diff options
2078 files changed, 13789 insertions, 13789 deletions
diff --git a/chalk/HACKING b/chalk/HACKING index c6f4ba66..a48526b0 100644 --- a/chalk/HACKING +++ b/chalk/HACKING @@ -62,7 +62,7 @@ Variable/Parameter names Designer - Chalk has started to use designer. All dialogs and all widgets that have a tqlayout + Chalk has started to use designer. All dialogs and all widgets that have a layout manager must be done in designer. We don't add code nor add signal/slot connections in designer diff --git a/chalk/IMAGE_LIBRARIES b/chalk/IMAGE_LIBRARIES index f2f0c1dc..1d26fb96 100644 --- a/chalk/IMAGE_LIBRARIES +++ b/chalk/IMAGE_LIBRARIES @@ -153,7 +153,7 @@ Disadvantages: Libart isn't really an image library, but rather a canvas that can be used to paint images on. It is optimized for vector graphics, and is -used by Karbon to render tqshapes before display. +used by Karbon to render shapes before display. Advantages: diff --git a/chalk/chalkcolor/kis_basic_histogram_producers.cc b/chalk/chalkcolor/kis_basic_histogram_producers.cc index b769a3d3..a67652f7 100644 --- a/chalk/chalkcolor/kis_basic_histogram_producers.cc +++ b/chalk/chalkcolor/kis_basic_histogram_producers.cc @@ -89,7 +89,7 @@ KisBasicU8HistogramProducer::KisBasicU8HistogramProducer(const KisID& id, KisCol } TQString KisBasicU8HistogramProducer::positionToString(double pos) const { - return TQString("%1").tqarg(static_cast<TQ_UINT8>(pos * UINT8_MAX)); + return TQString("%1").arg(static_cast<TQ_UINT8>(pos * UINT8_MAX)); } void KisBasicU8HistogramProducer::addRegionToBin(TQ_UINT8 * pixels, TQ_UINT8 * selectionMask, TQ_UINT32 nPixels, KisColorSpace *cs) @@ -142,7 +142,7 @@ KisBasicU16HistogramProducer::KisBasicU16HistogramProducer(const KisID& id, KisC TQString KisBasicU16HistogramProducer::positionToString(double pos) const { - return TQString("%1").tqarg(static_cast<TQ_UINT8>(pos * UINT8_MAX)); + return TQString("%1").arg(static_cast<TQ_UINT8>(pos * UINT8_MAX)); } double KisBasicU16HistogramProducer::maximalZoom() const @@ -210,7 +210,7 @@ KisBasicF32HistogramProducer::KisBasicF32HistogramProducer(const KisID& id, KisC } TQString KisBasicF32HistogramProducer::positionToString(double pos) const { - return TQString("%1").tqarg(static_cast<float>(pos)); // XXX I doubt this is correct! + return TQString("%1").arg(static_cast<float>(pos)); // XXX I doubt this is correct! } double KisBasicF32HistogramProducer::maximalZoom() const { @@ -282,7 +282,7 @@ KisBasicF16HalfHistogramProducer::KisBasicF16HalfHistogramProducer(const KisID& } TQString KisBasicF16HalfHistogramProducer::positionToString(double pos) const { - return TQString("%1").tqarg(static_cast<float>(pos)); // XXX I doubt this is correct! + return TQString("%1").arg(static_cast<float>(pos)); // XXX I doubt this is correct! } double KisBasicF16HalfHistogramProducer::maximalZoom() const { @@ -356,7 +356,7 @@ TQValueVector<KisChannelInfo *> KisGenericRGBHistogramProducer::channels() { } TQString KisGenericRGBHistogramProducer::positionToString(double pos) const { - return TQString("%1").tqarg(static_cast<TQ_UINT8>(pos * UINT8_MAX)); + return TQString("%1").arg(static_cast<TQ_UINT8>(pos * UINT8_MAX)); } double KisGenericRGBHistogramProducer::maximalZoom() const { @@ -433,7 +433,7 @@ TQValueVector<KisChannelInfo *> KisGenericLabHistogramProducer::channels() { } TQString KisGenericLabHistogramProducer::positionToString(double pos) const { - return TQString("%1").tqarg(static_cast<TQ_UINT16>(pos * UINT16_MAX)); + return TQString("%1").arg(static_cast<TQ_UINT16>(pos * UINT16_MAX)); } double KisGenericLabHistogramProducer::maximalZoom() const { diff --git a/chalk/chalkcolor/kis_basic_histogram_producers.h b/chalk/chalkcolor/kis_basic_histogram_producers.h index 8b913ece..83222765 100644 --- a/chalk/chalkcolor/kis_basic_histogram_producers.h +++ b/chalk/chalkcolor/kis_basic_histogram_producers.h @@ -60,7 +60,7 @@ protected: /** * The order in which channels() returns is not the same as the internal representation, * that of the pixel internally. This method converts external usage to internal usage. - * This method uses some basic assumtpions about the tqlayout of the pixel, so _extremely_ + * This method uses some basic assumtpions about the layout of the pixel, so _extremely_ * exotic spaces might want to override this (see makeExternalToInternal source for * those assumptions) **/ diff --git a/chalk/chalkcolor/kis_colorspace_factory_registry.cc b/chalk/chalkcolor/kis_colorspace_factory_registry.cc index 424e346d..c0219836 100644 --- a/chalk/chalkcolor/kis_colorspace_factory_registry.cc +++ b/chalk/chalkcolor/kis_colorspace_factory_registry.cc @@ -62,8 +62,8 @@ KisColorSpaceFactoryRegistry::KisColorSpaceFactoryRegistry(TQStringList profileF */ // Load all colorspace modules - KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/ColorSpace"), - TQString::tqfromLatin1("(Type == 'Service') and " + KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/ColorSpace"), + TQString::fromLatin1("(Type == 'Service') and " "([X-Chalk-Version] == 2)")); if (offers.empty()) { diff --git a/chalk/chalkcolor/kis_profile.cc b/chalk/chalkcolor/kis_profile.cc index 2d0ad98f..ae4c07cb 100644 --- a/chalk/chalkcolor/kis_profile.cc +++ b/chalk/chalkcolor/kis_profile.cc @@ -25,7 +25,7 @@ #include LCMS_HEADER #include <tqimage.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfile.h> #include <kdebug.h> @@ -65,7 +65,7 @@ KisProfile::KisProfile(const cmsHPROFILE profile) // Make a raw data image ready for saving _cmsSaveProfileToMem(m_profile, 0, &bytesNeeded); // calc size - if(m_rawData.tqresize(bytesNeeded)) + if(m_rawData.resize(bytesNeeded)) { _cmsSaveProfileToMem(m_profile, m_rawData.data(), &bytesNeeded); // fill buffer cmsHPROFILE newprofile = cmsOpenProfileFromMem(m_rawData.data(), (DWORD) bytesNeeded); diff --git a/chalk/colorspaces/wet/kis_wet_palette_widget.cc b/chalk/colorspaces/wet/kis_wet_palette_widget.cc index 901f2909..f8f3c6ac 100644 --- a/chalk/colorspaces/wet/kis_wet_palette_widget.cc +++ b/chalk/colorspaces/wet/kis_wet_palette_widget.cc @@ -21,12 +21,12 @@ #include <tqpushbutton.h> #include <tqapplication.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqcolor.h> #include <tqdrawutil.h> #include <tqhbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqspinbox.h> #include <tqstyle.h> @@ -50,7 +50,7 @@ KisWetPaletteWidget::KisWetPaletteWidget(TQWidget *parent, const char *name) : s { m_subject = 0; - TQVBoxLayout * vl = new TQVBoxLayout(this, 0, -1, "main tqlayout"); + TQVBoxLayout * vl = new TQVBoxLayout(this, 0, -1, "main layout"); TQGridLayout * l = new TQGridLayout(vl, 2, 8, 2, "color wells grid"); diff --git a/chalk/colorspaces/wet/wet_plugin.cc b/chalk/colorspaces/wet/wet_plugin.cc index df0666c4..42c3042b 100644 --- a/chalk/colorspaces/wet/wet_plugin.cc +++ b/chalk/colorspaces/wet/wet_plugin.cc @@ -22,7 +22,7 @@ #include <tqobject.h> #include <tqapplication.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqdockwindow.h> #include <tqpoint.h> #include <tqlabel.h> diff --git a/chalk/colorspaces/wetsticky/ws/canvas.c b/chalk/colorspaces/wetsticky/ws/canvas.c index d6940294..d2e27cd1 100644 --- a/chalk/colorspaces/wetsticky/ws/canvas.c +++ b/chalk/colorspaces/wetsticky/ws/canvas.c @@ -31,13 +31,13 @@ CELL canvas[CANVAS_WIDTH][CANVAS_HEIGHT]; /* This module maintains a list of the addresses of cells that have been modified since the last redraw and therefore need updating. - Points are added to this list by the need_to_tqrepaint() routine - and are removed by the next_cell_for_tqrepaint() function. The + Points are added to this list by the need_to_repaint() routine + and are removed by the next_cell_for_repaint() function. The pointer to the current tail of the list is updated by side-effect. */ static POINT need_repainting[REDRAW_LIMIT]; static int next_free = 0; -static int next_to_tqrepaint = 0; +static int next_to_repaint = 0; /* *********************************************************************** */ @@ -50,7 +50,7 @@ int number_of_repaints_needed() /* *********************************************************************** */ -void need_to_tqrepaint(point) +void need_to_repaint(point) /* The cell at this location needs to be redrawn since it has been altered. Scan the list to see if it is already scheduled for a repainting operation and only add it if @@ -62,7 +62,7 @@ POINT point; int k; - /* If the list is already full then simply ignore the tqrepaint + /* If the list is already full then simply ignore the repaint request - it will get done eventually anyway. */ if (next_free == REDRAW_LIMIT) return; @@ -85,7 +85,7 @@ POINT point; /* *********************************************************************** */ -void next_cell_for_tqrepaint(cell, locus) +void next_cell_for_repaint(cell, locus) /* This routine returns the next cell to be repainted, together with its location on the canvas. This is determined by taking the next point from the need_repainting list and accessing its cell. If the list is @@ -97,16 +97,16 @@ void next_cell_for_tqrepaint(cell, locus) POINT_PTR locus; { - if (next_to_tqrepaint >= next_free) { - next_to_tqrepaint = next_free = 0; + if (next_to_repaint >= next_free) { + next_to_repaint = next_free = 0; *(cell) = NIL; return; } - *(cell) = get_cell(need_repainting[next_to_tqrepaint]); - locus->x = need_repainting[next_to_tqrepaint].x; - locus->y = need_repainting[next_to_tqrepaint].y; - next_to_tqrepaint++; + *(cell) = get_cell(need_repainting[next_to_repaint]); + locus->x = need_repainting[next_to_repaint].x; + locus->y = need_repainting[next_to_repaint].y; + next_to_repaint++; } /* *********************************************************************** */ diff --git a/chalk/colorspaces/wetsticky/ws/canvas.h b/chalk/colorspaces/wetsticky/ws/canvas.h index 57453e7b..2df50140 100644 --- a/chalk/colorspaces/wetsticky/ws/canvas.h +++ b/chalk/colorspaces/wetsticky/ws/canvas.h @@ -22,11 +22,11 @@ Wet and Sticky is free software; you can redistribute it and/or modify it under extern int number_of_repaints_needed(); /* Returns the number of cells needing to repainted. */ -extern void need_to_tqrepaint (/* POINT */); +extern void need_to_repaint (/* POINT */); /* Requests that the cell at the given point be repainted at the next update as it has been modified. */ -extern void next_cell_for_tqrepaint (/* *CELL_PTR, POINT_PTR */); +extern void next_cell_for_repaint (/* *CELL_PTR, POINT_PTR */); /* Returns a pointer to a cell that needs to be updated as well as the location of that cell on the canvas. If there are no more cells to be redrawn then the pointer will be NIL. */ diff --git a/chalk/colorspaces/wetsticky/ws/engine.c b/chalk/colorspaces/wetsticky/ws/engine.c index b3855bda..19097d9f 100644 --- a/chalk/colorspaces/wetsticky/ws/engine.c +++ b/chalk/colorspaces/wetsticky/ws/engine.c @@ -192,7 +192,7 @@ int amount; } - need_to_tqrepaint(destLocus); + need_to_repaint(destLocus); } /* *********************************************************************** */ diff --git a/chalk/colorspaces/wetsticky/ws/engine3.c b/chalk/colorspaces/wetsticky/ws/engine3.c index fceb0c05..03a7d4f3 100644 --- a/chalk/colorspaces/wetsticky/ws/engine3.c +++ b/chalk/colorspaces/wetsticky/ws/engine3.c @@ -191,7 +191,7 @@ int amount; } - need_to_tqrepaint(destLocus); + need_to_repaint(destLocus); } /* *********************************************************************** */ diff --git a/chalk/colorspaces/wetsticky/ws/ogl_interface.c b/chalk/colorspaces/wetsticky/ws/ogl_interface.c index 953b10c8..76a552a9 100644 --- a/chalk/colorspaces/wetsticky/ws/ogl_interface.c +++ b/chalk/colorspaces/wetsticky/ws/ogl_interface.c @@ -255,7 +255,7 @@ void evolve_paint() for (k=0; k < STEP_LIMIT; k++) single_step(); while (TRUE) { - next_cell_for_tqrepaint(&cell, &p); + next_cell_for_repaint(&cell, &p); if (cell == NIL) return; paint_cell(cell, p.x, p.y); glFlush(); diff --git a/chalk/colorspaces/wetsticky/ws/x_interface.c b/chalk/colorspaces/wetsticky/ws/x_interface.c index 7c36a303..f4cb4901 100644 --- a/chalk/colorspaces/wetsticky/ws/x_interface.c +++ b/chalk/colorspaces/wetsticky/ws/x_interface.c @@ -700,7 +700,7 @@ void evolve_paint() for (k=0; k < STEP_LIMIT; k++) single_step(); while (TRUE) { - next_cell_for_tqrepaint(&cell, &p); + next_cell_for_repaint(&cell, &p); if (cell == NIL) return; paint_cell(cell, p.x, p.y); } diff --git a/chalk/core/kis_brush.cc b/chalk/core/kis_brush.cc index 31ee9d18..247bc7df 100644 --- a/chalk/core/kis_brush.cc +++ b/chalk/core/kis_brush.cc @@ -816,7 +816,7 @@ TQImage KisBrush::scaleImage(const TQImage& srcImage, int width, int height) // or scaling it to less than half size. scaledImage = srcImage.smoothScale(width, height); - //filename = TQString("smoothScale_%1x%2.png").tqarg(width).tqarg(height); + //filename = TQString("smoothScale_%1x%2.png").arg(width).arg(height); } else { scaledImage.create(width, height, 32); @@ -936,7 +936,7 @@ TQImage KisBrush::scaleImage(const TQImage& srcImage, int width, int height) } } - //filename = TQString("bilinear_%1x%2.png").tqarg(width).tqarg(height); + //filename = TQString("bilinear_%1x%2.png").arg(width).arg(height); } //scaledImage.save(filename, "PNG"); diff --git a/chalk/core/kis_convolution_painter.cc b/chalk/core/kis_convolution_painter.cc index ea0351df..32283ad3 100644 --- a/chalk/core/kis_convolution_painter.cc +++ b/chalk/core/kis_convolution_painter.cc @@ -20,7 +20,7 @@ #include <string.h> #include <cfloat> -#include "tqbrush.h" +#include "brush.h" #include "tqcolor.h" #include "tqfontinfo.h" #include "tqfontmetrics.h" diff --git a/chalk/core/kis_exif_value.cc b/chalk/core/kis_exif_value.cc index 043bf4e3..1981bd02 100644 --- a/chalk/core/kis_exif_value.cc +++ b/chalk/core/kis_exif_value.cc @@ -157,7 +157,7 @@ bool ExifValue::load(const TQDomElement& elmt) case EXIF_TYPE_BYTE: for(uint i = 0; i < components(); i++) { - if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() ) + if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() ) { setValue(i, (TQ_UINT8)0); } else { @@ -171,7 +171,7 @@ bool ExifValue::load(const TQDomElement& elmt) case EXIF_TYPE_SHORT: for(uint i = 0; i < components(); i++) { - if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() ) + if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() ) { setValue(i, (TQ_UINT16)0); } else { @@ -182,7 +182,7 @@ bool ExifValue::load(const TQDomElement& elmt) case EXIF_TYPE_LONG: for(uint i = 0; i < components(); i++) { - if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() ) + if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() ) { setValue(i, (TQ_UINT32)0); } else { @@ -194,13 +194,13 @@ bool ExifValue::load(const TQDomElement& elmt) for(uint i = 0; i < components(); i++) { KisExifRational r; - if( (attr = elmt.attribute(TQString("numerator%1").tqarg(i) ) ).isNull() ) + if( (attr = elmt.attribute(TQString("numerator%1").arg(i) ) ).isNull() ) { r.numerator = (TQ_UINT32)0; } else { r.numerator = (TQ_UINT32) attr.toUInt(); } - if( (attr = elmt.attribute(TQString("denominator%1").tqarg(i) ) ).isNull() ) + if( (attr = elmt.attribute(TQString("denominator%1").arg(i) ) ).isNull() ) { r.denominator = (TQ_UINT32)0; } else { @@ -212,7 +212,7 @@ bool ExifValue::load(const TQDomElement& elmt) case EXIF_TYPE_SBYTE: for(uint i = 0; i < components(); i++) { - if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() ) + if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() ) { setValue(i, (TQ_INT8)0); } else { @@ -233,7 +233,7 @@ bool ExifValue::load(const TQDomElement& elmt) case EXIF_TYPE_SSHORT: for(uint i = 0; i < components(); i++) { - if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() ) + if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() ) { setValue(i, (TQ_INT16)0); } else { @@ -244,7 +244,7 @@ bool ExifValue::load(const TQDomElement& elmt) case EXIF_TYPE_SLONG: for(uint i = 0; i < components(); i++) { - if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() ) + if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() ) { setValue(i, (TQ_INT32)0); } else { @@ -256,13 +256,13 @@ bool ExifValue::load(const TQDomElement& elmt) for(uint i = 0; i < components(); i++) { KisExifSRational r; - if( (attr = elmt.attribute(TQString("numerator%1").tqarg(i) ) ).isNull() ) + if( (attr = elmt.attribute(TQString("numerator%1").arg(i) ) ).isNull() ) { r.numerator = (TQ_INT32)0; } else { r.numerator = (TQ_INT32) attr.toInt(); } - if( (attr = elmt.attribute(TQString("denominator%1").tqarg(i) ) ).isNull() ) + if( (attr = elmt.attribute(TQString("denominator%1").arg(i) ) ).isNull() ) { r.denominator = (TQ_UINT32)0; } else { @@ -274,7 +274,7 @@ bool ExifValue::load(const TQDomElement& elmt) case EXIF_TYPE_FLOAT: for(uint i = 0; i < components(); i++) { - if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() ) + if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() ) { setValue(i, (float)0); } else { @@ -285,7 +285,7 @@ bool ExifValue::load(const TQDomElement& elmt) case EXIF_TYPE_DOUBLE: for(uint i = 0; i < components(); i++) { - if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() ) + if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() ) { setValue(i, (double)0); } else { @@ -310,65 +310,65 @@ TQDomElement ExifValue::save(TQDomDocument& doc) { case EXIF_TYPE_BYTE: for(uint i = 0; i < components(); i++) - elmt.setAttribute(TQString("value%1").tqarg(i), asByte( i ) ); + elmt.setAttribute(TQString("value%1").arg(i), asByte( i ) ); break; case EXIF_TYPE_ASCII: elmt.setAttribute("value", asAscii() ); break; case EXIF_TYPE_SHORT: for(uint i = 0; i < components(); i++) - elmt.setAttribute(TQString("value%1").tqarg(i), asShort( i ) ); + elmt.setAttribute(TQString("value%1").arg(i), asShort( i ) ); break; case EXIF_TYPE_LONG: for(uint i = 0; i < components(); i++) - elmt.setAttribute(TQString("value%1").tqarg(i), asLong( i ) ); + elmt.setAttribute(TQString("value%1").arg(i), asLong( i ) ); break; case EXIF_TYPE_RATIONAL: for(uint i = 0; i < components(); i++) { KisExifRational r = asRational(i); - elmt.setAttribute(TQString("numerator%1").tqarg(i), r.numerator ); - elmt.setAttribute(TQString("denominator%1").tqarg(i), r.denominator ); + elmt.setAttribute(TQString("numerator%1").arg(i), r.numerator ); + elmt.setAttribute(TQString("denominator%1").arg(i), r.denominator ); } break; case EXIF_TYPE_SBYTE: for(uint i = 0; i < components(); i++) - elmt.setAttribute(TQString("value%1").tqarg(i), asSByte( i ) ); + elmt.setAttribute(TQString("value%1").arg(i), asSByte( i ) ); break; case EXIF_TYPE_UNDEFINED: { UByteArray value = asUndefined(); TQByteArray data; data.setRawData((char*)value.data(), value.size()); - TQByteArray tqencodedData; - KCodecs::base64Encode( data, tqencodedData ); + TQByteArray encodedData; + KCodecs::base64Encode( data, encodedData ); data.resetRawData( (char*)value.data(), value.size()); - elmt.setAttribute("value", TQString(tqencodedData)); + elmt.setAttribute("value", TQString(encodedData)); } break; case EXIF_TYPE_SSHORT: for(uint i = 0; i < components(); i++) - elmt.setAttribute(TQString("value%1").tqarg(i), asSShort( i ) ); + elmt.setAttribute(TQString("value%1").arg(i), asSShort( i ) ); break; case EXIF_TYPE_SLONG: for(uint i = 0; i < components(); i++) - elmt.setAttribute(TQString("value%1").tqarg(i), asSLong( i ) ); + elmt.setAttribute(TQString("value%1").arg(i), asSLong( i ) ); break; case EXIF_TYPE_SRATIONAL: for(uint i = 0; i < components(); i++) { KisExifSRational r = asSRational(i); - elmt.setAttribute(TQString("numerator%1").tqarg(i), r.numerator ); - elmt.setAttribute(TQString("denominator%1").tqarg(i), r.denominator ); + elmt.setAttribute(TQString("numerator%1").arg(i), r.numerator ); + elmt.setAttribute(TQString("denominator%1").arg(i), r.denominator ); } break; case EXIF_TYPE_FLOAT: for(uint i = 0; i < components(); i++) - elmt.setAttribute(TQString("value%1").tqarg(i), asFloat( i ) ); + elmt.setAttribute(TQString("value%1").arg(i), asFloat( i ) ); break; case EXIF_TYPE_DOUBLE: for(uint i = 0; i < components(); i++) - elmt.setAttribute(TQString("value%1").tqarg(i), asDouble( i ) ); + elmt.setAttribute(TQString("value%1").arg(i), asDouble( i ) ); break; case EXIF_TYPE_UNKNOW: break; @@ -660,25 +660,25 @@ TQString ExifValue::toString(uint i) switch(type()) { case EXIF_TYPE_BYTE: - return TQString("%1 ").tqarg( asExifNumber( i ).m_byte ); + return TQString("%1 ").arg( asExifNumber( i ).m_byte ); case EXIF_TYPE_SHORT: - return TQString("%1 ").tqarg( asExifNumber( i ).m_short ); + return TQString("%1 ").arg( asExifNumber( i ).m_short ); case EXIF_TYPE_LONG: - return TQString("%1 ").tqarg( asExifNumber( i ).m_long ); + return TQString("%1 ").arg( asExifNumber( i ).m_long ); case EXIF_TYPE_RATIONAL: - return TQString("%1 / %2 ").tqarg( asExifNumber( i ).m_rational.numerator ).tqarg( asExifNumber( i ).m_rational.denominator ); + return TQString("%1 / %2 ").arg( asExifNumber( i ).m_rational.numerator ).arg( asExifNumber( i ).m_rational.denominator ); case EXIF_TYPE_SBYTE: - return TQString("%1 ").tqarg( asExifNumber( i ).m_sbyte ); + return TQString("%1 ").arg( asExifNumber( i ).m_sbyte ); case EXIF_TYPE_SSHORT: - return TQString("%1 ").tqarg( asExifNumber( i ).m_sshort ); + return TQString("%1 ").arg( asExifNumber( i ).m_sshort ); case EXIF_TYPE_SLONG: - return TQString("%1 ").tqarg( asExifNumber( i ).m_slong ); + return TQString("%1 ").arg( asExifNumber( i ).m_slong ); case EXIF_TYPE_SRATIONAL: - return TQString("%1 / %2 ").tqarg( asExifNumber( i ).m_srational.numerator ).tqarg( asExifNumber( i ).m_srational.denominator ); + return TQString("%1 / %2 ").arg( asExifNumber( i ).m_srational.numerator ).arg( asExifNumber( i ).m_srational.denominator ); case EXIF_TYPE_FLOAT: - return TQString("%1 ").tqarg( asExifNumber( i ).m_float ); + return TQString("%1 ").arg( asExifNumber( i ).m_float ); case EXIF_TYPE_DOUBLE: - return TQString("%1 ").tqarg( asExifNumber( i ).m_double ); + return TQString("%1 ").arg( asExifNumber( i ).m_double ); default: return "unknow "; } diff --git a/chalk/core/kis_fill_painter.cc b/chalk/core/kis_fill_painter.cc index 54e730a7..a025ce10 100644 --- a/chalk/core/kis_fill_painter.cc +++ b/chalk/core/kis_fill_painter.cc @@ -22,7 +22,7 @@ #include <cfloat> #include <stack> -#include "tqbrush.h" +#include "brush.h" #include "tqfontinfo.h" #include "tqfontmetrics.h" #include "tqpen.h" @@ -209,7 +209,7 @@ struct FillSegment { // FillSegment* parent; }; -typedef enum { None = 0, Added = 1, Checked = 2 } tqStatus; +typedef enum { None = 0, Added = 1, Checked = 2 } Status; KisSelectionSP KisFillPainter::createFloodSelection(int startX, int startY) { if (m_width < 0 || m_height < 0) { @@ -260,9 +260,9 @@ KisSelectionSP KisFillPainter::createFloodSelection(int startX, int startY) { stack.push(new FillSegment(startX, startY/*, 0*/)); - tqStatus* map = new tqStatus[m_size]; + Status* map = new Status[m_size]; - memset(map, None, m_size * sizeof(tqStatus)); + memset(map, None, m_size * sizeof(Status)); int progressPercent = 0; int pixelsDone = 0; int currentPercent = 0; emit notifyProgressStage(i18n("Making fill outline..."), 0); diff --git a/chalk/core/kis_filter_registry.cc b/chalk/core/kis_filter_registry.cc index b7c8383e..53f17ea8 100644 --- a/chalk/core/kis_filter_registry.cc +++ b/chalk/core/kis_filter_registry.cc @@ -40,8 +40,8 @@ KisFilterRegistry::KisFilterRegistry() Q_ASSERT(KisFilterRegistry::m_singleton == 0); KisFilterRegistry::m_singleton = this; - KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/Filter"), - TQString::tqfromLatin1("(Type == 'Service') and " + KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Filter"), + TQString::fromLatin1("(Type == 'Service') and " "([X-Chalk-Version] == 2)")); KTrader::OfferList::ConstIterator iter; diff --git a/chalk/core/kis_gradient.cc b/chalk/core/kis_gradient.cc index efc370bb..6dffc087 100644 --- a/chalk/core/kis_gradient.cc +++ b/chalk/core/kis_gradient.cc @@ -26,7 +26,7 @@ #include <cmath> #include <tqimage.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfile.h> #include <koColor.h> diff --git a/chalk/core/kis_gradient_painter.cc b/chalk/core/kis_gradient_painter.cc index 2258d899..8d387e6f 100644 --- a/chalk/core/kis_gradient_painter.cc +++ b/chalk/core/kis_gradient_painter.cc @@ -20,7 +20,7 @@ #include <string.h> #include <cfloat> -#include "tqbrush.h" +#include "brush.h" #include "tqcolor.h" #include "tqfontinfo.h" #include "tqfontmetrics.h" @@ -483,7 +483,7 @@ KisGradientPainter::KisGradientPainter(KisPaintDeviceSP device) : super(device), bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart, const KisPoint& gradientVectorEnd, - enumGradientShape tqshape, + enumGradientShape shape, enumGradientRepeat repeat, double antiAliasThreshold, bool reverseGradient, @@ -496,29 +496,29 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart, if (!m_gradient) return false; - GradientShapeStrategy *tqshapeStrategy = 0; + GradientShapeStrategy *shapeStrategy = 0; - switch (tqshape) { + switch (shape) { case GradientShapeLinear: - tqshapeStrategy = new LinearGradientStrategy(gradientVectorStart, gradientVectorEnd); + shapeStrategy = new LinearGradientStrategy(gradientVectorStart, gradientVectorEnd); break; case GradientShapeBiLinear: - tqshapeStrategy = new BiLinearGradientStrategy(gradientVectorStart, gradientVectorEnd); + shapeStrategy = new BiLinearGradientStrategy(gradientVectorStart, gradientVectorEnd); break; case GradientShapeRadial: - tqshapeStrategy = new RadialGradientStrategy(gradientVectorStart, gradientVectorEnd); + shapeStrategy = new RadialGradientStrategy(gradientVectorStart, gradientVectorEnd); break; case GradientShapeSquare: - tqshapeStrategy = new SquareGradientStrategy(gradientVectorStart, gradientVectorEnd); + shapeStrategy = new SquareGradientStrategy(gradientVectorStart, gradientVectorEnd); break; case GradientShapeConical: - tqshapeStrategy = new ConicalGradientStrategy(gradientVectorStart, gradientVectorEnd); + shapeStrategy = new ConicalGradientStrategy(gradientVectorStart, gradientVectorEnd); break; case GradientShapeConicalSymetric: - tqshapeStrategy = new ConicalSymetricGradientStrategy(gradientVectorStart, gradientVectorEnd); + shapeStrategy = new ConicalSymetricGradientStrategy(gradientVectorStart, gradientVectorEnd); break; } - Q_CHECK_PTR(tqshapeStrategy); + Q_CHECK_PTR(shapeStrategy); GradientRepeatStrategy *repeatStrategy = 0; @@ -566,7 +566,7 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart, for (int y = starty; y <= endy; y++) { for (int x = startx; x <= endx; x++) { - double t = tqshapeStrategy->valueAt( x, y); + double t = shapeStrategy->valueAt( x, y); t = repeatStrategy->valueAt(t); if (reverseGradient) { @@ -662,7 +662,7 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart, double sampleX = x - 0.5 + (sampleWidth / 2) + xSample * sampleWidth; double sampleY = y - 0.5 + (sampleWidth / 2) + ySample * sampleWidth; - double t = tqshapeStrategy->valueAt(sampleX, sampleY); + double t = shapeStrategy->valueAt(sampleX, sampleY); t = repeatStrategy->valueAt(t); if (reverseGradient) { @@ -715,7 +715,7 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart, dev->writeBytes(layer.bits(), startx, starty, width, height); bltSelection(startx, starty, m_compositeOp, dev, m_opacity, startx, starty, width, height); } - delete tqshapeStrategy; + delete shapeStrategy; emit notifyProgressDone(); diff --git a/chalk/core/kis_gradient_painter.h b/chalk/core/kis_gradient_painter.h index fc31b117..2c0e29c2 100644 --- a/chalk/core/kis_gradient_painter.h +++ b/chalk/core/kis_gradient_painter.h @@ -66,7 +66,7 @@ public: */ bool paintGradient(const KisPoint& gradientVectorStart, const KisPoint& gradientVectorEnd, - enumGradientShape tqshape, + enumGradientShape shape, enumGradientRepeat repeat, double antiAliasThreshold, bool reverseGradient, diff --git a/chalk/core/kis_group_layer.cc b/chalk/core/kis_group_layer.cc index 1f08dbdd..0e2f90d2 100644 --- a/chalk/core/kis_group_layer.cc +++ b/chalk/core/kis_group_layer.cc @@ -207,7 +207,7 @@ bool KisGroupLayer::removeLayer(int x) m_layers.erase(m_layers.begin() + reverseIndex(index)); setDirty(removedLayer->extent()); if (childCount() < 1) { - // No tqchildren, nothing to show for it. + // No children, nothing to show for it. m_projection->clear(); setDirty(); } @@ -308,7 +308,7 @@ void KisGroupLayer::updateProjection(const TQRect & rc) // Get the first layer in this group to start compositing with KisLayerSP child = lastChild(); - // No child -- clear the projection. Without tqchildren, a group layer is empty. + // No child -- clear the projection. Without children, a group layer is empty. if (!child) m_projection->clear(); KisLayerSP startWith = 0; diff --git a/chalk/core/kis_group_layer.h b/chalk/core/kis_group_layer.h index a516ac72..58a3ddab 100644 --- a/chalk/core/kis_group_layer.h +++ b/chalk/core/kis_group_layer.h @@ -80,7 +80,7 @@ public: { // kdDebug(41001) << "GROUP\t\t" << name() // << " dirty: " << dirty() -// << ", " << m_layers.count() << " tqchildren " +// << ", " << m_layers.count() << " children " // << ", projection: " << m_projection // << "\n"; return v.visit(this); diff --git a/chalk/core/kis_imagepipe_brush.cc b/chalk/core/kis_imagepipe_brush.cc index 726d0295..ca470382 100644 --- a/chalk/core/kis_imagepipe_brush.cc +++ b/chalk/core/kis_imagepipe_brush.cc @@ -37,7 +37,7 @@ #include <tqfile.h> #include <tqregexp.h> #include <tqstringlist.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> #include <klocale.h> diff --git a/chalk/core/kis_nameserver.cc b/chalk/core/kis_nameserver.cc index ff66144d..4cb51a98 100644 --- a/chalk/core/kis_nameserver.cc +++ b/chalk/core/kis_nameserver.cc @@ -29,7 +29,7 @@ KisNameServer::~KisNameServer() TQString KisNameServer::name() { - return m_prefix.tqarg(m_generator++); + return m_prefix.arg(m_generator++); } TQ_INT32 KisNameServer::currentSeed() const diff --git a/chalk/core/kis_painter.cc b/chalk/core/kis_painter.cc index c64935fc..ed51587b 100644 --- a/chalk/core/kis_painter.cc +++ b/chalk/core/kis_painter.cc @@ -26,7 +26,7 @@ #include <climits> #include <strings.h> -#include "tqbrush.h" +#include "brush.h" #include "tqfontinfo.h" #include "tqfontmetrics.h" #include "tqpen.h" diff --git a/chalk/core/kis_paintop_registry.cc b/chalk/core/kis_paintop_registry.cc index 012f2027..7d5de556 100644 --- a/chalk/core/kis_paintop_registry.cc +++ b/chalk/core/kis_paintop_registry.cc @@ -43,8 +43,8 @@ KisPaintOpRegistry::KisPaintOpRegistry() Q_ASSERT(KisPaintOpRegistry::m_singleton == 0); KisPaintOpRegistry::m_singleton = this; - KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/Paintop"), - TQString::tqfromLatin1("(Type == 'Service') and " + KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Paintop"), + TQString::fromLatin1("(Type == 'Service') and " "([X-Chalk-Version] == 2)")); KTrader::OfferList::ConstIterator iter; diff --git a/chalk/core/kis_palette.cc b/chalk/core/kis_palette.cc index 161a4ff8..c6f0c645 100644 --- a/chalk/core/kis_palette.cc +++ b/chalk/core/kis_palette.cc @@ -33,7 +33,7 @@ #include <tqpoint.h> #include <tqvaluevector.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> #include <klocale.h> diff --git a/chalk/core/kis_selection.cc b/chalk/core/kis_selection.cc index 03d76616..69b90fe3 100644 --- a/chalk/core/kis_selection.cc +++ b/chalk/core/kis_selection.cc @@ -215,7 +215,7 @@ void KisSelection::paintUniformSelectionRegion(TQImage img, const TQRect& imageR TQRegion region = uniformRegion & TQRegion(imageRect); if (!region.isEmpty()) { - TQMemArray<TQRect> rects = region.tqrects(); + TQMemArray<TQRect> rects = region.rects(); for (unsigned int i = 0; i < rects.count(); i++) { TQRect r = rects[i]; diff --git a/chalk/doc/DESIGN.obsolete b/chalk/doc/DESIGN.obsolete index 10ab8dbb..f702d920 100644 --- a/chalk/doc/DESIGN.obsolete +++ b/chalk/doc/DESIGN.obsolete @@ -21,7 +21,7 @@ Design Patterns changes: * Change brushes handling to a generic Mediator pattern - (kis_resource_mediator). Resources are brush tqshapes, + (kis_resource_mediator). Resources are brush shapes, patterns (and colours, too?) Patrick intended a Flyweight here. diff --git a/chalk/doc/background_paper.txt b/chalk/doc/background_paper.txt index aa3bf87b..2b860773 100644 --- a/chalk/doc/background_paper.txt +++ b/chalk/doc/background_paper.txt @@ -79,6 +79,6 @@ We need perhaps to add a light source or two, in OpenGL mode... I think we do. On top of the layers are what Xara calls blobs: the temporary droppings of -tools, like rubber bands, vector paths, brush tqshape cursors. +tools, like rubber bands, vector paths, brush shape cursors. diff --git a/chalk/doc/chalk-features b/chalk/doc/chalk-features index 1c737ce6..4bca9d00 100644 --- a/chalk/doc/chalk-features +++ b/chalk/doc/chalk-features @@ -201,10 +201,10 @@ of a tablet. Tilt and rotation is not yet supported. * Brushes -** gimp brush tqshapes. Support for colored and grayscale brushes and +** gimp brush shapes. Support for colored and grayscale brushes and pipe brushes. Support from Gimp parasites in brushes. -** custom brush tqshapes -** text brush tqshapes +** custom brush shapes +** text brush shapes ** brushes created from layers or images. These brushes can be saved ** colored brushes can also be used as masks diff --git a/chalk/doc/chalk.xmi b/chalk/doc/chalk.xmi index 69c6edca..b209cfa9 100644 --- a/chalk/doc/chalk.xmi +++ b/chalk/doc/chalk.xmi @@ -473,15 +473,15 @@ managed by this KisTileMgr" visibility="public" xmi.id="354" type="Q_INT32" name <UML:Operation comment="Returns true if this KisTileMgr does not manage any tiles." visibility="public" xmi.id="362" type="bool" name="empty" /> <UML:Operation comment="Height in pixels of the total area managed by this KisTileMgr" visibility="public" xmi.id="363" type="Q_INT32" name="height" /> - <UML:Operation comment="XXX" visibility="public" xmi.id="364" type="KisTileSP" name="tqinvalidate" > + <UML:Operation comment="XXX" visibility="public" xmi.id="364" type="KisTileSP" name="invalidate" > <UML:Parameter visibility="private" xmi.id="365" value="" type="KisTileSP" name="tile" /> <UML:Parameter visibility="private" xmi.id="366" value="" type="Q_INT32" name="xpix" /> <UML:Parameter visibility="private" xmi.id="367" value="" type="Q_INT32" name="ypix" /> </UML:Operation> - <UML:Operation comment="XXX" visibility="public" xmi.id="368" type="KisTileSP" name="tqinvalidate" > + <UML:Operation comment="XXX" visibility="public" xmi.id="368" type="KisTileSP" name="invalidate" > <UML:Parameter visibility="private" xmi.id="369" value="" type="Q_INT32" name="tileno" /> </UML:Operation> - <UML:Operation comment="XXX" visibility="public" xmi.id="370" type="KisTileSP" name="tqinvalidate" > + <UML:Operation comment="XXX" visibility="public" xmi.id="370" type="KisTileSP" name="invalidate" > <UML:Parameter visibility="private" xmi.id="371" value="" type="Q_INT32" name="xpix" /> <UML:Parameter visibility="private" xmi.id="372" value="" type="Q_INT32" name="ypix" /> </UML:Operation> @@ -645,7 +645,7 @@ of tile in x and y." visibility="public" xmi.id="408" type="void" name="tileCoor <UML:Operation visibility="public" xmi.id="476" type="virtual void" isAbstract="true" name="insert" > <UML:Parameter visibility="private" xmi.id="477" value="" type="KisTileSP" name="tile" /> </UML:Operation> - <UML:Operation visibility="public" xmi.id="478" type="virtual void" isAbstract="true" name="tqsizeHint" > + <UML:Operation visibility="public" xmi.id="478" type="virtual void" isAbstract="true" name="sizeHint" > <UML:Parameter visibility="private" xmi.id="479" value="" type="Q_INT32" name="nelements" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="480" type="virtual " name="~KisTileCacheInterface" /> @@ -1705,17 +1705,17 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas <UML:Parameter visibility="private" xmi.id="1359" value="" type="const enumImgType &" name="imgType" /> <UML:Parameter visibility="private" xmi.id="1360" value="" type="const QString &" name="name" /> </UML:Operation> - <UML:Operation visibility="public" xmi.id="1361" type="virtual void" name="tqinvalidate" /> - <UML:Operation visibility="public" xmi.id="1362" type="virtual void" name="tqinvalidate" > + <UML:Operation visibility="public" xmi.id="1361" type="virtual void" name="invalidate" /> + <UML:Operation visibility="public" xmi.id="1362" type="virtual void" name="invalidate" > <UML:Parameter visibility="private" xmi.id="1363" value="" type="Q_INT32" name="tileno" /> </UML:Operation> - <UML:Operation visibility="public" xmi.id="1364" type="virtual void" name="tqinvalidate" > + <UML:Operation visibility="public" xmi.id="1364" type="virtual void" name="invalidate" > <UML:Parameter visibility="private" xmi.id="1365" value="" type="Q_INT32" name="x" /> <UML:Parameter visibility="private" xmi.id="1366" value="" type="Q_INT32" name="y" /> <UML:Parameter visibility="private" xmi.id="1367" value="" type="Q_INT32" name="w" /> <UML:Parameter visibility="private" xmi.id="1368" value="" type="Q_INT32" name="h" /> </UML:Operation> - <UML:Operation visibility="public" xmi.id="1369" type="virtual void" name="tqinvalidate" > + <UML:Operation visibility="public" xmi.id="1369" type="virtual void" name="invalidate" > <UML:Parameter visibility="private" xmi.id="1370" value="" type="const QRect &" name="rc" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="1371" type="KisLayerSP" name="layer" > @@ -1930,17 +1930,17 @@ cannot be abstract, because otherwise this class would be abstract." visibility= </UML:Operation> <UML:Operation visibility="public" xmi.id="1529" type="const KisImageSP" name="image" /> <UML:Operation visibility="protected" xmi.id="1530" type="void" name="init" /> - <UML:Operation visibility="public" xmi.id="1531" type="virtual void" name="tqinvalidate" /> - <UML:Operation visibility="public" xmi.id="1532" type="virtual void" name="tqinvalidate" > + <UML:Operation visibility="public" xmi.id="1531" type="virtual void" name="invalidate" /> + <UML:Operation visibility="public" xmi.id="1532" type="virtual void" name="invalidate" > <UML:Parameter visibility="private" xmi.id="1533" value="" type="Q_INT32" name="tileno" /> </UML:Operation> - <UML:Operation visibility="public" xmi.id="1534" type="virtual void" name="tqinvalidate" > + <UML:Operation visibility="public" xmi.id="1534" type="virtual void" name="invalidate" > <UML:Parameter visibility="private" xmi.id="1535" value="" type="Q_INT32" name="x" /> <UML:Parameter visibility="private" xmi.id="1536" value="" type="Q_INT32" name="y" /> <UML:Parameter visibility="private" xmi.id="1537" value="" type="Q_INT32" name="w" /> <UML:Parameter visibility="private" xmi.id="1538" value="" type="Q_INT32" name="h" /> </UML:Operation> - <UML:Operation visibility="public" xmi.id="1539" type="virtual void" name="tqinvalidate" > + <UML:Operation visibility="public" xmi.id="1539" type="virtual void" name="invalidate" > <UML:Parameter visibility="private" xmi.id="1540" value="" type="const QRect &" name="rc" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="1541" type="void" name="maskBounds" > @@ -2649,17 +2649,17 @@ in the constructor, you have to call loadAsync. <UML:Operation visibility="public" xmi.id="2090" type="" name="KisRenderInterface" > <UML:Parameter visibility="private" xmi.id="2091" value="" type="const KisRenderInterface &" name="rhs" /> </UML:Operation> - <UML:Operation visibility="public" xmi.id="2092" type="virtual void" isAbstract="true" name="tqinvalidate" /> - <UML:Operation visibility="public" xmi.id="2093" type="virtual void" isAbstract="true" name="tqinvalidate" > + <UML:Operation visibility="public" xmi.id="2092" type="virtual void" isAbstract="true" name="invalidate" /> + <UML:Operation visibility="public" xmi.id="2093" type="virtual void" isAbstract="true" name="invalidate" > <UML:Parameter visibility="private" xmi.id="2094" value="" type="Q_INT32" name="tileno" /> </UML:Operation> - <UML:Operation visibility="public" xmi.id="2095" type="virtual void" isAbstract="true" name="tqinvalidate" > + <UML:Operation visibility="public" xmi.id="2095" type="virtual void" isAbstract="true" name="invalidate" > <UML:Parameter visibility="private" xmi.id="2096" value="" type="Q_INT32" name="x" /> <UML:Parameter visibility="private" xmi.id="2097" value="" type="Q_INT32" name="y" /> <UML:Parameter visibility="private" xmi.id="2098" value="" type="Q_INT32" name="w" /> <UML:Parameter visibility="private" xmi.id="2099" value="" type="Q_INT32" name="h" /> </UML:Operation> - <UML:Operation visibility="public" xmi.id="2100" type="virtual void" isAbstract="true" name="tqinvalidate" > + <UML:Operation visibility="public" xmi.id="2100" type="virtual void" isAbstract="true" name="invalidate" > <UML:Parameter visibility="private" xmi.id="2101" value="" type="const QRect &" name="rc" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="2102" type="virtual Q_INT32" isAbstract="true" name="tileNum" > @@ -3926,10 +3926,10 @@ in the constructor, you have to call loadAsync. <listitem open="0" type="815" id="1353" label="index" /> <listitem open="0" type="815" id="1351" label="index" /> <listitem open="0" type="815" id="1355" label="init" /> - <listitem open="0" type="815" id="1362" label="tqinvalidate" /> - <listitem open="0" type="815" id="1361" label="tqinvalidate" /> - <listitem open="0" type="815" id="1369" label="tqinvalidate" /> - <listitem open="0" type="815" id="1364" label="tqinvalidate" /> + <listitem open="0" type="815" id="1362" label="invalidate" /> + <listitem open="0" type="815" id="1361" label="invalidate" /> + <listitem open="0" type="815" id="1369" label="invalidate" /> + <listitem open="0" type="815" id="1364" label="invalidate" /> <listitem open="0" type="815" id="1371" label="layer" /> <listitem open="0" type="815" id="1373" label="layer" /> <listitem open="0" type="815" id="1375" label="layers" /> @@ -4126,10 +4126,10 @@ in the constructor, you have to call loadAsync. <listitem open="0" type="815" id="1526" label="height" /> <listitem open="0" type="815" id="1529" label="image" /> <listitem open="0" type="815" id="1530" label="init" /> - <listitem open="0" type="815" id="1532" label="tqinvalidate" /> - <listitem open="0" type="815" id="1531" label="tqinvalidate" /> - <listitem open="0" type="815" id="1539" label="tqinvalidate" /> - <listitem open="0" type="815" id="1534" label="tqinvalidate" /> + <listitem open="0" type="815" id="1532" label="invalidate" /> + <listitem open="0" type="815" id="1531" label="invalidate" /> + <listitem open="0" type="815" id="1539" label="invalidate" /> + <listitem open="0" type="815" id="1534" label="invalidate" /> <listitem open="0" type="815" id="1541" label="maskBounds" /> <listitem open="0" type="815" id="1543" label="maskBounds" /> <listitem open="0" type="815" id="1548" label="move" /> @@ -4263,10 +4263,10 @@ in the constructor, you have to call loadAsync. <listitem open="0" type="815" id="2087" label="=" /> <listitem open="0" type="815" id="2089" label="KisRenderInterface" /> <listitem open="0" type="815" id="2090" label="KisRenderInterface" /> - <listitem open="0" type="815" id="2093" label="tqinvalidate" /> - <listitem open="0" type="815" id="2095" label="tqinvalidate" /> - <listitem open="0" type="815" id="2092" label="tqinvalidate" /> - <listitem open="0" type="815" id="2100" label="tqinvalidate" /> + <listitem open="0" type="815" id="2093" label="invalidate" /> + <listitem open="0" type="815" id="2095" label="invalidate" /> + <listitem open="0" type="815" id="2092" label="invalidate" /> + <listitem open="0" type="815" id="2100" label="invalidate" /> <listitem open="0" type="815" id="2102" label="tileNum" /> <listitem open="0" type="815" id="2105" label="tiles" /> <listitem open="0" type="815" id="2106" label="validate" /> @@ -4485,7 +4485,7 @@ in the constructor, you have to call loadAsync. <listitem open="0" type="815" id="473" label="KisTileCacheInterface" /> <listitem open="0" type="815" id="474" label="flush" /> <listitem open="0" type="815" id="476" label="insert" /> - <listitem open="0" type="815" id="478" label="tqsizeHint" /> + <listitem open="0" type="815" id="478" label="sizeHint" /> <listitem open="0" type="815" id="480" label="~KisTileCacheInterface" /> </listitem> <listitem open="0" type="813" id="1996" label="KisTileCommand" > @@ -4535,9 +4535,9 @@ in the constructor, you have to call loadAsync. <listitem open="0" type="815" id="359" label="duplicate" /> <listitem open="0" type="815" id="362" label="empty" /> <listitem open="0" type="815" id="363" label="height" /> - <listitem open="0" type="815" id="364" label="tqinvalidate" /> - <listitem open="0" type="815" id="370" label="tqinvalidate" /> - <listitem open="0" type="815" id="368" label="tqinvalidate" /> + <listitem open="0" type="815" id="364" label="invalidate" /> + <listitem open="0" type="815" id="370" label="invalidate" /> + <listitem open="0" type="815" id="368" label="invalidate" /> <listitem open="0" type="815" id="373" label="invalidateTile" /> <listitem open="0" type="815" id="376" label="invalidateTiles" /> <listitem open="0" type="815" id="378" label="memSize" /> diff --git a/chalk/doc/controller.xmi b/chalk/doc/controller.xmi index 7d242713..ceacf630 100644 --- a/chalk/doc/controller.xmi +++ b/chalk/doc/controller.xmi @@ -3219,12 +3219,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1726" isRoot="false" initialValue="" type="1701" isAbstract="false" name="m_ac" /> <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1751" isRoot="false" initialValue="" type="1750" isAbstract="false" name="m_toolDockManager" /> <UML:Attribute comment="// Sliders" isSpecification="false" isLeaf="false" visibility="private" xmi.id="1753" isRoot="false" initialValue="" type="1752" isAbstract="false" name="m_layerchannelslider" /> - <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1754" isRoot="false" initialValue="" type="1752" isAbstract="false" name="m_tqshapesslider" /> + <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1754" isRoot="false" initialValue="" type="1752" isAbstract="false" name="m_shapesslider" /> <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1755" isRoot="false" initialValue="" type="1752" isAbstract="false" name="m_fillsslider" /> <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1756" isRoot="false" initialValue="" type="1752" isAbstract="false" name="m_toolcontrolslider" /> <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1757" isRoot="false" initialValue="" type="1752" isAbstract="false" name="m_colorslider" /> <UML:Attribute comment="// Dockers" isSpecification="false" isLeaf="false" visibility="private" xmi.id="1759" isRoot="false" initialValue="" type="1758" isAbstract="false" name="m_layerchanneldocker" /> - <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1760" isRoot="false" initialValue="" type="1758" isAbstract="false" name="m_tqshapesdocker" /> + <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1760" isRoot="false" initialValue="" type="1758" isAbstract="false" name="m_shapesdocker" /> <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1761" isRoot="false" initialValue="" type="1758" isAbstract="false" name="m_fillsdocker" /> <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1762" isRoot="false" initialValue="" type="1758" isAbstract="false" name="m_toolcontroldocker" /> <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1763" isRoot="false" initialValue="" type="1758" isAbstract="false" name="m_colordocker" /> @@ -36138,7 +36138,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <codecomment tag="" indentLevel="1" text="// Sliders" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="1754" tag="tblock_23" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_tqshapesslider;" > + <ccfdeclarationcodeblock parent_id="1754" tag="tblock_23" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_shapesslider;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -36163,7 +36163,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <codecomment tag="" indentLevel="1" text="// Dockers" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="1760" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_tqshapesdocker;" > + <ccfdeclarationcodeblock parent_id="1760" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_shapesdocker;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -36382,14 +36382,14 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <javacodedocumentation tag="" indentLevel="1" text="// Sliders" /> </header> </codeaccessormethod> - <codeaccessormethod accessType="0" parent_id="1754" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1754" text="return m_tqshapesslider;" > + <codeaccessormethod accessType="0" parent_id="1754" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1754" text="return m_shapesslider;" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesslider&#010;&#010;@return the value of m_tqshapesslider" /> + <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_shapesslider&#010;&#010;@return the value of m_shapesslider" /> </header> </codeaccessormethod> - <codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_tqshapesslider = value;" > + <codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_shapesslider = value;" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesslider&#010;&#010;" /> + <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_shapesslider&#010;&#010;" /> </header> </codeaccessormethod> <codeaccessormethod accessType="0" parent_id="1755" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="1755" text="return m_fillsslider;" > @@ -36432,14 +36432,14 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <javacodedocumentation tag="" indentLevel="1" text="// Dockers" /> </header> </codeaccessormethod> - <codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_tqshapesdocker;" > + <codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_shapesdocker;" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesdocker&#010;&#010;@return the value of m_tqshapesdocker" /> + <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_shapesdocker&#010;&#010;@return the value of m_shapesdocker" /> </header> </codeaccessormethod> - <codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_tqshapesdocker = value;" > + <codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_shapesdocker = value;" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesdocker&#010;&#010;" /> + <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_shapesdocker&#010;&#010;" /> </header> </codeaccessormethod> <codeaccessormethod accessType="0" parent_id="1761" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1761" text="return m_fillsdocker;" > @@ -36982,19 +36982,19 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="1754" tag="tblock_23" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_tqshapesslider;" > + <ccfdeclarationcodeblock parent_id="1754" tag="tblock_23" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_shapesslider;" > <header> <codecomment tag="" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <codeaccessormethod accessType="0" parent_id="1754" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1754" text="return m_tqshapesslider;" > + <codeaccessormethod accessType="0" parent_id="1754" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1754" text="return m_shapesslider;" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesslider&#010;&#010;@return the value of m_tqshapesslider" /> + <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_shapesslider&#010;&#010;@return the value of m_shapesslider" /> </header> </codeaccessormethod> - <codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_tqshapesslider = value;" > + <codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_shapesslider = value;" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesslider&#010;&#010;" /> + <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_shapesslider&#010;&#010;" /> </header> </codeaccessormethod> </codeclassfield> @@ -37082,19 +37082,19 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="1760" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_tqshapesdocker;" > + <ccfdeclarationcodeblock parent_id="1760" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_shapesdocker;" > <header> <codecomment tag="" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_tqshapesdocker;" > + <codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_shapesdocker;" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesdocker&#010;&#010;@return the value of m_tqshapesdocker" /> + <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_shapesdocker&#010;&#010;@return the value of m_shapesdocker" /> </header> </codeaccessormethod> - <codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_tqshapesdocker = value;" > + <codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_shapesdocker = value;" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesdocker&#010;&#010;" /> + <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_shapesdocker&#010;&#010;" /> </header> </codeaccessormethod> </codeclassfield> diff --git a/chalk/doc/doc-outline b/chalk/doc/doc-outline index 081f9ed7..88722a45 100644 --- a/chalk/doc/doc-outline +++ b/chalk/doc/doc-outline @@ -85,7 +85,7 @@ The current outline (working towards 1.6): - [TODO] properties, usage, converting, ... - Commands - - General tqlayout + - General layout - Menus - Toolbars - Palettes @@ -142,7 +142,7 @@ Outline for the 1.5 manual (final as of 2006-05-31): - Available colorspaces - Commands ([TODO] make up-to-date) - - General tqlayout + - General layout - Menus - Toolbars - Palettes diff --git a/chalk/doc/selections b/chalk/doc/selections index 32bffe49..37d78702 100644 --- a/chalk/doc/selections +++ b/chalk/doc/selections @@ -117,7 +117,7 @@ discarded. If a transform is applied to a image, all layers are transformed. The selection is transformed, too: in the new situation, the layer that has a -selection active still has a selection, but the tqshape of the selection is +selection active still has a selection, but the shape of the selection is transformed. If a layer is moved, the selection moves with the layer (this is not diff --git a/chalk/doc/the preview widget b/chalk/doc/the preview widget index cc06b9de..a403da86 100644 --- a/chalk/doc/the preview widget +++ b/chalk/doc/the preview widget @@ -2,7 +2,7 @@ On Tuesday 21 June 2005 14:16, Casper Boemann wrote: > Hi > -> As you might have noticed I have changed the tqlayout of the preview, to lo= +> As you might have noticed I have changed the layout of the preview, to lo= ok > more like digikam. > diff --git a/chalk/plugins/filters/blur/kis_blur_filter.cc b/chalk/plugins/filters/blur/kis_blur_filter.cc index 0217b7e1..8d360497 100644 --- a/chalk/plugins/filters/blur/kis_blur_filter.cc +++ b/chalk/plugins/filters/blur/kis_blur_filter.cc @@ -72,7 +72,7 @@ KisFilterConfiguration* KisBlurFilter::configuration(TQWidget* w) config->setProperty("halfHeight", wCTA->widget()->intHalfWidth->value() ); config->setProperty("rotate", wCTA->widget()->intAngle->value() ); config->setProperty("strength", wCTA->widget()->intStrength->value() ); - config->setProperty("tqshape", wCTA->widget()->cbShape->currentItem()); + config->setProperty("shape", wCTA->widget()->cbShape->currentItem()); } return config; } @@ -87,7 +87,7 @@ void KisBlurFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte if(!config) config = new KisFilterConfiguration(id().id(), 1); TQVariant value; - int tqshape = (config->getProperty("tqshape", value)) ? value.toInt() : 0; + int shape = (config->getProperty("shape", value)) ? value.toInt() : 0; uint halfWidth = (config->getProperty("halfWidth", value)) ? value.toUInt() : 5; uint width = 2 * halfWidth + 1; uint halfHeight = (config->getProperty("halfHeight", value)) ? value.toUInt() : 5; @@ -100,7 +100,7 @@ void KisBlurFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte KisAutobrushShape* kas; kdDebug() << width << " " << height << " " << hFade << " " << vFade << endl; - switch(tqshape) + switch(shape) { case 1: kas = new KisAutobrushRectShape(width, height , hFade, vFade); diff --git a/chalk/plugins/filters/blur/kis_wdg_blur.cc b/chalk/plugins/filters/blur/kis_wdg_blur.cc index dc836971..b12e6b11 100644 --- a/chalk/plugins/filters/blur/kis_wdg_blur.cc +++ b/chalk/plugins/filters/blur/kis_wdg_blur.cc @@ -20,7 +20,7 @@ #include "kis_wdg_blur.h" -#include <tqlayout.h> +#include <layout.h> #include <tqtoolbutton.h> #include <kcombobox.h> @@ -55,7 +55,7 @@ KisWdgBlur::KisWdgBlur( KisFilter* nfilter, TQWidget * parent, const char * name void KisWdgBlur::setConfiguration(KisFilterConfiguration* config) { TQVariant value; - if (config->getProperty("tqshape", value)) + if (config->getProperty("shape", value)) { widget()->cbShape->setCurrentItem( value.toUInt() ); } diff --git a/chalk/plugins/filters/blur/wdgblur.ui b/chalk/plugins/filters/blur/wdgblur.ui index 3e381bbe..8cd89f63 100644 --- a/chalk/plugins/filters/blur/wdgblur.ui +++ b/chalk/plugins/filters/blur/wdgblur.ui @@ -32,7 +32,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -49,7 +49,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -58,7 +58,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <grid> <property name="name"> @@ -76,13 +76,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>16</width> <height>32767</height> diff --git a/chalk/plugins/filters/bumpmap/bumpmap.cc b/chalk/plugins/filters/bumpmap/bumpmap.cc index 4ae92469..38d31007 100644 --- a/chalk/plugins/filters/bumpmap/bumpmap.cc +++ b/chalk/plugins/filters/bumpmap/bumpmap.cc @@ -31,7 +31,7 @@ #include <vector> #include <tqpoint.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcombobox.h> #include <tqcheckbox.h> #include <tqbuttongroup.h> diff --git a/chalk/plugins/filters/bumpmap/wdgbumpmap.ui b/chalk/plugins/filters/bumpmap/wdgbumpmap.ui index 513912ea..2934623a 100644 --- a/chalk/plugins/filters/bumpmap/wdgbumpmap.ui +++ b/chalk/plugins/filters/bumpmap/wdgbumpmap.ui @@ -52,7 +52,7 @@ layer, the current layer will be used.</string> <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -66,7 +66,7 @@ layer, the current layer will be used.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -82,7 +82,7 @@ layer, the current layer will be used.</string> <property name="title"> <string>Settings</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignAuto</set> </property> <grid> diff --git a/chalk/plugins/filters/cimg/CImg.h b/chalk/plugins/filters/cimg/CImg.h index abd1bb66..23c7e221 100644 --- a/chalk/plugins/filters/cimg/CImg.h +++ b/chalk/plugins/filters/cimg/CImg.h @@ -3749,8 +3749,8 @@ namespace cimg_library { then this image is displayed in the current display window. \param list : The list of images to display. \param axe : The axe used to append the image for visualization. Can be 'x' (default),'y','z' or 'v'. - \param align : Defines the relative tqalignment of images when displaying images of different sizes. - Can be '\p c' (centered, which is the default), '\p p' (top tqalignment) and '\p n' (bottom aligment). + \param align : Defines the relative alignment of images when displaying images of different sizes. + Can be '\p c' (centered, which is the default), '\p p' (top alignment) and '\p n' (bottom aligment). \see CImg::get_append() **/ @@ -7772,7 +7772,7 @@ namespace cimg_library { //! Return a resized image. /** - \param src = Image giving the tqgeometry of the resize. + \param src = Image giving the geometry of the resize. \param interp = Resizing type : - 0 = no interpolation : additionnal space is filled with 0. - 1 = bloc interpolation (nearest point). @@ -7788,7 +7788,7 @@ namespace cimg_library { //! Return a resized image. /** - \param disp = Display giving the tqgeometry of the resize. + \param disp = Display giving the geometry of the resize. \param interp = Resizing type : - 0 = no interpolation : additionnal space is filled with 0. - 1 = bloc interpolation (nearest point). @@ -7830,7 +7830,7 @@ namespace cimg_library { //! Resize the image. /** - \param src = Image giving the tqgeometry of the resize. + \param src = Image giving the geometry of the resize. \param interp = Resizing type : - 0 = no interpolation : additionnal space is filled with 0. - 1 = bloc interpolation (nearest point). @@ -7846,7 +7846,7 @@ namespace cimg_library { //! Resize the image /** - \param disp = Display giving the tqgeometry of the resize. + \param disp = Display giving the geometry of the resize. \param interp = Resizing type : - 0 = no interpolation : additionnal space is filled with 0. - 1 = bloc interpolation (nearest point). @@ -12881,7 +12881,7 @@ namespace cimg_library { \param sharpness = define the contour preservation. \param anisotropy = define the smoothing anisotropy. \param alpha = image pre-blurring (gaussian). - \param sigma = regularity of the tensor-valued tqgeometry. + \param sigma = regularity of the tensor-valued geometry. \param dl = spatial discretization. \param da = angular discretization. \param gauss_prec = precision of the gaussian function. @@ -17550,7 +17550,7 @@ namespace cimg_library { //! Return a single image which is the concatenation of all images of the current CImgl instance. /** \param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'. - \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). + \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). \return A CImg<T> image corresponding to the concatenation is returned. **/ CImg<T> get_append(const char axe='x',const char align='c') const { @@ -17740,7 +17740,7 @@ namespace cimg_library { The function returns immediately. \param disp : reference to an existing CImgDisplay instance, where the current image list will be displayed. \param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'. - \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). + \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). \return A reference to the current CImgl instance is returned. **/ const CImgl& display(CImgDisplay& disp,const char axe='x',const char align='c') const { @@ -17755,7 +17755,7 @@ namespace cimg_library { The function returns when a key is pressed or the display window is closed by the user. \param title : specify the title of the opening display window. \param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'. - \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). + \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). \param min_size : specify the minimum size of the opening display window. Images having dimensions below this size will be upscaled. \param max_size : specify the maximum size of the opening display window. Images having dimensions above this @@ -17774,7 +17774,7 @@ namespace cimg_library { Images of the list are concatenated in a single temporarly image for visualization purposes. The function returns when a key is pressed or the display window is closed by the user. \param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'. - \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). + \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). \param min_size : specify the minimum size of the opening display window. Images having dimensions below this size will be upscaled. \param max_size : specify the maximum size of the opening display window. Images having dimensions above this diff --git a/chalk/plugins/filters/cimg/kis_cimg_filter.cc b/chalk/plugins/filters/cimg/kis_cimg_filter.cc index 665dfc09..9c3a7543 100644 --- a/chalk/plugins/filters/cimg/kis_cimg_filter.cc +++ b/chalk/plugins/filters/cimg/kis_cimg_filter.cc @@ -429,7 +429,7 @@ bool KisCImgFilter::prepare_inpaint() bool KisCImgFilter::prepare_resize() { - const char *geom = NULL; //cimg_option("-g",(const char*)NULL,"Output image tqgeometry"); + const char *geom = NULL; //cimg_option("-g",(const char*)NULL,"Output image geometry"); const bool anchor = true; //cimg_option("-anchor",true,"Anchor original pixels"); if (!geom) throw CImgArgumentException("You need to specify an output geomety (option -g)"); int w,h; get_geom(geom,w,h); @@ -445,7 +445,7 @@ bool KisCImgFilter::prepare_resize() bool KisCImgFilter::prepare_visuflow() { - const char *geom = "100%x100%"; //cimg_option("-g","100%x100%","Output tqgeometry"); + const char *geom = "100%x100%"; //cimg_option("-g","100%x100%","Output geometry"); //const char *file_i = (const char *)NULL; //cimg_option("-i",(const char*)NULL,"Input init image"); const bool normalize = false; //cimg_option("-norm",false,"Normalize input flow"); diff --git a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc index b65a435f..46df5cc6 100644 --- a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc +++ b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc @@ -19,7 +19,7 @@ * * Ported from the CImg Gimp plugin by Victor Stinner and David Tschumperlé. */ -#include "tqlayout.h" +#include "layout.h" #include "tqcheckbox.h" #include "tqpushbutton.h" diff --git a/chalk/plugins/filters/cimg/wdg_cimg.ui b/chalk/plugins/filters/cimg/wdg_cimg.ui index 397e52e6..09d4e323 100644 --- a/chalk/plugins/filters/cimg/wdg_cimg.ui +++ b/chalk/plugins/filters/cimg/wdg_cimg.ui @@ -42,7 +42,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> diff --git a/chalk/plugins/filters/colorify/KisWdgColorify.cpp b/chalk/plugins/filters/colorify/KisWdgColorify.cpp index 5b03ad70..75635c8c 100644 --- a/chalk/plugins/filters/colorify/KisWdgColorify.cpp +++ b/chalk/plugins/filters/colorify/KisWdgColorify.cpp @@ -21,7 +21,7 @@ #include "KisWdgColorify.h" #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqspinbox.h> #include <kcolorbutton.h> diff --git a/chalk/plugins/filters/colorify/WdgColorifyBase.ui b/chalk/plugins/filters/colorify/WdgColorifyBase.ui index ad1c062e..90337f22 100644 --- a/chalk/plugins/filters/colorify/WdgColorifyBase.ui +++ b/chalk/plugins/filters/colorify/WdgColorifyBase.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -38,7 +38,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -79,7 +79,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> diff --git a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc index 31b726bf..14d4c26d 100644 --- a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc +++ b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc @@ -21,7 +21,7 @@ #include "kis_wdg_color_to_alpha.h" #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqspinbox.h> #include <kcolorbutton.h> diff --git a/chalk/plugins/filters/colors/wdgcolortoalphabase.ui b/chalk/plugins/filters/colors/wdgcolortoalphabase.ui index 525b221c..70ff3071 100644 --- a/chalk/plugins/filters/colors/wdgcolortoalphabase.ui +++ b/chalk/plugins/filters/colors/wdgcolortoalphabase.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -38,7 +38,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> diff --git a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc index a97f809b..c0fcee28 100644 --- a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc +++ b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc @@ -23,7 +23,7 @@ #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpixmap.h> #include <tqpainter.h> #include <tqlabel.h> @@ -98,7 +98,7 @@ void KisBrightnessContrastFilterConfiguration::fromXML( const TQString& s ) } n = n.nextSibling(); } - // If the adjustment was cached, it now has changed - tqinvalidate it + // If the adjustment was cached, it now has changed - invalidate it delete m_adjustment; m_adjustment = 0; } diff --git a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc index 928baded..8b6aa949 100644 --- a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc +++ b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <tqpixmap.h> #include <tqpainter.h> #include <tqlabel.h> diff --git a/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui b/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui index 1e576f66..3382102c 100644 --- a/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui +++ b/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> @@ -50,13 +50,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>250</width> <height>20</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>250</width> <height>20</height> @@ -84,13 +84,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>254</width> <height>254</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>254</width> <height>254</height> @@ -116,13 +116,13 @@ <property name="name"> <cstring>kCurve</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>250</width> <height>250</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>250</width> <height>250</height> @@ -143,13 +143,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>250</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>20</width> <height>250</height> @@ -169,7 +169,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <grid> <property name="name"> @@ -193,7 +193,7 @@ <property name="text"> <string>Contrast</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -226,7 +226,7 @@ <property name="text"> <string>Brightness</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -253,7 +253,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>20</height> diff --git a/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui b/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui index 8d95814c..7f413abc 100644 --- a/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui +++ b/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -47,7 +47,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <grid> <property name="name"> @@ -65,13 +65,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>20</height> @@ -134,13 +134,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>20</width> <height>32767</height> diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui index 03c0e336..860595e2 100644 --- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui +++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -34,7 +34,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -69,7 +69,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -80,7 +80,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -115,7 +115,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>24</width> <height>20</height> @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -153,7 +153,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc index 2c1c87d9..3db7389c 100644 --- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc +++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc @@ -18,7 +18,7 @@ #include "kis_custom_convolution_filter_configuration_widget.h" -#include <tqlayout.h> +#include <layout.h> #include <tqspinbox.h> #include <klocale.h> diff --git a/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp b/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp index 49826ccb..c20001d3 100644 --- a/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp +++ b/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp @@ -20,7 +20,7 @@ #include "kis_wdg_fastcolortransfer.h" -#include <tqlayout.h> +#include <layout.h> #include <kurlrequester.h> diff --git a/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui b/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui index c14bd51a..97379cea 100644 --- a/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui +++ b/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -55,7 +55,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>101</height> diff --git a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp index b83baa11..b4d0487a 100644 --- a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp +++ b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp @@ -20,7 +20,7 @@ #include "kis_wdg_lens_correction.h" -#include <tqlayout.h> +#include <layout.h> #include <knuminput.h> diff --git a/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui b/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui index 6ee2631a..25705322 100644 --- a/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui +++ b/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>90</height> @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -118,7 +118,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -135,7 +135,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> diff --git a/chalk/plugins/filters/levelfilter/kgradientslider.cc b/chalk/plugins/filters/levelfilter/kgradientslider.cc index 7b836436..b36e5ce9 100644 --- a/chalk/plugins/filters/levelfilter/kgradientslider.cc +++ b/chalk/plugins/filters/levelfilter/kgradientslider.cc @@ -66,7 +66,7 @@ void KGradientSlider::paintEvent(TQPaintEvent *) /*if (!m_dragging) {*/ TQPixmap pm(size()); TQPainter p1; - p1.tqbegin(TQT_TQPAINTDEVICE(&pm), this); + p1.begin(TQT_TQPAINTDEVICE(&pm), this); pm.fill(); @@ -203,7 +203,7 @@ void KGradientSlider::mousePressEvent ( TQMouseEvent * e ) m_gamma = 1.0 / pow (10, tmp); break; } - tqrepaint(false); + repaint(false); } void KGradientSlider::mouseReleaseEvent ( TQMouseEvent * e ) @@ -212,7 +212,7 @@ void KGradientSlider::mouseReleaseEvent ( TQMouseEvent * e ) return; m_dragging = false; - tqrepaint(false); + repaint(false); switch (m_grab_cursor) { case BlackCursor: @@ -283,7 +283,7 @@ void KGradientSlider::mouseMoveEvent ( TQMouseEvent * e ) } } - tqrepaint(false); + repaint(false); } void KGradientSlider::leaveEvent( TQEvent * ) @@ -294,7 +294,7 @@ void KGradientSlider::leaveEvent( TQEvent * ) void KGradientSlider::enableGamma(bool b) { m_gammaEnabled = b; - tqrepaint(false); + repaint(false); } double KGradientSlider::getGamma(void) @@ -311,7 +311,7 @@ void KGradientSlider::modifyBlack(int v) { double tmp = log10 (1.0 / m_gamma); m_gammacursor = (unsigned int)tqRound(mid + delta * tmp); } - tqrepaint(false); + repaint(false); } } void KGradientSlider::modifyWhite(int v) { @@ -323,7 +323,7 @@ void KGradientSlider::modifyWhite(int v) { double tmp = log10 (1.0 / m_gamma); m_gammacursor = (unsigned int)tqRound(mid + delta * tmp); } - tqrepaint(false); + repaint(false); } } void KGradientSlider::modifyGamma(double v) { @@ -332,7 +332,7 @@ void KGradientSlider::modifyGamma(double v) { double mid = (double)m_blackcursor + delta; double tmp = log10 (1.0 / m_gamma); m_gammacursor = (unsigned int)tqRound(mid + delta * tmp); - tqrepaint(false); + repaint(false); } #include "kgradientslider.moc" diff --git a/chalk/plugins/filters/levelfilter/kis_level_filter.cc b/chalk/plugins/filters/levelfilter/kis_level_filter.cc index b7c1cb00..2dbf8a44 100644 --- a/chalk/plugins/filters/levelfilter/kis_level_filter.cc +++ b/chalk/plugins/filters/levelfilter/kis_level_filter.cc @@ -22,7 +22,7 @@ #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpixmap.h> #include <tqpainter.h> #include <tqlabel.h> diff --git a/chalk/plugins/filters/levelfilter/wdg_level.ui b/chalk/plugins/filters/levelfilter/wdg_level.ui index 841b78fb..f365e3d1 100644 --- a/chalk/plugins/filters/levelfilter/wdg_level.ui +++ b/chalk/plugins/filters/levelfilter/wdg_level.ui @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -60,7 +60,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> @@ -70,13 +70,13 @@ <property name="name"> <cstring>histview</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>256</width> <height>256</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>256</width> <height>256</height> @@ -88,7 +88,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -98,7 +98,7 @@ <property name="name"> <cstring>ingradient</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>256</width> <height>20</height> @@ -107,7 +107,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>25</width> <height>20</height> @@ -148,7 +148,7 @@ <property name="text"> <string>1.0</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -162,7 +162,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>25</width> <height>20</height> @@ -194,7 +194,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -204,7 +204,7 @@ <property name="name"> <cstring>outgradient</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>256</width> <height>20</height> @@ -213,7 +213,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -240,7 +240,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -274,7 +274,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -291,7 +291,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp b/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp index c13db952..8692a50f 100644 --- a/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp +++ b/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp @@ -20,7 +20,7 @@ #include "kis_wdg_noise.h" -#include <tqlayout.h> +#include <layout.h> #include <knuminput.h> diff --git a/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui b/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui index 3bafae01..2741e116 100644 --- a/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui +++ b/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -90,7 +90,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc index 81ee1448..72c0675b 100644 --- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc +++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc @@ -124,7 +124,7 @@ void KisRainDropsFilter::rainDrops(KisPaintDeviceSP src, KisPaintDeviceSP dst, c KisColorSpace * cs = src->colorSpace(); - TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) ); srand ((uint) dt.secsTo(Y2000)); diff --git a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp index ba157e14..9c8a44d8 100644 --- a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp +++ b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp @@ -20,7 +20,7 @@ #include "kis_wdg_random_pick.h" -#include <tqlayout.h> +#include <layout.h> #include <knuminput.h> diff --git a/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui b/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui index c9ce3acf..934d465f 100644 --- a/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui +++ b/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -98,7 +98,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> diff --git a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc index 627d105c..be233d70 100644 --- a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc +++ b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc @@ -20,7 +20,7 @@ #include "kis_wdg_unsharp.h" -#include <tqlayout.h> +#include <layout.h> #include <tqtoolbutton.h> #include <kcombobox.h> diff --git a/chalk/plugins/filters/unsharp/wdgunsharp.ui b/chalk/plugins/filters/unsharp/wdgunsharp.ui index faf74dd4..c2181eb8 100644 --- a/chalk/plugins/filters/unsharp/wdgunsharp.ui +++ b/chalk/plugins/filters/unsharp/wdgunsharp.ui @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -115,7 +115,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp b/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp index e7537c27..fb6c59c5 100644 --- a/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp +++ b/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp @@ -20,7 +20,7 @@ #include "kis_wdg_wave.h" -#include <tqlayout.h> +#include <layout.h> #include <kcombobox.h> #include <knuminput.h> @@ -63,7 +63,7 @@ void KisWdgWave::setConfiguration(KisFilterConfiguration* config) { widget()->intHAmplitude->setValue( value.toUInt() ); } - if (config->getProperty("horizontaltqshape", value)) + if (config->getProperty("horizontalshape", value)) { widget()->cbHShape->setCurrentItem( value.toUInt() ); } @@ -79,7 +79,7 @@ void KisWdgWave::setConfiguration(KisFilterConfiguration* config) { widget()->intVAmplitude->setValue( value.toUInt() ); } - if (config->getProperty("verticaltqshape", value)) + if (config->getProperty("verticalshape", value)) { widget()->cbVShape->setCurrentItem( value.toUInt() ); } diff --git a/chalk/plugins/filters/wavefilter/wavefilter.cc b/chalk/plugins/filters/wavefilter/wavefilter.cc index ddcfc4bd..a7a9264e 100644 --- a/chalk/plugins/filters/wavefilter/wavefilter.cc +++ b/chalk/plugins/filters/wavefilter/wavefilter.cc @@ -112,11 +112,11 @@ KisFilterConfiguration* KisFilterWave::configuration(TQWidget* w) config->setProperty("horizontalwavelength", wN->widget()->intHWavelength->value() ); config->setProperty("horizontalshift", wN->widget()->intHShift->value() ); config->setProperty("horizontalamplitude", wN->widget()->intHAmplitude->value() ); - config->setProperty("horizontaltqshape", wN->widget()->cbHShape->currentItem() ); + config->setProperty("horizontalshape", wN->widget()->cbHShape->currentItem() ); config->setProperty("verticalwavelength", wN->widget()->intVWavelength->value() ); config->setProperty("verticalshift", wN->widget()->intVShift->value() ); config->setProperty("verticalamplitude", wN->widget()->intVAmplitude->value() ); - config->setProperty("verticaltqshape", wN->widget()->cbVShape->currentItem() ); + config->setProperty("verticalshape", wN->widget()->cbVShape->currentItem() ); } return config; } @@ -137,19 +137,19 @@ void KisFilterWave::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte int horizontalwavelength = (config && config->getProperty("horizontalwavelength", value)) ? value.toInt() : 50; int horizontalshift = (config && config->getProperty("horizontalshift", value)) ? value.toInt() : 50; int horizontalamplitude = (config && config->getProperty("horizontalamplitude", value)) ? value.toInt() : 4; - int horizontaltqshape = (config && config->getProperty("horizontaltqshape", value)) ? value.toInt() : 0; + int horizontalshape = (config && config->getProperty("horizontalshape", value)) ? value.toInt() : 0; int verticalwavelength = (config && config->getProperty("verticalwavelength", value)) ? value.toInt() : 50; int verticalshift = (config && config->getProperty("verticalshift", value)) ? value.toInt() : 50; int verticalamplitude = (config && config->getProperty("verticalamplitude", value)) ? value.toInt() : 4; - int verticaltqshape = (config && config->getProperty("verticaltqshape", value)) ? value.toInt() : 0; + int verticalshape = (config && config->getProperty("verticalshape", value)) ? value.toInt() : 0; KisRectIteratorPixel dstIt = dst->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), true ); KisWaveCurve* verticalcurve; - if(verticaltqshape == 1) + if(verticalshape == 1) verticalcurve = new KisTriangleWaveCurve(verticalamplitude, verticalwavelength, verticalshift); else verticalcurve = new KisSinusoidalWaveCurve(verticalamplitude, verticalwavelength, verticalshift); KisWaveCurve* horizontalcurve; - if(horizontaltqshape == 1) + if(horizontalshape == 1) horizontalcurve = new KisTriangleWaveCurve(horizontalamplitude, horizontalwavelength, horizontalshift); else horizontalcurve = new KisSinusoidalWaveCurve(horizontalamplitude, horizontalwavelength, horizontalshift); diff --git a/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui b/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui index b8132262..e56f4760 100644 --- a/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui +++ b/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>60</width> <height>20</height> @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> diff --git a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc index c5f93864..7338ef54 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc @@ -59,18 +59,18 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info // // Most graphics apps -- especially the simple ones like Kolourpaint // and the previous version of this routine in Chalk took a brush -// tqshape -- often a simple ellipse -- and filled that tqshape with a +// shape -- often a simple ellipse -- and filled that shape with a // random 'spray' of single pixels. // // Other, more advanced graphics apps, like the Gimp or Photoshop, -// take the brush tqshape and paint just as with the brush paint op, +// take the brush shape and paint just as with the brush paint op, // only making the initial dab more transparent, and perhaps adding // extra transparence near the edges. Then, using a timer, when the // cursor stays in place, dab upon dab is positioned in the same // place, which makes the result less and less transparent. // // What I want to do here is create an airbrush that approaches a real -// one. It won't use brush tqshapes, instead going for the old-fashioned +// one. It won't use brush shapes, instead going for the old-fashioned // circle. Depending upon pressure, both the size of the dab and the // rate of paint deposition is determined. The edges of the dab are // more transparent than the center, with perhaps even some fully @@ -91,7 +91,7 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info KisPaintDeviceSP device = m_painter->device(); - // For now: use the current brush tqshape -- it beats calculating + // For now: use the current brush shape -- it beats calculating // ellipes and cones, and it shows the working of the timer. if (!device) return; diff --git a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc index 1ec16561..c794c76a 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc @@ -24,7 +24,7 @@ #include <tqrect.h> #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqtoolbutton.h> @@ -68,7 +68,7 @@ KisBrushOpSettings::KisBrushOpSettings(TQWidget *parent) m_darken = new TQCheckBox(i18n("Darken"), m_optionsWidget); m_curveControl = new WdgBrushCurveControl(m_optionsWidget); TQToolButton* moreButton = new TQToolButton(TQt::UpArrow, m_optionsWidget); - moreButton->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + moreButton->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); moreButton->setMinimumSize(TQSize(24,24)); // Bah, I had hoped the above line would make this unneeded connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustomCurves())); diff --git a/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui b/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui index 89207a50..e88ecbe3 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui +++ b/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui @@ -39,7 +39,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -83,7 +83,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -127,7 +127,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -183,7 +183,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc index c5f4e6eb..69542a6e 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc @@ -22,7 +22,7 @@ #include <tqrect.h> #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqtabwidget.h> @@ -77,7 +77,7 @@ KisSmudgeOpSettings::KisSmudgeOpSettings(TQWidget *parent, bool isTablet) m_curveControl->tabWidget->setTabToolTip(m_curveControl->tabWidget->page(2), i18n("Modifies the rate. Bottom is 0% of the rate top is 100% of the original rate.")); TQToolButton* moreButton = new TQToolButton(TQt::UpArrow, m_optionsWidget); - moreButton->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + moreButton->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); moreButton->setMinimumSize(TQSize(24,24)); // Bah, I had hoped the above line would make this unneeded connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustomCurves())); } else { diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc index 384e4e26..61e485a5 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc @@ -19,7 +19,7 @@ */ #include <tqevent.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwidget.h> #include <tqtimer.h> #include <tqpushbutton.h> diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc index 6aff68c8..c5c9d324 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc @@ -19,7 +19,7 @@ #include <string.h> #include <tqpoint.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqcombobox.h> #include <tqlistview.h> @@ -180,7 +180,7 @@ void KisToolColorPicker::buttonPress(KisButtonPressEvent *e) palette->add(ent); if (!palette->save()) { - KMessageBox::error(0, i18n("Cannot write to palette file %1. Maybe it is read-only.").tqarg(palette->filename()), i18n("Palette")); + KMessageBox::error(0, i18n("Cannot write to palette file %1. Maybe it is read-only.").arg(palette->filename()), i18n("Palette")); } } } @@ -197,7 +197,7 @@ void KisToolColorPicker::displayPickedColor() TQString channelValueText; if (m_normaliseValues) { - channelValueText = i18n("%1%").tqarg(m_pickedColor.colorSpace()->normalisedChannelValueText(m_pickedColor.data(), i)); + channelValueText = i18n("%1%").arg(m_pickedColor.colorSpace()->normalisedChannelValueText(m_pickedColor.data(), i)); } else { channelValueText = m_pickedColor.colorSpace()->channelValueText(m_pickedColor.data(), i); } diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc index f15bf778..4fcf642b 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc @@ -25,7 +25,7 @@ #include <klocale.h> #include <kcommand.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqcolor.h> diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc index 6df9f8da..0f0305e5 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc @@ -23,7 +23,7 @@ #include <tqpainter.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <kdebug.h> @@ -58,7 +58,7 @@ KisToolGradient::KisToolGradient() m_endPos = KisPoint(0, 0); m_reverse = false; - m_tqshape = KisGradientPainter::GradientShapeLinear; + m_shape = KisGradientPainter::GradientShapeLinear; m_repeat = KisGradientPainter::GradientRepeatNone; m_antiAliasThreshold = 0.2; } @@ -157,7 +157,7 @@ void KisToolGradient::buttonRelease(KisButtonReleaseEvent *e) progress->setSubject(&painter, true, true); } - bool painted = painter.paintGradient(m_startPos, m_endPos, m_tqshape, m_repeat, m_antiAliasThreshold, m_reverse, 0, 0, m_subject->currentImg()->width(), m_subject->currentImg()->height()); + bool painted = painter.paintGradient(m_startPos, m_endPos, m_shape, m_repeat, m_antiAliasThreshold, m_reverse, 0, 0, m_subject->currentImg()->width(), m_subject->currentImg()->height()); if (painted) { // does whole thing at moment @@ -237,7 +237,7 @@ TQWidget* KisToolGradient::createOptionWidget(TQWidget* parent) m_ckReverse = new TQCheckBox(i18n("Reverse"), widget, "reverse_check"); connect(m_ckReverse, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetReverse(bool))); - m_cmbShape = new TQComboBox(false, widget, "tqshape_combo"); + m_cmbShape = new TQComboBox(false, widget, "shape_combo"); connect(m_cmbShape, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetShape(int))); m_cmbShape->insertItem(i18n("Linear")); m_cmbShape->insertItem(i18n("Bi-Linear")); @@ -270,9 +270,9 @@ TQWidget* KisToolGradient::createOptionWidget(TQWidget* parent) return widget; } -void KisToolGradient::slotSetShape(int tqshape) +void KisToolGradient::slotSetShape(int shape) { - m_tqshape = static_cast<KisGradientPainter::enumGradientShape>(tqshape); + m_shape = static_cast<KisGradientPainter::enumGradientShape>(shape); } void KisToolGradient::slotSetRepeat(int repeat) diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.h b/chalk/plugins/tools/defaulttools/kis_tool_gradient.h index 29df8bf7..08ab06ab 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.h @@ -88,7 +88,7 @@ private: KisCanvasSubject *m_subject; - KisGradientPainter::enumGradientShape m_tqshape; + KisGradientPainter::enumGradientShape m_shape; KisGradientPainter::enumGradientRepeat m_repeat; bool m_reverse; diff --git a/chalk/plugins/tools/defaulttools/kis_tool_line.cc b/chalk/plugins/tools/defaulttools/kis_tool_line.cc index 243052cf..7b1df85b 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_line.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_line.cc @@ -21,7 +21,7 @@ */ #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwidget.h> #include <kdebug.h> diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.cc b/chalk/plugins/tools/defaulttools/kis_tool_text.cc index bf23b441..c624d30a 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_text.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_text.cc @@ -19,7 +19,7 @@ #include <tqfont.h> #include <tqrect.h> #include <tqimage.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwidget.h> #include <tqstring.h> #include <tqpixmap.h> @@ -156,7 +156,7 @@ void KisToolText::buttonRelease(KisButtonReleaseEvent *e) void KisToolText::setFont() { KFontDialog::getFont( m_font, false/*, TQWidget* parent! */ ); - m_lbFontName->setText(TQString(m_font.family() + ", %1").tqarg(m_font.pointSize())); + m_lbFontName->setText(TQString(m_font.family() + ", %1").arg(m_font.pointSize())); } TQWidget* KisToolText::createOptionWidget(TQWidget* parent) @@ -167,7 +167,7 @@ TQWidget* KisToolText::createOptionWidget(TQWidget* parent) TQHBox *fontBox = new TQHBox(widget); m_lbFontName = new KSqueezedTextLabel(TQString(m_font.family() + ", %1") - .tqarg(m_font.pointSize()), fontBox); + .arg(m_font.pointSize()), fontBox); m_btnMoreFonts = new TQPushButton("...", fontBox); connect(m_btnMoreFonts, TQT_SIGNAL(released()), this, TQT_SLOT(setFont())); diff --git a/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui b/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui index 7675b875..5463d3e3 100644 --- a/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui +++ b/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui @@ -47,13 +47,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>200</width> <height>32767</height> @@ -70,7 +70,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -101,7 +101,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc index 4a59c384..8f9eb202 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc @@ -20,7 +20,7 @@ #include <tqevent.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwidget.h> #include <tqrect.h> @@ -152,7 +152,7 @@ TQWidget* KisToolSelectBrush::createOptionWidget(TQWidget* parent) Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Selection Brush")); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h index faeb32d8..9fd07e6d 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h @@ -32,7 +32,7 @@ class KisSelectionOptions; /** * The selection brush creates a selection by painting with the current - * brush tqshape. Not sure what kind of an icon could represent this... + * brush shape. Not sure what kind of an icon could represent this... * Depends a bit on how we're going to visualize selections. */ class KisToolSelectBrush : public KisToolFreehand { diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc index cc164680..0dfe1e1c 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc @@ -21,7 +21,7 @@ */ #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqapplication.h> #include <tqcheckbox.h> @@ -189,7 +189,7 @@ TQWidget* KisToolSelectContiguous::createOptionWidget(TQWidget* parent) Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Contiguous Area Selection")); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); l->setSpacing( 6 ); connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc index d16ab740..cfce3704 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc @@ -21,7 +21,7 @@ #include <tqapplication.h> #include <tqpainter.h> #include <tqpen.h> -#include <tqlayout.h> +#include <layout.h> #include <kdebug.h> #include <kaction.h> @@ -203,12 +203,12 @@ void KisToolSelectElliptical::buttonRelease(KisButtonReleaseEvent *e) rc = rc.normalize(); KisSelectionSP tmpSel = new KisSelection(dev); - KisAutobrushCircleShape tqshape(rc.width(),rc.height(), 1, 1); + KisAutobrushCircleShape shape(rc.width(),rc.height(), 1, 1); TQ_UINT8 value; for (int y = 0; y <= rc.height(); y++) for (int x = 0; x <= rc.width(); x++) { - value = MAX_SELECTED - tqshape.valueAt(x,y); + value = MAX_SELECTED - shape.valueAt(x,y); tmpSel->setSelected( x+rc.x(), y+rc.y(), value); } switch(m_selectAction) @@ -305,7 +305,7 @@ TQWidget* KisToolSelectElliptical::createOptionWidget(TQWidget* parent) connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc index 118281e1..a6f52abc 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc @@ -20,7 +20,7 @@ #include <tqevent.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwidget.h> #include <kdebug.h> @@ -139,7 +139,7 @@ TQWidget* KisToolSelectEraser::createOptionWidget(TQWidget* parent) Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Selection Eraser")); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h index c796ec3c..cb8b82ed 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h @@ -30,7 +30,7 @@ class KisSelectionOptions; /** * The selection eraser makes a selection smaller by painting with the - * current eraser tqshape. Not sure what kind of an icon could represent + * current eraser shape. Not sure what kind of an icon could represent * this... Depends a bit on how we're going to visualize selections. */ class KisToolSelectEraser : public KisToolFreehand { diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc index 8bac379c..cf8bb81e 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc @@ -23,7 +23,7 @@ #include <tqpainter.h> #include <tqregion.h> #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <kaction.h> #include <kdebug.h> @@ -275,7 +275,7 @@ TQWidget* KisToolSelectOutline::createOptionWidget(TQWidget* parent) connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc index 85a53c94..f1a6436d 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc @@ -23,7 +23,7 @@ #include <tqpainter.h> #include <tqregion.h> #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <kaction.h> #include <kdebug.h> @@ -294,7 +294,7 @@ TQWidget* KisToolSelectPolygonal::createOptionWidget(TQWidget* parent) connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc index 54bfbdd6..f4e4743d 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc @@ -24,7 +24,7 @@ #include <tqapplication.h> #include <tqpainter.h> #include <tqpen.h> -#include <tqlayout.h> +#include <layout.h> #include <kdebug.h> #include <kaction.h> @@ -306,7 +306,7 @@ TQWidget* KisToolSelectRectangular::createOptionWidget(TQWidget* parent) connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc index 8f5c9e5f..37107508 100644 --- a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc +++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc @@ -500,7 +500,7 @@ void KisToolCrop::paintOutlineWithHandles(KisCanvasPainter& gc, const TQRect&) gc.drawLine(startx,endy + m_handleSize / 2 + 1, startx, controller->kiscanvas()->height()); gc.drawLine(endx,0,endx,starty - m_handleSize / 2); gc.drawLine(endx + m_handleSize / 2 + 1,starty, controller->kiscanvas()->width(), starty); - TQMemArray <TQRect> rects = m_handlesRegion.tqrects (); + TQMemArray <TQRect> rects = m_handlesRegion.rects (); for (TQMemArray <TQRect>::ConstIterator it = rects.begin (); it != rects.end (); ++it) { gc.fillRect (*it, TQt::black); diff --git a/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui b/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui index 8d3bf1d8..5cbcd476 100644 --- a/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui +++ b/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui @@ -27,7 +27,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -138,7 +138,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -185,7 +185,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc index e18b096c..69e7953e 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc @@ -21,7 +21,7 @@ #include <math.h> #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqrect.h> #include <kaction.h> diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc index 663e1324..9d47647d 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc @@ -20,7 +20,7 @@ #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqrect.h> #include <tqlabel.h> #include <tqpushbutton.h> diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h index c2a3715b..582c89cd 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h @@ -57,7 +57,7 @@ public: t->setup(ac); return t; } - virtual KisID id() { return KisID("beziertqshape", i18n("Bezier Painting Tool")); } + virtual KisID id() { return KisID("beziershape", i18n("Bezier Painting Tool")); } }; #endif //__KIS_TOOL_CURVE_PAINT_H_ diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc index ed1200d4..2a8d1047 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc @@ -20,7 +20,7 @@ #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqrect.h> #include <tqlabel.h> #include <tqpushbutton.h> diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc index d4a8605d..463ef641 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc @@ -23,7 +23,7 @@ #include <tqapplication.h> #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqrect.h> #include <kaction.h> @@ -576,7 +576,7 @@ TQWidget* KisToolCurve::createSelectionOptionWidget(TQWidget* parent) connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; diff --git a/chalk/plugins/tools/tool_curves/kis_tool_example.cc b/chalk/plugins/tools/tool_curves/kis_tool_example.cc index e14abcb5..b759c8f6 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_example.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_example.cc @@ -20,7 +20,7 @@ #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqrect.h> #include <kaction.h> diff --git a/chalk/plugins/tools/tool_curves/kis_tool_example.h b/chalk/plugins/tools/tool_curves/kis_tool_example.h index e7bfd89e..ad77204e 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_example.h +++ b/chalk/plugins/tools/tool_curves/kis_tool_example.h @@ -60,7 +60,7 @@ public: t->setup(ac); return t; } - virtual KisID id() { return KisID("exampletqshape", i18n("Example Tool")); } + virtual KisID id() { return KisID("exampleshape", i18n("Example Tool")); } }; diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc index 42806771..b8d221ea 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc @@ -22,7 +22,7 @@ #include <set> #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqrect.h> #include <tqlabel.h> #include <tqpushbutton.h> @@ -762,7 +762,7 @@ void KisToolMagnetic::slotSetDistance (int dist) TQWidget* KisToolMagnetic::createOptionWidget(TQWidget* parent) { m_optWidget = super::createOptionWidget(parent); - TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout()); TQGridLayout *box = new TQGridLayout(l, 2, 2, 3); box->setColStretch(0, 1); box->setColStretch(1, 1); diff --git a/chalk/plugins/tools/tool_curves/wdg_tool_example.ui b/chalk/plugins/tools/tool_curves/wdg_tool_example.ui index 035eff3b..1384ff58 100644 --- a/chalk/plugins/tools/tool_curves/wdg_tool_example.ui +++ b/chalk/plugins/tools/tool_curves/wdg_tool_example.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -59,7 +59,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc index e53c96da..a23de04b 100644 --- a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc +++ b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc @@ -21,7 +21,7 @@ #include <tqbitmap.h> #include <tqpainter.h> #include <tqcombobox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <kaction.h> diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc index ae07e589..54dd393d 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc +++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc @@ -23,7 +23,7 @@ #include <tqpainter.h> #include <tqregion.h> #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <kaction.h> #include <kdebug.h> diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc index 700efa4b..74274cdd 100644 --- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc +++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc @@ -19,7 +19,7 @@ */ #include <tqpoint.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqlabel.h> #include <tqcombobox.h> diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.cc b/chalk/plugins/tools/tool_star/kis_tool_star.cc index 037f6bb5..53743ae1 100644 --- a/chalk/plugins/tools/tool_star/kis_tool_star.cc +++ b/chalk/plugins/tools/tool_star/kis_tool_star.cc @@ -23,7 +23,7 @@ #include <tqpainter.h> #include <tqspinbox.h> -#include <tqlayout.h> +#include <layout.h> #include <kaction.h> #include <kdebug.h> diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.h b/chalk/plugins/tools/tool_star/kis_tool_star.h index 947dae25..8128dcdf 100644 --- a/chalk/plugins/tools/tool_star/kis_tool_star.h +++ b/chalk/plugins/tools/tool_star/kis_tool_star.h @@ -94,7 +94,7 @@ public: t->setup(ac); return t; } - virtual KisID id() { return KisID("startqshape", i18n("Star Tool")); } + virtual KisID id() { return KisID("starshape", i18n("Star Tool")); } }; diff --git a/chalk/plugins/tools/tool_star/wdg_tool_star.ui b/chalk/plugins/tools/tool_star/wdg_tool_star.ui index 3f4f30f5..a6395037 100644 --- a/chalk/plugins/tools/tool_star/wdg_tool_star.ui +++ b/chalk/plugins/tools/tool_star/wdg_tool_star.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -59,7 +59,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui b/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui index 2cf6806e..5375d564 100644 --- a/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui +++ b/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui @@ -27,7 +27,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -35,7 +35,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> @@ -43,7 +43,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -72,7 +72,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -103,7 +103,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -111,7 +111,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -140,7 +140,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -178,7 +178,7 @@ <property name="text"> <string>Filter:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -197,7 +197,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc index 1d2c4d61..552e4c40 100644 --- a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc +++ b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc @@ -187,7 +187,7 @@ DlgColorRange::DlgColorRange( KisView * view, KisPaintDeviceSP dev, TQWidget * setCaption(i18n("Color Range")); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); if (m_dev->image()->undo()) m_transaction = new KisSelectedTransaction(i18n("Select by Color Range"), m_dev); diff --git a/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui b/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui index 67c6028b..876f0319 100644 --- a/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui +++ b/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -37,7 +37,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -144,7 +144,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -233,7 +233,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc index 0498505d..00c0c820 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc +++ b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc @@ -91,7 +91,7 @@ void ColorSpaceConversion::slotImgColorSpaceConversion() if (KMessageBox::warningContinueCancel(m_view, i18n("This conversion will convert your %1 image through 16-bit L*a*b* and back.\n" "Watercolor and openEXR colorspaces will even be converted through 8-bit RGB.\n") - .tqarg(image->colorSpace()->id().name()), + .arg(image->colorSpace()->id().name()), i18n("Colorspace Conversion"), KGuiItem(i18n("Continue")), "lab16degradation") != KMessageBox::Continue) return; @@ -128,7 +128,7 @@ void ColorSpaceConversion::slotLayerColorSpaceConversion() if (KMessageBox::warningContinueCancel(m_view, i18n("This conversion will convert your %1 layer through 16-bit L*a*b* and back.\n" "Watercolor and openEXR colorspaces will even be converted through 8-bit RGB.\n") - .tqarg(dev->colorSpace()->id().name()), + .arg(dev->colorSpace()->id().name()), i18n("Colorspace Conversion"), KGuiItem(i18n("Continue")), "lab16degradation") != KMessageBox::Continue) return; diff --git a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc index 6f9af1c6..31163eb7 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc +++ b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc @@ -47,7 +47,7 @@ DlgColorSpaceConversion::DlgColorSpaceConversion( TQWidget * parent, Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); m_page->cmbColorSpaces->setIDList(KisMetaRegistry::instance()->csRegistry()->listKeys()); diff --git a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc index fedb1fd1..ddb47f47 100644 --- a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc +++ b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc @@ -46,7 +46,7 @@ DlgDropshadow::DlgDropshadow( const TQString & /*imageCS*/, m_page = new WdgDropshadow(this, "dropshadow"); Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); KConfig * cfg = KGlobal::config(); m_page->xOffsetSpinBox->setValue( cfg->readNumEntry("dropshadow_x", 8) ); diff --git a/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui b/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui index 69aae624..2354cfbc 100644 --- a/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui +++ b/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui @@ -116,7 +116,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>200</width> <height>20</height> @@ -144,7 +144,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>200</width> <height>20</height> @@ -169,7 +169,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>190</width> <height>20</height> @@ -194,7 +194,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>120</width> <height>31</height> diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc index 60313cb2..f130a46b 100644 --- a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc +++ b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc @@ -22,7 +22,7 @@ #include "kis_dlg_filtersgallery.h" #include <tqgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqdatetime.h> @@ -56,7 +56,7 @@ KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* parent,const connect(m_widget->filtersList , TQT_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQT_SLOT(selectionHasChanged(TQIconViewItem* ))); // Initialize configWidgetHolder m_widget->configWidgetHolder->setColumnLayout ( 0, Qt::Horizontal ); - //m_widget->configWidgetHolder->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum); + //m_widget->configWidgetHolder->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum); // Initialize preview widget if (m_view->canvasSubject()->currentImg() && m_view->canvasSubject()->currentImg()->activeDevice()) @@ -64,10 +64,10 @@ KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* parent,const m_widget->previewWidget->slotSetDevice( m_view->canvasSubject()->currentImg()->activeDevice().data() ); } connect( m_widget->previewWidget, TQT_SIGNAL(updated()), this, TQT_SLOT(refreshPreview())); - resize( tqminimumSizeHint()); - m_widget->previewWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding); + resize( minimumSizeHint()); + m_widget->previewWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding); m_labelNoCW = new TQLabel(i18n("No configuration options are available for this filter."), m_widget->configWidgetHolder); - m_widget->configWidgetHolder->tqlayout()->add(m_labelNoCW); + m_widget->configWidgetHolder->layout()->add(m_labelNoCW); m_labelNoCW->hide(); } @@ -81,7 +81,7 @@ void KisDlgFiltersGallery::selectionHasChanged ( TQIconViewItem * item ) m_currentFilter = kisitem->filter(); if(m_currentConfigWidget != 0) { - m_widget->configWidgetHolder->tqlayout()->remove(m_currentConfigWidget); + m_widget->configWidgetHolder->layout()->remove(m_currentConfigWidget); delete m_currentConfigWidget; m_currentConfigWidget = 0; } else { @@ -94,8 +94,8 @@ void KisDlgFiltersGallery::selectionHasChanged ( TQIconViewItem * item ) m_currentConfigWidget = m_currentFilter->createConfigurationWidget(m_widget->configWidgetHolder, activeLayer->paintDevice()); if(m_currentConfigWidget != 0) { - //m_currentConfigWidget->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); - m_widget->configWidgetHolder->tqlayout()->add(m_currentConfigWidget); + //m_currentConfigWidget->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_widget->configWidgetHolder->layout()->add(m_currentConfigWidget); m_currentConfigWidget->show(); connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged())); } diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui b/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui index 4b812770..03972a16 100644 --- a/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui +++ b/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui @@ -49,7 +49,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> diff --git a/chalk/plugins/viewplugins/histogram/dlg_histogram.cc b/chalk/plugins/viewplugins/histogram/dlg_histogram.cc index 90acf130..0ceb3dd4 100644 --- a/chalk/plugins/viewplugins/histogram/dlg_histogram.cc +++ b/chalk/plugins/viewplugins/histogram/dlg_histogram.cc @@ -47,7 +47,7 @@ DlgHistogram::DlgHistogram( TQWidget * parent, const char * name) setCaption(i18n("Histogram")); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); } DlgHistogram::~DlgHistogram() diff --git a/chalk/plugins/viewplugins/histogram/wdghistogram.ui b/chalk/plugins/viewplugins/histogram/wdghistogram.ui index 320b7d7a..be6f9552 100644 --- a/chalk/plugins/viewplugins/histogram/wdghistogram.ui +++ b/chalk/plugins/viewplugins/histogram/wdghistogram.ui @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -75,7 +75,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -124,7 +124,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>256</width> <height>150</height> @@ -133,7 +133,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc index 8a656752..6ee07f30 100644 --- a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc +++ b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc @@ -58,7 +58,7 @@ DlgImageSize::DlgImageSize( TQWidget * parent, m_page->cmbFilterType->setCurrentText("Mitchell"); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); unblockAll(); diff --git a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc index 6d24d60a..d084060b 100644 --- a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc +++ b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc @@ -59,7 +59,7 @@ DlgLayerSize::DlgLayerSize( TQWidget * parent, m_page->cmbFilterType->setCurrentText("Mitchell"); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); unblockAll(); diff --git a/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui b/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui index 1686fe97..8e8ca43d 100644 --- a/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui +++ b/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui @@ -51,7 +51,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>65</width> <height>20</height> @@ -68,7 +68,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>65</width> <height>20</height> @@ -123,7 +123,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>20</height> @@ -197,7 +197,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -214,7 +214,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -307,7 +307,7 @@ <property name="text"> <string>Filter:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> diff --git a/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui b/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui index 13cd72a8..b9b3e400 100644 --- a/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui +++ b/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui @@ -76,7 +76,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -93,7 +93,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui b/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui index d3a8326a..72a70c8a 100644 --- a/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui +++ b/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui @@ -96,7 +96,7 @@ <property name="text"> <string>100</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc index bb21f6f7..300161a8 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc +++ b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc @@ -45,7 +45,7 @@ DlgBorderSelection::DlgBorderSelection( TQWidget * parent, const char * name) : Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); } diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc index 5e327aa8..566dabc4 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc +++ b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc @@ -45,7 +45,7 @@ DlgGrowSelection::DlgGrowSelection( TQWidget * parent, const char * name) : sup Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); } diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc index b69b998f..5b4c8747 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc +++ b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc @@ -45,7 +45,7 @@ DlgShrinkSelection::DlgShrinkSelection( TQWidget * parent, const char * name) : Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); } diff --git a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc index dafb6669..e4a3386d 100644 --- a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc +++ b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc @@ -49,7 +49,7 @@ DlgPerfTest::DlgPerfTest( TQWidget * parent, Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); diff --git a/chalk/plugins/viewplugins/performancetest/perftest.cc b/chalk/plugins/viewplugins/performancetest/perftest.cc index 8a137374..5b65a9e4 100644 --- a/chalk/plugins/viewplugins/performancetest/perftest.cc +++ b/chalk/plugins/viewplugins/performancetest/perftest.cc @@ -27,7 +27,7 @@ #include <tqradiobutton.h> #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqdatetime.h> #include <klocale.h> @@ -140,7 +140,7 @@ void PerfTest::slotPerfTest() } if (dlgPerfTest->page()->chkShape->isChecked()) { kdDebug() << "Shapetest\n"; - TQString s = tqshapeTest(testCount); + TQString s = shapeTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } @@ -293,10 +293,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op, p.end(); report = report.append(TQString(" %1 blits of rectangles < tilesize with opacity %2 and composite op %3: %4ms\n") - .tqarg(testCount) - .tqarg(opacity) - .tqarg(op.id().name()) - .tqarg(t.elapsed())); + .arg(testCount) + .arg(opacity) + .arg(op.id().name()) + .arg(t.elapsed())); // ------------------------------------------------------------------------------ @@ -316,10 +316,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op, p.end(); report = report.append(TQString(" %1 blits of rectangles 3 * tilesize with opacity %2 and composite op %3: %4ms\n") - .tqarg(testCount) - .tqarg(opacity) - .tqarg(op.id().name()) - .tqarg(t.elapsed())); + .arg(testCount) + .arg(opacity) + .arg(op.id().name()) + .arg(t.elapsed())); // ------------------------------------------------------------------------------ @@ -339,10 +339,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op, } p.end(); report = report.append(TQString(" %1 blits of rectangles 800 x 800 with opacity %2 and composite op %3: %4ms\n") - .tqarg(testCount) - .tqarg(opacity) - .tqarg(op.id().name()) - .tqarg(t.elapsed())); + .arg(testCount) + .arg(opacity) + .arg(op.id().name()) + .arg(t.elapsed())); // ------------------------------------------------------------------------------ @@ -362,10 +362,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op, } p.end(); report = report.append(TQString(" %1 blits of rectangles 500 x 500 at 600,600 with opacity %2 and composite op %3: %4ms\n") - .tqarg(testCount) - .tqarg(opacity) - .tqarg(op.id().name()) - .tqarg(t.elapsed())); + .arg(testCount) + .arg(opacity) + .arg(op.id().name()) + .arg(t.elapsed())); // ------------------------------------------------------------------------------ // Small with varied source opacity @@ -387,10 +387,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op, p.end(); report = report.append(TQString(" %1 blits of rectangles < tilesize with source alpha, with opacity %2 and composite op %3: %4ms\n") - .tqarg(testCount) - .tqarg(opacity) - .tqarg(op.id().name()) - .tqarg(t.elapsed())); + .arg(testCount) + .arg(opacity) + .arg(op.id().name()) + .arg(t.elapsed())); return report; @@ -418,21 +418,21 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount) for (TQ_UINT32 i = 0; i < testCount; ++i) { p.eraseRect(0, 0, 1000, 1000); } - report = report.append(TQString(" Erased 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" Erased 1000 x 1000 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); t.restart(); for (TQ_UINT32 i = 0; i < testCount; ++i) { p.eraseRect(50, 50, 500, 500); } - report = report.append(TQString(" Erased 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" Erased 500 x 500 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); t.restart(); for (TQ_UINT32 i = 0; i < testCount; ++i) { p.eraseRect(-50, -50, 1100, 1100); } - report = report.append(TQString(" Erased rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" Erased rect bigger than layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); // Opaque Rect fill @@ -440,21 +440,21 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount) for (TQ_UINT32 i = 0; i < testCount; ++i) { p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); } - report = report.append(TQString(" Opaque fill 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" Opaque fill 1000 x 1000 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); t.restart(); for (TQ_UINT32 i = 0; i < testCount; ++i) { p.fillRect(50, 50, 500, 500, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); } - report = report.append(TQString(" Opaque fill 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" Opaque fill 500 x 500 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); t.restart(); for (TQ_UINT32 i = 0; i < testCount; ++i) { p.fillRect(-50, -50, 1100, 1100, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); } - report = report.append(TQString(" Opaque fill rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" Opaque fill rect bigger than layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); // Transparent rect fill @@ -462,21 +462,21 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount) for (TQ_UINT32 i = 0; i < testCount; ++i) { p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); } - report = report.append(TQString(" Opaque fill 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" Opaque fill 1000 x 1000 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); t.restart(); for (TQ_UINT32 i = 0; i < testCount; ++i) { p.fillRect(50, 50, 500, 500, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); } - report = report.append(TQString(" Opaque fill 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" Opaque fill 500 x 500 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); t.restart(); for (TQ_UINT32 i = 0; i < testCount; ++i) { p.fillRect(-50, -50, 1100, 1100, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); } - report = report.append(TQString(" Opaque fill rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" Opaque fill rect bigger than layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); // Colour fill @@ -489,7 +489,7 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount) p.setCompositeOp(COMPOSITE_OVER); p.fillColor(0,0); } - report = report.append(TQString(" Opaque floodfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" Opaque floodfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").arg(testCount).arg(t.elapsed())); // Pattern fill @@ -505,7 +505,7 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount) p.setCompositeOp(COMPOSITE_OVER); p.fillPattern(0,0); } - report = report.append(TQString(" Opaque patternfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" Opaque patternfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").arg(testCount).arg(t.elapsed())); @@ -549,7 +549,7 @@ TQString PerfTest::pixelTest(TQ_UINT32 testCount) } } } - report = report.append(TQString(" read 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" read 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); c= TQt::black; t.restart(); @@ -560,7 +560,7 @@ TQString PerfTest::pixelTest(TQ_UINT32 testCount) } } } - report = report.append(TQString(" written 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" written 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); } @@ -571,7 +571,7 @@ TQString PerfTest::pixelTest(TQ_UINT32 testCount) } -TQString PerfTest::tqshapeTest(TQ_UINT32 testCount) +TQString PerfTest::shapeTest(TQ_UINT32 testCount) { return TQString("Shape test\n"); } @@ -606,7 +606,7 @@ TQString PerfTest::rotateTest(TQ_UINT32 testCount) delete img; } } - report = report.append(TQString(" rotated 1000 x 1000 pixels over 360 degrees, degree by degree, %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" rotated 1000 x 1000 pixels over 360 degrees, degree by degree, %1 times: %2\n").arg(testCount).arg(t.elapsed())); } return report; } @@ -643,7 +643,7 @@ TQString PerfTest::colorConversionTest(TQ_UINT32 testCount) img2->convertTo(KisMetaRegistry::instance()->csRegistry()->getColorSpace(*it2,"")); delete img2; } - report = report.append(TQString(" converted from " + (*it).name() + " to " + (*it2).name() + " 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" converted from " + (*it).name() + " to " + (*it2).name() + " 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); } @@ -681,7 +681,7 @@ TQString PerfTest::filterTest(TQ_UINT32 testCount) f->process(l.data(), l.data(), f->configuration(f->createConfigurationWidget(m_view, l.data())), TQRect(0, 0, 1000, 1000)); f->disableProgress(); } - report = report.append(TQString(" filtered " + (*it).name() + "1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" filtered " + (*it).name() + "1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); } @@ -709,7 +709,7 @@ TQString PerfTest::readBytesTest(TQ_UINT32 testCount) delete[] newData; } - report = report.append(TQString(" read 1000 x 1000 pixels %1 times from empty image: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" read 1000 x 1000 pixels %1 times from empty image: %2\n").arg(testCount).arg(t.elapsed())); // On tiles with data @@ -726,7 +726,7 @@ TQString PerfTest::readBytesTest(TQ_UINT32 testCount) delete[] newData; } - report = report.append(TQString(" read 1000 x 1000 pixels %1 times from filled image: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" read 1000 x 1000 pixels %1 times from filled image: %2\n").arg(testCount).arg(t.elapsed())); return report; } @@ -755,7 +755,7 @@ TQString PerfTest::writeBytesTest(TQ_UINT32 testCount) l->writeBytes(data, 0, 0, 1000, 1000); } delete[] data; - report = report.append(TQString(" written 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" written 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); return report; @@ -788,7 +788,7 @@ TQString hlineRODefault(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" hline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); + return TQString(" hline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); } @@ -820,7 +820,7 @@ TQString hlineRO(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" hline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); + return TQString(" hline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); } @@ -847,7 +847,7 @@ TQString hlineWRDefault(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" hline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); + return TQString(" hline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); } @@ -878,7 +878,7 @@ TQString hlineWR(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" hline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); + return TQString(" hline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); } @@ -903,7 +903,7 @@ TQString vlineRODefault(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" vline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); + return TQString(" vline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); } @@ -932,7 +932,7 @@ TQString vlineRO(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" vline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); + return TQString(" vline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); } @@ -957,7 +957,7 @@ TQString vlineWRDefault(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" vline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); + return TQString(" vline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); } TQString vlineWR(KisDoc * doc, TQ_UINT32 testCount) @@ -985,7 +985,7 @@ TQString vlineWR(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" vline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); + return TQString(" vline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); } @@ -1005,7 +1005,7 @@ TQString rectRODefault(KisDoc * doc, TQ_UINT32 testCount) } } - return TQString(" rect iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); + return TQString(" rect iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); } @@ -1030,7 +1030,7 @@ TQString rectRO(KisDoc * doc, TQ_UINT32 testCount) } } - return TQString(" rect iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); + return TQString(" rect iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); } @@ -1052,7 +1052,7 @@ TQString rectWRDefault(KisDoc * doc, TQ_UINT32 testCount) } } - return TQString(" rect iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); + return TQString(" rect iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); } @@ -1079,7 +1079,7 @@ TQString rectWR(KisDoc * doc, TQ_UINT32 testCount) } - return TQString(" rect iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); + return TQString(" rect iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); } @@ -1140,7 +1140,7 @@ TQString PerfTest::paintViewTest(TQ_UINT32 testCount) CALLGRIND_DUMP_STATS(); #endif - report = report.append(TQString(" painted a 512 x 512 image %1 times: %2 ms\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" painted a 512 x 512 image %1 times: %2 ms\n").arg(testCount).arg(t.elapsed())); img->newLayer("layer 2", OPACITY_OPAQUE); l = img->activeDevice(); @@ -1162,7 +1162,7 @@ TQString PerfTest::paintViewTest(TQ_UINT32 testCount) m_view->getCanvasController()->updateCanvas(TQRect(0, 0, 512, 512)); } - report = report.append(TQString(" painted a 512 x 512 image with 3 layers %1 times: %2 ms\n").tqarg(testCount).tqarg(t.elapsed())); + report = report.append(TQString(" painted a 512 x 512 image with 3 layers %1 times: %2 ms\n").arg(testCount).arg(t.elapsed())); return report; } @@ -1190,7 +1190,7 @@ TQString PerfTest::paintViewFPSTest() CALLGRIND_DUMP_STATS(); #endif - report = report.append(TQString(" painted current view at %1 frames per second\n").tqarg(numViewsPainted)); + report = report.append(TQString(" painted current view at %1 frames per second\n").arg(numViewsPainted)); return report; } diff --git a/chalk/plugins/viewplugins/performancetest/perftest.h b/chalk/plugins/viewplugins/performancetest/perftest.h index cbd8799f..959233e4 100644 --- a/chalk/plugins/viewplugins/performancetest/perftest.h +++ b/chalk/plugins/viewplugins/performancetest/perftest.h @@ -46,7 +46,7 @@ private: TQString fillTest(TQ_UINT32 testCount); TQString gradientTest(TQ_UINT32 testCount); TQString pixelTest(TQ_UINT32 testCount); - TQString tqshapeTest(TQ_UINT32 testCount); + TQString shapeTest(TQ_UINT32 testCount); TQString layerTest(TQ_UINT32 testCount); TQString scaleTest(TQ_UINT32 testCount); TQString rotateTest(TQ_UINT32 testCount); diff --git a/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui b/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui index 20f66825..b019e9e1 100644 --- a/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui +++ b/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui @@ -233,7 +233,7 @@ </widget> <widget class="TQLayoutWidget" row="18" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc index 03bd6b52..9440a8fe 100644 --- a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc +++ b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc @@ -49,7 +49,7 @@ DlgRotateImage::DlgRotateImage( TQWidget * parent, Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); diff --git a/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui b/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui index 884776f1..af18881a 100644 --- a/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui +++ b/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -48,7 +48,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -65,7 +65,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -79,7 +79,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -96,7 +96,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> @@ -177,7 +177,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -219,7 +219,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>91</height> diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp index 6e942c38..585290ae 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp @@ -25,7 +25,7 @@ #include <tqbitmap.h> #include <tqdragobject.h> #include <tqimage.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqvbox.h> #include <kaccel.h> @@ -153,7 +153,7 @@ bool KSnapshot::save( const KURL& url ) TQString caption = i18n("Unable to Save Image"); TQString text = i18n("KSnapshot was unable to save the image to\n%1.") - .tqarg(url.prettyURL()); + .arg(url.prettyURL()); KMessageBox::error(this, text, caption); } @@ -162,7 +162,7 @@ bool KSnapshot::save( const KURL& url ) void KSnapshot::slotCopy() { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setPixmap( snapshot ); } @@ -320,16 +320,16 @@ Window findRealWindow( Window w, int depth = 0 ) return w; } Window root, parent; - Window* tqchildren; - unsigned int ntqchildren; + Window* children; + unsigned int nchildren; Window ret = None; - if( XQueryTree( qt_xdisplay(), w, &root, &parent, &tqchildren, &ntqchildren ) != 0 ) { + if( XQueryTree( qt_xdisplay(), w, &root, &parent, &children, &nchildren ) != 0 ) { for( unsigned int i = 0; - i < ntqchildren && ret == None; + i < nchildren && ret == None; ++i ) - ret = findRealWindow( tqchildren[ i ], depth + 1 ); - if( tqchildren != NULL ) - XFree( tqchildren ); + ret = findRealWindow( children[ i ], depth + 1 ); + if( children != NULL ) + XFree( children ); } return ret; } @@ -365,12 +365,12 @@ void KSnapshot::performGrab() h += 2 * border; Window parent; - Window* tqchildren; - unsigned int ntqchildren; + Window* children; + unsigned int nchildren; if( XQueryTree( qt_xdisplay(), child, &root, &parent, - &tqchildren, &ntqchildren ) != 0 ) { - if( tqchildren != NULL ) - XFree( tqchildren ); + &children, &nchildren ) != 0 ) { + if( children != NULL ) + XFree( children ); int newx, newy; Window dummy; if( XTranslateCoordinates( qt_xdisplay(), parent, qt_xrootwin(), @@ -390,7 +390,7 @@ void KSnapshot::performGrab() int count, order; XRectangle* rects = XShapeGetRectangles( qt_xdisplay(), child, ShapeBounding, &count, &order); - //The ShapeBounding region is the outermost tqshape of the window; + //The ShapeBounding region is the outermost shape of the window; //ShapeBounding - ShapeClipping is defined to be the border. //Since the border area is part of the window, we use bounding // to limit our work region diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.h b/chalk/plugins/viewplugins/screenshot/ksnapshot.h index eb8fa60a..5c0951a8 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.h +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.h @@ -44,7 +44,7 @@ public: KSnapshotThumb(TQWidget *parent, const char *name = 0) : TQLabel(parent, name) { - tqsetAlignment(AlignHCenter | AlignVCenter); + setAlignment(AlignHCenter | AlignVCenter); } virtual ~KSnapshotThumb() {} diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui b/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui index 34643902..65ae3c99 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui +++ b/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui @@ -23,7 +23,7 @@ <property name="name"> <cstring>lblImage</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>130</height> @@ -76,7 +76,7 @@ The image can be dragged to another application or document to copy the full scr <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> @@ -167,7 +167,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>156</width> <height>16</height> @@ -225,7 +225,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp index ec5ba7cc..d7b7729d 100644 --- a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp +++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp @@ -21,7 +21,7 @@ #include "regiongrabber.h" #include <tqpainter.h> -#include <tqpalette.h> +#include <palette.h> #include <tqstyle.h> #include <tqtimer.h> #include <tqtooltip.h> @@ -41,8 +41,8 @@ SizeTip::SizeTip( TQWidget *parent, const char *name ) void SizeTip::setTip( const TQRect &rect ) { - TQString tip = TQString( "%1x%2" ).tqarg( rect.width() ) - .tqarg( rect.height() ); + TQString tip = TQString( "%1x%2" ).arg( rect.width() ) + .arg( rect.height() ); setText( tip ); adjustSize(); @@ -52,7 +52,7 @@ void SizeTip::setTip( const TQRect &rect ) void SizeTip::positionTip( const TQRect &rect ) { - TQRect tipRect = tqgeometry(); + TQRect tipRect = geometry(); tipRect.moveTopLeft( TQPoint( 0, 0 ) ); if ( rect.intersects( tipRect ) ) @@ -61,7 +61,7 @@ void SizeTip::positionTip( const TQRect &rect ) tipRect.moveCenter( TQPoint( deskR.width()/2, deskR.height()/2 ) ); if ( !rect.contains( tipRect, true ) && rect.intersects( tipRect ) ) - tipRect.moveBottomRight( tqgeometry().bottomRight() ); + tipRect.moveBottomRight( geometry().bottomRight() ); } move( tipRect.topLeft() ); @@ -161,8 +161,8 @@ void RegionGrabber::drawRubber() p.setPen( TQPen( color0, 1 ) ); p.setBrush( NoBrush ); - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, tqcolorGroup(), - TQStyle::Style_Default, TQStyleOption( tqcolorGroup().base() ) ); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(), + TQStyle::Style_Default, TQStyleOption( colorGroup().base() ) ); p.end(); } diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp index 04f7b653..45c1705a 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp @@ -209,7 +209,7 @@ Kross::Api::Object::Ptr ChalkCoreFactory::newImage(Kross::Api::List::Ptr args) KisColorSpace * cs = KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID(csname, ""), ""); if(!cs) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").tqarg(csname ) ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").arg(csname ) ) ); return 0; } @@ -225,9 +225,9 @@ ChalkCoreModule::ChalkCoreModule(Kross::Api::Manager* manager) : Kross::Api::Module("chalkcore") , m_manager(manager), m_factory(0) { - TQMap<TQString, Object::Ptr> tqchildren = manager->getChildren(); - kdDebug(41011) << " there are " << tqchildren.size() << endl; - for(TQMap<TQString, Object::Ptr>::const_iterator it = tqchildren.begin(); it != tqchildren.end(); it++) + TQMap<TQString, Object::Ptr> children = manager->getChildren(); + kdDebug(41011) << " there are " << children.size() << endl; + for(TQMap<TQString, Object::Ptr>::const_iterator it = children.begin(); it != children.end(); it++) { kdDebug(41011) << it.key() << " " << it.data() << endl; } diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h index d719edd6..5ddb004d 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h +++ b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h @@ -108,7 +108,7 @@ namespace Kross { namespace ChalkCore { */ Kross::Api::Object::Ptr getBrush(Kross::Api::List::Ptr); /** - * This function return a Brush with a circular tqshape + * This function return a Brush with a circular shape * It takes at least two arguments : * - width * - height @@ -127,7 +127,7 @@ namespace Kross { namespace ChalkCore { */ Kross::Api::Object::Ptr newCircleBrush(Kross::Api::List::Ptr); /** - * This function return a Brush with a rectangular tqshape + * This function return a Brush with a rectangular shape * It takes at least two arguments : * - width * - height diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_filter.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_filter.cpp index ecac5501..e2f09a58 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_filter.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_filter.cpp @@ -53,7 +53,7 @@ Kross::Api::Object::Ptr Filter::process(Kross::Api::List::Ptr args) PaintLayer* src = (PaintLayer*)args->item(0).data(); if(!m_filter->workWith( src->paintLayer()->paintDevice()->colorSpace())) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("process") ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("process") ) ); } TQRect rect; if( args->count() >1) diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp index c93d6e88..1486d415 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp @@ -80,7 +80,7 @@ Kross::Api::Object::Ptr Image::convertToColorspace(Kross::Api::List::Ptr args) KisColorSpace * dstCS = KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID(Kross::Api::Variant::toString(args->item(0)), ""), ""); if(!dstCS) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").tqarg(Kross::Api::Variant::toString(args->item(0))) ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").arg(Kross::Api::Variant::toString(args->item(0))) ) ); return 0; } m_image->convertTo(dstCS); diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h index b01ba0a8..0b22ebf5 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h @@ -246,7 +246,7 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem pixel.push_back( *((float*) data) ); break; default: - kdDebug(41011) << i18n("An error has occurred in %1").tqarg("getPixel") << endl; + kdDebug(41011) << i18n("An error has occurred in %1").arg("getPixel") << endl; kdDebug(41011) << i18n("unsupported data format in scripts") << endl; break; } @@ -274,7 +274,7 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem *((float*) data) = pixel[i].toDouble(); break; default: - kdDebug(41011) << i18n("An error has occurred in %1").tqarg("setPixel") << endl; + kdDebug(41011) << i18n("An error has occurred in %1").arg("setPixel") << endl; kdDebug(41011) << i18n("unsupported data format in scripts") << endl; break; } diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp index 5f800f6a..9f27adc6 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp @@ -130,7 +130,7 @@ Kross::Api::Object::Ptr PaintLayer::createHistogram(Kross::Api::List::Ptr args) { return new Histogram( paintLayer().data(), factory->generate() , type); } else { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("createHistogram") + "\n" + i18n("The histogram %1 is not available").tqarg(histoname) ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("createHistogram") + "\n" + i18n("The histogram %1 is not available").arg(histoname) ) ); } return 0; } @@ -172,7 +172,7 @@ Kross::Api::Object::Ptr PaintLayer::convertToColorspace(Kross::Api::List::Ptr ar if(!dstCS) { // FIXME: inform user - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("convertToColorspace") + "\n" + i18n("Colorspace %1 is not available, please check your installation.").tqarg(Kross::Api::Variant::toString(args->item(0))) ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("convertToColorspace") + "\n" + i18n("Colorspace %1 is not available, please check your installation.").arg(Kross::Api::Variant::toString(args->item(0))) ) ); return 0; } paintLayer()->paintDevice()->convertTo(dstCS); diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_painter.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_painter.cpp index 44991303..5aee1431 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_painter.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_painter.cpp @@ -110,7 +110,7 @@ Kross::Api::Object::Ptr Painter::convolve(Kross::Api::List::Ptr args) TQVariant firstlineVariant = *kernelH.begin(); if(firstlineVariant.type() != TQVariant::List) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("applyConvolution")) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").arg("applyConvolution")) ); } TQValueList<TQVariant> firstline = firstlineVariant.toList(); @@ -126,12 +126,12 @@ Kross::Api::Object::Ptr Painter::convolve(Kross::Api::List::Ptr args) TQVariant lineVariant = *kernelH.begin(); if(lineVariant.type() != TQVariant::List) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("applyConvolution")) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").arg("applyConvolution")) ); } TQValueList<TQVariant> line = firstlineVariant.toList(); if(line.size() != kernel.width) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("applyConvolution")) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").arg("applyConvolution")) ); } uint j = 0; for(TQValueList<TQVariant>::iterator itLine = line.begin(); itLine != line.end(); itLine++, j ++ ) diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp index e166de7c..c8ef92c5 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp @@ -52,7 +52,7 @@ Kross::Api::Object::Ptr Wavelet::getNCoeff(Kross::Api::List::Ptr args) TQ_UINT32 n = Kross::Api::Variant::toUInt(args->item(0)); if( n > m_numCoeff) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("getNCoeff") + "\n" + i18n("Index out of bound") ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("getNCoeff") + "\n" + i18n("Index out of bound") ) ); } return new Kross::Api::Variant(*(m_wavelet->coeffs + n )); } @@ -63,7 +63,7 @@ Kross::Api::Object::Ptr Wavelet::setNCoeff(Kross::Api::List::Ptr args) double v = Kross::Api::Variant::toDouble(args->item(1)); if( n > m_numCoeff) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("setNCoeff") + "\n" + i18n("Index out of bound") ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("setNCoeff") + "\n" + i18n("Index out of bound") ) ); } *(m_wavelet->coeffs + n ) = v; return 0; @@ -75,7 +75,7 @@ Kross::Api::Object::Ptr Wavelet::getXYCoeff(Kross::Api::List::Ptr args) TQ_UINT32 y = Kross::Api::Variant::toUInt(args->item(1)); if( x > m_wavelet->size && y > m_wavelet->size) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("getXYCoeff") + "\n" + i18n("Index out of bound") ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("getXYCoeff") + "\n" + i18n("Index out of bound") ) ); } return new Kross::Api::Variant(*(m_wavelet->coeffs + (x + y * m_wavelet->size ) * m_wavelet->depth )); } @@ -87,7 +87,7 @@ Kross::Api::Object::Ptr Wavelet::setXYCoeff(Kross::Api::List::Ptr args) double v = Kross::Api::Variant::toDouble(args->item(2)); if( x > m_wavelet->size && y > m_wavelet->size) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("setXYCoeff") + "\n" + i18n("Index out of bound") )); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("setXYCoeff") + "\n" + i18n("Index out of bound") )); } *(m_wavelet->coeffs + (x + y * m_wavelet->size ) * m_wavelet->depth ) = v; return 0; diff --git a/chalk/plugins/viewplugins/scripting/samples/ruby/randompaint.rb b/chalk/plugins/viewplugins/scripting/samples/ruby/randompaint.rb index 1ec25dcd..7f6a9b05 100644 --- a/chalk/plugins/viewplugins/scripting/samples/ruby/randompaint.rb +++ b/chalk/plugins/viewplugins/scripting/samples/ruby/randompaint.rb @@ -60,11 +60,11 @@ for i in 1..100 painter.setBrush( Krosschalkcore::newCircleBrush(rand*20,rand*20,rand*10,rand*10) ) end # paint a point - tqshape = rand * 7 + shape = rand * 7 painter.setStrokeStyle(1) - if( tqshape < 1 ) + if( shape < 1 ) painter.paintAt(rand * width , rand * height,1.1) - elsif(tqshape < 2 ) + elsif(shape < 2 ) xs = Array.new ys = Array.new for i in 0..6 @@ -72,14 +72,14 @@ for i in 1..100 ys[i] = rand*height end painter.paintPolyline(xs,ys) - elsif(tqshape < 3) + elsif(shape < 3) painter.paintLine(rand * width, rand * height, 1.1, rand * width, rand * height,1.1) - elsif(tqshape < 4) + elsif(shape < 4) painter.paintBezierCurve(rand * width, rand * height, 1.1, rand * width, rand * height, rand * width , rand * height, rand * width, rand * height, 1.1) - elsif(tqshape < 5) + elsif(shape < 5) randomizeStyle(painter) painter.paintEllipse(rand * width, rand * height, rand * width, rand * height, 1.1) - elsif(tqshape < 6) + elsif(shape < 6) xs = Array.new ys = Array.new for i in 0..6 @@ -88,7 +88,7 @@ for i in 1..100 end randomizeStyle(painter) painter.paintPolygon(xs, ys) - elsif(tqshape < 7) + elsif(shape < 7) randomizeStyle(painter) painter.paintRect(rand * width, rand * height, rand * width, rand * height, 1.1) end diff --git a/chalk/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb b/chalk/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb index b7c784fc..68610cc5 100644 --- a/chalk/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb +++ b/chalk/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb @@ -91,11 +91,11 @@ class TorturePainting painter.setBrush( Krosschalkcore::newCircleBrush(rand*20,rand*20,rand*10,rand*10) ) end # paint a point - tqshape = rand * 7 + shape = rand * 7 painter.setStrokeStyle(1) - if( tqshape < 1 ) + if( shape < 1 ) painter.paintAt(rand * @width , rand * @height,1.1) - elsif(tqshape < 2 ) + elsif(shape < 2 ) xs = Array.new ys = Array.new for i in 0..6 @@ -103,14 +103,14 @@ class TorturePainting ys[i] = rand*@height end painter.paintPolyline(xs,ys) - elsif(tqshape < 3) + elsif(shape < 3) painter.paintLine(rand * @width, rand * @height, 1.1, rand * @width, rand * @height,1.1) - elsif(tqshape < 4) + elsif(shape < 4) painter.paintBezierCurve(rand * @width, rand * @height, 1.1, rand * @width, rand * @height, rand * @width , rand * @height, rand * @width, rand * @height, 1.1) - elsif(tqshape < 5) + elsif(shape < 5) randomizeStyle(painter) painter.paintEllipse(rand * @width, rand * @height, rand * @width, rand * @height, 1.1) - elsif(tqshape < 6) + elsif(shape < 6) xs = Array.new ys = Array.new for i in 0..6 @@ -119,7 +119,7 @@ class TorturePainting end randomizeStyle(painter) painter.paintPolygon(xs, ys) - elsif(tqshape < 7) + elsif(shape < 7) randomizeStyle(painter) painter.paintRect(rand * @width, rand * @height, rand * @width, rand * @height, 1.1) end diff --git a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc index 99078d0f..3da5db51 100644 --- a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc +++ b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc @@ -43,7 +43,7 @@ DlgSeparate::DlgSeparate( const TQString & imageCS, m_page = new WdgSeparations(this, "separate_image"); Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); m_page->lblColormodel->setText(layerCS); m_page->grpOutput->hide(); diff --git a/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui b/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui index f1eeeaa2..7e611f67 100644 --- a/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui +++ b/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc index a2c43aa9..26a05d84 100644 --- a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc +++ b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc @@ -29,7 +29,7 @@ using namespace std; #include <tqradiobutton.h> #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <knuminput.h> @@ -46,11 +46,11 @@ DlgShearImage::DlgShearImage( TQWidget * parent, m_lock = false; m_page = new WdgShearImage(this, "shear_image"); - m_page->tqlayout()->setMargin(0); + m_page->layout()->setMargin(0); Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); diff --git a/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui b/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui index 848eb328..6facd42a 100644 --- a/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui +++ b/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui @@ -56,7 +56,7 @@ <property name="name"> <cstring>shearAngleY</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>100</height> diff --git a/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui b/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui index 3382fe1f..de5850d6 100644 --- a/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui +++ b/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -92,7 +92,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> diff --git a/chalk/plugins/viewplugins/variations/wdg_variations.ui b/chalk/plugins/viewplugins/variations/wdg_variations.ui index 65f20e23..a9c7adea 100644 --- a/chalk/plugins/viewplugins/variations/wdg_variations.ui +++ b/chalk/plugins/viewplugins/variations/wdg_variations.ui @@ -64,13 +64,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>150</height> @@ -95,13 +95,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>150</height> @@ -121,7 +121,7 @@ <property name="text"> <string>Current Pick</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -132,7 +132,7 @@ <property name="text"> <string>Original</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -228,7 +228,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <property name="geometry"> <rect> @@ -268,7 +268,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>187</height> @@ -287,7 +287,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>556</height> @@ -322,13 +322,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>150</height> @@ -348,7 +348,7 @@ <property name="text"> <string>Lighter</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -364,13 +364,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>150</height> @@ -390,7 +390,7 @@ <property name="text"> <string>Current Pick</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -406,13 +406,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>150</height> @@ -432,7 +432,7 @@ <property name="text"> <string>Darker</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -460,13 +460,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>540</width> <height>556</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>540</width> <height>556</height> @@ -497,13 +497,13 @@ <height>150</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>150</height> @@ -531,7 +531,7 @@ <property name="text"> <string>More Red</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -550,7 +550,7 @@ <property name="text"> <string>More Cyan</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -574,13 +574,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>150</height> @@ -608,7 +608,7 @@ <property name="text"> <string>More Green</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -632,13 +632,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>150</height> @@ -671,13 +671,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>150</height> @@ -710,13 +710,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>150</height> @@ -744,7 +744,7 @@ <property name="text"> <string>Current Pick</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -763,7 +763,7 @@ <property name="text"> <string>More Yellow</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -787,13 +787,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>150</height> @@ -829,13 +829,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>150</height> @@ -863,7 +863,7 @@ <property name="text"> <string>More Magenta</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -882,7 +882,7 @@ <property name="text"> <string>More Blue</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/chalk/sdk/kis_canvas_controller.h b/chalk/sdk/kis_canvas_controller.h index 6ed8f1b9..bdcb3ab0 100644 --- a/chalk/sdk/kis_canvas_controller.h +++ b/chalk/sdk/kis_canvas_controller.h @@ -68,19 +68,19 @@ public: virtual void scrollTo(TQ_INT32 x, TQ_INT32 y) = 0; /** - * Tell all of the canvas to tqrepaint itself. + * Tell all of the canvas to repaint itself. */ virtual void updateCanvas() = 0; /** - * Tell the canvas to tqrepaint the rectangle defined by x, y, w and h. + * Tell the canvas to repaint the rectangle defined by x, y, w and h. * The coordinates are image coordinates. */ virtual void updateCanvas(TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32 h) = 0; /** - * Tell the canvas tqrepaint the specified rectangle. The coordinates + * Tell the canvas repaint the specified rectangle. The coordinates * are image coordinates, not view coordinates. */ virtual void updateCanvas(const TQRect& rc) = 0; diff --git a/chalk/ui/imageviewer.cc b/chalk/ui/imageviewer.cc index cfe6905d..09955e9e 100644 --- a/chalk/ui/imageviewer.cc +++ b/chalk/ui/imageviewer.cc @@ -35,7 +35,7 @@ ImageViewer::ImageViewer(TQWidget *widget, const char * name) , m_image(TQPixmap()) { m_label = new TQLabel( viewport()); - tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); setCursor(KisCursor::handCursor()); addChild(m_label); } diff --git a/chalk/ui/kcurve.cc b/chalk/ui/kcurve.cc index c7f9e0ad..1d7932cb 100644 --- a/chalk/ui/kcurve.cc +++ b/chalk/ui/kcurve.cc @@ -73,21 +73,21 @@ void KCurve::reset(void) { m_grab_point = NULL; m_guideVisible = false; - tqrepaint(false); + repaint(false); } void KCurve::setCurveGuide(TQColor color) { m_guideVisible = true; m_colorGuide = color; - tqrepaint(false); + repaint(false); } void KCurve::setPixmap(TQPixmap pix) { if (m_pix) delete m_pix; m_pix = new TQPixmap(pix); - tqrepaint(false); + repaint(false); } void KCurve::keyPressEvent(TQKeyEvent *e) @@ -113,7 +113,7 @@ void KCurve::keyPressEvent(TQKeyEvent *e) m_points.remove(m_grab_point); } m_grab_point = closest_point; - tqrepaint(false); + repaint(false); } else TQWidget::keyPressEvent(e); @@ -133,7 +133,7 @@ void KCurve::paintEvent(TQPaintEvent *) TQPixmap pm(size()); TQPainter p1; - p1.tqbegin(TQT_TQPAINTDEVICE(&pm), this); + p1.begin(TQT_TQPAINTDEVICE(&pm), this); // draw background if(m_pix) @@ -281,7 +281,7 @@ void KCurve::mousePressEvent ( TQMouseEvent * e ) } p = m_points.next(); } - tqrepaint(false); + repaint(false); } void KCurve::mouseReleaseEvent ( TQMouseEvent * e ) @@ -293,7 +293,7 @@ void KCurve::mouseReleaseEvent ( TQMouseEvent * e ) setCursor( KCursor::arrowCursor() ); m_dragging = false; - tqrepaint(false); + repaint(false); emit modified(); } @@ -304,7 +304,7 @@ void KCurve::mouseMoveEvent ( TQMouseEvent * e ) double x = e->pos().x() / (float)width(); double y = 1.0 - e->pos().y() / (float)height(); - if (m_dragging == false) // If no point is selected set the the cursor tqshape if on top + if (m_dragging == false) // If no point is selected set the the cursor shape if on top { double distance = 1000; double ydistance = 1000; @@ -349,7 +349,7 @@ void KCurve::mouseMoveEvent ( TQMouseEvent * e ) emit modified(); } - tqrepaint(false); + repaint(false); } double KCurve::getCurveValue(double x) diff --git a/chalk/ui/kis_autogradient.cc b/chalk/ui/kis_autogradient.cc index 318bf305..bd5b80fb 100644 --- a/chalk/ui/kis_autogradient.cc +++ b/chalk/ui/kis_autogradient.cc @@ -113,7 +113,7 @@ void KisAutogradient::slotChangedRightColor( const TQColor& color) KisGradientSegment* segment = gradientSlider->selectedSegment(); if(segment) segment->setEndColor( Color( color, segment->endColor().alpha() ) ); - gradientSlider->tqrepaint(); + gradientSlider->repaint(); paramChanged(); } @@ -123,7 +123,7 @@ void KisAutogradient::slotChangedLeftOpacity( int value ) KisGradientSegment* segment = gradientSlider->selectedSegment(); if(segment) segment->setStartColor( Color( segment->startColor().color(), (double)value / 100 ) ); - gradientSlider->tqrepaint(false); + gradientSlider->repaint(false); paramChanged(); } @@ -133,7 +133,7 @@ void KisAutogradient::slotChangedRightOpacity( int value ) KisGradientSegment* segment = gradientSlider->selectedSegment(); if(segment) segment->setEndColor( Color( segment->endColor().color(), (double)value / 100 ) ); - gradientSlider->tqrepaint(false); + gradientSlider->repaint(false); paramChanged(); } diff --git a/chalk/ui/kis_birdeye_box.cc b/chalk/ui/kis_birdeye_box.cc index 0bc9ae08..b1f9d724 100644 --- a/chalk/ui/kis_birdeye_box.cc +++ b/chalk/ui/kis_birdeye_box.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "tqlayout.h" +#include "layout.h" #include "tqlabel.h" #include "tqpixmap.h" #include "tqpainter.h" @@ -203,7 +203,7 @@ KisBirdEyeBox::KisBirdEyeBox(KisView * view, TQWidget* parent, const char* name) hl->addWidget(m_exposureLabel); m_exposureDoubleWidget = new KisDoubleWidget(-10, 10, this); - m_exposureDoubleWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); + m_exposureDoubleWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); hl->addWidget(m_exposureDoubleWidget); TQToolTip::add(m_exposureDoubleWidget, i18n("Select the exposure (stops) for HDR images")); l->addItem(new TQSpacerItem(0, 1, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding)); diff --git a/chalk/ui/kis_brush_chooser.cc b/chalk/ui/kis_brush_chooser.cc index 20de3c5b..d567b76a 100644 --- a/chalk/ui/kis_brush_chooser.cc +++ b/chalk/ui/kis_brush_chooser.cc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <klocale.h> #include <koIconChooser.h> @@ -41,7 +41,7 @@ KisBrushChooser::KisBrushChooser(TQWidget *parent, const char *name) m_lbName = new TQLabel(this); - TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main tqlayout"); + TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout"); mainLayout->addWidget(m_lbName); mainLayout->addWidget(chooserWidget(), 10); @@ -89,7 +89,7 @@ void KisBrushChooser::update(KoIconItem *item) if (kisItem) { KisBrush *brush = static_cast<KisBrush *>(kisItem->resource()); - TQString text = TQString("%1 (%2 x %3)").tqarg(brush->name()).tqarg(brush->width()).tqarg(brush->height()); + TQString text = TQString("%1 (%2 x %3)").arg(brush->name()).arg(brush->width()).arg(brush->height()); m_lbName->setText(text); m_slSpacing->setValue(brush->spacing()); diff --git a/chalk/ui/kis_canvas.cc b/chalk/ui/kis_canvas.cc index 16872418..d38c7ea1 100644 --- a/chalk/ui/kis_canvas.cc +++ b/chalk/ui/kis_canvas.cc @@ -1235,34 +1235,34 @@ void KisCanvas::update(int x, int y, int width, int height) dynamic_cast<TQWidget *>(m_canvasWidget)->update(x, y, width, height); } -void KisCanvas::tqrepaint() +void KisCanvas::repaint() { Q_ASSERT(m_canvasWidget); - dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(); + dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(); } -void KisCanvas::tqrepaint(bool erase) +void KisCanvas::repaint(bool erase) { Q_ASSERT(m_canvasWidget); - dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(erase); + dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(erase); } -void KisCanvas::tqrepaint(int x, int y, int width, int height, bool erase) +void KisCanvas::repaint(int x, int y, int width, int height, bool erase) { Q_ASSERT(m_canvasWidget); - dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(x, y, width, height, erase); + dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(x, y, width, height, erase); } -void KisCanvas::tqrepaint(const TQRect& r, bool erase) +void KisCanvas::repaint(const TQRect& r, bool erase) { Q_ASSERT(m_canvasWidget); - dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(r, erase); + dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(r, erase); } -void KisCanvas::tqrepaint(const TQRegion& r, bool erase) +void KisCanvas::repaint(const TQRegion& r, bool erase) { Q_ASSERT(m_canvasWidget); - dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(r, erase); + dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(r, erase); } bool KisCanvas::isUpdatesEnabled() const diff --git a/chalk/ui/kis_canvas.h b/chalk/ui/kis_canvas.h index 4d92a4ce..5f717468 100644 --- a/chalk/ui/kis_canvas.h +++ b/chalk/ui/kis_canvas.h @@ -313,11 +313,11 @@ public: void update(); void update(const TQRect& r); void update(int x, int y, int width, int height); - void tqrepaint(); - void tqrepaint(bool erase); - void tqrepaint(int x, int y, int width, int height, bool erase = true); - void tqrepaint(const TQRect& r, bool erase = true); - void tqrepaint(const TQRegion& r, bool erase = true); + void repaint(); + void repaint(bool erase); + void repaint(int x, int y, int width, int height, bool erase = true); + void repaint(const TQRect& r, bool erase = true); + void repaint(const TQRegion& r, bool erase = true); void updateGeometry(); diff --git a/chalk/ui/kis_canvas_painter.cc b/chalk/ui/kis_canvas_painter.cc index ed5be01d..9b3666e8 100644 --- a/chalk/ui/kis_canvas_painter.cc +++ b/chalk/ui/kis_canvas_painter.cc @@ -184,7 +184,7 @@ void KisCanvasWidgetPainter::setWorldXForm(bool /*enable*/) { } -const TQWMatrix& KisCanvasWidgetPainter::tqworldMatrix() const +const TQWMatrix& KisCanvasWidgetPainter::worldMatrix() const { return m_defaultWorldMatrix; } @@ -501,11 +501,11 @@ void KisCanvasWidgetPainter::drawText(const TQRect& /*r*/, int /*flags*/, const { } -void KisCanvasWidgetPainter::tqdrawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/) +void KisCanvasWidgetPainter::drawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/) { } -void KisCanvasWidgetPainter::tqdrawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/) +void KisCanvasWidgetPainter::drawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/) { } @@ -833,10 +833,10 @@ void KisCanvasPainter::setWorldXForm(bool enable) } } -const TQWMatrix& KisCanvasPainter::tqworldMatrix() const +const TQWMatrix& KisCanvasPainter::worldMatrix() const { if (m_canvasWidgetPainter != 0) { - return m_canvasWidgetPainter->tqworldMatrix(); + return m_canvasWidgetPainter->worldMatrix(); } return m_defaultWorldMatrix; } @@ -1378,17 +1378,17 @@ void KisCanvasPainter::drawText(const TQRect& r, int flags, const TQString& text } } -void KisCanvasPainter::tqdrawTextItem(int x, int y, const TQTextItem& ti, int textflags) +void KisCanvasPainter::drawTextItem(int x, int y, const TQTextItem& ti, int textflags) { if (m_canvasWidgetPainter != 0) { - m_canvasWidgetPainter->tqdrawTextItem(x, y, ti, textflags); + m_canvasWidgetPainter->drawTextItem(x, y, ti, textflags); } } -void KisCanvasPainter::tqdrawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags) +void KisCanvasPainter::drawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags) { if (m_canvasWidgetPainter != 0) { - m_canvasWidgetPainter->tqdrawTextItem(p, ti, textflags); + m_canvasWidgetPainter->drawTextItem(p, ti, textflags); } } diff --git a/chalk/ui/kis_canvas_painter.h b/chalk/ui/kis_canvas_painter.h index 9a719eea..a5ad2d84 100644 --- a/chalk/ui/kis_canvas_painter.h +++ b/chalk/ui/kis_canvas_painter.h @@ -78,7 +78,7 @@ public: virtual void setViewport(int x, int y, int w, int h); virtual void setWorldXForm(bool); - virtual const TQWMatrix&tqworldMatrix() const; + virtual const TQWMatrix&worldMatrix() const; virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE); virtual void saveWorldMatrix(); @@ -168,8 +168,8 @@ public: virtual void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0); virtual void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0); - virtual void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0); - virtual void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0); + virtual void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0); + virtual void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0); virtual TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0); virtual TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0); @@ -241,7 +241,7 @@ public: void setViewport(int x, int y, int w, int h); void setWorldXForm(bool); - const TQWMatrix&tqworldMatrix() const; + const TQWMatrix&worldMatrix() const; void setWorldMatrix(const TQWMatrix&, bool combine=FALSE); void saveWorldMatrix(); @@ -331,8 +331,8 @@ public: void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0); void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0); - void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0); - void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0); + void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0); + void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0); TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0); TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0); diff --git a/chalk/ui/kis_clipboard.cc b/chalk/ui/kis_clipboard.cc index d52f5ec9..7eb3607a 100644 --- a/chalk/ui/kis_clipboard.cc +++ b/chalk/ui/kis_clipboard.cc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include <tqapplication.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqobject.h> #include <tqimage.h> #include <tqmessagebox.h> @@ -52,7 +52,7 @@ KisClipboard::KisClipboard() clipboardDataChanged(); // Make sure we are notified when clipboard changes - connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ), + connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), this, TQT_SLOT( clipboardDataChanged() ) ); } @@ -132,20 +132,20 @@ void KisClipboard::setClip(KisPaintDeviceSP selection) multiDrag->addDragObject( storeDrag ); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setData(multiDrag); m_pushedClipboard = true; } KisPaintDeviceSP KisClipboard::clip() { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); TQCString mimeType("application/x-chalk-selection"); TQMimeSource *cbData = cb->data(); if(cbData && cbData->provides(mimeType)) { - TQBuffer buffer(cbData->tqencodedData(mimeType)); + TQBuffer buffer(cbData->encodedData(mimeType)); KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read, mimeType ); KisProfile *profile=0; @@ -211,7 +211,7 @@ void KisClipboard::clipboardDataChanged() { if (!m_pushedClipboard) { m_hasClip = false; - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); TQImage qimg = cb->image(); TQMimeSource *cbData = cb->data(); TQCString mimeType("application/x-chalk-selection"); @@ -235,7 +235,7 @@ bool KisClipboard::hasClip() TQSize KisClipboard::clipSize() { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); TQCString mimeType("application/x-chalk-selection"); TQMimeSource *cbData = cb->data(); @@ -243,7 +243,7 @@ TQSize KisClipboard::clipSize() if(cbData && cbData->provides(mimeType)) { - TQBuffer buffer(cbData->tqencodedData(mimeType)); + TQBuffer buffer(cbData->encodedData(mimeType)); KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read, mimeType ); KisProfile *profile=0; diff --git a/chalk/ui/kis_color_cup.cc b/chalk/ui/kis_color_cup.cc index 4d2103d8..2a2c4b8d 100644 --- a/chalk/ui/kis_color_cup.cc +++ b/chalk/ui/kis_color_cup.cc @@ -21,12 +21,12 @@ #include <tqpushbutton.h> #include <tqapplication.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqcolor.h> #include <tqdrawutil.h> #include <tqhbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqspinbox.h> #include <tqstyle.h> @@ -81,7 +81,7 @@ void KisColorCup::slotClicked() emit changed(m_color); } -TQSize KisColorCup::tqsizeHint() const +TQSize KisColorCup::sizeHint() const { return tqstyle().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(24, 24)). expandedTo(TQApplication::globalStrut()); @@ -93,24 +93,24 @@ void KisColorCup::drawButtonLabel( TQPainter *painter ) TQRect r = tqstyle().subRect( TQStyle::SR_PushButtonContents, this ); r.rect(&x, &y, &w, &h); - int margin = 2; //tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin, this ); + int margin = 2; //tqstyle().pixelMetric( TQStyle::PM_ButtonMargin, this ); x += margin; y += margin; w -= 2*margin; h -= 2*margin; if (isOn() || isDown()) { - x += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal, this ); - y += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical, this ); + x += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this ); + y += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical, this ); } - qDrawShadePanel( painter, x, y, w, h, tqcolorGroup(), true, 1, NULL); + qDrawShadePanel( painter, x, y, w, h, colorGroup(), true, 1, NULL); if ( m_color.isValid() ) painter->fillRect( x+1, y+1, w-2, h-2, m_color ); if ( hasFocus() ) { TQRect focusRect = tqstyle().subRect( TQStyle::SR_PushButtonFocusRect, this ); - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, tqcolorGroup() ); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() ); } } diff --git a/chalk/ui/kis_color_cup.h b/chalk/ui/kis_color_cup.h index 2cf9ddef..8c7fd2b5 100644 --- a/chalk/ui/kis_color_cup.h +++ b/chalk/ui/kis_color_cup.h @@ -72,7 +72,7 @@ signals: public: - TQSize tqsizeHint() const; + TQSize sizeHint() const; public slots: diff --git a/chalk/ui/kis_controlframe.cc b/chalk/ui/kis_controlframe.cc index fab8c4bb..21debef1 100644 --- a/chalk/ui/kis_controlframe.cc +++ b/chalk/ui/kis_controlframe.cc @@ -23,7 +23,7 @@ #include <stdlib.h> #include <tqapplication.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtabwidget.h> #include <tqframe.h> #include <tqwidget.h> @@ -218,7 +218,7 @@ void KisControlFrame::createBrushesChooser(KisView * view) m_brushChooserPopup = new KisPopupFrame(m_brushWidget, "brush_chooser_popup"); - TQHBoxLayout * l = new TQHBoxLayout(m_brushChooserPopup, 2, 2, "brushpopuptqlayout"); + TQHBoxLayout * l = new TQHBoxLayout(m_brushChooserPopup, 2, 2, "brushpopuplayout"); TQTabWidget * m_brushesTab = new TQTabWidget(m_brushChooserPopup, "brushestab"); m_brushesTab->setTabShape(TQTabWidget::Triangular); @@ -270,7 +270,7 @@ void KisControlFrame::createPatternsChooser(KisView * view) { m_patternChooserPopup = new KisPopupFrame(m_patternWidget, "pattern_chooser_popup"); - TQHBoxLayout * l2 = new TQHBoxLayout(m_patternChooserPopup, 2, 2, "patternpopuptqlayout"); + TQHBoxLayout * l2 = new TQHBoxLayout(m_patternChooserPopup, 2, 2, "patternpopuplayout"); TQTabWidget * m_patternsTab = new TQTabWidget(m_patternChooserPopup, "patternstab"); m_patternsTab->setTabShape(TQTabWidget::Triangular); @@ -311,7 +311,7 @@ void KisControlFrame::createGradientsChooser(KisView * view) { m_gradientChooserPopup = new KisPopupFrame(m_gradientWidget, "gradient_chooser_popup"); - TQHBoxLayout * l2 = new TQHBoxLayout(m_gradientChooserPopup, 2, 2, "gradientpopuptqlayout"); + TQHBoxLayout * l2 = new TQHBoxLayout(m_gradientChooserPopup, 2, 2, "gradientpopuplayout"); TQTabWidget * m_gradientTab = new TQTabWidget(m_gradientChooserPopup, "gradientstab"); m_gradientTab->setTabShape(TQTabWidget::Triangular); diff --git a/chalk/ui/kis_custom_image_widget.cc b/chalk/ui/kis_custom_image_widget.cc index 93c82977..41263237 100644 --- a/chalk/ui/kis_custom_image_widget.cc +++ b/chalk/ui/kis_custom_image_widget.cc @@ -35,7 +35,7 @@ #include <kdebug.h> #include <tqpushbutton.h> #include <tqslider.h> -#include <tqtextedit.h> +#include <textedit.h> #include <KoUnitWidgets.h> #include <tqlabel.h> diff --git a/chalk/ui/kis_custom_palette.cc b/chalk/ui/kis_custom_palette.cc index f84bf24d..ac762953 100644 --- a/chalk/ui/kis_custom_palette.cc +++ b/chalk/ui/kis_custom_palette.cc @@ -136,7 +136,7 @@ void KisCustomPalette::slotAddPredefined() { if (!m_palette->save()) { KMessageBox::error(0, i18n("Cannot write to palette file %1. Maybe it is read-only.") - .tqarg(m_palette->filename()), i18n("Palette")); + .arg(m_palette->filename()), i18n("Palette")); return; } diff --git a/chalk/ui/kis_dlg_adj_layer_props.cc b/chalk/ui/kis_dlg_adj_layer_props.cc index 1cdd309c..5d09bf3b 100644 --- a/chalk/ui/kis_dlg_adj_layer_props.cc +++ b/chalk/ui/kis_dlg_adj_layer_props.cc @@ -20,7 +20,7 @@ #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klineedit.h> #include <klocale.h> @@ -85,16 +85,16 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer, } setCaption(caption); TQWidget * page = new TQWidget(this, "page widget"); - TQHBoxLayout * tqlayout = new TQHBoxLayout(page, 0, 6); + TQHBoxLayout * layout = new TQHBoxLayout(page, 0, 6); setMainWidget(page); m_preview = new KisPreviewWidget(page, "dlgadjustment.preview"); m_preview->slotSetDevice( dev ); connect( m_preview, TQT_SIGNAL(updated()), this, TQT_SLOT(refreshPreview())); - tqlayout->addWidget(m_preview, 1, 1); + layout->addWidget(m_preview, 1, 1); - TQVBoxLayout *v1 = new TQVBoxLayout( tqlayout ); + TQVBoxLayout *v1 = new TQVBoxLayout( layout ); TQHBoxLayout *hl = new TQHBoxLayout( v1 ); TQLabel * lblName = new TQLabel(i18n("Layer name:"), page, "lblName"); @@ -102,7 +102,7 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer, m_layerName = new KLineEdit(page, "m_layerName"); m_layerName->setText(layerName); - m_layerName->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed); + m_layerName->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed); hl->addWidget(m_layerName, 0, 1); connect( m_layerName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotNameChanged( const TQString & ) ) ); diff --git a/chalk/ui/kis_dlg_adjustment_layer.cc b/chalk/ui/kis_dlg_adjustment_layer.cc index 13caff98..83893b0b 100644 --- a/chalk/ui/kis_dlg_adjustment_layer.cc +++ b/chalk/ui/kis_dlg_adjustment_layer.cc @@ -20,7 +20,7 @@ #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klineedit.h> #include <klocale.h> @@ -102,10 +102,10 @@ KisDlgAdjustmentLayer::KisDlgAdjustmentLayer(KisImage * img, m_labelNoConfigWidget = new TQLabel(i18n("No configuration options are available for this filter"), m_configWidgetHolder); - m_configWidgetHolder->tqlayout()->add(m_labelNoConfigWidget); + m_configWidgetHolder->layout()->add(m_labelNoConfigWidget); m_labelNoConfigWidget->hide(); - resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(600, 480).expandedTo(minimumSizeHint()) ); m_currentConfigWidget = 0; @@ -156,7 +156,7 @@ void KisDlgAdjustmentLayer::selectionHasChanged ( TQIconViewItem * item ) if ( m_currentConfigWidget != 0 ) { - m_configWidgetHolder->tqlayout()->remove(m_currentConfigWidget); + m_configWidgetHolder->layout()->remove(m_currentConfigWidget); delete m_currentConfigWidget; m_currentConfigWidget = 0; @@ -173,7 +173,7 @@ void KisDlgAdjustmentLayer::selectionHasChanged ( TQIconViewItem * item ) if (m_currentConfigWidget != 0) { - m_configWidgetHolder->tqlayout()->add(m_currentConfigWidget); + m_configWidgetHolder->layout()->add(m_currentConfigWidget); m_currentConfigWidget->show(); connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged())); } else { diff --git a/chalk/ui/kis_dlg_apply_profile.cc b/chalk/ui/kis_dlg_apply_profile.cc index 5c136738..2d5e8a90 100644 --- a/chalk/ui/kis_dlg_apply_profile.cc +++ b/chalk/ui/kis_dlg_apply_profile.cc @@ -42,7 +42,7 @@ KisDlgApplyProfile::KisDlgApplyProfile(TQWidget *parent, const char *name) m_page = new WdgApplyProfile(this); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); // XXX: This is BAD! (bsar) fillCmbProfiles(KisID("RGBA", "")); diff --git a/chalk/ui/kis_dlg_image_properties.cc b/chalk/ui/kis_dlg_image_properties.cc index ca6a1b72..20fdac28 100644 --- a/chalk/ui/kis_dlg_image_properties.cc +++ b/chalk/ui/kis_dlg_image_properties.cc @@ -19,11 +19,11 @@ #include <tqpushbutton.h> #include <tqradiobutton.h> #include <tqgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqspinbox.h> #include <tqslider.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqcheckbox.h> #include <klocale.h> @@ -58,7 +58,7 @@ KisDlgImageProperties::KisDlgImageProperties(KisImageSP image, TQWidget *parent, m_image = image; setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); m_page->txtName->setText(image->name()); m_page->m_createButton->hide(); diff --git a/chalk/ui/kis_dlg_layer_properties.cc b/chalk/ui/kis_dlg_layer_properties.cc index 7742969b..5dc65047 100644 --- a/chalk/ui/kis_dlg_layer_properties.cc +++ b/chalk/ui/kis_dlg_layer_properties.cc @@ -17,7 +17,7 @@ */ #include <limits.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqgroupbox.h> #include <tqslider.h> #include <tqstring.h> @@ -43,7 +43,7 @@ KisDlgLayerProperties::KisDlgLayerProperties(const TQString& deviceName, : super(parent, name, f, name, Ok | Cancel) { m_page = new WdgLayerProperties(this); - m_page->tqlayout()->setMargin(0); + m_page->layout()->setMargin(0); opacity = int((opacity * 100.0) / 255 + 0.5); diff --git a/chalk/ui/kis_dlg_new_layer.cc b/chalk/ui/kis_dlg_new_layer.cc index 154dbf2c..c762a3c5 100644 --- a/chalk/ui/kis_dlg_new_layer.cc +++ b/chalk/ui/kis_dlg_new_layer.cc @@ -20,7 +20,7 @@ */ #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klineedit.h> #include <klocale.h> @@ -48,7 +48,7 @@ NewLayerDialog::NewLayerDialog(const KisID colorSpaceID, : super(parent, name, true, "", Ok | Cancel) { m_page = new WdgLayerProperties(this); - m_page->tqlayout()->setMargin(0); + m_page->layout()->setMargin(0); setCaption(i18n("New Layer")); diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc index a19edebe..b9313fa9 100644 --- a/chalk/ui/kis_dlg_preferences.cc +++ b/chalk/ui/kis_dlg_preferences.cc @@ -27,7 +27,7 @@ #include <tqcheckbox.h> #include <tqcursor.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpixmap.h> #include <tqpushbutton.h> @@ -77,7 +77,7 @@ GeneralTab::GeneralTab( TQWidget *_parent, const char *_name ) KisConfig cfg; - m_cmbtqCursorShape->setCurrentItem(cfg.cursorStyle()); + m_cmbCursorShape->setCurrentItem(cfg.cursorStyle()); grpDockability->setButton(cfg.dockability()); numDockerFontSize->setValue((int)cfg.dockerFontSize()); } @@ -86,14 +86,14 @@ void GeneralTab::setDefault() { KisConfig cfg; - m_cmbtqCursorShape->setCurrentItem( cfg.getDefaultCursorStyle()); + m_cmbCursorShape->setCurrentItem( cfg.getDefaultCursorStyle()); grpDockability->setButton(cfg.getDefaultDockability()); numDockerFontSize->setValue((int)(cfg.getDefaultDockerFontSize())); } enumCursorStyle GeneralTab::cursorStyle() { - return (enumCursorStyle)m_cmbtqCursorShape->currentItem(); + return (enumCursorStyle)m_cmbCursorShape->currentItem(); } enumKoDockability GeneralTab::dockability() @@ -383,12 +383,12 @@ TabletSettingsTab::TabletDeviceSettingsDialog::TabletDeviceSettingsDialog(const TQWidget *parent, const char *name) : super(parent, name, true, "", Ok | Cancel) { - setCaption(i18n("Configure %1").tqarg(deviceName)); + setCaption(i18n("Configure %1").arg(deviceName)); m_page = new WdgTabletDeviceSettings(this); setMainWidget(m_page); - resize(m_page->tqsizeHint()); + resize(m_page->sizeHint()); for (TQ_INT32 axis = 0; axis < settings.numAxes(); axis++) { TQString axisString; diff --git a/chalk/ui/kis_doc.cc b/chalk/ui/kis_doc.cc index 6bae7e78..70141dea 100644 --- a/chalk/ui/kis_doc.cc +++ b/chalk/ui/kis_doc.cc @@ -347,7 +347,7 @@ bool KisDoc::loadXML(TQIODevice *, const TQDomDocument& doc) } bool KisDoc::loadChildren(KoStore* store) { - TQPtrListIterator<KoDocumentChild> it(tqchildren()); + TQPtrListIterator<KoDocumentChild> it(children()); for( ; it.current(); ++it ) { if (!it.current()->loadDocument(store)) { return false; diff --git a/chalk/ui/kis_double_widget.cc b/chalk/ui/kis_double_widget.cc index 6c03b3e9..8768e81a 100644 --- a/chalk/ui/kis_double_widget.cc +++ b/chalk/ui/kis_double_widget.cc @@ -20,7 +20,7 @@ */ #include <tqhbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqslider.h> #include <knuminput.h> @@ -53,7 +53,7 @@ void KisDoubleWidget::init(double min, double max) connect(m_slider, TQT_SIGNAL(sliderPressed()), TQT_SIGNAL(sliderPressed())); connect(m_slider, TQT_SIGNAL(sliderReleased()), TQT_SIGNAL(sliderReleased())); - m_layout = new TQHBoxLayout(this, 0, -1, "hbox tqlayout"); + m_layout = new TQHBoxLayout(this, 0, -1, "hbox layout"); m_layout->addWidget(m_slider); m_layout->addSpacing(5); diff --git a/chalk/ui/kis_filter_manager.cc b/chalk/ui/kis_filter_manager.cc index e8bf5ba8..a2775bc7 100644 --- a/chalk/ui/kis_filter_manager.cc +++ b/chalk/ui/kis_filter_manager.cc @@ -18,7 +18,7 @@ */ #include "tqsignalmapper.h" -#include <tqlayout.h> +#include <layout.h> #include <tqframe.h> #include <tqcursor.h> #include <tqapplication.h> @@ -168,7 +168,7 @@ void KisFilterManager::setup(KActionCollection * ac) // Create action KAction * a = new KAction(f->menuEntry(), 0, m_filterMapper, TQT_SLOT(map()), ac, - TQString("chalk_filter_%1").tqarg((*it) . id()).ascii()); + TQString("chalk_filter_%1").arg((*it) . id()).ascii()); // Add action to the right submenu KActionMenu * m = m_filterActionMenus.find( f->menuCategory() ); @@ -320,8 +320,8 @@ void KisFilterManager::slotApplyFilter(int i) if (m_lastFilter->colorSpaceIndependence() == TO_LAB16) { if (KMessageBox::warningContinueCancel(m_view, i18n("The %1 filter will convert your %2 data to 16-bit L*a*b* and vice versa. ") - .tqarg(m_lastFilter->id().name()) - .tqarg(dev->colorSpace()->id().name()), + .arg(m_lastFilter->id().name()) + .arg(dev->colorSpace()->id().name()), i18n("Filter Will Convert Your Layer Data"), KGuiItem(i18n("Continue")), "lab16degradation") != KMessageBox::Continue) return; @@ -330,8 +330,8 @@ void KisFilterManager::slotApplyFilter(int i) else if (m_lastFilter->colorSpaceIndependence() == TO_RGBA8) { if (KMessageBox::warningContinueCancel(m_view, i18n("The %1 filter will convert your %2 data to 8-bit RGBA and vice versa. ") - .tqarg(m_lastFilter->id().name()) - .tqarg(dev->colorSpace()->id().name()), + .arg(m_lastFilter->id().name()) + .arg(dev->colorSpace()->id().name()), i18n("Filter Will Convert Your Layer Data"), KGuiItem(i18n("Continue")), "rgba8degradation") != KMessageBox::Continue) return; @@ -359,7 +359,7 @@ void KisFilterManager::slotApplyFilter(int i) widgetLayout->addWidget(m_lastWidget, 0 , 0); - m_lastDialog->container()->setMinimumSize(m_lastWidget->tqminimumSize()); + m_lastDialog->container()->setMinimumSize(m_lastWidget->minimumSize()); refreshPreview(); diff --git a/chalk/ui/kis_filters_listview.cc b/chalk/ui/kis_filters_listview.cc index f2d63cc3..0112ceb0 100644 --- a/chalk/ui/kis_filters_listview.cc +++ b/chalk/ui/kis_filters_listview.cc @@ -154,7 +154,7 @@ void KisFiltersListView::init() setCaption(i18n("Filters List")); setItemsMovable(false); setSelectionMode(TQIconView::Single); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding )); + setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding )); setMinimumWidth(160); } diff --git a/chalk/ui/kis_gradient_chooser.cc b/chalk/ui/kis_gradient_chooser.cc index 203f0718..f66bb80a 100644 --- a/chalk/ui/kis_gradient_chooser.cc +++ b/chalk/ui/kis_gradient_chooser.cc @@ -17,7 +17,7 @@ */ #include <klocale.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <kdialogbase.h> @@ -49,7 +49,7 @@ KisGradientChooser::KisGradientChooser(KisView * view, TQWidget *parent, const c KisCustomGradientDialog * autogradient = new KisCustomGradientDialog(view, this, "autogradient"); connect(m_customGradient, TQT_SIGNAL(clicked()), autogradient, TQT_SLOT(show())); - TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main tqlayout"); + TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout"); mainLayout->addWidget(m_lbName); mainLayout->addWidget(chooserWidget(), 10); diff --git a/chalk/ui/kis_gradient_slider_widget.cc b/chalk/ui/kis_gradient_slider_widget.cc index cda77d68..a8fdf71e 100644 --- a/chalk/ui/kis_gradient_slider_widget.cc +++ b/chalk/ui/kis_gradient_slider_widget.cc @@ -57,7 +57,7 @@ void KisGradientSliderWidget::paintEvent ( TQPaintEvent* pe ) { TQWidget::paintEvent( pe ); TQPixmap pixmap( width(), height() ); - pixmap.fill( tqcolorGroup().background() ); + pixmap.fill( colorGroup().background() ); TQPainter painter( &pixmap ); painter.setPen( TQt::black ); painter.drawRect( MARGIN, MARGIN, width() - 2 * MARGIN, height()- 2 * MARGIN - HANDLE_SIZE ); @@ -77,7 +77,7 @@ void KisGradientSliderWidget::paintEvent ( TQPaintEvent* pe ) height()- HANDLE_SIZE - MARGIN, tqRound( ( m_selectedSegment->endOffset() - m_selectedSegment->startOffset() )*(double)(width()-12) ), HANDLE_SIZE ); - painter.fillRect( selection, TQBrush( tqcolorGroup().highlight() ) ); + painter.fillRect( selection, TQBrush( colorGroup().highlight() ) ); } TQPointArray triangle(3); @@ -155,7 +155,7 @@ void KisGradientSliderWidget::mousePressEvent( TQMouseEvent * e ) emit sigSelectedSegment( m_selectedSegment ); } } - tqrepaint(false); + repaint(false); } void KisGradientSliderWidget::mouseReleaseEvent ( TQMouseEvent * e ) @@ -186,7 +186,7 @@ void KisGradientSliderWidget::mouseMoveEvent( TQMouseEvent * e ) if ( m_drag != NO_DRAG) emit sigChangedSegment( m_currentSegment ); - tqrepaint(false); + repaint(false); } void KisGradientSliderWidget::contextMenuEvent( TQContextMenuEvent * e ) @@ -213,7 +213,7 @@ void KisGradientSliderWidget::slotMenuAction( int id ) break; } emit sigSelectedSegment( m_selectedSegment ); - tqrepaint(false); + repaint(false); } #include "kis_gradient_slider_widget.moc" diff --git a/chalk/ui/kis_int_spinbox.cc b/chalk/ui/kis_int_spinbox.cc index 1375cacc..2d704d86 100644 --- a/chalk/ui/kis_int_spinbox.cc +++ b/chalk/ui/kis_int_spinbox.cc @@ -36,7 +36,7 @@ #include <tqlabel.h> #include <tqpopupmenu.h> #include <tqlineedit.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvalidator.h> #include <knuminput.h> @@ -81,7 +81,7 @@ void KisIntSpinbox::init(int val) l->insertStretch(0, 1); d->m_numinput = new KIntSpinBox(0, 100, 1, val, 10, this, "KisIntSpinbox::KIntSpinBox"); - d->m_numinput->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed); + d->m_numinput->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed); d->m_numinput->setSuffix("%"); l->addWidget( d->m_numinput ); @@ -98,7 +98,7 @@ void KisIntSpinbox::init(int val) d->m_prevValue = val; setValue(val); setFocusProxy(d->m_numinput); - tqlayout(); + layout(); connect(d->m_numinput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinboxValueChanged(int))); connect(d->m_slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderValueChanged(int))); @@ -128,7 +128,7 @@ void KisIntSpinbox::setRange(int lower, int upper, int /*step*/) lower = kMin(upper, lower); d->m_slider->setRange(lower, upper); - tqlayout(); + layout(); } void KisIntSpinbox::setMinValue(int min) diff --git a/chalk/ui/kis_label_progress.cc b/chalk/ui/kis_label_progress.cc index c081111f..5920c3d0 100644 --- a/chalk/ui/kis_label_progress.cc +++ b/chalk/ui/kis_label_progress.cc @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqtoolbutton.h> #include <tqcursor.h> diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc index 424c405d..31756d7c 100644 --- a/chalk/ui/kis_layerbox.cc +++ b/chalk/ui/kis_layerbox.cc @@ -21,11 +21,11 @@ #include <tqbutton.h> #include <tqtoolbutton.h> -#include <tqbrush.h> +#include <brush.h> #include <tqfont.h> #include <tqfontmetrics.h> #include <tqhbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqpoint.h> #include <tqrect.h> @@ -68,7 +68,7 @@ KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *parent, const char vbox->setAutoAdd(true); m_lst = new WdgLayerBox(this); - setMinimumSize(m_lst->tqminimumSizeHint()); + setMinimumSize(m_lst->minimumSizeHint()); TQToolTip::add(m_lst->bnAdd, i18n("Create new layer")); @@ -594,7 +594,7 @@ TQPixmap KisLayerBox::loadPixmap(const TQString& filename, const KIconLoader& TQPixmap pixmap = il.loadIcon(filename, KIcon::NoGroup, size); if (pixmap.isNull()) - KMessageBox::error(0, i18n("Cannot find %1").tqarg(filename), + KMessageBox::error(0, i18n("Cannot find %1").arg(filename), i18n("Canvas")); return pixmap; @@ -626,7 +626,7 @@ void KisLayerBox::printChalkLayers() const return; TQString s = root->name(); if( dynamic_cast<KisGroupLayer*>( root ) ) - s = TQString("[%1]").tqarg( s ); + s = TQString("[%1]").arg( s ); if( m_image->activeLayer().data() == root ) s.prepend("*"); kdDebug() << (TQString().fill(' ', indent) + s) << endl; @@ -658,7 +658,7 @@ void KisLayerBox::printLayerboxLayers() const } TQString s = root->displayName(); if( root->isFolder() ) - s = TQString("[%1]").tqarg( s ); + s = TQString("[%1]").arg( s ); if( list()->activeLayer() == root ) s.prepend("*"); kdDebug() << (TQString().fill(' ', indent) + s) << endl; diff --git a/chalk/ui/kis_layerlist.cc b/chalk/ui/kis_layerlist.cc index 985bd0c6..24ae2738 100644 --- a/chalk/ui/kis_layerlist.cc +++ b/chalk/ui/kis_layerlist.cc @@ -181,16 +181,16 @@ TQString KisLayerItem::tooltip() const TQString text = super::tooltip(); text = text.left( text.length() - 8 ); //HACK -- strip the </table> TQString row = "<tr><td>%1</td><td>%2</td></tr>"; - text += row.tqarg( i18n( "Opacity:" ) ).tqarg( "%1%" ).tqarg( int( float( m_layer->opacity() * 100 ) / 255 + 0.5 ) ); - text += row.tqarg( i18n( "Composite mode:" ) ).tqarg( m_layer->compositeOp().id().name() ); + text += row.arg( i18n( "Opacity:" ) ).arg( "%1%" ).arg( int( float( m_layer->opacity() * 100 ) / 255 + 0.5 ) ); + text += row.arg( i18n( "Composite mode:" ) ).arg( m_layer->compositeOp().id().name() ); if( KisPaintLayer *player = dynamic_cast<KisPaintLayer*>( m_layer ) ) { - text += row.tqarg( i18n( "Colorspace:" ) ).tqarg( player->paintDevice()->colorSpace()->id().name() ); + text += row.arg( i18n( "Colorspace:" ) ).arg( player->paintDevice()->colorSpace()->id().name() ); if( KisProfile *profile = player->paintDevice()->colorSpace()->getProfile() ) - text += row.tqarg( i18n( "Profile:" ) ).tqarg( profile->productName() ); + text += row.arg( i18n( "Profile:" ) ).arg( profile->productName() ); } if( KisAdjustmentLayer *alayer = dynamic_cast<KisAdjustmentLayer*>( m_layer ) ) - text += row.tqarg( i18n( "Filter: " ) ).tqarg( KisFilterRegistry::instance()->get( alayer->filter()->name() )->id().name() ); + text += row.arg( i18n( "Filter: " ) ).arg( KisFilterRegistry::instance()->get( alayer->filter()->name() )->id().name() ); if( KisPartLayerImpl *player = dynamic_cast<KisPartLayerImpl*>( m_layer ) ) { TQString type = player->docType(); @@ -198,7 +198,7 @@ TQString KisLayerItem::tooltip() const type = player->childDoc()->document()->instance()->aboutData()->programName(); } - text += row.tqarg( i18n( "Document type: " ) ).tqarg( type ); + text += row.arg( i18n( "Document type: " ) ).arg( type ); } text += "</table>"; diff --git a/chalk/ui/kis_matrix_widget.ui b/chalk/ui/kis_matrix_widget.ui index ca238b60..2b866c2f 100644 --- a/chalk/ui/kis_matrix_widget.ui +++ b/chalk/ui/kis_matrix_widget.ui @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> diff --git a/chalk/ui/kis_multi_bool_filter_widget.cc b/chalk/ui/kis_multi_bool_filter_widget.cc index 806998bf..56d8265c 100644 --- a/chalk/ui/kis_multi_bool_filter_widget.cc +++ b/chalk/ui/kis_multi_bool_filter_widget.cc @@ -19,7 +19,7 @@ #include "kis_multi_bool_filter_widget.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <klocale.h> diff --git a/chalk/ui/kis_multi_double_filter_widget.cc b/chalk/ui/kis_multi_double_filter_widget.cc index 486bc770..5bccdcef 100644 --- a/chalk/ui/kis_multi_double_filter_widget.cc +++ b/chalk/ui/kis_multi_double_filter_widget.cc @@ -19,7 +19,7 @@ #include "kis_multi_double_filter_widget.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <knuminput.h> diff --git a/chalk/ui/kis_multi_integer_filter_widget.cc b/chalk/ui/kis_multi_integer_filter_widget.cc index 130a03d1..0cecabcc 100644 --- a/chalk/ui/kis_multi_integer_filter_widget.cc +++ b/chalk/ui/kis_multi_integer_filter_widget.cc @@ -19,7 +19,7 @@ #include "kis_multi_integer_filter_widget.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <knuminput.h> diff --git a/chalk/ui/kis_opengl_canvas_painter.cc b/chalk/ui/kis_opengl_canvas_painter.cc index 6ae12305..e6551f81 100644 --- a/chalk/ui/kis_opengl_canvas_painter.cc +++ b/chalk/ui/kis_opengl_canvas_painter.cc @@ -317,7 +317,7 @@ void KisOpenGLCanvasPainter::setWorldXForm(bool /*enable*/) { } -const TQWMatrix& KisOpenGLCanvasPainter::tqworldMatrix() const +const TQWMatrix& KisOpenGLCanvasPainter::worldMatrix() const { return m_defaultWorldMatrix; } @@ -809,11 +809,11 @@ void KisOpenGLCanvasPainter::drawText(const TQRect& /*r*/, int /*flags*/, const { } -void KisOpenGLCanvasPainter::tqdrawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/) +void KisOpenGLCanvasPainter::drawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/) { } -void KisOpenGLCanvasPainter::tqdrawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/) +void KisOpenGLCanvasPainter::drawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/) { } diff --git a/chalk/ui/kis_opengl_canvas_painter.h b/chalk/ui/kis_opengl_canvas_painter.h index 47983ce2..24f2e2e2 100644 --- a/chalk/ui/kis_opengl_canvas_painter.h +++ b/chalk/ui/kis_opengl_canvas_painter.h @@ -85,7 +85,7 @@ public: virtual void setViewport(int x, int y, int w, int h); virtual void setWorldXForm(bool); - virtual const TQWMatrix&tqworldMatrix() const; + virtual const TQWMatrix&worldMatrix() const; virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE); virtual void saveWorldMatrix(); @@ -175,8 +175,8 @@ public: virtual void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0); virtual void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0); - virtual void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0); - virtual void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0); + virtual void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0); + virtual void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0); virtual TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0); virtual TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0); diff --git a/chalk/ui/kis_paintop_box.cc b/chalk/ui/kis_paintop_box.cc index 20197dd2..6a5a3885 100644 --- a/chalk/ui/kis_paintop_box.cc +++ b/chalk/ui/kis_paintop_box.cc @@ -21,7 +21,7 @@ #include <tqstring.h> #include <tqvaluelist.h> #include <tqpixmap.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <klocale.h> @@ -180,7 +180,7 @@ void KisPaintopBox::updateOptionWidget() if (m_optionWidget != 0) { m_layout->remove(m_optionWidget); m_optionWidget->hide(); - m_layout->tqinvalidate(); + m_layout->invalidate(); } const KisPaintOpSettings *settings = paintopSettings(currentPaintop(), m_canvasController->currentInputDevice()); diff --git a/chalk/ui/kis_palette_view.cc b/chalk/ui/kis_palette_view.cc index a424d9ac..2bfe1985 100644 --- a/chalk/ui/kis_palette_view.cc +++ b/chalk/ui/kis_palette_view.cc @@ -29,7 +29,7 @@ #include <tqfile.h> #include <tqimage.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqvalidator.h> #include <tqpainter.h> @@ -78,7 +78,7 @@ KisPaletteView::KisPaletteView(TQWidget *parent, const char* name, int minWidth, minSize += TQSize(cellSize); setMinimumSize(minSize); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored)); } KisPaletteView::~KisPaletteView() diff --git a/chalk/ui/kis_palette_widget.cc b/chalk/ui/kis_palette_widget.cc index 2feb74c8..3618e8ad 100644 --- a/chalk/ui/kis_palette_widget.cc +++ b/chalk/ui/kis_palette_widget.cc @@ -26,7 +26,7 @@ #include <tqfile.h> #include <tqimage.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqvalidator.h> #include <tqpainter.h> @@ -67,16 +67,16 @@ KisPaletteWidget::KisPaletteWidget( TQWidget *parent, int minWidth, int cols) m_currentPalette = 0; - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); combo = new TQComboBox( false, this ); combo->setFocusPolicy( TQ_ClickFocus ); - tqlayout->addWidget(combo); + layout->addWidget(combo); m_view = new KisPaletteView(this, 0, minWidth, cols); - tqlayout->addWidget( m_view ); + layout->addWidget( m_view ); - //setFixedSize(tqsizeHint()); + //setFixedSize(sizeHint()); connect(combo, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotSetPalette(const TQString &))); diff --git a/chalk/ui/kis_part_layer.cc b/chalk/ui/kis_part_layer.cc index ace29965..5846a67b 100644 --- a/chalk/ui/kis_part_layer.cc +++ b/chalk/ui/kis_part_layer.cc @@ -94,19 +94,19 @@ void KisPartLayerImpl::childActivated(KoDocumentChild* child) // Called when another layer is made inactive void KisPartLayerImpl::childDeactivated(bool activated) { - // We probably changed, notify the image that it needs to tqrepaint where we currently updated - // We use the original tqgeometry + // We probably changed, notify the image that it needs to repaint where we currently updated + // We use the original geometry if (m_activated && !activated /* no clue, but debugging suggests it is false here */) { TQPtrList<KoView> views = m_doc->parentDocument()->views(); Q_ASSERT(views.count()); views.at(0)->disconnect(TQT_SIGNAL(activated(bool))); m_activated = false; - setDirty(m_doc->tqgeometry()); + setDirty(m_doc->geometry()); } } void KisPartLayerImpl::setX(TQ_INT32 x) { - TQRect rect = m_doc->tqgeometry(); + TQRect rect = m_doc->geometry(); // KisPaintDevice::move moves to absolute coordinates, not relative. Work around that here, // since the part is not necesarily started at (0,0) @@ -115,7 +115,7 @@ void KisPartLayerImpl::setX(TQ_INT32 x) { } void KisPartLayerImpl::setY(TQ_INT32 y) { - TQRect rect = m_doc->tqgeometry(); + TQRect rect = m_doc->geometry(); // KisPaintDevice::move moves to absolute coordinates, not relative. Work around that here, // since the part is not necesarily started at (0,0) @@ -125,7 +125,7 @@ void KisPartLayerImpl::setY(TQ_INT32 y) { void KisPartLayerImpl::paintSelection(TQImage &img, TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32 h) { uchar *j = img.bits(); - TQRect rect = m_doc->tqgeometry(); + TQRect rect = m_doc->geometry(); for (int y2 = y; y2 < h + y; ++y2) { for (int x2 = x; x2 < w + x; ++x2) { diff --git a/chalk/ui/kis_part_layer.h b/chalk/ui/kis_part_layer.h index d2ff10eb..377b37a0 100644 --- a/chalk/ui/kis_part_layer.h +++ b/chalk/ui/kis_part_layer.h @@ -95,10 +95,10 @@ public: virtual void setX(TQ_INT32 x); virtual void setY(TQ_INT32 y); - virtual TQ_INT32 x() const { return m_doc->tqgeometry() . x(); } - virtual TQ_INT32 y() const { return m_doc->tqgeometry() . y(); } //m_paintLayer->y(); } - virtual TQRect extent() const { return m_doc->tqgeometry(); } - virtual TQRect exactBounds() const { return m_doc->tqgeometry(); } + virtual TQ_INT32 x() const { return m_doc->geometry() . x(); } + virtual TQ_INT32 y() const { return m_doc->geometry() . y(); } //m_paintLayer->y(); } + virtual TQRect extent() const { return m_doc->geometry(); } + virtual TQRect exactBounds() const { return m_doc->geometry(); } virtual TQImage createThumbnail(TQ_INT32 w, TQ_INT32 h); @@ -113,7 +113,7 @@ public: virtual bool saveToXML(TQDomDocument doc, TQDomElement elem); private slots: /// Repaints our device with the data from the embedded part - //void tqrepaint(); + //void repaint(); /// When we activate the embedding, we clear ourselves void childActivated(KoDocumentChild* child); void childDeactivated(bool activated); diff --git a/chalk/ui/kis_pattern_chooser.cc b/chalk/ui/kis_pattern_chooser.cc index 70484b0a..39ffe61e 100644 --- a/chalk/ui/kis_pattern_chooser.cc +++ b/chalk/ui/kis_pattern_chooser.cc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <koIconChooser.h> @@ -30,7 +30,7 @@ KisPatternChooser::KisPatternChooser(TQWidget *parent, const char *name) : super { m_lbName = new TQLabel(this); - TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main tqlayout"); + TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout"); mainLayout->addWidget(m_lbName); mainLayout->addWidget(chooserWidget(), 10); @@ -47,7 +47,7 @@ void KisPatternChooser::update(KoIconItem *item) if (item) { KisPattern *pattern = static_cast<KisPattern *>(kisItem->resource()); - TQString text = TQString("%1 (%2 x %3)").tqarg(pattern->name()).tqarg(pattern->width()).tqarg(pattern->height()); + TQString text = TQString("%1 (%2 x %3)").arg(pattern->name()).arg(pattern->width()).arg(pattern->height()); m_lbName->setText(text); } diff --git a/chalk/ui/kis_previewdialog.cc b/chalk/ui/kis_previewdialog.cc index e2857c19..e9fb8443 100644 --- a/chalk/ui/kis_previewdialog.cc +++ b/chalk/ui/kis_previewdialog.cc @@ -20,7 +20,7 @@ #include <tqframe.h> #include <tqhbox.h> #include <tqgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include "kis_previewwidget.h" #include "kis_previewdialog.h" @@ -28,14 +28,14 @@ KisPreviewDialog::KisPreviewDialog( TQWidget * parent, const char * name, bool modal, const TQString &caption) : super (parent, name, modal, caption, Ok | Cancel, Ok) { - TQHBox* tqlayout = new TQHBox(this); - tqlayout->setSpacing( 6 ); + TQHBox* layout = new TQHBox(this); + layout->setSpacing( 6 ); - m_containerFrame = new TQFrame( tqlayout, "container" ); + m_containerFrame = new TQFrame( layout, "container" ); - m_preview = new KisPreviewWidget( tqlayout, "previewWidget" ); + m_preview = new KisPreviewWidget( layout, "previewWidget" ); - setMainWidget(tqlayout); + setMainWidget(layout); } KisPreviewDialog::~KisPreviewDialog() diff --git a/chalk/ui/kis_previewwidget.cc b/chalk/ui/kis_previewwidget.cc index 2598e79d..9bc7eb46 100644 --- a/chalk/ui/kis_previewwidget.cc +++ b/chalk/ui/kis_previewwidget.cc @@ -26,7 +26,7 @@ #include <tqpainter.h> #include <tqpoint.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqapplication.h> #include <tqcolor.h> diff --git a/chalk/ui/kis_previewwidgetbase.ui b/chalk/ui/kis_previewwidgetbase.ui index f1b52244..6ba86353 100644 --- a/chalk/ui/kis_previewwidgetbase.ui +++ b/chalk/ui/kis_previewwidgetbase.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -56,13 +56,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>1000</width> <height>1000</height> @@ -73,7 +73,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -122,7 +122,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -130,7 +130,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/ui/kis_qpaintdevice_canvas_painter.cc b/chalk/ui/kis_qpaintdevice_canvas_painter.cc index 4233bc11..5bf891ac 100644 --- a/chalk/ui/kis_qpaintdevice_canvas_painter.cc +++ b/chalk/ui/kis_qpaintdevice_canvas_painter.cc @@ -38,7 +38,7 @@ bool KisTQPaintDeviceCanvasPainter::begin(KisCanvasWidget *canvasWidget, bool un TQWidget *widget = dynamic_cast<TQWidget *>(canvasWidget); if (widget != 0) { - return m_painter.tqbegin(TQT_TQPAINTDEVICE(widget), unclipped); + return m_painter.begin(TQT_TQPAINTDEVICE(widget), unclipped); } else { return false; } @@ -46,7 +46,7 @@ bool KisTQPaintDeviceCanvasPainter::begin(KisCanvasWidget *canvasWidget, bool un bool KisTQPaintDeviceCanvasPainter::begin(const TQPaintDevice* paintDevice, bool unclipped) { - return m_painter.tqbegin(const_cast<TQPaintDevice*>(paintDevice), unclipped); + return m_painter.begin(const_cast<TQPaintDevice*>(paintDevice), unclipped); } bool KisTQPaintDeviceCanvasPainter::end() @@ -224,9 +224,9 @@ void KisTQPaintDeviceCanvasPainter::setWorldXForm(bool enable) m_painter.setWorldXForm(enable); } -const TQWMatrix& KisTQPaintDeviceCanvasPainter::tqworldMatrix() const +const TQWMatrix& KisTQPaintDeviceCanvasPainter::worldMatrix() const { - return m_painter.tqworldMatrix(); + return m_painter.worldMatrix(); } void KisTQPaintDeviceCanvasPainter::setWorldMatrix(const TQWMatrix& matrix, bool combine) @@ -481,17 +481,17 @@ void KisTQPaintDeviceCanvasPainter::drawLineSegments(const TQPointArray& pointAr void KisTQPaintDeviceCanvasPainter::drawPolyline(const TQPointArray& pointArray, int index, int npoints) { - m_painter.tqdrawPolyline(pointArray, index, npoints); + m_painter.drawPolyline(pointArray, index, npoints); } void KisTQPaintDeviceCanvasPainter::drawPolygon(const TQPointArray& pointArray, bool winding, int index, int npoints) { - m_painter.tqdrawPolygon(pointArray, winding, index, npoints); + m_painter.drawPolygon(pointArray, winding, index, npoints); } void KisTQPaintDeviceCanvasPainter::drawConvexPolygon(const TQPointArray& pointArray, int index, int npoints) { - m_painter.tqdrawConvexPolygon(pointArray, index, npoints); + m_painter.drawConvexPolygon(pointArray, index, npoints); } void KisTQPaintDeviceCanvasPainter::drawCubicBezier(const TQPointArray& pointArray, int index) @@ -614,14 +614,14 @@ void KisTQPaintDeviceCanvasPainter::drawText(const TQRect& r, int flags, const T #endif // USE_QT4 } -void KisTQPaintDeviceCanvasPainter::tqdrawTextItem(int x, int y, const TQTextItem& ti, int textflags) +void KisTQPaintDeviceCanvasPainter::drawTextItem(int x, int y, const TQTextItem& ti, int textflags) { - m_painter.tqdrawTextItem(x, y, ti, textflags); + m_painter.drawTextItem(x, y, ti, textflags); } -void KisTQPaintDeviceCanvasPainter::tqdrawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags) +void KisTQPaintDeviceCanvasPainter::drawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags) { - m_painter.tqdrawTextItem(p, ti, textflags); + m_painter.drawTextItem(p, ti, textflags); } TQRect KisTQPaintDeviceCanvasPainter::boundingRect(int x, int y, int w, int h, int flags, const TQString& text, int len, TQTextParag **intern) diff --git a/chalk/ui/kis_qpaintdevice_canvas_painter.h b/chalk/ui/kis_qpaintdevice_canvas_painter.h index 0dca7322..cef260b4 100644 --- a/chalk/ui/kis_qpaintdevice_canvas_painter.h +++ b/chalk/ui/kis_qpaintdevice_canvas_painter.h @@ -80,7 +80,7 @@ public: virtual void setViewport(int x, int y, int w, int h); virtual void setWorldXForm(bool); - virtual const TQWMatrix&tqworldMatrix() const; + virtual const TQWMatrix&worldMatrix() const; virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE); virtual void saveWorldMatrix(); @@ -170,8 +170,8 @@ public: virtual void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0); virtual void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0); - virtual void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0); - virtual void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0); + virtual void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0); + virtual void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0); virtual TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0); virtual TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0); diff --git a/chalk/ui/kis_ruler.cc b/chalk/ui/kis_ruler.cc index 44e86cae..8a8929a7 100644 --- a/chalk/ui/kis_ruler.cc +++ b/chalk/ui/kis_ruler.cc @@ -131,7 +131,7 @@ void KisRuler::updatePointer(TQ_INT32 x, TQ_INT32 y) if (m_pixmapBuffer) { if (m_orientation == Qt::Horizontal) { if (m_currentPosition != -1) - tqrepaint(m_currentPosition, 1, MARKER_WIDTH, MARKER_HEIGHT); + repaint(m_currentPosition, 1, MARKER_WIDTH, MARKER_HEIGHT); if (x != -1) { bitBlt(this, x, 1, &m_pixmapMarker, 0, 0, MARKER_WIDTH, MARKER_HEIGHT); @@ -139,7 +139,7 @@ void KisRuler::updatePointer(TQ_INT32 x, TQ_INT32 y) } } else { if (m_currentPosition != -1) - tqrepaint(1, m_currentPosition, MARKER_HEIGHT, MARKER_WIDTH); + repaint(1, m_currentPosition, MARKER_HEIGHT, MARKER_WIDTH); if (y != -1) { bitBlt(this, 1, y, &m_pixmapMarker, 0, 0, MARKER_HEIGHT, MARKER_WIDTH); @@ -184,8 +184,8 @@ void KisRuler::drawRuler() return; p.begin(m_pixmapBuffer); - p.setPen(tqcolorGroup().text()); - p.setBackgroundColor(tqcolorGroup().base()); + p.setPen(colorGroup().text()); + p.setBackgroundColor(colorGroup().base()); p.eraseRect(0, 0, m_pixmapBuffer->width(), m_pixmapBuffer->height()); switch (m_unit) { diff --git a/chalk/ui/kis_save_visitor.h b/chalk/ui/kis_save_visitor.h index 1205632b..de98548c 100644 --- a/chalk/ui/kis_save_visitor.h +++ b/chalk/ui/kis_save_visitor.h @@ -50,7 +50,7 @@ public: //connect(*layer->paintDevice(), TQT_SIGNAL(ioProgress(TQ_INT8)), m_img, TQT_SLOT(slotIOProgress(TQ_INT8))); TQString location = m_external ? TQString() : m_uri; - location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count); + location += m_img->name() + TQString("/layers/layer%1").arg(m_count); // Layer data if (m_store->open(location)) { @@ -70,7 +70,7 @@ public: if (annotation) { // save layer profile location = m_external ? TQString() : m_uri; - location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".icc"; + location += m_img->name() + TQString("/layers/layer%1").arg(m_count) + ".icc"; if (m_store->open(location)) { m_store->write(annotation->annotation()); @@ -85,7 +85,7 @@ public: if (mask) { // save layer profile location = m_external ? TQString() : m_uri; - location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".mask"; + location += m_img->name() + TQString("/layers/layer%1").arg(m_count) + ".mask"; if (m_store->open(location)) { if (!mask->write(m_store)) { @@ -130,7 +130,7 @@ public: if (layer->selection()) { TQString location = m_external ? TQString() : m_uri; - location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".selection"; + location += m_img->name() + TQString("/layers/layer%1").arg(m_count) + ".selection"; // Layer data if (m_store->open(location)) { @@ -147,7 +147,7 @@ public: if (layer->filter()) { TQString location = m_external ? TQString() : m_uri; location = m_external ? TQString() : m_uri; - location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".filterconfig"; + location += m_img->name() + TQString("/layers/layer%1").arg(m_count) + ".filterconfig"; if (m_store->open(location)) { TQString s = layer->filter()->toString(); diff --git a/chalk/ui/kis_savexml_visitor.h b/chalk/ui/kis_savexml_visitor.h index 15580752..b5e3d930 100644 --- a/chalk/ui/kis_savexml_visitor.h +++ b/chalk/ui/kis_savexml_visitor.h @@ -54,7 +54,7 @@ public: layerElement.setAttribute("visible", layer->visible()); layerElement.setAttribute("locked", layer->locked()); layerElement.setAttribute("layertype", "paintlayer"); - layerElement.setAttribute("filename", TQString("layer%1").tqarg(m_count)); + layerElement.setAttribute("filename", TQString("layer%1").arg(m_count)); layerElement.setAttribute("colorspacename", layer->paintDevice()->colorSpace()->id().id()); layerElement.setAttribute("hasmask", layer->hasMask()); m_elem.appendChild(layerElement); @@ -124,7 +124,7 @@ public: layerElement.setAttribute("visible", layer->visible()); layerElement.setAttribute("locked", layer->locked()); layerElement.setAttribute("layertype", "adjustmentlayer"); - layerElement.setAttribute("filename", TQString("layer%1").tqarg(m_count)); + layerElement.setAttribute("filename", TQString("layer%1").arg(m_count)); layerElement.setAttribute("x", layer->x()); layerElement.setAttribute("y", layer->y()); m_elem.appendChild(layerElement); diff --git a/chalk/ui/kis_selection_manager.cc b/chalk/ui/kis_selection_manager.cc index 0655b834..60ab80c7 100644 --- a/chalk/ui/kis_selection_manager.cc +++ b/chalk/ui/kis_selection_manager.cc @@ -18,7 +18,7 @@ #include <tqobject.h> #include <tqapplication.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqcolor.h> #include <tqcursor.h> @@ -236,7 +236,7 @@ void KisSelectionManager::setup(KActionCollection * collection) // this, TQT_SLOT(save()), // collection, "save_selection"); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); connect(cb, TQT_SIGNAL(dataChanged()), TQT_SLOT(clipboardDataChanged())); } diff --git a/chalk/ui/kis_selection_options.cc b/chalk/ui/kis_selection_options.cc index 32933b5a..17562722 100644 --- a/chalk/ui/kis_selection_options.cc +++ b/chalk/ui/kis_selection_options.cc @@ -20,7 +20,7 @@ #include <tqradiobutton.h> #include <tqcombobox.h> #include <kcolorbtn.h> -#include <tqlayout.h> +#include <layout.h> #include "kis_canvas_controller.h" #include "kis_canvas_subject.h" diff --git a/chalk/ui/kis_text_brush.cc b/chalk/ui/kis_text_brush.cc index ad681c75..b2ae9f36 100644 --- a/chalk/ui/kis_text_brush.cc +++ b/chalk/ui/kis_text_brush.cc @@ -63,7 +63,7 @@ void KisTextBrush::getFont() void KisTextBrush::rebuildTextBrush() { - lblFont->setText(TQString(m_font.family() + ", %1").tqarg(m_font.pointSize())); + lblFont->setText(TQString(m_font.family() + ", %1").arg(m_font.pointSize())); lblFont->setFont(m_font); m_textBrushResource->setFont(m_font); m_textBrushResource->setText(lineEdit->text()); diff --git a/chalk/ui/kis_tool.cc b/chalk/ui/kis_tool.cc index d6e600af..807b8ffc 100644 --- a/chalk/ui/kis_tool.cc +++ b/chalk/ui/kis_tool.cc @@ -56,9 +56,9 @@ KisTool::~KisTool() TQWidget* KisTool::createOptionWidget(TQWidget* parent) { - d->optionWidget = new TQLabel(i18n("No options for %1.").tqarg(d->uiname), parent); + d->optionWidget = new TQLabel(i18n("No options for %1.").arg(d->uiname), parent); d->optionWidget->setCaption(d->uiname); - d->optionWidget->tqsetAlignment(TQt::AlignCenter); + d->optionWidget->setAlignment(TQt::AlignCenter); return d->optionWidget; } diff --git a/chalk/ui/kis_tool.h b/chalk/ui/kis_tool.h index b9abdc75..bda3b7e7 100644 --- a/chalk/ui/kis_tool.h +++ b/chalk/ui/kis_tool.h @@ -47,7 +47,7 @@ class KisMoveEvent; class KisCanvasPainter; enum enumToolType { - TOOL_SHAPE = 0, // Geometric tqshapes like ellipses and lines + TOOL_SHAPE = 0, // Geometric shapes like ellipses and lines TOOL_FREEHAND = 1, // Freehand drawing tools TOOL_TRANSFORM = 2, // Tools that transform the layer TOOL_FILL = 3, // Tools that fill parts of the canvas diff --git a/chalk/ui/kis_tool_dummy.cc b/chalk/ui/kis_tool_dummy.cc index 51eb1407..bc478d4e 100644 --- a/chalk/ui/kis_tool_dummy.cc +++ b/chalk/ui/kis_tool_dummy.cc @@ -98,7 +98,7 @@ TQWidget* KisToolDummy::createOptionWidget(TQWidget* parent) { m_optionWidget = new TQLabel(i18n("Layer is locked or invisible."), parent); m_optionWidget->setCaption(i18n("No Active Tool")); - m_optionWidget->tqsetAlignment(TQt::AlignCenter); + m_optionWidget->setAlignment(TQt::AlignCenter); return m_optionWidget; } diff --git a/chalk/ui/kis_tool_freehand.cc b/chalk/ui/kis_tool_freehand.cc index adbf9b8a..bb7dbc1e 100644 --- a/chalk/ui/kis_tool_freehand.cc +++ b/chalk/ui/kis_tool_freehand.cc @@ -20,7 +20,7 @@ */ #include <tqevent.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwidget.h> #include <tqrect.h> @@ -318,7 +318,7 @@ void KisToolFreehand::paintOutline(const KisPoint& point) { } KisCanvas *canvas = controller->kiscanvas(); - canvas->tqrepaint(); + canvas->repaint(); KisBrush *brush = m_subject->currentBrush(); // There may not be a brush present, and we shouldn't crash in that case diff --git a/chalk/ui/kis_tool_paint.cc b/chalk/ui/kis_tool_paint.cc index 9d37dae6..e3cf7152 100644 --- a/chalk/ui/kis_tool_paint.cc +++ b/chalk/ui/kis_tool_paint.cc @@ -18,7 +18,7 @@ #include <tqwidget.h> #include <tqrect.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqpushbutton.h> #include <tqwhatsthis.h> @@ -161,12 +161,12 @@ TQWidget* KisToolPaint::optionWidget() return m_optionWidget; } -void KisToolPaint::addOptionWidgetLayout(TQLayout *tqlayout) +void KisToolPaint::addOptionWidgetLayout(TQLayout *layout) { Q_ASSERT(m_optionWidget != 0); Q_ASSERT(m_optionWidgetLayout != 0); int rowCount = m_optionWidgetLayout->numRows(); - m_optionWidgetLayout->addMultiCellLayout(tqlayout, rowCount, rowCount, 0, 1); + m_optionWidgetLayout->addMultiCellLayout(layout, rowCount, rowCount, 0, 1); } void KisToolPaint::addOptionWidgetOption(TQWidget *control, TQWidget *label) diff --git a/chalk/ui/kis_tool_paint.h b/chalk/ui/kis_tool_paint.h index 7fb4b819..05dbf450 100644 --- a/chalk/ui/kis_tool_paint.h +++ b/chalk/ui/kis_tool_paint.h @@ -20,7 +20,7 @@ #define KIS_TOOL_PAINT_H_ #include <tqcursor.h> -#include <tqlayout.h> +#include <layout.h> #include <koffice_export.h> @@ -88,8 +88,8 @@ public slots: protected: void notifyModified() const; - // Add the tool-specific tqlayout to the default option widget's tqlayout. - void addOptionWidgetLayout(TQLayout *tqlayout); + // Add the tool-specific layout to the default option widget's layout. + void addOptionWidgetLayout(TQLayout *layout); private: void updateCompositeOpComboBox(); diff --git a/chalk/ui/kis_tool_registry.cc b/chalk/ui/kis_tool_registry.cc index e7696f0b..045b43f9 100644 --- a/chalk/ui/kis_tool_registry.cc +++ b/chalk/ui/kis_tool_registry.cc @@ -37,8 +37,8 @@ KisToolRegistry *KisToolRegistry::m_singleton = 0; KisToolRegistry::KisToolRegistry() { // Load all modules: color models, paintops, filters - KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/Tool"), - TQString::tqfromLatin1("(Type == 'Service') and " + KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Tool"), + TQString::fromLatin1("(Type == 'Service') and " "([X-Chalk-Version] == 2)")); KTrader::OfferList::ConstIterator iter; diff --git a/chalk/ui/kis_tool_shape.cc b/chalk/ui/kis_tool_shape.cc index 9e76f159..0c9ddc4a 100644 --- a/chalk/ui/kis_tool_shape.cc +++ b/chalk/ui/kis_tool_shape.cc @@ -17,7 +17,7 @@ */ #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcombobox.h> #include <tqlabel.h> @@ -29,7 +29,7 @@ KisToolShape::KisToolShape(const TQString& UIName) : super(UIName) { - m_tqshapeOptionsWidget = 0; + m_shapeOptionsWidget = 0; m_optionLayout = 0; } @@ -41,23 +41,23 @@ TQWidget* KisToolShape::createOptionWidget(TQWidget* parent) { TQWidget *widget = super::createOptionWidget(parent); - m_tqshapeOptionsWidget = new WdgGeometryOptions(0); - Q_CHECK_PTR(m_tqshapeOptionsWidget); + m_shapeOptionsWidget = new WdgGeometryOptions(0); + Q_CHECK_PTR(m_shapeOptionsWidget); m_optionLayout = new TQGridLayout(widget, 2, 1); // super::addOptionWidgetLayout(m_optionLayout); - m_tqshapeOptionsWidget->cmbFill->reparent(widget, TQPoint(0,0), true); - m_tqshapeOptionsWidget->textLabel3->reparent(widget, TQPoint(0,0), true); - addOptionWidgetOption(m_tqshapeOptionsWidget->cmbFill, m_tqshapeOptionsWidget->textLabel3); + m_shapeOptionsWidget->cmbFill->reparent(widget, TQPoint(0,0), true); + m_shapeOptionsWidget->textLabel3->reparent(widget, TQPoint(0,0), true); + addOptionWidgetOption(m_shapeOptionsWidget->cmbFill, m_shapeOptionsWidget->textLabel3); return widget; } KisPainter::FillStyle KisToolShape::fillStyle(void) { - if (m_tqshapeOptionsWidget) { - return static_cast<KisPainter::FillStyle>(m_tqshapeOptionsWidget->cmbFill->currentItem()); + if (m_shapeOptionsWidget) { + return static_cast<KisPainter::FillStyle>(m_shapeOptionsWidget->cmbFill->currentItem()); } else { return KisPainter::FillStyleNone; } diff --git a/chalk/ui/kis_tool_shape.h b/chalk/ui/kis_tool_shape.h index e8974c79..45767fe4 100644 --- a/chalk/ui/kis_tool_shape.h +++ b/chalk/ui/kis_tool_shape.h @@ -46,7 +46,7 @@ protected: private: TQGridLayout *m_optionLayout; - WdgGeometryOptions *m_tqshapeOptionsWidget; + WdgGeometryOptions *m_shapeOptionsWidget; }; #endif // KIS_TOOL_SHAPE_H_ diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc index 4455f17d..629072ff 100644 --- a/chalk/ui/kis_view.cc +++ b/chalk/ui/kis_view.cc @@ -313,8 +313,8 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c m_brushesAndStuffToolBar = new KisControlFrame(mainWindow(), this); // Load all plugins - KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/ViewPlugin"), - TQString::tqfromLatin1("(Type == 'Service') and " + KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/ViewPlugin"), + TQString::fromLatin1("(Type == 'Service') and " "([X-Chalk-Version] == 2)")); KTrader::OfferList::ConstIterator iter; for(iter = offers.begin(); iter != offers.end(); ++iter) @@ -494,11 +494,11 @@ void KisView::setupRulers() void KisView::updateStatusBarZoomLabel () { if (zoom() < 1 - EPSILON) { - m_statusBarZoomLabel->setText(i18n("Zoom %1%").tqarg(zoom() * 100, 0, 'g', 4)); + m_statusBarZoomLabel->setText(i18n("Zoom %1%").arg(zoom() * 100, 0, 'g', 4)); } else { - m_statusBarZoomLabel->setText(i18n("Zoom %1%").tqarg(zoom() * 100, 0, 'f', 0)); + m_statusBarZoomLabel->setText(i18n("Zoom %1%").arg(zoom() * 100, 0, 'f', 0)); } - m_statusBarZoomLabel->setMaximumWidth(m_statusBarZoomLabel->fontMetrics().width(i18n("Zoom %1%").tqarg("0.8888 "))); + m_statusBarZoomLabel->setMaximumWidth(m_statusBarZoomLabel->fontMetrics().width(i18n("Zoom %1%").arg("0.8888 "))); } void KisView::updateStatusBarSelectionLabel() @@ -513,7 +513,7 @@ void KisView::updateStatusBarSelectionLabel() if (dev) { if (dev->hasSelection()) { TQRect r = dev->selection()->selectedExactRect(); - m_statusBarSelectionLabel->setText( i18n("Selection Active: x = %1 y = %2 width = %3 height = %4").tqarg(r.x()).tqarg(r.y()).tqarg( r.width()).tqarg( r.height())); + m_statusBarSelectionLabel->setText( i18n("Selection Active: x = %1 y = %2 width = %3 height = %4").arg(r.x()).arg(r.y()).arg( r.width()).arg( r.height())); return; } } @@ -682,7 +682,7 @@ void KisView::setupActions() new KAction(i18n("Edit Palette..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditPalette()), actionCollection(), "edit_palette"); - // XXX: This triggers a tqrepaint of the image, but way too early + // XXX: This triggers a repaint of the image, but way too early //showRuler(); } @@ -694,7 +694,7 @@ void KisView::resizeEvent(TQResizeEvent *) } KisImageSP img = currentImg(); - TQ_INT32 scrollBarExtent = tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent); + TQ_INT32 scrollBarExtent = tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent); TQ_INT32 drawH; TQ_INT32 drawW; TQ_INT32 docW; @@ -858,7 +858,7 @@ void KisView::resizeEvent(TQResizeEvent *) if (!m_canvasPixmap.isNull() && !exposedRegion.isEmpty()) { - TQMemArray<TQRect> rects = exposedRegion.tqrects(); + TQMemArray<TQRect> rects = exposedRegion.rects(); for (unsigned int i = 0; i < rects.count(); i++) { TQRect r = rects[i]; @@ -958,11 +958,11 @@ void KisView::updateTQPaintDeviceCanvas(const TQRect& imageRect) TQRegion rg(vr); rg -= TQRegion(windowToView(TQRect(0, 0, img->width(), img->height()))); - TQMemArray<TQRect> rects = rg.tqrects(); + TQMemArray<TQRect> rects = rg.rects(); for (unsigned int i = 0; i < rects.count(); i++) { TQRect er = rects[i]; - gc.fillRect(er, tqcolorGroup().mid()); + gc.fillRect(er, colorGroup().mid()); } wr &= TQRect(0, 0, img->width(), img->height()); } @@ -1014,7 +1014,7 @@ void KisView::updateTQPaintDeviceCanvas(const TQRect& imageRect) } // paintGuides(); } else { - gc.fillRect(vr, tqcolorGroup().mid()); + gc.fillRect(vr, colorGroup().mid()); } } } @@ -1025,7 +1025,7 @@ void KisView::paintTQPaintDeviceView(const TQRegion& canvasRegion) Q_ASSERT(m_canvas->TQPaintDeviceWidget() != 0); if (m_canvas->TQPaintDeviceWidget() != 0 && !m_canvasPixmap.isNull()) { - TQMemArray<TQRect> rects = canvasRegion.tqrects(); + TQMemArray<TQRect> rects = canvasRegion.rects(); for (unsigned int i = 0; i < rects.count(); i++) { TQRect r = rects[i]; @@ -1066,7 +1066,7 @@ void KisView::paintOpenGLView(const TQRect& canvasRect) glDrawBuffer(GL_BACK); - TQColor widgetBackgroundColor = tqcolorGroup().mid(); + TQColor widgetBackgroundColor = colorGroup().mid(); glClearColor(widgetBackgroundColor.red() / 255.0, widgetBackgroundColor.green() / 255.0, widgetBackgroundColor.blue() / 255.0, 1.0); glClear(GL_COLOR_BUFFER_BIT); @@ -1226,7 +1226,7 @@ void KisView::updateCanvas(const TQRect& imageRect) } else { updateTQPaintDeviceCanvas(imageRect); //m_canvas->update(windowToView(imageRect)); - m_canvas->tqrepaint(windowToView(imageRect)); + m_canvas->repaint(windowToView(imageRect)); } } @@ -1241,7 +1241,7 @@ void KisView::refreshKisCanvas() updateCanvas(imageRect); // Enable this if updateCanvas does an m_canvas->update() - //m_canvas->tqrepaint(); + //m_canvas->repaint(); } void KisView::selectionDisplayToggled(bool displaySelection) @@ -2965,7 +2965,7 @@ void KisView::layerDuplicate() return; KisLayerSP dup = active->clone(); - dup->setName(i18n("Duplicate of '%1'").tqarg(active->name())); + dup->setName(i18n("Duplicate of '%1'").arg(active->name())); img->addLayer(dup, active->parent().data(), active); if (dup) { img->activate( dup ); @@ -3086,7 +3086,7 @@ void KisView::scrollH(int value) bitBlt(&m_canvasPixmap, xShift, 0, &m_canvasPixmap, 0, 0, m_canvasPixmap.width() - xShift, m_canvasPixmap.height()); updateTQPaintDeviceCanvas(viewToWindow(drawRect)); - m_canvas->tqrepaint(); + m_canvas->repaint(); } } else if (xShift < 0) { @@ -3098,7 +3098,7 @@ void KisView::scrollH(int value) bitBlt(&m_canvasPixmap, 0, 0, &m_canvasPixmap, -xShift, 0, m_canvasPixmap.width() + xShift, m_canvasPixmap.height()); updateTQPaintDeviceCanvas(viewToWindow(drawRect)); - m_canvas->tqrepaint(); + m_canvas->repaint(); } } if (m_oldTool) { @@ -3131,7 +3131,7 @@ void KisView::scrollV(int value) bitBlt(&m_canvasPixmap, 0, yShift, &m_canvasPixmap, 0, 0, m_canvasPixmap.width(), m_canvasPixmap.height() - yShift); updateTQPaintDeviceCanvas(viewToWindow(drawRect)); - m_canvas->tqrepaint(); + m_canvas->repaint(); } } else if (yShift < 0) { @@ -3143,7 +3143,7 @@ void KisView::scrollV(int value) bitBlt(&m_canvasPixmap, 0, 0, &m_canvasPixmap, 0, -yShift, m_canvasPixmap.width(), m_canvasPixmap.height() + yShift); updateTQPaintDeviceCanvas(viewToWindow(drawRect)); - m_canvas->tqrepaint(); + m_canvas->repaint(); } } if (m_oldTool) { @@ -3470,7 +3470,7 @@ bool KisView::eventFilter(TQObject *o, TQEvent *e) // We ignore device change due to mouse events for a short duration // after a tablet event, since these are almost certainly mouse events - // sent to tqreceivers that don't accept the tablet event. + // sent to receivers that don't accept the tablet event. m_tabletEventTimer.start(); break; } @@ -3544,7 +3544,7 @@ bool KisView::eventFilter(TQObject *o, TQEvent *e) mgr = img->guides(); if (e->type() == TQEvent::MouseMove && (me->state() & Qt::LeftButton)) { - bool flag = tqgeometry().contains(pt); + bool flag = geometry().contains(pt); KisGuideSP gd; if (m_currentGuide == 0 && flag) { diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp index 542e257d..3ec87a6e 100644 --- a/chalk/ui/kobirdeyepanel.cpp +++ b/chalk/ui/kobirdeyepanel.cpp @@ -19,7 +19,7 @@ */ #include <tqpixmap.h> #include <tqimage.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqframe.h> #include <tqlabel.h> @@ -194,8 +194,8 @@ void KoBirdEyePanel::sliderChanged( int v ) void KoBirdEyePanel::cursorPosChanged(TQ_INT32 xpos, TQ_INT32 ypos) { - m_page->txtX->setText(TQString("%L1").tqarg(xpos, 5)); - m_page->txtY->setText(TQString("%L1").tqarg(ypos, 5)); + m_page->txtX->setText(TQString("%L1").arg(xpos, 5)); + m_page->txtY->setText(TQString("%L1").arg(ypos, 5)); } void KoBirdEyePanel::setThumbnailProvider(KoThumbnailAdapter * thumbnailProvider) @@ -238,7 +238,7 @@ void KoBirdEyePanel::slotUpdate(const TQRect & r) TQPainter painter(&m_thumbnail); - painter.fillRect(thumbnailRect, tqcolorGroup().mid()); + painter.fillRect(thumbnailRect, colorGroup().mid()); painter.drawImage(thumbnailRect.x(), thumbnailRect.y(), thumbnailImage); } } @@ -583,7 +583,7 @@ void KoBirdEyePanel::renderView() TQPainter painter(&m_viewBuffer); - painter.fillRect(0, 0, m_viewBuffer.width(), m_viewBuffer.height(), tqcolorGroup().mid()); + painter.fillRect(0, 0, m_viewBuffer.width(), m_viewBuffer.height(), colorGroup().mid()); if (!m_thumbnail.isNull()) { diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp index 96e1e032..19f49200 100644 --- a/chalk/ui/layerlist.cpp +++ b/chalk/ui/layerlist.cpp @@ -142,9 +142,9 @@ public: { m_img = m_item->tooltipPreview(); m_timer.start( 15000, true ); - if( !isVisible() || tqsizeHint() != size() ) + if( !isVisible() || sizeHint() != size() ) { - resize( tqsizeHint() ); + resize( sizeHint() ); position(); } if( !isVisible() ) @@ -168,8 +168,8 @@ public: { TQPixmap buf( width(), height() ); TQPainter p( &buf ); - buf.fill( tqcolorGroup().background() ); - p.setPen( tqcolorGroup().foreground() ); + buf.fill( colorGroup().background() ); + p.setPen( colorGroup().foreground() ); p.drawRect( buf.rect() ); TQSimpleRichText text( m_item->tooltip(), TQToolTip::font() ); @@ -188,12 +188,12 @@ public: p.translate( m_img.width() + 10, 0 ); } - text.draw( &p, 0, 0, rect(), tqcolorGroup() ); + text.draw( &p, 0, 0, rect(), colorGroup() ); painter->drawPixmap( 0, 0, buf ); } - virtual TQSize tqsizeHint() const + virtual TQSize sizeHint() const { if( !m_item ) return TQSize( 0, 0 ); @@ -217,7 +217,7 @@ public: void position() { const TQRect drect = TQApplication::desktop()->availableGeometry( TQToolTip::parentWidget() ); - const TQSize size = tqsizeHint(); + const TQSize size = sizeHint(); const int width = size.width(), height = size.height(); const TQRect tmp = m_item->rect(); const TQRect irect( m_list->viewport()->mapToGlobal( m_list->contentsToViewport(tmp.topLeft()) ), tmp.size() ); @@ -1219,15 +1219,15 @@ TQString LayerItem::tooltip() const { TQString tip; tip += "<table cellspacing=\"0\" cellpadding=\"0\">"; - tip += TQString("<tr><td colspan=\"2\" align=\"center\"><b>%1</b></td></tr>").tqarg( displayName() ); + tip += TQString("<tr><td colspan=\"2\" align=\"center\"><b>%1</b></td></tr>").arg( displayName() ); TQString row = "<tr><td>%1</td><td>%2</td></tr>"; for( int i = 0, n = listView()->d->properties.count(); i < n; ++i ) if( !isFolder() || listView()->d->properties[i].validForFolders ) { if( d->properties[i] ) - tip += row.tqarg( i18n( "%1:" ).tqarg( listView()->d->properties[i].displayName ) ).tqarg( i18n( "Yes" ) ); + tip += row.arg( i18n( "%1:" ).arg( listView()->d->properties[i].displayName ) ).arg( i18n( "Yes" ) ); else - tip += row.tqarg( i18n( "%1:" ).tqarg( listView()->d->properties[i].displayName ) ).tqarg( i18n( "No" ) ); + tip += row.arg( i18n( "%1:" ).arg( listView()->d->properties[i].displayName ) ).arg( i18n( "No" ) ); } tip += "</table>"; return tip; @@ -1277,7 +1277,7 @@ void LayerItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int colum p.setFont( font() ); - const TQColorGroup cg_ = isEnabled() ? listView()->tqpalette().active() : listView()->tqpalette().disabled(); + const TQColorGroup cg_ = isEnabled() ? listView()->palette().active() : listView()->palette().disabled(); const TQColor bg = isSelected() ? cg_.highlight() : isAlternate() ? listView()->alternateBackground() diff --git a/chalk/ui/squeezedcombobox.cpp b/chalk/ui/squeezedcombobox.cpp index 6b957a26..31a044f2 100644 --- a/chalk/ui/squeezedcombobox.cpp +++ b/chalk/ui/squeezedcombobox.cpp @@ -50,7 +50,7 @@ void SqueezedComboBoxTip::maybeTip( const TQPoint &pos ) TQListBoxItem* selectedItem = listBox->itemAt( pos ); if (selectedItem) { - TQRect positionToolTip = listBox->tqitemRect( selectedItem ); + TQRect positionToolTip = listBox->itemRect( selectedItem ); TQString toolTipText = m_originalWidget->itemHighlighted(); if (!toolTipText.isNull()) tip(positionToolTip, toolTipText); @@ -90,7 +90,7 @@ bool SqueezedComboBox::contains( const TQString& _text ) const return false; } -TQSize SqueezedComboBox::tqsizeHint() const +TQSize SqueezedComboBox::sizeHint() const { constPolish(); TQFontMetrics fm = fontMetrics(); diff --git a/chalk/ui/squeezedcombobox.h b/chalk/ui/squeezedcombobox.h index 03a1cdb9..50f4bc77 100644 --- a/chalk/ui/squeezedcombobox.h +++ b/chalk/ui/squeezedcombobox.h @@ -117,9 +117,9 @@ public: TQString itemHighlighted( ); /** - * Sets the tqsizeHint() of this widget. + * Sets the sizeHint() of this widget. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; private slots: void slotTimeOut(); diff --git a/chalk/ui/wdgapplyprofile.ui b/chalk/ui/wdgapplyprofile.ui index 5227d7fb..39de910a 100644 --- a/chalk/ui/wdgapplyprofile.ui +++ b/chalk/ui/wdgapplyprofile.ui @@ -71,7 +71,7 @@ <property name="text"> <string>The image data you want to paste does not have an ICM profile associated with it. If you do not select a profile, Chalk will assume that the image data is encoded in the import profile defined in the Settings dialog.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/chalk/ui/wdgautobrush.ui b/chalk/ui/wdgautobrush.ui index 00683ca9..6d3a572d 100644 --- a/chalk/ui/wdgautobrush.ui +++ b/chalk/ui/wdgautobrush.ui @@ -26,7 +26,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -48,7 +48,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout21</cstring> + <cstring>layout21</cstring> </property> <grid> <property name="name"> @@ -129,13 +129,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>16</width> <height>32767</height> @@ -169,7 +169,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout23</cstring> + <cstring>layout23</cstring> </property> <grid> <property name="name"> @@ -242,13 +242,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>16</width> <height>32767</height> @@ -273,7 +273,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -291,7 +291,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>95</width> <height>95</height> @@ -332,7 +332,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/chalk/ui/wdgautogradient.ui b/chalk/ui/wdgautogradient.ui index 94a8a137..aec6907d 100644 --- a/chalk/ui/wdgautogradient.ui +++ b/chalk/ui/wdgautogradient.ui @@ -45,7 +45,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>30</height> @@ -57,7 +57,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <property name="font"> <font> @@ -71,7 +71,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <property name="font"> <font> @@ -95,7 +95,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <property name="font"> <font> @@ -129,7 +129,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>30</height> @@ -150,7 +150,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <property name="font"> <font> @@ -184,7 +184,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>30</height> @@ -207,7 +207,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <property name="font"> <font> @@ -287,7 +287,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11_2</cstring> + <cstring>layout11_2</cstring> </property> <property name="font"> <font> diff --git a/chalk/ui/wdgbirdeye.ui b/chalk/ui/wdgbirdeye.ui index 2b2b7910..506e2803 100644 --- a/chalk/ui/wdgbirdeye.ui +++ b/chalk/ui/wdgbirdeye.ui @@ -39,7 +39,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -53,7 +53,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -71,13 +71,13 @@ <property name="name"> <cstring>txtX</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -105,13 +105,13 @@ <property name="name"> <cstring>txtY</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -158,13 +158,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>75</width> <height>75</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>200</width> <height>75</height> @@ -186,7 +186,7 @@ <property name="name"> <cstring>toolbar</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32</height> @@ -195,7 +195,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/ui/wdgcolorsettings.ui b/chalk/ui/wdgcolorsettings.ui index 6f9e41e6..f4a0f695 100644 --- a/chalk/ui/wdgcolorsettings.ui +++ b/chalk/ui/wdgcolorsettings.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -47,7 +47,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -228,7 +228,7 @@ The different rendering intent methods will affect only what is shown on screen, <property name="text"> <string><p>Select what color profile to add when pasting from external applications that do not use a color profile.</p></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -266,7 +266,7 @@ The different rendering intent methods will affect only what is shown on screen, </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -295,7 +295,7 @@ The different rendering intent methods will affect only what is shown on screen, <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/chalk/ui/wdgcustombrush.ui b/chalk/ui/wdgcustombrush.ui index dba17dac..f1c67ffa 100644 --- a/chalk/ui/wdgcustombrush.ui +++ b/chalk/ui/wdgcustombrush.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> @@ -103,7 +103,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -119,7 +119,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -138,7 +138,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>50</height> @@ -158,7 +158,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -169,7 +169,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> diff --git a/chalk/ui/wdgcustompattern.ui b/chalk/ui/wdgcustompattern.ui index 7936f20b..5b03a7f0 100644 --- a/chalk/ui/wdgcustompattern.ui +++ b/chalk/ui/wdgcustompattern.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -49,7 +49,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -65,7 +65,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -84,7 +84,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>50</height> @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -115,7 +115,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> diff --git a/chalk/ui/wdgdisplaysettings.ui b/chalk/ui/wdgdisplaysettings.ui index 64b33f16..757b6b27 100644 --- a/chalk/ui/wdgdisplaysettings.ui +++ b/chalk/ui/wdgdisplaysettings.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -49,7 +49,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>31</height> diff --git a/chalk/ui/wdggeneralsettings.ui b/chalk/ui/wdggeneralsettings.ui index 53f3ef90..9383fbfd 100644 --- a/chalk/ui/wdggeneralsettings.ui +++ b/chalk/ui/wdggeneralsettings.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -37,10 +37,10 @@ <cstring>textLabel1</cstring> </property> <property name="text"> - <string>&Cursor tqshape:</string> + <string>&Cursor shape:</string> </property> <property name="buddy" stdset="0"> - <cstring>m_cmbtqCursorShape</cstring> + <cstring>m_cmbCursorShape</cstring> </property> </widget> <widget class="TQComboBox"> @@ -65,7 +65,7 @@ </property> </item> <property name="name"> - <cstring>m_cmbtqCursorShape</cstring> + <cstring>m_cmbCursorShape</cstring> </property> </widget> </hbox> @@ -112,7 +112,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -148,7 +148,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> diff --git a/chalk/ui/wdggridsettings.ui b/chalk/ui/wdggridsettings.ui index 18c1f528..dbb90e0a 100644 --- a/chalk/ui/wdggridsettings.ui +++ b/chalk/ui/wdggridsettings.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -192,7 +192,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>34</width> <height>20</height> @@ -214,7 +214,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -222,7 +222,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <grid> <property name="name"> @@ -294,13 +294,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>16</width> <height>32767</height> @@ -320,7 +320,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -357,7 +357,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -427,7 +427,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/chalk/ui/wdglayerbox.ui b/chalk/ui/wdglayerbox.ui index d977802e..02c15129 100644 --- a/chalk/ui/wdglayerbox.ui +++ b/chalk/ui/wdglayerbox.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -42,7 +42,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>10</height> @@ -74,7 +74,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -84,13 +84,13 @@ <property name="name"> <cstring>bnAdd</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>18</width> <height>18</height> @@ -110,13 +110,13 @@ <property name="name"> <cstring>bnLower</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>18</width> <height>18</height> @@ -136,13 +136,13 @@ <property name="name"> <cstring>bnRaise</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>18</width> <height>18</height> @@ -162,13 +162,13 @@ <property name="name"> <cstring>bnProperties</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>18</width> <height>18</height> @@ -191,7 +191,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -202,13 +202,13 @@ <property name="name"> <cstring>bnDelete</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>18</width> <height>18</height> diff --git a/chalk/ui/wdgnewimage.ui b/chalk/ui/wdgnewimage.ui index dd310483..82548e11 100644 --- a/chalk/ui/wdgnewimage.ui +++ b/chalk/ui/wdgnewimage.ui @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>61</height> @@ -230,7 +230,7 @@ <property name="text"> <string>Description:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> <property name="buddy" stdset="0"> @@ -316,7 +316,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -332,7 +332,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>480</width> <height>21</height> @@ -359,7 +359,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>0</height> diff --git a/chalk/ui/wdgpalettechooser.ui b/chalk/ui/wdgpalettechooser.ui index 3654031b..c4de4e1d 100644 --- a/chalk/ui/wdgpalettechooser.ui +++ b/chalk/ui/wdgpalettechooser.ui @@ -29,7 +29,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>255</width> <height>20</height> diff --git a/chalk/ui/wdgperformancesettings.ui b/chalk/ui/wdgperformancesettings.ui index c8e4404b..82deb5b9 100644 --- a/chalk/ui/wdgperformancesettings.ui +++ b/chalk/ui/wdgperformancesettings.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -61,7 +61,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>81</width> <height>20</height> @@ -72,7 +72,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -93,7 +93,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be <property name="name"> <cstring>m_swappiness</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>600</width> <height>32767</height> @@ -127,7 +127,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>139</height> diff --git a/chalk/ui/wdgpressuresettings.ui b/chalk/ui/wdgpressuresettings.ui index 90f59a33..2a21e377 100644 --- a/chalk/ui/wdgpressuresettings.ui +++ b/chalk/ui/wdgpressuresettings.ui @@ -26,7 +26,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>89</height> diff --git a/chalk/ui/wdgselectionoptions.ui b/chalk/ui/wdgselectionoptions.ui index ca71ee01..f6f02f39 100644 --- a/chalk/ui/wdgselectionoptions.ui +++ b/chalk/ui/wdgselectionoptions.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/ui/wdgshapeoptions.ui b/chalk/ui/wdgshapeoptions.ui index 563c7dbc..2c485c4d 100644 --- a/chalk/ui/wdgshapeoptions.ui +++ b/chalk/ui/wdgshapeoptions.ui @@ -35,7 +35,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -85,7 +85,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> diff --git a/chalk/ui/wdgtabletdevicesettings.ui b/chalk/ui/wdgtabletdevicesettings.ui index f9dfaac6..44a43e94 100644 --- a/chalk/ui/wdgtabletdevicesettings.ui +++ b/chalk/ui/wdgtabletdevicesettings.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>90</height> @@ -49,7 +49,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -72,7 +72,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4_4</cstring> + <cstring>layout4_4</cstring> </property> <hbox> <property name="name"> @@ -95,7 +95,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4_2</cstring> + <cstring>layout4_2</cstring> </property> <hbox> <property name="name"> @@ -118,7 +118,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4_3</cstring> + <cstring>layout4_3</cstring> </property> <hbox> <property name="name"> @@ -141,7 +141,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4_6</cstring> + <cstring>layout4_6</cstring> </property> <hbox> <property name="name"> @@ -164,7 +164,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4_5</cstring> + <cstring>layout4_5</cstring> </property> <hbox> <property name="name"> diff --git a/chalk/ui/wdgtabletsettings.ui b/chalk/ui/wdgtabletsettings.ui index 29ff9dbb..41be6f39 100644 --- a/chalk/ui/wdgtabletsettings.ui +++ b/chalk/ui/wdgtabletsettings.ui @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -55,7 +55,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -91,7 +91,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>90</height> diff --git a/chalk/ui/wdgtextbrush.ui b/chalk/ui/wdgtextbrush.ui index 5e5d5dac..e51a4d6c 100644 --- a/chalk/ui/wdgtextbrush.ui +++ b/chalk/ui/wdgtextbrush.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -47,7 +47,7 @@ <property name="name"> <cstring>lineEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>0</height> @@ -65,7 +65,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>20</height> @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cc index 2194831a..5bce37b2 100644 --- a/filters/chalk/gmagick/kis_image_magick_converter.cc +++ b/filters/chalk/gmagick/kis_image_magick_converter.cc @@ -202,7 +202,7 @@ namespace { rawdata.resize(len); memcpy(rawdata.data(), imgAttr -> value, len); - KisAnnotation* annotation = new KisAnnotation( TQString("chalk_attribute:%1").tqarg(TQString(imgAttr -> key)), "", rawdata ); + KisAnnotation* annotation = new KisAnnotation( TQString("chalk_attribute:%1").arg(TQString(imgAttr -> key)), "", rawdata ); Q_CHECK_PTR(annotation); image -> addAnnotation(annotation); @@ -258,7 +258,7 @@ namespace { memcpy(rawdata.data(), attr -> value, len); annotation = new KisAnnotation( - TQString("chalk_attribute:%1").tqarg(TQString(attr -> key)), "", rawdata); + TQString("chalk_attribute:%1").arg(TQString(attr -> key)), "", rawdata); Q_CHECK_PTR(annotation); image -> addAnnotation(annotation); diff --git a/filters/chalk/gmagick/magickexport.cpp b/filters/chalk/gmagick/magickexport.cpp index e56f53d2..2c49532a 100644 --- a/filters/chalk/gmagick/magickexport.cpp +++ b/filters/chalk/gmagick/magickexport.cpp @@ -39,7 +39,7 @@ MagickExport::~MagickExport() { } -KoFilter::ConversiontqStatus MagickExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus MagickExport::convert(const TQCString& from, const TQCString& to) { kdDebug(41008) << "magick export! From: " << from << ", To: " << to << "\n"; diff --git a/filters/chalk/gmagick/magickexport.h b/filters/chalk/gmagick/magickexport.h index 46a080f4..b1b73bb5 100644 --- a/filters/chalk/gmagick/magickexport.h +++ b/filters/chalk/gmagick/magickexport.h @@ -30,7 +30,7 @@ public: virtual ~MagickExport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // MAGICKEXPORT_H_ diff --git a/filters/chalk/gmagick/magickimport.cpp b/filters/chalk/gmagick/magickimport.cpp index dbfe6da8..9400c5bd 100644 --- a/filters/chalk/gmagick/magickimport.cpp +++ b/filters/chalk/gmagick/magickimport.cpp @@ -41,7 +41,7 @@ MagickImport::~MagickImport() { } -KoFilter::ConversiontqStatus MagickImport::convert(const TQCString&, const TQCString& to) +KoFilter::ConversionStatus MagickImport::convert(const TQCString&, const TQCString& to) { kdDebug(41008) << "Importing using MagickImport!\n"; diff --git a/filters/chalk/gmagick/magickimport.h b/filters/chalk/gmagick/magickimport.h index 22bf3002..6ade3a20 100644 --- a/filters/chalk/gmagick/magickimport.h +++ b/filters/chalk/gmagick/magickimport.h @@ -30,7 +30,7 @@ public: virtual ~MagickImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // MAGICKIMPORT_H_ diff --git a/filters/chalk/jpeg/kis_jpeg_converter.cc b/filters/chalk/jpeg/kis_jpeg_converter.cc index 5fa8e78a..c9772d9a 100644 --- a/filters/chalk/jpeg/kis_jpeg_converter.cc +++ b/filters/chalk/jpeg/kis_jpeg_converter.cc @@ -73,7 +73,7 @@ namespace { { return JCS_CMYK; } - KMessageBox::error(0, i18n("Cannot export images in %1.\n").tqarg(cs->id().name()) ) ; + KMessageBox::error(0, i18n("Cannot export images in %1.\n").arg(cs->id().name()) ) ; return JCS_UNKNOWN; } diff --git a/filters/chalk/jpeg/kis_jpeg_export.cc b/filters/chalk/jpeg/kis_jpeg_export.cc index edfbbc02..c0eef02d 100644 --- a/filters/chalk/jpeg/kis_jpeg_export.cc +++ b/filters/chalk/jpeg/kis_jpeg_export.cc @@ -85,7 +85,7 @@ KisJPEGExport::~KisJPEGExport() { } -KoFilter::ConversiontqStatus KisJPEGExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus KisJPEGExport::convert(const TQCString& from, const TQCString& to) { kdDebug(41008) << "JPEG export! From: " << from << ", To: " << to << "\n"; diff --git a/filters/chalk/jpeg/kis_jpeg_export.h b/filters/chalk/jpeg/kis_jpeg_export.h index ea55c12c..918c44b5 100644 --- a/filters/chalk/jpeg/kis_jpeg_export.h +++ b/filters/chalk/jpeg/kis_jpeg_export.h @@ -29,7 +29,7 @@ class KisJPEGExport : public KoFilter { KisJPEGExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisJPEGExport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif diff --git a/filters/chalk/jpeg/kis_jpeg_import.cc b/filters/chalk/jpeg/kis_jpeg_import.cc index 2ca7c4c2..bacec679 100644 --- a/filters/chalk/jpeg/kis_jpeg_import.cc +++ b/filters/chalk/jpeg/kis_jpeg_import.cc @@ -41,7 +41,7 @@ KisJPEGImport::~KisJPEGImport() { } -KoFilter::ConversiontqStatus KisJPEGImport::convert(const TQCString&, const TQCString& to) +KoFilter::ConversionStatus KisJPEGImport::convert(const TQCString&, const TQCString& to) { kdDebug(41008) << "Importing using JPEGImport!\n"; diff --git a/filters/chalk/jpeg/kis_jpeg_import.h b/filters/chalk/jpeg/kis_jpeg_import.h index a32c367f..9db52292 100644 --- a/filters/chalk/jpeg/kis_jpeg_import.h +++ b/filters/chalk/jpeg/kis_jpeg_import.h @@ -28,7 +28,7 @@ class KisJPEGImport : public KoFilter { KisJPEGImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisJPEGImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif diff --git a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui index cb405324..456fc67a 100644 --- a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui +++ b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -34,13 +34,13 @@ <property name="text"> <string>Quality:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -80,7 +80,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -101,7 +101,7 @@ <property name="text"> <string>Best</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -136,7 +136,7 @@ Enabling progressive will cause the image to be displayed by the browser even wh <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>61</height> diff --git a/filters/chalk/magick/kis_image_magick_converter.cc b/filters/chalk/magick/kis_image_magick_converter.cc index dd16dd0e..880a52c6 100644 --- a/filters/chalk/magick/kis_image_magick_converter.cc +++ b/filters/chalk/magick/kis_image_magick_converter.cc @@ -206,7 +206,7 @@ namespace { memcpy(rawdata.data(), attr -> value, len); annotation = new KisAnnotation( - TQString("chalk_attribute:%1").tqarg(TQString(attr -> key)), "", rawdata); + TQString("chalk_attribute:%1").arg(TQString(attr -> key)), "", rawdata); Q_CHECK_PTR(annotation); image -> addAnnotation(annotation); diff --git a/filters/chalk/magick/magickexport.cpp b/filters/chalk/magick/magickexport.cpp index 09f351c1..8c1e3365 100644 --- a/filters/chalk/magick/magickexport.cpp +++ b/filters/chalk/magick/magickexport.cpp @@ -39,7 +39,7 @@ MagickExport::~MagickExport() { } -KoFilter::ConversiontqStatus MagickExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus MagickExport::convert(const TQCString& from, const TQCString& to) { kdDebug(41008) << "magick export! From: " << from << ", To: " << to << "\n"; diff --git a/filters/chalk/magick/magickexport.h b/filters/chalk/magick/magickexport.h index 46a080f4..b1b73bb5 100644 --- a/filters/chalk/magick/magickexport.h +++ b/filters/chalk/magick/magickexport.h @@ -30,7 +30,7 @@ public: virtual ~MagickExport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // MAGICKEXPORT_H_ diff --git a/filters/chalk/magick/magickimport.cpp b/filters/chalk/magick/magickimport.cpp index b5f73d19..d3e5bbb9 100644 --- a/filters/chalk/magick/magickimport.cpp +++ b/filters/chalk/magick/magickimport.cpp @@ -41,7 +41,7 @@ MagickImport::~MagickImport() { } -KoFilter::ConversiontqStatus MagickImport::convert(const TQCString&, const TQCString& to) +KoFilter::ConversionStatus MagickImport::convert(const TQCString&, const TQCString& to) { kdDebug(41008) << "Importing using MagickImport!\n"; diff --git a/filters/chalk/magick/magickimport.h b/filters/chalk/magick/magickimport.h index 22bf3002..6ade3a20 100644 --- a/filters/chalk/magick/magickimport.h +++ b/filters/chalk/magick/magickimport.h @@ -30,7 +30,7 @@ public: virtual ~MagickImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // MAGICKIMPORT_H_ diff --git a/filters/chalk/openexr/kis_openexr_export.cpp b/filters/chalk/openexr/kis_openexr_export.cpp index 4859f5d9..062a072f 100644 --- a/filters/chalk/openexr/kis_openexr_export.cpp +++ b/filters/chalk/openexr/kis_openexr_export.cpp @@ -57,7 +57,7 @@ KisOpenEXRExport::~KisOpenEXRExport() { } -KoFilter::ConversiontqStatus KisOpenEXRExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus KisOpenEXRExport::convert(const TQCString& from, const TQCString& to) { if (to != "image/x-exr" || from != "application/x-chalk") { return KoFilter::NotImplemented; diff --git a/filters/chalk/openexr/kis_openexr_export.h b/filters/chalk/openexr/kis_openexr_export.h index 7f0c71f9..ea62421c 100644 --- a/filters/chalk/openexr/kis_openexr_export.h +++ b/filters/chalk/openexr/kis_openexr_export.h @@ -31,7 +31,7 @@ public: virtual ~KisOpenEXRExport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // KIS_OPENEXR_EXPORT_H_ diff --git a/filters/chalk/openexr/kis_openexr_import.cpp b/filters/chalk/openexr/kis_openexr_import.cpp index 974d4a67..8546edb2 100644 --- a/filters/chalk/openexr/kis_openexr_import.cpp +++ b/filters/chalk/openexr/kis_openexr_import.cpp @@ -62,7 +62,7 @@ KisOpenEXRImport::~KisOpenEXRImport() { } -KoFilter::ConversiontqStatus KisOpenEXRImport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus KisOpenEXRImport::convert(const TQCString& from, const TQCString& to) { if (from != "image/x-exr" || to != "application/x-chalk") { return KoFilter::NotImplemented; diff --git a/filters/chalk/openexr/kis_openexr_import.h b/filters/chalk/openexr/kis_openexr_import.h index 8bddb4f5..8654df54 100644 --- a/filters/chalk/openexr/kis_openexr_import.h +++ b/filters/chalk/openexr/kis_openexr_import.h @@ -31,7 +31,7 @@ public: virtual ~KisOpenEXRImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // KIS_OPENEXR_IMPORT_H_ diff --git a/filters/chalk/pdf/kis_pdf_import.cpp b/filters/chalk/pdf/kis_pdf_import.cpp index 2cef93e9..ed504f67 100644 --- a/filters/chalk/pdf/kis_pdf_import.cpp +++ b/filters/chalk/pdf/kis_pdf_import.cpp @@ -63,7 +63,7 @@ KisPDFImport::~KisPDFImport() { } -KisPDFImport::ConversiontqStatus KisPDFImport::convert(const TQCString& , const TQCString& ) +KisPDFImport::ConversionStatus KisPDFImport::convert(const TQCString& , const TQCString& ) { TQString filename = m_chain -> inputFile(); kdDebug(41008) << "Importing using PDFImport!" << filename << endl; @@ -141,7 +141,7 @@ KisPDFImport::ConversiontqStatus KisPDFImport::convert(const TQCString& , const TQValueList<int> pages = wdg->pages(); for(TQValueList<int>::const_iterator it = pages.begin(); it != pages.end(); ++it) { - KisPaintLayer* layer = new KisPaintLayer(img, TQString(i18n("Page %1")).tqarg( TQString::number(*it) + 1), TQ_UINT8_MAX); + KisPaintLayer* layer = new KisPaintLayer(img, TQString(i18n("Page %1")).arg( TQString::number(*it) + 1), TQ_UINT8_MAX); layer->paintDevice()->convertFromTQImage( pdoc->getPage( *it )->renderToImage(wdg->intHorizontal->value(), wdg->intVertical->value() ), ""); img->addLayer(layer, img->rootLayer(), 0); } diff --git a/filters/chalk/pdf/kis_pdf_import.h b/filters/chalk/pdf/kis_pdf_import.h index 06e22288..ffb9c79e 100644 --- a/filters/chalk/pdf/kis_pdf_import.h +++ b/filters/chalk/pdf/kis_pdf_import.h @@ -29,7 +29,7 @@ class KisPDFImport : public KoFilter{ KisPDFImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisPDFImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif diff --git a/filters/chalk/pdf/pdfimportwidgetbase.ui b/filters/chalk/pdf/pdfimportwidgetbase.ui index 697a3e30..88d24dc6 100644 --- a/filters/chalk/pdf/pdfimportwidgetbase.ui +++ b/filters/chalk/pdf/pdfimportwidgetbase.ui @@ -40,7 +40,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -65,7 +65,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> @@ -160,7 +160,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -185,7 +185,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -235,7 +235,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> diff --git a/filters/chalk/png/kis_png_converter.cc b/filters/chalk/png/kis_png_converter.cc index d3cce618..d5c4a080 100644 --- a/filters/chalk/png/kis_png_converter.cc +++ b/filters/chalk/png/kis_png_converter.cc @@ -62,7 +62,7 @@ namespace { return alpha ? PNG_COLOR_TYPE_RGB_ALPHA : PNG_COLOR_TYPE_RGB; } - KMessageBox::error(0, i18n("Cannot export images in %1.\n").tqarg(cs->id().name()) ) ; + KMessageBox::error(0, i18n("Cannot export images in %1.\n").arg(cs->id().name()) ) ; return -1; } diff --git a/filters/chalk/png/kis_png_export.cc b/filters/chalk/png/kis_png_export.cc index 8154866a..ace65954 100644 --- a/filters/chalk/png/kis_png_export.cc +++ b/filters/chalk/png/kis_png_export.cc @@ -49,7 +49,7 @@ KisPNGExport::~KisPNGExport() { } -KoFilter::ConversiontqStatus KisPNGExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus KisPNGExport::convert(const TQCString& from, const TQCString& to) { kdDebug(41008) << "Png export! From: " << from << ", To: " << to << "\n"; diff --git a/filters/chalk/png/kis_png_export.h b/filters/chalk/png/kis_png_export.h index 433b68e3..562628a9 100644 --- a/filters/chalk/png/kis_png_export.h +++ b/filters/chalk/png/kis_png_export.h @@ -29,7 +29,7 @@ class KisPNGExport : public KoFilter { KisPNGExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisPNGExport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif diff --git a/filters/chalk/png/kis_png_import.cc b/filters/chalk/png/kis_png_import.cc index ccfe4388..dc2a6325 100644 --- a/filters/chalk/png/kis_png_import.cc +++ b/filters/chalk/png/kis_png_import.cc @@ -41,7 +41,7 @@ KisPNGImport::~KisPNGImport() { } -KoFilter::ConversiontqStatus KisPNGImport::convert(const TQCString&, const TQCString& to) +KoFilter::ConversionStatus KisPNGImport::convert(const TQCString&, const TQCString& to) { kdDebug(41008) << "Importing using PNGImport!\n"; diff --git a/filters/chalk/png/kis_png_import.h b/filters/chalk/png/kis_png_import.h index 3487d24d..0412e7bd 100644 --- a/filters/chalk/png/kis_png_import.h +++ b/filters/chalk/png/kis_png_import.h @@ -28,7 +28,7 @@ class KisPNGImport : public KoFilter { KisPNGImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisPNGImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif diff --git a/filters/chalk/png/kis_wdg_options_png.ui b/filters/chalk/png/kis_wdg_options_png.ui index ec5e0ba8..5797c407 100644 --- a/filters/chalk/png/kis_wdg_options_png.ui +++ b/filters/chalk/png/kis_wdg_options_png.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -37,7 +37,7 @@ <property name="text"> <string>Compress:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> <property name="toolTip" stdset="0"> @@ -50,7 +50,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -88,7 +88,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -113,7 +113,7 @@ <property name="text"> <string>Small</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="whatsThis" stdset="0"> @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>5</height> diff --git a/filters/chalk/raw/kis_raw_import.cpp b/filters/chalk/raw/kis_raw_import.cpp index f006f913..4ec8f028 100644 --- a/filters/chalk/raw/kis_raw_import.cpp +++ b/filters/chalk/raw/kis_raw_import.cpp @@ -103,7 +103,7 @@ KisRawImport::~KisRawImport() delete m_process; } -KoFilter::ConversiontqStatus KisRawImport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus KisRawImport::convert(const TQCString& from, const TQCString& to) { if (from != "image/x-raw" || to != "application/x-chalk") { return KoFilter::NotImplemented; @@ -458,7 +458,7 @@ void KisRawImport::slotReceivedStdout(KProcess *, char *buffer, int buflen) //kdDebug(41008) << "stdout received " << buflen << " bytes on stdout.\n"; //kdDebug(41008) << TQString::fromAscii(buffer, buflen) << "\n"; int oldSize = m_data->size(); - m_data->tqresize(oldSize + buflen, TQGArray::SpeedOptim); + m_data->resize(oldSize + buflen, TQGArray::SpeedOptim); memcpy(m_data->data() + oldSize, buffer, buflen); } diff --git a/filters/chalk/raw/kis_raw_import.h b/filters/chalk/raw/kis_raw_import.h index 17fd576c..e02caeed 100644 --- a/filters/chalk/raw/kis_raw_import.h +++ b/filters/chalk/raw/kis_raw_import.h @@ -37,7 +37,7 @@ public: virtual ~KisRawImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); private slots: diff --git a/filters/chalk/raw/wdgrawimport.ui b/filters/chalk/raw/wdgrawimport.ui index 26115762..59d9642e 100644 --- a/filters/chalk/raw/wdgrawimport.ui +++ b/filters/chalk/raw/wdgrawimport.ui @@ -36,7 +36,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>150</height> @@ -45,7 +45,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <vbox> <property name="name"> @@ -304,7 +304,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>500</width> <height>20</height> @@ -321,7 +321,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>120</height> @@ -330,7 +330,7 @@ </spacer> <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -355,7 +355,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -408,7 +408,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> diff --git a/filters/chalk/tiff/kis_dlg_options_tiff.cpp b/filters/chalk/tiff/kis_dlg_options_tiff.cpp index 7a6ad9ca..59784009 100644 --- a/filters/chalk/tiff/kis_dlg_options_tiff.cpp +++ b/filters/chalk/tiff/kis_dlg_options_tiff.cpp @@ -39,7 +39,7 @@ KisDlgOptionsTIFF::KisDlgOptionsTIFF(TQWidget *parent, const char *name) connect(optionswdg->flatten, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(flattenToggled( bool) ) ); setMainWidget(optionswdg); kapp->restoreOverrideCursor(); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum) ); + setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum) ); } KisDlgOptionsTIFF::~KisDlgOptionsTIFF() diff --git a/filters/chalk/tiff/kis_tiff_export.cc b/filters/chalk/tiff/kis_tiff_export.cc index bcd3f22e..28495ff4 100644 --- a/filters/chalk/tiff/kis_tiff_export.cc +++ b/filters/chalk/tiff/kis_tiff_export.cc @@ -50,7 +50,7 @@ KisTIFFExport::~KisTIFFExport() { } -KoFilter::ConversiontqStatus KisTIFFExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus KisTIFFExport::convert(const TQCString& from, const TQCString& to) { kdDebug(41008) << "Tiff export! From: " << from << ", To: " << to << "\n"; diff --git a/filters/chalk/tiff/kis_tiff_export.h b/filters/chalk/tiff/kis_tiff_export.h index 9efeb940..bb78fd4f 100644 --- a/filters/chalk/tiff/kis_tiff_export.h +++ b/filters/chalk/tiff/kis_tiff_export.h @@ -29,7 +29,7 @@ class KisTIFFExport : public KoFilter { KisTIFFExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisTIFFExport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif diff --git a/filters/chalk/tiff/kis_tiff_import.cc b/filters/chalk/tiff/kis_tiff_import.cc index 89d1763f..8c785ffe 100644 --- a/filters/chalk/tiff/kis_tiff_import.cc +++ b/filters/chalk/tiff/kis_tiff_import.cc @@ -41,7 +41,7 @@ KisTIFFImport::~KisTIFFImport() { } -KoFilter::ConversiontqStatus KisTIFFImport::convert(const TQCString&, const TQCString& to) +KoFilter::ConversionStatus KisTIFFImport::convert(const TQCString&, const TQCString& to) { kdDebug(41008) << "Importing using TIFFImport!\n"; diff --git a/filters/chalk/tiff/kis_tiff_import.h b/filters/chalk/tiff/kis_tiff_import.h index b9e33d06..77cfd0de 100644 --- a/filters/chalk/tiff/kis_tiff_import.h +++ b/filters/chalk/tiff/kis_tiff_import.h @@ -28,7 +28,7 @@ class KisTIFFImport : public KoFilter { KisTIFFImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisTIFFImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif diff --git a/filters/chalk/tiff/kis_tiff_writer_visitor.cpp b/filters/chalk/tiff/kis_tiff_writer_visitor.cpp index 681e66b7..da399a53 100644 --- a/filters/chalk/tiff/kis_tiff_writer_visitor.cpp +++ b/filters/chalk/tiff/kis_tiff_writer_visitor.cpp @@ -63,7 +63,7 @@ namespace { return true; } - KMessageBox::error(0, i18n("Cannot export images in %1.\n").tqarg(cs->id().name()) ) ; + KMessageBox::error(0, i18n("Cannot export images in %1.\n").arg(cs->id().name()) ) ; return false; } diff --git a/filters/chalk/tiff/kis_wdg_options_tiff.ui b/filters/chalk/tiff/kis_wdg_options_tiff.ui index d840dc8d..29038890 100644 --- a/filters/chalk/tiff/kis_wdg_options_tiff.ui +++ b/filters/chalk/tiff/kis_wdg_options_tiff.ui @@ -51,7 +51,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -119,7 +119,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -283,13 +283,13 @@ You can uncheck the box if you are not using transparancy and you want to make t <property name="text"> <string>Quality:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -329,7 +329,7 @@ You can uncheck the box if you are not using transparancy and you want to make t </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4_2</cstring> + <cstring>layout4_2</cstring> </property> <hbox> <property name="name"> @@ -350,7 +350,7 @@ You can uncheck the box if you are not using transparancy and you want to make t <property name="text"> <string>Best</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -405,7 +405,7 @@ You can uncheck the box if you are not using transparancy and you want to make t <property name="text"> <string>Compress:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> <property name="toolTip" stdset="0"> @@ -418,7 +418,7 @@ You can uncheck the box if you are not using transparancy and you want to make t </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5_2</cstring> + <cstring>layout5_2</cstring> </property> <vbox> <property name="name"> @@ -456,7 +456,7 @@ You can uncheck the box if you are not using transparancy and you want to make t </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -481,7 +481,7 @@ You can uncheck the box if you are not using transparancy and you want to make t <property name="text"> <string>Small</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="whatsThis" stdset="0"> @@ -608,7 +608,7 @@ You can uncheck the box if you are not using transparancy and you want to make t <property name="text"> <string>Compress:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> <property name="toolTip" stdset="0"> @@ -621,7 +621,7 @@ You can uncheck the box if you are not using transparancy and you want to make t </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5_2_2</cstring> + <cstring>layout5_2_2</cstring> </property> <vbox> <property name="name"> @@ -659,7 +659,7 @@ You can uncheck the box if you are not using transparancy and you want to make t </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4_3</cstring> + <cstring>layout4_3</cstring> </property> <hbox> <property name="name"> @@ -684,7 +684,7 @@ You can uncheck the box if you are not using transparancy and you want to make t <property name="text"> <string>Small</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="whatsThis" stdset="0"> @@ -711,7 +711,7 @@ You can uncheck the box if you are not using transparancy and you want to make t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/filters/chalk/xcf/xcf/xcf-load.cc b/filters/chalk/xcf/xcf/xcf-load.cc index 90d61755..3209e181 100644 --- a/filters/chalk/xcf/xcf/xcf-load.cc +++ b/filters/chalk/xcf/xcf/xcf-load.cc @@ -173,7 +173,7 @@ xcf_load_image (XcfInfo * info) /* add the layer to the image if its not the floating selection */ if (layer != info->floating_sel) gimp_image_add_layer (gimage, layer, - gimp_container_num_tqchildren (gimage->layers)); + gimp_container_num_children (gimage->layers)); /* restore the saved position so we'll be ready to * read the next offset. @@ -1494,7 +1494,7 @@ xcf_load_old_path (XcfInfo * info, KisImage * gimage) GIMP_ITEM (vectors)->tattoo = tattoo; gimp_image_add_vectors (gimage, vectors, - gimp_container_num_tqchildren (gimage->vectors)); + gimp_container_num_children (gimage->vectors)); return TRUE; } @@ -1674,7 +1674,7 @@ xcf_load_vector (XcfInfo * info, KisImage * gimage) } gimp_image_add_vectors (gimage, vectors, - gimp_container_num_tqchildren (gimage->vectors)); + gimp_container_num_children (gimage->vectors)); return TRUE; } diff --git a/filters/chalk/xcf/xcf/xcf-save.cc b/filters/chalk/xcf/xcf/xcf-save.cc index 3544baf4..a0dbb9b5 100644 --- a/filters/chalk/xcf/xcf/xcf-save.cc +++ b/filters/chalk/xcf/xcf/xcf-save.cc @@ -289,8 +289,8 @@ xcf_save_image (XcfInfo *info, xcf_write_int32_print_error (info, (TQ_INT32 *) &gimage->base_type, 1); /* determine the number of layers and channels in the image */ - nlayers = (TQ_UINT32) gimp_container_num_tqchildren (gimage->layers); - nchannels = (TQ_UINT32) gimp_container_num_tqchildren (gimage->channels); + nlayers = (TQ_UINT32) gimp_container_num_children (gimage->layers); + nchannels = (TQ_UINT32) gimp_container_num_children (gimage->channels); /* check and see if we have to save out the selection */ have_selection = gimp_channel_bounds (gimp_image_get_mask (gimage), @@ -442,7 +442,7 @@ xcf_save_image_props (XcfInfo *info, if (unit < _gimp_unit_get_number_of_built_in_units (gimage->gimp)) xcf_check_error (xcf_save_prop (info, gimage, PROP_UNIT, error, unit)); - if (gimp_container_num_tqchildren (gimage->vectors) > 0) + if (gimp_container_num_children (gimage->vectors) > 0) { if (gimp_vectors_compat_is_compatible (gimage)) xcf_check_error (xcf_save_prop (info, gimage, PROP_PATHS, error)); @@ -1581,7 +1581,7 @@ xcf_save_old_paths (XcfInfo *info, * then each path:- */ - num_paths = gimp_container_num_tqchildren (gimage->vectors); + num_paths = gimp_container_num_children (gimage->vectors); active_vectors = gimp_image_get_active_vectors (gimage); @@ -1696,7 +1696,7 @@ xcf_save_vectors (XcfInfo *info, active_index = gimp_container_get_child_index (gimage->vectors, GIMP_OBJECT (active_vectors)); - num_paths = gimp_container_num_tqchildren (gimage->vectors); + num_paths = gimp_container_num_children (gimage->vectors); xcf_write_int32_check_error (info, &version, 1); xcf_write_int32_check_error (info, &active_index, 1); diff --git a/filters/chalk/xcf/xcfexport.cpp b/filters/chalk/xcf/xcfexport.cpp index b26fdba8..06bcf96f 100644 --- a/filters/chalk/xcf/xcfexport.cpp +++ b/filters/chalk/xcf/xcfexport.cpp @@ -41,7 +41,7 @@ XCFExport::~XCFExport() { } -KoFilter::ConversiontqStatus XCFExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus XCFExport::convert(const TQCString& from, const TQCString& to) { kdDebug(41008) << "xcf export! From: " << from << ", To: " << to << "\n"; diff --git a/filters/chalk/xcf/xcfexport.h b/filters/chalk/xcf/xcfexport.h index b8f260fb..34595b06 100644 --- a/filters/chalk/xcf/xcfexport.h +++ b/filters/chalk/xcf/xcfexport.h @@ -30,7 +30,7 @@ public: virtual ~XCFExport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // XCFEXPORT_H_ diff --git a/filters/chalk/xcf/xcfimport.cpp b/filters/chalk/xcf/xcfimport.cpp index 6f07ebcf..6b81ec67 100644 --- a/filters/chalk/xcf/xcfimport.cpp +++ b/filters/chalk/xcf/xcfimport.cpp @@ -39,7 +39,7 @@ XCFImport::~XCFImport() { } -KoFilter::ConversiontqStatus XCFImport::convert(const TQCString&, const TQCString& to) +KoFilter::ConversionStatus XCFImport::convert(const TQCString&, const TQCString& to) { kdDebug(41008) << "Importing using XCFImport!\n"; diff --git a/filters/chalk/xcf/xcfimport.h b/filters/chalk/xcf/xcfimport.h index 434566ba..27f2cbfe 100644 --- a/filters/chalk/xcf/xcfimport.h +++ b/filters/chalk/xcf/xcfimport.h @@ -30,7 +30,7 @@ public: virtual ~XCFImport(); public: - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // XCFIMPORT_H_ diff --git a/filters/generic_wrapper/generic_filter.cc b/filters/generic_wrapper/generic_filter.cc index f3ae2b13..4a1b1f08 100644 --- a/filters/generic_wrapper/generic_filter.cc +++ b/filters/generic_wrapper/generic_filter.cc @@ -19,7 +19,7 @@ #include <stdlib.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqfile.h> #include <kdebug.h> @@ -41,7 +41,7 @@ GenericFilter::GenericFilter(KoFilter *, const char *, const TQStringList&) : KoFilter() { } -KoFilter::ConversiontqStatus GenericFilter::convert( const TQCString &from, const TQCString &to ) +KoFilter::ConversionStatus GenericFilter::convert( const TQCString &from, const TQCString &to ) { //find the right script to use @@ -80,7 +80,7 @@ KoFilter::ConversiontqStatus GenericFilter::convert( const TQCString &from, cons return KoFilter::NotImplemented; } -KoFilter::ConversiontqStatus GenericFilter::doImport() +KoFilter::ConversionStatus GenericFilter::doImport() { KTempFile temp(TQString("genericfilter-")); temp.setAutoDelete(true); @@ -119,7 +119,7 @@ KoFilter::ConversiontqStatus GenericFilter::doImport() return KoFilter::OK; } -KoFilter::ConversiontqStatus GenericFilter::doExport() +KoFilter::ConversionStatus GenericFilter::doExport() { return KoFilter::NotImplemented; } diff --git a/filters/generic_wrapper/generic_filter.h b/filters/generic_wrapper/generic_filter.h index 7b47406b..71448fce 100644 --- a/filters/generic_wrapper/generic_filter.h +++ b/filters/generic_wrapper/generic_filter.h @@ -36,11 +36,11 @@ public: GenericFilter(KoFilter *parent, const char *name, const TQStringList&); virtual ~GenericFilter() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: - KoFilter::ConversiontqStatus doImport(); - KoFilter::ConversiontqStatus doExport(); + KoFilter::ConversionStatus doImport(); + KoFilter::ConversionStatus doExport(); TQString m_to, m_from, m_exec; KoStore* m_out; }; diff --git a/filters/karbon/ai/aielement.cc b/filters/karbon/ai/aielement.cc index 608bdf61..023943b9 100644 --- a/filters/karbon/ai/aielement.cc +++ b/filters/karbon/ai/aielement.cc @@ -360,7 +360,7 @@ AIElement::Type AIElement::nameToType( const char* name ) const TQString AIElement::toString() const { if ( d->typ == CString ) - return TQString::tqfromLatin1( toCString() ); + return TQString::fromLatin1( toCString() ); if ( d->typ == Int ) return TQString::number( toInt() ); if ( d->typ == UInt ) diff --git a/filters/karbon/ai/aiimport.cc b/filters/karbon/ai/aiimport.cc index 4a201ec5..4e854995 100644 --- a/filters/karbon/ai/aiimport.cc +++ b/filters/karbon/ai/aiimport.cc @@ -56,7 +56,7 @@ AiImport::~AiImport() { } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus AiImport::convert( const TQCString& from, const TQCString& to ) { if ( from != "application/illustrator" || to != "application/x-karbon" ) diff --git a/filters/karbon/ai/aiimport.h b/filters/karbon/ai/aiimport.h index c305b536..3dd9a560 100644 --- a/filters/karbon/ai/aiimport.h +++ b/filters/karbon/ai/aiimport.h @@ -36,7 +36,7 @@ public: AiImport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~AiImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); /* private: TQString m_result; */ diff --git a/filters/karbon/applixgraphics/applixgraphicimport.cc b/filters/karbon/applixgraphics/applixgraphicimport.cc index b3df1581..47c5f2b6 100644 --- a/filters/karbon/applixgraphics/applixgraphicimport.cc +++ b/filters/karbon/applixgraphics/applixgraphicimport.cc @@ -26,7 +26,7 @@ #include <kdebug.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqmessagebox.h> #include <KoFilterChain.h> #include <kgenericfactory.h> @@ -133,7 +133,7 @@ APPLIXGRAPHICImport::APPLIXGRAPHICImport (KoFilter *, const char *, const TQStri * * * * ******************************************************************************/ -KoFilter::ConversiontqStatus APPLIXGRAPHICImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus APPLIXGRAPHICImport::convert( const TQCString& from, const TQCString& to ) { // Check MIME Types @@ -156,7 +156,7 @@ KoFilter::ConversiontqStatus APPLIXGRAPHICImport::convert( const TQCString& from str += "<!DOCTYPE karbon>\n"; str += " <karbon mime=\"application/x-karbon\" version=\"2\" editor=\"APPLIXGRAPHICS import filter\">\n"; // str += " <head>\n"; -// str += " <tqlayout width=\"210\" lmargin=\"0\" format=\"a4\" bmargin=\"0\" height=\"297\" rmargin=\"0\" tmargin=\"0\" orientation=\"portrait\"/>\n"; +// str += " <layout width=\"210\" lmargin=\"0\" format=\"a4\" bmargin=\"0\" height=\"297\" rmargin=\"0\" tmargin=\"0\" orientation=\"portrait\"/>\n"; // str += " <grid dx=\"20\" dy=\"20\" align=\"0\">\n"; // str += " <helplines align=\"0\"/>\n"; // str += " </grid>\n"; @@ -189,10 +189,10 @@ KoFilter::ConversiontqStatus APPLIXGRAPHICImport::convert( const TQCString& from TQMessageBox::critical (0L, "Applixgraphics header problem", TQString ("The Applixgraphics header is not correct. " "May be it is not an applixgraphics file! <BR>" - "This is the header line I did read:<BR><B>%1</B>").tqarg(mystr.latin1()), + "This is the header line I did read:<BR><B>%1</B>").arg(mystr.latin1()), "Comma"); - // i18n( "What is the separator used in this file ? First line is \n%1" ).tqarg(firstLine), + // i18n( "What is the separator used in this file ? First line is \n%1" ).arg(firstLine), return KoFilter::StupidError; } diff --git a/filters/karbon/applixgraphics/applixgraphicimport.h b/filters/karbon/applixgraphics/applixgraphicimport.h index 3e42256e..e0eff76c 100644 --- a/filters/karbon/applixgraphics/applixgraphicimport.h +++ b/filters/karbon/applixgraphics/applixgraphicimport.h @@ -32,7 +32,7 @@ public: APPLIXGRAPHICImport (KoFilter *parent, const char *name, const TQStringList&); virtual ~APPLIXGRAPHICImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; diff --git a/filters/karbon/eps/epsexport.cc b/filters/karbon/eps/epsexport.cc index e1bd06a5..8696e6a3 100644 --- a/filters/karbon/eps/epsexport.cc +++ b/filters/karbon/eps/epsexport.cc @@ -87,7 +87,7 @@ EpsExport::EpsExport( KoFilter*, const char*, const TQStringList& ) { } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus EpsExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "image/x-eps" || from != "application/x-karbon" ) @@ -102,7 +102,7 @@ EpsExport::convert( const TQCString& from, const TQCString& to ) return KoFilter::StupidError; - KoFilter::ConversiontqStatus status = KoFilter::OK; + KoFilter::ConversionStatus status = KoFilter::OK; // Ask questions about PS level etc. EpsExportDlg* dialog = new EpsExportDlg(); @@ -194,7 +194,7 @@ EpsExport::visitVDocument( VDocument& document ) static_cast<KoDocumentInfoAuthor*>( docInfo.page( "author" ) ); // Get creation date/time = "now". - TQDateTime now( TQDateTime::tqcurrentDateTime() ); + TQDateTime now( TQDateTime::currentDateTime() ); *m_stream << "%%CreationDate: (" << now.toString( Qt::LocalDate ) << ")\n" diff --git a/filters/karbon/eps/epsexport.h b/filters/karbon/eps/epsexport.h index 1313294e..f5867b43 100644 --- a/filters/karbon/eps/epsexport.h +++ b/filters/karbon/eps/epsexport.h @@ -46,7 +46,7 @@ public: EpsExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~EpsExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: virtual void visitVPath( VPath& composite ); diff --git a/filters/karbon/eps/epsimport.cc b/filters/karbon/eps/epsimport.cc index 0fefb3e0..77a650bb 100644 --- a/filters/karbon/eps/epsimport.cc +++ b/filters/karbon/eps/epsimport.cc @@ -57,7 +57,7 @@ EpsImport::~EpsImport() { } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus EpsImport::convert( const TQCString& from, const TQCString& to ) { if( @@ -93,7 +93,7 @@ EpsImport::convert( const TQCString& from, const TQCString& to ) // sed filter TQString sedFilter = TQString ("sed -e \"s/%%BoundingBox: 0 0 612 792/%%BoundingBox: %1 %2 %3 %4/g\""). - tqarg(llx).tqarg(lly).tqarg(urx).tqarg(ury); + arg(llx).arg(lly).arg(urx).arg(ury); // Build ghostscript call to convert ps/eps -> ai: TQString command( diff --git a/filters/karbon/eps/epsimport.h b/filters/karbon/eps/epsimport.h index 873dc169..c86be29d 100644 --- a/filters/karbon/eps/epsimport.h +++ b/filters/karbon/eps/epsimport.h @@ -36,7 +36,7 @@ public: EpsImport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~EpsImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif diff --git a/filters/karbon/kontour/kontourimport.cpp b/filters/karbon/kontour/kontourimport.cpp index a260fd50..30b77ccf 100644 --- a/filters/karbon/kontour/kontourimport.cpp +++ b/filters/karbon/kontour/kontourimport.cpp @@ -49,7 +49,7 @@ KontourImport::~KontourImport() } -KoFilter::ConversiontqStatus KontourImport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus KontourImport::convert(const TQCString& from, const TQCString& to) { // check for proper conversion if ( to != "application/x-karbon" || ( from != "application/x-kontour" && from != "application/x-killustrator") ) @@ -198,8 +198,8 @@ KontourImport::convert() if( docElem.attribute( "version" ).toInt() == 2 ) { lay = docElem; - height = lay.firstChild().namedItem( "tqlayout" ).toElement().attribute( "height" ).toDouble(); - width = lay.firstChild().namedItem( "tqlayout" ).toElement().attribute( "width" ).toDouble(); + height = lay.firstChild().namedItem( "layout" ).toElement().attribute( "height" ).toDouble(); + width = lay.firstChild().namedItem( "layout" ).toElement().attribute( "width" ).toDouble(); } else { diff --git a/filters/karbon/kontour/kontourimport.h b/filters/karbon/kontour/kontourimport.h index e140f088..92e27a09 100644 --- a/filters/karbon/kontour/kontourimport.h +++ b/filters/karbon/kontour/kontourimport.h @@ -33,7 +33,7 @@ public: KontourImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KontourImport(); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); protected: TQDomDocument inpdoc; diff --git a/filters/karbon/msod/msod.cc b/filters/karbon/msod/msod.cc index 3e79e3ab..8c4c2795 100644 --- a/filters/karbon/msod/msod.cc +++ b/filters/karbon/msod/msod.cc @@ -39,18 +39,18 @@ Msod::Msod( m_dpi = dpi; m_images.setAutoDelete(true); m_opt = new Options(*this); - m_tqshape.data = 0L; - m_tqshape.length = 0; + m_shape.data = 0L; + m_shape.length = 0; } Msod::~Msod() { - delete [] m_tqshape.data; + delete [] m_shape.data; delete m_opt; } void Msod::drawShape( - unsigned tqshapeType, + unsigned shapeType, TQ_UINT32 bytes, TQDataStream &operands) { @@ -262,25 +262,25 @@ void Msod::drawShape( }; struct { - TQ_UINT32 spid; // The tqshape id + TQ_UINT32 spid; // The shape id union { TQ_UINT32 info; struct { - TQ_UINT32 fGroup : 1; // This tqshape is a group tqshape - TQ_UINT32 fChild : 1; // Not a top-level tqshape - TQ_UINT32 fPatriarch : 1; // This is the topmost group tqshape. + TQ_UINT32 fGroup : 1; // This shape is a group shape + TQ_UINT32 fChild : 1; // Not a top-level shape + TQ_UINT32 fPatriarch : 1; // This is the topmost group shape. // Exactly one of these per drawing. TQ_UINT32 fDeleted : 1; // The shape.has been deleted - TQ_UINT32 fOleShape : 1; // The tqshape is an OLE object + TQ_UINT32 fOleShape : 1; // The shape is an OLE object TQ_UINT32 fHaveMaster : 1; // Shape has a hspMaster property TQ_UINT32 fFlipH : 1; // Shape is flipped horizontally TQ_UINT32 fFlipV : 1; // Shape is flipped vertically - TQ_UINT32 fConnector : 1; // Connector type of tqshape + TQ_UINT32 fConnector : 1; // Connector type of shape TQ_UINT32 fHaveAnchor : 1; // Shape has an anchor of some kind - TQ_UINT32 fBackground : 1; // Background tqshape - TQ_UINT32 fHaveSpt : 1; // Shape has a tqshape type property + TQ_UINT32 fBackground : 1; // Background shape + TQ_UINT32 fHaveSpt : 1; // Shape has a shape type property TQ_UINT32 reserved : 20; // Not yet used } fields; } grfPersistent; @@ -291,12 +291,12 @@ void Msod::drawShape( operands >> data.spid; operands >> data.grfPersistent.info; bytes -= 8; - kdDebug(s_area) << "tqshape-id: " << data.spid << " type: " << funcTab[tqshapeType] << " (" << tqshapeType << ")" << + kdDebug(s_area) << "shape-id: " << data.spid << " type: " << funcTab[shapeType] << " (" << shapeType << ")" << (data.grfPersistent.fields.fGroup ? " group" : "") << (data.grfPersistent.fields.fChild ? " child" : "") << (data.grfPersistent.fields.fPatriarch ? " patriarch" : "") << (data.grfPersistent.fields.fDeleted ? " deleted" : "") << - (data.grfPersistent.fields.fOleShape ? " oletqshape" : "") << + (data.grfPersistent.fields.fOleShape ? " oleshape" : "") << (data.grfPersistent.fields.fHaveMaster ? " master" : "") << (data.grfPersistent.fields.fFlipH ? " flipv" : "") << (data.grfPersistent.fields.fConnector ? " connector" : "") << @@ -309,9 +309,9 @@ void Msod::drawShape( if ((!m_isRequiredDrawing) && (m_requestedShapeId != data.spid)) return; - // An active tqshape! Let's draw it... + // An active shape! Let's draw it... - switch (tqshapeType) + switch (shapeType) { case 0: if (m_opt->m_pVertices) @@ -493,7 +493,7 @@ TQSize Msod::normaliseSize( } bool Msod::parse( - unsigned tqshapeId, + unsigned shapeId, const TQString &file, const char *delayStream) { @@ -505,19 +505,19 @@ bool Msod::parse( return false; } TQDataStream stream(&in); - bool result = parse(tqshapeId, stream, in.size(), delayStream); + bool result = parse(shapeId, stream, in.size(), delayStream); in.close(); return result; } bool Msod::parse( - unsigned tqshapeId, + unsigned shapeId, TQDataStream &stream, unsigned size, const char *delayStream) { stream.setByteOrder(TQDataStream::LittleEndian); // Great, I love TQt ! - m_requestedShapeId = tqshapeId; + m_requestedShapeId = shapeId; m_isRequiredDrawing = false; m_delayStream = delayStream; @@ -854,8 +854,8 @@ void Msod::opDg(Header &, TQ_UINT32, TQDataStream &operands) { struct { - TQ_UINT32 csp; // The number of tqshapes in this drawing. - TQ_UINT32 spidCur; // The last tqshape ID given to an SP in this DG. + TQ_UINT32 csp; // The number of shapes in this drawing. + TQ_UINT32 spidCur; // The last shape ID given to an SP in this DG. } data; operands >> data.csp >> data.spidCur; @@ -878,10 +878,10 @@ void Msod::opDgg(Header &, TQ_UINT32, TQDataStream &operands) { struct { - TQ_UINT32 spidMax; // The current maximum tqshape ID. + TQ_UINT32 spidMax; // The current maximum shape ID. TQ_UINT32 cidcl; // The number of ID clusters (FIDCLs). - TQ_UINT32 cspSaved; // The total number of tqshapes saved. - // (including deleted tqshapes, if undo + TQ_UINT32 cspSaved; // The total number of shapes saved. + // (including deleted shapes, if undo // information was saved). TQ_UINT32 cdgSaved; // The total number of drawings saved. } data; @@ -896,7 +896,7 @@ void Msod::opDgg(Header &, TQ_UINT32, TQDataStream &operands) unsigned i; operands >> data.spidMax >> data.cidcl >> data.cspSaved >> data.cdgSaved; - kdDebug(s_area) << data.cspSaved << " tqshapes in " << + kdDebug(s_area) << data.cspSaved << " shapes in " << data.cidcl - 1 << " clusters in " << data.cdgSaved << " drawings" << endl; for (i = 0; i < data.cidcl - 1; i++) @@ -943,31 +943,31 @@ void Msod::opSolvercontainer(Header &, TQ_UINT32 bytes, TQDataStream &operands) void Msod::opSp(Header &op, TQ_UINT32 bytes, TQDataStream &operands) { - // We want to defer the act of drawing a tqshape until we have seen any options + // We want to defer the act of drawing a shape until we have seen any options // that may affect it. Thus, we merely store the data away, and let opSpContainer // do all the ahrd work. - m_tqshape.type = op.opcode.fields.inst; - m_tqshape.length = bytes; - m_tqshape.data = new char [bytes]; - operands.readRawBytes(m_tqshape.data, bytes); + m_shape.type = op.opcode.fields.inst; + m_shape.length = bytes; + m_shape.data = new char [bytes]; + operands.readRawBytes(m_shape.data, bytes); } void Msod::opSpcontainer(Header &, TQ_UINT32 bytes, TQDataStream &operands) { walk(bytes, operands); - // Having gathered all the information for this tqshape, we can now draw it. + // Having gathered all the information for this shape, we can now draw it. TQByteArray a; - a.setRawData(m_tqshape.data, m_tqshape.length); + a.setRawData(m_shape.data, m_shape.length); TQDataStream s(a, IO_ReadOnly); s.setByteOrder(TQDataStream::LittleEndian); // Great, I love TQt ! - drawShape(m_tqshape.type, m_tqshape.length, s); - a.resetRawData(m_tqshape.data, m_tqshape.length); - delete [] m_tqshape.data; - m_tqshape.data = 0L; + drawShape(m_shape.type, m_shape.length, s); + a.resetRawData(m_shape.data, m_shape.length); + delete [] m_shape.data; + m_shape.data = 0L; } void Msod::opSpgr(Header &, TQ_UINT32, TQDataStream &operands) @@ -1097,7 +1097,7 @@ void Msod::Options::initialise() m_geoTop = 0; m_geoRight = 21600; m_geoBottom = 21600; - m_tqshapePath = 1; + m_shapePath = 1; delete m_pVertices; m_pVertices = 0L; m_fShadowOK = true; @@ -1233,7 +1233,7 @@ void Msod::Options::walk(TQ_UINT32 bytes, TQDataStream &operands) m_geoBottom = op.value; break; case 324: - m_tqshapePath = op.value; + m_shapePath = op.value; break; case 383: m_fShadowOK = (op.value & 0x0020) != 0; diff --git a/filters/karbon/msod/msod.h b/filters/karbon/msod/msod.h index f53146bf..3db6fc2f 100644 --- a/filters/karbon/msod/msod.h +++ b/filters/karbon/msod/msod.h @@ -44,15 +44,15 @@ public: unsigned dpi); virtual ~Msod(); - // Called to parse the given file. We extract a drawing by tqshapeId. + // Called to parse the given file. We extract a drawing by shapeId. // If the drawing is not found, the return value will be false. bool parse( - unsigned tqshapeId, + unsigned shapeId, const TQString &file, const char *delayStream = 0L); bool parse( - unsigned tqshapeId, + unsigned shapeId, TQDataStream &stream, unsigned size, const char *delayStream = 0L); @@ -114,14 +114,14 @@ private: unsigned type; char *data; unsigned length; - } m_tqshape; + } m_shape; TQPoint normalisePoint( TQDataStream &operands); TQSize normaliseSize( TQDataStream &operands); void drawShape( - unsigned tqshapeType, + unsigned shapeType, TQ_UINT32 bytes, TQDataStream &operands); @@ -244,7 +244,7 @@ private: TQ_UINT32 m_geoTop; TQ_UINT32 m_geoRight; TQ_UINT32 m_geoBottom; - TQ_UINT32 m_tqshapePath; + TQ_UINT32 m_shapePath; TQPointArray *m_pVertices; bool m_fShadowOK; bool m_f3DOK; diff --git a/filters/karbon/msod/msodimport.cc b/filters/karbon/msod/msodimport.cc index 903d50a2..e25889c0 100644 --- a/filters/karbon/msod/msodimport.cc +++ b/filters/karbon/msod/msodimport.cc @@ -46,18 +46,18 @@ MSODImport::~MSODImport() { } -KoFilter::ConversiontqStatus MSODImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus MSODImport::convert( const TQCString& from, const TQCString& to ) { if (to != "application/x-karbon" || from != "image/x-msod") return KoFilter::NotImplemented; - // Get configuration data: the tqshape id, and any delay stream that we were given. - unsigned tqshapeId; - emit commSignalShapeID( tqshapeId ); + // Get configuration data: the shape id, and any delay stream that we were given. + unsigned shapeId; + emit commSignalShapeID( shapeId ); const char *delayStream = 0L; emit commSignalDelayStream( delayStream ); kdDebug( s_area ) << "##################################################################" << endl; - kdDebug( s_area ) << "tqshape id: " << tqshapeId << endl; + kdDebug( s_area ) << "shape id: " << shapeId << endl; kdDebug( s_area ) << "delay stream: " << delayStream << endl; kdDebug( s_area ) << "##################################################################" << endl; /* @@ -68,9 +68,9 @@ KoFilter::ConversiontqStatus MSODImport::convert( const TQCString& from, const T kdDebug(s_area) << "MSODImport::filter: config: " << config << endl; for (i = 0; i < args.count(); i++) { - if (args[i].startsWith("tqshape-id=")) + if (args[i].startsWith("shape-id=")) { - tqshapeId = args[i].mid(9).toUInt(); + shapeId = args[i].mid(9).toUInt(); } else if (args[i].startsWith("delay-stream=")) @@ -91,7 +91,7 @@ KoFilter::ConversiontqStatus MSODImport::convert( const TQCString& from, const T m_text += "<DOC mime=\"application/x-karbon\" syntaxVersion=\"0.1\" editor=\"WMF import filter\">\n"; m_text += " <LAYER name=\"Layer\" visible=\"1\">\n"; - if (!parse(tqshapeId, m_chain->inputFile(), delayStream)) + if (!parse(shapeId, m_chain->inputFile(), delayStream)) return KoFilter::WrongFormat; // close doc @@ -175,7 +175,7 @@ void MSODImport::gotPicture( kdWarning( s_area ) << "Couldn't determine the mimetype from the extension" << endl; TQCString destMime; // intentionally empty, the filter manager will do the rest - KoFilter::ConversiontqStatus status; + KoFilter::ConversionStatus status; partRef = embedPart( srcMime.latin1(), destMime, status, TQString::number( key ) ); m_embeddeeData = 0; diff --git a/filters/karbon/msod/msodimport.h b/filters/karbon/msod/msodimport.h index 162176de..9264b7d5 100644 --- a/filters/karbon/msod/msodimport.h +++ b/filters/karbon/msod/msodimport.h @@ -39,7 +39,7 @@ public: const TQStringList&); virtual ~MSODImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); protected: @@ -68,7 +68,7 @@ protected: signals: // Communication signals to the parent filters void commSignalDelayStream( const char* delay ); - void commSignalShapeID( unsigned int& tqshapeID ); + void commSignalShapeID( unsigned int& shapeID ); private: virtual void savePartContents( TQIODevice* file ); diff --git a/filters/karbon/oodraw/oodrawimport.cc b/filters/karbon/oodraw/oodrawimport.cc index 90320d7e..fba48867 100644 --- a/filters/karbon/oodraw/oodrawimport.cc +++ b/filters/karbon/oodraw/oodrawimport.cc @@ -62,7 +62,7 @@ OoDrawImport::~OoDrawImport() { } -KoFilter::ConversiontqStatus OoDrawImport::convert( TQCString const & from, TQCString const & to ) +KoFilter::ConversionStatus OoDrawImport::convert( TQCString const & from, TQCString const & to ) { kdDebug() << "Entering Oodraw Import filter: " << from << " - " << to << endl; @@ -81,13 +81,13 @@ KoFilter::ConversiontqStatus OoDrawImport::convert( TQCString const & from, TQCS return KoFilter::FileNotFound; } - KoFilter::ConversiontqStatus pretqStatus = openFile(); + KoFilter::ConversionStatus preStatus = openFile(); - if( pretqStatus != KoFilter::OK ) + if( preStatus != KoFilter::OK ) { m_zip->close(); delete m_zip; - return pretqStatus; + return preStatus; } /*TQDomDocument docinfo; createDocumentInfo( docinfo ); @@ -149,9 +149,9 @@ void OoDrawImport::createDocumentInfo( TQDomDocument &docinfo ) // Very related to OoWriterImport::openFile() -KoFilter::ConversiontqStatus OoDrawImport::openFile() +KoFilter::ConversionStatus OoDrawImport::openFile() { - KoFilter::ConversiontqStatus status = loadAndParse( "content.xml", m_content ); + KoFilter::ConversionStatus status = loadAndParse( "content.xml", m_content ); if ( status != KoFilter::OK ) { kdError(30518) << "Content.xml could not be parsed correctly! Aborting!" << endl; @@ -223,7 +223,7 @@ void OoDrawImport::convert() } -KoFilter::ConversiontqStatus OoDrawImport::loadAndParse(const TQString& filename, TQDomDocument& doc) +KoFilter::ConversionStatus OoDrawImport::loadAndParse(const TQString& filename, TQDomDocument& doc) { return OoUtils::loadAndParse( filename, doc, m_zip); } diff --git a/filters/karbon/oodraw/oodrawimport.h b/filters/karbon/oodraw/oodrawimport.h index 2b395f48..6e753d7d 100644 --- a/filters/karbon/oodraw/oodrawimport.h +++ b/filters/karbon/oodraw/oodrawimport.h @@ -43,7 +43,7 @@ public: OoDrawImport( KoFilter *parent, const char *name, const TQStringList & ); virtual ~OoDrawImport(); - virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to ); + virtual KoFilter::ConversionStatus convert( TQCString const & from, TQCString const & to ); private: void createDocumentInfo( TQDomDocument &docinfo ); @@ -63,8 +63,8 @@ private: double ymirror( double y ); KoRect parseViewBox( const TQDomElement& object ); - KoFilter::ConversiontqStatus openFile(); - KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc); + KoFilter::ConversionStatus openFile(); + KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc); VDocument m_document; TQDomDocument m_content; diff --git a/filters/karbon/png/pngexport.cc b/filters/karbon/png/pngexport.cc index 4de61a44..89b43d03 100644 --- a/filters/karbon/png/pngexport.cc +++ b/filters/karbon/png/pngexport.cc @@ -48,7 +48,7 @@ PngExport::PngExport( KoFilter*, const char*, const TQStringList& ) { } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus PngExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "image/png" || from != "application/x-karbon" ) diff --git a/filters/karbon/png/pngexport.h b/filters/karbon/png/pngexport.h index 3758daa3..df893965 100644 --- a/filters/karbon/png/pngexport.h +++ b/filters/karbon/png/pngexport.h @@ -33,7 +33,7 @@ public: PngExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~PngExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif diff --git a/filters/karbon/svg/svgexport.cc b/filters/karbon/svg/svgexport.cc index 2e661039..a5ed9b40 100644 --- a/filters/karbon/svg/svgexport.cc +++ b/filters/karbon/svg/svgexport.cc @@ -67,7 +67,7 @@ SvgExport::SvgExport( KoFilter*, const char*, const TQStringList& ) m_gc.setAutoDelete( true ); } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus SvgExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "image/svg+xml" || from != "application/x-karbon" ) @@ -171,7 +171,7 @@ TQString SvgExport::getID( VObject *obj ) { if( obj && !obj->name().isEmpty() ) - return TQString( " id=\"%1\"" ).tqarg( obj->name() ); + return TQString( " id=\"%1\"" ).arg( obj->name() ); return TQString(); } @@ -490,9 +490,9 @@ SvgExport::visitVText( VText& text ) *m_body << " font-weight=\"bold\""; if( text.font().italic() ) *m_body << " font-style=\"italic\""; - if( text.tqalignment() == VText::Center ) + if( text.alignment() == VText::Center ) *m_body << " text-anchor=\"middle\""; - else if( text.tqalignment() == VText::Right ) + else if( text.alignment() == VText::Right ) *m_body << " text-anchor=\"end\""; *m_body << ">" << endl; diff --git a/filters/karbon/svg/svgexport.h b/filters/karbon/svg/svgexport.h index 6bfe5d98..c79d1fde 100644 --- a/filters/karbon/svg/svgexport.h +++ b/filters/karbon/svg/svgexport.h @@ -52,7 +52,7 @@ public: SvgExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~SvgExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: virtual void visitVPath( VPath& composite ); diff --git a/filters/karbon/svg/svgimport.cc b/filters/karbon/svg/svgimport.cc index 5a5e90aa..9d323d3d 100644 --- a/filters/karbon/svg/svgimport.cc +++ b/filters/karbon/svg/svgimport.cc @@ -54,7 +54,7 @@ SvgImport::~SvgImport() { } -KoFilter::ConversiontqStatus SvgImport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus SvgImport::convert(const TQCString& from, const TQCString& to) { // check for proper conversion if( to != "application/x-karbon" || from != "image/svg+xml" ) @@ -138,7 +138,7 @@ void SvgImport::convert() m_outerRect = m_document.boundingBox(); // undo y-mirroring - //m_debug->append(TQString("%1\tUndo Y-mirroring.").tqarg(m_time.elapsed())); + //m_debug->append(TQString("%1\tUndo Y-mirroring.").arg(m_time.elapsed())); if( !docElem.attribute( "viewBox" ).isEmpty() ) { // allow for viewbox def with ',' or whitespace @@ -692,17 +692,17 @@ void SvgImport::parsePA( VObject *obj, SvgGraphicsContext *gc, const TQString &c //kdDebug() << "!!!!!!bbox y : " << bbox.y() << endl; //kdDebug() << gc->fill.gradient().origin().x() << endl; //kdDebug() << gc->fill.gradient().vector().x() << endl; - double offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().origin().x() ), true, false, bbox ); - double offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().origin().y() ), false, true, bbox ); + double offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().origin().x() ), true, false, bbox ); + double offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().origin().y() ), false, true, bbox ); gc->fill.gradient().setOrigin( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) ); if(gc->fill.gradient().type() == VGradient::radial) { - offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().focalPoint().x() ), true, false, bbox ); - offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().focalPoint().y() ), false, true, bbox ); + offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().focalPoint().x() ), true, false, bbox ); + offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().focalPoint().y() ), false, true, bbox ); gc->fill.gradient().setFocalPoint( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) ); } - offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().vector().x() ), true, false, bbox ); - offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().vector().y() ), false, true, bbox ); + offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().vector().x() ), true, false, bbox ); + offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().vector().y() ), false, true, bbox ); gc->fill.gradient().setVector( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) ); //kdDebug() << offsety << endl; //kdDebug() << gc->fill.gradient().origin().x() << endl; @@ -1263,9 +1263,9 @@ void SvgImport::createText( VGroup *grp, const TQDomElement &b ) text->setName( b.attribute("id") ); if( anchor == "middle" ) - text->tqsetAlignment( VText::Center ); + text->setAlignment( VText::Center ); else if( anchor == "end" ) - text->tqsetAlignment( VText::Right ); + text->setAlignment( VText::Right ); if( offset > 0.0 ) text->setOffset( offset ); diff --git a/filters/karbon/svg/svgimport.h b/filters/karbon/svg/svgimport.h index e4e3f56a..636077a1 100644 --- a/filters/karbon/svg/svgimport.h +++ b/filters/karbon/svg/svgimport.h @@ -45,7 +45,7 @@ public: SvgImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~SvgImport(); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); protected: class GradientHelper diff --git a/filters/karbon/wmf/wmfexport.cc b/filters/karbon/wmf/wmfexport.cc index a04dfc11..de929ca8 100644 --- a/filters/karbon/wmf/wmfexport.cc +++ b/filters/karbon/wmf/wmfexport.cc @@ -57,7 +57,7 @@ WmfExport::~WmfExport() { } -KoFilter::ConversiontqStatus WmfExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus WmfExport::convert( const TQCString& from, const TQCString& to ) { if( to != "image/x-wmf" || from != "application/x-karbon" ) { return KoFilter::NotImplemented; diff --git a/filters/karbon/wmf/wmfexport.h b/filters/karbon/wmf/wmfexport.h index e0c9be57..2c464f13 100644 --- a/filters/karbon/wmf/wmfexport.h +++ b/filters/karbon/wmf/wmfexport.h @@ -20,7 +20,7 @@ #define WMFEXPORT_H #include <tqpen.h> -#include <tqbrush.h> +#include <brush.h> #include <tqptrlist.h> #include <tqpointarray.h> #include <KoFilter.h> @@ -41,7 +41,7 @@ public: WmfExport( KoFilter *parent, const char *name, const TQStringList&); virtual ~WmfExport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: void visitVPath( VPath& composite ); diff --git a/filters/karbon/wmf/wmfimport.cc b/filters/karbon/wmf/wmfimport.cc index 23eaaa12..f7dcdcf3 100644 --- a/filters/karbon/wmf/wmfimport.cc +++ b/filters/karbon/wmf/wmfimport.cc @@ -45,7 +45,7 @@ WMFImport::~WMFImport() { } -KoFilter::ConversiontqStatus WMFImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus WMFImport::convert( const TQCString& from, const TQCString& to ) { if( to != "application/x-karbon" || from != "image/x-wmf" ) return KoFilter::NotImplemented; diff --git a/filters/karbon/wmf/wmfimport.h b/filters/karbon/wmf/wmfimport.h index 21bcee74..34ee8140 100644 --- a/filters/karbon/wmf/wmfimport.h +++ b/filters/karbon/wmf/wmfimport.h @@ -36,7 +36,7 @@ public: WMFImport( KoFilter *parent, const char *name, const TQStringList&); virtual ~WMFImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; diff --git a/filters/karbon/xaml/xamlexport.cc b/filters/karbon/xaml/xamlexport.cc index 228024f3..e1599a8c 100644 --- a/filters/karbon/xaml/xamlexport.cc +++ b/filters/karbon/xaml/xamlexport.cc @@ -60,7 +60,7 @@ XAMLExport::XAMLExport( KoFilter*, const char*, const TQStringList& ) m_gc.setAutoDelete( true ); } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus XAMLExport::convert( const TQCString& from, const TQCString& to ) { // TODO: ??? @@ -161,7 +161,7 @@ TQString XAMLExport::getID( VObject *obj ) { if( obj && !obj->name().isEmpty() ) - return TQString( " Name=\"%1\"" ).tqarg( obj->name() ); + return TQString( " Name=\"%1\"" ).arg( obj->name() ); return TQString(); } diff --git a/filters/karbon/xaml/xamlexport.h b/filters/karbon/xaml/xamlexport.h index b1a0f4fd..124ea3fd 100644 --- a/filters/karbon/xaml/xamlexport.h +++ b/filters/karbon/xaml/xamlexport.h @@ -50,7 +50,7 @@ public: XAMLExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~XAMLExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: virtual void visitVPath( VPath& composite ); diff --git a/filters/karbon/xaml/xamlimport.cc b/filters/karbon/xaml/xamlimport.cc index 3a755181..002001e2 100644 --- a/filters/karbon/xaml/xamlimport.cc +++ b/filters/karbon/xaml/xamlimport.cc @@ -24,9 +24,9 @@ #include <kdebug.h> #include <KoUnit.h> #include <KoGlobal.h> -#include <tqshapes/vellipse.h> -#include <tqshapes/vrectangle.h> -#include <tqshapes/vpolygon.h> +#include <shapes/vellipse.h> +#include <shapes/vrectangle.h> +#include <shapes/vpolygon.h> #include <commands/vtransformcmd.h> #include <core/vsegment.h> #include <core/vtext.h> @@ -52,7 +52,7 @@ XAMLImport::~XAMLImport() { } -KoFilter::ConversiontqStatus XAMLImport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus XAMLImport::convert(const TQCString& from, const TQCString& to) { // check for proper conversion if( to != "application/x-karbon" || from != "image/wvg+xml" ) @@ -466,14 +466,14 @@ XAMLImport::parsePA( VObject *obj, XAMLGraphicsContext *gc, const TQString &comm //kdDebug() << "!!!!!!bbox y : " << bbox.y() << endl; //kdDebug() << gc->fill.gradient().origin().x() << endl; //kdDebug() << gc->fill.gradient().vector().x() << endl; - double offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().origin().x() ), true, false, bbox ); - double offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().origin().y() ), false, true, bbox ); + double offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().origin().x() ), true, false, bbox ); + double offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().origin().y() ), false, true, bbox ); gc->fill.gradient().setOrigin( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) ); - offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().focalPoint().x() ), true, false, bbox ); - offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().focalPoint().y() ), false, true, bbox ); + offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().focalPoint().x() ), true, false, bbox ); + offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().focalPoint().y() ), false, true, bbox ); gc->fill.gradient().setFocalPoint( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) ); - offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().vector().x() ), true, false, bbox ); - offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().vector().y() ), false, true, bbox ); + offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().vector().x() ), true, false, bbox ); + offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().vector().y() ), false, true, bbox ); gc->fill.gradient().setVector( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) ); //kdDebug() << offsety << endl; //kdDebug() << gc->fill.gradient().origin().x() << endl; diff --git a/filters/karbon/xaml/xamlimport.h b/filters/karbon/xaml/xamlimport.h index b61313b9..001d1dc3 100644 --- a/filters/karbon/xaml/xamlimport.h +++ b/filters/karbon/xaml/xamlimport.h @@ -43,7 +43,7 @@ public: XAMLImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~XAMLImport(); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); protected: class GradientHelper diff --git a/filters/karbon/xcf/xcfexport.cc b/filters/karbon/xcf/xcfexport.cc index 3e9237fb..215c4f01 100644 --- a/filters/karbon/xcf/xcfexport.cc +++ b/filters/karbon/xcf/xcfexport.cc @@ -52,7 +52,7 @@ XcfExport::XcfExport( KoFilter*, const char*, const TQStringList& ) m_zoomY = 1.0; } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus XcfExport::convert( const TQCString& from, const TQCString& to ) { if( to != "image/x-xcf-gimp" || from != "application/x-karbon" ) @@ -128,10 +128,10 @@ XcfExport::visitVDocument( VDocument& document ) // Save current offset. - current = m_stream->tqdevice()->at(); + current = m_stream->device()->at(); // Leave space for layer and channel offsets. - m_stream->tqdevice()->at( + m_stream->device()->at( // current position + (number layers + number channels + 2) * 4. current + ( document.layers().count() + 3 + 2 ) * 4 ); @@ -142,7 +142,7 @@ XcfExport::visitVDocument( VDocument& document ) for( ; itr.current(); ++itr ) { // Save start offset. - start = m_stream->tqdevice()->at(); + start = m_stream->device()->at(); // Write layer. @@ -150,31 +150,31 @@ XcfExport::visitVDocument( VDocument& document ) // Save end offset. - end = m_stream->tqdevice()->at(); + end = m_stream->device()->at(); // Return to current offset. - m_stream->tqdevice()->at( current ); + m_stream->device()->at( current ); // Save layer offset. *m_stream << start; // Increment offset. - current = m_stream->tqdevice()->at(); + current = m_stream->device()->at(); // Return to end offset. - m_stream->tqdevice()->at( end ); + m_stream->device()->at( end ); } // Return to current offset. - m_stream->tqdevice()->at( current ); + m_stream->device()->at( current ); // Append a zero offset to indicate end of layer offsets. *m_stream << static_cast<TQ_UINT32>( 0 ); // Return to end offset. - m_stream->tqdevice()->at( end ); + m_stream->device()->at( end ); // Append a zero offset to indicate end of channel offsets. *m_stream << static_cast<TQ_UINT32>( 0 ); @@ -279,13 +279,13 @@ XcfExport::visitVLayer( VLayer& layer ) TQIODevice::Offset end = 0; // Save current offset. - current = m_stream->tqdevice()->at(); + current = m_stream->device()->at(); // Leave space for hierarchy offsets. - m_stream->tqdevice()->at( current + 8 ); + m_stream->device()->at( current + 8 ); // Save start offset. - start = m_stream->tqdevice()->at(); + start = m_stream->device()->at(); // Write hierarchy. @@ -293,10 +293,10 @@ XcfExport::visitVLayer( VLayer& layer ) // Save end offset. - end = m_stream->tqdevice()->at(); + end = m_stream->device()->at(); // Return to current offset. - m_stream->tqdevice()->at( current ); + m_stream->device()->at( current ); // Save hierarchy offset. *m_stream << start; @@ -333,15 +333,15 @@ XcfExport::writeHierarchy() int height = m_height; // Save current offset. - current = m_stream->tqdevice()->at(); + current = m_stream->device()->at(); // Leave space for level offsets. - m_stream->tqdevice()->at( current + ( levels + 1 ) * 4 ); + m_stream->device()->at( current + ( levels + 1 ) * 4 ); for( int i = 0; i < levels; ++i ) { // Save start offset. - start = m_stream->tqdevice()->at(); + start = m_stream->device()->at(); if( i == 0 ) { @@ -360,23 +360,23 @@ XcfExport::writeHierarchy() } // Save end offset. - end = m_stream->tqdevice()->at(); + end = m_stream->device()->at(); // Return to current offset. - m_stream->tqdevice()->at( current ); + m_stream->device()->at( current ); // Save level offset. *m_stream << start; // Increment offset. - current = m_stream->tqdevice()->at(); + current = m_stream->device()->at(); // Return to end offset. - m_stream->tqdevice()->at( end ); + m_stream->device()->at( end ); } // Return to current offset. - m_stream->tqdevice()->at( current ); + m_stream->device()->at( current ); // Append a zero offset to indicate end of level offsets. *m_stream << static_cast<TQ_UINT32>( 0 ); @@ -398,15 +398,15 @@ XcfExport::writeLevel() int tiles = rows * cols; // Save current offset. - current = m_stream->tqdevice()->at(); + current = m_stream->device()->at(); // Leave space for tile offsets. - m_stream->tqdevice()->at( current + ( tiles + 1 ) * 4 ); + m_stream->device()->at( current + ( tiles + 1 ) * 4 ); for( int i = 0; i < tiles; ++i ) { // Save start offset. - start = m_stream->tqdevice()->at(); + start = m_stream->device()->at(); // TODO: Save tile. @@ -425,19 +425,19 @@ XcfExport::writeLevel() // Save end offset. - end = m_stream->tqdevice()->at(); + end = m_stream->device()->at(); // Return to current offset. - m_stream->tqdevice()->at( current ); + m_stream->device()->at( current ); // Save tile offset. *m_stream << start; // Increment offset. - current = m_stream->tqdevice()->at(); + current = m_stream->device()->at(); // Return to end offset. - m_stream->tqdevice()->at( end ); + m_stream->device()->at( end ); } } diff --git a/filters/karbon/xcf/xcfexport.h b/filters/karbon/xcf/xcfexport.h index 82d86883..f6a7be70 100644 --- a/filters/karbon/xcf/xcfexport.h +++ b/filters/karbon/xcf/xcfexport.h @@ -40,7 +40,7 @@ public: XcfExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~XcfExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); virtual void visitVDocument( VDocument& document ); virtual void visitVLayer( VLayer& layer ); diff --git a/filters/karbon/xfig/xfigimport.cc b/filters/karbon/xfig/xfigimport.cc index 015c4006..c3d6ab6a 100644 --- a/filters/karbon/xfig/xfigimport.cc +++ b/filters/karbon/xfig/xfigimport.cc @@ -167,7 +167,7 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc, char buf[255]; int value; - KoPageLayout tqlayout; + KoPageLayout layout; ifstream fin( file.local8Bit() ); if (! fin) @@ -177,7 +177,7 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc, GDocument *gdoc = kidoc->gdoc(); //GPage *activePage = gdoc->activePage(); - tqlayout = gdoc->activePage()->pageLayout (); + layout = gdoc->activePage()->pageLayout (); fin.getline (buf, 255); if (::strncmp (buf, "#FIG 3", 6)) { @@ -203,9 +203,9 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc, // orientation fin.getline (buf, 255); if (::strcmp (buf, "Landscape") == 0) - tqlayout.orientation = PG_LANDSCAPE; + layout.orientation = PG_LANDSCAPE; else if (::strcmp (buf, "Portrait") == 0) - tqlayout.orientation = PG_PORTRAIT; + layout.orientation = PG_PORTRAIT; else kdDebug() << "ERROR: invalid orientation" << endl; @@ -215,9 +215,9 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc, // units fin.getline (buf, 255); if (::strcmp (buf, "Metric") == 0) - tqlayout.unit = PG_MM; + layout.unit = PG_MM; else if (::strcmp (buf, "Inches") == 0) - tqlayout.unit = PG_INCH; + layout.unit = PG_INCH; else kdDebug() << "ERROR: invalid units" << endl; diff --git a/filters/kchart/libimageexport/imageexport.cpp b/filters/kchart/libimageexport/imageexport.cpp index 5033762b..faff17ff 100644 --- a/filters/kchart/libimageexport/imageexport.cpp +++ b/filters/kchart/libimageexport/imageexport.cpp @@ -40,7 +40,7 @@ ImageExport::~ImageExport() } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus ImageExport::convert(const TQCString& from, const TQCString& to) { // Check for proper conversion. diff --git a/filters/kchart/libimageexport/imageexport.h b/filters/kchart/libimageexport/imageexport.h index 825b0156..d1a73abe 100644 --- a/filters/kchart/libimageexport/imageexport.h +++ b/filters/kchart/libimageexport/imageexport.h @@ -32,7 +32,7 @@ public: ImageExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~ImageExport(); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); virtual void extraImageAttribute() {}; virtual bool saveImage( TQString fileName) = 0; virtual const char* exportFormat() = 0; diff --git a/filters/kchart/svg/svgexport.cc b/filters/kchart/svg/svgexport.cc index 8d8ad52c..1507f536 100644 --- a/filters/kchart/svg/svgexport.cc +++ b/filters/kchart/svg/svgexport.cc @@ -45,7 +45,7 @@ SvgExport::~SvgExport() } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus SvgExport::convert(const TQCString& from, const TQCString& to) { // Check for proper conversion. diff --git a/filters/kchart/svg/svgexport.h b/filters/kchart/svg/svgexport.h index c04c0f22..653aae9b 100644 --- a/filters/kchart/svg/svgexport.h +++ b/filters/kchart/svg/svgexport.h @@ -31,7 +31,7 @@ public: SvgExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~SvgExport(); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // __SVGEXPORT_H__ diff --git a/filters/kformula/latex/latexexport.cc b/filters/kformula/latex/latexexport.cc index 77488fa9..3f184674 100644 --- a/filters/kformula/latex/latexexport.cc +++ b/filters/kformula/latex/latexexport.cc @@ -18,7 +18,7 @@ */ #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfile.h> #include <kapplication.h> @@ -46,7 +46,7 @@ LATEXExport::LATEXExport( KoFilter */*parent*/, const char */*name*/, const TQSt } -KoFilter::ConversiontqStatus LATEXExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus LATEXExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "text/x-tex" || from != "application/x-kformula" ) return KoFilter::NotImplemented; diff --git a/filters/kformula/latex/latexexport.h b/filters/kformula/latex/latexexport.h index 091ed125..83672fae 100644 --- a/filters/kformula/latex/latexexport.h +++ b/filters/kformula/latex/latexexport.h @@ -33,7 +33,7 @@ public: LATEXExport( KoFilter *parent, const char *name, const TQStringList& ); virtual ~LATEXExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // LATEXEXPORT_H diff --git a/filters/kformula/mathml/mathmlexport.cc b/filters/kformula/mathml/mathmlexport.cc index 507c13a2..6103da18 100644 --- a/filters/kformula/mathml/mathmlexport.cc +++ b/filters/kformula/mathml/mathmlexport.cc @@ -18,7 +18,7 @@ */ #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfile.h> #include <kapplication.h> @@ -46,7 +46,7 @@ MathMLExport::MathMLExport( KoFilter */*parent*/, const char */*name*/, const TQ } -KoFilter::ConversiontqStatus MathMLExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus MathMLExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "application/mathml+xml" || from != "application/x-kformula" ) return KoFilter::NotImplemented; diff --git a/filters/kformula/mathml/mathmlexport.h b/filters/kformula/mathml/mathmlexport.h index a49b837b..2a442a22 100644 --- a/filters/kformula/mathml/mathmlexport.h +++ b/filters/kformula/mathml/mathmlexport.h @@ -33,7 +33,7 @@ public: MathMLExport( KoFilter *parent, const char *name, const TQStringList& ); virtual ~MathMLExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // MATHMLEXPORT_H diff --git a/filters/kformula/mathml/mathmlimport.cc b/filters/kformula/mathml/mathmlimport.cc index 87ce2182..6900c61b 100644 --- a/filters/kformula/mathml/mathmlimport.cc +++ b/filters/kformula/mathml/mathmlimport.cc @@ -25,7 +25,7 @@ #include <kmessagebox.h> #include <KoFilterChain.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <kformuladocument.h> #include <kformulacontainer.h> @@ -44,7 +44,7 @@ MathMLImport::MathMLImport(KoFilter *, const char *, const TQStringList&) { } -KoFilter::ConversiontqStatus MathMLImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus MathMLImport::convert( const TQCString& from, const TQCString& to ) { kdDebug( KFormula::DEBUGID ) << "From: " << from << endl; kdDebug( KFormula::DEBUGID ) << "To: " << to << endl; @@ -68,7 +68,7 @@ KoFilter::ConversiontqStatus MathMLImport::convert( const TQCString& from, const const TQString filename( m_chain->inputFile() ); TQFile f( filename ); if ( !f.open( IO_ReadOnly ) ) { - KMessageBox::error( 0, i18n( "Failed to open input file: %1" ).tqarg( filename ), i18n( "MathML Import Error" ) ); + KMessageBox::error( 0, i18n( "Failed to open input file: %1" ).arg( filename ), i18n( "MathML Import Error" ) ); delete wrapper; return KoFilter::FileNotFound; } @@ -84,7 +84,7 @@ KoFilter::ConversiontqStatus MathMLImport::convert( const TQCString& from, const << " In line: " << errorLine << ", column: " << errorColumn << endl << " Error message: " << errorMsg << endl; KMessageBox::error( 0, i18n( "Parsing error in MathML file %4 at line %1, column %2\nError message: %3" ) - .tqarg( errorLine ).tqarg( errorColumn ).tqarg( i18n ( "TQXml", errorMsg.utf8() ).tqarg( filename ) ), i18n( "MathML Import Error" ) ); + .arg( errorLine ).arg( errorColumn ).arg( i18n ( "TQXml", errorMsg.utf8() ).arg( filename ) ), i18n( "MathML Import Error" ) ); return KoFilter::WrongFormat; } f.close(); diff --git a/filters/kformula/mathml/mathmlimport.h b/filters/kformula/mathml/mathmlimport.h index a4a28e18..4835b69b 100644 --- a/filters/kformula/mathml/mathmlimport.h +++ b/filters/kformula/mathml/mathmlimport.h @@ -21,7 +21,7 @@ #define MATHMLIMPORT_H #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfile.h> #include <tqobject.h> @@ -36,7 +36,7 @@ public: MathMLImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~MathMLImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif /* MATHMLIMPORT_H */ diff --git a/filters/kformula/png/pngexport.cc b/filters/kformula/png/pngexport.cc index c6d3611e..764cfc2b 100644 --- a/filters/kformula/png/pngexport.cc +++ b/filters/kformula/png/pngexport.cc @@ -18,7 +18,7 @@ */ #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfile.h> #include <tqobject.h> @@ -46,7 +46,7 @@ PNGExport::PNGExport( KoFilter */*parent*/, const char */*name*/, const TQString } -KoFilter::ConversiontqStatus PNGExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus PNGExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "image/png" || from != "application/x-kformula" ) return KoFilter::NotImplemented; diff --git a/filters/kformula/png/pngexport.h b/filters/kformula/png/pngexport.h index 8dd3de34..eb71df94 100644 --- a/filters/kformula/png/pngexport.h +++ b/filters/kformula/png/pngexport.h @@ -33,7 +33,7 @@ public: PNGExport( KoFilter *parent, const char *name, const TQStringList& ); virtual ~PNGExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // PNGEXPORT_H diff --git a/filters/kformula/png/pngexportdia.cc b/filters/kformula/png/pngexportdia.cc index fb0407e0..36741fa2 100644 --- a/filters/kformula/png/pngexportdia.cc +++ b/filters/kformula/png/pngexportdia.cc @@ -20,7 +20,7 @@ #include <tqcheckbox.h> #include <tqimage.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpaintdevice.h> #include <tqrect.h> @@ -190,13 +190,13 @@ void PNGExportDia::setupGUI() width->setText( i18n( "Width" ) ); heightEdit = new KIntNumInput( page, "heightEdit" ); - TQGridLayout* tqlayout1 = new TQGridLayout; - tqlayout1->addWidget( height, 1, 0 ); - tqlayout1->addWidget( widthEdit, 0, 1 ); - tqlayout1->addWidget( width, 0, 0 ); - tqlayout1->addWidget( heightEdit, 1, 1 ); + TQGridLayout* layout1 = new TQGridLayout; + layout1->addWidget( height, 1, 0 ); + layout1->addWidget( widthEdit, 0, 1 ); + layout1->addWidget( width, 0, 0 ); + layout1->addWidget( heightEdit, 1, 1 ); - mainLayout->addLayout( tqlayout1 ); + mainLayout->addLayout( layout1 ); TQLabel* percentHeight = new TQLabel( page, "PercentHeight" ); percentHeight->setText( i18n( "Height (%)" ) ); @@ -205,15 +205,15 @@ void PNGExportDia::setupGUI() percWidthEdit = new KDoubleNumInput( page, "percWidthEdit" ); percHeightEdit = new KDoubleNumInput( page, "percHeightEdit" ); - TQGridLayout* tqlayout2 = new TQGridLayout; - tqlayout2->addWidget( percWidthEdit, 0, 1 ); - tqlayout2->addWidget( percHeightEdit, 1, 1 ); - tqlayout2->addWidget( percentHeight, 1, 0 ); - tqlayout2->addWidget( percentWidth, 0, 0 ); + TQGridLayout* layout2 = new TQGridLayout; + layout2->addWidget( percWidthEdit, 0, 1 ); + layout2->addWidget( percHeightEdit, 1, 1 ); + layout2->addWidget( percentHeight, 1, 0 ); + layout2->addWidget( percentWidth, 0, 0 ); - mainLayout->addLayout( tqlayout2 ); + mainLayout->addLayout( layout2 ); - /* Display the main tqlayout */ + /* Display the main layout */ mainLayout->addStretch( 5 ); mainLayout->activate(); } diff --git a/filters/kformula/svg/svgexport.cc b/filters/kformula/svg/svgexport.cc index 25758e82..328f1518 100644 --- a/filters/kformula/svg/svgexport.cc +++ b/filters/kformula/svg/svgexport.cc @@ -48,7 +48,7 @@ SvgExport::~SvgExport() } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus SvgExport::convert(const TQCString& from, const TQCString& to) { // Check for proper conversion. diff --git a/filters/kformula/svg/svgexport.h b/filters/kformula/svg/svgexport.h index 65a5cef1..0296e574 100644 --- a/filters/kformula/svg/svgexport.h +++ b/filters/kformula/svg/svgexport.h @@ -32,7 +32,7 @@ public: SvgExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~SvgExport(); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // __SVGEXPORT_H__ diff --git a/filters/kivio/imageexport/kivio_imageexport.cpp b/filters/kivio/imageexport/kivio_imageexport.cpp index cd983fe6..2339dbf0 100644 --- a/filters/kivio/imageexport/kivio_imageexport.cpp +++ b/filters/kivio/imageexport/kivio_imageexport.cpp @@ -55,7 +55,7 @@ ImageExport::ImageExport(KoFilter *, const char *, const TQStringList&) KGlobal::locale()->insertCatalogue("kofficefilters"); } -KoFilter::ConversiontqStatus ImageExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus ImageExport::convert(const TQCString& from, const TQCString& to) { if(from != "application/x-kivio") { return KoFilter::BadMimeType; diff --git a/filters/kivio/imageexport/kivio_imageexport.h b/filters/kivio/imageexport/kivio_imageexport.h index e1946f0f..498204fa 100644 --- a/filters/kivio/imageexport/kivio_imageexport.h +++ b/filters/kivio/imageexport/kivio_imageexport.h @@ -32,7 +32,7 @@ class ImageExport : public KoFilter public: ImageExport(KoFilter *, const char *, const TQStringList&); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; } diff --git a/filters/kivio/imageexport/kivio_imageexportwidget.ui b/filters/kivio/imageexport/kivio_imageexportwidget.ui index 41d73a4c..34feba57 100644 --- a/filters/kivio/imageexport/kivio_imageexportwidget.ui +++ b/filters/kivio/imageexport/kivio_imageexportwidget.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -81,7 +81,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>60</width> <height>21</height> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>20</height> diff --git a/filters/kpresenter/kword/kprkword.cc b/filters/kpresenter/kword/kprkword.cc index d40cd608..8dd96c5f 100644 --- a/filters/kpresenter/kword/kprkword.cc +++ b/filters/kpresenter/kword/kprkword.cc @@ -41,7 +41,7 @@ KprKword::KprKword(KoFilter *, const char *, const TQStringList&) : // This filter can act as an import filter for KWord and as an export // filter for KPresenter (isn't our architecture really nice ? :) // This is why we use the file-to-file method, not a TQDomDoc one. -KoFilter::ConversiontqStatus KprKword::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus KprKword::convert( const TQCString& from, const TQCString& to ) { if(to!="application/x-kword" || from!="application/x-kpresenter") return KoFilter::NotImplemented; diff --git a/filters/kpresenter/kword/kprkword.h b/filters/kpresenter/kword/kprkword.h index f4141a09..30932652 100644 --- a/filters/kpresenter/kword/kprkword.h +++ b/filters/kpresenter/kword/kprkword.h @@ -33,7 +33,7 @@ public: virtual ~KprKword() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); protected: void convert(); diff --git a/filters/kpresenter/libimageexport/imageexport.cpp b/filters/kpresenter/libimageexport/imageexport.cpp index b87b8635..c4ceb243 100644 --- a/filters/kpresenter/libimageexport/imageexport.cpp +++ b/filters/kpresenter/libimageexport/imageexport.cpp @@ -42,7 +42,7 @@ ImageExport::~ImageExport() } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus ImageExport::convert(const TQCString& from, const TQCString& to) { KoDocument * document = m_chain->inputDocument(); diff --git a/filters/kpresenter/libimageexport/imageexport.h b/filters/kpresenter/libimageexport/imageexport.h index 23f45e28..5cb89622 100644 --- a/filters/kpresenter/libimageexport/imageexport.h +++ b/filters/kpresenter/libimageexport/imageexport.h @@ -32,7 +32,7 @@ public: ImageExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~ImageExport(); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); virtual bool extraImageAttribute() { return true;}; virtual bool saveImage( TQString fileName) = 0; virtual const char* exportFormat() = 0; diff --git a/filters/kpresenter/magicpoint/mgp2kpr.py b/filters/kpresenter/magicpoint/mgp2kpr.py index e2e5b50a..97527471 100755 --- a/filters/kpresenter/magicpoint/mgp2kpr.py +++ b/filters/kpresenter/magicpoint/mgp2kpr.py @@ -56,7 +56,7 @@ class MgpImporter: self.__reset() #init properties def __reset(self): - self.tqalignment="1" #text tqalignment, left + self.alignment="1" #text alignment, left self.vgap=1 #line spacing #font properties @@ -167,14 +167,14 @@ class MgpImporter: def __setAlign(self,command): tokens=string.split(command,' ') if (tokens[0]=='leftfill'): #justify - self.tqalignment="8" + self.alignment="8" elif (tokens[0]=='right'): - self.tqalignment="2" + self.alignment="2" elif (tokens[0]=='center'): - self.tqalignment="4" + self.alignment="4" else: - self.tqalignment="1" #left - #print self.tqalignment + self.alignment="1" #left + #print self.alignment def __setBackground(self,parent): pageElem=self.document.createElement("PAGE") @@ -233,7 +233,7 @@ class MgpImporter: indent=-1 pElem=self.document.createElement("P") #paragraph - pElem.setAttribute("align", self.tqalignment) + pElem.setAttribute("align", self.alignment) elem=self.document.createElement("NAME") #style name elem.setAttribute("value", "Standard") ###is this needed at all? @@ -283,7 +283,7 @@ class MgpImporter: if (self.fontItalic!=0): elem.setAttribute("italic", "1") - text=self.document.createTextNode(tqunicode(line, self.charset, 'ignore')) + text=self.document.createTextNode(unicode(line, self.charset, 'ignore')) elem.appendChild(text) pElem.appendChild(elem) self.textElem.appendChild(pElem) @@ -377,7 +377,7 @@ class MgpImporter: self.__setFontSize(command) elif (command.startswith('left') or command.startswith('center') or - command.startswith('right')): #text tqalignment + command.startswith('right')): #text alignment self.__setAlign(command) elif (command.startswith('charset')): #charset self.__setCharset(command) diff --git a/filters/kpresenter/ooimpress/ooimpressexport.cc b/filters/kpresenter/ooimpress/ooimpressexport.cc index 0e4771cf..47173cb9 100644 --- a/filters/kpresenter/ooimpress/ooimpressexport.cc +++ b/filters/kpresenter/ooimpress/ooimpressexport.cc @@ -54,7 +54,7 @@ OoImpressExport::~OoImpressExport() delete m_storeinp; } -KoFilter::ConversiontqStatus OoImpressExport::convert( const TQCString & from, +KoFilter::ConversionStatus OoImpressExport::convert( const TQCString & from, const TQCString & to ) { kdDebug(30518) << "Entering Ooimpress Export filter: " << from << " - " << to << endl; @@ -66,10 +66,10 @@ KoFilter::ConversiontqStatus OoImpressExport::convert( const TQCString & from, } // read in the KPresenter file - KoFilter::ConversiontqStatus pretqStatus = openFile(); + KoFilter::ConversionStatus preStatus = openFile(); - if ( pretqStatus != KoFilter::OK ) - return pretqStatus; + if ( preStatus != KoFilter::OK ) + return preStatus; TQDomImplementation impl; TQDomDocument meta( impl.createDocumentType( "office:document-meta", @@ -178,7 +178,7 @@ KoFilter::ConversiontqStatus OoImpressExport::convert( const TQCString & from, return KoFilter::OK; } -KoFilter::ConversiontqStatus OoImpressExport::openFile() +KoFilter::ConversionStatus OoImpressExport::openFile() { m_storeinp = KoStore::createStore( m_chain->inputFile(), KoStore::Read ); @@ -558,7 +558,7 @@ void OoImpressExport::createHelpLine( TQDomNode &helpline ) TQString str( "P%1,%2" ); int tmpX = ( int ) ( KoUnit::toMM( helplines.attribute("posX").toDouble() )*100 ); int tmpY = ( int ) ( KoUnit::toMM( helplines.attribute("posY").toDouble() )*100 ); - m_helpLine+=str.tqarg( TQString::number( tmpX ) ).tqarg( TQString::number( tmpY ) ); + m_helpLine+=str.arg( TQString::number( tmpX ) ).arg( TQString::number( tmpY ) ); } } } @@ -758,7 +758,7 @@ void OoImpressExport::appendNote( TQDomDocument & doc, TQDomElement & source, TQ TQDomElement noteTextBox = doc.createElement( "draw:text-box" ); //TODO : add draw:text-box size : - //<draw:text-box draw:style-name="gr2" draw:text-style-name="P2" draw:layer="tqlayout" svg:width="13.336cm" svg:height="56.288cm" svg:x="-0.54cm" svg:y="-14.846cm"> + //<draw:text-box draw:style-name="gr2" draw:text-style-name="P2" draw:layer="layout" svg:width="13.336cm" svg:height="56.288cm" svg:x="-0.54cm" svg:y="-14.846cm"> TQStringList text = TQStringList::split( "\n", noteText ); for ( TQStringList::Iterator it = text.begin(); it != text.end(); ++it ) { @@ -780,7 +780,7 @@ void OoImpressExport::appendTextbox( TQDomDocument & doc, TQDomElement & source, TQString gs = m_styleFactory.createGraphicStyle( source ); textbox.setAttribute( "draw:style-name", gs ); - // set the tqgeometry + // set the geometry set2DGeometry( source, textbox ); // parse every paragraph @@ -876,7 +876,7 @@ void OoImpressExport::appendPicture( TQDomDocument & doc, TQDomElement & source, image.setAttribute( "draw:style-name", gs ); TQDomElement key = source.namedItem( "KEY" ).toElement(); - TQString pictureName = TQString( "Picture/Picture%1" ).tqarg( m_pictureIndex ); + TQString pictureName = TQString( "Picture/Picture%1" ).arg( m_pictureIndex ); image.setAttribute( "xlink:type", "simple" ); image.setAttribute( "xlink:show", "embed" ); @@ -909,7 +909,7 @@ void OoImpressExport::appendPicture( TQDomDocument & doc, TQDomElement & source, } image.setAttribute( "xlink:href", "#" + pictureName ); -// set the tqgeometry +// set the geometry set2DGeometry( source, image ); target.appendChild( image ); @@ -927,7 +927,7 @@ void OoImpressExport::appendLine( TQDomDocument & doc, TQDomElement & source, TQ TQString gs = m_styleFactory.createGraphicStyle( source ); line.setAttribute( "draw:style-name", gs ); - // set the tqgeometry + // set the geometry setLineGeometry( source, line ); target.appendChild( line ); @@ -941,7 +941,7 @@ void OoImpressExport::appendRectangle( TQDomDocument & doc, TQDomElement & sourc TQString gs = m_styleFactory.createGraphicStyle( source ); rectangle.setAttribute( "draw:style-name", gs ); - // set the tqgeometry + // set the geometry set2DGeometry( source, rectangle ); target.appendChild( rectangle ); @@ -955,7 +955,7 @@ void OoImpressExport::appendPolyline( TQDomDocument & doc, TQDomElement & source TQString gs = m_styleFactory.createGraphicStyle( source ); polyline.setAttribute( "draw:style-name", gs ); - // set the tqgeometry + // set the geometry set2DGeometry( source, polyline, false, true /*multipoint*/ ); target.appendChild( polyline ); @@ -974,7 +974,7 @@ void OoImpressExport::appendEllipse( TQDomDocument & doc, TQDomElement & source, TQString gs = m_styleFactory.createGraphicStyle( source ); ellipse.setAttribute( "draw:style-name", gs ); - // set the tqgeometry + // set the geometry set2DGeometry( source, ellipse, pieObject ); target.appendChild( ellipse ); @@ -998,7 +998,7 @@ void OoImpressExport::set2DGeometry( TQDomElement & source, TQDomElement & targe target.setAttribute( "draw:id", TQString::number( m_objectIndex ) ); target.setAttribute( "svg:x", StyleFactory::toCM( orig.attribute( "x" ) ) ); - target.setAttribute( "svg:y", TQString( "%1cm" ).tqarg( KoUnit::toCM( y ) ) ); + target.setAttribute( "svg:y", TQString( "%1cm" ).arg( KoUnit::toCM( y ) ) ); target.setAttribute( "svg:width", StyleFactory::toCM( size.attribute( "width" ) ) ); target.setAttribute( "svg:height", StyleFactory::toCM( size.attribute( "height" ) ) ); TQString nameStr = name.attribute("objectName"); @@ -1073,16 +1073,16 @@ void OoImpressExport::set2DGeometry( TQDomElement & source, TQDomElement & targe if( elemPoint.hasAttribute( "point_y" ) ) tmpY = ( int ) ( KoUnit::toMM(elemPoint.attribute( "point_y" ).toDouble() )*100 ); if ( !listOfPoint.isEmpty() ) - listOfPoint += TQString( " %1,%2" ).tqarg( tmpX ).tqarg( tmpY ); + listOfPoint += TQString( " %1,%2" ).arg( tmpX ).arg( tmpY ); else - listOfPoint = TQString( "%1,%2" ).tqarg( tmpX ).tqarg( tmpY ); + listOfPoint = TQString( "%1,%2" ).arg( tmpX ).arg( tmpY ); maxX = TQMAX( maxX, tmpX ); maxY = TQMAX( maxY, tmpY ); } elemPoint = elemPoint.nextSibling().toElement(); } target.setAttribute( "draw:points", listOfPoint ); - target.setAttribute( "svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( maxX ).tqarg( maxY ) ); + target.setAttribute( "svg:viewBox", TQString( "0 0 %1 %2" ).arg( maxX ).arg( maxY ) ); } } } @@ -1093,7 +1093,7 @@ TQString OoImpressExport::rotateValue( double val ) if ( val!=0.0 ) { double value = -1 * ( ( double )val* M_PI )/180.0; - str=TQString( "rotate (%1)" ).tqarg( value ); + str=TQString( "rotate (%1)" ).arg( value ); } return str; } @@ -1125,29 +1125,29 @@ void OoImpressExport::setLineGeometry( TQDomElement & source, TQDomElement & tar target.setAttribute( "draw:id", TQString::number( m_objectIndex ) ); TQString xpos1 = StyleFactory::toCM( orig.attribute( "x" ) ); - TQString xpos2 = TQString( "%1cm" ).tqarg( KoUnit::toCM( x2 ) ); + TQString xpos2 = TQString( "%1cm" ).arg( KoUnit::toCM( x2 ) ); if ( type == 0 ) { - target.setAttribute( "svg:y1", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2/2.0 ) ) ); - target.setAttribute( "svg:y2", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2/2.0 ) ) ); + target.setAttribute( "svg:y1", TQString( "%1cm" ).arg( KoUnit::toCM( y2/2.0 ) ) ); + target.setAttribute( "svg:y2", TQString( "%1cm" ).arg( KoUnit::toCM( y2/2.0 ) ) ); } else if ( type == 1 ) { - target.setAttribute( "svg:y1", TQString( "%1cm" ).tqarg( KoUnit::toCM( y1 ) ) ); - target.setAttribute( "svg:y2", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2 ) ) ); - xpos1 = TQString( "%1cm" ).tqarg( KoUnit::toCM( x1/2.0 ) ); + target.setAttribute( "svg:y1", TQString( "%1cm" ).arg( KoUnit::toCM( y1 ) ) ); + target.setAttribute( "svg:y2", TQString( "%1cm" ).arg( KoUnit::toCM( y2 ) ) ); + xpos1 = TQString( "%1cm" ).arg( KoUnit::toCM( x1/2.0 ) ); xpos2 = xpos1; } else if ( type == 3 ) // from left bottom to right top { - target.setAttribute( "svg:y1", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2 ) ) ); - target.setAttribute( "svg:y2", TQString( "%1cm" ).tqarg( KoUnit::toCM( y1 ) ) ); + target.setAttribute( "svg:y1", TQString( "%1cm" ).arg( KoUnit::toCM( y2 ) ) ); + target.setAttribute( "svg:y2", TQString( "%1cm" ).arg( KoUnit::toCM( y1 ) ) ); } else // from left top to right bottom { - target.setAttribute( "svg:y1", TQString( "%1cm" ).tqarg( KoUnit::toCM( y1 ) ) ); - target.setAttribute( "svg:y2", TQString( "%1cm" ).tqarg( KoUnit::toCM( y2 ) ) ); + target.setAttribute( "svg:y1", TQString( "%1cm" ).arg( KoUnit::toCM( y1 ) ) ); + target.setAttribute( "svg:y2", TQString( "%1cm" ).arg( KoUnit::toCM( y2 ) ) ); } target.setAttribute( "svg:x1", xpos1 ); target.setAttribute( "svg:x2", xpos2 ); diff --git a/filters/kpresenter/ooimpress/ooimpressexport.h b/filters/kpresenter/ooimpress/ooimpressexport.h index ac369192..dec5ec4c 100644 --- a/filters/kpresenter/ooimpress/ooimpressexport.h +++ b/filters/kpresenter/ooimpress/ooimpressexport.h @@ -37,11 +37,11 @@ public: OoImpressExport( KoFilter * parent, const char * name, const TQStringList & ); virtual ~OoImpressExport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString & from, + virtual KoFilter::ConversionStatus convert( const TQCString & from, const TQCString & to ); private: - KoFilter::ConversiontqStatus openFile(); + KoFilter::ConversionStatus openFile(); void exportBody( TQDomDocument & doccontent, TQDomElement & body ); void createDocumentMeta( TQDomDocument & docmeta ); diff --git a/filters/kpresenter/ooimpress/ooimpressimport.cc b/filters/kpresenter/ooimpress/ooimpressimport.cc index 1dab566d..77e1f38c 100644 --- a/filters/kpresenter/ooimpress/ooimpressimport.cc +++ b/filters/kpresenter/ooimpress/ooimpressimport.cc @@ -67,7 +67,7 @@ OoImpressImport::~OoImpressImport() m_animations.clear(); } -KoFilter::ConversiontqStatus OoImpressImport::convert( TQCString const & from, TQCString const & to ) +KoFilter::ConversionStatus OoImpressImport::convert( TQCString const & from, TQCString const & to ) { kdDebug(30518) << "Entering Ooimpress Import filter: " << from << " - " << to << endl; @@ -87,13 +87,13 @@ KoFilter::ConversiontqStatus OoImpressImport::convert( TQCString const & from, T return KoFilter::FileNotFound; } - KoFilter::ConversiontqStatus pretqStatus = openFile(); + KoFilter::ConversionStatus preStatus = openFile(); - if ( pretqStatus != KoFilter::OK ) + if ( preStatus != KoFilter::OK ) { m_zip->close(); delete m_zip; - return pretqStatus; + return preStatus; } TQDomDocument docinfo; @@ -129,9 +129,9 @@ KoFilter::ConversiontqStatus OoImpressImport::convert( TQCString const & from, T } // Very related to OoWriterImport::openFile() -KoFilter::ConversiontqStatus OoImpressImport::openFile() +KoFilter::ConversionStatus OoImpressImport::openFile() { - KoFilter::ConversiontqStatus status = loadAndParse( "content.xml", m_content ); + KoFilter::ConversionStatus status = loadAndParse( "content.xml", m_content ); if ( status != KoFilter::OK ) { kdError(30518) << "Content.xml could not be parsed correctly! Aborting!" << endl; @@ -150,7 +150,7 @@ KoFilter::ConversiontqStatus OoImpressImport::openFile() return KoFilter::OK; } -KoFilter::ConversiontqStatus OoImpressImport::loadAndParse(const TQString& filename, TQDomDocument& doc) +KoFilter::ConversionStatus OoImpressImport::loadAndParse(const TQString& filename, TQDomDocument& doc) { return OoUtils::loadAndParse( filename, doc, m_zip); } @@ -1154,7 +1154,7 @@ void OoImpressImport::appendImage( TQDomDocument& doc, TQDomElement& e, TQDomEle // create a key for the picture TQTime time = TQTime::currentTime(); - TQDate date = TQDate::tqcurrentDate(); + TQDate date = TQDate::currentDate(); TQDomElement image = doc.createElement( "KEY" ); image.setAttribute( "msec", time.msec() ); @@ -1214,7 +1214,7 @@ void OoImpressImport::appendBackgroundImage( TQDomDocument& doc, TQDomElement& e // create a key for the picture TQTime time = TQTime::currentTime(); - TQDate date = TQDate::tqcurrentDate(); + TQDate date = TQDate::currentDate(); TQDomElement image = doc.createElement( "BACKPICTUREKEY" ); image.setAttribute( "msec", time.msec() ); @@ -1498,15 +1498,15 @@ TQDomElement OoImpressImport::parseTextBox( TQDomDocument& doc, const TQDomEleme TQDomElement textObjectElement = doc.createElement( "TEXTOBJ" ); appendTextObjectMargin( doc, textObjectElement ); - // vertical tqalignment + // vertical alignment if ( m_styleStack.hasAttributeNS( ooNS::draw, "textarea-vertical-align" ) ) { - TQString tqalignment = m_styleStack.attributeNS( ooNS::draw, "textarea-vertical-align" ); - if ( tqalignment == "top" ) + TQString alignment = m_styleStack.attributeNS( ooNS::draw, "textarea-vertical-align" ); + if ( alignment == "top" ) textObjectElement.setAttribute( "verticalAlign", "top" ); - else if ( tqalignment == "middle" ) + else if ( alignment == "middle" ) textObjectElement.setAttribute( "verticalAlign", "center" ); - else if ( tqalignment == "bottom" ) + else if ( alignment == "bottom" ) textObjectElement.setAttribute( "verticalAlign", "bottom" ); textObjectElement.setAttribute("verticalValue", 0.0); @@ -1663,7 +1663,7 @@ TQDomElement OoImpressImport::parseParagraph( TQDomDocument& doc, const TQDomEle p.appendChild(nameElem); } - // Paragraph tqalignment + // Paragraph alignment if ( m_styleStack.hasAttributeNS( ooNS::fo, "text-align" ) ) { TQString align = m_styleStack.attributeNS( ooNS::fo, "text-align" ); @@ -2046,7 +2046,7 @@ TQString OoImpressImport::storeImage( const TQDomElement& object ) KArchiveFile* file = (KArchiveFile*) m_zip->directory()->entry( url ); TQString extension = url.mid( url.find( '.' ) ); - TQString fileName = TQString( "picture%1" ).tqarg( m_numPicture++ ) + extension; + TQString fileName = TQString( "picture%1" ).arg( m_numPicture++ ) + extension; KoStoreDevice* out = m_chain->storageFile( "pictures/" + fileName, KoStore::Write ); if ( file && out ) @@ -2072,7 +2072,7 @@ TQString OoImpressImport::storeSound(const TQDomElement & object, TQDomElement & return TQString(); TQString extension = url.mid( url.find( '.' ) ); - TQString fileName = TQString( "sound%1" ).tqarg( m_numSound++ ) + extension; + TQString fileName = TQString( "sound%1" ).arg( m_numSound++ ) + extension; fileName = "sounds/" + fileName; KoStoreDevice* out = m_chain->storageFile( fileName, KoStore::Write ); @@ -2161,7 +2161,7 @@ void OoImpressImport::appendField(TQDomDocument& doc, TQDomElement& e, const TQD bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true"); if (!dt.isValid()) { - dt = TQDateTime::tqcurrentDateTime(); // OOo docs say so :) + dt = TQDateTime::currentDateTime(); // OOo docs say so :) fixed = false; } @@ -2196,7 +2196,7 @@ void OoImpressImport::appendField(TQDomDocument& doc, TQDomElement& e, const TQD bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true"); if (!dt.isValid()) { - dt = TQDateTime::tqcurrentDateTime(); // OOo docs say so :) + dt = TQDateTime::currentDateTime(); // OOo docs say so :) fixed = false; } @@ -2314,9 +2314,9 @@ void OoImpressImport::createPresentationAnimation(const TQDomElement& element) { const TQString localName = e.localName(); const TQString ns = e.namespaceURI(); - if ( ns == ooNS::presentation && localName == "show-tqshape" && e.hasAttributeNS( ooNS::draw, "tqshape-id" ) ) + if ( ns == ooNS::presentation && localName == "show-shape" && e.hasAttributeNS( ooNS::draw, "shape-id" ) ) { - TQString name = e.attributeNS( ooNS::draw, "tqshape-id", TQString() ); + TQString name = e.attributeNS( ooNS::draw, "shape-id", TQString() ); //kdDebug(30518)<<" insert animation style : name :"<<name<<endl; animationList *lst = new animationList; TQDomElement* ep = new TQDomElement( e ); @@ -2342,8 +2342,8 @@ TQDomElement OoImpressImport::findAnimationByObjectID(const TQString & id, int { TQDomElement e = node.toElement(); order = animation->order; - kdDebug(30518)<<"e.tagName() :"<<e.tagName()<<" e.attribute(draw:tqshape-id) :"<<e.attributeNS( ooNS::draw, "tqshape-id", TQString())<<endl; - if (e.tagName()=="presentation:show-tqshape" && e.attributeNS( ooNS::draw, "tqshape-id", TQString())==id) + kdDebug(30518)<<"e.tagName() :"<<e.tagName()<<" e.attribute(draw:shape-id) :"<<e.attributeNS( ooNS::draw, "shape-id", TQString())<<endl; + if (e.tagName()=="presentation:show-shape" && e.attributeNS( ooNS::draw, "shape-id", TQString())==id) return e; } diff --git a/filters/kpresenter/ooimpress/ooimpressimport.h b/filters/kpresenter/ooimpress/ooimpressimport.h index 596ca703..b187d189 100644 --- a/filters/kpresenter/ooimpress/ooimpressimport.h +++ b/filters/kpresenter/ooimpress/ooimpressimport.h @@ -46,7 +46,7 @@ public: OoImpressImport( KoFilter * parent, const char * name, const TQStringList & ); virtual ~OoImpressImport(); - virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to ); + virtual KoFilter::ConversionStatus convert( TQCString const & from, TQCString const & to ); private: void createDocumentInfo( TQDomDocument &docinfo ); @@ -96,8 +96,8 @@ private: bool parseSettings( TQDomDocument &doc, TQDomElement &helpLineElement, TQDomElement &attributeElement ); void parseHelpLine( TQDomDocument &doc,TQDomElement &helpLineElement, const TQString &text ); - KoFilter::ConversiontqStatus openFile(); - KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc); + KoFilter::ConversionStatus openFile(); + KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc); int m_numPicture; int m_numSound; diff --git a/filters/kpresenter/ooimpress/status.html b/filters/kpresenter/ooimpress/status.html index f64a38b0..8c34c4d1 100644 --- a/filters/kpresenter/ooimpress/status.html +++ b/filters/kpresenter/ooimpress/status.html @@ -61,7 +61,7 @@ - Rounding (for rectangles)<br> - Shadow<br> - Text margins<br> - -Qt::Vertical tqalignment for text<br> + -Qt::Vertical alignment for text<br> - Text style (underline, sub/super script, bold, italic, strikeout, background color)<br> - Paragraph style (line spacing, offset before/after paragraph, indent first/right/left, borders)<br> - Presentation settings<br> @@ -168,7 +168,7 @@ - Settings element (snap line drawing)<br> - Export Transparency<br> - Export Group Object<br> - -Qt::Vertical tqalignment for text<br> + -Qt::Vertical alignment for text<br> - Text margins<br> - Export title/keyword/subject<br> - Custom Slide Show<br> diff --git a/filters/kpresenter/ooimpress/stylefactory.cc b/filters/kpresenter/ooimpress/stylefactory.cc index a25ba52a..e50b652e 100644 --- a/filters/kpresenter/ooimpress/stylefactory.cc +++ b/filters/kpresenter/ooimpress/stylefactory.cc @@ -362,7 +362,7 @@ void StrokeDashStyle::toXML( TQDomDocument & doc, TQDomElement & e ) const GradientStyle::GradientStyle( TQDomElement & gradient, int index ) { - m_name = TQString( "Gradient %1" ).tqarg( index ); + m_name = TQString( "Gradient %1" ).arg( index ); m_start_intensity = "100%"; m_end_intensity = "100%"; m_border = "0%"; @@ -393,8 +393,8 @@ GradientStyle::GradientStyle( TQDomElement & gradient, int index ) { int cx = bGradient.attribute( "xfactor" ).toInt(); int cy = bGradient.attribute( "yfactor" ).toInt(); - m_cx = TQString( "%1%" ).tqarg( cx / 4 + 50 ); - m_cy = TQString( "%1%" ).tqarg( cy / 4 + 50 ); + m_cx = TQString( "%1%" ).arg( cx / 4 + 50 ); + m_cy = TQString( "%1%" ).arg( cy / 4 + 50 ); } } @@ -419,8 +419,8 @@ GradientStyle::GradientStyle( TQDomElement & gradient, int index ) { int cx = gradient.attribute( "xfactor" ).toInt(); int cy = gradient.attribute( "yfactor" ).toInt(); - m_cx = TQString( "%1%" ).tqarg( cx / 4 + 50 ); - m_cy = TQString( "%1%" ).tqarg( cy / 4 + 50 ); + m_cx = TQString( "%1%" ).arg( cx / 4 + 50 ); + m_cy = TQString( "%1%" ).arg( cy / 4 + 50 ); } } @@ -615,8 +615,8 @@ PageMasterStyle::PageMasterStyle( TQDomElement & e, const uint index ) TQDomNode borders = e.namedItem( "PAPERBORDERS" ); TQDomElement b = borders.toElement(); - m_name = TQString( "PM%1" ).tqarg( index ); - m_style = TQString( "Default%1" ).tqarg( index ); + m_name = TQString( "PM%1" ).arg( index ); + m_style = TQString( "Default%1" ).arg( index ); m_margin_top = StyleFactory::toCM( b.attribute( "ptTop" ) ); m_margin_bottom = StyleFactory::toCM( b.attribute( "ptBottom" ) ); m_margin_left = StyleFactory::toCM( b.attribute( "ptLeft" ) ); @@ -675,7 +675,7 @@ PageStyle::PageStyle( StyleFactory * styleFactory, TQDomElement & e, const uint m_bg_objects_visible = "true"; } - m_name = TQString( "dp%1" ).tqarg( index ); + m_name = TQString( "dp%1" ).arg( index ); // check if this is an empty page tag if ( !e.hasChildNodes() ) @@ -718,7 +718,7 @@ PageStyle::PageStyle( StyleFactory * styleFactory, TQDomElement & e, const uint //ISO8601 chapter 5.5.3.2 //TQDate doesn't encode it as this format. - m_page_duration = TQString( "PT%1H%2M%3S" ).tqarg( hours ).tqarg( ms ).tqarg( sec ); + m_page_duration = TQString( "PT%1H%2M%3S" ).arg( hours ).arg( ms ).arg( sec ); } TQDomElement pageEffect = e.namedItem( "PGEFFECT" ).toElement(); @@ -899,11 +899,11 @@ bool PageStyle::operator==( const PageStyle & pageStyle ) const TextStyle::TextStyle( TQDomElement & e, const uint index ) { - m_name = TQString( "T%1" ).tqarg( index ); + m_name = TQString( "T%1" ).arg( index ); if ( e.hasAttribute( "family" ) ) m_font_family = e.attribute( "family" ); if ( e.hasAttribute( "pointSize" ) ) - m_font_size = TQString( "%1pt" ).tqarg( e.attribute( "pointSize" ) ); + m_font_size = TQString( "%1pt" ).arg( e.attribute( "pointSize" ) ); if ( e.hasAttribute( "color" ) ) m_color = e.attribute( "color" ); if ( e.hasAttribute( "bold" ) && e.attribute( "bold" ) == "1" ) @@ -1017,25 +1017,25 @@ GraphicStyle::GraphicStyle( StyleFactory * styleFactory, TQDomElement & e, const } if ( textObjectElement.hasAttribute( "bleftpt" ) ) { - m_textMarginLeft = TQString( "%1pt" ).tqarg( textObjectElement.attribute( "bleftpt" ) ); + m_textMarginLeft = TQString( "%1pt" ).arg( textObjectElement.attribute( "bleftpt" ) ); } if ( textObjectElement.hasAttribute( "bbottompt" ) ) { - m_textMarginBottom = TQString( "%1pt" ).tqarg( textObjectElement.attribute( "bbottompt" ) ); + m_textMarginBottom = TQString( "%1pt" ).arg( textObjectElement.attribute( "bbottompt" ) ); } if ( textObjectElement.hasAttribute( "btoppt" ) ) { - m_textMarginTop = TQString( "%1pt" ).tqarg( textObjectElement.attribute( "btoppt" ) ); + m_textMarginTop = TQString( "%1pt" ).arg( textObjectElement.attribute( "btoppt" ) ); } if ( textObjectElement.hasAttribute( "brightpt" ) ) { - m_textMarginRight = TQString( "%1pt" ).tqarg( textObjectElement.attribute( "brightpt" ) ); + m_textMarginRight = TQString( "%1pt" ).arg( textObjectElement.attribute( "brightpt" ) ); } } - kdDebug(30518)<<" tqalignment :"<<m_textAlignment<<endl; + kdDebug(30518)<<" alignment :"<<m_textAlignment<<endl; - m_name = TQString( "gr%1" ).tqarg( index ); + m_name = TQString( "gr%1" ).arg( index ); if ( !pen.isNull() ) { TQDomElement p = pen.toElement(); @@ -1352,7 +1352,7 @@ ParagraphStyle::ParagraphStyle( TQDomElement & e, const uint index ) TQDomNode lineSpacing = e.namedItem( "LINESPACING" ); TQDomNode counter = e.namedItem( "COUNTER" ); - m_name = TQString( "P%1" ).tqarg( index ); + m_name = TQString( "P%1" ).arg( index ); if ( e.hasAttribute( "align" ) ) { int align = e.attribute( "align" ).toInt(); @@ -1376,7 +1376,7 @@ ParagraphStyle::ParagraphStyle( TQDomElement & e, const uint index ) if ( !shadow.isNull() ) { TQDomElement s = shadow.toElement(); - TQString distance = TQString( "%1pt" ).tqarg( s.attribute( "distance" ) ); + TQString distance = TQString( "%1pt" ).arg( s.attribute( "distance" ) ); m_text_shadow = distance + " " + distance; } @@ -1416,7 +1416,7 @@ ParagraphStyle::ParagraphStyle( TQDomElement & e, const uint index ) else if ( type == "double" ) m_line_height = "200%"; else if ( type == "multiple" ) - m_line_height = TQString( "%1%" ).tqarg( l.attribute( "spacingvalue" ).toInt() * 100 ); + m_line_height = TQString( "%1%" ).arg( l.attribute( "spacingvalue" ).toInt() * 100 ); else if ( type == "custom" ) m_line_spacing = StyleFactory::toCM( l.attribute( "spacingvalue" ) ); else if ( type == "atleast" ) @@ -1503,7 +1503,7 @@ TQString ParagraphStyle::parseBorder( TQDomElement e ) e.attribute( "green" ).toInt(), e.attribute( "blue" ).toInt() ); - return TQString( "%1 %2 %3" ).tqarg( width ).tqarg( style ).tqarg( color.name() ); + return TQString( "%1 %2 %3" ).arg( width ).arg( style ).arg( color.name() ); } ListStyle::ListStyle( TQDomElement & e, const uint index ) @@ -1513,7 +1513,7 @@ ListStyle::ListStyle( TQDomElement & e, const uint index ) m_color = "#000000"; m_font_size = "100%"; - m_name = TQString( "L%1" ).tqarg( index ); + m_name = TQString( "L%1" ).arg( index ); if ( e.hasAttribute( "type" ) ) { @@ -1598,9 +1598,9 @@ void ListStyle::toXML( TQDomDocument & doc, TQDomElement & e ) const if ( level > 1 ) { properties.setAttribute( "text:min-label-width", - TQString( "%1cm" ).tqarg( m_min_label_width ) ); + TQString( "%1cm" ).arg( m_min_label_width ) ); properties.setAttribute( "text:space-before", - TQString( "%1cm" ).tqarg( m_min_label_width * ( level - 1 ) ) ); + TQString( "%1cm" ).arg( m_min_label_width * ( level - 1 ) ) ); } if ( !m_color.isNull() ) diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.cc b/filters/kpresenter/powerpoint/import/powerpointimport.cc index 4f41aac7..31d2b4a1 100644 --- a/filters/kpresenter/powerpoint/import/powerpointimport.cc +++ b/filters/kpresenter/powerpoint/import/powerpointimport.cc @@ -30,7 +30,7 @@ #include <tqcstring.h> #include <tqfile.h> #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> #include <KoFilterChain.h> @@ -80,7 +80,7 @@ PowerPointImport::~PowerPointImport() delete d; } -KoFilter::ConversiontqStatus PowerPointImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus PowerPointImport::convert( const TQCString& from, const TQCString& to ) { if ( from != "application/mspowerpoint" ) return KoFilter::NotImplemented; @@ -156,8 +156,8 @@ TQByteArray PowerPointImport::createStyles() TQByteArray stylesData; TQBuffer stylesBuffer( stylesData ); - TQString pageWidth = TQString("%1pt").tqarg( d->presentation->masterSlide()->pageWidth() ); - TQString pageHeight = TQString("%1pt").tqarg( d->presentation->masterSlide()->pageHeight() ); + TQString pageWidth = TQString("%1pt").arg( d->presentation->masterSlide()->pageWidth() ); + TQString pageHeight = TQString("%1pt").arg( d->presentation->masterSlide()->pageHeight() ); stylesBuffer.open( IO_WriteOnly ); stylesWriter = new KoXmlWriter( &stylesBuffer ); @@ -178,10 +178,10 @@ TQByteArray PowerPointImport::createStyles() // office:automatic-styles stylesWriter->startElement( "office:automatic-styles" ); - stylesWriter->startElement( "style:page-tqlayout" ); + stylesWriter->startElement( "style:page-layout" ); stylesWriter->addAttribute( "style:name","pm1" ); stylesWriter->addAttribute( "style:page-usage","all" ); - stylesWriter->startElement( "style:page-tqlayout-properties" ); + stylesWriter->startElement( "style:page-layout-properties" ); stylesWriter->addAttribute( "fo:margin-bottom","0pt" ); stylesWriter->addAttribute( "fo:margin-left","0pt" ); stylesWriter->addAttribute( "fo:margin-right","0pt" ); @@ -189,8 +189,8 @@ TQByteArray PowerPointImport::createStyles() stylesWriter->addAttribute( "fo:page-height", pageHeight ); stylesWriter->addAttribute( "fo:page-width", pageWidth ); stylesWriter->addAttribute( "style:print-orientation","landscape" ); - stylesWriter->endElement(); // style:page-tqlayout-properties - stylesWriter->endElement(); // style:page-tqlayout + stylesWriter->endElement(); // style:page-layout-properties + stylesWriter->endElement(); // style:page-layout stylesWriter->startElement( "style:style" ); stylesWriter->addAttribute( "style:name","dp1" ); @@ -237,7 +237,7 @@ TQByteArray PowerPointImport::createStyles() stylesWriter->startElement( "office:master-styles" ); stylesWriter->startElement( "style:master-page" ); stylesWriter->addAttribute( "style:name", "Standard" ); - stylesWriter->addAttribute( "style:page-tqlayout-name", "pm1" ); + stylesWriter->addAttribute( "style:page-layout-name", "pm1" ); stylesWriter->addAttribute( "draw:style-name", "dp1" ); stylesWriter->endElement(); stylesWriter->endElement(); @@ -351,11 +351,11 @@ void PowerPointImport::processEllipse (DrawObject* drawObject, KoXmlWriter* xmlW { if( !drawObject || !xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); xmlWriter->startElement( "draw:ellipse" ); xmlWriter->addAttribute( "draw:style-name", styleName ); @@ -363,7 +363,7 @@ void PowerPointImport::processEllipse (DrawObject* drawObject, KoXmlWriter* xmlW xmlWriter->addAttribute( "svg:height", heightStr ); xmlWriter->addAttribute( "svg:x", xStr ); xmlWriter->addAttribute( "svg:y", yStr ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->endElement(); // draw:ellipse } @@ -372,11 +372,11 @@ void PowerPointImport::processRectangle (DrawObject* drawObject, KoXmlWriter* xm if( !drawObject ) return; if( !xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); xmlWriter->startElement( "draw:rect" ); xmlWriter->addAttribute( "draw:style-name", styleName ); @@ -393,7 +393,7 @@ void PowerPointImport::processRectangle (DrawObject* drawObject, KoXmlWriter* xm double xNew = xVec*cos(rotAngle) - yVec*sin(rotAngle); double yNew = xVec*sin(rotAngle) + yVec*cos(rotAngle); - TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").tqarg(rotAngle).tqarg(xNew+xMid).tqarg(yMid-yNew); + TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").arg(rotAngle).arg(xNew+xMid).arg(yMid-yNew); xmlWriter->addAttribute( "draw:transform", rot ); } else @@ -401,7 +401,7 @@ void PowerPointImport::processRectangle (DrawObject* drawObject, KoXmlWriter* xm xmlWriter->addAttribute( "svg:x", xStr ); xmlWriter->addAttribute( "svg:y", yStr ); } - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->endElement(); // draw:rect } @@ -409,13 +409,13 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite { if( !drawObject || !xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); - xmlWriter->startElement( "draw:custom-tqshape" ); + xmlWriter->startElement( "draw:custom-shape" ); xmlWriter->addAttribute( "draw:style-name", styleName ); @@ -435,7 +435,7 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite double xNew = xVec*cos(rotAngle) - yVec*sin(rotAngle); double yNew = xVec*sin(rotAngle) + yVec*cos(rotAngle); - TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").tqarg(rotAngle).tqarg(xNew+xMid).tqarg(yMid+yNew); + TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").arg(rotAngle).arg(xNew+xMid).arg(yMid+yNew); xmlWriter->addAttribute( "draw:transform", rot ); } else @@ -448,7 +448,7 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite double xNew = xVec*cos(rotAngle) - yVec*sin(rotAngle); double yNew = xVec*sin(rotAngle) + yVec*cos(rotAngle); - TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").tqarg(rotAngle).tqarg(xNew+xMid).tqarg(yMid-yNew); + TQString rot = TQString("rotate (%1) translate (%2mm %3mm)").arg(rotAngle).arg(xNew+xMid).arg(yMid-yNew); xmlWriter->addAttribute( "draw:transform", rot ); } @@ -463,8 +463,8 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite // xmlWriter->addAttribute( "svg:x", xStr ); // xmlWriter->addAttribute( "svg:y", yStr ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); - xmlWriter->startElement( "draw:enhanced-tqgeometry" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); + xmlWriter->startElement( "draw:enhanced-geometry" ); xmlWriter->addAttribute( "draw:type", "round-rectangle"); xmlWriter->startElement( "draw:equation" ); xmlWriter->addAttribute( "draw:formula", "$0 /3" ); @@ -486,21 +486,21 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite xmlWriter->addAttribute( "draw:formula", "top+?f0 " ); xmlWriter->addAttribute( "draw:name", "f4" ); xmlWriter->endElement(); // draw:equation - xmlWriter->endElement(); // draw:enhanced-tqgeometry - xmlWriter->endElement(); // draw:custom-tqshape + xmlWriter->endElement(); // draw:enhanced-geometry + xmlWriter->endElement(); // draw:custom-shape } void PowerPointImport::processDiamond (DrawObject* drawObject, KoXmlWriter* xmlWriter ) { if( !drawObject || !xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); - xmlWriter->startElement( "draw:custom-tqshape" ); + xmlWriter->startElement( "draw:custom-shape" ); xmlWriter->addAttribute( "draw:style-name", styleName ); xmlWriter->addAttribute( "svg:width", widthStr ); xmlWriter->addAttribute( "svg:height", heightStr ); @@ -522,10 +522,10 @@ void PowerPointImport::processDiamond (DrawObject* drawObject, KoXmlWriter* xmlW xmlWriter->addAttribute( "svg:x", 10 ); xmlWriter->addAttribute( "svg:y", 5 ); xmlWriter->endElement(); - xmlWriter->startElement( "draw:enhanced-tqgeometry" ); + xmlWriter->startElement( "draw:enhanced-geometry" ); xmlWriter->addAttribute( "draw:type", "diamond"); xmlWriter->endElement(); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->endElement(); } @@ -533,20 +533,20 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml { if( !drawObject || !xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); /* draw IsocelesTriangle or RightTriangle */ - xmlWriter->startElement( "draw:custom-tqshape" ); + xmlWriter->startElement( "draw:custom-shape" ); xmlWriter->addAttribute( "draw:style-name", styleName ); xmlWriter->addAttribute( "svg:width", widthStr ); xmlWriter->addAttribute( "svg:height", heightStr ); xmlWriter->addAttribute( "svg:x", xStr ); xmlWriter->addAttribute( "svg:y", yStr ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->startElement( "draw:glue-point" ); xmlWriter->addAttribute( "svg:x", 5 ); xmlWriter->addAttribute( "svg:y", 0 ); @@ -572,7 +572,7 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml xmlWriter->addAttribute( "svg:y", 5 ); xmlWriter->endElement(); - xmlWriter->startElement( "draw:enhanced-tqgeometry" ); + xmlWriter->startElement( "draw:enhanced-geometry" ); if (drawObject->hasProperty("draw:mirror-vertical")) { @@ -588,14 +588,14 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml double rotAngle = drawObject->getDoubleProperty("libppt:rotation" ); double xMid = ( drawObject->left() + 0.5*drawObject->width() ); double yMid = ( drawObject->top() + 0.5*drawObject->height() ); - TQString rot = TQString("rotate (%1) translate (%2cm %3cm)").tqarg(rotAngle).tqarg(xMid).tqarg(yMid); + TQString rot = TQString("rotate (%1) translate (%2cm %3cm)").arg(rotAngle).arg(xMid).arg(yMid); xmlWriter->addAttribute( "draw:transform", rot ); } - if (drawObject->tqshape() == DrawObject::RightTriangle) + if (drawObject->shape() == DrawObject::RightTriangle) { xmlWriter->addAttribute( "draw:type", "right-triangle"); } - else if (drawObject->tqshape() == DrawObject::IsoscelesTriangle) + else if (drawObject->shape() == DrawObject::IsoscelesTriangle) { xmlWriter->addAttribute( "draw:type", "isosceles-triangle"); xmlWriter->startElement( "draw:equation" ); @@ -637,27 +637,27 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml xmlWriter->endElement(); } - xmlWriter->endElement(); // enhanced-tqgeometry - xmlWriter->endElement(); // custom-tqshape + xmlWriter->endElement(); // enhanced-geometry + xmlWriter->endElement(); // custom-shape } void PowerPointImport::processTrapezoid (DrawObject* drawObject, KoXmlWriter* xmlWriter ) { if( !drawObject || !xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); - xmlWriter->startElement( "draw:custom-tqshape" ); + xmlWriter->startElement( "draw:custom-shape" ); xmlWriter->addAttribute( "draw:style-name", styleName ); xmlWriter->addAttribute( "svg:width", widthStr ); xmlWriter->addAttribute( "svg:height", heightStr ); xmlWriter->addAttribute( "svg:x", xStr ); xmlWriter->addAttribute( "svg:y", yStr ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->startElement( "draw:glue-point" ); xmlWriter->addAttribute( "svg:x", 5 ); @@ -675,7 +675,7 @@ void PowerPointImport::processTrapezoid (DrawObject* drawObject, KoXmlWriter* xm xmlWriter->addAttribute( "svg:x", 5 ); xmlWriter->addAttribute( "svg:y", 10 ); xmlWriter->endElement(); - xmlWriter->startElement( "draw:enhanced-tqgeometry" ); + xmlWriter->startElement( "draw:enhanced-geometry" ); if ( drawObject->hasProperty("draw:mirror-vertical") ) { xmlWriter->addAttribute("draw:mirror-vertical","true"); @@ -718,27 +718,27 @@ void PowerPointImport::processTrapezoid (DrawObject* drawObject, KoXmlWriter* xm xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0); xmlWriter->addAttribute("draw:handle-position","$0 bottom"); xmlWriter->endElement(); - xmlWriter->endElement(); // enhanced-tqgeometry - xmlWriter->endElement(); // custom-tqshape + xmlWriter->endElement(); // enhanced-geometry + xmlWriter->endElement(); // custom-shape } void PowerPointImport::processParallelogram (DrawObject* drawObject, KoXmlWriter* xmlWriter ) { if( !drawObject || !xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); - xmlWriter->startElement( "draw:custom-tqshape" ); + xmlWriter->startElement( "draw:custom-shape" ); xmlWriter->addAttribute( "draw:style-name", styleName ); xmlWriter->addAttribute( "svg:width", widthStr ); xmlWriter->addAttribute( "svg:height", heightStr ); xmlWriter->addAttribute( "svg:x", xStr ); xmlWriter->addAttribute( "svg:y", yStr ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->startElement( "draw:glue-point" ); xmlWriter->addAttribute( "svg:x", 6.25 ); xmlWriter->addAttribute( "svg:y", 0 ); @@ -763,7 +763,7 @@ void PowerPointImport::processParallelogram (DrawObject* drawObject, KoXmlWriter xmlWriter->addAttribute( "svg:x", 1.25 ); xmlWriter->addAttribute( "svg:y", 5 ); xmlWriter->endElement(); - xmlWriter->startElement( "draw:enhanced-tqgeometry" ); + xmlWriter->startElement( "draw:enhanced-geometry" ); if (drawObject->hasProperty("draw:mirror-vertical")) { xmlWriter->addAttribute("draw:mirror-vertical","true"); @@ -834,27 +834,27 @@ void PowerPointImport::processParallelogram (DrawObject* drawObject, KoXmlWriter xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0); xmlWriter->addAttribute("draw:handle-position","$0 top"); xmlWriter->endElement(); - xmlWriter->endElement(); // enhanced-tqgeometry - xmlWriter->endElement(); // custom-tqshape + xmlWriter->endElement(); // enhanced-geometry + xmlWriter->endElement(); // custom-shape } void PowerPointImport::processHexagon (DrawObject* drawObject, KoXmlWriter* xmlWriter ) { if( !drawObject || !xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); - xmlWriter->startElement( "draw:custom-tqshape" ); + xmlWriter->startElement( "draw:custom-shape" ); xmlWriter->addAttribute( "draw:style-name", styleName ); xmlWriter->addAttribute( "svg:width", widthStr ); xmlWriter->addAttribute( "svg:height", heightStr ); xmlWriter->addAttribute( "svg:x", xStr ); xmlWriter->addAttribute( "svg:y", yStr ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->startElement( "draw:glue-point" ); xmlWriter->addAttribute( "svg:x", 5 ); xmlWriter->addAttribute( "svg:y", 0 ); @@ -871,7 +871,7 @@ void PowerPointImport::processHexagon (DrawObject* drawObject, KoXmlWriter* xmlW xmlWriter->addAttribute( "svg:x", 10 ); xmlWriter->addAttribute( "svg:y", 5 ); xmlWriter->endElement(); - xmlWriter->startElement( "draw:enhanced-tqgeometry" ); + xmlWriter->startElement( "draw:enhanced-geometry" ); xmlWriter->addAttribute( "draw:type", "hexagon" ); xmlWriter->startElement( "draw:equation" ); xmlWriter->addAttribute( "draw:formula", "$0 " ); @@ -898,27 +898,27 @@ void PowerPointImport::processHexagon (DrawObject* drawObject, KoXmlWriter* xmlW xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0); xmlWriter->addAttribute("draw:handle-position","$0 top"); xmlWriter->endElement(); - xmlWriter->endElement(); // enhanced-tqgeometry - xmlWriter->endElement(); // custom-tqshape + xmlWriter->endElement(); // enhanced-geometry + xmlWriter->endElement(); // custom-shape } void PowerPointImport::processOctagon (DrawObject* drawObject, KoXmlWriter* xmlWriter ) { if( !drawObject || !xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); - xmlWriter->startElement( "draw:custom-tqshape" ); + xmlWriter->startElement( "draw:custom-shape" ); xmlWriter->addAttribute( "draw:style-name", styleName ); xmlWriter->addAttribute( "svg:width", widthStr ); xmlWriter->addAttribute( "svg:height", heightStr ); xmlWriter->addAttribute( "svg:x", xStr ); xmlWriter->addAttribute( "svg:y", yStr ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->startElement( "draw:glue-point" ); xmlWriter->addAttribute( "svg:x", 5 ); xmlWriter->addAttribute( "svg:y", 0 ); @@ -935,7 +935,7 @@ void PowerPointImport::processOctagon (DrawObject* drawObject, KoXmlWriter* xmlW xmlWriter->addAttribute( "svg:x", 10 ); xmlWriter->addAttribute( "svg:y", 4.782 ); xmlWriter->endElement(); - xmlWriter->startElement( "draw:enhanced-tqgeometry" ); + xmlWriter->startElement( "draw:enhanced-geometry" ); xmlWriter->addAttribute( "draw:type", "octagon" ); xmlWriter->startElement( "draw:equation" ); xmlWriter->addAttribute( "draw:formula", "left+$0 " ); @@ -978,36 +978,36 @@ void PowerPointImport::processOctagon (DrawObject* drawObject, KoXmlWriter* xmlW xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0); xmlWriter->addAttribute("draw:handle-position","$0 top"); xmlWriter->endElement(); - xmlWriter->endElement(); // enhanced-tqgeometry - xmlWriter->endElement(); // custom-tqshape + xmlWriter->endElement(); // enhanced-geometry + xmlWriter->endElement(); // custom-shape } void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWriter ) { if( !drawObject || !xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); - xmlWriter->startElement( "draw:custom-tqshape" ); + xmlWriter->startElement( "draw:custom-shape" ); xmlWriter->addAttribute( "draw:style-name", styleName ); xmlWriter->addAttribute( "svg:width", widthStr ); xmlWriter->addAttribute( "svg:height", heightStr ); xmlWriter->addAttribute( "svg:x", xStr ); xmlWriter->addAttribute( "svg:y", yStr ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); - xmlWriter->startElement( "draw:enhanced-tqgeometry" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); + xmlWriter->startElement( "draw:enhanced-geometry" ); - if (drawObject->tqshape() == DrawObject::RightArrow) + if (drawObject->shape() == DrawObject::RightArrow) xmlWriter->addAttribute( "draw:type", "right-arrow" ); - else if (drawObject->tqshape() == DrawObject::LeftArrow) + else if (drawObject->shape() == DrawObject::LeftArrow) xmlWriter->addAttribute( "draw:type", "left-arrow" ); - else if (drawObject->tqshape() == DrawObject::UpArrow) + else if (drawObject->shape() == DrawObject::UpArrow) xmlWriter->addAttribute( "draw:type", "up-arrow" ); - else if (drawObject->tqshape() == DrawObject::DownArrow) + else if (drawObject->shape() == DrawObject::DownArrow) xmlWriter->addAttribute( "draw:type", "down-arrow" ); xmlWriter->startElement( "draw:equation" ); xmlWriter->addAttribute( "draw:formula","$1"); @@ -1042,7 +1042,7 @@ void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWri xmlWriter->addAttribute( "draw:name","f7"); xmlWriter->endElement(); // draw:equation xmlWriter->startElement( "draw:handle" ); - if ( drawObject->tqshape() == DrawObject::RightArrow | drawObject->tqshape() == DrawObject::LeftArrow ) + if ( drawObject->shape() == DrawObject::RightArrow | drawObject->shape() == DrawObject::LeftArrow ) { xmlWriter->addAttribute( "draw:handle-range-x-maximum", 21600); xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0); @@ -1050,7 +1050,7 @@ void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWri xmlWriter->addAttribute("draw:handle-range-y-maximum",10800); xmlWriter->addAttribute("draw:handle-range-y-minimum",0); } - else if ( drawObject->tqshape() == DrawObject::UpArrow | drawObject->tqshape() == DrawObject::DownArrow ) + else if ( drawObject->shape() == DrawObject::UpArrow | drawObject->shape() == DrawObject::DownArrow ) { xmlWriter->addAttribute( "draw:handle-range-x-maximum", 10800); xmlWriter->addAttribute( "draw:handle-range-x-minimum", 0); @@ -1059,19 +1059,19 @@ void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWri xmlWriter->addAttribute("draw:handle-range-y-minimum",0); } xmlWriter->endElement(); // draw:handle - xmlWriter->endElement(); // draw:enhanced-tqgeometry - xmlWriter->endElement(); // draw:custom-tqshape + xmlWriter->endElement(); // draw:enhanced-geometry + xmlWriter->endElement(); // draw:custom-shape } void PowerPointImport::processLine (DrawObject* drawObject, KoXmlWriter* xmlWriter ) { if( !drawObject || !xmlWriter) return; - TQString x1Str = TQString("%1mm").tqarg( drawObject->left() ); - TQString y1Str = TQString("%1mm").tqarg( drawObject->top() ); - TQString x2Str = TQString("%1mm").tqarg( drawObject->left() + drawObject->width() ); - TQString y2Str = TQString("%1mm").tqarg( drawObject->top() + drawObject->height() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString x1Str = TQString("%1mm").arg( drawObject->left() ); + TQString y1Str = TQString("%1mm").arg( drawObject->top() ); + TQString x2Str = TQString("%1mm").arg( drawObject->left() + drawObject->width() ); + TQString y2Str = TQString("%1mm").arg( drawObject->top() + drawObject->height() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); if ( drawObject->hasProperty("draw:mirror-vertical") ) { TQString temp = y1Str; @@ -1090,7 +1090,7 @@ void PowerPointImport::processLine (DrawObject* drawObject, KoXmlWriter* xmlWrit xmlWriter->addAttribute( "svg:y2", y2Str ); xmlWriter->addAttribute( "svg:x1", x1Str ); xmlWriter->addAttribute( "svg:x2", x2Str ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->endElement(); } @@ -1099,19 +1099,19 @@ void PowerPointImport::processSmiley (DrawObject* drawObject, KoXmlWriter* xmlWr { if( !drawObject ||!xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); - xmlWriter->startElement( "draw:custom-tqshape" ); + xmlWriter->startElement( "draw:custom-shape" ); xmlWriter->addAttribute( "draw:style-name", styleName ); xmlWriter->addAttribute( "svg:width", widthStr ); xmlWriter->addAttribute( "svg:height", heightStr ); xmlWriter->addAttribute( "svg:x", xStr ); xmlWriter->addAttribute( "svg:y", yStr ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->startElement( "draw:glue-point" ); xmlWriter->addAttribute( "svg:x", 5 ); xmlWriter->addAttribute( "svg:y", 0 ); @@ -1136,7 +1136,7 @@ void PowerPointImport::processSmiley (DrawObject* drawObject, KoXmlWriter* xmlWr xmlWriter->addAttribute( "svg:x", 8.536 ); xmlWriter->addAttribute( "svg:y", 1.461 ); xmlWriter->endElement(); - xmlWriter->startElement( "draw:enhanced-tqgeometry" ); + xmlWriter->startElement( "draw:enhanced-geometry" ); xmlWriter->addAttribute( "draw:type", "smiley" ); xmlWriter->startElement( "draw:equation" ); xmlWriter->addAttribute( "draw:formula", "$0-15510 " ); @@ -1156,27 +1156,27 @@ void PowerPointImport::processSmiley (DrawObject* drawObject, KoXmlWriter* xmlWr xmlWriter->addAttribute( "draw:handle-range-y-minimum", 15510); xmlWriter->addAttribute("draw:handle-position","$0 top"); xmlWriter->endElement(); - xmlWriter->endElement(); // enhanced-tqgeometry - xmlWriter->endElement(); // custom-tqshape + xmlWriter->endElement(); // enhanced-geometry + xmlWriter->endElement(); // custom-shape } void PowerPointImport::processHeart (DrawObject* drawObject, KoXmlWriter* xmlWriter ) { if( !drawObject || !xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); - xmlWriter->startElement( "draw:custom-tqshape" ); + xmlWriter->startElement( "draw:custom-shape" ); xmlWriter->addAttribute( "draw:style-name", styleName ); xmlWriter->addAttribute( "svg:width", widthStr ); xmlWriter->addAttribute( "svg:height", heightStr ); xmlWriter->addAttribute( "svg:x", xStr ); xmlWriter->addAttribute( "svg:y", yStr ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->startElement( "draw:glue-point" ); xmlWriter->addAttribute( "svg:x", 5 ); xmlWriter->addAttribute( "svg:y", 1 ); @@ -1193,22 +1193,22 @@ void PowerPointImport::processHeart (DrawObject* drawObject, KoXmlWriter* xmlWri xmlWriter->addAttribute( "svg:x", 8.553 ); xmlWriter->addAttribute( "svg:y", 5 ); xmlWriter->endElement(); - xmlWriter->startElement( "draw:enhanced-tqgeometry" ); + xmlWriter->startElement( "draw:enhanced-geometry" ); xmlWriter->addAttribute( "draw:type", "heart" ); - xmlWriter->endElement(); // enhanced-tqgeometry - xmlWriter->endElement(); // custom-tqshape + xmlWriter->endElement(); // enhanced-geometry + xmlWriter->endElement(); // custom-shape } void PowerPointImport::processFreeLine (DrawObject* drawObject, KoXmlWriter* xmlWriter) { if( !drawObject ||!xmlWriter ) return; - TQString widthStr = TQString("%1mm").tqarg( drawObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( drawObject->height() ); - TQString xStr = TQString("%1mm").tqarg( drawObject->left() ); - TQString yStr = TQString("%1mm").tqarg( drawObject->top() ); - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString widthStr = TQString("%1mm").arg( drawObject->width() ); + TQString heightStr = TQString("%1mm").arg( drawObject->height() ); + TQString xStr = TQString("%1mm").arg( drawObject->left() ); + TQString yStr = TQString("%1mm").arg( drawObject->top() ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); xmlWriter->startElement( "draw:path" ); xmlWriter->addAttribute( "draw:style-name", styleName ); @@ -1216,7 +1216,7 @@ void PowerPointImport::processFreeLine (DrawObject* drawObject, KoXmlWriter* xml xmlWriter->addAttribute( "svg:height", heightStr ); xmlWriter->addAttribute( "svg:x", xStr ); xmlWriter->addAttribute( "svg:y", yStr ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->endElement(); // path } @@ -1228,63 +1228,63 @@ void PowerPointImport::processDrawingObjectForBody( DrawObject* drawObject, KoXm drawingObjectCounter++; - if (drawObject->tqshape() == DrawObject::Ellipse) + if (drawObject->shape() == DrawObject::Ellipse) { processEllipse (drawObject, xmlWriter ); } - else if (drawObject->tqshape() == DrawObject::Rectangle) + else if (drawObject->shape() == DrawObject::Rectangle) { processRectangle (drawObject, xmlWriter ); } - else if (drawObject->tqshape() == DrawObject::RoundRectangle) + else if (drawObject->shape() == DrawObject::RoundRectangle) { processRoundRectangle (drawObject, xmlWriter ); } - else if (drawObject->tqshape() == DrawObject::Diamond) + else if (drawObject->shape() == DrawObject::Diamond) { processDiamond (drawObject, xmlWriter ); } - else if (drawObject->tqshape() == DrawObject::IsoscelesTriangle | - drawObject->tqshape() == DrawObject::RightTriangle) + else if (drawObject->shape() == DrawObject::IsoscelesTriangle | + drawObject->shape() == DrawObject::RightTriangle) { processTriangle (drawObject, xmlWriter ); } - else if (drawObject->tqshape() == DrawObject::Trapezoid) + else if (drawObject->shape() == DrawObject::Trapezoid) { processTrapezoid (drawObject, xmlWriter ); } - else if (drawObject->tqshape() == DrawObject::Parallelogram) + else if (drawObject->shape() == DrawObject::Parallelogram) { processParallelogram( drawObject, xmlWriter); } - else if (drawObject->tqshape() == DrawObject::Hexagon) + else if (drawObject->shape() == DrawObject::Hexagon) { processHexagon ( drawObject, xmlWriter ); } - else if (drawObject->tqshape() == DrawObject::Octagon) + else if (drawObject->shape() == DrawObject::Octagon) { processOctagon ( drawObject, xmlWriter ); } - else if (drawObject->tqshape() == DrawObject::RightArrow | - drawObject->tqshape() == DrawObject::LeftArrow | - drawObject->tqshape() == DrawObject::UpArrow | - drawObject->tqshape() == DrawObject::DownArrow ) + else if (drawObject->shape() == DrawObject::RightArrow | + drawObject->shape() == DrawObject::LeftArrow | + drawObject->shape() == DrawObject::UpArrow | + drawObject->shape() == DrawObject::DownArrow ) { processArrow ( drawObject, xmlWriter ); } - else if (drawObject->tqshape() == DrawObject::Line) + else if (drawObject->shape() == DrawObject::Line) { processLine ( drawObject, xmlWriter ); } - else if (drawObject->tqshape() == DrawObject::Smiley) + else if (drawObject->shape() == DrawObject::Smiley) { processSmiley (drawObject, xmlWriter ); } - else if (drawObject->tqshape() == DrawObject::Heart) + else if (drawObject->shape() == DrawObject::Heart) { processHeart (drawObject, xmlWriter ); } - else if (drawObject->tqshape() == DrawObject::FreeLine) + else if (drawObject->shape() == DrawObject::FreeLine) { processFreeLine (drawObject, xmlWriter ); } @@ -1317,14 +1317,14 @@ void PowerPointImport::processTextObjectForBody( TextObject* textObject, KoXmlWr // TQString pStr = string( textObject->text() ).string(); TQString pStr; - TQString widthStr = TQString("%1mm").tqarg( textObject->width() ); - TQString heightStr = TQString("%1mm").tqarg( textObject->height() ); - TQString xStr = TQString("%1mm").tqarg( textObject->left() ); - TQString yStr = TQString("%1mm").tqarg( textObject->top() ); + TQString widthStr = TQString("%1mm").arg( textObject->width() ); + TQString heightStr = TQString("%1mm").arg( textObject->height() ); + TQString xStr = TQString("%1mm").arg( textObject->left() ); + TQString yStr = TQString("%1mm").arg( textObject->top() ); xmlWriter->startElement( "draw:frame" ); xmlWriter->addAttribute( "presentation:style-name", "pr1" ); - xmlWriter->addAttribute( "draw:layer", "tqlayout" ); + xmlWriter->addAttribute( "draw:layer", "layout" ); xmlWriter->addAttribute( "svg:width", widthStr ); xmlWriter->addAttribute( "svg:height", heightStr ); xmlWriter->addAttribute( "svg:x", xStr ); @@ -1381,15 +1381,15 @@ void PowerPointImport::processSlideForBody( unsigned slideNo, Slide* slide, KoXm TQString nameStr = Libppt::string( slide->title() ).string(); if( nameStr.isEmpty() ) - nameStr = TQString("page%1").tqarg(slideNo+1); + nameStr = TQString("page%1").arg(slideNo+1); - TQString styleNameStr = TQString("dp%1").tqarg(slideNo+1); + TQString styleNameStr = TQString("dp%1").arg(slideNo+1); xmlWriter->startElement( "draw:page" ); xmlWriter->addAttribute( "draw:master-page-name", "Default" ); xmlWriter->addAttribute( "draw:name", nameStr ); xmlWriter->addAttribute( "draw:style-name", styleNameStr ); - xmlWriter->addAttribute( "presentation:presentation-page-tqlayout-name", "AL1T0"); + xmlWriter->addAttribute( "presentation:presentation-page-layout-name", "AL1T0"); GroupObject* root = slide->rootObject(); if( root ) @@ -1450,7 +1450,7 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX if( !drawObject || !xmlWriter) return; drawingObjectCounter++; - TQString styleName = TQString("gr%1").tqarg( drawingObjectCounter ); + TQString styleName = TQString("gr%1").arg( drawingObjectCounter ); xmlWriter->startElement( "style:style" ); xmlWriter->addAttribute( "style:name", styleName ); @@ -1490,7 +1490,7 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX if( drawObject->hasProperty( "svg:stroke-width" ) ) { double strokeWidth = drawObject->getDoubleProperty("svg:stroke-width" ); - xmlWriter->addAttribute( "svg:stroke-width",TQString("%1mm").tqarg( strokeWidth ) ); + xmlWriter->addAttribute( "svg:stroke-width",TQString("%1mm").arg( strokeWidth ) ); } if( drawObject->hasProperty( "svg:stroke-color" ) ) @@ -1528,14 +1528,14 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX { double strokeWidth = drawObject->getDoubleProperty("svg:stroke-width" ); double arrowWidth = (drawObject->getDoubleProperty("draw:marker-start-width") * strokeWidth); - xmlWriter->addAttribute( "draw:marker-start-width",TQString("%1cm").tqarg( arrowWidth ) ); + xmlWriter->addAttribute( "draw:marker-start-width",TQString("%1cm").arg( arrowWidth ) ); } if( drawObject->hasProperty( "draw:marker-end-width" ) ) { double strokeWidth = drawObject->getDoubleProperty("svg:stroke-width" ); double arrowWidth = (drawObject->getDoubleProperty("draw:marker-end-width") * strokeWidth); - xmlWriter->addAttribute( "draw:marker-end-width",TQString("%1cm").tqarg( arrowWidth ) ); + xmlWriter->addAttribute( "draw:marker-end-width",TQString("%1cm").arg( arrowWidth ) ); } @@ -1569,19 +1569,19 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX if( drawObject->hasProperty( "draw:shadow-opacity" ) ) { double opacity = drawObject->getDoubleProperty("draw:shadow-opacity") ; - xmlWriter->addAttribute( "draw:shadow-opacity",TQString("%1%").tqarg( opacity ) ); + xmlWriter->addAttribute( "draw:shadow-opacity",TQString("%1%").arg( opacity ) ); } if( drawObject->hasProperty( "draw:shadow-offset-x" ) ) { double offset = drawObject->getDoubleProperty("draw:shadow-offset-x") ; - xmlWriter->addAttribute( "draw:shadow-offset-x",TQString("%1cm").tqarg( offset ) ); + xmlWriter->addAttribute( "draw:shadow-offset-x",TQString("%1cm").arg( offset ) ); } if( drawObject->hasProperty( "draw:shadow-offset-y" ) ) { double offset = drawObject->getDoubleProperty("draw:shadow-offset-y"); - xmlWriter->addAttribute( "draw:shadow-offset-y",TQString("%1cm").tqarg( offset ) ); + xmlWriter->addAttribute( "draw:shadow-offset-y",TQString("%1cm").arg( offset ) ); } diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.h b/filters/kpresenter/powerpoint/import/powerpointimport.h index ca3e7365..6b75cfb3 100644 --- a/filters/kpresenter/powerpoint/import/powerpointimport.h +++ b/filters/kpresenter/powerpoint/import/powerpointimport.h @@ -39,7 +39,7 @@ Q_OBJECT public: PowerPointImport ( TQObject *parent, const char* name, const TQStringList& ); virtual ~PowerPointImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: diff --git a/filters/kpresenter/powerpoint/libppt/objects.cpp b/filters/kpresenter/powerpoint/libppt/objects.cpp index d0343b43..29870cbd 100644 --- a/filters/kpresenter/powerpoint/libppt/objects.cpp +++ b/filters/kpresenter/powerpoint/libppt/objects.cpp @@ -379,7 +379,7 @@ void GroupObject::takeObject( Object* object ) class DrawObject::Private { public: - unsigned tqshape; + unsigned shape; bool isVerFlip; bool isHorFlip; }; @@ -387,7 +387,7 @@ public: DrawObject::DrawObject() { d = new Private; - d->tqshape = None; + d->shape = None; } DrawObject::~DrawObject() @@ -395,14 +395,14 @@ DrawObject::~DrawObject() delete d; } -unsigned DrawObject::tqshape() const +unsigned DrawObject::shape() const { - return d->tqshape; + return d->shape; } void DrawObject::setShape( unsigned s ) { - d->tqshape = s; + d->shape = s; } bool DrawObject::isVerFlip() const diff --git a/filters/kpresenter/powerpoint/libppt/objects.h b/filters/kpresenter/powerpoint/libppt/objects.h index a9160897..823e2a75 100644 --- a/filters/kpresenter/powerpoint/libppt/objects.h +++ b/filters/kpresenter/powerpoint/libppt/objects.h @@ -103,7 +103,7 @@ public: Body = 1, Notes = 2, NotUsed = 3, - Other = 4, // text in a tqshape + Other = 4, // text in a shape CenterBody = 5, // subtitle in title slide CenterTitle = 6, // title in title slide HalfBody = 7, // body in two-column slide @@ -184,7 +184,7 @@ public: virtual ~DrawObject(); virtual bool isDrawing() const { return true; } - unsigned tqshape() const; + unsigned shape() const; void setShape( unsigned s ); bool isVerFlip() const; diff --git a/filters/kpresenter/powerpoint/libppt/pole.cpp b/filters/kpresenter/powerpoint/libppt/pole.cpp index b905539d..2a78b79f 100644 --- a/filters/kpresenter/powerpoint/libppt/pole.cpp +++ b/filters/kpresenter/powerpoint/libppt/pole.cpp @@ -94,7 +94,7 @@ class DirEntry { public: bool valid; // false if invalid (should be skipped) - std::string name; // the name, not in tqunicode anymore + std::string name; // the name, not in unicode anymore bool dir; // true if directory unsigned long size; // size (not valid if directory) unsigned long start; // starting block @@ -115,7 +115,7 @@ class DirTree int indexOf( DirEntry* e ); int parent( unsigned index ); std::string fullName( unsigned index ); - std::vector<unsigned> tqchildren( unsigned index ); + std::vector<unsigned> children( unsigned index ); void load( unsigned char* buffer, unsigned len ); void save( unsigned char* buffer ); unsigned size(); @@ -505,11 +505,11 @@ int DirTree::indexOf( DirEntry* e ) int DirTree::parent( unsigned index ) { - // brute-force, basically we iterate for each entries, find its tqchildren - // and check if one of the tqchildren is 'index' + // brute-force, basically we iterate for each entries, find its children + // and check if one of the children is 'index' for( unsigned j=0; j<entryCount(); j++ ) { - std::vector<unsigned> chi = tqchildren( j ); + std::vector<unsigned> chi = children( j ); for( unsigned i=0; i<chi.size();i++ ) if( chi[i] == index ) return j; @@ -573,8 +573,8 @@ DirEntry* DirTree::entry( const std::string& name, bool create ) for( it = names.begin(); it != names.end(); ++it ) { - // find among the tqchildren of index - std::vector<unsigned> chi = tqchildren( index ); + // find among the children of index + std::vector<unsigned> chi = children( index ); unsigned child = 0; for( unsigned i = 0; i < chi.size(); i++ ) { @@ -589,7 +589,7 @@ DirEntry* DirTree::entry( const std::string& name, bool create ) if( child > 0 ) index = child; else { - // not found among tqchildren + // not found among children if( !create ) return (DirEntry*)0; // create a new entry @@ -646,7 +646,7 @@ void dirtree_find_siblings( DirTree* dirtree, std::vector<unsigned>& result, } } -std::vector<unsigned> DirTree::tqchildren( unsigned index ) +std::vector<unsigned> DirTree::children( unsigned index ) { std::vector<unsigned> result; @@ -1249,9 +1249,9 @@ std::list<std::string> Storage::entries( const std::string& path ) if( e && e->dir ) { unsigned parent = dt->indexOf( e ); - std::vector<unsigned> tqchildren = dt->tqchildren( parent ); - for( unsigned i = 0; i < tqchildren.size(); i++ ) - result.push_back( dt->entry( tqchildren[i] )->name ); + std::vector<unsigned> children = dt->children( parent ); + for( unsigned i = 0; i < children.size(); i++ ) + result.push_back( dt->entry( children[i] )->name ); } return result; diff --git a/filters/kpresenter/powerpoint/libppt/powerpoint.cpp b/filters/kpresenter/powerpoint/libppt/powerpoint.cpp index bf3fc51f..af035c69 100644 --- a/filters/kpresenter/powerpoint/libppt/powerpoint.cpp +++ b/filters/kpresenter/powerpoint/libppt/powerpoint.cpp @@ -4105,7 +4105,7 @@ const unsigned int msofbtSpAtom::id = 61450; /* F00A */ class msofbtSpAtom::Private { public: - unsigned long tqshapeId; + unsigned long shapeId; unsigned long persistentFlag; bool background; bool hFlip; @@ -4115,7 +4115,7 @@ public: msofbtSpAtom ::msofbtSpAtom () { d = new Private; - d->tqshapeId = 0; + d->shapeId = 0; d->persistentFlag = 0; d->background = false; d->hFlip = false; @@ -4127,17 +4127,17 @@ msofbtSpAtom ::~msofbtSpAtom () delete d; } -unsigned long msofbtSpAtom::tqshapeId() const +unsigned long msofbtSpAtom::shapeId() const { - return d->tqshapeId; + return d->shapeId; } void msofbtSpAtom::setShapeId( unsigned long id ) { - d->tqshapeId = id; + d->shapeId = id; } -const char* msofbtSpAtom::tqshapeTypeAsString() const +const char* msofbtSpAtom::shapeTypeAsString() const { switch( instance() ) { @@ -5821,7 +5821,7 @@ void PPTReader::handleEscherGroupAtom( msofbtSpgrAtom* atom ) // set rect bound of current group - // this is tqshape for the group, no need to + // this is shape for the group, no need to d->isShapeGroup = true; } diff --git a/filters/kpresenter/powerpoint/libppt/powerpoint.h b/filters/kpresenter/powerpoint/libppt/powerpoint.h index 6eec1564..b2a0f649 100644 --- a/filters/kpresenter/powerpoint/libppt/powerpoint.h +++ b/filters/kpresenter/powerpoint/libppt/powerpoint.h @@ -1901,9 +1901,9 @@ public: msofbtSpAtom (); ~msofbtSpAtom (); - unsigned long tqshapeId() const; + unsigned long shapeId() const; void setShapeId( unsigned long id ); - const char* tqshapeTypeAsString() const; + const char* shapeTypeAsString() const; unsigned long persistentFlag() const; void setPersistentFlag( unsigned long persistentFlag ); @@ -1957,10 +1957,10 @@ public: FillSolid, // Fill with a solid color FillPattern, // Fill with a pattern (bitmap) FillTexture, // A texture (pattern with its own color map) - FillPicture, // Center a picture in the tqshape + FillPicture, // Center a picture in the shape FillShade, // Shade from start to end points FillShadeCenter, // Shade from bounding rectangle to end point - FillShadeShape, // Shade from tqshape outline to end point + FillShadeShape, // Shade from shape outline to end point FillShadeScale, // Similar to msofillShade, but the fillAngle FillShadeTitle, // special type - shade to title --- for PP FillBackground // Use the background fill color/pattern @@ -2385,9 +2385,9 @@ public: int ruid() const; // rule ID void setRuid( int ruid ); int align() const; - void setAlign( int align );// tqalignment + void setAlign( int align );// alignment int cProxies() const; - void setCProxies( int cProxies );// number of tqshapes governed by rule + void setCProxies( int cProxies );// number of shapes governed by rule void setData( unsigned size, const unsigned char* data ); const char* name(){ return "msofbtAlignRuleAtom "; } diff --git a/filters/kpresenter/powerpoint/libppt/ustring.cpp b/filters/kpresenter/powerpoint/libppt/ustring.cpp index 23b61d30..b0a44e56 100644 --- a/filters/kpresenter/powerpoint/libppt/ustring.cpp +++ b/filters/kpresenter/powerpoint/libppt/ustring.cpp @@ -216,13 +216,13 @@ UString UString::null; static char *statBuffer = 0L; UChar::UChar(const UCharReference &c) - : uc( c.tqunicode() ) + : uc( c.unicode() ) { } UChar UChar::toLower() const { - // ### properly support tqunicode tolower + // ### properly support unicode tolower if (uc >= 256 || islower(uc)) return *this; @@ -644,7 +644,7 @@ bool Libppt::operator<(const UString& s1, const UString& s2) l++; } if (l < lmin) - return (c1->tqunicode() < c2->tqunicode()); + return (c1->unicode() < c2->unicode()); return (l1 < l2); } diff --git a/filters/kpresenter/powerpoint/libppt/ustring.h b/filters/kpresenter/powerpoint/libppt/ustring.h index c0e34cf4..52a43afe 100644 --- a/filters/kpresenter/powerpoint/libppt/ustring.h +++ b/filters/kpresenter/powerpoint/libppt/ustring.h @@ -71,7 +71,7 @@ namespace Libppt { /** * @return the 16 bit Unicode value of the character */ - unsigned short tqunicode() const { return uc; } + unsigned short unicode() const { return uc; } public: /** * @return The character converted to lower case. @@ -128,7 +128,7 @@ namespace Libppt { /** * @return Unicode value. */ - unsigned short tqunicode() const { return ref().tqunicode(); } + unsigned short unicode() const { return ref().unicode(); } /** * @return Lower byte. */ diff --git a/filters/kpresenter/svg/svgexport.cc b/filters/kpresenter/svg/svgexport.cc index 990d12cd..9eae5cd8 100644 --- a/filters/kpresenter/svg/svgexport.cc +++ b/filters/kpresenter/svg/svgexport.cc @@ -48,7 +48,7 @@ SvgExport::~SvgExport() } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus SvgExport::convert(const TQCString& from, const TQCString& to) { KoDocument * document = m_chain->inputDocument(); diff --git a/filters/kpresenter/svg/svgexport.h b/filters/kpresenter/svg/svgexport.h index eafdd792..17e3d79f 100644 --- a/filters/kpresenter/svg/svgexport.h +++ b/filters/kpresenter/svg/svgexport.h @@ -32,7 +32,7 @@ public: SvgExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~SvgExport(); - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // __SVGEXPORT_H__ diff --git a/filters/kspread/applixspread/applixspreadimport.cc b/filters/kspread/applixspread/applixspreadimport.cc index a75cccac..5b88d11c 100644 --- a/filters/kspread/applixspread/applixspreadimport.cc +++ b/filters/kspread/applixspread/applixspreadimport.cc @@ -55,7 +55,7 @@ TQString APPLIXSPREADImport::nextLine( TQTextStream & stream ) return s; } -KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus APPLIXSPREADImport::convert( const TQCString& from, const TQCString& to ) { if (to != "application/x-kspread" || from != "application/x-applixspread") @@ -390,7 +390,7 @@ KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from, //kdDebug()<< " Type (%2d) >%s< ", // nn, (*it).latin1() ); nn++; - // Grep horizontal tqalignment + // Grep horizontal alignment if ( (*it) == "1") { kdDebug()<< " = left align\n"; @@ -407,7 +407,7 @@ KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from, align = 2; // center } - // Grep verticale tqalignment + // Grep verticale alignment else if ( (*it) == "VT") { kdDebug()<<" = top valign\n"; @@ -1268,7 +1268,7 @@ APPLIXSPREADImport::readHeader (TQTextStream &stream) TQMessageBox::critical (0L, "Applix spreadsheet header problem", TQString ("The Applix Spreadsheet header is not correct. " "May be it is not an applix spreadsheet file! <BR>" - "This is the header line I did read:<BR><B>%1</B>").tqarg(mystr.latin1()), + "This is the header line I did read:<BR><B>%1</B>").arg(mystr.latin1()), "Okay"); diff --git a/filters/kspread/applixspread/applixspreadimport.h b/filters/kspread/applixspread/applixspreadimport.h index 78deb2ca..15decadc 100644 --- a/filters/kspread/applixspread/applixspreadimport.h +++ b/filters/kspread/applixspread/applixspreadimport.h @@ -23,7 +23,7 @@ #include <tqstring.h> #include <tqfile.h> #include <tqobject.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqptrlist.h> #include <KoFilter.h> @@ -57,7 +57,7 @@ public: APPLIXSPREADImport ( TQObject *parent, const char* name, const TQStringList& ); virtual ~APPLIXSPREADImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); protected: TQString nextLine (TQTextStream &); diff --git a/filters/kspread/applixspread/status.html b/filters/kspread/applixspread/status.html index 968bf333..c944ef5c 100644 --- a/filters/kspread/applixspread/status.html +++ b/filters/kspread/applixspread/status.html @@ -53,7 +53,7 @@ - tests the headline of the document<br> - converts <, >, &, to &lt; &gt; &amp;<br> - converts all applix special characters<br> - - converts fontsize, fontcolor, horizontal and vertical tqalignment, bold, italic, underline<br> + - converts fontsize, fontcolor, horizontal and vertical alignment, bold, italic, underline<br> - eats long text strings (more than one row in inputfile)<br> - converts different tables inside of one document<br> - cellformat: background color, brushstyles, brushcolor<br> @@ -352,43 +352,43 @@ <spacer size="20"><U>6.1.1. Part 1 - Alignment format</U><BR> - <spacer size="30">This is the tqalignment format for vertical, horizontal tqalignment<BR> + <spacer size="30">This is the alignment format for vertical, horizontal alignment<BR> <spacer size="30"> <TABLE CELLPADDING="0" BORDER="0"> <TR> <TD>6.1.1.1 </TD> <TD><B>1</B></TD> - <TD>horizontal tqalignment</TD> + <TD>horizontal alignment</TD> <TD>left</TD> </TR> <TR> <TD>6.1.1.2 </TD> <TD><B>2</B></TD> - <TD>horizontal tqalignment</TD> + <TD>horizontal alignment</TD> <TD>right</TD> </TR> <TR> <TD>6.1.1.3 </TD> <TD><B>3</B></TD> - <TD>horizontal tqalignment</TD> + <TD>horizontal alignment</TD> <TD>center</TD> </TR> <TR> <TD>6.1.1.4 </TD> <TD><B>VT</B></TD> - <TD>vertical tqalignment</TD> + <TD>vertical alignment</TD> <TD>top</TD> </TR> <TR> <TD>6.1.1.5 </TD> <TD><B>VC</B></TD> - <TD>vertical tqalignment</TD> + <TD>vertical alignment</TD> <TD>center</TD> </TR> <TR> <TD>6.1.1.5 </TD> <TD><B>VB</B></TD> - <TD>vertical tqalignment</TD> + <TD>vertical alignment</TD> <TD>bottom</TD> </TR> <TR> @@ -402,7 +402,7 @@ <spacer size="20"><U>6.1.2. Part 2 - Text format</U><BR> - <spacer size="30">This is the tqalignment format for the text<BR> + <spacer size="30">This is the alignment format for the text<BR> <spacer size="30"> <TABLE CELLPADDING="0" BORDER="0"> <TR> @@ -441,7 +441,7 @@ <spacer size="20"><U>6.1.3. Part 3 - Cell format</U><BR> - <spacer size="30">This is the tqalignment format for the text<BR> + <spacer size="30">This is the alignment format for the text<BR> <spacer size="30"> <TABLE CELLPADDING="0" BORDER="0"> <TR> diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp index 17e9cc65..3ea3f967 100644 --- a/filters/kspread/csv/csvdialog.cpp +++ b/filters/kspread/csv/csvdialog.cpp @@ -27,11 +27,11 @@ #include <tqlineedit.h> #include <tqcombobox.h> #include <tqspinbox.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqbuttongroup.h> #include <tqpushbutton.h> #include <tqradiobutton.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <kapplication.h> #include <kconfig.h> @@ -60,14 +60,14 @@ CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /* kapp->restoreOverrideCursor(); TQStringList encodings; - encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" ); - encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() ); + encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" ); + encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() ); encodings += KGlobal::charsets()->descriptiveEncodingNames(); // Add a few non-standard encodings, which might be useful for text files const TQString description(i18n("Descriptive encoding name","Other ( %1 )")); - encodings << description.tqarg("Apple Roman"); // Apple - encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS - encodings << description.tqarg("CP 1258"); // Windows + encodings << description.arg("Apple Roman"); // Apple + encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS + encodings << description.arg("CP 1258"); // Windows m_dialog->comboBoxEncoding->insertStringList(encodings); m_formatList << i18n( "Text" ); @@ -84,7 +84,7 @@ CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /* fillTable(); - //resize(tqsizeHint()); + //resize(sizeHint()); resize( 600, 400 ); // Try to show as much as possible of the table view setMainWidget(m_dialog); @@ -613,7 +613,7 @@ TQTextCodec* CSVDialog::getCodec(void) const // Default: UTF-8 kdWarning(30502) << "Cannot find encoding:" << strCodec << endl; // ### TODO: what parent to use? - KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) ); + KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) ); return 0; } diff --git a/filters/kspread/csv/csvexport.cc b/filters/kspread/csv/csvexport.cc index 9961d218..b37d1c8f 100644 --- a/filters/kspread/csv/csvexport.cc +++ b/filters/kspread/csv/csvexport.cc @@ -21,7 +21,7 @@ #include <csvexport.h> #include <tqfile.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <kdebug.h> #include <kmessagebox.h> @@ -118,7 +118,7 @@ TQString CSVExport::exportCSVCell( Sheet const * const sheet, int col, int row, // The reason why we use the KoDocument* approach and not the TQDomDocument // approach is because we don't want to export formulas but values ! -KoFilter::ConversiontqStatus CSVExport::convert( const TQCString & from, const TQCString & to ) +KoFilter::ConversionStatus CSVExport::convert( const TQCString & from, const TQCString & to ) { kdDebug(30501) << "CSVExport::convert" << endl; KoDocument* document = m_chain->inputDocument(); diff --git a/filters/kspread/csv/csvexport.h b/filters/kspread/csv/csvexport.h index decdb81c..ebc8a861 100644 --- a/filters/kspread/csv/csvexport.h +++ b/filters/kspread/csv/csvexport.h @@ -38,7 +38,7 @@ class CSVExport : public KoFilter CSVExport(KoFilter * parent, const char * name, const TQStringList &); virtual ~CSVExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString & from, const TQCString & to ); + virtual KoFilter::ConversionStatus convert( const TQCString & from, const TQCString & to ); private: TQString exportCSVCell( KSpread::Sheet const * const sheet, int col, int row, TQChar const & textQuote, TQChar delimiter ); diff --git a/filters/kspread/csv/csvexportdialog.cpp b/filters/kspread/csv/csvexportdialog.cpp index a4ef1347..e0a4db8c 100644 --- a/filters/kspread/csv/csvexportdialog.cpp +++ b/filters/kspread/csv/csvexportdialog.cpp @@ -33,9 +33,9 @@ #include <tqlistview.h> #include <tqptrlist.h> #include <tqradiobutton.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqtabwidget.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqvalidator.h> #include <kapplication.h> @@ -57,14 +57,14 @@ CSVExportDialog::CSVExportDialog( TQWidget * parent ) kapp->restoreOverrideCursor(); TQStringList encodings; - encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" ); - encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() ); + encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" ); + encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() ); encodings += KGlobal::charsets()->descriptiveEncodingNames(); // Add a few non-standard encodings, which might be useful for text files const TQString description(i18n("Descriptive encoding name","Other ( %1 )")); - encodings << description.tqarg("Apple Roman"); // Apple - encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS - encodings << description.tqarg("CP 1258"); // Windows + encodings << description.arg("Apple Roman"); // Apple + encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS + encodings << description.arg("CP 1258"); // Windows m_dialog->comboBoxEncoding->insertStringList(encodings); @@ -306,7 +306,7 @@ TQTextCodec* CSVExportDialog::getCodec(void) const // Default: UTF-8 kdWarning(30502) << "Cannot find encoding:" << strCodec << endl; // ### TODO: what parent to use? - KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) ); + KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) ); return 0; } diff --git a/filters/kspread/csv/csvimport.cc b/filters/kspread/csv/csvimport.cc index cd93017b..e9852c61 100644 --- a/filters/kspread/csv/csvimport.cc +++ b/filters/kspread/csv/csvimport.cc @@ -57,7 +57,7 @@ CSVFilter::CSVFilter(KoFilter *, const char*, const TQStringList&) : KoFilter() { } -KoFilter::ConversiontqStatus CSVFilter::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus CSVFilter::convert( const TQCString& from, const TQCString& to ) { TQString file( m_chain->inputFile() ); KoDocument* document = m_chain->outputDocument(); diff --git a/filters/kspread/csv/csvimport.h b/filters/kspread/csv/csvimport.h index df14a756..c68ecffb 100644 --- a/filters/kspread/csv/csvimport.h +++ b/filters/kspread/csv/csvimport.h @@ -31,6 +31,6 @@ public: CSVFilter(KoFilter *parent, const char *name, const TQStringList&); virtual ~CSVFilter() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // CSVFILTER_H diff --git a/filters/kspread/csv/dialogui.ui b/filters/kspread/csv/dialogui.ui index 8c3a72cf..f8960f4b 100644 --- a/filters/kspread/csv/dialogui.ui +++ b/filters/kspread/csv/dialogui.ui @@ -66,7 +66,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>106</width> <height>20</height> @@ -123,7 +123,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> @@ -223,7 +223,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> @@ -313,7 +313,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> @@ -330,7 +330,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> @@ -379,7 +379,7 @@ <property name="textFormat"> <enum>AutoText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -428,7 +428,7 @@ <property name="textFormat"> <enum>AutoText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -472,7 +472,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>468</width> <height>20</height> @@ -489,7 +489,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>468</width> <height>20</height> @@ -506,7 +506,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>611</width> <height>20</height> @@ -523,7 +523,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>20</height> diff --git a/filters/kspread/csv/exportdialogui.ui b/filters/kspread/csv/exportdialogui.ui index 45eb6914..f6a552e1 100644 --- a/filters/kspread/csv/exportdialogui.ui +++ b/filters/kspread/csv/exportdialogui.ui @@ -47,7 +47,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -85,7 +85,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>106</width> <height>20</height> @@ -156,7 +156,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>96</height> @@ -254,7 +254,7 @@ <property name="text"> <string><SHEETNAME> gets replaced by the name of the next sheet.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -375,7 +375,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> @@ -469,7 +469,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>81</height> diff --git a/filters/kspread/csv/xmltree.h b/filters/kspread/csv/xmltree.h index 247af4e5..1eede0dc 100644 --- a/filters/kspread/csv/xmltree.h +++ b/filters/kspread/csv/xmltree.h @@ -22,7 +22,7 @@ #include <tqdom.h> #include <tqmemarray.h> -#include <tqtextstream.h> +#include <textstream.h> class XMLTree { diff --git a/filters/kspread/dbase/dbase.cpp b/filters/kspread/dbase/dbase.cpp index acc1e27d..2c8ba3b8 100644 --- a/filters/kspread/dbase/dbase.cpp +++ b/filters/kspread/dbase/dbase.cpp @@ -165,7 +165,7 @@ bool DBase::load( const TQString& filename ) } // set the index to the first record - m_stream.tqdevice()->at( m_headerLength ); + m_stream.device()->at( m_headerLength ); return true; } @@ -184,7 +184,7 @@ TQStringList DBase::readRecord( unsigned recno ) // seek to where the record is unsigned filepos = m_headerLength + recno * m_recordLength; - m_stream.tqdevice()->at( filepos ); + m_stream.device()->at( filepos ); // first char == '*' means the record is deleted // so we just skip it diff --git a/filters/kspread/dbase/dbaseimport.cc b/filters/kspread/dbase/dbaseimport.cc index bcbc98b8..6121baaf 100644 --- a/filters/kspread/dbase/dbaseimport.cc +++ b/filters/kspread/dbase/dbaseimport.cc @@ -48,7 +48,7 @@ DBaseImport::DBaseImport ( TQObject*, const char*, const TQStringList& ) { } -KoFilter::ConversiontqStatus DBaseImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus DBaseImport::convert( const TQCString& from, const TQCString& to ) { if (to != "application/x-kspread" || from != "application/x-dbase") return KoFilter::NotImplemented; diff --git a/filters/kspread/dbase/dbaseimport.h b/filters/kspread/dbase/dbaseimport.h index 39a0ac0e..293bda21 100644 --- a/filters/kspread/dbase/dbaseimport.h +++ b/filters/kspread/dbase/dbaseimport.h @@ -33,7 +33,7 @@ public: DBaseImport ( TQObject *parent, const char* name, const TQStringList& ); virtual ~DBaseImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __DBASEIMPORT_H diff --git a/filters/kspread/excel/excelexport.cc b/filters/kspread/excel/excelexport.cc index 2e2c50e7..0ecf41f7 100644 --- a/filters/kspread/excel/excelexport.cc +++ b/filters/kspread/excel/excelexport.cc @@ -13,7 +13,7 @@ ExcelExport::ExcelExport(KoFilter *, const char *, const TQStringList&) : KoFilt } -KoFilter::ConversiontqStatus ExcelExport::convert(const TQCString& from, const TQCString& to) { +KoFilter::ConversionStatus ExcelExport::convert(const TQCString& from, const TQCString& to) { // Double check that's we really what we want to do if ( ( (to != "application/excel") && (to != "application/msexcel") ) || from != "application/x-kspread") { kdWarning(0) << "Invalid mimetypes " << to << ", " << from << endl; @@ -28,37 +28,37 @@ KoFilter::ConversiontqStatus ExcelExport::convert(const TQCString& from, const T /* -KoFilter::ConversiontqStatus ExcelWorker::startDocument(KSpreadFilterProperty property) { +KoFilter::ConversionStatus ExcelWorker::startDocument(KSpreadFilterProperty property) { return KoFilter::OK; } -KoFilter::ConversiontqStatus ExcelWorker::startInfoLog(KSpreadFilterProperty property) { +KoFilter::ConversionStatus ExcelWorker::startInfoLog(KSpreadFilterProperty property) { return KoFilter::OK; } -KoFilter::ConversiontqStatus ExcelWorker::startInfoAuthor(KSpreadFilterProperty property) { +KoFilter::ConversionStatus ExcelWorker::startInfoAuthor(KSpreadFilterProperty property) { return KoFilter::OK; } -KoFilter::ConversiontqStatus ExcelWorker::startInfoAbout(KSpreadFilterProperty property) { +KoFilter::ConversionStatus ExcelWorker::startInfoAbout(KSpreadFilterProperty property) { return KoFilter::OK; } -KoFilter::ConversiontqStatus ExcelWorker::startSpreadBook(KSpreadFilterProperty property) { +KoFilter::ConversionStatus ExcelWorker::startSpreadBook(KSpreadFilterProperty property) { return KoFilter::OK; } -KoFilter::ConversiontqStatus ExcelWorker::startSpreadSheet(KSpreadFilterProperty property) { +KoFilter::ConversionStatus ExcelWorker::startSpreadSheet(KSpreadFilterProperty property) { return KoFilter::OK; } -KoFilter::ConversiontqStatus ExcelWorker::startSpreadCell(KSpreadFilterProperty property) { +KoFilter::ConversionStatus ExcelWorker::startSpreadCell(KSpreadFilterProperty property) { return KoFilter::OK; } */ diff --git a/filters/kspread/excel/excelexport.h b/filters/kspread/excel/excelexport.h index 029cdac1..e4b6b499 100644 --- a/filters/kspread/excel/excelexport.h +++ b/filters/kspread/excel/excelexport.h @@ -16,20 +16,20 @@ public: ExcelExport(KoFilter *parent, const char*name, const TQStringList&); virtual ~ExcelExport() {} - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; class ExcelWorker : public KSpreadBaseWorker { public: // Implement those - //KoFilter::ConversiontqStatus startDocument(KSpreadFilterProperty property); - //KoFilter::ConversiontqStatus startInfoLog(KSpreadFilterProperty property); - //KoFilter::ConversiontqStatus startInfoAuthor(KSpreadFilterProperty property); - //KoFilter::ConversiontqStatus startInfoAbout(KSpreadFilterProperty property); - //KoFilter::ConversiontqStatus startSpreadBook(KSpreadFilterProperty property); - //KoFilter::ConversiontqStatus startSpreadSheet(KSpreadFilterProperty property); - //KoFilter::ConversiontqStatus startSpreadCell(KSpreadFilterProperty property); + //KoFilter::ConversionStatus startDocument(KSpreadFilterProperty property); + //KoFilter::ConversionStatus startInfoLog(KSpreadFilterProperty property); + //KoFilter::ConversionStatus startInfoAuthor(KSpreadFilterProperty property); + //KoFilter::ConversionStatus startInfoAbout(KSpreadFilterProperty property); + //KoFilter::ConversionStatus startSpreadBook(KSpreadFilterProperty property); + //KoFilter::ConversionStatus startSpreadSheet(KSpreadFilterProperty property); + //KoFilter::ConversionStatus startSpreadCell(KSpreadFilterProperty property); }; #endif diff --git a/filters/kspread/excel/import/excelimport.cc b/filters/kspread/excel/import/excelimport.cc index f1bade9e..75ee412a 100644 --- a/filters/kspread/excel/import/excelimport.cc +++ b/filters/kspread/excel/import/excelimport.cc @@ -33,7 +33,7 @@ #include <tqfile.h> #include <tqmap.h> #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> #include <KoFilterChain.h> @@ -107,7 +107,7 @@ ExcelImport::~ExcelImport() delete d; } -KoFilter::ConversiontqStatus ExcelImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus ExcelImport::convert( const TQCString& from, const TQCString& to ) { if ( from != "application/msexcel" ) return KoFilter::NotImplemented; @@ -348,7 +348,7 @@ void ExcelImport::Private::processSheetForBody( Sheet* sheet, KoXmlWriter* xmlWr xmlWriter->addAttribute( "table:name", string( sheet->name() ).string() ); xmlWriter->addAttribute( "table:print", "false" ); xmlWriter->addAttribute( "table:protected", "false" ); - xmlWriter->addAttribute( "table:style-name", TQString("ta%1").tqarg(sheetFormatIndex)); + xmlWriter->addAttribute( "table:style-name", TQString("ta%1").arg(sheetFormatIndex)); sheetFormatIndex++; unsigned ci = 0; @@ -397,7 +397,7 @@ void ExcelImport::Private::processSheetForStyle( Sheet* sheet, KoXmlWriter* xmlW xmlWriter->startElement( "style:style" ); xmlWriter->addAttribute( "style:family", "table" ); xmlWriter->addAttribute( "style:master-page-name", "Default" ); - xmlWriter->addAttribute( "style:name", TQString("ta%1").tqarg(sheetFormatIndex) ); + xmlWriter->addAttribute( "style:name", TQString("ta%1").arg(sheetFormatIndex) ); sheetFormatIndex++; xmlWriter->startElement( "style:table-properties" ); @@ -450,7 +450,7 @@ void ExcelImport::Private::processColumnForBody( Column* column, int repeat, KoX xmlWriter->addAttribute( "table:default-style-name", "Default" ); xmlWriter->addAttribute( "table:visibility", column->visible() ? "visible" : "collapse" ); if(repeat > 1) xmlWriter->addAttribute( "table:number-columns-repeated", repeat ); - xmlWriter->addAttribute( "table:style-name", TQString("co%1").tqarg(columnFormatIndex) ); + xmlWriter->addAttribute( "table:style-name", TQString("co%1").arg(columnFormatIndex) ); columnFormatIndex++; xmlWriter->endElement(); // table:table-column @@ -463,12 +463,12 @@ void ExcelImport::Private::processColumnForStyle( Column* column, int /*repeat*/ xmlWriter->startElement( "style:style" ); xmlWriter->addAttribute( "style:family", "table-column" ); - xmlWriter->addAttribute( "style:name", TQString("co%1").tqarg(columnFormatIndex) ); + xmlWriter->addAttribute( "style:name", TQString("co%1").arg(columnFormatIndex) ); columnFormatIndex++; xmlWriter->startElement( "style:table-column-properties" ); xmlWriter->addAttribute( "fo:break-before", "auto" ); - xmlWriter->addAttribute( "style:column-width", TQString("%1in").tqarg(column->width()/27) ); + xmlWriter->addAttribute( "style:column-width", TQString("%1in").arg(column->width()/27) ); xmlWriter->endElement(); // style:table-column-properties xmlWriter->endElement(); // style:style @@ -494,7 +494,7 @@ void ExcelImport::Private::processRowForBody( Row* row, int /*repeat*/, KoXmlWri xmlWriter->startElement( "table:table-row" ); xmlWriter->addAttribute( "table:visibility", row->visible() ? "visible" : "collapse" ); - xmlWriter->addAttribute( "table:style-name", TQString("ro%1").tqarg(rowFormatIndex) ); + xmlWriter->addAttribute( "table:style-name", TQString("ro%1").arg(rowFormatIndex) ); rowFormatIndex++; for( int i = 0; i <= lastCol; i++ ) @@ -530,12 +530,12 @@ void ExcelImport::Private::processRowForStyle( Row* row, int repeat, KoXmlWriter xmlWriter->startElement( "style:style" ); xmlWriter->addAttribute( "style:family", "table-row" ); if(repeat > 1) xmlWriter->addAttribute( "table:number-rows-repeated", repeat ); - xmlWriter->addAttribute( "style:name", TQString("ro%1").tqarg(rowFormatIndex) ); + xmlWriter->addAttribute( "style:name", TQString("ro%1").arg(rowFormatIndex) ); rowFormatIndex++; xmlWriter->startElement( "style:table-row-properties" ); xmlWriter->addAttribute( "fo:break-before", "auto" ); - xmlWriter->addAttribute( "style:row-height", TQString("%1pt").tqarg(row->height()) ); + xmlWriter->addAttribute( "style:row-height", TQString("%1pt").arg(row->height()) ); xmlWriter->endElement(); // style:table-row-properties xmlWriter->endElement(); // style:style @@ -703,7 +703,7 @@ void ExcelImport::Private::processCellForStyle( Cell* cell, KoXmlWriter* xmlWrit const UString& valueFormat = format.valueFormat(); if( !valueFormat.isEmpty() ) { - refName = TQString("N%1").tqarg(cell->formatIndex()); + refName = TQString("N%1").arg(cell->formatIndex()); TQString numformat = string( valueFormat ).string(); processValueFormat( numformat, refName, xmlWriter ); } @@ -717,7 +717,7 @@ void ExcelImport::Private::processCellForStyle( Cell* cell, KoXmlWriter* xmlWrit // now the real table-cell xmlWriter->startElement( "style:style" ); xmlWriter->addAttribute( "style:family", "table-cell" ); - xmlWriter->addAttribute( "style:name", TQString("ce%1").tqarg( cell->formatIndex() ) ); + xmlWriter->addAttribute( "style:name", TQString("ce%1").arg( cell->formatIndex() ) ); if( !refName.isEmpty() ) xmlWriter->addAttribute( "style:data-style-name", refName ); @@ -759,7 +759,7 @@ void ExcelImport::Private::processFormat( const Format* format, KoXmlWriter* xml if( !xmlWriter ) return; const FormatFont& font = format->font(); - const FormatAlignment& align = format->tqalignment(); + const FormatAlignment& align = format->alignment(); const FormatBackground& back = format->background(); const FormatBorders& borders = format->borders(); @@ -792,7 +792,7 @@ void ExcelImport::Private::processFormat( const Format* format, KoXmlWriter* xml if( !font.fontFamily().isEmpty() ) xmlWriter->addAttribute( "style:font-name", string(font.fontFamily()).string() ); - xmlWriter->addAttribute( "fo:font-size", TQString("%1pt").tqarg(font.fontSize()) ); + xmlWriter->addAttribute( "fo:font-size", TQString("%1pt").arg(font.fontSize()) ); xmlWriter->addAttribute( "fo:color", convertColor( font.color() ) ); diff --git a/filters/kspread/excel/import/excelimport.h b/filters/kspread/excel/import/excelimport.h index 5b733733..84729b4d 100644 --- a/filters/kspread/excel/import/excelimport.h +++ b/filters/kspread/excel/import/excelimport.h @@ -35,7 +35,7 @@ public: ExcelImport ( TQObject *parent, const char* name, const TQStringList& ); virtual ~ExcelImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: class Private; diff --git a/filters/kspread/excel/sidewinder/excel.cpp b/filters/kspread/excel/sidewinder/excel.cpp index 8155bca5..2a3a6247 100644 --- a/filters/kspread/excel/sidewinder/excel.cpp +++ b/filters/kspread/excel/sidewinder/excel.cpp @@ -185,7 +185,7 @@ static Value errorAsValue( int errorCode ) class EString::Private { public: - bool tqunicode; + bool unicode; bool richText; UString str; unsigned size; @@ -194,7 +194,7 @@ public: EString::EString() { d = new EString::Private(); - d->tqunicode = false; + d->unicode = false; d->richText = false; d->str = UString::null; d->size = 0; @@ -208,7 +208,7 @@ EString::EString( const EString& es ) EString& EString::operator=( const EString& es ) { - d->tqunicode = es.d->tqunicode; + d->unicode = es.d->unicode; d->richText = es.d->richText; d->size = es.d->size; d->str = es.d->str; @@ -220,14 +220,14 @@ EString::~EString() delete d; } -bool EString::tqunicode() const +bool EString::unicode() const { - return d->tqunicode; + return d->unicode; } void EString::setUnicode( bool u ) { - d->tqunicode = u; + d->unicode = u; } bool EString::richText() const @@ -271,7 +271,7 @@ EString EString::fromUnicodeString( const void* p, bool longString, unsigned /* unsigned char flag = data[ offset ]; offset++; // for flag (1 byte) - bool tqunicode = flag & 0x01; + bool unicode = flag & 0x01; bool richText = flag & 0x08; unsigned formatRuns = 0; @@ -283,10 +283,10 @@ EString EString::fromUnicodeString( const void* p, bool longString, unsigned /* // find out total bytes used in this string unsigned size = offset + len; // string data - if( tqunicode ) size += len; // because tqunicode takes 2-bytes char + if( unicode ) size += len; // because unicode takes 2-bytes char if( richText ) size += (formatRuns*4); - if( !tqunicode ) + if( !unicode ) { char* buffer = new char[ len+1 ]; memcpy( buffer, data + offset, len ); @@ -303,7 +303,7 @@ EString EString::fromUnicodeString( const void* p, bool longString, unsigned /* } EString result; - result.setUnicode( tqunicode ); + result.setUnicode( unicode ); result.setRichText( richText ); result.setSize( size ); result.setStr( str ); @@ -351,14 +351,14 @@ EString EString::fromSheetName( const void* p, unsigned datasize ) unsigned len = data[0]; unsigned flag = data[1]; - bool tqunicode = flag & 1; + bool unicode = flag & 1; if( len > datasize-2 ) len = datasize-2; if( len == 0 ) return EString(); unsigned offset = 2; - if( !tqunicode ) + if( !unicode ) { char* buffer = new char[ len+1 ]; memcpy( buffer, data + offset, len ); @@ -376,7 +376,7 @@ EString EString::fromSheetName( const void* p, unsigned datasize ) } EString result; - result.setUnicode( tqunicode ); + result.setUnicode( unicode ); result.setRichText( richText ); result.setSize( datasize ); result.setStr( str ); @@ -2012,7 +2012,7 @@ void BoundSheetRecord::setData( unsigned size, const unsigned char* data ) d->visibility = data[4]; d->type = data[5]; - /* FIXME: it turned out that sheet name is not normal tqunicode string + /* FIXME: it turned out that sheet name is not normal unicode string where the first two bytes specifies string length, but instead only the first specifies it. the next byte could be correctly interpreted as flag. @@ -5113,31 +5113,31 @@ bool ExcelReader::load( Workbook* workbook, const char* filename ) format.setFont( convertFont( xf.fontIndex() ) ); - FormatAlignment tqalignment; + FormatAlignment alignment; switch( xf.horizontalAlignment() ) { case XFRecord::Left: - tqalignment.setAlignX( Format::Left ); break; + alignment.setAlignX( Format::Left ); break; case XFRecord::Right: - tqalignment.setAlignX( Format::Right ); break; + alignment.setAlignX( Format::Right ); break; case XFRecord::Centered: - tqalignment.setAlignX( Format::Center ); break; + alignment.setAlignX( Format::Center ); break; default: break; // FIXME still unsupported: Repeat, Justified, Filled, Distributed }; switch( xf.verticalAlignment() ) { case XFRecord::Top: - tqalignment.setAlignY( Format::Top ); break; + alignment.setAlignY( Format::Top ); break; case XFRecord::VCentered: - tqalignment.setAlignY( Format::Middle ); break; + alignment.setAlignY( Format::Middle ); break; case XFRecord::Bottom: - tqalignment.setAlignY( Format::Bottom ); break; + alignment.setAlignY( Format::Bottom ); break; default: break; // FIXME still unsupported: Justified, Distributed } - tqalignment.setWrap( xf.textWrap() ); - format.tqsetAlignment( tqalignment ); + alignment.setWrap( xf.textWrap() ); + format.setAlignment( alignment ); FormatBorders borders; @@ -5929,31 +5929,31 @@ Format ExcelReader::convertFormat( unsigned xfIndex ) format.setFont( convertFont( xf.fontIndex() ) ); - FormatAlignment tqalignment; + FormatAlignment alignment; switch( xf.horizontalAlignment() ) { case XFRecord::Left: - tqalignment.setAlignX( Format::Left ); break; + alignment.setAlignX( Format::Left ); break; case XFRecord::Right: - tqalignment.setAlignX( Format::Right ); break; + alignment.setAlignX( Format::Right ); break; case XFRecord::Centered: - tqalignment.setAlignX( Format::Center ); break; + alignment.setAlignX( Format::Center ); break; default: break; // FIXME still unsupported: Repeat, Justified, Filled, Distributed }; switch( xf.verticalAlignment() ) { case XFRecord::Top: - tqalignment.setAlignY( Format::Top ); break; + alignment.setAlignY( Format::Top ); break; case XFRecord::VCentered: - tqalignment.setAlignY( Format::Middle ); break; + alignment.setAlignY( Format::Middle ); break; case XFRecord::Bottom: - tqalignment.setAlignY( Format::Bottom ); break; + alignment.setAlignY( Format::Bottom ); break; default: break; // FIXME still unsupported: Justified, Distributed } - tqalignment.setWrap( xf.textWrap() ); - format.tqsetAlignment( tqalignment ); + alignment.setWrap( xf.textWrap() ); + format.setAlignment( alignment ); FormatBorders borders; diff --git a/filters/kspread/excel/sidewinder/excel.h b/filters/kspread/excel/sidewinder/excel.h index 8cbdfd53..5221b518 100644 --- a/filters/kspread/excel/sidewinder/excel.h +++ b/filters/kspread/excel/sidewinder/excel.h @@ -36,7 +36,7 @@ enum { UnknownExcel = 0, Excel95, Excel97, Excel2000 }; class Record; -// rich-text, tqunicode, far-east support Excel string +// rich-text, unicode, far-east support Excel string class EString { @@ -50,7 +50,7 @@ public: ~EString(); - bool tqunicode() const; + bool unicode() const; void setUnicode( bool u ); @@ -2805,17 +2805,17 @@ public: Distributed }; /** - * Gets the horizontal tqalignment, e.g Left. + * Gets the horizontal alignment, e.g Left. */ unsigned horizontalAlignment() const; /** - * Sets the horizontal tqalignment, e.g Left. + * Sets the horizontal alignment, e.g Left. */ void setHorizontalAlignment( unsigned ha ); /** - * Returns human-readable string representation of the horizontal tqalignment. + * Returns human-readable string representation of the horizontal alignment. For example, XFRecord::Left will return "Left". */ const char* horizontalAlignmentAsString() const; @@ -2828,21 +2828,21 @@ public: VDistributed = 4 }; /** - * Gets the vertical tqalignment, e.g Bottom. + * Gets the vertical alignment, e.g Bottom. * * \sa setVerticalAlignment */ unsigned verticalAlignment() const; /** - * Sets the vertical tqalignment, e.g Top. + * Sets the vertical alignment, e.g Top. * * \sa verticalAlignment */ void setVerticalAlignment( unsigned va ); /** - * Returns human-readable string representation of the vertical tqalignment. + * Returns human-readable string representation of the vertical alignment. For example, XFRecord::Top will return "Top". */ const char* verticalAlignmentAsString() const; diff --git a/filters/kspread/excel/sidewinder/format.cpp b/filters/kspread/excel/sidewinder/format.cpp index 29481fd0..8ce69f24 100644 --- a/filters/kspread/excel/sidewinder/format.cpp +++ b/filters/kspread/excel/sidewinder/format.cpp @@ -271,7 +271,7 @@ FormatAlignment& FormatAlignment::operator=( const FormatAlignment& align ) return assign( align ); } -// assign from another tqalignment +// assign from another alignment FormatAlignment& FormatAlignment::assign( const FormatAlignment& align ) { d->null = align.isNull(); @@ -398,7 +398,7 @@ FormatBackground& FormatBackground::operator=( const FormatBackground& backgroun return assign( background ); } -// assign from another tqalignment +// assign from another alignment FormatBackground& FormatBackground::assign( const FormatBackground& background ) { d->null = background.isNull(); @@ -498,7 +498,7 @@ FormatBorders& FormatBorders::operator=( const FormatBorders& border ) return assign( border ); } -// assign from another tqalignment +// assign from another alignment FormatBorders& FormatBorders::assign( const FormatBorders& border ) { d->null = border.isNull(); @@ -581,7 +581,7 @@ class Format::Private { public: FormatFont font; - FormatAlignment tqalignment; + FormatAlignment alignment; FormatBorders borders; FormatBackground background; UString valueFormat; @@ -617,7 +617,7 @@ Format& Format::operator=( const Format& f ) Format& Format::assign( const Format& f ) { d->font = f.font(); - d->tqalignment = f.tqalignment(); + d->alignment = f.alignment(); d->borders = f.borders(); d->valueFormat = f.valueFormat(); d->background = f.background(); @@ -626,7 +626,7 @@ Format& Format::assign( const Format& f ) bool Format::isNull() const { - return d->font.isNull() && d->tqalignment.isNull() && d->borders.isNull(); + return d->font.isNull() && d->alignment.isNull() && d->borders.isNull(); } FormatFont& Format::font() const @@ -639,14 +639,14 @@ void Format::setFont( const FormatFont& font ) d->font = font; } -FormatAlignment& Format::tqalignment() const +FormatAlignment& Format::alignment() const { - return d->tqalignment; + return d->alignment; } -void Format::tqsetAlignment( const FormatAlignment& tqalignment ) +void Format::setAlignment( const FormatAlignment& alignment ) { - d->tqalignment = tqalignment; + d->alignment = alignment; } FormatBorders& Format::borders() const @@ -682,8 +682,8 @@ void Format::setValueFormat( const UString& valueFormat ) // merge f into current format Format& Format::apply( const Format& f ) { - if( !f.tqalignment().isNull() ) - tqalignment() = f.tqalignment(); + if( !f.alignment().isNull() ) + alignment() = f.alignment(); if( !f.font().isNull() ) font() = f.font(); if( !f.borders().isNull() ) @@ -700,7 +700,7 @@ bool Format::operator==(const Format& format) const { return d->font == format.d->font && - d->tqalignment == format.d->tqalignment && + d->alignment == format.d->alignment && d->borders == format.d->borders && d->background == format.d->background && d->valueFormat == format.d->valueFormat; @@ -710,7 +710,7 @@ bool Format::operator!=(const Format& format) const { return d->font != format.d->font || - d->tqalignment != format.d->tqalignment || + d->alignment != format.d->alignment || d->borders != format.d->borders || d->background != format.d->background || d->valueFormat != format.d->valueFormat; diff --git a/filters/kspread/excel/sidewinder/format.h b/filters/kspread/excel/sidewinder/format.h index dcadc1c2..acb566a5 100644 --- a/filters/kspread/excel/sidewinder/format.h +++ b/filters/kspread/excel/sidewinder/format.h @@ -266,9 +266,9 @@ private: /** - * Defines tqalignment information for cell format. + * Defines alignment information for cell format. * - * Class FormatAlignment defines the horizontal and vertical tqalignment + * Class FormatAlignment defines the horizontal and vertical alignment * for the text inside a cell. * */ @@ -278,37 +278,37 @@ class FormatAlignment public: /** - * Creates a default tqalignment information. + * Creates a default alignment information. */ FormatAlignment(); /** - * Destroys the tqalignment information + * Destroys the alignment information */ ~FormatAlignment(); /** - * Creates a copy of tqalignment information. + * Creates a copy of alignment information. */ FormatAlignment( const FormatAlignment& ); /** - * Assigns from another tqalignment information. + * Assigns from another alignment information. */ FormatAlignment& operator=( const FormatAlignment& ); /** - * Assigns from another tqalignment information. + * Assigns from another alignment information. */ FormatAlignment& assign( const FormatAlignment& ); /** - * Returns true if it is a default tqalignment information. + * Returns true if it is a default alignment information. */ bool isNull() const; /** - * Returns horizontal tqalignment. Possible values are + * Returns horizontal alignment. Possible values are * Format::Left, Format::Right and Format::Center. * * \sa setAlignX @@ -316,14 +316,14 @@ public: unsigned alignX() const; /** - * Sets the horizontal tqalignment. + * Sets the horizontal alignment. * * \sa alignX */ void setAlignX( unsigned xa ); /** - * Returns horizontal tqalignment. Possible values are + * Returns horizontal alignment. Possible values are * Format::Top, Format::Middle and Format::Bottom. * * \sa setAlignY @@ -331,7 +331,7 @@ public: unsigned alignY() const; /** - * Sets the horizontal tqalignment. + * Sets the horizontal alignment. * * \sa alignY */ @@ -380,12 +380,12 @@ public: void setRotationAngle( unsigned r ); /** - * Returns true if this tqalignment is equal to f; otherwise returns false. + * Returns true if this alignment is equal to f; otherwise returns false. */ bool operator==(const FormatAlignment& f) const; /** - * Returns true if this tqalignment is not equal to f; otherwise returns false. + * Returns true if this alignment is not equal to f; otherwise returns false. */ bool operator!=(const FormatAlignment& f) const; @@ -683,14 +683,14 @@ public: void setFont( const FormatFont& font ); /** - * Returns a constant reference to the tqalignment information of this format. + * Returns a constant reference to the alignment information of this format. */ - FormatAlignment& tqalignment() const; + FormatAlignment& alignment() const; /** - * Sets new tqalignment information for this format. + * Sets new alignment information for this format. */ - void tqsetAlignment( const FormatAlignment& tqalignment ); + void setAlignment( const FormatAlignment& alignment ); /** * Returns a reference to the borders information of this format. diff --git a/filters/kspread/excel/sidewinder/pole.cpp b/filters/kspread/excel/sidewinder/pole.cpp index 38fe8cb5..e4090cd9 100644 --- a/filters/kspread/excel/sidewinder/pole.cpp +++ b/filters/kspread/excel/sidewinder/pole.cpp @@ -95,7 +95,7 @@ class DirEntry { public: bool valid; // false if invalid (should be skipped) - std::string name; // the name, not in tqunicode anymore + std::string name; // the name, not in unicode anymore bool dir; // true if directory unsigned long size; // size (not valid if directory) unsigned long start; // starting block @@ -116,7 +116,7 @@ class DirTree int indexOf( DirEntry* e ); int parent( unsigned index ); std::string fullName( unsigned index ); - std::vector<unsigned> tqchildren( unsigned index ); + std::vector<unsigned> children( unsigned index ); void load( unsigned char* buffer, unsigned len ); void save( unsigned char* buffer ); unsigned size(); @@ -509,11 +509,11 @@ int DirTree::indexOf( DirEntry* e ) int DirTree::parent( unsigned index ) { - // brute-force, basically we iterate for each entries, find its tqchildren - // and check if one of the tqchildren is 'index' + // brute-force, basically we iterate for each entries, find its children + // and check if one of the children is 'index' for( unsigned j=0; j<entryCount(); j++ ) { - std::vector<unsigned> chi = tqchildren( j ); + std::vector<unsigned> chi = children( j ); for( unsigned i=0; i<chi.size();i++ ) if( chi[i] == index ) return j; @@ -577,8 +577,8 @@ DirEntry* DirTree::entry( const std::string& name, bool create ) for( it = names.begin(); it != names.end(); ++it ) { - // find among the tqchildren of index - std::vector<unsigned> chi = tqchildren( index ); + // find among the children of index + std::vector<unsigned> chi = children( index ); unsigned child = 0; for( unsigned i = 0; i < chi.size(); i++ ) { @@ -593,7 +593,7 @@ DirEntry* DirTree::entry( const std::string& name, bool create ) if( child > 0 ) index = child; else { - // not found among tqchildren + // not found among children if( !create ) return (DirEntry*)0; // create a new entry @@ -650,7 +650,7 @@ void dirtree_find_siblings( DirTree* dirtree, std::vector<unsigned>& result, } } -std::vector<unsigned> DirTree::tqchildren( unsigned index ) +std::vector<unsigned> DirTree::children( unsigned index ) { std::vector<unsigned> result; @@ -1286,9 +1286,9 @@ std::list<std::string> Storage::entries( const std::string& path ) if( e && e->dir ) { unsigned parent = dt->indexOf( e ); - std::vector<unsigned> tqchildren = dt->tqchildren( parent ); - for( unsigned i = 0; i < tqchildren.size(); i++ ) - result.push_back( dt->entry( tqchildren[i] )->name ); + std::vector<unsigned> children = dt->children( parent ); + for( unsigned i = 0; i < children.size(); i++ ) + result.push_back( dt->entry( children[i] )->name ); } return result; diff --git a/filters/kspread/excel/sidewinder/ustring.cpp b/filters/kspread/excel/sidewinder/ustring.cpp index b26ee196..304fed18 100644 --- a/filters/kspread/excel/sidewinder/ustring.cpp +++ b/filters/kspread/excel/sidewinder/ustring.cpp @@ -39,7 +39,7 @@ UString UString::null; static char *statBuffer = 0L; UChar::UChar(const UCharReference &c) - : uc( c.tqunicode() ) + : uc( c.unicode() ) { } @@ -579,7 +579,7 @@ bool Swinder::operator<(const UString& s1, const UString& s2) l++; } if (l < lmin) - return (c1->tqunicode() < c2->tqunicode()); + return (c1->unicode() < c2->unicode()); return (l1 < l2); } diff --git a/filters/kspread/excel/sidewinder/ustring.h b/filters/kspread/excel/sidewinder/ustring.h index 1c4f2bc5..3f41867b 100644 --- a/filters/kspread/excel/sidewinder/ustring.h +++ b/filters/kspread/excel/sidewinder/ustring.h @@ -68,7 +68,7 @@ namespace Swinder { /** * @return the 16 bit Unicode value of the character */ - unsigned short tqunicode() const { return uc; } + unsigned short unicode() const { return uc; } public: /** * A static instance of UChar(0). @@ -120,7 +120,7 @@ namespace Swinder { /** * @return Unicode value. */ - unsigned short tqunicode() const { return ref().uc; } + unsigned short unicode() const { return ref().uc; } /** * @return Lower byte. */ diff --git a/filters/kspread/gnumeric/gnumeric.xsd b/filters/kspread/gnumeric/gnumeric.xsd index 04949083..7150f7e4 100644 --- a/filters/kspread/gnumeric/gnumeric.xsd +++ b/filters/kspread/gnumeric/gnumeric.xsd @@ -427,8 +427,8 @@ </xsd:complexType> </xsd:element> </xsd:sequence> - <xsd:attribute name="HAlign" type="gmr:horizontal_tqalignment"/> - <xsd:attribute name="VAlign" type="gmr:vertical_tqalignment" /> + <xsd:attribute name="HAlign" type="gmr:horizontal_alignment"/> + <xsd:attribute name="VAlign" type="gmr:vertical_alignment" /> <xsd:attribute name="WrapText" type="xsd:boolean" /> <xsd:attribute name="ShrinkToFit" type="xsd:integer" /> <!-- should be bool, but some files have odd truth values --> <xsd:attribute name="Rotation" type="xsd:integer" use="optional"/> @@ -492,7 +492,7 @@ </xsd:restriction> </xsd:simpleType> - <xsd:simpleType name="horizontal_tqalignment"> + <xsd:simpleType name="horizontal_alignment"> <xsd:restriction base="xsd:integer"> <!-- this is a bit map as follows: 1 = GENERAL @@ -508,7 +508,7 @@ </xsd:restriction> </xsd:simpleType> - <xsd:simpleType name="vertical_tqalignment"> + <xsd:simpleType name="vertical_alignment"> <xsd:restriction base="xsd:integer"> <!-- this is a bit map as follows: 1 = TOP @@ -644,7 +644,7 @@ <xsd:attribute name="FillColor" type="gmr:color" use="required"/> <xsd:attribute name="Type" type="gmr:objectfilled" use="required"/> <xsd:attribute name="Width" type="xsd:positiveInteger" use="required"/> - <!-- the arrow tqshape attributes are only used if the type is + <!-- the arrow shape attributes are only used if the type is arrow (type="gmr:2") --> <xsd:attribute name="ArrowShapeA" type="xsd:double" use="optional"/> diff --git a/filters/kspread/gnumeric/gnumericexport.cc b/filters/kspread/gnumeric/gnumericexport.cc index cccfcc9f..f7416cc7 100644 --- a/filters/kspread/gnumeric/gnumericexport.cc +++ b/filters/kspread/gnumeric/gnumericexport.cc @@ -31,7 +31,7 @@ #include <tqptrlist.h> #include <tqsortedlist.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kspread_map.h> #include <kspread_sheet.h> @@ -540,7 +540,7 @@ TQDomElement GNUMERICExport::GetLinkStyle(TQDomDocument gnumeric_doc) TQDomElement GNUMERICExport::GetCellStyle(TQDomDocument gnumeric_doc,Cell * cell, int currentcolumn, int currentrow) { - TQColorGroup defaultColorGroup = TQApplication::tqpalette().active(); + TQColorGroup defaultColorGroup = TQApplication::palette().active(); TQDomElement cell_style; @@ -938,7 +938,7 @@ void GNUMERICExport::addSummaryItem(TQDomDocument gnumeric_doc, TQDomElement sum // The reason why we use the KoDocument* approach and not the TQDomDocument // approach is because we don't want to export formulas but values ! -KoFilter::ConversiontqStatus GNUMERICExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus GNUMERICExport::convert( const TQCString& from, const TQCString& to ) { kdDebug(30521) << "Exporting GNUmeric" << endl; @@ -1443,7 +1443,7 @@ KoFilter::ConversiontqStatus GNUMERICExport::convert( const TQCString& from, con //<gmr:CellComment Author="" Text="cvbcvbxcvb cb xc vbxcv " ObjectBound="A1" ObjectOffset="0 0 0 0" ObjectAnchorType="17 16 17 16" Direction="17"/> cellComment = gnumeric_doc.createElement("gmr:CellComment"); cellComment.setAttribute( "Text", cell->format()->comment( currentcolumn, currentrow ) ); - TQString sCell=TQString( "%1%2" ).tqarg( Cell::columnName(currentcolumn ) ).tqarg( currentrow ); + TQString sCell=TQString( "%1%2" ).arg( Cell::columnName(currentcolumn ) ).arg( currentrow ); cellComment.setAttribute("ObjectBound", sCell ); objects.appendChild(cellComment); diff --git a/filters/kspread/gnumeric/gnumericexport.h b/filters/kspread/gnumeric/gnumericexport.h index 392f0f72..0b2b0324 100644 --- a/filters/kspread/gnumeric/gnumericexport.h +++ b/filters/kspread/gnumeric/gnumericexport.h @@ -37,7 +37,7 @@ public: GNUMERICExport(KoFilter *parent, const char*name, const TQStringList&); virtual ~GNUMERICExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: TQDomElement GetCellStyle(TQDomDocument gnumeric_doc, KSpread::Cell* cell, int currentcolumn, int currentrow); diff --git a/filters/kspread/gnumeric/gnumericimport.cc b/filters/kspread/gnumeric/gnumericimport.cc index 249258b3..b0833e87 100644 --- a/filters/kspread/gnumeric/gnumericimport.cc +++ b/filters/kspread/gnumeric/gnumericimport.cc @@ -1822,7 +1822,7 @@ void GNUMERICFilter::setStyleInfo(TQDomNode * sheet, Sheet * table) */ -KoFilter::ConversiontqStatus GNUMERICFilter::convert( const TQCString & from, const TQCString & to ) +KoFilter::ConversionStatus GNUMERICFilter::convert( const TQCString & from, const TQCString & to ) { dateInit(); bool bSuccess=true; diff --git a/filters/kspread/gnumeric/gnumericimport.h b/filters/kspread/gnumeric/gnumericimport.h index b7fbd4bd..c449a599 100644 --- a/filters/kspread/gnumeric/gnumericimport.h +++ b/filters/kspread/gnumeric/gnumericimport.h @@ -39,7 +39,7 @@ class GNUMERICFilter : public KoFilter GNUMERICFilter(KoFilter *parent, const char *name, const TQStringList&); virtual ~GNUMERICFilter() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); enum borderStyle { Left, Right, Top, Bottom, Diagonal, Revdiagonal}; private: diff --git a/filters/kspread/gnumeric/status.html b/filters/kspread/gnumeric/status.html index 7bd198cc..a25cdf4b 100644 --- a/filters/kspread/gnumeric/status.html +++ b/filters/kspread/gnumeric/status.html @@ -211,7 +211,7 @@ Bold <br>Cell Size:Qt::Horizontal &Qt::Vertical <br>Hidden columns/rows <br>Selected Tab -<br>Paper tqlayout +<br>Paper layout <br>area name <br>Cell comment <br>Text Rotation diff --git a/filters/kspread/html/exportdialog.cc b/filters/kspread/html/exportdialog.cc index 72dd6875..aa9366bf 100644 --- a/filters/kspread/html/exportdialog.cc +++ b/filters/kspread/html/exportdialog.cc @@ -22,7 +22,7 @@ #include <tqlistbox.h> #include <tqradiobutton.h> #include <tqspinbox.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <kapplication.h> #include <kglobal.h> @@ -44,7 +44,7 @@ ExportDialog::ExportDialog( TQWidget *parent, const char *name ) m_mainwidget->mSheets, TQT_SLOT( clearSelection() ) ); m_mainwidget->mEncodingBox->insertItem( i18n( "Recommended: UTF-8" ) ); - m_mainwidget->mEncodingBox->insertItem( i18n( "Locale (%1)" ).tqarg( KGlobal::locale()->codecForEncoding()->name() ) ); + m_mainwidget->mEncodingBox->insertItem( i18n( "Locale (%1)" ).arg( KGlobal::locale()->codecForEncoding()->name() ) ); m_mainwidget->mCustomURL->setMode( KFile::ExistingOnly ); diff --git a/filters/kspread/html/exportwidget.ui b/filters/kspread/html/exportwidget.ui index df5dcc90..1b6ad59b 100644 --- a/filters/kspread/html/exportwidget.ui +++ b/filters/kspread/html/exportwidget.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -86,7 +86,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -124,7 +124,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>330</width> <height>20</height> @@ -222,7 +222,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -271,7 +271,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -292,7 +292,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/filters/kspread/html/htmlexport.cc b/filters/kspread/html/htmlexport.cc index 54711d8d..93991ad0 100644 --- a/filters/kspread/html/htmlexport.cc +++ b/filters/kspread/html/htmlexport.cc @@ -23,7 +23,7 @@ #include <exportdialog.h> #include <tqfile.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <kdebug.h> #include <kgenericfactory.h> @@ -76,7 +76,7 @@ const TQString strGt (">"); // The reason why we use the KoDocument* approach and not the TQDomDocument // approach is because we don't want to export formulas but values ! -KoFilter::ConversiontqStatus HTMLExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus HTMLExport::convert( const TQCString& from, const TQCString& to ) { if(to!="text/html" || from!="application/x-kspread") { @@ -186,7 +186,7 @@ void HTMLExport::openPage( Sheet *sheet, KoDocument *document, TQString &str ) str += "<html>\n"; str += "<head>\n"; str += "<meta http-equiv=\"Content-Type\" "; - str += TQString("content=\"text/html; charset=%1\">\n").tqarg( m_dialog->encoding()->mimeName() ); + str += TQString("content=\"text/html; charset=%1\">\n").arg( m_dialog->encoding()->mimeName() ); str += "<meta name=\"Generator\" "; str += "content=\"KSpread HTML Export Filter Version = "; str += KOFFICE_VERSION_STRING; @@ -202,7 +202,7 @@ void HTMLExport::openPage( Sheet *sheet, KoDocument *document, TQString &str ) str += "<title>" + title + "</title>\n"; str += "</head>\n"; - str += TQString("<body bgcolor=\"#FFFFFF\" dir=\"%1\">\n").tqarg( + str += TQString("<body bgcolor=\"#FFFFFF\" dir=\"%1\">\n").arg( sheet->isRightToLeft()?"rtl":"ltr"); str += "<a name=\"__top\">\n"; @@ -234,8 +234,8 @@ void HTMLExport::convertSheet( Sheet *sheet, TQString &str, int iMaxUsedRow, int int step=iMaxRow > 50 ? iMaxRow/50 : 1; int i=1; - str += "<" + html_table_tag + html_table_options.tqarg( m_dialog->useBorders() ? "1" : "0" ).tqarg( m_dialog->pixelsBetweenCells() ) + - TQString("dir=\"%1\">\n").tqarg(sheet->isRightToLeft()?"rtl":"ltr"); + str += "<" + html_table_tag + html_table_options.arg( m_dialog->useBorders() ? "1" : "0" ).arg( m_dialog->pixelsBetweenCells() ) + + TQString("dir=\"%1\">\n").arg(sheet->isRightToLeft()?"rtl":"ltr"); unsigned int nonempty_cells_prev=0; @@ -297,7 +297,7 @@ void HTMLExport::convertSheet( Sheet *sheet, TQString &str, int iMaxUsedRow, int #endif line += " <" + html_cell_tag + html_cell_options; if (text.isRightToLeft() != sheet->isRightToLeft()) - line += TQString(" dir=\"%1\" ").tqarg(text.isRightToLeft()?"rtl":"ltr"); + line += TQString(" dir=\"%1\" ").arg(text.isRightToLeft()?"rtl":"ltr"); if (bgcolor.isValid() && bgcolor.name()!="#ffffff") // change color only for non-white cells line += " bgcolor=\"" + bgcolor.name() + "\""; diff --git a/filters/kspread/html/htmlexport.h b/filters/kspread/html/htmlexport.h index 09f904d3..c7007157 100644 --- a/filters/kspread/html/htmlexport.h +++ b/filters/kspread/html/htmlexport.h @@ -39,7 +39,7 @@ public: HTMLExport(KoFilter *parent, const char*name, const TQStringList&); virtual ~HTMLExport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: /** Writes the top of the page in HTML to @par str */ void openPage( KSpread::Sheet *sheet,KoDocument *document, TQString &str); diff --git a/filters/kspread/kexi/kspread_kexiimport.cc b/filters/kspread/kexi/kspread_kexiimport.cc index 15e8ee2a..ac725982 100644 --- a/filters/kspread/kexi/kspread_kexiimport.cc +++ b/filters/kspread/kexi/kspread_kexiimport.cc @@ -74,7 +74,7 @@ KSpreadKexiImport::~KSpreadKexiImport() //============================================================================= -KoFilter::ConversiontqStatus KSpreadKexiImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus KSpreadKexiImport::convert( const TQCString& from, const TQCString& to ) { TQPtrList<TQListViewItem> objects; TQString file( m_chain->inputFile() ); diff --git a/filters/kspread/kexi/kspread_kexiimport.h b/filters/kspread/kexi/kspread_kexiimport.h index aec65889..4de3e704 100644 --- a/filters/kspread/kexi/kspread_kexiimport.h +++ b/filters/kspread/kexi/kspread_kexiimport.h @@ -76,7 +76,7 @@ class KSpreadKexiImport : public KoFilter */ virtual ~KSpreadKexiImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: KSpread::Doc *ksdoc; diff --git a/filters/kspread/kexi/kspread_kexiimportdialog.cc b/filters/kspread/kexi/kspread_kexiimportdialog.cc index 9ddf240f..f99b76a3 100644 --- a/filters/kspread/kexi/kspread_kexiimportdialog.cc +++ b/filters/kspread/kexi/kspread_kexiimportdialog.cc @@ -35,7 +35,7 @@ #include <klistview.h> #include <kcombobox.h> #include <tqradiobutton.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqcheckbox.h> #include <klocale.h> diff --git a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui index d9d28d55..fad0e0be 100644 --- a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui +++ b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui @@ -35,7 +35,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -110,7 +110,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -180,7 +180,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -196,7 +196,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>145</width> <height>0</height> diff --git a/filters/kspread/latex/export/config.h b/filters/kspread/latex/export/config.h index 6e35bd1c..969d021d 100644 --- a/filters/kspread/latex/export/config.h +++ b/filters/kspread/latex/export/config.h @@ -22,7 +22,7 @@ #ifndef __LATEX_CONFIG_H__ #define __LATEX_CONFIG_H__ -#include <tqtextstream.h> +#include <textstream.h> #include <tqstringlist.h> /***********************************************************************/ @@ -84,8 +84,8 @@ class Config bool convertPictures() const { return _convertPictures; } TQString getPicturesDir() const { return _picturesDir; } - bool mustUseUnicode() const { return (_encoding == "tqunicode"); } - bool mustUseLatin1() const { return (_encoding != "tqunicode"); } + bool mustUseUnicode() const { return (_encoding == "unicode"); } + bool mustUseLatin1() const { return (_encoding != "unicode"); } TQString getEncoding() const { return _encoding; } TQStringList getLanguagesList() const { return _languagesList; } TQString getDefaultLanguage() const { return _defaultLanguage; } diff --git a/filters/kspread/latex/export/document.h b/filters/kspread/latex/export/document.h index b8f0296c..733310bc 100644 --- a/filters/kspread/latex/export/document.h +++ b/filters/kspread/latex/export/document.h @@ -24,7 +24,7 @@ #define __KSPREAD_LATEX_DOCUMENT_H__ #include <tqfile.h> /* for TQFile class */ -#include <tqtextstream.h> /* for TQTextStream class */ +#include <textstream.h> /* for TQTextStream class */ #include <tqstring.h> /* for TQString class */ #include "xmlparser.h" diff --git a/filters/kspread/latex/export/fileheader.cc b/filters/kspread/latex/export/fileheader.cc index 8ee9eee0..07b1fbe4 100644 --- a/filters/kspread/latex/export/fileheader.cc +++ b/filters/kspread/latex/export/fileheader.cc @@ -79,7 +79,7 @@ void FileHeader::analysePaper(const TQDomNode balise) analysePaperParam(balise); //setTokenCurrent(balise_initiale->pContent); - // Analyse tqchildren markups --> PAPERBORDERS + // Analyse children markups --> PAPERBORDERS TQDomNode fils = getChild(balise, "PAPERSBORDERS"); _leftBorder = getAttr(fils, "left").toInt(); _rightBorder = getAttr(fils, "right").toInt(); @@ -282,7 +282,7 @@ void FileHeader::generatePackage(TQTextStream &out) if(Config::instance()->mustUseUnicode()) out << "\\usepackage{omega}" << endl; if(getFormat() == TF_A4) - out << "\\usepackage[a4paper]{tqgeometry}" << endl; + out << "\\usepackage[a4paper]{geometry}" << endl; if(hasFooter() || hasHeader()) out << "\\usepackage{fancyhdr}" << endl; if(hasColor()) diff --git a/filters/kspread/latex/export/fileheader.h b/filters/kspread/latex/export/fileheader.h index 5c4e7774..1d9b6025 100644 --- a/filters/kspread/latex/export/fileheader.h +++ b/filters/kspread/latex/export/fileheader.h @@ -22,7 +22,7 @@ #ifndef __KSPREAD_LATEX_FILEHEADER_H__ #define __KSPREAD_LATEX_FILEHEADER_H__ -#include <tqtextstream.h> +#include <textstream.h> #include "xmlparser.h" diff --git a/filters/kspread/latex/export/format.h b/filters/kspread/latex/export/format.h index 7025c371..9b03a258 100644 --- a/filters/kspread/latex/export/format.h +++ b/filters/kspread/latex/export/format.h @@ -23,7 +23,7 @@ #ifndef __KSPREAD_LATEX_FORMAT_H__ #define __KSPREAD_LATEX_FORMAT_H__ -#include <tqtextstream.h> +#include <textstream.h> #include <tqstring.h> #include <tqcolor.h> #include "xmlparser.h" diff --git a/filters/kspread/latex/export/formula.h b/filters/kspread/latex/export/formula.h index 03ba4bd6..b023cdf6 100644 --- a/filters/kspread/latex/export/formula.h +++ b/filters/kspread/latex/export/formula.h @@ -25,7 +25,7 @@ #include "element.h" #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> /***********************************************************************/ /* Class: Formula */ diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc index a7f03f60..7a058550 100644 --- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc +++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc @@ -69,7 +69,7 @@ KSpreadLatexExportDiaImpl::KSpreadLatexExportDiaImpl(KoStore* in, TQWidget* pare TQString value; while(i < 10) { - /*value = _config->readPathEntry( TQString("Recent%1").tqarg(i) ); + /*value = _config->readPathEntry( TQString("Recent%1").arg(i) ); kdDebug(30522) << "recent : " << value << endl; if(!value.isEmpty()) { @@ -99,7 +99,7 @@ KSpreadLatexExportDiaImpl::KSpreadLatexExportDiaImpl(KoStore* in, TQWidget* pare classComboBox->insertItem("report"); classComboBox->insertItem("slides"); - encodingComboBox->insertItem("tqunicode"); + encodingComboBox->insertItem("unicode"); encodingComboBox->insertItem("ansinew"); encodingComboBox->insertItem("applemac"); encodingComboBox->insertItem("ascii"); diff --git a/filters/kspread/latex/export/latexexport.cc b/filters/kspread/latex/export/latexexport.cc index 66927728..c1cdd389 100644 --- a/filters/kspread/latex/export/latexexport.cc +++ b/filters/kspread/latex/export/latexexport.cc @@ -24,7 +24,7 @@ #include <kgenericfactory.h> #include <kglobal.h> #include <klocale.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include "kspreadlatexexportdiaImpl.h" typedef KGenericFactory<LATEXExport, KoFilter> LATEXExportFactory; @@ -35,7 +35,7 @@ LATEXExport::LATEXExport(KoFilter *, const char *, const TQStringList&) : KoFilter() { } -KoFilter::ConversiontqStatus LATEXExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus LATEXExport::convert( const TQCString& from, const TQCString& to ) { TQString config; diff --git a/filters/kspread/latex/export/latexexport.h b/filters/kspread/latex/export/latexexport.h index e7c0312b..4d34e0f0 100644 --- a/filters/kspread/latex/export/latexexport.h +++ b/filters/kspread/latex/export/latexexport.h @@ -21,7 +21,7 @@ #define __LATEXEXPORT_H__ #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfile.h> #include <tqobject.h> @@ -38,7 +38,7 @@ class LATEXExport : public KoFilter LATEXExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~LATEXExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif /* __LATEXExport_H__ */ diff --git a/filters/kspread/latex/export/latexexportdia.ui b/filters/kspread/latex/export/latexexportdia.ui index 8c3835ed..741a9c7e 100644 --- a/filters/kspread/latex/export/latexexportdia.ui +++ b/filters/kspread/latex/export/latexexportdia.ui @@ -593,7 +593,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/filters/kspread/latex/export/map.cc b/filters/kspread/latex/export/map.cc index a2256d5e..886f6c11 100644 --- a/filters/kspread/latex/export/map.cc +++ b/filters/kspread/latex/export/map.cc @@ -46,7 +46,7 @@ void Map::analyse(const TQDomNode balise) /* Analyse of the parameters */ kdDebug(30522) << "ANALYSE A MAP" << endl; - /* Analyse of the tqchildren markups */ + /* Analyse of the children markups */ for(int index = 0; index < getNbChild(balise); index++) { // Only tables diff --git a/filters/kspread/latex/export/pen.h b/filters/kspread/latex/export/pen.h index 49da17e0..54792205 100644 --- a/filters/kspread/latex/export/pen.h +++ b/filters/kspread/latex/export/pen.h @@ -23,7 +23,7 @@ #ifndef __KSPREAD_LATEX_PEN_H__ #define __KSPREAD_LATEX_PEN_H__ -#include <tqtextstream.h> +#include <textstream.h> #include <tqstring.h> #include <tqcolor.h> #include "xmlparser.h" diff --git a/filters/kspread/latex/export/spreadsheet.h b/filters/kspread/latex/export/spreadsheet.h index 03984105..dfc2f092 100644 --- a/filters/kspread/latex/export/spreadsheet.h +++ b/filters/kspread/latex/export/spreadsheet.h @@ -23,7 +23,7 @@ #define __KSPREAD_LATEX_SPREADSHEET_H__ #include <tqptrlist.h> -#include <tqtextstream.h> +#include <textstream.h> #include "map.h" #include "config.h" diff --git a/filters/kspread/latex/export/xmlparser.cc b/filters/kspread/latex/export/xmlparser.cc index 6b85f243..fb2c8e1f 100644 --- a/filters/kspread/latex/export/xmlparser.cc +++ b/filters/kspread/latex/export/xmlparser.cc @@ -89,18 +89,18 @@ bool XmlParser::isChild(TQDomNode balise, TQString name) TQDomNode XmlParser::getChild(TQDomNode balise, TQString name, int index) { if(balise.isElement()) { - TQDomNodeList tqchildren = balise.toElement().elementsByTagName(name); - if ( tqchildren.count() ) - return tqchildren.item(index); + TQDomNodeList children = balise.toElement().elementsByTagName(name); + if ( children.count() ) + return children.item(index); } return TQDomNode(); } TQDomNode XmlParser::getChild(TQDomNode balise, int index) { - TQDomNodeList tqchildren = balise.childNodes(); - if ( tqchildren.count() ) - return tqchildren.item(index); + TQDomNodeList children = balise.childNodes(); + if ( children.count() ) + return children.item(index); return TQDomNode(); } diff --git a/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc b/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc index ba56c229..cc7b2b46 100644 --- a/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc +++ b/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc @@ -31,7 +31,7 @@ KSpreadBaseWorker::~KSpreadBaseWorker() { } -KoFilter::ConversiontqStatus KSpreadBaseWorker::startDocument(KSpreadFilterProperty property) { +KoFilter::ConversionStatus KSpreadBaseWorker::startDocument(KSpreadFilterProperty property) { KSpreadFilterProperty::Iterator it; for (it = property.begin(); it != property.end(); ++it) { kdDebug(30508) << "startDocument: " << it.key() << "->" << it.data() << endl; @@ -40,7 +40,7 @@ KoFilter::ConversiontqStatus KSpreadBaseWorker::startDocument(KSpreadFilterPrope } -KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoLog(KSpreadFilterProperty property) { +KoFilter::ConversionStatus KSpreadBaseWorker::startInfoLog(KSpreadFilterProperty property) { KSpreadFilterProperty::Iterator it; for (it = property.begin(); it != property.end(); ++it) { kdDebug(30508) << "startInfoLog: " << it.key() << "->" << it.data() << endl; @@ -49,7 +49,7 @@ KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoLog(KSpreadFilterProper } -KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoAuthor(KSpreadFilterProperty property) { +KoFilter::ConversionStatus KSpreadBaseWorker::startInfoAuthor(KSpreadFilterProperty property) { KSpreadFilterProperty::Iterator it; for (it = property.begin(); it != property.end(); ++it) { kdDebug(30508) << "startInfoAuthor: " << it.key() << "->" << it.data() << endl; @@ -58,7 +58,7 @@ KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoAuthor(KSpreadFilterPro } -KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoAbout(KSpreadFilterProperty property) { +KoFilter::ConversionStatus KSpreadBaseWorker::startInfoAbout(KSpreadFilterProperty property) { KSpreadFilterProperty::Iterator it; for (it = property.begin(); it != property.end(); ++it) { kdDebug(30508) << "startInfoAbout: " << it.key() << "->" << it.data() << endl; @@ -67,7 +67,7 @@ KoFilter::ConversiontqStatus KSpreadBaseWorker::startInfoAbout(KSpreadFilterProp } -KoFilter::ConversiontqStatus KSpreadBaseWorker::startSpreadBook(KSpreadFilterProperty property) { +KoFilter::ConversionStatus KSpreadBaseWorker::startSpreadBook(KSpreadFilterProperty property) { KSpreadFilterProperty::Iterator it; for (it = property.begin(); it != property.end(); ++it) { kdDebug(30508) << "startSpreadBook: " << it.key() << "->" << it.data() << endl; @@ -76,7 +76,7 @@ KoFilter::ConversiontqStatus KSpreadBaseWorker::startSpreadBook(KSpreadFilterPro } -KoFilter::ConversiontqStatus KSpreadBaseWorker::startSpreadSheet(KSpreadFilterProperty property) { +KoFilter::ConversionStatus KSpreadBaseWorker::startSpreadSheet(KSpreadFilterProperty property) { KSpreadFilterProperty::Iterator it; for (it = property.begin(); it != property.end(); ++it) { kdDebug(30508) << "startSpreadSheet: " << it.key() << "->" << it.data() << endl; @@ -85,7 +85,7 @@ KoFilter::ConversiontqStatus KSpreadBaseWorker::startSpreadSheet(KSpreadFilterPr } -KoFilter::ConversiontqStatus KSpreadBaseWorker::startSpreadCell(KSpreadFilterProperty property) { +KoFilter::ConversionStatus KSpreadBaseWorker::startSpreadCell(KSpreadFilterProperty property) { KSpreadFilterProperty::Iterator it; for (it = property.begin(); it != property.end(); ++it) { kdDebug(30508) << "startSpreadCell: " << it.key() << "->" << it.data() << endl; diff --git a/filters/kspread/libkspreadexport/KSpreadBaseWorker.h b/filters/kspread/libkspreadexport/KSpreadBaseWorker.h index 4ba82383..13b3d380 100644 --- a/filters/kspread/libkspreadexport/KSpreadBaseWorker.h +++ b/filters/kspread/libkspreadexport/KSpreadBaseWorker.h @@ -33,13 +33,13 @@ public: KSpreadBaseWorker(); virtual ~KSpreadBaseWorker(); - virtual KoFilter::ConversiontqStatus startDocument(KSpreadFilterProperty property); - virtual KoFilter::ConversiontqStatus startInfoLog(KSpreadFilterProperty property); - virtual KoFilter::ConversiontqStatus startInfoAuthor(KSpreadFilterProperty property); - virtual KoFilter::ConversiontqStatus startInfoAbout(KSpreadFilterProperty property); - virtual KoFilter::ConversiontqStatus startSpreadBook(KSpreadFilterProperty property); - virtual KoFilter::ConversiontqStatus startSpreadSheet(KSpreadFilterProperty property); - virtual KoFilter::ConversiontqStatus startSpreadCell(KSpreadFilterProperty property); + virtual KoFilter::ConversionStatus startDocument(KSpreadFilterProperty property); + virtual KoFilter::ConversionStatus startInfoLog(KSpreadFilterProperty property); + virtual KoFilter::ConversionStatus startInfoAuthor(KSpreadFilterProperty property); + virtual KoFilter::ConversionStatus startInfoAbout(KSpreadFilterProperty property); + virtual KoFilter::ConversionStatus startSpreadBook(KSpreadFilterProperty property); + virtual KoFilter::ConversionStatus startSpreadSheet(KSpreadFilterProperty property); + virtual KoFilter::ConversionStatus startSpreadCell(KSpreadFilterProperty property); }; #endif /* KSPREAD_BASE_WORKER_H */ diff --git a/filters/kspread/libkspreadexport/KSpreadLeader.cc b/filters/kspread/libkspreadexport/KSpreadLeader.cc index 9ba2d874..b1b9a0aa 100644 --- a/filters/kspread/libkspreadexport/KSpreadLeader.cc +++ b/filters/kspread/libkspreadexport/KSpreadLeader.cc @@ -48,8 +48,8 @@ void Leader::setWorker(KSpreadBaseWorker *newWorker) { } -KoFilter::ConversiontqStatus Leader::convert() { - KoFilter::ConversiontqStatus status; +KoFilter::ConversionStatus Leader::convert() { + KoFilter::ConversionStatus status; // Validate the filter chain and the worker if (!m_filterChain) { @@ -122,8 +122,8 @@ KoFilter::ConversiontqStatus Leader::convert() { } -KoFilter::ConversiontqStatus Leader::doInfo(KoDocumentInfo *info) { - KoFilter::ConversiontqStatus status; +KoFilter::ConversionStatus Leader::doInfo(KoDocumentInfo *info) { + KoFilter::ConversionStatus status; #if 0 // this was never used, it's been removed now // Gather data about the document log @@ -164,7 +164,7 @@ KoFilter::ConversiontqStatus Leader::doInfo(KoDocumentInfo *info) { } -KoFilter::ConversiontqStatus Leader::doSpreadBook(KSpreadDoc *document) { +KoFilter::ConversionStatus Leader::doSpreadBook(KSpreadDoc *document) { KSpreadFilterProperty docSpreadBookProperty; docSpreadBookProperty["spreadsheetcount"] = TQString::number(document->map()->count()); docSpreadBookProperty["decimalsymbol"] = document->locale()->decimalSymbol(); @@ -216,7 +216,7 @@ KoFilter::ConversiontqStatus Leader::doSpreadBook(KSpreadDoc *document) { } -KoFilter::ConversiontqStatus Leader::doSpreadSheet(KSpreadSheet *spreadSheet) { +KoFilter::ConversionStatus Leader::doSpreadSheet(KSpreadSheet *spreadSheet) { KSpreadFilterProperty docSpreadSheetProperty; docSpreadSheetProperty["name"] = spreadSheet->tableName(); docSpreadSheetProperty["sizemaxx"] = TQString::number(spreadSheet->sizeMaxX()); @@ -257,7 +257,7 @@ KoFilter::ConversiontqStatus Leader::doSpreadSheet(KSpreadSheet *spreadSheet) { } -KoFilter::ConversiontqStatus Leader::doSpreadCell(Cell*spreadCell, int column, int row) { +KoFilter::ConversionStatus Leader::doSpreadCell(Cell*spreadCell, int column, int row) { KSpreadFilterProperty docSpreadCellProperty; docSpreadCellProperty["column"] = TQString::number(column); docSpreadCellProperty["row"] = TQString::number(row); diff --git a/filters/kspread/libkspreadexport/KSpreadLeader.h b/filters/kspread/libkspreadexport/KSpreadLeader.h index 7e9abfed..eee950b9 100644 --- a/filters/kspread/libkspreadexport/KSpreadLeader.h +++ b/filters/kspread/libkspreadexport/KSpreadLeader.h @@ -78,10 +78,10 @@ private: protected: KSpreadBaseWorker *getWorker() const; - KoFilter::ConversiontqStatus doSpreadCell(Cell *spreadCell, int column, int row); - KoFilter::ConversiontqStatus doSpreadSheet(Sheet *spreadSheet); - KoFilter::ConversiontqStatus doSpreadBook(Doc *document); - KoFilter::ConversiontqStatus doInfo(KoDocumentInfo *info); + KoFilter::ConversionStatus doSpreadCell(Cell *spreadCell, int column, int row); + KoFilter::ConversionStatus doSpreadSheet(Sheet *spreadSheet); + KoFilter::ConversionStatus doSpreadBook(Doc *document); + KoFilter::ConversionStatus doInfo(KoDocumentInfo *info); public: /** @@ -97,7 +97,7 @@ public: * * @return status of the conversion. */ - KoFilter::ConversiontqStatus convert(); + KoFilter::ConversionStatus convert(); }; } // namespace KSpread diff --git a/filters/kspread/opencalc/opencalcexport.cc b/filters/kspread/opencalc/opencalcexport.cc index 9e37597c..ce1a55ad 100644 --- a/filters/kspread/opencalc/opencalcexport.cc +++ b/filters/kspread/opencalc/opencalcexport.cc @@ -83,7 +83,7 @@ OpenCalcExport::OpenCalcExport( KoFilter *, const char *, const TQStringList & ) { } -KoFilter::ConversiontqStatus OpenCalcExport::convert( const TQCString & from, +KoFilter::ConversionStatus OpenCalcExport::convert( const TQCString & from, const TQCString & to ) { /* later... @@ -91,7 +91,7 @@ KoFilter::ConversiontqStatus OpenCalcExport::convert( const TQCString & from, OpenCalcWorker * worker = new OpenCalcWorker(); leader->setWorker( worker ); - KoFilter::ConversiontqStatus status = leader->convert(); + KoFilter::ConversionStatus status = leader->convert(); delete worker; delete leader; @@ -227,7 +227,7 @@ bool OpenCalcExport::exportDocInfo( KoStore * store, const Doc* ksdoc ) data.appendChild( meta.createTextNode( aboutPage->subject() ) ); officeMeta.appendChild( data ); - const TQDateTime dt ( TQDateTime::tqcurrentDateTime() ); + const TQDateTime dt ( TQDateTime::currentDateTime() ); if ( dt.isValid() ) { data = meta.createElement( "dc:date" ); @@ -844,7 +844,7 @@ void OpenCalcExport::exportDefaultCellStyle( TQDomDocument & doc, TQDomElement & TQDomElement style = doc.createElement( "style:properties" ); style.setAttribute( "style:font-name", font.family() ); - style.setAttribute( "fo:font-size", TQString( "%1pt" ).tqarg( font.pointSize() ) ); + style.setAttribute( "fo:font-size", TQString( "%1pt" ).arg( font.pointSize() ) ); style.setAttribute( "style:decimal-places", TQString::number( locale->fracDigits() ) ); style.setAttribute( "fo:language", language ); style.setAttribute( "fo:country", country ); @@ -881,8 +881,8 @@ void OpenCalcExport::exportPageAutoStyles( TQDomDocument & doc, TQDomElement & a height = sheet->print()->paperHeight() / 10; } - TQString sWidth = TQString( "%1cm" ).tqarg( width ); - TQString sHeight = TQString( "%1cm" ).tqarg( height ); + TQString sWidth = TQString( "%1cm" ).arg( width ); + TQString sHeight = TQString( "%1cm" ).arg( height ); TQDomElement pageMaster = doc.createElement( "style:page-master" ); pageMaster.setAttribute( "style:name", "pm1" ); @@ -1073,7 +1073,7 @@ void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc, TQDomElement t = doc.createElement( "text:date" ); t.setAttribute( "text:date-value", "0-00-00" ); // todo: "style:data-style-name", "N2" - t.appendChild( doc.createTextNode( TQDate::tqcurrentDate().toString() ) ); + t.appendChild( doc.createTextNode( TQDate::currentDate().toString() ) ); parent.appendChild( t ); } else if ( var == "<time>" ) diff --git a/filters/kspread/opencalc/opencalcexport.h b/filters/kspread/opencalc/opencalcexport.h index 97832a9a..03cfa245 100644 --- a/filters/kspread/opencalc/opencalcexport.h +++ b/filters/kspread/opencalc/opencalcexport.h @@ -46,7 +46,7 @@ class OpenCalcExport : public KoFilter OpenCalcExport( KoFilter * parent, const char * name, const TQStringList & ); virtual ~OpenCalcExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString & from, + virtual KoFilter::ConversionStatus convert( const TQCString & from, const TQCString & to ); private: diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc index 376a8f77..60412181 100644 --- a/filters/kspread/opencalc/opencalcimport.cc +++ b/filters/kspread/opencalc/opencalcimport.cc @@ -168,7 +168,7 @@ bool OpenCalcImport::readRowFormat( TQDomElement & rowNode, TQDomElement * rowSt double height = -1.0; bool insertPageBreak = false; - Format tqlayout( table, table->doc()->styleManager()->defaultStyle() ); + Format layout( table, table->doc()->styleManager()->defaultStyle() ); while( !node.isNull() ) { @@ -190,7 +190,7 @@ bool OpenCalcImport::readRowFormat( TQDomElement & rowNode, TQDomElement * rowSt } } - loadStyleProperties( &tqlayout, property ); + loadStyleProperties( &layout, property ); } node = node.nextSibling(); @@ -219,7 +219,7 @@ bool OpenCalcImport::readRowFormat( TQDomElement & rowNode, TQDomElement * rowSt for ( int i = 0; i < number; ++i ) { RowFormat * rowL = table->nonDefaultRowFormat( row ); - rowL->copy( tqlayout ); + rowL->copy( layout ); if ( height != -1 ) { @@ -480,10 +480,10 @@ bool OpenCalcImport::readCells( TQDomElement & rowNode, Sheet * table, int row, psName = e.attributeNS( ooNS::style, "parent-style-name", TQString() ); kdDebug(30518) << "Default style: " << psName << endl; - Format * tqlayout = m_defaultStyles[psName]; + Format * layout = m_defaultStyles[psName]; - if ( tqlayout ) - cell->format()->copy( *tqlayout ); + if ( layout ) + cell->format()->copy( *layout ); TQDomElement * st = 0; if ( e.hasAttributeNS( ooNS::table, "style-name" ) ) @@ -548,10 +548,10 @@ bool OpenCalcImport::readCells( TQDomElement & rowNode, Sheet * table, int row, TQString psName( "Default" ); kdDebug(30518) << "Default style: " << psName << endl; - Format * tqlayout = m_defaultStyles[psName]; + Format * layout = m_defaultStyles[psName]; - if ( tqlayout ) - cell->format()->copy( *tqlayout ); + if ( layout ) + cell->format()->copy( *layout ); } if ( e.hasAttributeNS( ooNS::table, "formula" ) ) { @@ -959,16 +959,16 @@ bool OpenCalcImport::readRowsAndCells( TQDomElement & content, Sheet * table ) return false; RowFormat * srcLayout = table->nonDefaultRowFormat( backupRow ); - RowFormat * tqlayout = 0; + RowFormat * layout = 0; if ( collapsed ) srcLayout->setHide( true ); for ( i = 1; i < number; ++i ) { - tqlayout = table->nonDefaultRowFormat( backupRow + i ); + layout = table->nonDefaultRowFormat( backupRow + i ); - tqlayout->copy( *srcLayout ); + layout->copy( *srcLayout ); /* * TODO: Test: do we need to copy the cells, too? @@ -1047,14 +1047,14 @@ bool OpenCalcImport::readColLayouts( TQDomElement & content, Sheet * table ) if ( st && !st->isNull() ) { - Format * tqlayout = new Format( 0, m_doc->styleManager()->defaultStyle() ); + Format * layout = new Format( 0, m_doc->styleManager()->defaultStyle() ); - readInStyle( tqlayout, *st ); + readInStyle( layout, *st ); - m_defaultStyles.insert( name, tqlayout ); + m_defaultStyles.insert( name, layout ); kdDebug(30518) << "Insert default cell style: " << name << endl; - defaultStyle = tqlayout; + defaultStyle = layout; } } @@ -1281,7 +1281,7 @@ void OpenCalcImport::loadOasisMasterLayoutPage( Sheet * table,KoStyleStack &styl TQString orientation = "Portrait"; TQString format; - // Laurent : Why we stored tqlayout information as Millimeter ?!!!!! + // Laurent : Why we stored layout information as Millimeter ?!!!!! // kspread used point for all other attribute // I don't understand :( if ( styleStack.hasAttributeNS( ooNS::fo, "page-width" ) ) @@ -1387,7 +1387,7 @@ void OpenCalcImport::loadOasisMasterLayoutPage( Sheet * table,KoStyleStack &styl kdDebug(30518)<<" table-centering unknown :"<<str<<endl; #endif } - format = TQString( "%1x%2" ).tqarg( width ).tqarg( height ); + format = TQString( "%1x%2" ).arg( width ).arg( height ); kdDebug(30518)<<" format : "<<format<<endl; table->print()->setPaperLayout( left, top, right, bottom, format, orientation ); @@ -1962,32 +1962,32 @@ TQString * OpenCalcImport::loadFormat( TQDomElement * element, return format; } -void OpenCalcImport::loadFontStyle( Format * tqlayout, TQDomElement const * font ) const +void OpenCalcImport::loadFontStyle( Format * layout, TQDomElement const * font ) const { - if ( !font || !tqlayout ) + if ( !font || !layout ) return; - kdDebug(30518) << "Copy font style from the tqlayout " << font->tagName() << ", " << font->nodeName() << endl; + kdDebug(30518) << "Copy font style from the layout " << font->tagName() << ", " << font->nodeName() << endl; if ( font->hasAttributeNS( ooNS::fo, "font-family" ) ) - tqlayout->setTextFontFamily( font->attributeNS( ooNS::fo, "font-family", TQString() ) ); + layout->setTextFontFamily( font->attributeNS( ooNS::fo, "font-family", TQString() ) ); if ( font->hasAttributeNS( ooNS::fo, "color" ) ) - tqlayout->setTextColor( TQColor( font->attributeNS( ooNS::fo, "color", TQString() ) ) ); + layout->setTextColor( TQColor( font->attributeNS( ooNS::fo, "color", TQString() ) ) ); if ( font->hasAttributeNS( ooNS::fo, "font-size" ) ) - tqlayout->setTextFontSize( int( KoUnit::parseValue( font->attributeNS( ooNS::fo, "font-size", TQString() ), 10 ) ) ); + layout->setTextFontSize( int( KoUnit::parseValue( font->attributeNS( ooNS::fo, "font-size", TQString() ), 10 ) ) ); else - tqlayout->setTextFontSize( 10 ); + layout->setTextFontSize( 10 ); if ( font->hasAttributeNS( ooNS::fo, "font-style" ) ) { kdDebug(30518) << "italic" << endl; - tqlayout->setTextFontItalic( true ); // only thing we support + layout->setTextFontItalic( true ); // only thing we support } if ( font->hasAttributeNS( ooNS::fo, "font-weight" ) ) - tqlayout->setTextFontBold( true ); // only thing we support + layout->setTextFontBold( true ); // only thing we support if ( font->hasAttributeNS( ooNS::fo, "text-underline" ) || font->hasAttributeNS( ooNS::style, "text-underline" ) ) - tqlayout->setTextFontUnderline( true ); // only thing we support + layout->setTextFontUnderline( true ); // only thing we support if ( font->hasAttributeNS( ooNS::style, "text-crossing-out" ) ) - tqlayout->setTextFontStrike( true ); // only thing we support + layout->setTextFontStrike( true ); // only thing we support if ( font->hasAttributeNS( ooNS::style, "font-pitch" ) ) { // TODO: possible values: fixed, variable @@ -1996,7 +1996,7 @@ void OpenCalcImport::loadFontStyle( Format * tqlayout, TQDomElement const * font // text-underline-color } -void OpenCalcImport::loadBorder( Format * tqlayout, TQString const & borderDef, bPos pos ) const +void OpenCalcImport::loadBorder( Format * layout, TQString const & borderDef, bPos pos ) const { if ( borderDef == "none" ) return; @@ -2038,24 +2038,24 @@ void OpenCalcImport::loadBorder( Format * tqlayout, TQString const & borderDef, pen.setColor( TQColor( borderDef.right( p - p2 ) ) ); if ( pos == Left ) - tqlayout->setLeftBorderPen( pen ); + layout->setLeftBorderPen( pen ); else if ( pos == Top ) - tqlayout->setTopBorderPen( pen ); + layout->setTopBorderPen( pen ); else if ( pos == Right ) - tqlayout->setRightBorderPen( pen ); + layout->setRightBorderPen( pen ); else if ( pos == Bottom ) - tqlayout->setBottomBorderPen( pen ); + layout->setBottomBorderPen( pen ); else if ( pos == Border ) { - tqlayout->setLeftBorderPen( pen ); - tqlayout->setTopBorderPen( pen ); - tqlayout->setRightBorderPen( pen ); - tqlayout->setBottomBorderPen( pen ); + layout->setLeftBorderPen( pen ); + layout->setTopBorderPen( pen ); + layout->setRightBorderPen( pen ); + layout->setBottomBorderPen( pen ); } // TODO Diagonals not supported by oocalc } -void OpenCalcImport::loadStyleProperties( Format * tqlayout, TQDomElement const & property ) const +void OpenCalcImport::loadStyleProperties( Format * layout, TQDomElement const & property ) const { kdDebug(30518) << "*** Loading style properties *****" << endl; @@ -2064,16 +2064,16 @@ void OpenCalcImport::loadStyleProperties( Format * tqlayout, TQDomElement const bool ok = false; int p = property.attributeNS( ooNS::style, "decimal-places", TQString() ).toInt( &ok ); if (ok ) - tqlayout->setPrecision( p ); + layout->setPrecision( p ); } if ( property.hasAttributeNS( ooNS::style, "font-name" ) ) { TQDomElement * font = m_styles[ property.attributeNS( ooNS::style, "font-name", TQString() ) ]; - loadFontStyle( tqlayout, font ); // generell font style + loadFontStyle( layout, font ); // generell font style } - loadFontStyle( tqlayout, &property ); // specific font style + loadFontStyle( layout, &property ); // specific font style // TODO: // diagonal: fall + goup @@ -2090,133 +2090,133 @@ void OpenCalcImport::loadStyleProperties( Format * tqlayout, TQDomElement const bool ok = false; int a = property.attributeNS( ooNS::style, "rotation-angle", TQString() ).toInt( &ok ); if ( ok ) - tqlayout->setAngle( -a + 1 ); + layout->setAngle( -a + 1 ); } if ( property.hasAttributeNS( ooNS::fo, "direction" ) ) { - tqlayout->setVerticalText( true ); + layout->setVerticalText( true ); } if ( property.hasAttributeNS( ooNS::fo, "text-align" ) ) { TQString s = property.attributeNS( ooNS::fo, "text-align", TQString() ); if ( s == "center" ) - tqlayout->setAlign( Format::Center ); + layout->setAlign( Format::Center ); else if ( s == "end" ) - tqlayout->setAlign( Format::Right ); + layout->setAlign( Format::Right ); else if ( s == "start" ) - tqlayout->setAlign( Format::Left ); + layout->setAlign( Format::Left ); else if ( s == "justify" ) // TODO in KSpread! - tqlayout->setAlign( Format::Center ); + layout->setAlign( Format::Center ); } if ( property.hasAttributeNS( ooNS::fo, "margin-left" ) ) { kdDebug(30518)<<"margin-left :"<<KoUnit::parseValue( property.attributeNS( ooNS::fo, "margin-left", TQString() ),0.0 )<<endl; - tqlayout->setIndent( KoUnit::parseValue( property.attributeNS( ooNS::fo, "margin-left", TQString() ),0.0 ) ); + layout->setIndent( KoUnit::parseValue( property.attributeNS( ooNS::fo, "margin-left", TQString() ),0.0 ) ); } if ( property.hasAttributeNS( ooNS::fo, "background-color" ) ) - tqlayout->setBgColor( TQColor( property.attributeNS( ooNS::fo, "background-color", TQString() ) ) ); + layout->setBgColor( TQColor( property.attributeNS( ooNS::fo, "background-color", TQString() ) ) ); if ( property.hasAttributeNS( ooNS::style, "print-content" ) ) { if ( property.attributeNS( ooNS::style, "print-content", TQString() ) == "false" ) - tqlayout->setDontPrintText( false ); + layout->setDontPrintText( false ); } if ( property.hasAttributeNS( ooNS::style, "cell-protect" ) ) { TQString prot( property.attributeNS( ooNS::style, "cell-protect", TQString() ) ); if ( prot == "none" ) { - tqlayout->setNotProtected( true ); - tqlayout->setHideFormula( false ); - tqlayout->setHideAll( false ); + layout->setNotProtected( true ); + layout->setHideFormula( false ); + layout->setHideAll( false ); } else if ( prot == "formula-hidden" ) { - tqlayout->setNotProtected( true ); - tqlayout->setHideFormula( true ); - tqlayout->setHideAll( false ); + layout->setNotProtected( true ); + layout->setHideFormula( true ); + layout->setHideAll( false ); } else if ( prot == "protected formula-hidden" ) { - tqlayout->setNotProtected( false ); - tqlayout->setHideFormula( true ); - tqlayout->setHideAll( false ); + layout->setNotProtected( false ); + layout->setHideFormula( true ); + layout->setHideAll( false ); } else if ( prot == "hidden-and-protected" ) { - tqlayout->setNotProtected( false ); - tqlayout->setHideFormula( false ); - tqlayout->setHideAll( true ); + layout->setNotProtected( false ); + layout->setHideFormula( false ); + layout->setHideAll( true ); } else if ( prot == "protected" ) { - tqlayout->setNotProtected( false ); - tqlayout->setHideFormula( false ); - tqlayout->setHideAll( false ); + layout->setNotProtected( false ); + layout->setHideFormula( false ); + layout->setHideAll( false ); } kdDebug(30518) << "Cell " << prot << endl; } if ( property.hasAttributeNS( ooNS::fo, "padding-left" ) ) - tqlayout->setIndent( KoUnit::parseValue(property.attributeNS( ooNS::fo, "padding-left", TQString() ) ) ); + layout->setIndent( KoUnit::parseValue(property.attributeNS( ooNS::fo, "padding-left", TQString() ) ) ); if ( property.hasAttributeNS( ooNS::fo, "vertical-align" ) ) { TQString s = property.attributeNS( ooNS::fo, "vertical-align", TQString() ); if ( s == "middle" ) - tqlayout->setAlignY( Format::Middle ); + layout->setAlignY( Format::Middle ); else if ( s == "bottom" ) - tqlayout->setAlignY( Format::Bottom ); + layout->setAlignY( Format::Bottom ); else - tqlayout->setAlignY( Format::Top ); + layout->setAlignY( Format::Top ); } else - tqlayout->setAlignY( Format::Bottom ); + layout->setAlignY( Format::Bottom ); if ( property.hasAttributeNS( ooNS::fo, "wrap-option" ) ) { - tqlayout->setMultiRow( true ); + layout->setMultiRow( true ); /* we do not support anything else yet TQString s = property.attributeNS( ooNS::fo, "wrap-option", TQString() ); if ( s == "wrap" ) - tqlayout->setMultiRow( true ); + layout->setMultiRow( true ); */ } if ( property.hasAttributeNS( ooNS::fo, "border-bottom" ) ) { - loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border-bottom", TQString() ), Bottom ); + loadBorder( layout, property.attributeNS( ooNS::fo, "border-bottom", TQString() ), Bottom ); // TODO: style:border-line-width-bottom if double! } if ( property.hasAttributeNS( ooNS::fo, "border-right" ) ) { - loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border-right", TQString() ), Right ); + loadBorder( layout, property.attributeNS( ooNS::fo, "border-right", TQString() ), Right ); // TODO: style:border-line-width-right } if ( property.hasAttributeNS( ooNS::fo, "border-top" ) ) { - loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border-top", TQString() ), Top ); + loadBorder( layout, property.attributeNS( ooNS::fo, "border-top", TQString() ), Top ); // TODO: style:border-line-width-top } if ( property.hasAttributeNS( ooNS::fo, "border-left" ) ) { - loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border-left", TQString() ), Left ); + loadBorder( layout, property.attributeNS( ooNS::fo, "border-left", TQString() ), Left ); // TODO: style:border-line-width-left } if ( property.hasAttributeNS( ooNS::fo, "border" ) ) { - loadBorder( tqlayout, property.attributeNS( ooNS::fo, "border", TQString() ), Border ); + loadBorder( layout, property.attributeNS( ooNS::fo, "border", TQString() ), Border ); // TODO: style:border-line-width-left } } -void OpenCalcImport::readInStyle( Format * tqlayout, TQDomElement const & style ) +void OpenCalcImport::readInStyle( Format * layout, TQDomElement const & style ) { kdDebug(30518) << "** Reading Style: " << style.tagName() << "; " << style.attributeNS( ooNS::style, "name", TQString()) << endl; if ( style.localName() == "style" && style.namespaceURI()==ooNS::style) @@ -2225,20 +2225,20 @@ void OpenCalcImport::readInStyle( Format * tqlayout, TQDomElement const & style { Format * cp = m_defaultStyles.find( style.attributeNS( ooNS::style, "parent-style-name", TQString() ) ); - kdDebug(30518) << "Copying tqlayout from " << style.attributeNS( ooNS::style, "parent-style-name", TQString() ) << endl; + kdDebug(30518) << "Copying layout from " << style.attributeNS( ooNS::style, "parent-style-name", TQString() ) << endl; if ( cp != 0 ) - tqlayout->copy( *cp ); + layout->copy( *cp ); } else if ( style.hasAttributeNS( ooNS::style, "family") ) { TQString name = style.attribute( "style-family" ) + "default"; Format * cp = m_defaultStyles.find( name ); - kdDebug(30518) << "Copying tqlayout from " << name << ", " << !cp << endl; + kdDebug(30518) << "Copying layout from " << name << ", " << !cp << endl; if ( cp != 0 ) - tqlayout->copy( *cp ); + layout->copy( *cp ); } if ( style.hasAttributeNS( ooNS::style, "data-style-name" ) ) @@ -2255,8 +2255,8 @@ void OpenCalcImport::readInStyle( Format * tqlayout, TQDomElement const & style if ( format ) { - tqlayout->setFormatString( *format ); - tqlayout->setFormatType( formatType ); + layout->setFormatString( *format ); + layout->setFormatType( formatType ); } // <number:currency-symbol number:language="de" number:country="DE">€</number:currency-symbol> @@ -2267,9 +2267,9 @@ void OpenCalcImport::readInStyle( Format * tqlayout, TQDomElement const & style forEachElement( property, style ) { if ( property.localName() == "properties" && property.namespaceURI() == ooNS::style ) - loadStyleProperties( tqlayout, property ); + loadStyleProperties( layout, property ); - kdDebug(30518) << tqlayout->textFontFamily( 0, 0 ) << endl; + kdDebug(30518) << layout->textFontFamily( 0, 0 ) << endl; } } @@ -2289,7 +2289,7 @@ bool OpenCalcImport::createStyleMap( TQDomDocument const & styles ) if ( d > 1.0 ) { TQString message( i18n("This document was created with OpenOffice.org version '%1'. This filter was written for version 1.0. Reading this file could cause strange behavior, crashes or incorrect display of the data. Do you want to continue converting the document?") ); - message.tqarg( content.attributeNS( ooNS::office, "version", TQString() ) ); + message.arg( content.attributeNS( ooNS::office, "version", TQString() ) ); if ( KMessageBox::warningYesNo( 0, message, i18n( "Unsupported document version" ) ) == KMessageBox::No ) return false; } @@ -2358,13 +2358,13 @@ bool OpenCalcImport::createStyleMap( TQDomDocument const & styles ) if ( !e.isNull() ) { - Format * tqlayout = new Format( 0, m_doc->styleManager()->defaultStyle() ); + Format * layout = new Format( 0, m_doc->styleManager()->defaultStyle() ); - readInStyle( tqlayout, e ); + readInStyle( layout, e ); kdDebug(30518) << "Default style " << e.attributeNS( ooNS::style, "family", TQString() ) << "default" << " loaded " << endl; - m_defaultStyles.insert( e.attributeNS( ooNS::style, "family", TQString() ) + "default", tqlayout ); - // TQFont font = tqlayout->font(); + m_defaultStyles.insert( e.attributeNS( ooNS::style, "family", TQString() ) + "default", layout ); + // TQFont font = layout->font(); // kdDebug(30518) << "Font: " << font.family() << ", " << font.toString() << endl; } @@ -2384,12 +2384,12 @@ bool OpenCalcImport::createStyleMap( TQDomDocument const & styles ) continue; } - Format * tqlayout = new Format( 0, m_doc->styleManager()->defaultStyle() ); - readInStyle( tqlayout, defs ); + Format * layout = new Format( 0, m_doc->styleManager()->defaultStyle() ); + readInStyle( layout, defs ); kdDebug(30518) << "Default style " << defs.attributeNS( ooNS::style, "name", TQString() ) << " loaded " << endl; - m_defaultStyles.insert( defs.attributeNS( ooNS::style, "name", TQString() ), tqlayout ); - // kdDebug(30518) << "Font: " << tqlayout->font().family() << ", " << tqlayout->font().toString() << endl; + m_defaultStyles.insert( defs.attributeNS( ooNS::style, "name", TQString() ), layout ); + // kdDebug(30518) << "Font: " << layout->font().family() << ", " << layout->font().toString() << endl; defs = defs.nextSibling().toElement(); } @@ -2735,7 +2735,7 @@ int OpenCalcImport::readMetaData() return result; } -KoFilter::ConversiontqStatus OpenCalcImport::convert( TQCString const & from, TQCString const & to ) +KoFilter::ConversionStatus OpenCalcImport::convert( TQCString const & from, TQCString const & to ) { kdDebug(30518) << "Entering OpenCalc Import filter: " << from << " - " << to << endl; @@ -2765,10 +2765,10 @@ KoFilter::ConversiontqStatus OpenCalcImport::convert( TQCString const & from, TQ kdDebug(30518) << "Opening file " << endl; - KoFilter::ConversiontqStatus pretqStatus = openFile(); + KoFilter::ConversionStatus preStatus = openFile(); - if ( pretqStatus != KoFilter::OK ) - return pretqStatus; + if ( preStatus != KoFilter::OK ) + return preStatus; emit sigProgress( 13 ); int tables = readMetaData(); @@ -2782,7 +2782,7 @@ KoFilter::ConversiontqStatus OpenCalcImport::convert( TQCString const & from, TQ return KoFilter::OK; } -KoFilter::ConversiontqStatus OpenCalcImport::openFile() +KoFilter::ConversionStatus OpenCalcImport::openFile() { KoStore * store = KoStore::createStore( m_chain->inputFile(), KoStore::Read); @@ -2817,7 +2817,7 @@ KoFilter::ConversiontqStatus OpenCalcImport::openFile() return KoFilter::OK; } -KoFilter::ConversiontqStatus OpenCalcImport::loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store ) +KoFilter::ConversionStatus OpenCalcImport::loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store ) { return OoUtils::loadAndParse( fileName, doc, m_store); } diff --git a/filters/kspread/opencalc/opencalcimport.h b/filters/kspread/opencalc/opencalcimport.h index cd1f23b6..8965dae5 100644 --- a/filters/kspread/opencalc/opencalcimport.h +++ b/filters/kspread/opencalc/opencalcimport.h @@ -47,7 +47,7 @@ class OpenCalcImport : public KoFilter OpenCalcImport( KoFilter * parent, const char * name, const TQStringList & ); virtual ~OpenCalcImport(); - virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to ); + virtual KoFilter::ConversionStatus convert( TQCString const & from, TQCString const & to ); private: @@ -90,10 +90,10 @@ class OpenCalcImport : public KoFilter bool readRowsAndCells( TQDomElement & content, KSpread::Sheet * table ); bool readCells( TQDomElement & rowNode, KSpread::Sheet * table, int row, int & columns ); void convertFormula( TQString & text, TQString const & f ) const; - void loadFontStyle( KSpread::Format * tqlayout, TQDomElement const * font ) const; - void readInStyle( KSpread::Format * tqlayout, TQDomElement const & style ); - void loadStyleProperties( KSpread::Format * tqlayout, TQDomElement const & property ) const; - void loadBorder( KSpread::Format * tqlayout, TQString const & borderDef, bPos pos ) const; + void loadFontStyle( KSpread::Format * layout, TQDomElement const * font ) const; + void readInStyle( KSpread::Format * layout, TQDomElement const & style ); + void loadStyleProperties( KSpread::Format * layout, TQDomElement const & property ) const; + void loadBorder( KSpread::Format * layout, TQString const & borderDef, bPos pos ) const; void loadTableMasterStyle( KSpread::Sheet * table, TQString const & stylename ); TQString * loadFormat( TQDomElement * element, KSpread::FormatType & formatType, @@ -111,9 +111,9 @@ class OpenCalcImport : public KoFilter void loadOasisConditionValue( const TQString &styleCondition, KSpread::Conditional &newCondition ); void loadOasisCondition( TQString &valExpression, KSpread::Conditional &newCondition ); void loadOasisValidationValue( const TQStringList &listVal, KSpread::Conditional &newCondition ); - KoFilter::ConversiontqStatus loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store ); + KoFilter::ConversionStatus loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store ); - KoFilter::ConversiontqStatus openFile(); + KoFilter::ConversionStatus openFile(); }; #endif // OpenCalc_IMPORT_H__ diff --git a/filters/kspread/opencalc/opencalcstyleexport.cc b/filters/kspread/opencalc/opencalcstyleexport.cc index f075713a..9585ae13 100644 --- a/filters/kspread/opencalc/opencalcstyleexport.cc +++ b/filters/kspread/opencalc/opencalcstyleexport.cc @@ -111,7 +111,7 @@ TQString OpenCalcStyles::cellStyle( CellStyle const & cs ) m_cellStyles.append( t ); - t->name = TQString( "ce%1" ).tqarg( m_cellStyles.count() ); + t->name = TQString( "ce%1" ).arg( m_cellStyles.count() ); return t->name; } @@ -132,7 +132,7 @@ TQString OpenCalcStyles::columnStyle( ColumnStyle const & cs ) m_columnStyles.append( t ); - t->name = TQString( "co%1" ).tqarg( m_columnStyles.count() ); + t->name = TQString( "co%1" ).arg( m_columnStyles.count() ); return t->name; } @@ -158,7 +158,7 @@ TQString OpenCalcStyles::rowStyle( RowStyle const & rs ) m_rowStyles.append( t ); - t->name = TQString( "ro%1" ).tqarg( m_rowStyles.count() ); + t->name = TQString( "ro%1" ).arg( m_rowStyles.count() ); return t->name; } @@ -179,14 +179,14 @@ TQString OpenCalcStyles::sheetStyle( SheetStyle const & ts ) m_sheetStyles.append( t ); - t->name = TQString( "ta%1" ).tqarg( m_sheetStyles.count() ); + t->name = TQString( "ta%1" ).arg( m_sheetStyles.count() ); return t->name; } TQString convertPenToString( TQPen const & pen ) { - TQString s( TQString( "%1cm solid " ).tqarg( pen.width() * 0.035 ) ); + TQString s( TQString( "%1cm solid " ).arg( pen.width() * 0.035 ) ); s += pen.color().name(); return s; @@ -212,7 +212,7 @@ void OpenCalcStyles::addCellStyles( TQDomDocument & doc, TQDomElement & autoStyl if ( t->font.bold() != m_defaultFont.bold() ) prop.setAttribute( "fo:font-weight", ( t->font.bold() ? "bold" : "light" ) ); - prop.setAttribute( "fo:font-size", TQString( "%1pt" ).tqarg( t->font.pointSize() ) ); + prop.setAttribute( "fo:font-size", TQString( "%1pt" ).arg( t->font.pointSize() ) ); if ( t->font.underline() != m_defaultFont.underline() ) { @@ -250,7 +250,7 @@ void OpenCalcStyles::addCellStyles( TQDomDocument & doc, TQDomElement & autoStyl if ( t->indent > 0.0 ) { - prop.setAttribute( "fo:margin-left", TQString( "%1pt" ).tqarg( t->indent ) ); + prop.setAttribute( "fo:margin-left", TQString( "%1pt" ).arg( t->indent ) ); if ( t->alignX == Format::Undefined ) prop.setAttribute( "fo:text-align", "start" ); } @@ -323,7 +323,7 @@ void OpenCalcStyles::addColumnStyles( TQDomDocument & doc, TQDomElement & autoSt TQDomElement prop = doc.createElement( "style:properties" ); if ( t->breakB != ::Style::none ) prop.setAttribute( "fo:break-before", ( t->breakB == ::Style::automatic ? "auto" : "page" ) ); - prop.setAttribute( "style:column-width", TQString( "%1cm" ).tqarg( t->size ) ); + prop.setAttribute( "style:column-width", TQString( "%1cm" ).arg( t->size ) ); ts.appendChild( prop ); autoStyles.appendChild( ts ); @@ -346,7 +346,7 @@ void OpenCalcStyles::addRowStyles( TQDomDocument & doc, TQDomElement & autoStyle ts.setAttribute( "style:family", "table-row" ); TQDomElement prop = doc.createElement( "style:properties" ); - prop.setAttribute( "style:row-height", TQString( "%1cm" ).tqarg( t->size ) ); + prop.setAttribute( "style:row-height", TQString( "%1cm" ).arg( t->size ) ); if ( t->breakB != ::Style::none ) prop.setAttribute( "fo:break-before", ( t->breakB == ::Style::automatic ? "auto" : "page" ) ); diff --git a/filters/kspread/opencalc/status.html b/filters/kspread/opencalc/status.html index dfaed8a4..b23f6ae9 100644 --- a/filters/kspread/opencalc/status.html +++ b/filters/kspread/opencalc/status.html @@ -51,7 +51,7 @@ KOffice filters status: OpenOffice.org Calc</h1></center> Borders, background colors<br> column width, row width<br> column layouts, row layouts<br> - page tqlayout (size, border)<br> + page layout (size, border)<br> OpenCalc style import, default style<br> format string translating (not supported by KSpread yet, but this filter produces these strings => needs enhancements in KSpread)<br> header, footer (including macros)<br> @@ -139,7 +139,7 @@ KOffice filters status: OpenOffice.org Calc</h1></center> Page sizes, header and footer (including variable converting)<br> Font (sizes, attributes, color)<br> Background color<br> - Text tqalignment, angle, vertical text, text wrap and indents<br> + Text alignment, angle, vertical text, text wrap and indents<br> Merged Cells<br> DontPrint flag<br> Comments<br> @@ -169,10 +169,10 @@ KOffice filters status: OpenOffice.org Calc</h1></center> <td> Jan 12, 2003 - Initial Revision<br> - Jan 18, 2003 - page tqlayout, header, footer<br> + Jan 18, 2003 - page layout, header, footer<br> Jan 19, 2003 - Added support for fonts, text color, background color, formula conversion<br> - Jan 19, 2003 - text tqalignment, indents, comments, NoPrint, Merged Cells<br> + Jan 19, 2003 - text alignment, indents, comments, NoPrint, Merged Cells<br> Jan 19, 2003 - angle, vertical text, text wrap<br> Jan 19, 2003 - named area, hidden columns and rows<br> Jan 20, 2003 - cell borders<br> diff --git a/filters/kspread/qpro/qproimport.cc b/filters/kspread/qpro/qproimport.cc index 9a0db4fa..920d20a7 100644 --- a/filters/kspread/qpro/qproimport.cc +++ b/filters/kspread/qpro/qproimport.cc @@ -94,7 +94,7 @@ QpImport::InitTableName(int pIdx, TQString& pResult) } } -KoFilter::ConversiontqStatus QpImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus QpImport::convert( const TQCString& from, const TQCString& to ) { bool bSuccess=true; diff --git a/filters/kspread/qpro/qproimport.h b/filters/kspread/qpro/qproimport.h index 1c3c7d85..e69d2a65 100644 --- a/filters/kspread/qpro/qproimport.h +++ b/filters/kspread/qpro/qproimport.h @@ -37,7 +37,7 @@ public: QpImport(KoFilter* parent, const char* name, const TQStringList&); virtual ~QpImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); void InitTableName(int pIdx, TQString& pResult); }; diff --git a/filters/kugar/kugarnop/kugarnopimport.cpp b/filters/kugar/kugarnop/kugarnopimport.cpp index f8ad242c..f3b132db 100644 --- a/filters/kugar/kugarnop/kugarnopimport.cpp +++ b/filters/kugar/kugarnop/kugarnopimport.cpp @@ -31,7 +31,7 @@ KugarNOPImport::KugarNOPImport( KoFilter *, const char *, const TQStringList& ) { } -KoFilter::ConversiontqStatus KugarNOPImport::convert( const TQCString& /*from*/, const TQCString& /*to*/ ) +KoFilter::ConversionStatus KugarNOPImport::convert( const TQCString& /*from*/, const TQCString& /*to*/ ) { TQFile in( m_chain->inputFile()); diff --git a/filters/kugar/kugarnop/kugarnopimport.h b/filters/kugar/kugarnop/kugarnopimport.h index 03085410..a7099bc4 100644 --- a/filters/kugar/kugarnop/kugarnopimport.h +++ b/filters/kugar/kugarnop/kugarnopimport.h @@ -28,7 +28,7 @@ class KugarNOPImport : public KoFilter public: KugarNOPImport( KoFilter *parent, const char *name, const TQStringList& ); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; diff --git a/filters/kword/abiword/ImportField.cc b/filters/kword/abiword/ImportField.cc index dfba826d..5e875ecd 100644 --- a/filters/kword/abiword/ImportField.cc +++ b/filters/kword/abiword/ImportField.cc @@ -26,7 +26,7 @@ TQString getFootnoteFramesetName(const TQString& id) { - return i18n("Frameset name","Footnote %1").tqarg(id); + return i18n("Frameset name","Footnote %1").arg(id); } static void InsertTimeVariable(TQDomDocument& mainDocument, diff --git a/filters/kword/abiword/ImportFormatting.cc b/filters/kword/abiword/ImportFormatting.cc index 1687e958..7c45f07a 100644 --- a/filters/kword/abiword/ImportFormatting.cc +++ b/filters/kword/abiword/ImportFormatting.cc @@ -208,7 +208,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& layoutElement, followingElement.setAttribute("name","Normal"); layoutElement.appendChild(followingElement); } - // Else: we are a tqlayout, so we leave the work to KWord (from the style) + // Else: we are a layout, so we leave the work to KWord (from the style) } else { diff --git a/filters/kword/abiword/ImportStyle.cc b/filters/kword/abiword/ImportStyle.cc index 4f84a8e4..5a08cf0d 100644 --- a/filters/kword/abiword/ImportStyle.cc +++ b/filters/kword/abiword/ImportStyle.cc @@ -121,7 +121,7 @@ void StyleDataMap::defineDefaultStyles(void) defineNewStyle("Block Text",-1,"margin-left: 1in; margin-right: 1in; margin-bottom: 6pt"); TQFontInfo fixedInfo(KGlobalSettings::fixedFont()); TQString strPlainText=TQString("font-family: %1") - .tqarg(fixedInfo.family()); // TODO: should be "Courier New" + .arg(fixedInfo.family()); // TODO: should be "Courier New" kdDebug(30506) << "Plain Text: " << strPlainText << endl; defineNewStyle("Plain Text",-1,strPlainText); // TODO: all list and numbered types diff --git a/filters/kword/abiword/abiwordexport.cc b/filters/kword/abiword/abiwordexport.cc index 717611cd..d52fa1c8 100644 --- a/filters/kword/abiword/abiwordexport.cc +++ b/filters/kword/abiword/abiwordexport.cc @@ -32,7 +32,7 @@ #include <tqmap.h> #include <tqiodevice.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdom.h> #include <kdebug.h> @@ -84,7 +84,7 @@ public: virtual bool doCloseFile(void); // Close file in normal conditions virtual bool doOpenDocument(void); virtual bool doCloseDocument(void); - virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout, + virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout, const ValueListFormatData& paraFormatDataList); virtual bool doOpenTextFrameSet(void); // AbiWord's <section> virtual bool doCloseTextFrameSet(void); // AbiWord's </section> @@ -95,7 +95,7 @@ public: virtual bool doCloseHead(void); // Write <papersize> virtual bool doOpenStyles(void); // AbiWord's <styles> virtual bool doCloseStyles(void); // AbiWord's </styles> - virtual bool doFullDefineStyle(LayoutData& tqlayout); // AbiWord's <s></s> + virtual bool doFullDefineStyle(LayoutData& layout); // AbiWord's <s></s> virtual bool doOpenSpellCheckIgnoreList (void); // AbiWord's <ignorewords> virtual bool doCloseSpellCheckIgnoreList (void); // AbiWord's </ignorewords> virtual bool doFullSpellCheckIgnoreWord (const TQString& ignoreword); // AbiWord's <iw> @@ -116,7 +116,7 @@ private: TQString textFormatToAbiProps(const TextFormatting& formatOrigin, const TextFormatting& formatData, const bool force) const; TQString layoutToCss(const LayoutData& layoutOrigin, - const LayoutData& tqlayout, const bool force) const; + const LayoutData& layout, const bool force) const; TQString escapeAbiWordText(const TQString& strText) const; bool makeTable(const FrameAnchor& anchor); bool makePicture(const FrameAnchor& anchor); @@ -649,7 +649,7 @@ void AbiWordWorker::processVariable ( const TQString&, TQString fstr; TQValueList<ParaData>::ConstIterator it; for (it=paraList->begin();it!=paraList->end();it++) - fstr += ProcessParagraphData( (*it).text, (*it).tqlayout,(*it).formattingList); + fstr += ProcessParagraphData( (*it).text, (*it).layout,(*it).formattingList); str += "{\\super "; str += automatic ? "\\chftn " : value; str += "{\\footnote "; @@ -719,50 +719,50 @@ void AbiWordWorker::processParagraphData ( const TQString ¶Text, } TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin, - const LayoutData& tqlayout, const bool force) const + const LayoutData& layout, const bool force) const { TQString props; - if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment)) + if (force || (layoutOrigin.alignment!=layout.alignment)) { - // Check if the current tqalignment is a valid one for AbiWord. - if ((tqlayout.tqalignment == "left") || (tqlayout.tqalignment == "right") - || (tqlayout.tqalignment == "center") || (tqlayout.tqalignment == "justify")) + // Check if the current alignment is a valid one for AbiWord. + if ((layout.alignment == "left") || (layout.alignment == "right") + || (layout.alignment == "center") || (layout.alignment == "justify")) { props += "text-align:"; - props += tqlayout.tqalignment; + props += layout.alignment; props += "; "; } - else if (tqlayout.tqalignment == "auto") + else if (layout.alignment == "auto") { - // We assume a left tqalignment as AbiWord is not really bi-di (and this filter even less.) + // We assume a left alignment as AbiWord is not really bi-di (and this filter even less.) props += "text-align:left; "; } else { - kdWarning(30506) << "Unknown tqalignment: " << tqlayout.tqalignment << endl; + kdWarning(30506) << "Unknown alignment: " << layout.alignment << endl; } } // TODO/FIXME: what if all tabulators must be erased? #if 0 // DEPRECATED! - if (!tqlayout.tabulator.isEmpty() - && (force || (layoutOrigin.tabulator!=tqlayout.tabulator))) + if (!layout.tabulator.isEmpty() + && (force || (layoutOrigin.tabulator!=layout.tabulator))) { props += "tabstops:"; - props += tqlayout.tabulator; + props += layout.tabulator; props += "; "; } #endif - if (!tqlayout.tabulatorList.isEmpty() - && (force || (layoutOrigin.tabulatorList!=tqlayout.tabulatorList) )) + if (!layout.tabulatorList.isEmpty() + && (force || (layoutOrigin.tabulatorList!=layout.tabulatorList) )) { props += "tabstops:"; bool first=true; TabulatorList::ConstIterator it; - TabulatorList::ConstIterator end(tqlayout.tabulatorList.end()); - for (it=tqlayout.tabulatorList.begin();it!=end;++it) + TabulatorList::ConstIterator end(layout.tabulatorList.end()); + for (it=layout.tabulatorList.begin();it!=end;++it) { if (first) { @@ -789,48 +789,48 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin, props += "; "; } - if ((tqlayout.indentLeft>=0.0) - && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))) + if ((layout.indentLeft>=0.0) + && (force || (layoutOrigin.indentLeft!=layout.indentLeft))) { - props += TQString("margin-left:%1pt; ").tqarg(tqlayout.indentLeft); + props += TQString("margin-left:%1pt; ").arg(layout.indentLeft); } - if ((tqlayout.indentRight>=0.0) - && (force || (layoutOrigin.indentRight!=tqlayout.indentRight))) + if ((layout.indentRight>=0.0) + && (force || (layoutOrigin.indentRight!=layout.indentRight))) { - props += TQString("margin-right:%1pt; ").tqarg(tqlayout.indentRight); + props += TQString("margin-right:%1pt; ").arg(layout.indentRight); } - if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)) + if (force || (layoutOrigin.indentLeft!=layout.indentLeft)) { props += "text-indent: "; - props += TQString::number(tqlayout.indentFirst); + props += TQString::number(layout.indentFirst); props += "pt; "; } - if ((tqlayout.marginBottom>=0.0) - && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) ) + if ((layout.marginBottom>=0.0) + && ( force || ( layoutOrigin.marginBottom != layout.marginBottom ) ) ) { - props += TQString("margin-bottom:%1pt; ").tqarg(tqlayout.marginBottom); + props += TQString("margin-bottom:%1pt; ").arg(layout.marginBottom); } - if ((tqlayout.marginTop>=0.0) - && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) ) + if ((layout.marginTop>=0.0) + && ( force || ( layoutOrigin.marginTop != layout.marginTop ) ) ) { - props += TQString("margin-top:%1pt; ").tqarg(tqlayout.marginTop); + props += TQString("margin-top:%1pt; ").arg(layout.marginTop); } if (force - || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType ) - || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) ) + || ( layoutOrigin.lineSpacingType != layout.lineSpacingType ) + || ( layoutOrigin.lineSpacing != layout.lineSpacing ) ) { - switch ( tqlayout.lineSpacingType ) + switch ( layout.lineSpacingType ) { case LayoutData::LS_CUSTOM: { // We have a custom line spacing (in points). However AbiWord cannot do it, so transform in "at-least" props += "line-height=:"; - props += TQString::number( tqlayout.lineSpacing ); // ### TODO: rounding? + props += TQString::number( layout.lineSpacing ); // ### TODO: rounding? props += "pt+; "; break; } @@ -852,7 +852,7 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin, case LayoutData::LS_MULTIPLE: { props += "line-height:"; - props += TQString::number( tqlayout.lineSpacing ); // ### TODO: rounding? + props += TQString::number( layout.lineSpacing ); // ### TODO: rounding? props += "; "; break; } @@ -860,7 +860,7 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin, { // We have a fixed line height (in points) props += "line-height:"; - props += TQString::number( tqlayout.lineSpacing ); // ### TODO: rounding? + props += TQString::number( layout.lineSpacing ); // ### TODO: rounding? props += "pt; "; break; } @@ -868,32 +868,32 @@ TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin, { // We have an "at-least" line height (in points) props += "line-height=:"; - props += TQString::number( tqlayout.lineSpacing ); // ### TODO: rounding? + props += TQString::number( layout.lineSpacing ); // ### TODO: rounding? props += "pt+; "; // The + makes the difference break; } default: { - kdWarning(30506) << "Unsupported lineSpacingType: " << tqlayout.lineSpacingType << " (Ignoring!)" << endl; + kdWarning(30506) << "Unsupported lineSpacingType: " << layout.lineSpacingType << " (Ignoring!)" << endl; break; } } } // Add all AbiWord properties collected in the <FORMAT> element - props += textFormatToAbiProps(layoutOrigin.formatData.text,tqlayout.formatData.text,force); + props += textFormatToAbiProps(layoutOrigin.formatData.text,layout.formatData.text,force); return props; } -bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData& tqlayout, +bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData& layout, const ValueListFormatData& paraFormatDataList) { - TQString style=tqlayout.styleName; + TQString style=layout.styleName; const LayoutData& styleLayout=m_styleMap[style]; - TQString props=layoutToCss(styleLayout,tqlayout,false); + TQString props=layoutToCss(styleLayout,layout,false); *m_streamOut << "<p"; if (!style.isEmpty()) @@ -916,16 +916,16 @@ bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData& *m_streamOut << ">"; //Warning: No trailing white space or else it's in the text!!! // Before processing the text, test if we have a page break - if (tqlayout.pageBreakBefore) + if (layout.pageBreakBefore) { // We have a page break before the paragraph *m_streamOut << "<pbr/>"; } - processParagraphData(paraText, tqlayout.formatData.text, paraFormatDataList); + processParagraphData(paraText, layout.formatData.text, paraFormatDataList); // Before closing the paragraph, test if we have a page break - if (tqlayout.pageBreakAfter) + if (layout.pageBreakAfter) { // We have a page break after the paragraph *m_streamOut << "<pbr/>"; @@ -935,26 +935,26 @@ bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData& return true; } -bool AbiWordWorker::doFullDefineStyle(LayoutData& tqlayout) +bool AbiWordWorker::doFullDefineStyle(LayoutData& layout) { //Register style in the style map - m_styleMap[tqlayout.styleName]=tqlayout; + m_styleMap[layout.styleName]=layout; *m_streamOut << "<s"; // TODO: cook the style name to the standard style names in AbiWord - *m_streamOut << " name=\"" << EscapeXmlText(tqlayout.styleName,true,true) << "\""; - *m_streamOut << " followedby=\"" << EscapeXmlText(tqlayout.styleFollowing,true,true) << "\""; + *m_streamOut << " name=\"" << EscapeXmlText(layout.styleName,true,true) << "\""; + *m_streamOut << " followedby=\"" << EscapeXmlText(layout.styleFollowing,true,true) << "\""; - if ( (tqlayout.counter.numbering == CounterData::NUM_CHAPTER) - && (tqlayout.counter.depth<10) ) + if ( (layout.counter.numbering == CounterData::NUM_CHAPTER) + && (layout.counter.depth<10) ) { *m_streamOut << " level=\""; - *m_streamOut << TQString::number(tqlayout.counter.depth+1,10); + *m_streamOut << TQString::number(layout.counter.depth+1,10); *m_streamOut << "\""; } - TQString abiprops=layoutToCss(tqlayout,tqlayout,true); + TQString abiprops=layoutToCss(layout,layout,true); const int result=abiprops.findRev(";"); if (result>=0) @@ -1041,7 +1041,7 @@ bool AbiWordWorker::doFullPaperFormat(const int format, } else { // We prefer to use inches, as to limit rounding errors (page size is in points!) - outputText += TQString("pagetype=\"Custom\" width=\"%1\" height=\"%2\" units=\"inch\" ").tqarg(width/72.0).tqarg(height/72.0); + outputText += TQString("pagetype=\"Custom\" width=\"%1\" height=\"%2\" units=\"inch\" ").arg(width/72.0).arg(height/72.0); } break; } @@ -1208,7 +1208,7 @@ bool AbiWordWorker::doFullDocumentInfo(const KWEFDocumentInfo& docInfo) *m_streamOut << "</m>\n"; - TQDateTime now (TQDateTime::tqcurrentDateTime(Qt::UTC)); // current time in UTC + TQDateTime now (TQDateTime::currentDateTime(Qt::UTC)); // current time in UTC *m_streamOut << "<m key=\"abiword.date_last_changed\">" << escapeAbiWordText(transformToTextDate(now)) << "</m>\n"; @@ -1225,7 +1225,7 @@ ABIWORDExport::ABIWORDExport(KoFilter */*parent*/, const char */*name*/, const T KoFilter() { } -KoFilter::ConversiontqStatus ABIWORDExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus ABIWORDExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "application/x-abiword" || from != "application/x-kword" ) { @@ -1252,7 +1252,7 @@ KoFilter::ConversiontqStatus ABIWORDExport::convert( const TQCString& from, cons return KoFilter::StupidError; } - KoFilter::ConversiontqStatus result=leader->convert(m_chain,from,to); + KoFilter::ConversionStatus result=leader->convert(m_chain,from,to); delete leader; delete worker; diff --git a/filters/kword/abiword/abiwordexport.h b/filters/kword/abiword/abiwordexport.h index 550b7682..656283f8 100644 --- a/filters/kword/abiword/abiwordexport.h +++ b/filters/kword/abiword/abiwordexport.h @@ -47,6 +47,6 @@ public: ABIWORDExport(KoFilter *parent, const char *name, const TQStringList &); virtual ~ABIWORDExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // ABIWORDEXPORT_H diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cc index 4815d02c..2c7e4d3f 100644 --- a/filters/kword/abiword/abiwordimport.cc +++ b/filters/kword/abiword/abiwordimport.cc @@ -72,7 +72,7 @@ class StructureParser : public TQXmlDefaultHandler public: StructureParser(KoFilterChain* chain) : m_chain(chain), m_pictureNumber(0), m_pictureFrameNumber(0), m_tableGroupNumber(0), - m_timepoint(TQDateTime::tqcurrentDateTime(Qt::UTC)), m_fatalerror(false) + m_timepoint(TQDateTime::currentDateTime(Qt::UTC)), m_fatalerror(false) { createDocument(); structureStack.setAutoDelete(true); @@ -363,7 +363,7 @@ bool StartElementP(StackItem* stackItem, StackItem* stackCurrent, stackItem->stackElementFormatsPlural=formatsPluralElementOut; // <FORMATS> stackItem->pos=0; // No text characters yet - // Now we populate the tqlayout + // Now we populate the layout TQDomElement layoutElement=mainDocument.createElement("LAYOUT"); paragraphElementOut.appendChild(layoutElement); @@ -527,7 +527,7 @@ bool StructureParser::StartElementImage(StackItem* stackItem, StackItem* stackCu kdDebug(30506) << "Image: " << strDataId << endl; } - TQString strPictureFrameName(i18n("Frameset name","Picture %1").tqarg(++m_pictureFrameNumber)); + TQString strPictureFrameName(i18n("Frameset name","Picture %1").arg(++m_pictureFrameNumber)); // Create the frame set of the image @@ -817,7 +817,7 @@ static bool StartElementPBR(StackItem* /*stackItem*/, StackItem* stackCurrent, TQDomElement formatsPluralElementOut=mainDocument.createElement("FORMATS"); paragraphElementOut.appendChild(formatsPluralElementOut); - // We must now copy/clone the tqlayout of elementText. + // We must now copy/clone the layout of elementText. TQDomNodeList nodeList=stackCurrent->stackElementParagraph.elementsByTagName("LAYOUT"); @@ -1127,7 +1127,7 @@ bool StructureParser::StartElementTable(StackItem* stackItem, StackItem* stackCu // ### TODO: in case of automatic column widths, we have not any width given by AbiWord const uint tableNumber(++m_tableGroupNumber); - const TQString tableName(i18n("Table %1").tqarg(tableNumber)); + const TQString tableName(i18n("Table %1").arg(tableNumber)); TQDomElement elementText=stackCurrent->stackElementText; TQDomElement paragraphElementOut=mainDocument.createElement("PARAGRAPH"); @@ -1159,7 +1159,7 @@ bool StructureParser::StartElementTable(StackItem* stackItem, StackItem* stackCu stackItem->strTemp2=TQString::number(tableNumber); // needed as I18N does not allow adding phrases stackItem->pos=1; // Just # - // Now we populate the tqlayout + // Now we populate the layout TQDomElement layoutElement=mainDocument.createElement("LAYOUT"); paragraphElementOut.appendChild(layoutElement); @@ -1211,7 +1211,7 @@ bool StructureParser::StartElementCell(StackItem* stackItem, StackItem* stackCur } const TQString frameName(i18n("Frameset name","Table %3, row %1, column %2") - .tqarg(row).tqarg(col).tqarg(stackCurrent->strTemp2)); // As the stack could be wrong, be careful and use the string as last! + .arg(row).arg(col).arg(stackCurrent->strTemp2)); // As the stack could be wrong, be careful and use the string as last! // We need to create a frameset for the cell TQDomElement framesetElement(mainDocument.createElement("FRAMESET")); @@ -1638,8 +1638,8 @@ bool StructureParser::fatalError (const TQXmlParseException& exception) << " col " << exception.columnNumber() << " message: " << exception.message() << endl; m_fatalerror=true; KMessageBox::error(NULL, i18n("An error has occurred while parsing the AbiWord file.\nAt line: %1, column %2\nError message: %3") - .tqarg(exception.lineNumber()).tqarg(exception.columnNumber()) - .tqarg( i18n( "TQXml", exception.message().utf8() ) ), + .arg(exception.lineNumber()).arg(exception.columnNumber()) + .arg( i18n( "TQXml", exception.message().utf8() ) ), i18n("AbiWord Import Filter"),0); return false; // Stop parsing now, we do not need further errors. } @@ -1757,7 +1757,7 @@ ABIWORDImport::ABIWORDImport(KoFilter */*parent*/, const char */*name*/, const T KoFilter() { } -KoFilter::ConversiontqStatus ABIWORDImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus ABIWORDImport::convert( const TQCString& from, const TQCString& to ) { if ((to != "application/x-kword") || (from != "application/x-abiword")) return KoFilter::NotImplemented; @@ -1825,7 +1825,7 @@ KoFilter::ConversiontqStatus ABIWORDImport::convert( const TQCString& from, cons if (!handler.wasFatalError()) { // As the parsing was stopped for something else than a fatal error, we have not yet get an error message. (Can it really happen?) - KMessageBox::error(NULL, i18n("An error occurred during the load of the AbiWord file: %1").tqarg(from.data()), + KMessageBox::error(NULL, i18n("An error occurred during the load of the AbiWord file: %1").arg(from.data()), i18n("AbiWord Import Filter"),0); } return KoFilter::ParsingError; diff --git a/filters/kword/abiword/abiwordimport.h b/filters/kword/abiword/abiwordimport.h index 9ff4d764..8b8349b7 100644 --- a/filters/kword/abiword/abiwordimport.h +++ b/filters/kword/abiword/abiwordimport.h @@ -50,6 +50,6 @@ public: ABIWORDImport(); virtual ~ABIWORDImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // ABIWORDIMPORT_H diff --git a/filters/kword/amipro/FileFormat.txt b/filters/kword/amipro/FileFormat.txt index f795b56c..15f20037 100644 --- a/filters/kword/amipro/FileFormat.txt +++ b/filters/kword/amipro/FileFormat.txt @@ -43,9 +43,9 @@ Note: Word underline is just like underline, except that spaces between words are not underlined. Paragraph align is also encoded using tag, here it the list: - <+@> left tqalignment - <+A> right tqalignment - <+B> center tqalignment + <+@> left alignment + <+A> right alignment + <+B> center alignment <+C> justified Linespacing is encoded using tag: @@ -81,7 +81,7 @@ example below: 0 font color (see below) 16385 formatting flag (see below) [algn] - 4 tqalignment flag (see below) + 4 alignment flag (see below) 1 216 indent, 216/20 = 10.8 pt 144 first line indent, 144/20 = 7.2 pt @@ -185,7 +185,7 @@ Normally this appears in beginning of paragraph. 5 Page Layout ------------- -Page tqlayout is defined in section [lay]. Here is the format, +Page layout is defined in section [lay]. Here is the format, along with an example: [lay] diff --git a/filters/kword/amipro/amiproexport.cc b/filters/kword/amipro/amiproexport.cc index dd4550b8..22bc741e 100644 --- a/filters/kword/amipro/amiproexport.cc +++ b/filters/kword/amipro/amiproexport.cc @@ -23,10 +23,10 @@ #include <unistd.h> #endif -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqfile.h> #include <tqfileinfo.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> #include <KoFilterChain.h> @@ -50,7 +50,7 @@ class AmiProWorker : public KWEFBaseWorker virtual bool doCloseFile(void); virtual bool doOpenDocument(void); virtual bool doCloseDocument(void); - virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout, + virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout, const ValueListFormatData& paraFormatDataList); private: TQString filename; @@ -116,7 +116,7 @@ static TQString AmiProEscape( const TQString& text ) for( unsigned i=0; i<text.length(); i++ ) { TQChar ch = text[i]; - switch( ch.tqunicode() ) + switch( ch.unicode() ) { case '<': result += "<<"; break; case '>': result += "<;>"; break; @@ -131,7 +131,7 @@ static TQString AmiProEscape( const TQString& text ) } bool AmiProWorker::doFullParagraph(const TQString& paraText, - const LayoutData& /*tqlayout*/, const ValueListFormatData& paraFormatDataList) + const LayoutData& /*layout*/, const ValueListFormatData& paraFormatDataList) { TQString amiproText = ""; TQString text = paraText; @@ -180,7 +180,7 @@ AmiProExport::AmiProExport( KoFilter *, const char *, const TQStringList& ): { } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus AmiProExport::convert( const TQCString& from, const TQCString& to ) { @@ -191,7 +191,7 @@ AmiProExport::convert( const TQCString& from, AmiProWorker* worker = new AmiProWorker(); KWEFKWordLeader* leader = new KWEFKWordLeader( worker ); - KoFilter::ConversiontqStatus result; + KoFilter::ConversionStatus result; result = leader->convert( m_chain, from, to ); delete worker; diff --git a/filters/kword/amipro/amiproexport.h b/filters/kword/amipro/amiproexport.h index c9e1f5d9..bffb4362 100644 --- a/filters/kword/amipro/amiproexport.h +++ b/filters/kword/amipro/amiproexport.h @@ -35,7 +35,7 @@ class AmiProExport : public KoFilter virtual ~AmiProExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __AMIPROEXPORT_H diff --git a/filters/kword/amipro/amiproimport.cc b/filters/kword/amipro/amiproimport.cc index 7f37746c..fe45ca18 100644 --- a/filters/kword/amipro/amiproimport.cc +++ b/filters/kword/amipro/amiproimport.cc @@ -124,43 +124,43 @@ static TQString AmiProFormatListAsXML( AmiProFormatList& formatList ) return result; } -// helper function to convert AmiPro paragraph tqlayout to KWord's LAYOUT -static TQString AmiProLayoutAsXML( const AmiProLayout& tqlayout ) +// helper function to convert AmiPro paragraph layout to KWord's LAYOUT +static TQString AmiProLayoutAsXML( const AmiProLayout& layout ) { TQString result; - TQString referredStyle = tqlayout.name; + TQString referredStyle = layout.name; if( referredStyle.isEmpty() ) referredStyle = "Standard"; - TQString fontname = tqlayout.fontFamily; + TQString fontname = layout.fontFamily; if( fontname.isEmpty() ) fontname = KoGlobal::defaultFont().family(); - TQString fontsize = TQString::number( tqlayout.fontSize ); - TQString fontcolor = "red=\"" + TQString::number( tqlayout.fontColor.red() ) + - "\" green=\"" + TQString::number( tqlayout.fontColor.green() ) + - "\" blue=\"" + TQString::number( tqlayout.fontColor.blue() ) + "\""; - TQString boldness = tqlayout.bold ? "75" : "50"; - TQString italic = tqlayout.italic ? "1" : "0"; - TQString strikeout = tqlayout.strikethrough ? "1" : "0"; - TQString vertalign = tqlayout.superscript ? "2" : tqlayout.subscript ? "1" : "0"; - TQString underline = tqlayout.double_underline ? "double" : - tqlayout.underline|tqlayout.word_underline ? "1" : "0"; + TQString fontsize = TQString::number( layout.fontSize ); + TQString fontcolor = "red=\"" + TQString::number( layout.fontColor.red() ) + + "\" green=\"" + TQString::number( layout.fontColor.green() ) + + "\" blue=\"" + TQString::number( layout.fontColor.blue() ) + "\""; + TQString boldness = layout.bold ? "75" : "50"; + TQString italic = layout.italic ? "1" : "0"; + TQString strikeout = layout.strikethrough ? "1" : "0"; + TQString vertalign = layout.superscript ? "2" : layout.subscript ? "1" : "0"; + TQString underline = layout.double_underline ? "double" : + layout.underline|layout.word_underline ? "1" : "0"; TQString align; - align = tqlayout.align==TQt::AlignLeft ? "left" : - tqlayout.align==TQt::AlignRight ? "right" : - tqlayout.align==TQt::AlignCenter ? "center" : - tqlayout.align==TQt::AlignJustify ? "justify" : + align = layout.align==TQt::AlignLeft ? "left" : + layout.align==TQt::AlignRight ? "right" : + layout.align==TQt::AlignCenter ? "center" : + layout.align==TQt::AlignJustify ? "justify" : "left"; TQString offsets; - offsets = "before=\"" + TQString::number(tqlayout.spaceBefore) + - "\" after=\"" + TQString::number(tqlayout.spaceAfter) + "\""; + offsets = "before=\"" + TQString::number(layout.spaceBefore) + + "\" after=\"" + TQString::number(layout.spaceAfter) + "\""; TQString linespacing; - linespacing = tqlayout.linespace==AmiPro::LS_Single ? TQString::tqfromLatin1( "0" ) : - tqlayout.linespace==AmiPro::LS_OneAndHalf ? TQString::tqfromLatin1( "oneandhalf" ) : - tqlayout.linespace==AmiPro::LS_Double ? TQString::tqfromLatin1( "double" ) : - TQString::number( tqlayout.linespace ); + linespacing = layout.linespace==AmiPro::LS_Single ? TQString::fromLatin1( "0" ) : + layout.linespace==AmiPro::LS_OneAndHalf ? TQString::fromLatin1( "oneandhalf" ) : + layout.linespace==AmiPro::LS_Double ? TQString::fromLatin1( "double" ) : + TQString::number( layout.linespace ); result.append( "<LAYOUT>\n" ); result.append( " <NAME value=\"" + XMLEscape( referredStyle ) + "\" />\n" ); @@ -213,9 +213,9 @@ static TQString AmiProStyleAsXML( const AmiProStyle& style ) "left"; TQString linespacing; - linespacing = style.linespace==AmiPro::LS_Single ? TQString::tqfromLatin1( "0" ) : - style.linespace==AmiPro::LS_OneAndHalf ? TQString::tqfromLatin1( "oneandhalf" ) : - style.linespace==AmiPro::LS_Double ? TQString::tqfromLatin1( "double" ) : + linespacing = style.linespace==AmiPro::LS_Single ? TQString::fromLatin1( "0" ) : + style.linespace==AmiPro::LS_OneAndHalf ? TQString::fromLatin1( "oneandhalf" ) : + style.linespace==AmiPro::LS_Double ? TQString::fromLatin1( "double" ) : TQString::number( style.linespace ); TQString offsets; @@ -308,18 +308,18 @@ bool AmiProConverter::doDefineStyle( const AmiProStyle& style ) } bool AmiProConverter::doParagraph( const TQString& text, AmiProFormatList formatList, - AmiProLayout& tqlayout ) + AmiProLayout& layout ) { root.append( "<PARAGRAPH>\n" ); root.append( "<TEXT>" + XMLEscape( text ) + "</TEXT>\n" ); root.append( AmiProFormatListAsXML( formatList ) ); - root.append( AmiProLayoutAsXML( tqlayout ) ); + root.append( AmiProLayoutAsXML( layout ) ); root.append( "</PARAGRAPH>\n" ); return true; } -KoFilter::ConversiontqStatus AmiProImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus AmiProImport::convert( const TQCString& from, const TQCString& to ) { // check for proper conversion if( to!= "application/x-kword" || from != "application/x-amipro" ) diff --git a/filters/kword/amipro/amiproimport.h b/filters/kword/amipro/amiproimport.h index ad078543..45c8cc2b 100644 --- a/filters/kword/amipro/amiproimport.h +++ b/filters/kword/amipro/amiproimport.h @@ -37,7 +37,7 @@ class AmiProImport : public KoFilter virtual ~AmiProImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __AMIPROIMPORT_H diff --git a/filters/kword/amipro/amiproparser.cpp b/filters/kword/amipro/amiproparser.cpp index fdae97e6..14a0084b 100644 --- a/filters/kword/amipro/amiproparser.cpp +++ b/filters/kword/amipro/amiproparser.cpp @@ -22,7 +22,7 @@ #include <tqfile.h> #include <tqstring.h> #include <tqstringlist.h> -#include <tqtextstream.h> +#include <textstream.h> const float AmiPro::LS_Single = -1; const float AmiPro::LS_OneAndHalf = -1.5; @@ -83,7 +83,7 @@ static TQString AmiProUnescape( const TQString& str ) else { result.truncate( result.length() - 1 ); // remove the '<' - result.append( TQChar(str[i+2].tqunicode() + 0x40 ) ); + result.append( TQChar(str[i+2].unicode() + 0x40 ) ); i += 3; } } @@ -92,7 +92,7 @@ static TQString AmiProUnescape( const TQString& str ) if( str[i+1] == '\\' ) { result.truncate( result.length() - 1 ); // remove the '<' - result.append( TQChar(str[i+2].tqunicode() | 0x80 ) ); + result.append( TQChar(str[i+2].unicode() | 0x80 ) ); i += 3; } @@ -344,7 +344,7 @@ bool AmiProParser::parseStyle( const TQStringList& lines ) style.word_underline = flag & 8; style.double_underline = flag & 64; - // tqalignment + // alignment if( lines[7].stripWhiteSpace() != "[algn]" ) return true; unsigned align_flag = lines[8].stripWhiteSpace().toUInt(); if( align_flag & 1 ) style.align = TQt::AlignLeft; @@ -628,7 +628,7 @@ void AmiProFormat::applyStyle( const AmiProStyle& style ) strikethrough = style.strikethrough; } -// paragraph tqlayout +// paragraph layout AmiProLayout::AmiProLayout() { name = ""; diff --git a/filters/kword/amipro/amiproparser.h b/filters/kword/amipro/amiproparser.h index 40a8f82b..b6f07753 100644 --- a/filters/kword/amipro/amiproparser.h +++ b/filters/kword/amipro/amiproparser.h @@ -104,7 +104,7 @@ class AmiProListener virtual bool doCloseDocument(); virtual bool doDefineStyle( const AmiProStyle& style ); virtual bool doParagraph( const TQString& text, AmiProFormatList formatList, - AmiProLayout& tqlayout ); + AmiProLayout& layout ); }; class AmiProParser @@ -144,7 +144,7 @@ class AmiProParser bool processOpenDocument(); bool processCloseDocument(); bool processParagraph( const TQString& text, AmiProFormatList formatList, - AmiProLayout& tqlayout ); + AmiProLayout& layout ); }; diff --git a/filters/kword/applixword/applixwordimport.cc b/filters/kword/applixword/applixwordimport.cc index d7acc7ed..89bf5541 100644 --- a/filters/kword/applixword/applixwordimport.cc +++ b/filters/kword/applixword/applixwordimport.cc @@ -85,7 +85,7 @@ APPLIXWORDImport::nextLine (TQTextStream & stream) * * * * ******************************************************************************/ -KoFilter::ConversiontqStatus APPLIXWORDImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus APPLIXWORDImport::convert( const TQCString& from, const TQCString& to ) { if (to!="application/x-kword" || from!="application/x-applixword") @@ -780,10 +780,10 @@ APPLIXWORDImport::readHeader (TQTextStream &stream, TQFile &in) TQMessageBox::critical (0L, "Applixword header problem", TQString ("The Applixword header is not correct. " "May be it is not an applixword file! <BR>" - "This is the header line I did read:<BR><B>%1</B>").tqarg(mystr.latin1()), + "This is the header line I did read:<BR><B>%1</B>").arg(mystr.latin1()), "Okay"); - // i18n( "What is the separator used in this file ? First line is \n%1" ).tqarg(firstLine), + // i18n( "What is the separator used in this file ? First line is \n%1" ).arg(firstLine), return false; } else return true; diff --git a/filters/kword/applixword/applixwordimport.h b/filters/kword/applixword/applixwordimport.h index ccd80df7..957e4058 100644 --- a/filters/kword/applixword/applixwordimport.h +++ b/filters/kword/applixword/applixwordimport.h @@ -24,7 +24,7 @@ #include <tqstringlist.h> #include <tqfile.h> #include <tqobject.h> -#include <tqtextstream.h> +#include <textstream.h> #include <KoFilter.h> #include <KoStore.h> @@ -50,7 +50,7 @@ public: APPLIXWORDImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~APPLIXWORDImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); protected: TQChar specCharfind (TQChar , TQChar ); diff --git a/filters/kword/ascii/ExportDialog.cc b/filters/kword/ascii/ExportDialog.cc index 138618b2..f4bddc03 100644 --- a/filters/kword/ascii/ExportDialog.cc +++ b/filters/kword/ascii/ExportDialog.cc @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqradiobutton.h> #include <tqbuttongroup.h> @@ -41,14 +41,14 @@ AsciiExportDialog :: AsciiExportDialog(TQWidget* parent) kapp->restoreOverrideCursor(); TQStringList encodings; - encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" ); - encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() ); + encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" ); + encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() ); encodings += KGlobal::charsets()->descriptiveEncodingNames(); // Add a few non-standard encodings, which might be useful for text files const TQString description(i18n("Descriptive encoding name","Other ( %1 )")); - encodings << description.tqarg("Apple Roman"); // Apple - encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS - encodings << description.tqarg("CP 1258"); // Windows + encodings << description.arg("Apple Roman"); // Apple + encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS + encodings << description.arg("CP 1258"); // Windows m_dialog->comboBoxEncoding->insertStringList(encodings); @@ -85,7 +85,7 @@ TQTextCodec* AsciiExportDialog::getCodec(void) const // Default: UTF-8 kdWarning(30502) << "Cannot find encoding:" << strCodec << endl; // ### TODO: what parent to use? - KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) ); + KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) ); return 0; } diff --git a/filters/kword/ascii/ExportDialogUI.ui b/filters/kword/ascii/ExportDialogUI.ui index 8f66942c..9345a64c 100644 --- a/filters/kword/ascii/ExportDialogUI.ui +++ b/filters/kword/ascii/ExportDialogUI.ui @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -67,7 +67,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>106</width> <height>20</height> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/filters/kword/ascii/ImportDialog.cc b/filters/kword/ascii/ImportDialog.cc index adb345b1..c11753bc 100644 --- a/filters/kword/ascii/ImportDialog.cc +++ b/filters/kword/ascii/ImportDialog.cc @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqradiobutton.h> #include <tqbuttongroup.h> @@ -41,14 +41,14 @@ AsciiImportDialog :: AsciiImportDialog(TQWidget* parent) kapp->restoreOverrideCursor(); TQStringList encodings; - encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" ); - encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() ); + encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" ); + encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() ); encodings += KGlobal::charsets()->descriptiveEncodingNames(); // Add a few non-standard encodings, which might be useful for text files const TQString description(i18n("Descriptive encoding name","Other ( %1 )")); - encodings << description.tqarg("Apple Roman"); // Apple - encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS - encodings << description.tqarg("CP 1258"); // Windows + encodings << description.arg("Apple Roman"); // Apple + encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS + encodings << description.arg("CP 1258"); // Windows m_dialog->comboBoxEncoding->insertStringList(encodings); @@ -84,7 +84,7 @@ TQTextCodec* AsciiImportDialog::getCodec(void) const // Default: UTF-8 kdWarning(30502) << "Cannot find encoding:" << strCodec << endl; // ### TODO: what parent to use? - KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) ); + KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) ); return 0; } diff --git a/filters/kword/ascii/ImportDialogUI.ui b/filters/kword/ascii/ImportDialogUI.ui index fd124062..4b32a441 100644 --- a/filters/kword/ascii/ImportDialogUI.ui +++ b/filters/kword/ascii/ImportDialogUI.ui @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -67,7 +67,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>106</width> <height>20</height> @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/filters/kword/ascii/asciiexport.cc b/filters/kword/ascii/asciiexport.cc index 4f4fbb06..3748e8e7 100644 --- a/filters/kword/ascii/asciiexport.cc +++ b/filters/kword/ascii/asciiexport.cc @@ -28,8 +28,8 @@ #include <tqfile.h> #include <tqiodevice.h> #include <tqstring.h> -#include <tqtextcodec.h> -#include <tqtextstream.h> +#include <textcodec.h> +#include <textstream.h> #include <kdebug.h> #include <kgenericfactory.h> @@ -86,7 +86,7 @@ public: virtual bool doFullParagraphList(const TQValueList<ParaData>& paraList); virtual bool doFullParagraph(const ParaData& para); virtual bool doFullParagraph(const TQString& paraText, - const LayoutData& tqlayout, + const LayoutData& layout, const ValueListFormatData& paraFormatDataList); public: @@ -204,10 +204,10 @@ bool ASCIIWorker::doFullParagraphList(const TQValueList<ParaData>& paraList) bool ASCIIWorker::doFullParagraph(const ParaData& para) { - return doFullParagraph(para.text, para.tqlayout, para.formattingList); + return doFullParagraph(para.text, para.layout, para.formattingList); } -bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& tqlayout, +bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& layout, const ValueListFormatData& paraFormatDataList) { kdDebug(30502) << "Entering ASCIIWorker::doFullParagraph" << endl; @@ -216,15 +216,15 @@ bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& tq // As KWord has only one depth of lists, we can process lists very simply. // -- // Not anymore - Clarence - if ( tqlayout.counter.numbering == CounterData::NUM_LIST ) + if ( layout.counter.numbering == CounterData::NUM_LIST ) { // Are we still in a list of the right type? - if (!m_inList || (tqlayout.counter.style!=m_typeList)) + if (!m_inList || (layout.counter.style!=m_typeList)) { // We are not yet part of a list m_inList=true; m_counterList=1; // Start numbering - m_typeList=tqlayout.counter.style; + m_typeList=layout.counter.style; } switch (m_typeList) @@ -307,26 +307,26 @@ bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& tq else { m_inList=false; // Close an eventual list - if ( tqlayout.counter.numbering == CounterData::NUM_CHAPTER ) + if ( layout.counter.numbering == CounterData::NUM_CHAPTER ) { - if (!tqlayout.counter.depth) + if (!layout.counter.depth) { // HEAD 1 *m_streamOut << "###################################" << m_eol; *m_streamOut << "# "; ProcessParagraphData ( paraText, paraFormatDataList); *m_streamOut << "###################################" << m_eol; } - else if (tqlayout.counter.depth==1) + else if (layout.counter.depth==1) { // HEAD 2 *m_streamOut << "#### "; ProcessParagraphData ( paraText, paraFormatDataList); } - else if (tqlayout.counter.depth==2) + else if (layout.counter.depth==2) { // HEAD 3 *m_streamOut << "## "; ProcessParagraphData ( paraText, paraFormatDataList); } - else if (tqlayout.counter.depth==3) + else if (layout.counter.depth==3) { // HEAD 4 *m_streamOut << "# "; ProcessParagraphData ( paraText, paraFormatDataList); @@ -342,8 +342,8 @@ bool ASCIIWorker::doFullParagraph(const TQString& paraText, const LayoutData& tq } } #else - if (!tqlayout.counter.text.isEmpty()) - *m_streamOut << tqlayout.counter.text << " "; + if (!layout.counter.text.isEmpty()) + *m_streamOut << layout.counter.text << " "; if (!ProcessParagraphData(paraText, paraFormatDataList)) return false; #endif @@ -357,7 +357,7 @@ bool ASCIIWorker::ProcessTable(const Table& table) { kdDebug(30502) << "processTable CALLED!" << endl; - // just dump the table out (no tqlayout for now) + // just dump the table out (no layout for now) for (TQValueList<TableCell>::ConstIterator it = table.cellList.begin(); it != table.cellList.end(); it++) @@ -474,7 +474,7 @@ ASCIIExport::ASCIIExport(KoFilter*, const char*, const TQStringList&) { } -KoFilter::ConversiontqStatus ASCIIExport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus ASCIIExport::convert(const TQCString& from, const TQCString& to) { if (to != "text/plain" || from != "application/x-kword") { @@ -534,7 +534,7 @@ KoFilter::ConversiontqStatus ASCIIExport::convert(const TQCString& from, const T return KoFilter::StupidError; } - KoFilter::ConversiontqStatus result = leader->convert(m_chain,from,to); + KoFilter::ConversionStatus result = leader->convert(m_chain,from,to); delete leader; delete worker; diff --git a/filters/kword/ascii/asciiexport.h b/filters/kword/ascii/asciiexport.h index af1e2e04..429ad6c8 100644 --- a/filters/kword/ascii/asciiexport.h +++ b/filters/kword/ascii/asciiexport.h @@ -31,7 +31,7 @@ public: ASCIIExport(KoFilter* parent, const char* name, const TQStringList&); virtual ~ASCIIExport() {} - virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); }; #endif // ASCIIEXPORT_H diff --git a/filters/kword/ascii/asciiimport.cc b/filters/kword/ascii/asciiimport.cc index f2a6e039..52c5c4d9 100644 --- a/filters/kword/ascii/asciiimport.cc +++ b/filters/kword/ascii/asciiimport.cc @@ -28,9 +28,9 @@ #include <tqobject.h> #include <tqstring.h> // #include <tqregexp.h> // Currently not needed (due to disabled code) -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdom.h> #include <tqfontinfo.h> @@ -195,7 +195,7 @@ void ASCIIImport::prepareDocument(TQDomDocument& mainDocument, TQDomElement& mai } -KoFilter::ConversiontqStatus ASCIIImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus ASCIIImport::convert( const TQCString& from, const TQCString& to ) { if (to!="application/x-kword" || from!="text/plain") return KoFilter::NotImplemented; @@ -310,9 +310,9 @@ void ASCIIImport::oldWayConvert(TQTextStream& stream, TQDomDocument& mainDocumen } const int length = strLine.length(); - if (strLine.tqat(length-1) == '-') + if (strLine.at(length-1) == '-') // replace the hard hyphen - at line end by a soft hyphen - strLine.tqat(length-1)=TQChar(173); + strLine.at(length-1)=TQChar(173); else strLine += ' '; // add space to end of line diff --git a/filters/kword/ascii/asciiimport.h b/filters/kword/ascii/asciiimport.h index 4d332776..b2cfcbdd 100644 --- a/filters/kword/ascii/asciiimport.h +++ b/filters/kword/ascii/asciiimport.h @@ -65,7 +65,7 @@ public: ASCIIImport(); virtual ~ASCIIImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: // not yet changed #if 0 void WriteOutTableCell( int table_no, int row, int col, Position *pos, diff --git a/filters/kword/docbook/docbookexport.cc b/filters/kword/docbook/docbookexport.cc index db9c754a..f54bec6b 100644 --- a/filters/kword/docbook/docbookexport.cc +++ b/filters/kword/docbook/docbookexport.cc @@ -296,12 +296,12 @@ void DocBookWorker::ProcessParagraphData ( const ParaData ¶, fixedFont = true; } - if ( (*formattingIt).text.italic && !para.tqlayout.formatData.text.italic ) + if ( (*formattingIt).text.italic && !para.layout.formatData.text.italic ) { outputText += "<EMPHASIS>"; } - if ( (*formattingIt).text.weight > para.tqlayout.formatData.text.weight ) + if ( (*formattingIt).text.weight > para.layout.formatData.text.weight ) { outputText += "<EMPHASIS ROLE=bold>"; } @@ -318,12 +318,12 @@ void DocBookWorker::ProcessParagraphData ( const ParaData ¶, outputText += "</LITERAL>"; } - if ( (*formattingIt).text.weight > para.tqlayout.formatData.text.weight ) + if ( (*formattingIt).text.weight > para.layout.formatData.text.weight ) { outputText += "</EMPHASIS>"; } - if ( (*formattingIt).text.italic && !para.tqlayout.formatData.text.italic ) + if ( (*formattingIt).text.italic && !para.layout.formatData.text.italic ) { outputText += "</EMPHASIS>"; } @@ -516,10 +516,10 @@ bool DocBookWorker::doFullDocument ( const TQValueList<ParaData> ¶List ) TQValueList<ParaData>::ConstIterator end(paraList.end ()); for ( paraIt = paraList.begin (); paraIt != end ; ++paraIt ) { - switch ( (*paraIt).tqlayout.counter.numbering ) + switch ( (*paraIt).layout.counter.numbering ) { case CounterData::NUM_LIST: - switch ( (*paraIt).tqlayout.counter.style ) + switch ( (*paraIt).layout.counter.style ) { case CounterData::STYLE_CUSTOMBULLET: case CounterData::STYLE_CIRCLEBULLET: @@ -581,7 +581,7 @@ bool DocBookWorker::doFullDocument ( const TQValueList<ParaData> ¶List ) break; default: - kdError (30507) << "Unknown counter style " << (*paraIt).tqlayout.counter.style << "!" << endl; + kdError (30507) << "Unknown counter style " << (*paraIt).layout.counter.style << "!" << endl; CloseLists (); OpenArticleUnlessHead1 (); ProcessParagraphData (*paraIt, "PARA" ); @@ -590,7 +590,7 @@ bool DocBookWorker::doFullDocument ( const TQValueList<ParaData> ¶List ) break; case CounterData::NUM_CHAPTER: - switch ( (*paraIt).tqlayout.counter.depth ) + switch ( (*paraIt).layout.counter.depth ) { case 0: CloseHead1AndArticle (); @@ -629,7 +629,7 @@ bool DocBookWorker::doFullDocument ( const TQValueList<ParaData> ¶List ) break; default: - kdError (30507) << "Unexpected chapter depth " << (*paraIt).tqlayout.counter.depth << "!" << endl; + kdError (30507) << "Unexpected chapter depth " << (*paraIt).layout.counter.depth << "!" << endl; CloseLists (); OpenArticleUnlessHead1 (); ProcessParagraphData (*paraIt, "PARA" ); @@ -782,7 +782,7 @@ bool DocBookWorker::doFullDocumentInfo ( const KWEFDocumentInfo &docInfo ) } -KoFilter::ConversiontqStatus DocBookExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus DocBookExport::convert( const TQCString& from, const TQCString& to ) { #if 0 kdError (30507) << "to = " << to << ", from = " << from << endl; diff --git a/filters/kword/docbook/docbookexport.h b/filters/kword/docbook/docbookexport.h index cf7ec804..29362aaa 100644 --- a/filters/kword/docbook/docbookexport.h +++ b/filters/kword/docbook/docbookexport.h @@ -38,6 +38,6 @@ public: DocBookExport (KoFilter *parent, const char *name, const TQStringList & ); virtual ~DocBookExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // DOCBOOKEXPORT_H diff --git a/filters/kword/hancomword/hancomwordimport.cpp b/filters/kword/hancomword/hancomwordimport.cpp index 6fc353e5..47191bc7 100644 --- a/filters/kword/hancomword/hancomwordimport.cpp +++ b/filters/kword/hancomword/hancomwordimport.cpp @@ -31,7 +31,7 @@ #include <tqfile.h> #include <tqstring.h> #include <tqstringlist.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> #include <KoFilterChain.h> @@ -82,7 +82,7 @@ static inline unsigned long readU16( const void* p ) } -KoFilter::ConversiontqStatus HancomWordImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus HancomWordImport::convert( const TQCString& from, const TQCString& to ) { if ( from != "application/x-hancomword" ) return KoFilter::NotImplemented; diff --git a/filters/kword/hancomword/hancomwordimport.h b/filters/kword/hancomword/hancomwordimport.h index 64d279a8..f78c3a47 100644 --- a/filters/kword/hancomword/hancomwordimport.h +++ b/filters/kword/hancomword/hancomwordimport.h @@ -35,7 +35,7 @@ public: HancomWordImport ( TQObject *parent, const char* name, const TQStringList& ); virtual ~HancomWordImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: class Private; diff --git a/filters/kword/hancomword/pole.cpp b/filters/kword/hancomword/pole.cpp index f712f0e1..cb3771f5 100644 --- a/filters/kword/hancomword/pole.cpp +++ b/filters/kword/hancomword/pole.cpp @@ -96,7 +96,7 @@ class DirEntry { public: bool valid; // false if invalid (should be skipped) - std::string name; // the name, not in tqunicode anymore + std::string name; // the name, not in unicode anymore bool dir; // true if directory unsigned long size; // size (not valid if directory) unsigned long start; // starting block @@ -117,7 +117,7 @@ class DirTree int indexOf( DirEntry* e ); int parent( unsigned index ); std::string fullName( unsigned index ); - std::vector<unsigned> tqchildren( unsigned index ); + std::vector<unsigned> children( unsigned index ); void load( unsigned char* buffer, unsigned len ); void save( unsigned char* buffer ); unsigned size(); @@ -507,11 +507,11 @@ int DirTree::indexOf( DirEntry* e ) int DirTree::parent( unsigned index ) { - // brute-force, basically we iterate for each entries, find its tqchildren - // and check if one of the tqchildren is 'index' + // brute-force, basically we iterate for each entries, find its children + // and check if one of the children is 'index' for( unsigned j=0; j<entryCount(); j++ ) { - std::vector<unsigned> chi = tqchildren( j ); + std::vector<unsigned> chi = children( j ); for( unsigned i=0; i<chi.size();i++ ) if( chi[i] == index ) return j; @@ -575,8 +575,8 @@ DirEntry* DirTree::entry( const std::string& name, bool create ) for( it = names.begin(); it != names.end(); ++it ) { - // find among the tqchildren of index - std::vector<unsigned> chi = tqchildren( index ); + // find among the children of index + std::vector<unsigned> chi = children( index ); unsigned child = 0; for( unsigned i = 0; i < chi.size(); i++ ) { @@ -591,7 +591,7 @@ DirEntry* DirTree::entry( const std::string& name, bool create ) if( child > 0 ) index = child; else { - // not found among tqchildren + // not found among children if( !create ) return (DirEntry*)0; // create a new entry @@ -648,7 +648,7 @@ void dirtree_find_siblings( DirTree* dirtree, std::vector<unsigned>& result, } } -std::vector<unsigned> DirTree::tqchildren( unsigned index ) +std::vector<unsigned> DirTree::children( unsigned index ) { std::vector<unsigned> result; @@ -1249,9 +1249,9 @@ std::list<std::string> Storage::entries( const std::string& path ) if( e && e->dir ) { unsigned parent = dt->indexOf( e ); - std::vector<unsigned> tqchildren = dt->tqchildren( parent ); - for( unsigned i = 0; i < tqchildren.size(); i++ ) - result.push_back( dt->entry( tqchildren[i] )->name ); + std::vector<unsigned> children = dt->children( parent ); + for( unsigned i = 0; i < children.size(); i++ ) + result.push_back( dt->entry( children[i] )->name ); } return result; diff --git a/filters/kword/html/export/ExportBasic.cc b/filters/kword/html/export/ExportBasic.cc index 13864d7a..673b035a 100644 --- a/filters/kword/html/export/ExportBasic.cc +++ b/filters/kword/html/export/ExportBasic.cc @@ -19,7 +19,7 @@ */ #include <tqstring.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqfile.h> #include <klocale.h> @@ -308,37 +308,37 @@ void HtmlBasicWorker::closeFormatData(const FormatData& formatOrigin, } void HtmlBasicWorker::openParagraph(const TQString& strTag, - const LayoutData& tqlayout, TQChar::Direction direction) + const LayoutData& layout, TQChar::Direction direction) { *m_streamOut << '<' << strTag; - if ( (tqlayout.tqalignment=="left") || (tqlayout.tqalignment== "right") - || (tqlayout.tqalignment=="center") || (tqlayout.tqalignment=="justify")) + if ( (layout.alignment=="left") || (layout.alignment== "right") + || (layout.alignment=="center") || (layout.alignment=="justify")) { - *m_streamOut << " align=\"" << tqlayout.tqalignment << "\""; + *m_streamOut << " align=\"" << layout.alignment << "\""; if ( (direction == TQChar::DirRLE) || (direction == TQChar::DirRLO) ) *m_streamOut << " dir=\"rtl\""; } - else if ( tqlayout.tqalignment=="auto") + else if ( layout.alignment=="auto") { // Do nothing, the user-agent should be more intelligent than us. } else { - kdWarning(30503) << "Unknown tqalignment: " << tqlayout.tqalignment << endl; + kdWarning(30503) << "Unknown alignment: " << layout.alignment << endl; } *m_streamOut << ">"; // Allow bold only if tag is not a heading! - openFormatData(tqlayout.formatData,tqlayout.formatData,true,(strTag[0]!='h')); + openFormatData(layout.formatData,layout.formatData,true,(strTag[0]!='h')); } void HtmlBasicWorker::closeParagraph(const TQString& strTag, - const LayoutData& tqlayout) + const LayoutData& layout) { // Allow bold only if tag is not a heading! - closeFormatData(tqlayout.formatData,tqlayout.formatData,true,(strTag[0]!='h')); + closeFormatData(layout.formatData,layout.formatData,true,(strTag[0]!='h')); *m_streamOut << "</" << strTag << ">\n"; } diff --git a/filters/kword/html/export/ExportBasic.h b/filters/kword/html/export/ExportBasic.h index a6de0082..c8f2864c 100644 --- a/filters/kword/html/export/ExportBasic.h +++ b/filters/kword/html/export/ExportBasic.h @@ -33,9 +33,9 @@ public: protected: virtual TQString getStartOfListOpeningTag(const CounterData::Style typeList, bool& ordered); virtual void openParagraph(const TQString& strTag, - const LayoutData& tqlayout,TQChar::Direction direction=TQChar::DirL); + const LayoutData& layout,TQChar::Direction direction=TQChar::DirL); virtual void closeParagraph(const TQString& strTag, - const LayoutData& tqlayout); + const LayoutData& layout); virtual void openSpan(const FormatData& formatOrigin, const FormatData& format); virtual void closeSpan(const FormatData& formatOrigin, const FormatData& format); virtual bool doOpenBody(void); ///< HTML's \<body\> diff --git a/filters/kword/html/export/ExportCss.cc b/filters/kword/html/export/ExportCss.cc index 49abcf79..58f2860e 100644 --- a/filters/kword/html/export/ExportCss.cc +++ b/filters/kword/html/export/ExportCss.cc @@ -19,7 +19,7 @@ */ #include <tqstring.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqfile.h> #include <klocale.h> @@ -52,7 +52,7 @@ TQString HtmlCssWorker::escapeCssIdentifier(const TQString& strText) const for (uint i=0; i<strText.length(); i++) { const TQChar qch(strText.at(i)); - const ushort ch=qch.tqunicode(); + const ushort ch=qch.unicode(); if (((ch>='a') && (ch<='z')) || ((ch>='A') && (ch<='Z')) @@ -309,68 +309,68 @@ TQString HtmlCssWorker::getStartOfListOpeningTag(const CounterData::Style typeLi } TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin, - const LayoutData& tqlayout, const bool force) const + const LayoutData& layout, const bool force) const { TQString strLayout; - if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment)) + if (force || (layoutOrigin.alignment!=layout.alignment)) { - if ( (tqlayout.tqalignment=="left") || (tqlayout.tqalignment== "right") - || (tqlayout.tqalignment=="center") || (tqlayout.tqalignment=="justify")) + if ( (layout.alignment=="left") || (layout.alignment== "right") + || (layout.alignment=="center") || (layout.alignment=="justify")) { - strLayout += TQString("text-align:%1; ").tqarg(tqlayout.tqalignment); + strLayout += TQString("text-align:%1; ").arg(layout.alignment); } - else if ( tqlayout.tqalignment=="auto") + else if ( layout.alignment=="auto") { // Do nothing, the user-agent should be more intelligent than us. } else { - kdWarning(30503) << "Unknown tqalignment: " << tqlayout.tqalignment << endl; + kdWarning(30503) << "Unknown alignment: " << layout.alignment << endl; } } - if ((tqlayout.indentLeft>=0.0) - && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))) + if ((layout.indentLeft>=0.0) + && (force || (layoutOrigin.indentLeft!=layout.indentLeft))) { - strLayout += TQString("margin-left:%1pt; ").tqarg(tqlayout.indentLeft); + strLayout += TQString("margin-left:%1pt; ").arg(layout.indentLeft); } - if ((tqlayout.indentRight>=0.0) - && (force || (layoutOrigin.indentRight!=tqlayout.indentRight))) + if ((layout.indentRight>=0.0) + && (force || (layoutOrigin.indentRight!=layout.indentRight))) { - strLayout += TQString("margin-right:%1pt; ").tqarg(tqlayout.indentRight); + strLayout += TQString("margin-right:%1pt; ").arg(layout.indentRight); } - if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)) + if (force || (layoutOrigin.indentLeft!=layout.indentLeft)) { - strLayout += TQString("text-indent:%1pt; ").tqarg(tqlayout.indentFirst); + strLayout += TQString("text-indent:%1pt; ").arg(layout.indentFirst); } - if ((tqlayout.marginBottom>=0.0) - && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) ) + if ((layout.marginBottom>=0.0) + && ( force || ( layoutOrigin.marginBottom != layout.marginBottom ) ) ) { - strLayout += TQString("margin-bottom:%1pt; ").tqarg(tqlayout.marginBottom); + strLayout += TQString("margin-bottom:%1pt; ").arg(layout.marginBottom); } - if ((tqlayout.marginTop>=0.0) - && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) ) + if ((layout.marginTop>=0.0) + && ( force || ( layoutOrigin.marginTop != layout.marginTop ) ) ) { - strLayout += TQString("margin-top:%1pt; ").tqarg(tqlayout.marginTop); + strLayout += TQString("margin-top:%1pt; ").arg(layout.marginTop); } if (force - || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType ) - || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) ) + || ( layoutOrigin.lineSpacingType != layout.lineSpacingType ) + || ( layoutOrigin.lineSpacing != layout.lineSpacing ) ) { - switch ( tqlayout.lineSpacingType ) + switch ( layout.lineSpacingType ) { case LayoutData::LS_CUSTOM: { // ### TODO: CSS 2 does not known "at-least". #if 0 // We have a custom line spacing (in points) - const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding? + const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding? strLayout += "style:line-spacing:"; strLayout += height; strLayout += "pt; "; @@ -394,7 +394,7 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin, } case LayoutData::LS_MULTIPLE: { - const TQString mult ( TQString::number( tqRound( tqlayout.lineSpacing * 100 ) ) ); + const TQString mult ( TQString::number( tqRound( layout.lineSpacing * 100 ) ) ); strLayout += "line-height:"; strLayout += mult; strLayout += "%; "; @@ -403,7 +403,7 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin, case LayoutData::LS_FIXED: { // We have a fixed line height (in points) - const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding? + const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding? strLayout += "line-height:"; strLayout += height; strLayout += "pt; "; @@ -414,7 +414,7 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin, // ### TODO: CSS 2 does not known "at-least". // ### TODO: however draft CCS3 (module 'line') has 'line-stacking-strategy' to tweak this behaviour // We have a at-least line height (in points) - const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding? + const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding? strLayout += "line-height:"; strLayout += height; strLayout += "pt; "; @@ -422,7 +422,7 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin, } default: { - kdWarning(30503) << "Unsupported lineSpacingType: " << tqlayout.lineSpacingType << " (Ignoring!)" << endl; + kdWarning(30503) << "Unsupported lineSpacingType: " << layout.lineSpacingType << " (Ignoring!)" << endl; break; } } @@ -430,12 +430,12 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin, // TODO: Konqueror/KHTML does not support "text-shadow" if (!force - && ( layoutOrigin.shadowDirection == tqlayout.shadowDirection ) - && ( layoutOrigin.shadowDistance == tqlayout.shadowDistance ) ) + && ( layoutOrigin.shadowDirection == layout.shadowDirection ) + && ( layoutOrigin.shadowDistance == layout.shadowDistance ) ) { // Do nothing! } - else if ((!tqlayout.shadowDirection) || (!tqlayout.shadowDistance)) + else if ((!layout.shadowDirection) || (!layout.shadowDistance)) { strLayout += "text-shadow:"; strLayout+="none; "; @@ -443,8 +443,8 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin, else { double xDistance,yDistance; - const double distance=tqlayout.shadowDistance; - switch (tqlayout.shadowDirection) + const double distance=layout.shadowDistance; + switch (layout.shadowDirection) { case 1: // SD_LEFT_UP { @@ -509,8 +509,8 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin, else { strLayout += "text-shadow:"; - strLayout+=TQString("%1 %2pt %3pt; ").tqarg(tqlayout.shadowColor.name()) - .tqarg(xDistance,0,'f',0).tqarg(yDistance,0,'f',0); + strLayout+=TQString("%1 %2pt %3pt; ").arg(layout.shadowColor.name()) + .arg(xDistance,0,'f',0).arg(yDistance,0,'f',0); // We do not want any scientific notation or any decimal } } @@ -519,60 +519,60 @@ TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin, // This must remain last, as the last property does not have a semi-colon strLayout+=textFormatToCss(layoutOrigin.formatData.text, - tqlayout.formatData.text,force); + layout.formatData.text,force); return strLayout; } void HtmlCssWorker::openParagraph(const TQString& strTag, - const LayoutData& tqlayout, TQChar::Direction direction) + const LayoutData& layout, TQChar::Direction direction) { - const LayoutData& styleLayout=m_styleMap[tqlayout.styleName]; + const LayoutData& styleLayout=m_styleMap[layout.styleName]; *m_streamOut << '<' << strTag; // Opening elements - *m_streamOut << " class=\"" << escapeCssIdentifier(tqlayout.styleName); + *m_streamOut << " class=\"" << escapeCssIdentifier(layout.styleName); *m_streamOut << "\""; - TQString strStyle=layoutToCss(styleLayout,tqlayout,false); + TQString strStyle=layoutToCss(styleLayout,layout,false); if (!strStyle.isEmpty()) { *m_streamOut << " style=\"" << strStyle; if (direction == TQChar::DirRLE) { - *m_streamOut << "direction: rtl; tqunicode-bidi: embed; "; + *m_streamOut << "direction: rtl; unicode-bidi: embed; "; } else if (direction == TQChar::DirRLO) { - *m_streamOut << "direction: rtl; tqunicode-bidi: override; "; + *m_streamOut << "direction: rtl; unicode-bidi: override; "; } *m_streamOut<< "\""; } *m_streamOut << ">"; - if ( 1==tqlayout.formatData.text.verticalAlignment ) + if ( 1==layout.formatData.text.verticalAlignment ) { *m_streamOut << "<sub>"; //Subscript } - else if ( 2==tqlayout.formatData.text.verticalAlignment ) + else if ( 2==layout.formatData.text.verticalAlignment ) { *m_streamOut << "<sup>"; //Superscript } - if ( tqlayout.tqalignment == "center" ) *m_streamOut << "<center>"; + if ( layout.alignment == "center" ) *m_streamOut << "<center>"; } void HtmlCssWorker::closeParagraph(const TQString& strTag, - const LayoutData& tqlayout) + const LayoutData& layout) { - if ( 2==tqlayout.formatData.text.verticalAlignment ) + if ( 2==layout.formatData.text.verticalAlignment ) { *m_streamOut << "</sup>"; //Superscript } - else if ( 1==tqlayout.formatData.text.verticalAlignment ) + else if ( 1==layout.formatData.text.verticalAlignment ) { *m_streamOut << "</sub>"; //Subscript } - if ( tqlayout.tqalignment == "center" ) *m_streamOut << "</center>"; + if ( layout.alignment == "center" ) *m_streamOut << "</center>"; *m_streamOut << "</" << strTag << ">\n"; } @@ -680,16 +680,16 @@ bool HtmlCssWorker::doOpenStyles(void) return true; } -bool HtmlCssWorker::doFullDefineStyle(LayoutData& tqlayout) +bool HtmlCssWorker::doFullDefineStyle(LayoutData& layout) { //Register style in the style map - m_styleMap[tqlayout.styleName]=tqlayout; + m_styleMap[layout.styleName]=layout; // We do not limit (anymore) any style to <h1> ... <h6>, because - // the style could be forced on <p> by the tqlayout. + // the style could be forced on <p> by the layout. - *m_streamOut << "." << escapeCssIdentifier(tqlayout.styleName); - *m_streamOut << "\n{\n " << layoutToCss(tqlayout,tqlayout,true) << "\n}\n"; + *m_streamOut << "." << escapeCssIdentifier(layout.styleName); + *m_streamOut << "\n{\n " << layoutToCss(layout,layout,true) << "\n}\n"; return true; } diff --git a/filters/kword/html/export/ExportCss.h b/filters/kword/html/export/ExportCss.h index 358ea688..a33a0049 100644 --- a/filters/kword/html/export/ExportCss.h +++ b/filters/kword/html/export/ExportCss.h @@ -41,20 +41,20 @@ public: public: virtual bool doOpenStyles(void); ///< HTML's \<style\> virtual bool doCloseStyles(void); ///< HTML's \</style\> - virtual bool doFullDefineStyle(LayoutData& tqlayout); + virtual bool doFullDefineStyle(LayoutData& layout); virtual bool doFullPaperFormat(const int format, const double width, const double height, const int orientation); virtual bool doFullPaperBorders (const double top, const double left, const double bottom, const double right); ///< Like KWord's \<PAPERBORDERS\> protected: virtual TQString getStartOfListOpeningTag(const CounterData::Style typeList, bool& ordered); - virtual void openParagraph(const TQString& strTag, const LayoutData& tqlayout, + virtual void openParagraph(const TQString& strTag, const LayoutData& layout, TQChar::Direction direction=TQChar::DirL); - virtual void closeParagraph(const TQString& strTag, const LayoutData& tqlayout); + virtual void closeParagraph(const TQString& strTag, const LayoutData& layout); virtual void openSpan(const FormatData& formatOrigin, const FormatData& format); virtual void closeSpan(const FormatData& formatOrigin, const FormatData& format); private: - TQString layoutToCss(const LayoutData& layoutOrigin,const LayoutData& tqlayout, + TQString layoutToCss(const LayoutData& layoutOrigin,const LayoutData& layout, const bool force) const; TQString escapeCssIdentifier(const TQString& strText) const; TQString textFormatToCss(const TextFormatting& formatOrigin, diff --git a/filters/kword/html/export/ExportDialog.cc b/filters/kword/html/export/ExportDialog.cc index 20c7069b..7e005538 100644 --- a/filters/kword/html/export/ExportDialog.cc +++ b/filters/kword/html/export/ExportDialog.cc @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include <tqtextcodec.h> +#include <textcodec.h> #include <klocale.h> #include <kcharsets.h> @@ -28,7 +28,7 @@ #include <kcombobox.h> #include <kmessagebox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqvbuttongroup.h> #include <tqcheckbox.h> @@ -46,8 +46,8 @@ HtmlExportDialog :: HtmlExportDialog(TQWidget* parent) TQStringList encodingList; - encodingList += i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" ); - encodingList += i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() ); + encodingList += i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" ); + encodingList += i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() ); encodingList += KGlobal::charsets()->descriptiveEncodingNames(); m_dialog->comboBoxEncoding->insertStringList( encodingList ); @@ -106,7 +106,7 @@ TQTextCodec* HtmlExportDialog::getCodec(void) const // Default: UTF-8 kdWarning(30503) << "Cannot find encoding:" << strCodec << endl; // ### TODO: what parent to use? - KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) ); + KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) ); return 0; } diff --git a/filters/kword/html/export/ExportDialogUI.ui b/filters/kword/html/export/ExportDialogUI.ui index cbdc4fc2..a6683c04 100644 --- a/filters/kword/html/export/ExportDialogUI.ui +++ b/filters/kword/html/export/ExportDialogUI.ui @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -67,7 +67,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>106</width> <height>20</height> @@ -196,7 +196,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -212,7 +212,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -221,7 +221,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -262,7 +262,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>90</height> diff --git a/filters/kword/html/export/ExportDocStruct.cc b/filters/kword/html/export/ExportDocStruct.cc index f0e4b3aa..0cb6339e 100644 --- a/filters/kword/html/export/ExportDocStruct.cc +++ b/filters/kword/html/export/ExportDocStruct.cc @@ -19,7 +19,7 @@ */ #include <tqstring.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqfile.h> #include <klocale.h> @@ -140,16 +140,16 @@ void HtmlDocStructWorker::closeFormatData(const FormatData& formatOrigin, } void HtmlDocStructWorker::openParagraph(const TQString& strTag, - const LayoutData& tqlayout,TQChar::Direction /*direction*/) + const LayoutData& layout,TQChar::Direction /*direction*/) { *m_streamOut << '<' << strTag << ">"; - openFormatData(tqlayout.formatData,tqlayout.formatData,true,(strTag[0]!='h')); + openFormatData(layout.formatData,layout.formatData,true,(strTag[0]!='h')); } void HtmlDocStructWorker::closeParagraph(const TQString& strTag, - const LayoutData& tqlayout) + const LayoutData& layout) { - closeFormatData(tqlayout.formatData,tqlayout.formatData,true,(strTag[0]!='h')); + closeFormatData(layout.formatData,layout.formatData,true,(strTag[0]!='h')); *m_streamOut << "</" << strTag << ">\n"; } diff --git a/filters/kword/html/export/ExportDocStruct.h b/filters/kword/html/export/ExportDocStruct.h index 43b1e76a..6e963183 100644 --- a/filters/kword/html/export/ExportDocStruct.h +++ b/filters/kword/html/export/ExportDocStruct.h @@ -33,9 +33,9 @@ public: protected: virtual TQString getStartOfListOpeningTag(const CounterData::Style typeList, bool& ordered); virtual void openParagraph(const TQString& strTag, - const LayoutData& tqlayout,TQChar::Direction direction=TQChar::DirL); + const LayoutData& layout,TQChar::Direction direction=TQChar::DirL); virtual void closeParagraph(const TQString& strTag, - const LayoutData& tqlayout); + const LayoutData& layout); virtual void openSpan(const FormatData& formatOrigin, const FormatData& format); virtual void closeSpan(const FormatData& formatOrigin, const FormatData& format); private: diff --git a/filters/kword/html/export/ExportFilter.cc b/filters/kword/html/export/ExportFilter.cc index aa1b1817..ecaba65c 100644 --- a/filters/kword/html/export/ExportFilter.cc +++ b/filters/kword/html/export/ExportFilter.cc @@ -19,7 +19,7 @@ */ #include <tqstring.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqfile.h> #include <tqfileinfo.h> #include <tqdir.h> @@ -275,13 +275,13 @@ void HtmlWorker::formatTextParagraph(const TQString& strText, } void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString ¶Text, - const LayoutData& tqlayout, const ValueListFormatData ¶FormatDataList) + const LayoutData& layout, const ValueListFormatData ¶FormatDataList) { if (paraText.isEmpty() && paraFormatDataList.first().id != 6) { - openParagraph(strTag,tqlayout); + openParagraph(strTag,layout); *m_streamOut << " " ; // A paragraph can never be empty in HTML - closeParagraph(strTag,tqlayout); + closeParagraph(strTag,layout); } else { @@ -302,17 +302,17 @@ void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString &p // For normal text, we need an opened paragraph if (paragraphNotOpened) { - openParagraph(strTag,tqlayout,partialText.ref(0).direction()); + openParagraph(strTag,layout,partialText.ref(0).direction()); paragraphNotOpened=false; } - formatTextParagraph(partialText,tqlayout.formatData,*paraFormatDataIt); + formatTextParagraph(partialText,layout.formatData,*paraFormatDataIt); } else if (4==(*paraFormatDataIt).id) { // For variables, we need an opened paragraph if (paragraphNotOpened) { - openParagraph(strTag,tqlayout); + openParagraph(strTag,layout); paragraphNotOpened=false; } if (9==(*paraFormatDataIt).variable.m_type) @@ -341,7 +341,7 @@ void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString &p if (!paragraphNotOpened) { // The paragraph was opened, so close it. - closeParagraph(strTag,tqlayout); + closeParagraph(strTag,layout); } makeTable((*paraFormatDataIt).frameAnchor); // The paragraph will need to be opened again @@ -355,7 +355,7 @@ void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString &p // <img> and <object> need to be in a paragraph if (paragraphNotOpened) { - openParagraph( strTag, tqlayout,partialText.ref(0). direction() ); + openParagraph( strTag, layout,partialText.ref(0). direction() ); paragraphNotOpened=false; } makeImage((*paraFormatDataIt).frameAnchor); @@ -370,30 +370,30 @@ void HtmlWorker::ProcessParagraphData (const TQString& strTag, const TQString &p if (!paragraphNotOpened) { // The paragraph was opened, so close it. - closeParagraph(strTag,tqlayout); + closeParagraph(strTag,layout); } } } bool HtmlWorker::doFullParagraph(const TQString& paraText, - const LayoutData& tqlayout, const ValueListFormatData& paraFormatDataList) + const LayoutData& layout, const ValueListFormatData& paraFormatDataList) { kdDebug(30503) << "Entering HtmlWorker::doFullParagraph" << endl << paraText << endl; TQString strParaText=paraText; TQString strTag; // Tag that will be written. - if ( tqlayout.counter.numbering == CounterData::NUM_LIST ) + if ( layout.counter.numbering == CounterData::NUM_LIST ) { - const uint layoutDepth=tqlayout.counter.depth+1; // Word's depth starts at 0! + const uint layoutDepth=layout.counter.depth+1; // Word's depth starts at 0! const uint listDepth=m_listStack.size(); // We are in a list, but has it the right depth? if (layoutDepth>listDepth) { ListInfo newList; - newList.m_typeList=tqlayout.counter.style; + newList.m_typeList=layout.counter.style; for (uint i=listDepth; i<layoutDepth; i++) { - *m_streamOut << getStartOfListOpeningTag(tqlayout.counter.style,newList.m_orderedList); + *m_streamOut << getStartOfListOpeningTag(layout.counter.style,newList.m_orderedList); m_listStack.push(newList); } } @@ -414,7 +414,7 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText, } // We have a list but does it have the right type? - if ( tqlayout.counter.style!=m_listStack.top().m_typeList) + if ( layout.counter.style!=m_listStack.top().m_typeList) { // No, then close the previous list ListInfo oldList=m_listStack.pop(); @@ -427,8 +427,8 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText, *m_streamOut << "</ul>\n"; } ListInfo newList; - *m_streamOut << getStartOfListOpeningTag(tqlayout.counter.style,newList.m_orderedList); - newList.m_typeList=tqlayout.counter.style; + *m_streamOut << getStartOfListOpeningTag(layout.counter.style,newList.m_orderedList); + newList.m_typeList=layout.counter.style; m_listStack.push(newList); } @@ -453,10 +453,10 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText, } } } - if ( (tqlayout.counter.numbering == CounterData::NUM_CHAPTER) - && (tqlayout.counter.depth<6) ) + if ( (layout.counter.numbering == CounterData::NUM_CHAPTER) + && (layout.counter.depth<6) ) { - strTag=TQString("h%1").tqarg(tqlayout.counter.depth + 1); // H1 ... H6 + strTag=TQString("h%1").arg(layout.counter.depth + 1); // H1 ... H6 } else { @@ -464,7 +464,7 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText, } } - ProcessParagraphData(strTag, strParaText, tqlayout, paraFormatDataList); + ProcessParagraphData(strTag, strParaText, layout, paraFormatDataList); kdDebug(30503) << "Quiting HtmlWorker::doFullParagraph" << endl; return true; diff --git a/filters/kword/html/export/ExportFilter.h b/filters/kword/html/export/ExportFilter.h index f8446c1b..04d3129f 100644 --- a/filters/kword/html/export/ExportFilter.h +++ b/filters/kword/html/export/ExportFilter.h @@ -42,7 +42,7 @@ public: virtual bool doCloseFile(void); // Close file in normal conditions virtual bool doOpenDocument(void); virtual bool doCloseDocument(void); - virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout, + virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout, const ValueListFormatData& paraFormatDataList); virtual bool doFullDocumentInfo(const KWEFDocumentInfo& docInfo); virtual bool doOpenTextFrameSet(void); @@ -58,9 +58,9 @@ protected: * be detected from the actual string data */ virtual void openParagraph(const TQString& strTag, - const LayoutData& tqlayout, TQChar::Direction direction=TQChar::DirL)=0; + const LayoutData& layout, TQChar::Direction direction=TQChar::DirL)=0; virtual void closeParagraph(const TQString& strTag, - const LayoutData& tqlayout)=0; + const LayoutData& layout)=0; virtual void openSpan(const FormatData& formatOrigin, const FormatData& format)=0; virtual void closeSpan(const FormatData& formatOrigin, const FormatData& format)=0; virtual void writeDocType(void); @@ -84,7 +84,7 @@ protected: TQString getAdditionalFileName(const TQString& additionalName); private: void ProcessParagraphData ( const TQString& strTag, const TQString ¶Text, - const LayoutData& tqlayout, const ValueListFormatData ¶FormatDataList); + const LayoutData& layout, const ValueListFormatData ¶FormatDataList); void formatTextParagraph(const TQString& strText, const FormatData& formatOrigin, const FormatData& format); bool makeTable(const FrameAnchor& anchor); diff --git a/filters/kword/html/export/htmlexport.cc b/filters/kword/html/export/htmlexport.cc index f8af8e3e..013fb7ff 100644 --- a/filters/kword/html/export/htmlexport.cc +++ b/filters/kword/html/export/htmlexport.cc @@ -31,7 +31,7 @@ License version 2. */ -#include <tqtextcodec.h> +#include <textcodec.h> #include <kdebug.h> #include <kgenericfactory.h> @@ -61,7 +61,7 @@ HTMLExport::HTMLExport(KoFilter *, const char *, const TQStringList &) : KoFilter() { } -KoFilter::ConversiontqStatus HTMLExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus HTMLExport::convert( const TQCString& from, const TQCString& to ) { if ((from != "application/x-kword") || (to != "text/html")) { @@ -118,7 +118,7 @@ KoFilter::ConversiontqStatus HTMLExport::convert( const TQCString& from, const T delete worker; return KoFilter::StupidError; } - KoFilter::ConversiontqStatus result=leader->convert(m_chain,from,to); + KoFilter::ConversionStatus result=leader->convert(m_chain,from,to); delete leader; delete worker; diff --git a/filters/kword/html/export/htmlexport.h b/filters/kword/html/export/htmlexport.h index 5de5ef6a..5b62781a 100644 --- a/filters/kword/html/export/htmlexport.h +++ b/filters/kword/html/export/htmlexport.h @@ -22,7 +22,7 @@ #define HTMLEXPORT_H #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfile.h> #include <tqobject.h> @@ -39,7 +39,7 @@ public: HTMLExport(KoFilter *parent, const char *name, const TQStringList &); virtual ~HTMLExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // HTMLEXPORT_H diff --git a/filters/kword/html/import/htmlimport.cpp b/filters/kword/html/import/htmlimport.cpp index 2c403b2f..9b29320d 100644 --- a/filters/kword/html/import/htmlimport.cpp +++ b/filters/kword/html/import/htmlimport.cpp @@ -39,7 +39,7 @@ HTMLImport::HTMLImport(KoFilter *, const char*, const TQStringList &) : // 123 } -KoFilter::ConversiontqStatus HTMLImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus HTMLImport::convert( const TQCString& from, const TQCString& to ) { if(to!="application/x-kword" || from!="text/html") return KoFilter::NotImplemented; diff --git a/filters/kword/html/import/htmlimport.h b/filters/kword/html/import/htmlimport.h index f7c61a41..ab2a293c 100644 --- a/filters/kword/html/import/htmlimport.h +++ b/filters/kword/html/import/htmlimport.h @@ -37,7 +37,7 @@ public: HTMLImport(KoFilter *parent, const char *name, const TQStringList &); virtual ~HTMLImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // HTMLIMPORT_H diff --git a/filters/kword/html/import/khtmlreader.cpp b/filters/kword/html/import/khtmlreader.cpp index 6e134e38..8545fb0d 100644 --- a/filters/kword/html/import/khtmlreader.cpp +++ b/filters/kword/html/import/khtmlreader.cpp @@ -80,7 +80,7 @@ HTMLReader_state *KHTMLReader::state() s->frameset=_writer->mainFrameset(); s->paragraph = _writer->addParagraph(s->frameset); s->format=_writer->currentFormat(s->paragraph,true); - s->tqlayout=_writer->currentLayout(s->paragraph); + s->layout=_writer->currentLayout(s->paragraph); s->in_pre_mode = false; _state.push(s); } @@ -93,7 +93,7 @@ HTMLReader_state *KHTMLReader::pushNewState() s->frameset=state()->frameset; s->paragraph=state()->paragraph; s->format=state()->format; - s->tqlayout=state()->tqlayout; + s->layout=state()->layout; s->in_pre_mode=state()->in_pre_mode; _writer->cleanUpParagraph(s->paragraph); _state.push(s); @@ -118,9 +118,9 @@ void KHTMLReader::popState() if (s->frameset == state()->frameset) { state()->paragraph=s->paragraph; - if ((state()->tqlayout != s->tqlayout)) + if ((state()->layout != s->layout)) { - if (_writer->getText(state()->paragraph).length()!=0) startNewLayout(false,state()->tqlayout); + if (_writer->getText(state()->paragraph).length()!=0) startNewLayout(false,state()->layout); } state()->format=_writer->startFormat(state()->paragraph, state()->format); } @@ -129,15 +129,15 @@ void KHTMLReader::popState() void KHTMLReader::startNewLayout(bool startNewFormat) { - TQDomElement tqlayout; - startNewLayout(startNewFormat,tqlayout); + TQDomElement layout; + startNewLayout(startNewFormat,layout); } -void KHTMLReader::startNewLayout(bool startNewFormat, TQDomElement tqlayout) +void KHTMLReader::startNewLayout(bool startNewFormat, TQDomElement layout) { kdDebug() << "entering startNewLayout" << endl; startNewParagraph(startNewFormat,true); - state()->tqlayout=_writer->setLayout(state()->paragraph,tqlayout); + state()->layout=_writer->setLayout(state()->paragraph,layout); } void KHTMLReader::completed() @@ -178,12 +178,12 @@ void KHTMLReader::parseNode(DOM::Node node) if (!t.isNull()) { _writer->addText(state()->paragraph,t.data().string(),1,state()->in_pre_mode); - return; // no tqchildren anymore... + return; // no children anymore... } // is this really needed ? it can't do harm anyway. state()->format=_writer->currentFormat(state()->paragraph,true); - state()->tqlayout=_writer->currentLayout(state()->paragraph); + state()->layout=_writer->currentLayout(state()->paragraph); pushNewState(); DOM::Element e=node; @@ -227,13 +227,13 @@ void KHTMLReader::parse_head(DOM::Element e) } \ } -// the state->tqlayout=_writer->setLayout is meant to tell popState something changed in the tqlayout, and a new -// tqlayout should probably be started after closing. +// the state->layout=_writer->setLayout is meant to tell popState something changed in the layout, and a new +// layout should probably be started after closing. #define _PL(x,a,b,c) { \ if (e.tagName().lower() == #x) \ { \ - state()->tqlayout=_writer->setLayout(state()->paragraph,state()->tqlayout);\ + state()->layout=_writer->setLayout(state()->paragraph,state()->layout);\ if (!(_writer->getText(state()->paragraph).isEmpty())) \ startNewParagraph(false,false); \ _writer->layoutAttribute(state()->paragraph, #a,#b,#c); \ @@ -283,20 +283,20 @@ bool KHTMLReader::parseTag(DOM::Element e) return true; } -void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewtqlayout) +void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewlayout) { kdDebug() << "Entering startNewParagraph" << endl; TQDomElement qf=state()->format; - TQDomElement ql=state()->tqlayout; + TQDomElement ql=state()->layout; _writer->cleanUpParagraph(state()->paragraph); - if ((startnewtqlayout==true) || ql.isNull()) + if ((startnewlayout==true) || ql.isNull()) {state()->paragraph=_writer->addParagraph(state()->frameset);} else {state()->paragraph= - _writer->addParagraph(state()->frameset,state()->tqlayout);} + _writer->addParagraph(state()->frameset,state()->layout);} @@ -321,7 +321,7 @@ void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewtqlayout) _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","0"); _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext",""); int currdepth=(_writer->getLayoutAttribute(state()->paragraph,"COUNTER","depth")).toInt(); - _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(currdepth+1)); + _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").arg(currdepth+1)); } } @@ -403,7 +403,7 @@ bool KHTMLReader::parse_hr(DOM::Element /*e*/) bool KHTMLReader::parse_br(DOM::Element /*e*/) { - startNewParagraph(false,false); //keep the current format and tqlayout + startNewParagraph(false,false); //keep the current format and layout return false; // a BR tag has no childs. } @@ -508,7 +508,7 @@ void KHTMLReader::parseStyle(DOM::Element e) // process e.g. <style="text-align: center">this is in the center</style> if ( s1.getPropertyValue("text-align").string() != TQString() && s1.getPropertyValue("text-align").string() != TQString("left") ) { - state()->tqlayout=_writer->setLayout(state()->paragraph,state()->tqlayout); + state()->layout=_writer->setLayout(state()->paragraph,state()->layout); _writer->layoutAttribute(state()->paragraph, "FLOW","align",s1.getPropertyValue("text-align").string()); } // done @@ -520,11 +520,11 @@ void KHTMLReader::parseStyle(DOM::Element e) // debugging code. kdDebug(30503) << "e.style()" << endl; for (unsigned int i=0;i<s1.length();i++) { - kdDebug(30503) << TQString("%1: %2").tqarg(s1.item(i).string()).tqarg(s1.getPropertyValue(s1.item(i)).string()) << endl; + kdDebug(30503) << TQString("%1: %2").arg(s1.item(i).string()).arg(s1.getPropertyValue(s1.item(i)).string()) << endl; } kdDebug(30503) << "override style" << endl; for (unsigned int i=0;i<s2.length();i++) { - kdDebug(30503) << TQString("%1: %2").tqarg(s2.item(i).string()).tqarg(s2.getPropertyValue(s2.item(i)).string()) << endl; + kdDebug(30503) << TQString("%1: %2").arg(s2.item(i).string()).arg(s2.getPropertyValue(s2.item(i)).string()) << endl; } */ } @@ -628,7 +628,7 @@ bool KHTMLReader::parse_pre(DOM::Element e) _writer->addText(state()->paragraph,htmlelement.innerHTML().string(),1); startNewParagraph(); //popState(); - return false; // tqchildren are already handled. + return false; // children are already handled. #else pushNewState(); state()->in_pre_mode=true; @@ -640,7 +640,7 @@ bool KHTMLReader::parse_pre(DOM::Element e) } popState(); _writer->formatAttribute(state()->paragraph,"FONT","name",face); - return false; // tqchildren are already handled. + return false; // children are already handled. #endif } @@ -668,11 +668,11 @@ bool KHTMLReader::parse_font(DOM::Element e) _writer->formatAttribute(state()->paragraph,"FONT","name",face); if ((isize>=0) && (isize != 12)) - _writer->formatAttribute(state()->paragraph,"SIZE","value",TQString("%1").tqarg(isize)); + _writer->formatAttribute(state()->paragraph,"SIZE","value",TQString("%1").arg(isize)); - _writer->formatAttribute(state()->paragraph,"COLOR","red",TQString("%1").tqarg(color.red())); - _writer->formatAttribute(state()->paragraph,"COLOR","green",TQString("%1").tqarg(color.green())); - _writer->formatAttribute(state()->paragraph,"COLOR","blue",TQString("%1").tqarg(color.blue())); + _writer->formatAttribute(state()->paragraph,"COLOR","red",TQString("%1").arg(color.red())); + _writer->formatAttribute(state()->paragraph,"COLOR","green",TQString("%1").arg(color.green())); + _writer->formatAttribute(state()->paragraph,"COLOR","blue",TQString("%1").arg(color.blue())); return true; } @@ -684,7 +684,7 @@ bool KHTMLReader::parse_ul(DOM::Element e) _list_depth++; if (e.firstChild().nodeName().string().lower() == "#text") // e.g. <ul>this is indented<li>first listitem</li></ul> { - _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent + _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").arg(_list_depth-1)); // indent startNewLayout(); } for (DOM::Node items=e.firstChild();!items.isNull();items=items.nextSibling()) @@ -706,7 +706,7 @@ bool KHTMLReader::parse_ul(DOM::Element e) _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype",""); _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext",""); } - _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent + _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").arg(_list_depth-1)); // indent } parseNode(items); } diff --git a/filters/kword/html/import/khtmlreader.h b/filters/kword/html/import/khtmlreader.h index 9987a589..db93531a 100644 --- a/filters/kword/html/import/khtmlreader.h +++ b/filters/kword/html/import/khtmlreader.h @@ -39,7 +39,7 @@ struct HTMLReader_state { TQDomElement format; TQDomElement frameset; TQDomElement paragraph; - TQDomElement tqlayout; + TQDomElement layout; bool in_pre_mode; // keep formatting as is. }; @@ -77,8 +77,8 @@ private: KWDWriter *_writer; void startNewLayout(bool startNewFormat=false); - void startNewLayout(bool startNewFormat, TQDomElement tqlayout); - void startNewParagraph(bool startnewformat=true, bool startnewtqlayout=true); + void startNewLayout(bool startNewFormat, TQDomElement layout); + void startNewParagraph(bool startnewformat=true, bool startnewlayout=true); bool _it_worked; // ----------------------------------------------------- int _list_depth; diff --git a/filters/kword/html/import/kwdwriter.cpp b/filters/kword/html/import/kwdwriter.cpp index 56568be9..a194b219 100644 --- a/filters/kword/html/import/kwdwriter.cpp +++ b/filters/kword/html/import/kwdwriter.cpp @@ -173,9 +173,9 @@ TQDomElement KWDWriter::createTableCell(int tableno, int nrow, TQDomElement parent=docroot().elementsByTagName("FRAMESETS").item(0).toElement(); TQDomElement fs=addFrameSet(parent,1,0, - TQString("Table %1 - %2,%3").tqarg(tableno).tqarg(nrow).tqarg(ncol), + TQString("Table %1 - %2,%3").arg(tableno).arg(nrow).arg(ncol), 1); - fs.setAttribute("grpMgr",TQString("Table %1").tqarg(tableno)); + fs.setAttribute("grpMgr",TQString("Table %1").arg(tableno)); fs.setAttribute("row",nrow); fs.setAttribute("col",ncol); fs.setAttribute("cols",colspan); // FIXME do colspan in finishTable @@ -189,9 +189,9 @@ TQDomElement KWDWriter::fetchTableCell(int tableno, int rowno, int colno) { TQDomNodeList e=docroot().elementsByTagName("FRAMESET"); for (unsigned int i=0;i<e.count();i++) { TQDomElement k=e.item(i).toElement(); - if (k.attribute("grpMgr") == TQString("Table %1").tqarg(tableno)) - if (k.attribute("row") == TQString("%1").tqarg(rowno)) - if (k.attribute("col") == TQString("%1").tqarg(colno)) + if (k.attribute("grpMgr") == TQString("Table %1").arg(tableno)) + if (k.attribute("row") == TQString("%1").arg(rowno)) + if (k.attribute("col") == TQString("%1").arg(colno)) return k; } TQDomElement dummy; @@ -207,7 +207,7 @@ void KWDWriter::finishTable(int tableno) { void KWDWriter::createHR(TQDomElement paragraph, int width) { - layoutAttribute(paragraph,"BOTTOMBORDER","width",TQString("%1").tqarg(width)); + layoutAttribute(paragraph,"BOTTOMBORDER","width",TQString("%1").arg(width)); } void KWDWriter::finishTable(int tableno,TQRect rect) { @@ -227,7 +227,7 @@ void KWDWriter::finishTable(int tableno,TQRect rect) { // first, see how big the table is (cols & rows) for (unsigned i=0;i<nl.count();i++) { TQDomElement k=nl.item(i).toElement(); - if (k.attribute("grpMgr") == TQString("Table %1").tqarg(tableno)) { + if (k.attribute("grpMgr") == TQString("Table %1").arg(tableno)) { ncols=MAX(ncols,k.attribute("col").toInt()+1); nrows=MAX(nrows,k.attribute("row").toInt()+1); } @@ -251,7 +251,7 @@ void KWDWriter::finishTable(int tableno,TQRect rect) { TQDomElement e=fetchTableCell(tableno,currow,curcol); if (e.isNull()) { // a missing cell ! - kdDebug(30503) << TQString("creating %1 %2").tqarg(currow).tqarg(curcol).latin1() << endl; + kdDebug(30503) << TQString("creating %1 %2").arg(currow).arg(curcol).latin1() << endl; createTableCell(tableno,currow,curcol,1, TQRect(x+step_x*curcol,y+step_y*currow,step_x,step_y) ); @@ -328,12 +328,12 @@ TQDomElement KWDWriter::createLink(TQDomElement paragraph, TQString linkName, TQ } -TQDomElement KWDWriter::setLayout(TQDomElement paragraph, TQDomElement tqlayout) { +TQDomElement KWDWriter::setLayout(TQDomElement paragraph, TQDomElement layout) { TQDomElement theLayout; - if (tqlayout.isNull()) + if (layout.isNull()) theLayout=_doc->createElement("LAYOUT"); else - theLayout=tqlayout.cloneNode().toElement(); + theLayout=layout.cloneNode().toElement(); TQDomElement oldLayout=currentLayout(paragraph); paragraph.removeChild(oldLayout); paragraph.appendChild(theLayout); @@ -357,12 +357,12 @@ TQDomElement KWDWriter::addParagraph(TQDomElement parent, TQDomElement layoutToC TQDomElement paragraph=_doc->createElement("PARAGRAPH"); TQDomElement formats=_doc->createElement("FORMATS"); - TQDomElement tqlayout; + TQDomElement layout; if (layoutToClone.isNull()) { - tqlayout=_doc->createElement("LAYOUT"); + layout=_doc->createElement("LAYOUT"); } else { - tqlayout=layoutToClone.cloneNode().toElement(); + layout=layoutToClone.cloneNode().toElement(); } TQDomElement text=_doc->createElement("TEXT"); TQDomText t=_doc->createTextNode(TQString("")); @@ -370,7 +370,7 @@ TQDomElement KWDWriter::addParagraph(TQDomElement parent, TQDomElement layoutToC paragraph.appendChild(formats); paragraph.appendChild(text); parent.appendChild(paragraph); - paragraph.appendChild(tqlayout); + paragraph.appendChild(layout); layoutAttribute(paragraph,"NAME","value","Standard"); return paragraph; } @@ -460,8 +460,8 @@ void KWDWriter::addText(TQDomElement paragraph, TQString text, int format_id, bo TQDomElement lastformat=currentFormat(paragraph,true); if (lastformat.attribute("id").isEmpty()) // keep old id value, e.g. for LINK URL lastformat.setAttribute("id",format_id); - lastformat.setAttribute("pos",TQString("%1").tqarg(oldLength)); - lastformat.setAttribute("len",TQString("%1").tqarg(newLength)); + lastformat.setAttribute("pos",TQString("%1").arg(oldLength)); + lastformat.setAttribute("len",TQString("%1").arg(newLength)); } TQString KWDWriter::getText(TQDomElement paragraph) { diff --git a/filters/kword/html/import/kwdwriter.h b/filters/kword/html/import/kwdwriter.h index 542a1748..2942f22a 100644 --- a/filters/kword/html/import/kwdwriter.h +++ b/filters/kword/html/import/kwdwriter.h @@ -93,7 +93,7 @@ public: /** - * create a horizontal ruler tqlayout + * create a horizontal ruler layout **/ void createHR(TQDomElement paragraph, int width=1); @@ -115,7 +115,7 @@ public: * adds a paragraph **/ TQDomElement addParagraph(TQDomElement parent); - TQDomElement addParagraph(TQDomElement parent, TQDomElement tqlayout); + TQDomElement addParagraph(TQDomElement parent, TQDomElement layout); /** * adds/changes an attribute to/of the current format @@ -123,13 +123,13 @@ public: TQDomElement formatAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr); /** - * get a tqlayout attribute + * get a layout attribute **/ TQString getLayoutAttribute(TQDomElement paragraph, TQString name, TQString attrName); /** - * adds/changes an attribute to/of the current tqlayout + * adds/changes an attribute to/of the current layout **/ TQDomElement layoutAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr); @@ -164,9 +164,9 @@ public: TQDomElement createLink(TQDomElement paragraph, TQString linkName, TQString hrefName); /** - * copy the given tqlayout, and set it as tqlayout of the given paragraph + * copy the given layout, and set it as layout of the given paragraph **/ - TQDomElement setLayout(TQDomElement paragraph, TQDomElement tqlayout); + TQDomElement setLayout(TQDomElement paragraph, TQDomElement layout); /** * returns the text of this paragraph. diff --git a/filters/kword/kword1.3/import/kword13formatone.cpp b/filters/kword/kword1.3/import/kword13formatone.cpp index 9a658e41..5d1d2fe3 100644 --- a/filters/kword/kword1.3/import/kword13formatone.cpp +++ b/filters/kword/kword1.3/import/kword13formatone.cpp @@ -1,4 +1,4 @@ -#include <tqtextstream.h> +#include <textstream.h> #include "kword13utils.h" #include "kword13formatone.h" diff --git a/filters/kword/kword1.3/import/kword13formatone.h b/filters/kword/kword1.3/import/kword13formatone.h index e4cc7f38..682ef887 100644 --- a/filters/kword/kword1.3/import/kword13formatone.h +++ b/filters/kword/kword1.3/import/kword13formatone.h @@ -29,8 +29,8 @@ class TQTextStream; #include "kword13format.h" /** - * Contains the data of the \<FORMAT id="1"\> tqchildren - * also the grand-tqchildren of \<STYLE\> and \<LAYOUT\> + * Contains the data of the \<FORMAT id="1"\> children + * also the grand-children of \<STYLE\> and \<LAYOUT\> */ class KWord13FormatOneData { @@ -75,7 +75,7 @@ public: virtual KWord13FormatOneData* getFormatOneData(void); public: int m_length; ///< Length of format - KWord13FormatOneData m_formatOne; ///< Data of tqchildren of \<FORMAT id="1"\> + KWord13FormatOneData m_formatOne; ///< Data of children of \<FORMAT id="1"\> }; #endif // KWORD_1_3_FORMAT_ONE diff --git a/filters/kword/kword1.3/import/kword13import.cpp b/filters/kword/kword1.3/import/kword13import.cpp index ebcf3f6a..47eed1e7 100644 --- a/filters/kword/kword1.3/import/kword13import.cpp +++ b/filters/kword/kword1.3/import/kword13import.cpp @@ -59,7 +59,7 @@ bool KWord13Import::parseInfo( TQIODevice* io, KWord13Document& kwordDocument ) return false; } TQDomElement docElement( doc.documentElement() ); - // In documentinfo.xml, the text data is in the grand-tqchildren of the document element + // In documentinfo.xml, the text data is in the grand-children of the document element for ( TQDomNode node = docElement.firstChild(); !node.isNull(); node = node.nextSibling() ) { kdDebug(30520) << "Child " << node.nodeName() << endl; @@ -104,7 +104,7 @@ bool KWord13Import::postParse( KoStore* store, KWord13Document& doc ) return post.postParse( store, doc ); } -KoFilter::ConversiontqStatus KWord13Import::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus KWord13Import::convert( const TQCString& from, const TQCString& to ) { if ( to != "application/vnd.oasis.opendocument.text" || from != "application/x-kword" ) diff --git a/filters/kword/kword1.3/import/kword13import.h b/filters/kword/kword1.3/import/kword13import.h index 7d60dd89..77c05c23 100644 --- a/filters/kword/kword1.3/import/kword13import.h +++ b/filters/kword/kword1.3/import/kword13import.h @@ -39,7 +39,7 @@ public: KWord13Import(KoFilter *parent, const char *name, const TQStringList &); virtual ~KWord13Import() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); protected: bool parseInfo( TQIODevice* io, KWord13Document& kwordDocument ); bool parseRoot( TQIODevice* io, KWord13Document& kwordDocument ); diff --git a/filters/kword/kword1.3/import/kword13layout.cpp b/filters/kword/kword1.3/import/kword13layout.cpp index cc8a7046..f72dd5f8 100644 --- a/filters/kword/kword1.3/import/kword13layout.cpp +++ b/filters/kword/kword1.3/import/kword13layout.cpp @@ -1,4 +1,4 @@ -#include <tqtextstream.h> +#include <textstream.h> #include "kword13utils.h" #include "kword13layout.h" @@ -13,7 +13,7 @@ KWord13Layout::~KWord13Layout( void ) void KWord13Layout::xmldump( TQTextStream& iostream ) { - iostream << " <tqlayout name=\"" << EscapeXmlDump( m_name ) + iostream << " <layout name=\"" << EscapeXmlDump( m_name ) << "\" outline=\"" << ( m_outline ? TQString("true") : TQString("false") ) << "\">\n"; for ( TQMap<TQString,TQString>::ConstIterator it = m_layoutProperties.begin(); @@ -25,7 +25,7 @@ void KWord13Layout::xmldump( TQTextStream& iostream ) m_format.xmldump( iostream ); - iostream << " </tqlayout>\n"; + iostream << " </layout>\n"; } TQString KWord13Layout::key( void ) const diff --git a/filters/kword/kword1.3/import/kword13oasisgenerator.cpp b/filters/kword/kword1.3/import/kword13oasisgenerator.cpp index 00b899f9..7f246cad 100644 --- a/filters/kword/kword1.3/import/kword13oasisgenerator.cpp +++ b/filters/kword/kword1.3/import/kword13oasisgenerator.cpp @@ -178,11 +178,11 @@ double KWord13OasisGenerator::positiveNumberOrNull( const TQString& str ) const } // Inspired by KoParagStyle::saveStyle -void KWord13OasisGenerator::declareLayout( KWord13Layout& tqlayout ) +void KWord13OasisGenerator::declareLayout( KWord13Layout& layout ) { - KoGenStyle gs( KoGenStyle::STYLE_AUTO, "paragraph", tqlayout.m_name ); + KoGenStyle gs( KoGenStyle::STYLE_AUTO, "paragraph", layout.m_name ); - // ### TODO: any display name? gs.addAttribute( "style:display-name", tqlayout.m_name ); + // ### TODO: any display name? gs.addAttribute( "style:display-name", layout.m_name ); #if 0 // TODO: check that this is correct if ( m_paragLayout.counter && m_paragLayout.counter->depth() ) { @@ -192,21 +192,21 @@ void KWord13OasisGenerator::declareLayout( KWord13Layout& tqlayout ) gs.addAttribute( "style:default-level", (int)m_paragLayout.counter->depth() + 1 ); } #endif - fillGenStyleWithLayout( tqlayout, gs, false ); - fillGenStyleWithFormatOne( tqlayout.m_format , gs, false ); + fillGenStyleWithLayout( layout, gs, false ); + fillGenStyleWithFormatOne( layout.m_format , gs, false ); - tqlayout.m_autoStyleName = m_oasisGenStyles.lookup( gs, "P", true ); + layout.m_autoStyleName = m_oasisGenStyles.lookup( gs, "P", true ); - kdDebug(30520) << "Layout: Parent " << tqlayout.m_name << " => " << tqlayout.m_autoStyleName << endl; + kdDebug(30520) << "Layout: Parent " << layout.m_name << " => " << layout.m_autoStyleName << endl; } // Inspired by KoParagStyle::saveStyle -void KWord13OasisGenerator::declareStyle( KWord13Layout& tqlayout ) +void KWord13OasisGenerator::declareStyle( KWord13Layout& layout ) { KoGenStyle gs( KoGenStyle::STYLE_USER, "paragraph", TQString() ); - gs.addAttribute( "style:display-name", tqlayout.m_name ); + gs.addAttribute( "style:display-name", layout.m_name ); #if 0 // TODO: check that this is correct if ( m_paragLayout.counter && m_paragLayout.counter->depth() ) { @@ -216,12 +216,12 @@ void KWord13OasisGenerator::declareStyle( KWord13Layout& tqlayout ) gs.addAttribute( "style:default-level", (int)m_paragLayout.counter->depth() + 1 ); } #endif - fillGenStyleWithLayout( tqlayout, gs, true ); - fillGenStyleWithFormatOne( tqlayout.m_format , gs, true ); + fillGenStyleWithLayout( layout, gs, true ); + fillGenStyleWithFormatOne( layout.m_format , gs, true ); - tqlayout.m_autoStyleName = m_oasisGenStyles.lookup( gs, tqlayout.m_name, false ); + layout.m_autoStyleName = m_oasisGenStyles.lookup( gs, layout.m_name, false ); - kdDebug(30520) << "Style: " << tqlayout.m_name << " => " << tqlayout.m_autoStyleName << endl; + kdDebug(30520) << "Style: " << layout.m_name << " => " << layout.m_autoStyleName << endl; } @@ -341,13 +341,13 @@ void KWord13OasisGenerator::fillGenStyleWithFormatOne( const KWord13FormatOneDat } // Inspired from KoParagLayout::saveOasis but we have not the same data to start with. -void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& tqlayout, KoGenStyle& gs, const bool style ) const +void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& layout, KoGenStyle& gs, const bool style ) const { // ### TODO syntaxVersion < 3 - TQString str; // Help string to store each KWord 1.3 tqlayout property + TQString str; // Help string to store each KWord 1.3 layout property - str = tqlayout.getProperty( "FLOW:align" ); + str = layout.getProperty( "FLOW:align" ); if ( str.isEmpty() && ! style) { // Nothing to do! @@ -361,7 +361,7 @@ void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& tqlayou gs.addProperty( "fo:text-align", "start" ); // i.e. direction-dependent } - str = tqlayout.getProperty( "FLOW:dir" ); + str = layout.getProperty( "FLOW:dir" ); if ( str == "R" ) // ### TODO: check the right value { gs.addProperty( "style:writing-mode", "rl-tb" ); // right-to-left, top-to-bottom @@ -372,11 +372,11 @@ void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& tqlayou } // ### TODO: do not define if it does not exist and ! style - gs.addPropertyPt( "fo:margin-left", numberOrNull( tqlayout.getProperty( "INDENTS:left" ) ) ); - gs.addPropertyPt( "fo:margin-right", numberOrNull( tqlayout.getProperty( "INDENTS:right" ) ) ); - gs.addPropertyPt( "fo:text-indent", numberOrNull( tqlayout.getProperty( "INDENTS:first" ) ) ); - gs.addPropertyPt( "fo:margin-top", numberOrNull( tqlayout.getProperty( "OFFSETS:before" ) ) ); - gs.addPropertyPt( "fo:margin-bottom", numberOrNull( tqlayout.getProperty( "OFFSETS:after" ) ) ); + gs.addPropertyPt( "fo:margin-left", numberOrNull( layout.getProperty( "INDENTS:left" ) ) ); + gs.addPropertyPt( "fo:margin-right", numberOrNull( layout.getProperty( "INDENTS:right" ) ) ); + gs.addPropertyPt( "fo:text-indent", numberOrNull( layout.getProperty( "INDENTS:first" ) ) ); + gs.addPropertyPt( "fo:margin-top", numberOrNull( layout.getProperty( "OFFSETS:before" ) ) ); + gs.addPropertyPt( "fo:margin-bottom", numberOrNull( layout.getProperty( "OFFSETS:after" ) ) ); #if 0 switch ( lineSpacingType ) { @@ -425,7 +425,7 @@ void KWord13OasisGenerator::fillGenStyleWithLayout( const KWord13Layout& tqlayou case T_RIGHT: tabsWriter.addAttribute( "style:type", "right" ); break; - case T_DEC_PNT: // "tqalignment on decimal point" + case T_DEC_PNT: // "alignment on decimal point" tabsWriter.addAttribute( "style:type", "char" ); tabsWriter.addAttribute( "style:char", TQString( (*it).alignChar ) ); break; @@ -614,7 +614,7 @@ void KWord13OasisGenerator::writeStylesXml( void ) Q_ASSERT( styles.count() == 1 ); it = styles.begin(); for ( ; it != styles.end() ; ++it ) { - (*it).style->writeStyle( stylesWriter, m_oasisGenStyles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties", false /*don't close*/ ); + (*it).style->writeStyle( stylesWriter, m_oasisGenStyles, "style:page-layout", (*it).name, "style:page-layout-properties", false /*don't close*/ ); //if ( m_pageLayout.columns > 1 ) TODO add columns element. This is a bit of a hack, // which only works as long as we have only one page master stylesWriter->endElement(); @@ -629,7 +629,7 @@ void KWord13OasisGenerator::writeStylesXml( void ) stylesWriter->startElement( "office:master-styles" ); stylesWriter->startElement( "style:master-page" ); stylesWriter->addAttribute( "style:name", "Standard" ); - stylesWriter->addAttribute( "style:page-tqlayout-name", pageLayoutName ); + stylesWriter->addAttribute( "style:page-layout-name", pageLayoutName ); stylesWriter->endElement(); stylesWriter->endElement(); // office:master-styles diff --git a/filters/kword/kword1.3/import/kword13oasisgenerator.h b/filters/kword/kword1.3/import/kword13oasisgenerator.h index 39bc232a..3db989f2 100644 --- a/filters/kword/kword1.3/import/kword13oasisgenerator.h +++ b/filters/kword/kword1.3/import/kword13oasisgenerator.h @@ -49,17 +49,17 @@ protected: // Generating phase void writePreviewFile(void); void writePictures( void ); protected: // Preparing phase - /// Preparing page tqlayout + /// Preparing page layout void preparePageLayout( void ); void prepareTextFrameset( KWordTextFrameset* frameset ); /// Also sets the name of the automatical style - void declareLayout( KWord13Layout& tqlayout ); + void declareLayout( KWord13Layout& layout ); /// Also sets the name of the automatical style - void declareStyle( KWord13Layout& tqlayout ); + void declareStyle( KWord13Layout& layout ); double numberOrNull( const TQString& str ) const; double positiveNumberOrNull( const TQString& str ) const; void fillGenStyleWithFormatOne( const KWord13FormatOneData& one, KoGenStyle& gs, const bool style ) const; - void fillGenStyleWithLayout( const KWord13Layout& tqlayout, KoGenStyle& gs, const bool style ) const; + void fillGenStyleWithLayout( const KWord13Layout& layout, KoGenStyle& gs, const bool style ) const; protected: KWord13Document* m_kwordDocument; KoStore* m_store; diff --git a/filters/kword/kword1.3/import/kword13parser.cpp b/filters/kword/kword1.3/import/kword13parser.cpp index e3958b45..a3e22290 100644 --- a/filters/kword/kword1.3/import/kword13parser.cpp +++ b/filters/kword/kword1.3/import/kword13parser.cpp @@ -133,7 +133,7 @@ bool KWord13Parser::startElementLayoutProperty( const TQString& name, const TQXm } else { - kdError(30520) << "No current tqlayout for storing property: " << name << endl; + kdError(30520) << "No current layout for storing property: " << name << endl; return false; } } @@ -166,7 +166,7 @@ bool KWord13Parser::startElementFormat( const TQString&, const TQXmlAttributes& else if ( stackItem->elementType == KWord13TypeLayout ) { stackItem->elementType = KWord13TypeLayoutFormatOne; - return true; // Everything is done directly on the tqlayout + return true; // Everything is done directly on the layout } else if ( stackItem->elementType != KWord13TypeFormatsPlural ) { @@ -247,7 +247,7 @@ bool KWord13Parser::startElementLayout( const TQString&, const TQXmlAttributes& if ( m_currentLayout ) { // Delete an eventually already existing paragraph (should not happen) - kdWarning(30520) << "Current tqlayout already defined!" << endl; + kdWarning(30520) << "Current layout already defined!" << endl; delete m_currentLayout; } @@ -625,13 +625,13 @@ bool KWord13Parser::startElement( const TQString&, const TQString&, const TQStri } else if ( name == "FRAMESTYLE" ) { - // ### TODO, but some of the <STYLE> tqchildren are also tqchildren of <FRAMESTYLE>, so we have to set it to "ignore" + // ### TODO, but some of the <STYLE> children are also children of <FRAMESTYLE>, so we have to set it to "ignore" stackItem->elementType = KWord13TypeIgnore; success = true; } else if ( name == "PICTURES" || name == "PIXMAPS" || name == "CLIPARTS" ) { - // We just need a separate "type" for the <KEY> tqchildren + // We just need a separate "type" for the <KEY> children stackItem->elementType = KWord13TypePicturesPlural; success = true; } @@ -795,7 +795,7 @@ bool KWord13Parser :: characters ( const TQString & ch ) const uint length = ch.length(); for ( uint i = 0; i < length; ++i ) { - const ushort uni = ch.tqat(i).tqunicode(); + const ushort uni = ch.at(i).unicode(); if ( uni >= 32 ) continue; // Normal character else if ( uni == 9 || uni == 10 || uni == 13) diff --git a/filters/kword/kword1.3/import/kword13parser.h b/filters/kword/kword1.3/import/kword13parser.h index 7dc81d42..754a618e 100644 --- a/filters/kword/kword1.3/import/kword13parser.h +++ b/filters/kword/kword1.3/import/kword13parser.h @@ -92,9 +92,9 @@ protected: //TQXml virtual bool error(const TQXmlParseException& exception); virtual bool fatalError(const TQXmlParseException& exception); protected: - /// Process tqchildren of \<FORMAT id="1"\> + /// Process children of \<FORMAT id="1"\> bool startElementFormatOneProperty( const TQString& name, const TQXmlAttributes& attributes, KWord13StackItem *stackItem); - /// Process tqchildren of \<LAYOUT\> (with exceptions) + /// Process children of \<LAYOUT\> (with exceptions) bool startElementLayoutProperty( const TQString& name, const TQXmlAttributes& attributes, KWord13StackItem *stackItem); /// Process \<NAME\> bool startElementName( const TQString&, const TQXmlAttributes& attributes, KWord13StackItem *stackItem ); @@ -108,7 +108,7 @@ protected: bool startElementFrame( const TQString& name, const TQXmlAttributes& attributes, KWord13StackItem *stackItem ); /// Process \<FRAMESET\> bool startElementFrameset( const TQString& name, const TQXmlAttributes& attributes, KWord13StackItem *stackItem ); - /// Process opening tag of some elements that are tqchildren of \<DOC\> and which only define document properties + /// Process opening tag of some elements that are children of \<DOC\> and which only define document properties bool startElementDocumentAttributes( const TQString& name, const TQXmlAttributes& attributes, KWord13StackItem *stackItem, const KWord13StackItemType& allowedParentType, const KWord13StackItemType& newType ); /// Process \<KEY\> @@ -129,7 +129,7 @@ protected: KWord13StackItemStack parserStack; KWord13Document* m_kwordDocument; KWord13Paragraph* m_currentParagraph; ///< Current paragraph - KWord13Layout* m_currentLayout; ///< Current tqlayout (or style) + KWord13Layout* m_currentLayout; ///< Current layout (or style) KWord13Format* m_currentFormat; ///< Current format }; diff --git a/filters/kword/kword1.3/import/kword13utils.cpp b/filters/kword/kword1.3/import/kword13utils.cpp index d870f484..0caf48a7 100644 --- a/filters/kword/kword1.3/import/kword13utils.cpp +++ b/filters/kword/kword1.3/import/kword13utils.cpp @@ -8,7 +8,7 @@ TQString EscapeXmlDump( const TQString& strIn ) for (uint i=0; i<strIn.length(); i++) { ch=strIn[i]; - switch (ch.tqunicode()) + switch (ch.unicode()) { case 38: // & { diff --git a/filters/kword/latex/export/config.h b/filters/kword/latex/export/config.h index 7a81b168..26d954ea 100644 --- a/filters/kword/latex/export/config.h +++ b/filters/kword/latex/export/config.h @@ -22,7 +22,7 @@ #ifndef __LATEX_CONFIG_H__ #define __LATEX_CONFIG_H__ -#include <tqtextstream.h> +#include <textstream.h> #include <tqstringlist.h> /***********************************************************************/ @@ -84,8 +84,8 @@ class Config bool convertPictures() const { return _convertPictures; } TQString getPicturesDir() const { return _picturesDir; } - bool mustUseUnicode() const { return (_encoding == "tqunicode"); } - bool mustUseLatin1() const { return (_encoding != "tqunicode"); } + bool mustUseUnicode() const { return (_encoding == "unicode"); } + bool mustUseLatin1() const { return (_encoding != "unicode"); } TQString getEncoding() const { return _encoding; } TQStringList getLanguagesList() const { return _languagesList; } TQString getDefaultLanguage() const { return _defaultLanguage; } diff --git a/filters/kword/latex/export/document.h b/filters/kword/latex/export/document.h index b2844127..d6a96459 100644 --- a/filters/kword/latex/export/document.h +++ b/filters/kword/latex/export/document.h @@ -23,7 +23,7 @@ #define __KWORD_LATEX_DOCUMENT_H__ #include <tqptrlist.h> -#include <tqtextstream.h> +#include <textstream.h> #include "listtable.h" /* list of tables (another kind of list of elements). */ #include "key.h" diff --git a/filters/kword/latex/export/element.h b/filters/kword/latex/export/element.h index 9374620d..0db14ace 100644 --- a/filters/kword/latex/export/element.h +++ b/filters/kword/latex/export/element.h @@ -23,7 +23,7 @@ #ifndef __KWORD_ELEMENT_H__ #define __KWORD_ELEMENT_H__ -#include <tqtextstream.h> +#include <textstream.h> #include "xmlparser.h" #include "border.h" diff --git a/filters/kword/latex/export/fileheader.cc b/filters/kword/latex/export/fileheader.cc index 96b4be4e..8da25a16 100644 --- a/filters/kword/latex/export/fileheader.cc +++ b/filters/kword/latex/export/fileheader.cc @@ -78,7 +78,7 @@ void FileHeader::analysePaper(const TQDomNode balise) analysePaperParam(balise); //setTokenCurrent(balise_initiale->pContent); - // Analyse tqchildren markups --> PAPERBORDERS + // Analyse children markups --> PAPERBORDERS TQDomNode fils = getChild(balise, "PAPERSBORDERS"); _leftBorder = getAttr(fils, "left").toInt(); _rightBorder = getAttr(fils, "right").toInt(); @@ -287,7 +287,7 @@ void FileHeader::generatePackage(TQTextStream &out) if(Config::instance()->mustUseUnicode()) out << "\\usepackage{omega}" << endl; if(getFormat() == TF_A4) - out << "\\usepackage[a4paper]{tqgeometry}" << endl; + out << "\\usepackage[a4paper]{geometry}" << endl; if(hasFooter() || hasHeader()) out << "\\usepackage{fancyhdr}" << endl; if(hasColor()) diff --git a/filters/kword/latex/export/fileheader.h b/filters/kword/latex/export/fileheader.h index d837c828..d6843c26 100644 --- a/filters/kword/latex/export/fileheader.h +++ b/filters/kword/latex/export/fileheader.h @@ -22,7 +22,7 @@ #ifndef __KWORD_FILEHEADER_H__ #define __KWORD_FILEHEADER_H__ -#include <tqtextstream.h> +#include <textstream.h> #include "xmlparser.h" diff --git a/filters/kword/latex/export/format.h b/filters/kword/latex/export/format.h index c4c3e37a..cd82b36a 100644 --- a/filters/kword/latex/export/format.h +++ b/filters/kword/latex/export/format.h @@ -23,7 +23,7 @@ #ifndef __KWORD_FORMAT_H__ #define __KWORD_FORMAT_H__ -#include <tqtextstream.h> +#include <textstream.h> #include <tqstring.h> #include <tqcolor.h> #include "xmlparser.h" diff --git a/filters/kword/latex/export/formula.h b/filters/kword/latex/export/formula.h index 03ba4bd6..b023cdf6 100644 --- a/filters/kword/latex/export/formula.h +++ b/filters/kword/latex/export/formula.h @@ -25,7 +25,7 @@ #include "element.h" #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> /***********************************************************************/ /* Class: Formula */ diff --git a/filters/kword/latex/export/kwordlatexexportdia.cc b/filters/kword/latex/export/kwordlatexexportdia.cc index 079b38d3..145b30ed 100644 --- a/filters/kword/latex/export/kwordlatexexportdia.cc +++ b/filters/kword/latex/export/kwordlatexexportdia.cc @@ -71,7 +71,7 @@ KWordLatexExportDia::KWordLatexExportDia(KoStore* in, TQWidget* parent, TQString value; while(i < 10) { - /*value = _config->readPathEntry( TQString("Recent%1").tqarg(i) ); + /*value = _config->readPathEntry( TQString("Recent%1").arg(i) ); kdDebug(30522) << "recent : " << value << endl; if(!value.isEmpty()) { @@ -101,7 +101,7 @@ KWordLatexExportDia::KWordLatexExportDia(KoStore* in, TQWidget* parent, classComboBox->insertItem("report"); classComboBox->insertItem("slides"); - encodingComboBox->insertItem("tqunicode"); + encodingComboBox->insertItem("unicode"); encodingComboBox->insertItem("ansinew"); encodingComboBox->insertItem("applemac"); encodingComboBox->insertItem("ascii"); diff --git a/filters/kword/latex/export/latexexport.cc b/filters/kword/latex/export/latexexport.cc index f521ec9d..a72d8c52 100644 --- a/filters/kword/latex/export/latexexport.cc +++ b/filters/kword/latex/export/latexexport.cc @@ -25,7 +25,7 @@ #include <kgenericfactory.h> #include <kglobal.h> #include <klocale.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include "kwordlatexexportdia.h" typedef KGenericFactory<LATEXExport, KoFilter> LATEXExportFactory; @@ -36,7 +36,7 @@ LATEXExport::LATEXExport(KoFilter *, const char *, const TQStringList&) : KoFilter() { } -KoFilter::ConversiontqStatus LATEXExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus LATEXExport::convert( const TQCString& from, const TQCString& to ) { TQString config; diff --git a/filters/kword/latex/export/latexexport.h b/filters/kword/latex/export/latexexport.h index e7c0312b..4d34e0f0 100644 --- a/filters/kword/latex/export/latexexport.h +++ b/filters/kword/latex/export/latexexport.h @@ -21,7 +21,7 @@ #define __LATEXEXPORT_H__ #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfile.h> #include <tqobject.h> @@ -38,7 +38,7 @@ class LATEXExport : public KoFilter LATEXExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~LATEXExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif /* __LATEXExport_H__ */ diff --git a/filters/kword/latex/export/latexexportdia.ui b/filters/kword/latex/export/latexexportdia.ui index 8c3835ed..741a9c7e 100644 --- a/filters/kword/latex/export/latexexportdia.ui +++ b/filters/kword/latex/export/latexexportdia.ui @@ -593,7 +593,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/filters/kword/latex/export/layout.cc b/filters/kword/latex/export/layout.cc index f75ac651..05ad3405 100644 --- a/filters/kword/latex/export/layout.cc +++ b/filters/kword/latex/export/layout.cc @@ -24,7 +24,7 @@ #include <kdebug.h> /* for kdDebug() stream */ #include "fileheader.h" /* for _header use */ -#include "tqlayout.h" +#include "layout.h" #include "layout.h" /* Static Datas */ @@ -59,7 +59,7 @@ void Layout::analyseLayout(const TQDomNode balise) /* No parameters for this markup */ kdDebug(30522) << "ANALYSE OF THE BEGINING OF A LAYOUT" << endl; - /* Analyse tqchildren markups */ + /* Analyse children markups */ for(int index= 0; index < getNbChild(balise); index++) { if(getChildName(balise, index).compare("NAME")== 0) diff --git a/filters/kword/latex/export/layout.h b/filters/kword/latex/export/layout.h index 298b08ff..04096c77 100644 --- a/filters/kword/latex/export/layout.h +++ b/filters/kword/latex/export/layout.h @@ -23,7 +23,7 @@ #ifndef __KWORD_LAYOUT_H__ #define __KWORD_LAYOUT_H__ -#include <tqtextstream.h> +#include <textstream.h> #include <tqstring.h> #include <kdebug.h> #include "textformat.h" @@ -93,7 +93,7 @@ class Layout: public TextFormat * Nothing to do. */ virtual ~Layout() { - kdDebug(30522) << "Destruction of a tqlayout." << endl; + kdDebug(30522) << "Destruction of a layout." << endl; } /** diff --git a/filters/kword/latex/export/para.cc b/filters/kword/latex/export/para.cc index 6003a075..9cc829b5 100644 --- a/filters/kword/latex/export/para.cc +++ b/filters/kword/latex/export/para.cc @@ -23,7 +23,7 @@ #include <kdebug.h> /* for kdDebug() stream */ #include "para.h" #include "textFrame.h" /* father class. */ -#include "format.h" /* tqchildren classes. */ +#include "format.h" /* children classes. */ //#include "picturezone.h" #include "fileheader.h" #include "textzone.h" @@ -132,7 +132,7 @@ void Para::analyse(const TQDomNode balise) kdDebug(30522) << "**** PARAGRAPH ****" << endl; - /* Analyse of the tqchildren markups */ + /* Analyse of the children markups */ for(int index = 0; index < getNbChild(balise); index++) { if(getChildName(balise, index).compare("TEXT")== 0) @@ -210,7 +210,7 @@ void Para::analyseInfo(const TQDomNode balise) /*******************************************/ /* AnalyseLayoutPara */ /*******************************************/ -/* Analyse the tqlayout of a para. */ +/* Analyse the layout of a para. */ /* For each format, keep the type (picture,*/ /* text, variable, footnote) and put the */ /* zone in a list. */ diff --git a/filters/kword/latex/export/para.h b/filters/kword/latex/export/para.h index 75c41b3a..7d1c0af1 100644 --- a/filters/kword/latex/export/para.h +++ b/filters/kword/latex/export/para.h @@ -26,7 +26,7 @@ #include <tqptrstack.h> /* historic list */ #include <tqptrlist.h> /* for list of format */ -/*#include "listeformat.h"*/ /* tqchildren class contents the zone (italic, footnote, +/*#include "listeformat.h"*/ /* children class contents the zone (italic, footnote, variable. */ #include "layout.h" /* set of informations about the paragraph style. */ #include "element.h" /* to use the father class. */ diff --git a/filters/kword/latex/export/texlauncher.cc b/filters/kword/latex/export/texlauncher.cc index b67a7385..5b254f87 100644 --- a/filters/kword/latex/export/texlauncher.cc +++ b/filters/kword/latex/export/texlauncher.cc @@ -6,7 +6,7 @@ #include <klocale.h> #include <KoFilter.h> #include <KoStore.h> -#include<tqtextstream.h> +#include<textstream.h> int main(int argc, char* argv[]) diff --git a/filters/kword/latex/export/textFrame.cc b/filters/kword/latex/export/textFrame.cc index cdcbba6a..d6141e96 100644 --- a/filters/kword/latex/export/textFrame.cc +++ b/filters/kword/latex/export/textFrame.cc @@ -217,7 +217,7 @@ void TextFrame::generate(TQTextStream &out) lastPara->closeList(out, currentPara); _lastTypeEnum = TL_NONE; } - /* tqlayout management (left, center, justify, right) */ + /* layout management (left, center, justify, right) */ if((!lastPara->isChapter() && _lastEnv != getNextEnv(_parags, _parags.at()) && lastPara->notEmpty()) || _lastEnv != getNextEnv(_parags, _parags.at())) diff --git a/filters/kword/latex/export/textzone.cc b/filters/kword/latex/export/textzone.cc index a4beb875..0bf4e436 100644 --- a/filters/kword/latex/export/textzone.cc +++ b/filters/kword/latex/export/textzone.cc @@ -1,4 +1,4 @@ -/* MEMO: to see the tqunicode table +/* MEMO: to see the unicode table * xset +fp /usr/X11R6/lib/X11/fonts/ucs/ * xfd -fn '-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1' */ @@ -85,7 +85,7 @@ bool TextZone::useFormat() const /*******************************************/ /* escapeLatin1 */ /*******************************************/ -/* Convert special caracters (tqunicode) in */ +/* Convert special caracters (unicode) in */ /* latex usable caracters. */ /*******************************************/ TQString TextZone::escapeLatin1(TQString text) @@ -114,7 +114,7 @@ TQString TextZone::escapeLatin1(TQString text) }; TQString escapedText; - int tqunicode; /* the character to be escaped */ + int unicode; /* the character to be escaped */ escapedText = text; /* copy input text */ @@ -185,8 +185,8 @@ TQString TextZone::escapeLatin1(TQString text) for(int index = 0; index < 64; index++) { - tqunicode = CSTART + index; - convert(escapedText, tqunicode, escapes[index]); + unicode = CSTART + index; + convert(escapedText, unicode, escapes[index]); } convert(escapedText, 0X2020, "\\textdied{}"); /* textcomp */ @@ -259,12 +259,12 @@ TQString TextZone::escapeLatin1(TQString text) /* Convert all the instance of one */ /* character in latex usable caracter. */ /*******************************************/ -void TextZone::convert(TQString& text, int tqunicode, const char* escape) +void TextZone::convert(TQString& text, int unicode, const char* escape) { TQString expression; TQString value; - expression = TQString("\\x") + value.setNum(tqunicode, 16); + expression = TQString("\\x") + value.setNum(unicode, 16); if( !TQString(escape).isEmpty() ) { diff --git a/filters/kword/latex/export/textzone.h b/filters/kword/latex/export/textzone.h index fbc09280..848b276a 100644 --- a/filters/kword/latex/export/textzone.h +++ b/filters/kword/latex/export/textzone.h @@ -26,7 +26,7 @@ #ifndef __KWORD_LATEX_TEXTZONE_H__ #define __KWORD_LATEX_TEXTZONE_H__ -#include <tqtextstream.h> +#include <textstream.h> #include <tqstring.h> #include "textformat.h" @@ -81,7 +81,7 @@ class TextZone: public TextFormat /* ==== Helpfull functions ==== */ /** - * convert a tqunicode text in latin1 enconding ala latex. + * convert a unicode text in latin1 enconding ala latex. */ TQString escapeLatin1(TQString); diff --git a/filters/kword/latex/export/variablezone.cc b/filters/kword/latex/export/variablezone.cc index 09a16635..b73788b3 100644 --- a/filters/kword/latex/export/variablezone.cc +++ b/filters/kword/latex/export/variablezone.cc @@ -1,4 +1,4 @@ -/* MEMO: to see the tqunicode table +/* MEMO: to see the unicode table * xset +fp /usr/X11R6/lib/X11/fonts/ucs/ * xfd -fn '-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1' */ diff --git a/filters/kword/latex/export/variablezone.h b/filters/kword/latex/export/variablezone.h index a428984a..acdf06e5 100644 --- a/filters/kword/latex/export/variablezone.h +++ b/filters/kword/latex/export/variablezone.h @@ -26,7 +26,7 @@ #ifndef __KWORD_VARIABLEZONE_H__ #define __KWORD_VARIABLEZONE_H__ -#include <tqtextstream.h> +#include <textstream.h> #include <tqstring.h> #include "variableformat.h" diff --git a/filters/kword/latex/export/xml2latexparser.h b/filters/kword/latex/export/xml2latexparser.h index 38adc123..914cf3a2 100644 --- a/filters/kword/latex/export/xml2latexparser.h +++ b/filters/kword/latex/export/xml2latexparser.h @@ -23,7 +23,7 @@ #define __XML2LATEXPARSER_H__ #include <tqfile.h> /* for TQFile class */ -#include <tqtextstream.h> /* for TQTextStream class */ +#include <textstream.h> /* for TQTextStream class */ #include <tqstring.h> /* for TQString class */ #include "fileheader.h" #include "document.h" diff --git a/filters/kword/latex/export/xmlparser.cc b/filters/kword/latex/export/xmlparser.cc index 9c4c07e4..9d83bedb 100644 --- a/filters/kword/latex/export/xmlparser.cc +++ b/filters/kword/latex/export/xmlparser.cc @@ -104,18 +104,18 @@ bool XmlParser::isChild(TQDomNode balise, TQString name) TQDomNode XmlParser::getChild(TQDomNode balise, TQString name, int index) { if(balise.isElement()) { - TQDomNodeList tqchildren = balise.toElement().elementsByTagName(name); - if ( tqchildren.count() ) - return tqchildren.item(index); + TQDomNodeList children = balise.toElement().elementsByTagName(name); + if ( children.count() ) + return children.item(index); } return TQDomNode(); } TQDomNode XmlParser::getChild(TQDomNode balise, int index) { - TQDomNodeList tqchildren = balise.childNodes(); - if ( tqchildren.count() ) - return tqchildren.item(index); + TQDomNodeList children = balise.childNodes(); + if ( children.count() ) + return children.item(index); return TQDomNode(); } diff --git a/filters/kword/latex/import/generator/document.cc b/filters/kword/latex/import/generator/document.cc index 13685e02..aad270d8 100644 --- a/filters/kword/latex/import/generator/document.cc +++ b/filters/kword/latex/import/generator/document.cc @@ -18,7 +18,7 @@ */ #include <tqdom.h> -#include <tqtextstream.h> +#include <textstream.h> #include "kdebug.h" #include <KoStore.h> diff --git a/filters/kword/latex/import/lateximport.cc b/filters/kword/latex/import/lateximport.cc index f644910a..c1cd74c9 100644 --- a/filters/kword/latex/import/lateximport.cc +++ b/filters/kword/latex/import/lateximport.cc @@ -24,7 +24,7 @@ #include <kgenericfactory.h> #include <kglobal.h> #include <klocale.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include "lateximportdia.h" typedef KGenericFactory<LATEXImport, KoFilter> LATEXImportFactory; @@ -35,7 +35,7 @@ LATEXImport::LATEXImport(KoFilter *, const char *, const TQStringList&) : KoFilter() { } -KoFilter::ConversiontqStatus LATEXImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus LATEXImport::convert( const TQCString& from, const TQCString& to ) { TQString config; diff --git a/filters/kword/latex/import/lateximport.h b/filters/kword/latex/import/lateximport.h index 949d7163..0451ce78 100644 --- a/filters/kword/latex/import/lateximport.h +++ b/filters/kword/latex/import/lateximport.h @@ -21,7 +21,7 @@ #define __LATEXIMPORT_H__ #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfile.h> #include <tqobject.h> @@ -38,7 +38,7 @@ class LATEXImport : public KoFilter LATEXImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~LATEXImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif /* __LATEXIMPORT_H__ */ diff --git a/filters/kword/latex/import/lateximportdia.cc b/filters/kword/latex/import/lateximportdia.cc index 9489d491..8354b9ab 100644 --- a/filters/kword/latex/import/lateximportdia.cc +++ b/filters/kword/latex/import/lateximportdia.cc @@ -92,8 +92,8 @@ void LATEXImportDia::createDialog() TQBoxLayout *langLayout = new TQVBoxLayout(langBox); - tqunicodeRBtn = new TQRadioButton(i18n("Unicode"), langBox); - langLayout->addWidget(tqunicodeRBtn); + unicodeRBtn = new TQRadioButton(i18n("Unicode"), langBox); + langLayout->addWidget(unicodeRBtn); latin1RBtn = new TQRadioButton(i18n("latin1"), langBox); langLayout->addWidget(latin1RBtn); @@ -124,7 +124,7 @@ void LATEXImportDia::createDialog() docBox->setButton(0); /* NEW DOC IS THE DEFAULT. */ docLayout->activate(); - /* Display the main tqlayout */ + /* Display the main layout */ mainLayout->addStretch(5); mainLayout->activate(); } @@ -138,7 +138,7 @@ void LATEXImportDia::state() else if(embededRBtn == docBox->selected()) config.setType(TYPE_EMBEDED); - if(tqunicodeRBtn == langBox->selected()) + if(unicodeRBtn == langBox->selected()) config.setEncoding(ENC_UNICODE); else if(latin1RBtn == langBox->selected()) config.setEncoding(ENC_LATIN1); diff --git a/filters/kword/latex/import/lateximportdia.h b/filters/kword/latex/import/lateximportdia.h index b6f83baa..237b84b9 100644 --- a/filters/kword/latex/import/lateximportdia.h +++ b/filters/kword/latex/import/lateximportdia.h @@ -37,7 +37,7 @@ #include <tqwidget.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqvbuttongroup.h> @@ -72,7 +72,7 @@ class LATEXImportDia : public KDialogBase, public DCOPObject private: TQVButtonGroup* styleBox, *langBox, *docBox; TQRadioButton* latexStyleRBtn, *kwordStyleRBtn; /* Document style */ - TQRadioButton* tqunicodeRBtn, *latin1RBtn; /* Language */ + TQRadioButton* unicodeRBtn, *latin1RBtn; /* Language */ TQRadioButton* newDocRBtn, *embededRBtn; /* Latex file */ k_dcop: diff --git a/filters/kword/latex/import/parser/env.cc b/filters/kword/latex/import/parser/env.cc index e25e95ab..14abad37 100644 --- a/filters/kword/latex/import/parser/env.cc +++ b/filters/kword/latex/import/parser/env.cc @@ -47,10 +47,10 @@ Env::~Env() { } -void Env::setChildren(TQPtrList<Element>* tqchildren) +void Env::setChildren(TQPtrList<Element>* children) { - if(tqchildren != NULL) - _tqchildren = *tqchildren; + if(children != NULL) + _children = *children; } void Env::print(int tab) @@ -58,7 +58,7 @@ void Env::print(int tab) cout << "ENV " << getName().latin1() << "{" << endl; Element* elt; - for ( elt = _tqchildren.first(); elt; elt = _tqchildren.next() ) + for ( elt = _children.first(); elt; elt = _children.next() ) { elt->print(tab); } diff --git a/filters/kword/latex/import/parser/env.h b/filters/kword/latex/import/parser/env.h index cef56b29..191c0dd6 100644 --- a/filters/kword/latex/import/parser/env.h +++ b/filters/kword/latex/import/parser/env.h @@ -27,7 +27,7 @@ class Env: public Element { - TQPtrList<Element> _tqchildren; + TQPtrList<Element> _children; TQString _name; public: diff --git a/filters/kword/latex/status.html b/filters/kword/latex/status.html index ea2a527c..0b78eac2 100644 --- a/filters/kword/latex/status.html +++ b/filters/kword/latex/status.html @@ -131,14 +131,14 @@ <B>VERSION 1:</B> <table BORDER="0" WIDTH="100%"> <tr><td>text with accent</td> <td>DONE</td></tr> -<tr><td>text with special characters</td> <td>A LOT OF SPECIAL CHARS SUPPORTED for latin1 (all for tqunicode)!</td></tr> -<tr><td>tqlayout</td> <td>DONE</td></tr> +<tr><td>text with special characters</td> <td>A LOT OF SPECIAL CHARS SUPPORTED for latin1 (all for unicode)!</td></tr> +<tr><td>layout</td> <td>DONE</td></tr> <tr><td>title</td> <td>DONE</td></tr> <tr><td>list</td> <td>DONE</td></tr> <tr><td>paper</td> <td>DONE</td></tr> <tr><td>footnote, head</td> <td>DONE (still a little bug for first foot/header and a line is added)</td></tr> <tr><td>comments with kdoc</td> <td>STARTED</td></tr> -<tr><td>tqunicode support</td> <td>DONE (omega package)</td></tr> +<tr><td>unicode support</td> <td>DONE (omega package)</td></tr> <tr><td>break (line, page)</td> <td>STARTED</td></tr> <tr><td>indent list</td> <td></td></tr> </table> @@ -209,7 +209,7 @@ <ul> <li>features <ul> - <li>support of tqunicode with omega</li> + <li>support of unicode with omega</li> </ul> </li> </ul> diff --git a/filters/kword/libexport/KWEFBaseWorker.cc b/filters/kword/libexport/KWEFBaseWorker.cc index d3d41ff3..a47f647d 100644 --- a/filters/kword/libexport/KWEFBaseWorker.cc +++ b/filters/kword/libexport/KWEFBaseWorker.cc @@ -62,7 +62,7 @@ bool KWEFBaseWorker::doFullAllParagraphs (const TQValueList<ParaData>& paraList) TQValueList<ParaData>::ConstIterator end(paraList.end()); for (it=paraList.begin();it!=end;++it) { - if (!doFullParagraph((*it).text,(*it).tqlayout,(*it).formattingList)) + if (!doFullParagraph((*it).text,(*it).layout,(*it).formattingList)) return false; } return true; diff --git a/filters/kword/libexport/KWEFBaseWorker.h b/filters/kword/libexport/KWEFBaseWorker.h index e2046913..67cdb691 100644 --- a/filters/kword/libexport/KWEFBaseWorker.h +++ b/filters/kword/libexport/KWEFBaseWorker.h @@ -57,7 +57,7 @@ class KOFFICEFILTER_EXPORT KWEFBaseWorker virtual bool doVariableSettings (const VariableSettingsData &varSettings); virtual bool doFullDocument (const TQValueList<ParaData> &); virtual bool doFullAllParagraphs (const TQValueList<ParaData>& paraList); - virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout, + virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout, const ValueListFormatData& paraFormatDataList); virtual bool doFullPaperFormat (const int format, const double width, const double height, const int orientation); ///< Like AbiWord's \<papersize\> @@ -77,7 +77,7 @@ class KOFFICEFILTER_EXPORT KWEFBaseWorker virtual bool doCloseBody (void); ///< Like HTML's \</BODY\> virtual bool doOpenStyles (void); ///< Like HTML's \<style\> virtual bool doCloseStyles (void); ///< Like HTML's \</style\> - virtual bool doFullDefineStyle (LayoutData& tqlayout); ///< Defines a single style + virtual bool doFullDefineStyle (LayoutData& layout); ///< Defines a single style virtual bool doOpenSpellCheckIgnoreList (void); ///< like AbiWord's \<ignorewords\> and KWord's \<SPELLCHECKIGNORELIST\> virtual bool doCloseSpellCheckIgnoreList (void); ///< like AbiWord's \</ignorewords\> and Kwords \</SPELLCHECKIGNORELIST\> virtual bool doFullSpellCheckIgnoreWord (const TQString& ignoreword); ///< like AbiWord's \<iw\> and Kwords \</SPELLCHECKIGNOREWORD\> diff --git a/filters/kword/libexport/KWEFKWordLeader.cc b/filters/kword/libexport/KWEFKWordLeader.cc index 3e9a724e..a3fca243 100644 --- a/filters/kword/libexport/KWEFKWordLeader.cc +++ b/filters/kword/libexport/KWEFKWordLeader.cc @@ -189,11 +189,11 @@ static void ProcessParagraphTag ( TQDomNode myNode, TQValueList<TagProcessing> tagProcessingList; tagProcessingList << TagProcessing ( "TEXT", ProcessTextTag, ¶Data.text ) << TagProcessing ( "FORMATS", ProcessFormatsTag, ¶Data.formattingList ) - << TagProcessing ( "LAYOUT", ProcessLayoutTag, ¶Data.tqlayout ); + << TagProcessing ( "LAYOUT", ProcessLayoutTag, ¶Data.layout ); if ( leader->m_oldSyntax ) { - tagProcessingList.append( TagProcessing( "HARDBRK", ProcessHardBrkTag, ¶Data.tqlayout.pageBreakBefore ) ); + tagProcessingList.append( TagProcessing( "HARDBRK", ProcessHardBrkTag, ¶Data.layout.pageBreakBefore ) ); } ProcessSubtags (myNode, tagProcessingList, leader); @@ -203,9 +203,9 @@ static void ProcessParagraphTag ( TQDomNode myNode, // TODO/FIXME: why !paraData.text.isEmpty() if ( paraData.formattingList.isEmpty () && !paraData.text.isEmpty () ) { - if ( paraData.tqlayout.formatData.id == 1 ) + if ( paraData.layout.formatData.id == 1 ) { - paraData.formattingList << paraData.tqlayout.formatData; + paraData.formattingList << paraData.layout.formatData; } else { @@ -591,11 +591,11 @@ static void ProcessFramesetsTag ( TQDomNode myNode, static void ProcessStyleTag (TQDomNode myNode, void *, KWEFKWordLeader *leader ) { - LayoutData tqlayout; + LayoutData layout; - ProcessLayoutTag (myNode, &tqlayout, leader); + ProcessLayoutTag (myNode, &layout, leader); - leader->doFullDefineStyle (tqlayout); + leader->doFullDefineStyle (layout); } @@ -1227,10 +1227,10 @@ bool KWEFKWordLeader::doFullPaperFormatOther ( const int columns, const double c return false; } -bool KWEFKWordLeader::doFullDefineStyle ( LayoutData &tqlayout ) +bool KWEFKWordLeader::doFullDefineStyle ( LayoutData &layout ) { if ( m_worker ) - return m_worker->doFullDefineStyle (tqlayout); + return m_worker->doFullDefineStyle (layout); return false; } @@ -1280,7 +1280,7 @@ static bool ParseFile ( TQIODevice* subFile, TQDomDocument& doc) << " Message: " << errorMsg << endl; // ### TODO: the error is in which sub-file? KMessageBox::error( 0L, i18n("An error has occurred while parsing the KWord file.\nAt line: %1, column %2\nError message: %3") - .tqarg( errorLine ).tqarg( errorColumn ).tqarg(i18n( "TQXml", errorMsg.utf8() ) ), + .arg( errorLine ).arg( errorColumn ).arg(i18n( "TQXml", errorMsg.utf8() ) ), i18n("KWord Export Filter Library"), 0 ); return false; } @@ -1361,7 +1361,7 @@ bool KWEFKWordLeader::loadSubFile(const TQString& fileName, TQByteArray& array) return true; } -KoFilter::ConversiontqStatus KWEFKWordLeader::convert( KoFilterChain* chain, +KoFilter::ConversionStatus KWEFKWordLeader::convert( KoFilterChain* chain, const TQCString& from, const TQCString& to) { if ( from != "application/x-kword" ) diff --git a/filters/kword/libexport/KWEFKWordLeader.h b/filters/kword/libexport/KWEFKWordLeader.h index 78ce1348..fc7e787a 100644 --- a/filters/kword/libexport/KWEFKWordLeader.h +++ b/filters/kword/libexport/KWEFKWordLeader.h @@ -38,7 +38,7 @@ class KOFFICEFILTER_EXPORT KWEFKWordLeader public: void setWorker ( KWEFBaseWorker *newWorker ); KWEFBaseWorker *getWorker(void) const; - KoFilter::ConversiontqStatus convert( KoFilterChain* chain, + KoFilter::ConversionStatus convert( KoFilterChain* chain, const TQCString& from, const TQCString& to); public: // ### TODO: where to put in the end? void createBookmarkFormatData( ParaData& paraData ); @@ -63,7 +63,7 @@ class KOFFICEFILTER_EXPORT KWEFKWordLeader bool doCloseBody (void); bool doOpenStyles (void); bool doCloseStyles (void); - bool doFullDefineStyle (LayoutData& tqlayout); + bool doFullDefineStyle (LayoutData& layout); bool doOpenSpellCheckIgnoreList (void); bool doCloseSpellCheckIgnoreList (void); bool doFullSpellCheckIgnoreWord (const TQString& ignoreword); diff --git a/filters/kword/libexport/KWEFStructures.h b/filters/kword/libexport/KWEFStructures.h index dbee22d0..682606fe 100644 --- a/filters/kword/libexport/KWEFStructures.h +++ b/filters/kword/libexport/KWEFStructures.h @@ -412,7 +412,7 @@ public: virtual ~TabulatorList(void) {} }; -/// Paragraph tqlayout +/// Paragraph layout class LayoutData { public: @@ -428,7 +428,7 @@ public: TQString styleName; TQString styleFollowing; - TQString tqalignment; ///< left, right, center, justify + TQString alignment; ///< left, right, center, justify CounterData counter; FormatData formatData; double indentFirst; ///< indentation correction of first line (can be negative!) @@ -459,7 +459,7 @@ struct ParaData { TQString text; ValueListFormatData formattingList; - LayoutData tqlayout; + LayoutData layout; }; struct HeaderFooterData diff --git a/filters/kword/libexport/KWEFUtil.cc b/filters/kword/libexport/KWEFUtil.cc index 56e2b669..32b5eac2 100644 --- a/filters/kword/libexport/KWEFUtil.cc +++ b/filters/kword/libexport/KWEFUtil.cc @@ -19,7 +19,7 @@ */ #include <tqstring.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <KoPageLayout.h> @@ -36,7 +36,7 @@ TQString KWEFUtil::EscapeSgmlText(const TQTextCodec* codec, for (uint i=0; i<strIn.length(); i++) { ch=strIn[i]; - switch (ch.tqunicode()) + switch (ch.unicode()) { case 38: // & { @@ -78,7 +78,7 @@ TQString KWEFUtil::EscapeSgmlText(const TQTextCodec* codec, { if (!codec->canEncode(ch)) { - strReturn+=TQString("&#%1;").tqarg(ch.tqunicode()); + strReturn+=TQString("&#%1;").arg(ch.unicode()); break; } } diff --git a/filters/kword/libexport/ProcessDocument.cc b/filters/kword/libexport/ProcessDocument.cc index ed5a7bfc..3a626f7f 100644 --- a/filters/kword/libexport/ProcessDocument.cc +++ b/filters/kword/libexport/ProcessDocument.cc @@ -438,7 +438,7 @@ static void ProcessNoteTag (TQDomNode myNode, void *tagData, KWEFKWordLeader *le variable->setGenericData( "note", note ); } -// ### TODO: some files have not a <VARIABLE> tag but its supposed tqchildren are directly tqchildren of <FORMAT id="4"> +// ### TODO: some files have not a <VARIABLE> tag but its supposed children are directly children of <FORMAT id="4"> static void ProcessVariableTag (TQDomNode myNode, void* tagData, KWEFKWordLeader* leader) { VariableData *variable = (VariableData *) tagData; @@ -607,7 +607,7 @@ static void SubProcessFormatSixTag(TQDomNode myNode, TQString instance; TQValueList<TagProcessing> tagProcessingList; - // TODO: We can have all tqlayout information as in regular texts + // TODO: We can have all layout information as in regular texts // They simply apply to the table frames // FONT is just the first that we've come across so far tagProcessingList << TagProcessing ( "FONT" ) @@ -765,12 +765,12 @@ static void ProcessLayoutTabulatorTag ( TQDomNode myNode, void *tagData, KWEFKWo static void ProcessIndentsTag (TQDomNode myNode, void *tagData, KWEFKWordLeader *leader ) { - LayoutData *tqlayout = (LayoutData *) tagData; + LayoutData *layout = (LayoutData *) tagData; TQValueList<AttrProcessing> attrProcessingList; - attrProcessingList << AttrProcessing ("first" , tqlayout->indentFirst ); - attrProcessingList << AttrProcessing ("left" , tqlayout->indentLeft ); - attrProcessingList << AttrProcessing ("right" , tqlayout->indentRight ); + attrProcessingList << AttrProcessing ("first" , layout->indentFirst ); + attrProcessingList << AttrProcessing ("left" , layout->indentLeft ); + attrProcessingList << AttrProcessing ("right" , layout->indentRight ); ProcessAttributes (myNode, attrProcessingList); AllowNoSubtags (myNode, leader); @@ -779,11 +779,11 @@ static void ProcessIndentsTag (TQDomNode myNode, void *tagData, KWEFKWordLeader static void ProcessLayoutOffsetTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader ) { - LayoutData *tqlayout = (LayoutData *) tagData; + LayoutData *layout = (LayoutData *) tagData; TQValueList<AttrProcessing> attrProcessingList; - attrProcessingList << AttrProcessing ("after" , tqlayout->marginBottom ); - attrProcessingList << AttrProcessing ("before" , tqlayout->marginTop ); + attrProcessingList << AttrProcessing ("after" , layout->marginBottom ); + attrProcessingList << AttrProcessing ("before" , layout->marginTop ); ProcessAttributes (myNode, attrProcessingList); AllowNoSubtags (myNode, leader); @@ -792,14 +792,14 @@ static void ProcessLayoutOffsetTag ( TQDomNode myNode, void *tagData, KWEFKWordL static void ProcessLineBreakingTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader ) { - LayoutData *tqlayout = (LayoutData *) tagData; + LayoutData *layout = (LayoutData *) tagData; TQString strBefore, strAfter; TQValueList<AttrProcessing> attrProcessingList; - attrProcessingList << AttrProcessing ( "linesTogether", tqlayout->keepLinesTogether ); - attrProcessingList << AttrProcessing ( "hardFrameBreak", tqlayout->pageBreakBefore ); - attrProcessingList << AttrProcessing ( "hardFrameBreakAfter", tqlayout->pageBreakAfter ); + attrProcessingList << AttrProcessing ( "linesTogether", layout->keepLinesTogether ); + attrProcessingList << AttrProcessing ( "hardFrameBreak", layout->pageBreakBefore ); + attrProcessingList << AttrProcessing ( "hardFrameBreakAfter", layout->pageBreakAfter ); attrProcessingList << AttrProcessing ( "keepWithNext" ); // RTF import filter ProcessAttributes (myNode, attrProcessingList); @@ -809,21 +809,21 @@ static void ProcessLineBreakingTag ( TQDomNode myNode, void *tagData, KWEFKWordL static void ProcessShadowTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader) { - LayoutData *tqlayout = (LayoutData *) tagData; + LayoutData *layout = (LayoutData *) tagData; int red=0; int green=0; int blue=0; TQValueList<AttrProcessing> attrProcessingList; - attrProcessingList << AttrProcessing ( "distance", tqlayout->shadowDistance ); - attrProcessingList << AttrProcessing ( "direction", tqlayout->shadowDirection ); + attrProcessingList << AttrProcessing ( "distance", layout->shadowDistance ); + attrProcessingList << AttrProcessing ( "direction", layout->shadowDirection ); attrProcessingList << AttrProcessing ( "red", red ); attrProcessingList << AttrProcessing ( "green", green ); attrProcessingList << AttrProcessing ( "blue", blue ); ProcessAttributes (myNode, attrProcessingList); - tqlayout->shadowColor.setRgb(red,green,blue); + layout->shadowColor.setRgb(red,green,blue); AllowNoSubtags (myNode, leader); } @@ -856,7 +856,7 @@ static void ProcessFollowingTag ( TQDomNode myNode, void *tagData, KWEFKWordLead static void ProcessLinespacingTag (TQDomNode myNode, void *tagData, KWEFKWordLeader* /*leader*/ ) { - LayoutData *tqlayout = (LayoutData *) tagData; + LayoutData *layout = (LayoutData *) tagData; TQString oldValue, spacingType; double spacingValue; @@ -873,9 +873,9 @@ static void ProcessLinespacingTag (TQDomNode myNode, void *tagData, KWEFKWordLea { // for old format if( oldValue == "oneandhalf" ) - tqlayout->lineSpacingType = LayoutData::LS_ONEANDHALF; + layout->lineSpacingType = LayoutData::LS_ONEANDHALF; else if ( oldValue == "double" ) - tqlayout->lineSpacingType = LayoutData::LS_DOUBLE; + layout->lineSpacingType = LayoutData::LS_DOUBLE; else { bool ok = false; @@ -883,38 +883,38 @@ static void ProcessLinespacingTag (TQDomNode myNode, void *tagData, KWEFKWordLea if ( ok && ( size >= 0.0 ) ) // 0 is allowed but negative values are not { // We have a valid size - tqlayout->lineSpacingType = LayoutData::LS_CUSTOM; // set to custom - tqlayout->lineSpacing = size; + layout->lineSpacingType = LayoutData::LS_CUSTOM; // set to custom + layout->lineSpacing = size; } else - tqlayout->lineSpacingType = LayoutData::LS_SINGLE; // assume single linespace + layout->lineSpacingType = LayoutData::LS_SINGLE; // assume single linespace } } else { // for new format if( spacingType == "oneandhalf" ) - tqlayout->lineSpacingType = LayoutData::LS_ONEANDHALF; + layout->lineSpacingType = LayoutData::LS_ONEANDHALF; else if ( spacingType == "double" ) - tqlayout->lineSpacingType = LayoutData::LS_DOUBLE; + layout->lineSpacingType = LayoutData::LS_DOUBLE; else if ( spacingType == "custom" ) - tqlayout->lineSpacingType = LayoutData::LS_CUSTOM; + layout->lineSpacingType = LayoutData::LS_CUSTOM; else if ( spacingType == "atleast" ) - tqlayout->lineSpacingType = LayoutData::LS_ATLEAST; + layout->lineSpacingType = LayoutData::LS_ATLEAST; else if ( spacingType == "multiple" ) - tqlayout->lineSpacingType = LayoutData::LS_MULTIPLE; + layout->lineSpacingType = LayoutData::LS_MULTIPLE; else if ( spacingType == "fixed" ) - tqlayout->lineSpacingType = LayoutData::LS_FIXED; + layout->lineSpacingType = LayoutData::LS_FIXED; else - tqlayout->lineSpacingType = LayoutData::LS_SINGLE; // assume single linespace - tqlayout->lineSpacing = spacingValue; + layout->lineSpacingType = LayoutData::LS_SINGLE; // assume single linespace + layout->lineSpacing = spacingValue; } } static void ProcessLineSpaceTag (TQDomNode myNode, void *tagData, KWEFKWordLeader* /*leader*/ ) { // <LINESPACE> is an old tag, of before syntax 1 - LayoutData *tqlayout = (LayoutData *) tagData; + LayoutData *layout = (LayoutData *) tagData; double spacingValue = 0.0; TQValueList<AttrProcessing> attrProcessingList; @@ -923,13 +923,13 @@ static void ProcessLineSpaceTag (TQDomNode myNode, void *tagData, KWEFKWordLeade attrProcessingList << AttrProcessing ( "inch" ); ProcessAttributes (myNode, attrProcessingList); - tqlayout->lineSpacingType = LayoutData::LS_CUSTOM; // set to custom - tqlayout->lineSpacing = spacingValue; + layout->lineSpacingType = LayoutData::LS_CUSTOM; // set to custom + layout->lineSpacing = spacingValue; } static void ProcessFlowTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader ) { - LayoutData *tqlayout = (LayoutData *) tagData; + LayoutData *layout = (LayoutData *) tagData; TQString oldAlign, normalAlign; @@ -948,7 +948,7 @@ static void ProcessFlowTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *l { if ( oldAlign.isEmpty() ) { - tqlayout->tqalignment = "left"; // KWord 0.8 did not support right-to-left + layout->alignment = "left"; // KWord 0.8 did not support right-to-left } else { @@ -956,19 +956,19 @@ static void ProcessFlowTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *l if ( ( align < 0 ) || ( align > 3) ) { kdWarning(30508) << "KWord 0.8 flow unknown: " << oldAlign << endl; - tqlayout->tqalignment = "left"; // Unknown, so assume left + layout->alignment = "left"; // Unknown, so assume left } else { const char* flows[]={"left", "right", "center", "justify" }; - tqlayout->tqalignment = flows[ align ]; + layout->alignment = flows[ align ]; } } - kdDebug(30508) << "KWord 0.8 flow: " << oldAlign << " corrected: " << tqlayout->tqalignment << endl; + kdDebug(30508) << "KWord 0.8 flow: " << oldAlign << " corrected: " << layout->alignment << endl; } else { - tqlayout->tqalignment = normalAlign; + layout->alignment = normalAlign; } } @@ -981,36 +981,36 @@ void ProcessLayoutTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader attrProcessingList << AttrProcessing ( "outline" ); // Only in <STYLE> ProcessAttributes (myNode, attrProcessingList); - LayoutData *tqlayout = (LayoutData *) tagData; + LayoutData *layout = (LayoutData *) tagData; ValueListFormatData formatDataList; TQValueList<TagProcessing> tagProcessingList; - tagProcessingList << TagProcessing ( "NAME", ProcessStringValueTag, &tqlayout->styleName ); - tagProcessingList << TagProcessing ( "FOLLOWING", ProcessFollowingTag, &tqlayout->styleFollowing ); - tagProcessingList << TagProcessing ( "FLOW", ProcessFlowTag, tqlayout ); - tagProcessingList << TagProcessing ( "INDENTS", ProcessIndentsTag, tqlayout ); - tagProcessingList << TagProcessing ( "OFFSETS", ProcessLayoutOffsetTag, tqlayout ); - tagProcessingList << TagProcessing ( "LINESPACING", ProcessLinespacingTag, tqlayout ); - tagProcessingList << TagProcessing ( "PAGEBREAKING", ProcessLineBreakingTag, tqlayout ); - tagProcessingList << TagProcessing ( "LEFTBORDER", ProcessAnyBorderTag, &tqlayout->leftBorder ); - tagProcessingList << TagProcessing ( "RIGHTBORDER", ProcessAnyBorderTag, &tqlayout->rightBorder ); - tagProcessingList << TagProcessing ( "TOPBORDER", ProcessAnyBorderTag, &tqlayout->topBorder ); - tagProcessingList << TagProcessing ( "BOTTOMBORDER", ProcessAnyBorderTag, &tqlayout->bottomBorder ); - tagProcessingList << TagProcessing ( "COUNTER", ProcessCounterTag, &tqlayout->counter ); + tagProcessingList << TagProcessing ( "NAME", ProcessStringValueTag, &layout->styleName ); + tagProcessingList << TagProcessing ( "FOLLOWING", ProcessFollowingTag, &layout->styleFollowing ); + tagProcessingList << TagProcessing ( "FLOW", ProcessFlowTag, layout ); + tagProcessingList << TagProcessing ( "INDENTS", ProcessIndentsTag, layout ); + tagProcessingList << TagProcessing ( "OFFSETS", ProcessLayoutOffsetTag, layout ); + tagProcessingList << TagProcessing ( "LINESPACING", ProcessLinespacingTag, layout ); + tagProcessingList << TagProcessing ( "PAGEBREAKING", ProcessLineBreakingTag, layout ); + tagProcessingList << TagProcessing ( "LEFTBORDER", ProcessAnyBorderTag, &layout->leftBorder ); + tagProcessingList << TagProcessing ( "RIGHTBORDER", ProcessAnyBorderTag, &layout->rightBorder ); + tagProcessingList << TagProcessing ( "TOPBORDER", ProcessAnyBorderTag, &layout->topBorder ); + tagProcessingList << TagProcessing ( "BOTTOMBORDER", ProcessAnyBorderTag, &layout->bottomBorder ); + tagProcessingList << TagProcessing ( "COUNTER", ProcessCounterTag, &layout->counter ); tagProcessingList << TagProcessing ( "FORMAT", ProcessFormatTag, &formatDataList ); - tagProcessingList << TagProcessing ( "TABULATOR", ProcessLayoutTabulatorTag, &tqlayout->tabulatorList ); - tagProcessingList << TagProcessing ( "SHADOW", ProcessShadowTag, tqlayout ); + tagProcessingList << TagProcessing ( "TABULATOR", ProcessLayoutTabulatorTag, &layout->tabulatorList ); + tagProcessingList << TagProcessing ( "SHADOW", ProcessShadowTag, layout ); if ( leader->m_oldSyntax ) { - tqlayout->indentLeft = 0.0; // ### TODO: needed or not? + layout->indentLeft = 0.0; // ### TODO: needed or not? tagProcessingList - << TagProcessing ( "OHEAD", ProcessOldLayoutChildTag, &tqlayout->marginTop ) - << TagProcessing ( "OFOOT", ProcessOldLayoutChildTag, &tqlayout->marginBottom ) - << TagProcessing ( "ILEFT", ProcessOldLayoutChildTag, &tqlayout->indentLeft ) - << TagProcessing ( "IFIRST", ProcessOldLayoutChildTag, &tqlayout->indentFirst ) - << TagProcessing ( "LINESPACE", ProcessLineSpaceTag, tqlayout ) + << TagProcessing ( "OHEAD", ProcessOldLayoutChildTag, &layout->marginTop ) + << TagProcessing ( "OFOOT", ProcessOldLayoutChildTag, &layout->marginBottom ) + << TagProcessing ( "ILEFT", ProcessOldLayoutChildTag, &layout->indentLeft ) + << TagProcessing ( "IFIRST", ProcessOldLayoutChildTag, &layout->indentFirst ) + << TagProcessing ( "LINESPACE", ProcessLineSpaceTag, layout ) ; } @@ -1023,7 +1023,7 @@ void ProcessLayoutTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader } else { - tqlayout->formatData = formatDataList.first (); + layout->formatData = formatDataList.first (); if ( formatDataList.count () > 1 ) { @@ -1031,10 +1031,10 @@ void ProcessLayoutTag ( TQDomNode myNode, void *tagData, KWEFKWordLeader *leader } } - if ( tqlayout->styleName.isEmpty () ) + if ( layout->styleName.isEmpty () ) { - tqlayout->styleName = "Standard"; - kdWarning (30508) << "Empty tqlayout name!" << endl; + layout->styleName = "Standard"; + kdWarning (30508) << "Empty layout name!" << endl; } } diff --git a/filters/kword/msword/conversion.cpp b/filters/kword/msword/conversion.cpp index 6bd895b9..595c026c 100644 --- a/filters/kword/msword/conversion.cpp +++ b/filters/kword/msword/conversion.cpp @@ -246,7 +246,7 @@ int Conversion::ditheringToGray( int ipat, bool* ok ) } } -TQString Conversion::tqalignment( int jc ) { +TQString Conversion::alignment( int jc ) { TQString value( "left" ); if ( jc == 1 ) value = "center"; diff --git a/filters/kword/msword/conversion.h b/filters/kword/msword/conversion.h index fd30c69f..f8610415 100644 --- a/filters/kword/msword/conversion.h +++ b/filters/kword/msword/conversion.h @@ -57,8 +57,8 @@ namespace Conversion // Hackery for gray levels int ditheringToGray( int ipat, bool* ok ); - // Convert tqalignment code to string - TQString tqalignment( int jc ); + // Convert alignment code to string + TQString alignment( int jc ); // Convert linespacing struct to string TQString lineSpacing( const wvWare::Word97::LSPD& lspd ); diff --git a/filters/kword/msword/document.cpp b/filters/kword/msword/document.cpp index 5044f023..ab70c79a 100644 --- a/filters/kword/msword/document.cpp +++ b/filters/kword/msword/document.cpp @@ -328,10 +328,10 @@ void Document::footnoteStart() framesetElement.setAttribute( "frameInfo", 7 /* footnote/endnote */ ); if ( type == wvWare::FootnoteData::Endnote ) // Keep name in sync with KWordTextHandler::footnoteFound - framesetElement.setAttribute("name", i18n("Endnote %1").tqarg( ++m_endNoteNumber ) ); + framesetElement.setAttribute("name", i18n("Endnote %1").arg( ++m_endNoteNumber ) ); else // Keep name in sync with KWordTextHandler::footnoteFound - framesetElement.setAttribute("name", i18n("Footnote %1").tqarg( ++m_footNoteNumber ) ); + framesetElement.setAttribute("name", i18n("Footnote %1").arg( ++m_footNoteNumber ) ); m_framesetsElement.appendChild(framesetElement); createInitialFrame( framesetElement, 29, 798, 567, 567+41, true, NoFollowup ); @@ -352,7 +352,7 @@ void Document::slotTableCellStart( int row, int column, int rowSpan, int columnS framesetElement.setAttribute( "frameType", 1 /* text */ ); framesetElement.setAttribute( "frameInfo", 0 /* normal text */ ); framesetElement.setAttribute( "grpMgr", tableName ); - TQString name = i18n("Table_Name Cell row,column", "%1 Cell %2,%3").tqarg(tableName).tqarg(row).tqarg(column); + TQString name = i18n("Table_Name Cell row,column", "%1 Cell %2,%3").arg(tableName).arg(row).arg(column); framesetElement.setAttribute( "name", name ); framesetElement.setAttribute( "row", row ); framesetElement.setAttribute( "col", column ); diff --git a/filters/kword/msword/mswordimport.cpp b/filters/kword/msword/mswordimport.cpp index 3be95f7a..714db274 100644 --- a/filters/kword/msword/mswordimport.cpp +++ b/filters/kword/msword/mswordimport.cpp @@ -41,7 +41,7 @@ MSWordImport::~MSWordImport() { } -KoFilter::ConversiontqStatus MSWordImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus MSWordImport::convert( const TQCString& from, const TQCString& to ) { // check for proper conversion if ( to != "application/x-kword" || from != "application/msword" ) diff --git a/filters/kword/msword/mswordimport.h b/filters/kword/msword/mswordimport.h index 73a568ff..ae348fc7 100644 --- a/filters/kword/msword/mswordimport.h +++ b/filters/kword/msword/mswordimport.h @@ -33,7 +33,7 @@ public: MSWordImport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~MSWordImport(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: void prepareDocument( TQDomDocument& mainDocument, TQDomElement& framesetsElem ); diff --git a/filters/kword/msword/texthandler.cpp b/filters/kword/msword/texthandler.cpp index 07eb3da7..242a6d39 100644 --- a/filters/kword/msword/texthandler.cpp +++ b/filters/kword/msword/texthandler.cpp @@ -123,10 +123,10 @@ void KWordTextHandler::footnoteFound( wvWare::FootnoteData::Type type, footnoteElem.setAttribute( "numberingtype", autoNumbered ? "auto" : "manual" ); if ( type == wvWare::FootnoteData::Endnote ) // Keep name in sync with Document::startFootnote - footnoteElem.setAttribute( "frameset", i18n("Endnote %1").tqarg( ++m_endNoteNumber ) ); + footnoteElem.setAttribute( "frameset", i18n("Endnote %1").arg( ++m_endNoteNumber ) ); else // Keep name in sync with Document::startFootnote - footnoteElem.setAttribute( "frameset", i18n("Footnote %1").tqarg( ++m_footNoteNumber ) ); + footnoteElem.setAttribute( "frameset", i18n("Footnote %1").arg( ++m_footNoteNumber ) ); varElem.appendChild( footnoteElem ); // Remember to parse the footnote text later @@ -160,7 +160,7 @@ void KWordTextHandler::tableRowFound( const wvWare::TableRowFunctor& functor, wv paragraphStart( 0L ); static int s_tableNumber = 0; m_currentTable = new KWord::Table(); - m_currentTable->name = i18n("Table %1").tqarg( ++s_tableNumber ); + m_currentTable->name = i18n("Table %1").arg( ++s_tableNumber ); insertAnchor( m_currentTable->name ); } @@ -181,7 +181,7 @@ void KWordTextHandler::pictureFound( const wvWare::PictureFunctor& pictureFuncto TQString pictureName = "pictures/picture"; pictureName += TQString::number( s_pictureNumber ); // filenames start at 0 // looks better to the user if frame names start at 1 - TQString frameName = i18n("Picture %1").tqarg( ++s_pictureNumber ); + TQString frameName = i18n("Picture %1").arg( ++s_pictureNumber ); insertAnchor( frameName ); switch ( picf->mfp.mm ) { @@ -464,7 +464,7 @@ void KWordTextHandler::writeFormat( TQDomElement& parentElement, const wvWare::W int dist = fontSize > 20 ? 2 : 1; if (chp->fImprint) // ## no real support for imprint, we use a topleft shadow dist = -dist; - css = TQString::tqfromLatin1("#bebebe %1pt %1pt").tqarg(dist).tqarg(dist); + css = TQString::fromLatin1("#bebebe %1pt %1pt").arg(dist).arg(dist); } shadowElem.setAttribute( "text-shadow", css ); format.appendChild( shadowElem ); @@ -568,16 +568,16 @@ void KWordTextHandler::writeOutParagraph( const TQString& styleName, const TQStr m_paragraph = TQString( "" ); m_index = 0; - m_oldLayout = layoutElement; // Keep a reference to the old tqlayout for some hacks + m_oldLayout = layoutElement; // Keep a reference to the old layout for some hacks } void KWordTextHandler::writeLayout( TQDomElement& parentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style ) { const wvWare::Word97::PAP& pap = paragraphProperties.pap(); - // Always write out the tqalignment, it's required + // Always write out the alignment, it's required TQDomElement flowElement = mainDocument().createElement("FLOW"); - TQString tqalignment = Conversion::tqalignment( pap.jc ); - flowElement.setAttribute( "align", tqalignment ); + TQString alignment = Conversion::alignment( pap.jc ); + flowElement.setAttribute( "align", alignment ); parentElement.appendChild( flowElement ); //kdDebug(30513) << k_funcinfo << " dxaLeft1=" << pap.dxaLeft1 << " dxaLeft=" << pap.dxaLeft << " dxaRight=" << pap.dxaRight << " dyaBefore=" << pap.dyaBefore << " dyaAfter=" << pap.dyaAfter << " lspd=" << pap.lspd.dyaLine << "/" << pap.lspd.fMultLinespace << endl; @@ -659,7 +659,7 @@ void KWordTextHandler::writeLayout( TQDomElement& parentElement, const wvWare::P // which kword doesn't support. We map it to 0 with a clever '%4' :) tabElement.setAttribute( "type", td.tbd.jc % 4 ); int filling = 0; - double width = 0.5; // default kword value, see koparagtqlayout.cc + double width = 0.5; // default kword value, see koparaglayout.cc switch ( td.tbd.tlc ) { case 1: // dots case 2: // hyphenated @@ -810,7 +810,7 @@ void KWordTextHandler::writeCounter( TQDomElement& parentElement, const wvWare:: ( numberingType == 0 &&m_previousEnumLSID != 0 && m_previousEnumLSID != listInfo->lsid() ) ) counterElement.setAttribute( "restart", "true" ); - // listInfo->tqalignment() is not supported in KWord + // listInfo->alignment() is not supported in KWord // listInfo->isLegal() hmm // listInfo->notRestarted() [by higher level of lists] not supported // listInfo->followingchar() ignored, it's always a space in KWord currently diff --git a/filters/kword/msword/texthandler.h b/filters/kword/msword/texthandler.h index ebea5202..c75cfd4e 100644 --- a/filters/kword/msword/texthandler.h +++ b/filters/kword/msword/texthandler.h @@ -88,7 +88,7 @@ public: // Returns that element into pChildElement if set (in that case even an empty FORMAT can be appended) void writeFormat( TQDomElement& parentElement, const wvWare::Word97::CHP* chp, const wvWare::Word97::CHP* refChp, int pos, int len, int formatId, TQDomElement* pChildElement ); - // Write the _contents_ (tqchildren) of a <LAYOUT> or <STYLE> tag, from the given parag props + // Write the _contents_ (children) of a <LAYOUT> or <STYLE> tag, from the given parag props void writeLayout( TQDomElement& parentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style ); // Communication with Document, without having to know about Document diff --git a/filters/kword/mswrite/ImportDialog.cc b/filters/kword/mswrite/ImportDialog.cc index 460677cb..bf9c0668 100644 --- a/filters/kword/mswrite/ImportDialog.cc +++ b/filters/kword/mswrite/ImportDialog.cc @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include <tqtextcodec.h> +#include <textcodec.h> #include <klocale.h> #include <kcharsets.h> @@ -29,7 +29,7 @@ #include <ImportDialogUI.h> #include <ImportDialog.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqvbuttongroup.h> #include <tqcombobox.h> diff --git a/filters/kword/mswrite/ImportDialogUI.ui b/filters/kword/mswrite/ImportDialogUI.ui index db7dcc20..bed2bad1 100644 --- a/filters/kword/mswrite/ImportDialogUI.ui +++ b/filters/kword/mswrite/ImportDialogUI.ui @@ -92,7 +92,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -126,7 +126,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -187,7 +187,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -218,7 +218,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -237,7 +237,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/filters/kword/mswrite/mswriteexport.cc b/filters/kword/mswrite/mswriteexport.cc index 02d980ef..b645649b 100644 --- a/filters/kword/mswrite/mswriteexport.cc +++ b/filters/kword/mswrite/mswriteexport.cc @@ -26,7 +26,7 @@ #include <tqfile.h> #include <tqfont.h> #include <tqimage.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqvaluelist.h> #include <tqvaluestack.h> @@ -1286,7 +1286,7 @@ public: bool processTable (const Table &table) { - // just dump the table out for now (no tqlayout) + // just dump the table out for now (no layout) for (TQValueList <TableCell>::ConstIterator it = table.cellList.begin (); it != table.cellList.end (); it++) @@ -1417,12 +1417,12 @@ public: bool doFullParagraph (const ParaData ¶Data) { return doFullParagraph (paraData.text, - paraData.tqlayout, + paraData.layout, paraData.formattingList); } bool doFullParagraph (const TQString ¶Text, - const LayoutData &tqlayout, + const LayoutData &layout, const ValueListFormatData ¶FormatDataList) { MSWrite::FormatParaProperty paraProp; @@ -1446,34 +1446,34 @@ public: paraProp.setIsText (true); // Alignment - if (!tqlayout.tqalignment.isEmpty ()) + if (!layout.alignment.isEmpty ()) { - if (tqlayout.tqalignment == "left") + if (layout.alignment == "left") // quite useless since MSWrite::Alignment::Left is the default anyway - paraProp.tqsetAlignment (MSWrite::Alignment::Left); - else if (tqlayout.tqalignment == "right") - paraProp.tqsetAlignment (MSWrite::Alignment::Right); - else if (tqlayout.tqalignment == "center") - paraProp.tqsetAlignment (MSWrite::Alignment::Center); - else if (tqlayout.tqalignment == "justify") - paraProp.tqsetAlignment (MSWrite::Alignment::Justify); + paraProp.setAlignment (MSWrite::Alignment::Left); + else if (layout.alignment == "right") + paraProp.setAlignment (MSWrite::Alignment::Right); + else if (layout.alignment == "center") + paraProp.setAlignment (MSWrite::Alignment::Center); + else if (layout.alignment == "justify") + paraProp.setAlignment (MSWrite::Alignment::Justify); else - kdWarning (30509) << "Unknown Alignment: " << tqlayout.tqalignment << endl; + kdWarning (30509) << "Unknown Alignment: " << layout.alignment << endl; } // Indentation - if (tqlayout.indentFirst) paraProp.setLeftIndentFirstLine (MSWrite::Short (Point2Twip (tqlayout.indentFirst))); - if (tqlayout.indentLeft >= 0) paraProp.setLeftIndent (MSWrite::Word (Point2Twip (tqlayout.indentLeft))); - if (tqlayout.indentRight >= 0) paraProp.setRightIndent (MSWrite::Word (Point2Twip (tqlayout.indentRight))); + if (layout.indentFirst) paraProp.setLeftIndentFirstLine (MSWrite::Short (Point2Twip (layout.indentFirst))); + if (layout.indentLeft >= 0) paraProp.setLeftIndent (MSWrite::Word (Point2Twip (layout.indentLeft))); + if (layout.indentRight >= 0) paraProp.setRightIndent (MSWrite::Word (Point2Twip (layout.indentRight))); #if 0 - kdDebug (30509) << "Indent: " << Point2Twip (tqlayout.indentFirst) << " " - << Point2Twip (tqlayout.indentLeft) << " " - << Point2Twip (tqlayout.indentRight) << endl; + kdDebug (30509) << "Indent: " << Point2Twip (layout.indentFirst) << " " + << Point2Twip (layout.indentLeft) << " " + << Point2Twip (layout.indentRight) << endl; #endif // Line Spacing MSWrite::Word lineSpacing = MSWrite::LineSpacing::Normal; - switch (tqlayout.lineSpacingType) + switch (layout.lineSpacingType) { case LayoutData::LS_SINGLE: lineSpacing = MSWrite::LineSpacing::Normal; @@ -1487,12 +1487,12 @@ public: case LayoutData::LS_CUSTOM: case LayoutData::LS_FIXED: case LayoutData::LS_ATLEAST: - lineSpacing = getClosestLineSpacing (tqlayout.lineSpacing); + lineSpacing = getClosestLineSpacing (layout.lineSpacing); break; case LayoutData::LS_MULTIPLE: break; default: - kdWarning (30509) << "unknown lineSpacingType \'" << tqlayout.lineSpacingType << "\'" << endl; + kdWarning (30509) << "unknown lineSpacingType \'" << layout.lineSpacingType << "\'" << endl; } paraProp.setLineSpacing (lineSpacing); @@ -1500,8 +1500,8 @@ public: // It seems that Write applies the 1st paragraph's Tabulator settings to the _entire_ document // Word97 and KWord, however, will treat them like a Paragraph Property int numTabs = 0; - for (TabulatorList::ConstIterator tabIt = tqlayout.tabulatorList.begin (); - tabIt != tqlayout.tabulatorList.end (); + for (TabulatorList::ConstIterator tabIt = layout.tabulatorList.begin (); + tabIt != layout.tabulatorList.end (); tabIt++) { MSWrite::FormatParaPropertyTabulator tab; @@ -1544,7 +1544,7 @@ public: // get this paragraph's "default formatting" MSWrite::FormatCharProperty charPropDefault; - processFormatData (charPropDefault, tqlayout.formatData.text); + processFormatData (charPropDefault, layout.formatData.text); MSWrite::DWord uptoByte = 0; // relative to start of KWord paragraph MSWrite::DWord numBytes = paraText.length (); // relative to start of KWord paragraph @@ -1561,18 +1561,18 @@ public: if (!m_generator->writeCharInfoBegin (&charPropDefault)) return false; // page break at start of paragraph? - if (tqlayout.pageBreakBefore) + if (layout.pageBreakBefore) if (!m_generator->writePageBreak ()) return false; // counter data - processCounter (tqlayout.counter); + processCounter (layout.counter); // end of line if (!m_generator->writeCarriageReturn ()) return false; if (!m_generator->writeNewLine (true/*end of paragraph*/)) return false; // page break at end of paragraph? - if (tqlayout.pageBreakAfter) + if (layout.pageBreakAfter) if (!m_generator->writePageBreak ()) return false; // write default character property end @@ -1595,11 +1595,11 @@ public: if (uptoByte == 0) { // page break at start of paragraph? - if (tqlayout.pageBreakBefore) + if (layout.pageBreakBefore) if (!m_generator->writePageBreak ()) return false; // counter data - processCounter (tqlayout.counter); + processCounter (layout.counter); } // yes, this is slightly premature but it doesn't matter @@ -1733,7 +1733,7 @@ public: } // page break at end of paragraph? - if (tqlayout.pageBreakAfter) + if (layout.pageBreakAfter) if (!m_generator->writePageBreak ()) return false; } @@ -1903,7 +1903,7 @@ MSWriteExport::~MSWriteExport () { } -KoFilter::ConversiontqStatus MSWriteExport::convert (const TQCString &from, const TQCString &to) +KoFilter::ConversionStatus MSWriteExport::convert (const TQCString &from, const TQCString &to) { kdDebug (30509) << "MSWriteExport $Date: 2006-02-12 19:28:12 +0100 (Sun, 12 Feb 2006) $ using LibMSWrite " << MSWrite::Version << endl; @@ -1929,7 +1929,7 @@ KoFilter::ConversiontqStatus MSWriteExport::convert (const TQCString &from, cons return KoFilter::OutOfMemory; } - KoFilter::ConversiontqStatus ret = leader->convert (m_chain, from, to); + KoFilter::ConversionStatus ret = leader->convert (m_chain, from, to); int errorCode = worker->getError (); delete leader; diff --git a/filters/kword/mswrite/mswriteexport.h b/filters/kword/mswrite/mswriteexport.h index 796ce705..adfbc4ba 100644 --- a/filters/kword/mswrite/mswriteexport.h +++ b/filters/kword/mswrite/mswriteexport.h @@ -31,7 +31,7 @@ public: MSWriteExport (KoFilter *parent, const char *name, const TQStringList &); virtual ~MSWriteExport (); - KoFilter::ConversiontqStatus convert (const TQCString &from, const TQCString &to); + KoFilter::ConversionStatus convert (const TQCString &from, const TQCString &to); }; #endif // MSWRITEEXPORT_H diff --git a/filters/kword/mswrite/mswriteimport.cc b/filters/kword/mswrite/mswriteimport.cc index 379d3c01..a1ccc150 100644 --- a/filters/kword/mswrite/mswriteimport.cc +++ b/filters/kword/mswrite/mswriteimport.cc @@ -27,8 +27,8 @@ #include <tqfile.h> #include <tqobject.h> #include <tqstring.h> -#include <tqtextcodec.h> -#include <tqtextstream.h> +#include <textcodec.h> +#include <textstream.h> #include <kdebug.h> #include <kgenericfactory.h> @@ -1345,7 +1345,7 @@ MSWriteImport::~MSWriteImport () delete m_device; } -KoFilter::ConversiontqStatus MSWriteImport::convert (const TQCString &from, const TQCString &to) +KoFilter::ConversionStatus MSWriteImport::convert (const TQCString &from, const TQCString &to) { kdDebug (30509) << "MSWriteImport $Date: 2006-02-12 19:28:12 +0100 (Sun, 12 Feb 2006) $ using LibMSWrite " << MSWrite::Version << endl; diff --git a/filters/kword/mswrite/mswriteimport.h b/filters/kword/mswrite/mswriteimport.h index 65be7e7a..8d59fe38 100644 --- a/filters/kword/mswrite/mswriteimport.h +++ b/filters/kword/mswrite/mswriteimport.h @@ -40,7 +40,7 @@ public: MSWriteImport (KoFilter *parent, const char *name, const TQStringList &); virtual ~MSWriteImport (); - KoFilter::ConversiontqStatus convert (const TQCString &from, const TQCString &to); + KoFilter::ConversionStatus convert (const TQCString &from, const TQCString &to); void sigProgress (const int value) { diff --git a/filters/kword/mswrite/status.html b/filters/kword/mswrite/status.html index 6ede1caf..5a8bddd1 100644 --- a/filters/kword/mswrite/status.html +++ b/filters/kword/mswrite/status.html @@ -51,7 +51,7 @@ <td><b>Imports almost everything except OLE from MS WinWrite (3.0 & 3.1) documents</b> <br> - Character formatting (fonts, bold, italic, underline, superscript, subscript, "(page)" numbering) <br> - Optional/Soft Hyphenation <br> - - Paragraph formatting (tqalignment, linespacing, indentation, tabulation) <br> + - Paragraph formatting (alignment, linespacing, indentation, tabulation) <br> - Paragraphs with multiple newlines <br> - Pagebreaking (at the start or end of the line and on the next line) <br> - Images (Standard WMFs, monochrome BMPs, position from left margin) <br> @@ -126,7 +126,7 @@ <br> <b> Version 0.1 (7 Oct 2001): Initial release </b> <br> - - the underlying code to read in the format is there but the filter can only do plain text with tqalignment + - the underlying code to read in the format is there but the filter can only do plain text with alignment <br> </td> </tr> diff --git a/filters/kword/mswrite/structures.h b/filters/kword/mswrite/structures.h index af687b3a..5aa4f6a3 100644 --- a/filters/kword/mswrite/structures.h +++ b/filters/kword/mswrite/structures.h @@ -378,7 +378,7 @@ namespace MSWrite // convenience functions Byte getAlign (void) const { return getAlignment (); } - void setAlign (const Byte val) { tqsetAlignment (val); } + void setAlign (const Byte val) { setAlignment (val); } Short getLeftIndentFirstLine (const bool purist = false) const { diff --git a/filters/kword/mswrite/structures_generated.cpp b/filters/kword/mswrite/structures_generated.cpp index 6b6e5575..c443f252 100644 --- a/filters/kword/mswrite/structures_generated.cpp +++ b/filters/kword/mswrite/structures_generated.cpp @@ -1166,7 +1166,7 @@ namespace MSWrite // --- set defaults in raw array (needed because it's a useThisMuch structure) --- WriteByte ((Byte) (60), m_data + 1);// magic0_60_or_61 - m_data [2] = 0; // tqalignment + m_data [2] = 0; // alignment WriteWord ((Word) (30), m_data + 3);// magic30 memset (m_data + 5, 0, 6); // rightIndent, leftIndent, leftIndentFirstLine WriteWord ((Word) (240), m_data + 11);// lineSpacing @@ -1176,7 +1176,7 @@ namespace MSWrite // --- set defaults for variables -- m_numDataBytes = (Byte) (0); m_magic0_60_or_61 = (Byte) (60); - m_tqalignment = (Byte) (0); + m_alignment = (Byte) (0); m_magic30 = (Word) (30); m_rightIndent = (Word) (0); m_leftIndent = (Word) (0); @@ -1210,7 +1210,7 @@ namespace MSWrite m_numDataBytes = rhs.m_numDataBytes; m_magic0_60_or_61 = rhs.m_magic0_60_or_61; - m_tqalignment = rhs.m_tqalignment; + m_alignment = rhs.m_alignment; m_magic30 = rhs.m_magic30; m_rightIndent = rhs.m_rightIndent; m_leftIndent = rhs.m_leftIndent; @@ -1235,7 +1235,7 @@ namespace MSWrite if (!Verify (Error::InvalidFormat, m_numDataBytes >= 1 && m_numDataBytes <= s_size - sizeof (Byte), DWord (m_numDataBytes))) return false; if (!Verify (Error::Warn, m_magic0_60_or_61 == 0 || m_magic0_60_or_61 == 60 || m_magic0_60_or_61 == 61, DWord (m_magic0_60_or_61))) return false; - // m_tqalignment will not be checked + // m_alignment will not be checked if (!Verify (Error::Warn, m_magic30 == 30, DWord (m_magic30))) return false; // m_rightIndent will not be checked // m_leftIndent will not be checked @@ -1275,8 +1275,8 @@ namespace MSWrite ReadByte (m_magic0_60_or_61, m_data + 1); signalHaveSetData (m_magic0_60_or_61 == Byte (60), 0/*offset*/ + 8/*size*/); - ReadByte (m_tqalignment, m_data + 2); - signalHaveSetData (m_tqalignment == Byte (0), 8/*offset*/ + 8/*size*/); + ReadByte (m_alignment, m_data + 2); + signalHaveSetData (m_alignment == Byte (0), 8/*offset*/ + 8/*size*/); ReadWord (m_magic30, m_data + 3); signalHaveSetData (m_magic30 == Word (30), 16/*offset*/ + 16/*size*/); ReadWord (m_rightIndent, m_data + 5); @@ -1323,7 +1323,7 @@ namespace MSWrite WriteByte (m_numDataBytes, m_data + 0); WriteByte (m_magic0_60_or_61, m_data + 1); - WriteByte (m_tqalignment, m_data + 2); + WriteByte (m_alignment, m_data + 2); WriteWord (m_magic30, m_data + 3); WriteWord (m_rightIndent, m_data + 5); WriteWord (m_leftIndent, m_data + 7); diff --git a/filters/kword/mswrite/structures_generated.h b/filters/kword/mswrite/structures_generated.h index 0ee985ce..feb0f563 100644 --- a/filters/kword/mswrite/structures_generated.h +++ b/filters/kword/mswrite/structures_generated.h @@ -183,7 +183,7 @@ namespace MSWrite void setNumPages (const Word val) { m_numPages = val; } }; - // Page tqlayout information (margins, dimensions, ...) + // Page layout information (margins, dimensions, ...) class PageLayoutGenerated : public NeedsDevice { public: @@ -701,7 +701,7 @@ namespace MSWrite Byte m_numDataBytes; // number of bytes that follow Byte m_magic0_60_or_61; // =0? =60? =61? 60 is the most common - Byte m_tqalignment; + Byte m_alignment; Word m_magic30; // =30? Word m_rightIndent; // indent from right margin + right margin (if in header/footer) Word m_leftIndent; // indent from left margin + left margin (if in header/footer) @@ -758,8 +758,8 @@ namespace MSWrite // get and set functions // - Byte getAlignment (void) const { return m_tqalignment; } - void tqsetAlignment (const Byte val) { m_tqalignment = val; signalHaveSetData (m_tqalignment == Byte (0), 8/*offset*/ + 8/*size*/); } + Byte getAlignment (void) const { return m_alignment; } + void setAlignment (const Byte val) { m_alignment = val; signalHaveSetData (m_alignment == Byte (0), 8/*offset*/ + 8/*size*/); } Word getRightIndent (void) const { return m_rightIndent; } void setRightIndent (const Word val) { m_rightIndent = val; signalHaveSetData (m_rightIndent == Word (0), 32/*offset*/ + 16/*size*/); } diff --git a/filters/kword/oowriter/ExportFilter.cc b/filters/kword/oowriter/ExportFilter.cc index ff9c8276..2e6e515e 100644 --- a/filters/kword/oowriter/ExportFilter.cc +++ b/filters/kword/oowriter/ExportFilter.cc @@ -33,7 +33,7 @@ #include <tqmap.h> #include <tqiodevice.h> #include <tqbuffer.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdom.h> #include <kdebug.h> @@ -96,7 +96,7 @@ TQString OOWriterWorker::escapeOOSpan(const TQString& strText) const } // ### TODO: would be switch/case or if/elseif the best? - switch (ch.tqunicode()) + switch (ch.unicode()) { case 9: // Tab { @@ -180,7 +180,7 @@ TQString OOWriterWorker::escapeOOSpan(const TQString& strText) const case 30: case 31: { - kdWarning(30518) << "Not allowed XML character: " << ch.tqunicode() << endl; + kdWarning(30518) << "Not allowed XML character: " << ch.unicode() << endl; strReturn += '?'; break; } @@ -1206,9 +1206,9 @@ bool OOWriterWorker::makeTable( const FrameAnchor& anchor, const AnchorType anch // Be careful that while being similar the following 5 strings have different purposes const TQString automaticTableStyle ( makeAutomaticStyleName( "Table", m_tableNumber ) ); // It also increases m_tableNumber const TQString tableName( TQString( "Table" ) + TQString::number( m_tableNumber ) ); // m_tableNumber was already increased - const TQString translatedName( i18n( "Object name", "Table %1").tqarg( m_tableNumber ) ); + const TQString translatedName( i18n( "Object name", "Table %1").arg( m_tableNumber ) ); const TQString automaticFrameStyle ( makeAutomaticStyleName( "TableFrame", m_textBoxNumber ) ); // It also increases m_textBoxNumber - const TQString translatedFrameName( i18n( "Object name", "Table Frame %1").tqarg( m_textBoxNumber ) ); + const TQString translatedFrameName( i18n( "Object name", "Table Frame %1").arg( m_textBoxNumber ) ); kdDebug(30518) << "Processing table " << anchor.key.toString() << " => " << tableName << endl; @@ -1729,38 +1729,38 @@ void OOWriterWorker::processParagraphData ( const TQString ¶Text, } TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin, - const LayoutData& tqlayout, const bool force, TQString& styleKey) + const LayoutData& layout, const bool force, TQString& styleKey) { TQString props; // Props has to remain empty, if there is no difference. - styleKey += tqlayout.styleName; + styleKey += layout.styleName; styleKey += ','; - if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment)) + if (force || (layoutOrigin.alignment!=layout.alignment)) { // NOTE: OO 1.0.x uses start and end like left and right (section 3.11.4) // Unfortunately in XSL-FO's text-align, they are really supposed to be the start and the end. - if (tqlayout.tqalignment == "left") + if (layout.alignment == "left") { props += "fo:text-align=\"start\" "; styleKey += 'L'; } - else if (tqlayout.tqalignment == "right") + else if (layout.alignment == "right") { props += "fo:text-align=\"end\" "; styleKey += 'R'; } - else if (tqlayout.tqalignment == "center") + else if (layout.alignment == "center") { props += "fo:text-align=\"center\" "; styleKey += 'C'; } - else if (tqlayout.tqalignment == "justify") + else if (layout.alignment == "justify") { props += "fo:text-align=\"justify\" "; styleKey += 'J'; } - else if (tqlayout.tqalignment == "auto") + else if (layout.alignment == "auto") { props += "fo:text-align=\"start\" "; #ifndef STRICT_OOWRITER_VERSION_1 @@ -1770,68 +1770,68 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin, } else { - kdWarning(30518) << "Unknown tqalignment: " << tqlayout.tqalignment << endl; + kdWarning(30518) << "Unknown alignment: " << layout.alignment << endl; } } styleKey += ','; - if ((tqlayout.indentLeft>=0.0) - && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))) + if ((layout.indentLeft>=0.0) + && (force || (layoutOrigin.indentLeft!=layout.indentLeft))) { - props += TQString("fo:margin-left=\"%1pt\" ").tqarg(tqlayout.indentLeft); - styleKey += TQString::number(tqlayout.indentLeft); + props += TQString("fo:margin-left=\"%1pt\" ").arg(layout.indentLeft); + styleKey += TQString::number(layout.indentLeft); } styleKey += ','; - if ((tqlayout.indentRight>=0.0) - && (force || (layoutOrigin.indentRight!=tqlayout.indentRight))) + if ((layout.indentRight>=0.0) + && (force || (layoutOrigin.indentRight!=layout.indentRight))) { - props += TQString("fo:margin-right=\"%1pt\" ").tqarg(tqlayout.indentRight); - styleKey += TQString::number(tqlayout.indentRight); + props += TQString("fo:margin-right=\"%1pt\" ").arg(layout.indentRight); + styleKey += TQString::number(layout.indentRight); } styleKey += ','; - if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)) + if (force || (layoutOrigin.indentLeft!=layout.indentLeft)) { props += "fo:text-indent=\""; - props += TQString::number(tqlayout.indentFirst); + props += TQString::number(layout.indentFirst); props += "\" "; - styleKey += TQString::number(tqlayout.indentFirst); + styleKey += TQString::number(layout.indentFirst); } styleKey += ','; - if ((tqlayout.marginBottom>=0.0) - && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) ) + if ((layout.marginBottom>=0.0) + && ( force || ( layoutOrigin.marginBottom != layout.marginBottom ) ) ) { - props += TQString("fo:margin-bottom=\"%1pt\" ").tqarg(tqlayout.marginBottom); - styleKey += TQString::number(tqlayout.marginBottom); + props += TQString("fo:margin-bottom=\"%1pt\" ").arg(layout.marginBottom); + styleKey += TQString::number(layout.marginBottom); } styleKey += ','; - if ((tqlayout.marginTop>=0.0) - && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) ) + if ((layout.marginTop>=0.0) + && ( force || ( layoutOrigin.marginTop != layout.marginTop ) ) ) { - props += TQString("fo:margin-top=\"%1pt\" ").tqarg(tqlayout.marginTop); - styleKey += TQString::number(tqlayout.marginTop); + props += TQString("fo:margin-top=\"%1pt\" ").arg(layout.marginTop); + styleKey += TQString::number(layout.marginTop); } styleKey += ','; if (force - || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType ) - || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) ) + || ( layoutOrigin.lineSpacingType != layout.lineSpacingType ) + || ( layoutOrigin.lineSpacing != layout.lineSpacing ) ) { - switch ( tqlayout.lineSpacingType ) + switch ( layout.lineSpacingType ) { case LayoutData::LS_CUSTOM: { // We have a custom line spacing (in points) - const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding? + const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding? props += "style:line-spacing=\""; props += height; props += "pt\" "; @@ -1860,7 +1860,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin, case LayoutData::LS_MULTIPLE: { // OOWriter 1.1 only allows up to 200% - const TQString mult ( TQString::number( tqRound( tqlayout.lineSpacing * 100 ) ) ); + const TQString mult ( TQString::number( tqRound( layout.lineSpacing * 100 ) ) ); props += "fo:line-height=\""; props += mult; props += "%\" "; @@ -1871,7 +1871,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin, case LayoutData::LS_FIXED: { // We have a fixed line height (in points) - const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding? + const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding? props += "fo:line-height=\""; props += height; props += "pt\" "; @@ -1882,7 +1882,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin, case LayoutData::LS_ATLEAST: { // We have a at-least line height (in points) - const TQString height ( TQString::number(tqlayout.lineSpacing) ); // ### TODO: rounding? + const TQString height ( TQString::number(layout.lineSpacing) ); // ### TODO: rounding? props += "style:line-height-at-least=\""; props += height; props += "pt\" "; @@ -1892,7 +1892,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin, } default: { - kdWarning(30518) << "Unsupported lineSpacingType: " << tqlayout.lineSpacingType << " (Ignoring!)" << endl; + kdWarning(30518) << "Unsupported lineSpacingType: " << layout.lineSpacingType << " (Ignoring!)" << endl; break; } } @@ -1900,7 +1900,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin, styleKey += ','; - if ( tqlayout.pageBreakBefore ) + if ( layout.pageBreakBefore ) { // We have a page break before the paragraph props += "fo:page-break-before=\"page\" "; @@ -1909,7 +1909,7 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin, styleKey += ','; - if ( tqlayout.pageBreakAfter ) + if ( layout.pageBreakAfter ) { // We have a page break after the paragraph props += "fo:page-break-after=\"page\" "; @@ -1918,20 +1918,20 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin, styleKey += '@'; // A more visible seperator - props += textFormatToStyle(layoutOrigin.formatData.text,tqlayout.formatData.text,force,styleKey); + props += textFormatToStyle(layoutOrigin.formatData.text,layout.formatData.text,force,styleKey); props += ">"; styleKey += '@'; // A more visible seperator // ### TODO/FIXME: what if all tabulators must be erased? - if (!tqlayout.tabulatorList.isEmpty() - && (force || (layoutOrigin.tabulatorList!=tqlayout.tabulatorList) )) + if (!layout.tabulatorList.isEmpty() + && (force || (layoutOrigin.tabulatorList!=layout.tabulatorList) )) { props += "\n <style:tab-stops>\n"; TabulatorList::ConstIterator it; - TabulatorList::ConstIterator end(tqlayout.tabulatorList.end()); - for (it=tqlayout.tabulatorList.begin();it!=end;++it) + TabulatorList::ConstIterator end(layout.tabulatorList.end()); + for (it=layout.tabulatorList.begin();it!=end;++it) { props+=" <style:tab-stop style:position=\""; props += TQString::number((*it).m_ptpos); @@ -1966,27 +1966,27 @@ TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin, return props; } -bool OOWriterWorker::doFullParagraph(const TQString& paraText, const LayoutData& tqlayout, +bool OOWriterWorker::doFullParagraph(const TQString& paraText, const LayoutData& layout, const ValueListFormatData& paraFormatDataList) { - const bool header = ( (tqlayout.counter.numbering == CounterData::NUM_CHAPTER) - && (tqlayout.counter.depth<10) ); // ### TODO: Does OOWriter really limits to 10? + const bool header = ( (layout.counter.numbering == CounterData::NUM_CHAPTER) + && (layout.counter.depth<10) ); // ### TODO: Does OOWriter really limits to 10? if (header) { *m_streamOut << " <text:h text:level=\""; - *m_streamOut << TQString::number(tqlayout.counter.depth+1,10); + *m_streamOut << TQString::number(layout.counter.depth+1,10); *m_streamOut << "\" "; } else *m_streamOut << " <text:p "; - const LayoutData& styleLayout=m_styleMap[tqlayout.styleName]; + const LayoutData& styleLayout=m_styleMap[layout.styleName]; TQString styleKey; - const TQString props(layoutToParagraphStyle(styleLayout,tqlayout,false,styleKey)); + const TQString props(layoutToParagraphStyle(styleLayout,layout,false,styleKey)); - TQString actualStyle(tqlayout.styleName); + TQString actualStyle(layout.styleName); if (!props.isEmpty()) { TQMap<TQString,TQString>::ConstIterator it ( m_mapParaStyleKeys.find(styleKey) ); @@ -2003,7 +2003,7 @@ bool OOWriterWorker::doFullParagraph(const TQString& paraText, const LayoutData& m_contentAutomaticStyles += " <style:style"; m_contentAutomaticStyles += " style:name=\"" + escapeOOText(automaticStyle) + "\""; - m_contentAutomaticStyles += " style:parent-style-name=\"" + escapeOOText(tqlayout.styleName) + "\""; + m_contentAutomaticStyles += " style:parent-style-name=\"" + escapeOOText(layout.styleName) + "\""; m_contentAutomaticStyles += " style:family=\"paragraph\" style:class=\"text\""; m_contentAutomaticStyles += ">\n"; m_contentAutomaticStyles += " <style:properties "; @@ -2032,7 +2032,7 @@ bool OOWriterWorker::doFullParagraph(const TQString& paraText, const LayoutData& *m_streamOut << ">"; - processParagraphData(paraText, tqlayout.formatData.text, paraFormatDataList); + processParagraphData(paraText, layout.formatData.text, paraFormatDataList); if (header) *m_streamOut << "</text:h>\n"; @@ -2054,21 +2054,21 @@ bool OOWriterWorker::doOpenStyles(void) return true; } -bool OOWriterWorker::doFullDefineStyle(LayoutData& tqlayout) +bool OOWriterWorker::doFullDefineStyle(LayoutData& layout) { //Register style in the style map - m_styleMap[tqlayout.styleName]=tqlayout; + m_styleMap[layout.styleName]=layout; m_styles += " <style:style"; - m_styles += " style:name=\"" + escapeOOText( tqlayout.styleName ) + "\""; - m_styles += " style:next-style-name=\"" + escapeOOText( tqlayout.styleFollowing ) + "\""; + m_styles += " style:name=\"" + escapeOOText( layout.styleName ) + "\""; + m_styles += " style:next-style-name=\"" + escapeOOText( layout.styleFollowing ) + "\""; m_styles += " style:family=\"paragraph\" style:class=\"text\""; m_styles += ">\n"; m_styles += " <style:properties "; TQString debugKey; // Not needed - m_styles += layoutToParagraphStyle(tqlayout,tqlayout,true,debugKey); + m_styles += layoutToParagraphStyle(layout,layout,true,debugKey); kdDebug(30518) << "Defining style: " << debugKey << endl; m_styles += "</style:properties>\n"; @@ -2160,12 +2160,12 @@ void OOWriterWorker::declareFont(const TQString& fontName) { TQString props; - // Disabled, as TQFontInfo::tqstyleHint() cannot guess + // Disabled, as TQFontInfo::styleHint() cannot guess #if 0 TQFont font(fontName); TQFontInfo info(font); props+="style:font-family-generic=\"" - switch (info.tqstyleHint()) + switch (info.styleHint()) { case TQFont::SansSerif: default: @@ -2217,7 +2217,7 @@ TQString OOWriterWorker::makeAutomaticStyleName(const TQString& prefix, ulong& c return str2; // If it is still not unique, try a time stamp. - const TQDateTime dt(TQDateTime::tqcurrentDateTime(Qt::UTC)); + const TQDateTime dt(TQDateTime::currentDateTime(Qt::UTC)); str2 = str + "_" + TQString::number(dt.toTime_t(),16); if (m_styleMap.find(str2)==m_styleMap.end()) diff --git a/filters/kword/oowriter/ExportFilter.h b/filters/kword/oowriter/ExportFilter.h index 0a898227..c89e15ac 100644 --- a/filters/kword/oowriter/ExportFilter.h +++ b/filters/kword/oowriter/ExportFilter.h @@ -68,7 +68,7 @@ public: virtual bool doCloseFile(void); ///< Close file in normal conditions virtual bool doOpenDocument(void); virtual bool doCloseDocument(void); - virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout, + virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout, const ValueListFormatData& paraFormatDataList); virtual bool doFullPaperFormat(const int format, const double width, const double height, const int orientation); @@ -81,7 +81,7 @@ public: virtual bool doFullPaperFormatOther ( const int columns, const double columnspacing, const int numPages ); virtual bool doOpenStyles(void); virtual bool doCloseStyles(void); - virtual bool doFullDefineStyle(LayoutData& tqlayout); + virtual bool doFullDefineStyle(LayoutData& layout); virtual bool doFullDocumentInfo(const KWEFDocumentInfo& docInfo); virtual bool doVariableSettings(const VariableSettingsData& vs); virtual bool doOpenBody (void); @@ -107,7 +107,7 @@ private: TQString textFormatToStyle(const TextFormatting& formatOrigin, const TextFormatting& formatData, const bool force, TQString& key); TQString layoutToParagraphStyle(const LayoutData& layoutOrigin, - const LayoutData& tqlayout, const bool force, TQString& styleKey); + const LayoutData& layout, const bool force, TQString& styleKey); TQString escapeOOText(const TQString& strText) const; TQString escapeOOSpan(const TQString& strText) const; TQString cellToProperties( const TableCell& cell, TQString& key) const; diff --git a/filters/kword/oowriter/conversion.cc b/filters/kword/oowriter/conversion.cc index 209b2bec..22d9fed5 100644 --- a/filters/kword/oowriter/conversion.cc +++ b/filters/kword/oowriter/conversion.cc @@ -10,7 +10,7 @@ TQString Conversion::importAlignment( const TQString& align ) return "left"; if ( align == "end" ) return "right"; - kdWarning(30518) << "Conversion::importAlignment unknown tqalignment " << align << endl; + kdWarning(30518) << "Conversion::importAlignment unknown alignment " << align << endl; return "auto"; } @@ -22,7 +22,7 @@ TQString Conversion::exportAlignment( const TQString& align ) return "start"; if ( align == "right" ) return "end"; - kdWarning(30518) << "Conversion::exportAlignment unknown tqalignment " << align << endl; + kdWarning(30518) << "Conversion::exportAlignment unknown alignment " << align << endl; return "auto"; } @@ -37,13 +37,13 @@ TQPair<int,TQString> Conversion::importWrapping( const TQString& oowrap ) if ( oowrap == "run-through" ) return tqMakePair( 0, TQString() ); if ( oowrap == "biggest" ) // OASIS extension - return tqMakePair( 1, TQString::tqfromLatin1( "biggest" ) ); + return tqMakePair( 1, TQString::fromLatin1( "biggest" ) ); ////if ( oowrap == "parallel" || oowrap == "dynamic" ) // dynamic is called "optimal" in the OO GUI. It's different from biggest because it can lead to parallel. // Those are not supported in KWord, let's use biggest instead - return tqMakePair( 1, TQString::tqfromLatin1( "biggest" ) ); + return tqMakePair( 1, TQString::fromLatin1( "biggest" ) ); } TQString Conversion::exportWrapping( const TQPair<int,TQString>& runAroundAttribs ) diff --git a/filters/kword/oowriter/conversion.h b/filters/kword/oowriter/conversion.h index d9388268..ee6b41f6 100644 --- a/filters/kword/oowriter/conversion.h +++ b/filters/kword/oowriter/conversion.h @@ -32,7 +32,7 @@ namespace Conversion { - // Convert paragraph tqalignment value + // Convert paragraph alignment value TQString importAlignment( const TQString& ); TQString exportAlignment( const TQString& ); diff --git a/filters/kword/oowriter/oowriterexport.cc b/filters/kword/oowriter/oowriterexport.cc index 426105e8..aba0ee9f 100644 --- a/filters/kword/oowriter/oowriterexport.cc +++ b/filters/kword/oowriter/oowriterexport.cc @@ -52,7 +52,7 @@ OOWRITERExport::OOWRITERExport(KoFilter */*parent*/, const char */*name*/, const KoFilter() { } -KoFilter::ConversiontqStatus OOWRITERExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus OOWRITERExport::convert( const TQCString& from, const TQCString& to ) { if ( to != "application/vnd.sun.xml.writer" || from != "application/x-kword" ) { @@ -79,7 +79,7 @@ KoFilter::ConversiontqStatus OOWRITERExport::convert( const TQCString& from, con return KoFilter::StupidError; } - KoFilter::ConversiontqStatus result=leader->convert(m_chain,from,to); + KoFilter::ConversionStatus result=leader->convert(m_chain,from,to); delete leader; delete worker; diff --git a/filters/kword/oowriter/oowriterexport.h b/filters/kword/oowriter/oowriterexport.h index 8f4695b8..bd1a0f40 100644 --- a/filters/kword/oowriter/oowriterexport.h +++ b/filters/kword/oowriter/oowriterexport.h @@ -47,6 +47,6 @@ public: OOWRITERExport(KoFilter *parent, const char *name, const TQStringList &); virtual ~OOWRITERExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // OOWRITEREXPORT_H diff --git a/filters/kword/oowriter/oowriterimport.cc b/filters/kword/oowriter/oowriterimport.cc index 5fd196f8..07262c86 100644 --- a/filters/kword/oowriter/oowriterimport.cc +++ b/filters/kword/oowriter/oowriterimport.cc @@ -69,7 +69,7 @@ OoWriterImport::~OoWriterImport() { } -KoFilter::ConversiontqStatus OoWriterImport::convert( TQCString const & from, TQCString const & to ) +KoFilter::ConversionStatus OoWriterImport::convert( TQCString const & from, TQCString const & to ) { kdDebug(30518) << "Entering Oowriter Import filter: " << from << " - " << to << endl; @@ -99,20 +99,20 @@ KoFilter::ConversiontqStatus OoWriterImport::convert( TQCString const & from, TQ } - KoFilter::ConversiontqStatus pretqStatus = openFile(); + KoFilter::ConversionStatus preStatus = openFile(); TQImage thumbnail; - if ( pretqStatus == KoFilter::OK ) + if ( preStatus == KoFilter::OK ) { // We do not care about the failure OoUtils::loadThumbnail( thumbnail, m_zip ); } - if ( pretqStatus != KoFilter::OK ) + if ( preStatus != KoFilter::OK ) { m_zip->close(); delete m_zip; - return pretqStatus; + return preStatus; } m_currentMasterPage = TQString(); @@ -535,14 +535,14 @@ TQDomElement OoWriterImport::createInitialFrame( TQDomElement& parentFramesetEle return frameElementOut; } -KoFilter::ConversiontqStatus OoWriterImport::loadAndParse(const TQString& filename, TQDomDocument& doc) +KoFilter::ConversionStatus OoWriterImport::loadAndParse(const TQString& filename, TQDomDocument& doc) { return OoUtils::loadAndParse( filename, doc, m_zip); } -KoFilter::ConversiontqStatus OoWriterImport::openFile() +KoFilter::ConversionStatus OoWriterImport::openFile() { - KoFilter::ConversiontqStatus status=loadAndParse("content.xml", m_content); + KoFilter::ConversionStatus status=loadAndParse("content.xml", m_content); if ( status != KoFilter::OK ) { kdError(30518) << "Content.xml could not be parsed correctly! Aborting!" << endl; @@ -596,7 +596,7 @@ bool OoWriterImport::createStyleMap( const TQDomDocument & styles, TQDomDocument if ( d > 1.0 ) { TQString message( i18n("This document was created with OpenOffice.org version '%1'. This filter was written for version 1.0. Reading this file could cause strange behavior, crashes or incorrect display of the data. Do you want to continue converting the document?") ); - message = message.tqarg( docElement.attributeNS( ooNS::office, "version", TQString() ) ); + message = message.arg( docElement.attributeNS( ooNS::office, "version", TQString() ) ); if ( KMessageBox::warningYesNo( 0, message, i18n( "Unsupported document version" ) ) == KMessageBox::No ) return false; } @@ -873,13 +873,13 @@ void OoWriterImport::writeCounter( TQDomDocument& doc, TQDomElement& layoutEleme TQString bulletChar = listStyle.attributeNS( ooNS::text, "bullet-char", TQString() ); if ( !bulletChar.isEmpty() ) { #if 0 // doesn't work well. Fonts lack those symbols! - counter.setAttribute( "bullet", bulletChar[0].tqunicode() ); - kdDebug(30518) << "bullet code " << bulletChar[0].tqunicode() << endl; + counter.setAttribute( "bullet", bulletChar[0].unicode() ); + kdDebug(30518) << "bullet code " << bulletChar[0].unicode() << endl; TQString fontName = listStyleProperties.attributeNS( ooNS::style, "font-name", TQString() ); counter.setAttribute( "bulletfont", fontName ); #endif // Reverse engineering, I found those codes: - switch( bulletChar[0].tqunicode() ) { + switch( bulletChar[0].unicode() ) { case 0x2022: // small disc counter.setAttribute( "type", 10 ); // a disc bullet break; @@ -992,11 +992,11 @@ void OoWriterImport::parseList( TQDomDocument& doc, const TQDomElement& list, TQ static int numberOfParagraphs( const TQDomElement& frameset ) { - const TQDomNodeList tqchildren = frameset.childNodes(); + const TQDomNodeList children = frameset.childNodes(); const TQString paragStr = "PARAGRAPH"; int paragCount = 0; - for ( unsigned int i = 0 ; i < tqchildren.length() ; ++i ) { - if ( tqchildren.item( i ).toElement().tagName() == paragStr ) + for ( unsigned int i = 0 ; i < children.length() ; ++i ) { + if ( children.item( i ).toElement().tagName() == paragStr ) ++paragCount; } return paragCount; @@ -1209,12 +1209,12 @@ TQDomElement OoWriterImport::parseParagraph( TQDomDocument& doc, const TQDomElem TQDomElement* paragraphStyle = m_styles[paragraph.attributeNS( ooNS::text, "style-name", TQString() )]; TQString masterPageName = paragraphStyle ? paragraphStyle->attributeNS( ooNS::style, "master-page-name", TQString() ) : TQString(); if ( masterPageName.isEmpty() ) - masterPageName = "Standard"; // Seems to be a builtin name for the default tqlayout... + masterPageName = "Standard"; // Seems to be a builtin name for the default layout... if ( masterPageName != m_currentMasterPage ) { - // Detected a change in the master page -> this means we have to use a new page tqlayout + // Detected a change in the master page -> this means we have to use a new page layout // and insert a frame break if not on the first paragraph. - // In KWord we don't support sections so the first paragraph is the one that determines the page tqlayout. + // In KWord we don't support sections so the first paragraph is the one that determines the page layout. if ( m_currentMasterPage.isEmpty() ) { m_currentMasterPage = masterPageName; // before writePageLayout to avoid recursion writePageLayout( doc, masterPageName ); @@ -1228,7 +1228,7 @@ TQDomElement OoWriterImport::parseParagraph( TQDomDocument& doc, const TQDomElem layoutElement.appendChild( pageBreakElem ); } pageBreakElem.setAttribute( "hardFrameBreak", "true" ); - // We have no way to store the new page tqlayout, KWord doesn't have sections. + // We have no way to store the new page layout, KWord doesn't have sections. } } @@ -1458,7 +1458,7 @@ void OoWriterImport::writeLayout( TQDomDocument& doc, TQDomElement& layoutElemen { Q_ASSERT( layoutElement.ownerDocument() == doc ); - // Always write out the tqalignment, it's required + // Always write out the alignment, it's required TQDomElement flowElement = doc.createElement("FLOW"); /* This was only an intermediate OASIS decision. The final decision is: @@ -1563,7 +1563,7 @@ void OoWriterImport::writeLayout( TQDomDocument& doc, TQDomElement& layoutElemen style:background-image line numbering punctuation wrap, 3.10.36 - vertical tqalignment - a bit like offsetfrombaseline (but not for subscript/superscript, in general) + vertical alignment - a bit like offsetfrombaseline (but not for subscript/superscript, in general) Michael said those are in fact parag properties: style:text-autospace, 3.10.32 - not implemented in kotext style:line-break, 3.10.37 - apparently that's for some Asian languages @@ -1817,7 +1817,7 @@ TQString OoWriterImport::appendPicture(TQDomDocument& doc, const TQDomElement& o strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. } TQString filename(href.mid(1)); - KoPictureKey key(filename, TQDateTime::tqcurrentDateTime(Qt::UTC)); + KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC)); picture.setKey(key); if (!m_zip) @@ -1966,7 +1966,7 @@ void OoWriterImport::appendField(TQDomDocument& doc, TQDomElement& outputFormats bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true"); if (!dt.isValid()) { - dt = TQDateTime::tqcurrentDateTime(); // OOo docs say so :) + dt = TQDateTime::currentDateTime(); // OOo docs say so :) fixed = false; } const TQDate date(dt.date()); @@ -1995,7 +1995,7 @@ void OoWriterImport::appendField(TQDomDocument& doc, TQDomElement& outputFormats bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true"); if (!dt.isValid()) { - dt = TQDateTime::tqcurrentDateTime(); // OOo docs say so :) + dt = TQDateTime::currentDateTime(); // OOo docs say so :) fixed = false; } @@ -2303,7 +2303,7 @@ void OoWriterImport::parseInsideOfTable( TQDomDocument &doc, const TQDomElement& if ( localName == "table-cell" ) // OOo SPEC 4.8.1 p267 { const TQString frameName(i18n("Frameset name","Table %3, row %1, column %2") - .tqarg(row).tqarg(column).tqarg(tableName)); // The table name could have a % sequence, so use the table name as last! + .arg(row).arg(column).arg(tableName)); // The table name could have a % sequence, so use the table name as last! kdDebug(30518) << "Trying to create " << frameName << endl; // We need to create a frameset for the cell diff --git a/filters/kword/oowriter/oowriterimport.h b/filters/kword/oowriter/oowriterimport.h index 80586a31..4de60534 100644 --- a/filters/kword/oowriter/oowriterimport.h +++ b/filters/kword/oowriter/oowriterimport.h @@ -38,7 +38,7 @@ public: OoWriterImport( KoFilter * parent, const char * name, const TQStringList & ); virtual ~OoWriterImport(); - virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to ); + virtual KoFilter::ConversionStatus convert( TQCString const & from, TQCString const & to ); private: void prepareDocument( TQDomDocument& mainDocument, TQDomElement& framesetsElem ); @@ -61,8 +61,8 @@ private: void createDocumentInfo( TQDomDocument &docinfo ); void createDocumentContent( TQDomDocument &doccontent, TQDomElement& mainFramesetElement ); void parseBodyOrSimilar( TQDomDocument &doc, const TQDomElement& parent, TQDomElement& currentFramesetElement ); - KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc); - KoFilter::ConversiontqStatus openFile(); + KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc); + KoFilter::ConversionStatus openFile(); bool createStyleMap( const TQDomDocument & styles, TQDomDocument& doc ); void insertStyles( const TQDomElement& element, TQDomDocument& doc ); void importDateTimeStyle( const TQDomElement& parent ); diff --git a/filters/kword/palmdoc/palmdb.cpp b/filters/kword/palmdoc/palmdb.cpp index 65a83518..b7155fa8 100644 --- a/filters/kword/palmdoc/palmdb.cpp +++ b/filters/kword/palmdoc/palmdb.cpp @@ -18,7 +18,7 @@ */ /* - The database tqlayout for PalmDB files is described in + The database layout for PalmDB files is described in http://www.palmos.com/dev/support/docs/protein_books/FileFormats/Intro.html */ @@ -38,9 +38,9 @@ PalmDB::PalmDB() setName( "Unnamed" ); setAttributes( 0 ); setVersion( 0 ); - setCreationDate( TQDateTime::tqcurrentDateTime() ); - setModificationDate( TQDateTime::tqcurrentDateTime() ); - setLastBackupDate( TQDateTime::tqcurrentDateTime() ); + setCreationDate( TQDateTime::currentDateTime() ); + setModificationDate( TQDateTime::currentDateTime() ); + setLastBackupDate( TQDateTime::currentDateTime() ); setType( TQString() ); setCreator( TQString() ); @@ -73,11 +73,11 @@ bool PalmDB::load( const char* filename ) // read and encode database name // The name field is 32 bytes long, and is NUL terminated. - // Use the length parameter of tqfromLatin1() anyway. + // Use the length parameter of fromLatin1() anyway. TQ_UINT8 name[32]; for(int k = 0; k < 32; k++) stream >> name[k]; - m_name = TQString::tqfromLatin1( (char*) name, 31 ); + m_name = TQString::fromLatin1( (char*) name, 31 ); // read database attribute TQ_UINT16 attr; @@ -121,12 +121,12 @@ bool PalmDB::load( const char* filename ) // read and encode database type TQ_UINT8 dbt[4]; stream >> dbt[0] >> dbt[1] >> dbt[2] >> dbt[3]; - m_type = TQString::tqfromLatin1( (char*) dbt, 4 ); + m_type = TQString::fromLatin1( (char*) dbt, 4 ); // read and encode database creator TQ_UINT8 dbc[4]; stream >> dbc[0] >> dbc[1] >> dbc[2] >> dbc[3]; - m_creator = TQString::tqfromLatin1( (char*) dbc, 4 ); + m_creator = TQString::fromLatin1( (char*) dbc, 4 ); // read unique id seed TQ_UINT32 idseed; @@ -184,9 +184,9 @@ bool PalmDB::load( const char* filename ) if( recsize[r] >= 0 ) { data->resize( recsize[r] ); - stream.tqdevice()->at( recpos[r] ); + stream.device()->at( recpos[r] ); for( int q = 0; q < recsize[r]; q++ ) - { TQ_UINT8 c; stream >> c; data->tqat(q) = c; } + { TQ_UINT8 c; stream >> c; data->at(q) = c; } } records.append( data ); } diff --git a/filters/kword/palmdoc/palmdoc.cpp b/filters/kword/palmdoc/palmdoc.cpp index 791fa356..72bb0434 100644 --- a/filters/kword/palmdoc/palmdoc.cpp +++ b/filters/kword/palmdoc/palmdoc.cpp @@ -106,7 +106,7 @@ bool PalmDoc::load( const char* filename ) // if the text is not compressed, simply append as string if( format == 1 ) - setText( TQString::tqfromLatin1( rec.data(),rec.count() ) ); + setText( TQString::fromLatin1( rec.data(),rec.count() ) ); // done m_result = OK; @@ -120,7 +120,7 @@ bool PalmDoc::save( const char* filename ) setCreator( "REAd" ); // "touch" the database :-) - setModificationDate( TQDateTime::tqcurrentDateTime() ); + setModificationDate( TQDateTime::currentDateTime() ); // Palm record size is always 4 KB unsigned recsize = 4096; diff --git a/filters/kword/palmdoc/palmdocexport.cc b/filters/kword/palmdoc/palmdocexport.cc index 5e18ff6f..9bbb980f 100644 --- a/filters/kword/palmdoc/palmdocexport.cc +++ b/filters/kword/palmdoc/palmdocexport.cc @@ -25,7 +25,7 @@ #include <tqfile.h> #include <tqfileinfo.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> #include <KoFilterChain.h> @@ -53,7 +53,7 @@ public: virtual bool doOpenDocument(void); virtual bool doCloseDocument(void); virtual bool doFullDocumentInfo(const KWEFDocumentInfo& docInfo); - virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout, + virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout, const ValueListFormatData& paraFormatDataList); private: TQString title; @@ -101,7 +101,7 @@ bool PalmDocWorker::doFullDocumentInfo( const KWEFDocumentInfo& docInfo ) } bool PalmDocWorker::doFullParagraph(const TQString& paraText, - const LayoutData& /*tqlayout*/, const ValueListFormatData& /*paraFormatDataList*/) + const LayoutData& /*layout*/, const ValueListFormatData& /*paraFormatDataList*/) { kdDebug(30525) << "Entering ::doFullParagraph" << endl; text.append( paraText ); @@ -115,7 +115,7 @@ PalmDocExport::PalmDocExport( KoFilter *, const char *, const TQStringList& ): { } -KoFilter::ConversiontqStatus PalmDocExport::convert( const TQCString& from, +KoFilter::ConversionStatus PalmDocExport::convert( const TQCString& from, const TQCString& to ) { // check for proper conversion @@ -125,7 +125,7 @@ KoFilter::ConversiontqStatus PalmDocExport::convert( const TQCString& from, PalmDocWorker* worker = new PalmDocWorker(); KWEFKWordLeader* leader = new KWEFKWordLeader( worker ); - KoFilter::ConversiontqStatus result; + KoFilter::ConversionStatus result; result = leader->convert( m_chain, from, to ); delete worker; diff --git a/filters/kword/palmdoc/palmdocexport.h b/filters/kword/palmdoc/palmdocexport.h index fd2a1140..4c09946b 100644 --- a/filters/kword/palmdoc/palmdocexport.h +++ b/filters/kword/palmdoc/palmdocexport.h @@ -35,7 +35,7 @@ class PalmDocExport : public KoFilter virtual ~PalmDocExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __PALMDOCEXPORT_H diff --git a/filters/kword/palmdoc/palmdocimport.cc b/filters/kword/palmdoc/palmdocimport.cc index 98cd7629..a1e8107b 100644 --- a/filters/kword/palmdoc/palmdocimport.cc +++ b/filters/kword/palmdoc/palmdocimport.cc @@ -46,7 +46,7 @@ PalmDocImport::PalmDocImport( KoFilter *, const char *, const TQStringList& ): { } -KoFilter::ConversiontqStatus PalmDocImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus PalmDocImport::convert( const TQCString& from, const TQCString& to ) { // check for proper conversion if( to!= "application/x-kword" || from != "application/vnd.palm" ) @@ -96,7 +96,7 @@ KoFilter::ConversiontqStatus PalmDocImport::convert( const TQCString& from, cons TQString PalmDocImport::processPlainParagraph( TQString text ) { - TQString formats, tqlayout, result; + TQString formats, layout, result; // specify FORMAT (just empty element) formats.append ( " <FORMAT id=\"1\" pos=\"0\" len=\"" + @@ -108,29 +108,29 @@ TQString PalmDocImport::processPlainParagraph( TQString text ) double fontSize = font.pointSizeFloat(); // default LAYOUT - tqlayout.append( "<LAYOUT>\n" ); - tqlayout.append( " <NAME value=\"Standard\" />\n" ); - tqlayout.append( " <FLOW align=\"left\" />\n" ); - tqlayout.append( " <LINESPACING value=\"0\" />\n" ); - tqlayout.append( " <LEFTBORDER width=\"0\" style=\"0\" />\n" ); - tqlayout.append( " <RIGHTBORDER width=\"0\" style=\"0\" />\n" ); - tqlayout.append( " <TOPBORDER width=\"0\" style=\"0\" />\n" ); - tqlayout.append( " <BOTTOMBORDER width=\"0\" style=\"0\" />\n" ); - tqlayout.append( " <INDENTS />\n" ); - tqlayout.append( " <OFFSETS after=\"9\" />\n" ); - tqlayout.append( " <PAGEBREAKING />\n" ); - tqlayout.append( " <COUNTER />\n" ); - tqlayout.append( " <FORMAT id=\"1\">\n" ); - tqlayout.append( " <SIZE value=\"" + TQString::number( fontSize ) + "\" />\n" ); - tqlayout.append( " <WEIGHT value=\"50\" />\n" ); - tqlayout.append( " <ITALIC value=\"0\" />\n" ); - tqlayout.append( " <UNDERLINE value=\"0\" />\n" ); - tqlayout.append( " <STRIKEOUT value=\"0\" />\n" ); - tqlayout.append( " <CHARSET value=\"0\" />\n" ); - tqlayout.append( " <VERTALIGN value=\"0\" />\n" ); - tqlayout.append( " <FONT name=\"" + fontFamily + "\" />\n" ); - tqlayout.append( " </FORMAT>\n" ); - tqlayout.append( "</LAYOUT>\n" ); + layout.append( "<LAYOUT>\n" ); + layout.append( " <NAME value=\"Standard\" />\n" ); + layout.append( " <FLOW align=\"left\" />\n" ); + layout.append( " <LINESPACING value=\"0\" />\n" ); + layout.append( " <LEFTBORDER width=\"0\" style=\"0\" />\n" ); + layout.append( " <RIGHTBORDER width=\"0\" style=\"0\" />\n" ); + layout.append( " <TOPBORDER width=\"0\" style=\"0\" />\n" ); + layout.append( " <BOTTOMBORDER width=\"0\" style=\"0\" />\n" ); + layout.append( " <INDENTS />\n" ); + layout.append( " <OFFSETS after=\"9\" />\n" ); + layout.append( " <PAGEBREAKING />\n" ); + layout.append( " <COUNTER />\n" ); + layout.append( " <FORMAT id=\"1\">\n" ); + layout.append( " <SIZE value=\"" + TQString::number( fontSize ) + "\" />\n" ); + layout.append( " <WEIGHT value=\"50\" />\n" ); + layout.append( " <ITALIC value=\"0\" />\n" ); + layout.append( " <UNDERLINE value=\"0\" />\n" ); + layout.append( " <STRIKEOUT value=\"0\" />\n" ); + layout.append( " <CHARSET value=\"0\" />\n" ); + layout.append( " <VERTALIGN value=\"0\" />\n" ); + layout.append( " <FONT name=\"" + fontFamily + "\" />\n" ); + layout.append( " </FORMAT>\n" ); + layout.append( "</LAYOUT>\n" ); // encode text for XML-ness text.replace( '&', "&" ); @@ -145,7 +145,7 @@ TQString PalmDocImport::processPlainParagraph( TQString text ) result.append( "<FORMATS>\n"); result.append( formats ); result.append( "</FORMATS>\n"); - result.append( tqlayout ); + result.append( layout ); result.append( "</PARAGRAPH>\n" ); return result; diff --git a/filters/kword/palmdoc/palmdocimport.h b/filters/kword/palmdoc/palmdocimport.h index a97f9729..77b4cc73 100644 --- a/filters/kword/palmdoc/palmdocimport.h +++ b/filters/kword/palmdoc/palmdocimport.h @@ -37,7 +37,7 @@ class PalmDocImport : public KoFilter virtual ~PalmDocImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); private: diff --git a/filters/kword/pdf/FilterDevice.cpp b/filters/kword/pdf/FilterDevice.cpp index 5182f188..8a08c95c 100644 --- a/filters/kword/pdf/FilterDevice.cpp +++ b/filters/kword/pdf/FilterDevice.cpp @@ -196,7 +196,7 @@ void Device::addImage() } // add image - TQString name = TQString("pictures/picture%1.png").tqarg(_data.imageIndex()); + TQString name = TQString("pictures/picture%1.png").arg(_data.imageIndex()); TQDomElement frameset = _data.pictureFrameset(_currentImage.rect); current()->pictures.append(frameset); TQDomElement picture = _data.createElement("PICTURE"); @@ -253,7 +253,7 @@ void Device::computeGeometry(GfxState *state, Image &image) uint Device::initImage(GfxState *state, int width, int height, bool withMask) { - // get image tqgeometry + // get image geometry Image image; image.mask = withMask; computeGeometry(state, image); diff --git a/filters/kword/pdf/FilterPage.cpp b/filters/kword/pdf/FilterPage.cpp index 5391cb24..14d3d384 100644 --- a/filters/kword/pdf/FilterPage.cpp +++ b/filters/kword/pdf/FilterPage.cpp @@ -85,7 +85,7 @@ void Page::addString(TextString *str) // TQString s; // for (int i=0; i<str->len; i++) s += TQChar(str->text[i]); // kdDebug(30516) << "string: " << s << " (" -// << (str->len>0 ? s[0].tqunicode() : 0) << ")" << endl; +// << (str->len>0 ? s[0].unicode() : 0) << ")" << endl; TextPage::addString(str); // kdDebug(30516) << " ...addString done" << endl; } @@ -245,9 +245,9 @@ void Page::initParagraph(Paragraph &par) const if ( res==-1 ) { tab.pos = dx; if (tabRightAligned) { - tab.tqalignment = Tabulator::Right; + tab.alignment = Tabulator::Right; kdDebug(30516) << "tabulated text right aligned.." << endl; - } else tab.tqalignment = Tabulator::Left; + } else tab.alignment = Tabulator::Left; par.tabs.push_back(tab); } } @@ -262,7 +262,7 @@ void Page::initParagraph(Paragraph &par) const else par.leftIndent = kMin(par.leftIndent, left); } - // compute tqalignment + // compute alignment for (it = par.lines().begin(); it!=par.lines().end(); ++it) { double left = (*it)->blocks->xMin; double right = block(*it, -1)->xMax; @@ -287,7 +287,7 @@ void Page::initParagraph(Paragraph &par) const } } - // finalize tqalignment + // finalize alignment if (rightAligned) par.align = (leftAligned ? AlignBlock : AlignRight); else if (centered) par.align = AlignCenter; } @@ -315,14 +315,14 @@ void Page::fillParagraph(Paragraph &par, double &offset) const TQChar c = par.blocks[bi].text[si]; int psi = par.charFromEnd(1, pbi); TQChar prev = (psi<0 ? TQChar::null : par.blocks[pbi].text[psi]); - if ( !prev.isNull() && type(c.tqunicode())==Hyphen ) + if ( !prev.isNull() && type(c.unicode())==Hyphen ) kdDebug(30516) << "hyphen ? " << TQString(prev) - << " type=" << type(prev.tqunicode()) + << " type=" << type(prev.unicode()) << endl; TextString *next = ((*it)->next ? (*it)->next->blocks->strings : 0); - if ( !prev.isNull() && type(c.tqunicode())==Hyphen - && isLetter( type(prev.tqunicode()) ) + if ( !prev.isNull() && type(c.unicode())==Hyphen + && isLetter( type(prev.unicode()) ) && next && next->len>0 && isLetter( type(next->text[next->len-1]) ) ) { kdDebug(30516) << "found hyphen" << endl; @@ -389,7 +389,7 @@ void Page::fillParagraph(Paragraph &par, double &offset) const FontFamily Page::checkSpecial(TQChar &c, const Font &font) const { Unicode res = 0; - switch ( PDFImport::checkSpecial(c.tqunicode(), res) ) { + switch ( PDFImport::checkSpecial(c.unicode(), res) ) { case Bullet: kdDebug(30516) << "found bullet" << endl; // #### FIXME : if list, use a COUNTER @@ -405,7 +405,7 @@ FontFamily Page::checkSpecial(TQChar &c, const Font &font) const kdDebug(30516) << "found latex special" << endl; return Times; case SpecialSymbol: - kdDebug(30516) << "found symbol=" << c.tqunicode() << endl; + kdDebug(30516) << "found symbol=" << c.unicode() << endl; return Times; //return Symbol; default: diff --git a/filters/kword/pdf/data.cpp b/filters/kword/pdf/data.cpp index a6abf929..3236aa39 100644 --- a/filters/kword/pdf/data.cpp +++ b/filters/kword/pdf/data.cpp @@ -117,7 +117,7 @@ TQDomElement Data::createFrameset(FramesetType type, const TQString &n) TQString name = n; if ( name.isNull() ) name = (text ? i18n("Text Frameset %1") - : i18n("Picture %1")).tqarg(index); + : i18n("Picture %1")).arg(index); frameset.setAttribute("name", name); frameset.setAttribute("frameInfo", 0); @@ -154,7 +154,7 @@ void Data::initPage(const TQValueVector<DRect> &rects, // kdDebug(30516) << "page #" << pageIndex << " rect #" << i // << ": " << rects[i].toString() << endl; if ( !rects[i].isValid() ) continue; - TQString name = i18n(TEXT_FRAMESET_NAMES[i]).tqarg(pageIndex); + TQString name = i18n(TEXT_FRAMESET_NAMES[i]).arg(pageIndex); _textFramesets[i] = createFrameset(Text, name); _framesets.appendChild(_textFramesets[i]); TQDomElement frame = createFrame(Text, rects[i], true); @@ -189,13 +189,13 @@ void Data::createParagraph(const TQString &text, ParagraphType type, textElement.appendChild( _document.createTextNode(text) ); paragraph.appendChild(textElement); - TQDomElement tqlayout = _document.createElement("LAYOUT"); - paragraph.appendChild(tqlayout); + TQDomElement layout = _document.createElement("LAYOUT"); + paragraph.appendChild(layout); TQDomElement element = _document.createElement("NAME"); element.setAttribute("value", "Standard"); - tqlayout.appendChild(element); + layout.appendChild(element); for (uint i=0; i<layouts.size(); i++) - tqlayout.appendChild(layouts[i]); + layout.appendChild(layouts[i]); if ( formats.size() ) { TQDomElement format = _document.createElement("FORMATS"); diff --git a/filters/kword/pdf/dialog.cpp b/filters/kword/pdf/dialog.cpp index 29e0eabc..74aa89e2 100644 --- a/filters/kword/pdf/dialog.cpp +++ b/filters/kword/pdf/dialog.cpp @@ -26,7 +26,7 @@ #include <tqapplication.h> #include <tqgrid.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqbuttongroup.h> #include <tqradiobutton.h> #include <tqwhatsthis.h> @@ -128,7 +128,7 @@ Dialog::Dialog(uint nbPages, bool isEncrypted, TQWidget *widget) gbox->setInsideSpacing(KDialogBase::spacingHint()); top->addWidget(gbox); _group = new TQButtonGroup; - _allButton = new TQRadioButton(i18n("All (%1 pages)").tqarg(nbPages), gbox); + _allButton = new TQRadioButton(i18n("All (%1 pages)").arg(nbPages), gbox); _allButton->setChecked(true); _group->insert(_allButton); TQHBox *hbox = new TQHBox(gbox); @@ -147,8 +147,8 @@ Dialog::Dialog(uint nbPages, bool isEncrypted, TQWidget *widget) _smart->setChecked(true); TQWhatsThis::add(_smart, i18n("Removes returns and hyphens at end of line. " - "Also tries to compute the paragraph tqalignment. " - "Note that the tqlayout of some pages can " + "Also tries to compute the paragraph alignment. " + "Note that the layout of some pages can " "get messed up.")); top->addWidget(_smart); @@ -181,7 +181,7 @@ Options Dialog::options() const { Options o; o.range = SelectionRange( (_allButton->isChecked() ? - TQString("1-%1").tqarg(_nbPages) : _range->text()) ); + TQString("1-%1").arg(_nbPages) : _range->text()) ); o.ownerPassword = _owner->text(); o.userPassword = _user->text(); o.importImages = _images->isChecked(); diff --git a/filters/kword/pdf/fstring.cpp b/filters/kword/pdf/fstring.cpp index 1dd953aa..c8ecabcb 100644 --- a/filters/kword/pdf/fstring.cpp +++ b/filters/kword/pdf/fstring.cpp @@ -32,10 +32,10 @@ namespace PDFImport { TQDomElement Tabulator::createElement(Data &data) const { TQDomElement element = data.createElement("TABULATOR"); - element.setAttribute("type", tqalignment); + element.setAttribute("type", alignment); element.setAttribute("ptpos", pos); element.setAttribute("filling", filling); - if ( tqalignment==Character ) + if ( alignment==Character ) element.setAttribute("alignchar", TQString(alignmentChar)); return element; } diff --git a/filters/kword/pdf/fstring.h b/filters/kword/pdf/fstring.h index 6e4d0b6a..644c9398 100644 --- a/filters/kword/pdf/fstring.h +++ b/filters/kword/pdf/fstring.h @@ -39,13 +39,13 @@ public: enum Alignment { Left = 0, Center, Right, Character }; enum Filling { Blank = 0, Dots, Line, Dash, DashDot, DashDotDot }; - Tabulator() : tqalignment(Left) {} + Tabulator() : alignment(Left) {} TQDomElement createElement(Data &data) const; public: double pos; - Alignment tqalignment; + Alignment alignment; Filling filling; TQChar alignmentChar; }; diff --git a/filters/kword/pdf/misc.cpp b/filters/kword/pdf/misc.cpp index 0ffc9dba..3cd0e1bf 100644 --- a/filters/kword/pdf/misc.cpp +++ b/filters/kword/pdf/misc.cpp @@ -70,8 +70,8 @@ void DRect::unite(const DRect &r) TQString DRect::toString() const { if ( !isValid() ) return "invalid rect"; - return TQString("left=%1 right=%2 top=%3 bottom=%4").tqarg(_left).tqarg(_right) - .tqarg(_top).tqarg(_bottom); + return TQString("left=%1 right=%2 top=%3 bottom=%4").arg(_left).arg(_right) + .arg(_top).arg(_bottom); } bool DPath::isRectangle() const @@ -211,7 +211,7 @@ void Font::init(const TQString &n) _data->family = FAMILY_DATA[Symbol]; else { // with TQt TQFontDatabase fdb; - TQStringList list = fdb.tqfamilies(); + TQStringList list = fdb.families(); list = list.grep(name, false); if ( !list.isEmpty() ) { _data->family = list[0]; diff --git a/filters/kword/pdf/pdfdocument.cpp b/filters/kword/pdf/pdfdocument.cpp index ffe27e1c..80ec92d0 100644 --- a/filters/kword/pdf/pdfdocument.cpp +++ b/filters/kword/pdf/pdfdocument.cpp @@ -38,7 +38,7 @@ Document::Document() : _file(0), _object(0), _fileStream(0), _document(0), _device(0) {} -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus Document::init(const TQString &name, const TQString &ownerPassword, const TQString &userPassword) { diff --git a/filters/kword/pdf/pdfdocument.h b/filters/kword/pdf/pdfdocument.h index c54606f4..b2da781f 100644 --- a/filters/kword/pdf/pdfdocument.h +++ b/filters/kword/pdf/pdfdocument.h @@ -43,7 +43,7 @@ class Document Document(); ~Document() { clear(); } - KoFilter::ConversiontqStatus init(const TQString &name, + KoFilter::ConversionStatus init(const TQString &name, const TQString &ownerPassword, const TQString &userPassword); void clear(); diff --git a/filters/kword/pdf/pdfimport.cpp b/filters/kword/pdf/pdfimport.cpp index bee3e39a..dfc56703 100644 --- a/filters/kword/pdf/pdfimport.cpp +++ b/filters/kword/pdf/pdfimport.cpp @@ -55,7 +55,7 @@ K_EXPORT_COMPONENT_FACTORY(libpdfimport, PdfImportFactory()) PdfImport::PdfImport(KoFilter *, const char *, const TQStringList&) {} -KoFilter::ConversiontqStatus PdfImport::convert(const TQCString& from, +KoFilter::ConversionStatus PdfImport::convert(const TQCString& from, const TQCString& to) { // check for proper conversion @@ -63,7 +63,7 @@ KoFilter::ConversiontqStatus PdfImport::convert(const TQCString& from, return KoFilter::NotImplemented; // read file - KoFilter::ConversiontqStatus result + KoFilter::ConversionStatus result = _doc.init(m_chain->inputFile(), TQString(), TQString()); if ( result!=KoFilter::OK ) return result; @@ -111,7 +111,7 @@ KoFilter::ConversiontqStatus PdfImport::convert(const TQCString& from, for (it.toFirst(); it.current()!=it.end(); it.next()) { TQString s = (first ? i18n("First pass: page #%1...") : i18n("Second pass: page #%1...")); - pd.setLabel( s.tqarg(it.current()) ); + pd.setLabel( s.arg(it.current()) ); tqApp->processEvents(); if (pd.wasCancelled()) return KoFilter::UserCancelled; kdDebug(30516) << "-- " << "pass #" << k diff --git a/filters/kword/pdf/pdfimport.h b/filters/kword/pdf/pdfimport.h index 9686714e..53ca8f97 100644 --- a/filters/kword/pdf/pdfimport.h +++ b/filters/kword/pdf/pdfimport.h @@ -33,7 +33,7 @@ class PdfImport : public KoFilter public: PdfImport(KoFilter *parent, const char *name, const TQStringList&); - KoFilter::ConversiontqStatus + KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); private: diff --git a/filters/kword/pdf/xpdf/xpdf/FTFont.cc b/filters/kword/pdf/xpdf/xpdf/FTFont.cc index ebbbff40..8de09e0e 100644 --- a/filters/kword/pdf/xpdf/xpdf/FTFont.cc +++ b/filters/kword/pdf/xpdf/xpdf/FTFont.cc @@ -50,7 +50,7 @@ FTFontEngine::~FTFontEngine() { FTFontFile::FTFontFile(FTFontEngine *engineA, char *fontFileName, char **fontEnc, GBool pdfFontHasEncoding) { char *name; - int tqunicodeCmap, macRomanCmap, msSymbolCmap; + int unicodeCmap, macRomanCmap, msSymbolCmap; int i, j; ok = gFalse; @@ -89,11 +89,11 @@ FTFontFile::FTFontFile(FTFontEngine *engineA, char *fontFileName, // and use (0xf000 + char code). // 3. If none of these rules apply, use the first cmap and hope for // the best (this shouldn't happen). - tqunicodeCmap = macRomanCmap = msSymbolCmap = 0xffff; + unicodeCmap = macRomanCmap = msSymbolCmap = 0xffff; for (i = 0; i < face->num_charmaps; ++i) { if (face->charmaps[i]->platform_id == 3 && face->charmaps[i]->encoding_id == 1) { - tqunicodeCmap = i; + unicodeCmap = i; } else if (face->charmaps[i]->platform_id == 1 && face->charmaps[i]->encoding_id == 0) { macRomanCmap = i; @@ -106,8 +106,8 @@ FTFontFile::FTFontFile(FTFontEngine *engineA, char *fontFileName, mode = ftFontModeCharCode; charMapOffset = 0; if (pdfFontHasEncoding) { - if (tqunicodeCmap != 0xffff) { - i = tqunicodeCmap; + if (unicodeCmap != 0xffff) { + i = unicodeCmap; mode = ftFontModeUnicode; } else if (macRomanCmap != 0xffff) { i = macRomanCmap; diff --git a/filters/kword/pdf/xpdf/xpdf/FontFile.cc b/filters/kword/pdf/xpdf/xpdf/FontFile.cc index 73a7f1d3..ccb880bf 100644 --- a/filters/kword/pdf/xpdf/xpdf/FontFile.cc +++ b/filters/kword/pdf/xpdf/xpdf/FontFile.cc @@ -3206,7 +3206,7 @@ void TrueTypeFontFile::cvtCharStrings(const char **encodingA, GBool pdfFontHasEncoding, FontFileOutputFunc outputFunc, void *outputStream) { - int tqunicodeCmap, macRomanCmap, msSymbolCmap; + int unicodeCmap, macRomanCmap, msSymbolCmap; int nCmaps, cmapPlatform, cmapEncoding, cmapFmt, cmapOffset; T42FontIndexMode mode; const char *name; @@ -3239,13 +3239,13 @@ void TrueTypeFontFile::cvtCharStrings(const char **encodingA, // 3. If none of these rules apply, use the first cmap and hope for // the best (this shouldn't happen). nCmaps = getUShort(pos+2); - tqunicodeCmap = macRomanCmap = msSymbolCmap = -1; + unicodeCmap = macRomanCmap = msSymbolCmap = -1; cmapOffset = 0; for (i = 0; i < nCmaps; ++i) { cmapPlatform = getUShort(pos + 4 + 8*i); cmapEncoding = getUShort(pos + 4 + 8*i + 2); if (cmapPlatform == 3 && cmapEncoding == 1) { - tqunicodeCmap = i; + unicodeCmap = i; } else if (cmapPlatform == 1 && cmapEncoding == 0) { macRomanCmap = i; } else if (cmapPlatform == 3 && cmapEncoding == 0) { @@ -3255,8 +3255,8 @@ void TrueTypeFontFile::cvtCharStrings(const char **encodingA, i = 0; mode = t42FontModeCharCode; if (pdfFontHasEncoding) { - if (tqunicodeCmap >= 0) { - i = tqunicodeCmap; + if (unicodeCmap >= 0) { + i = unicodeCmap; mode = t42FontModeUnicode; } else if (macRomanCmap >= 0) { i = macRomanCmap; diff --git a/filters/kword/pdf/xpdf/xpdf/GlobalParams.cc b/filters/kword/pdf/xpdf/xpdf/GlobalParams.cc index d25970de..8a7b36de 100644 --- a/filters/kword/pdf/xpdf/xpdf/GlobalParams.cc +++ b/filters/kword/pdf/xpdf/xpdf/GlobalParams.cc @@ -139,7 +139,7 @@ GlobalParams::GlobalParams(const char *cfgFileName) { nameToUnicode = new NameToCharCode(); cidToUnicodes = new GHash(gTrue); residentUnicodeMaps = new GHash(); - tqunicodeMaps = new GHash(gTrue); + unicodeMaps = new GHash(gTrue); cMapDirs = new GHash(gTrue); toUnicodeDirs = new GList(); displayFonts = new GHash(); @@ -195,7 +195,7 @@ GlobalParams::GlobalParams(const char *cfgFileName) { errQuiet = gFalse; cidToUnicodeCache = new CIDToUnicodeCache(); - tqunicodeMapCache = new UnicodeMapCache(); + unicodeMapCache = new UnicodeMapCache(); cMapCache = new CMapCache(); // set up the initial nameToUnicode table @@ -318,7 +318,7 @@ void GlobalParams::parseFile(GString *fileName, FILE *f) { parseNameToUnicode(tokens, fileName, line); } else if (!cmd->cmp("cidToUnicode")) { parseCIDToUnicode(tokens, fileName, line); - } else if (!cmd->cmp("tqunicodeMap")) { + } else if (!cmd->cmp("unicodeMap")) { parseUnicodeMap(tokens, fileName, line); } else if (!cmd->cmp("cMapDir")) { parseCMapDir(tokens, fileName, line); @@ -465,16 +465,16 @@ void GlobalParams::parseUnicodeMap(GList *tokens, GString *fileName, GString *encodingName, *name, *old; if (tokens->getLength() != 3) { - error(-1, "Bad 'tqunicodeMap' config file command (%s:%d)", + error(-1, "Bad 'unicodeMap' config file command (%s:%d)", fileName->getCString(), line); return; } encodingName = (GString *)tokens->get(1); name = (GString *)tokens->get(2); - if ((old = (GString *)tqunicodeMaps->remove(encodingName))) { + if ((old = (GString *)unicodeMaps->remove(encodingName))) { delete old; } - tqunicodeMaps->add(encodingName->copy(), name->copy()); + unicodeMaps->add(encodingName->copy(), name->copy()); } void GlobalParams::parseCMapDir(GList *tokens, GString *fileName, int line) { @@ -765,7 +765,7 @@ GlobalParams::~GlobalParams() { delete nameToUnicode; deleteGHash(cidToUnicodes, GString); deleteGHash(residentUnicodeMaps, UnicodeMap); - deleteGHash(tqunicodeMaps, GString); + deleteGHash(unicodeMaps, GString); deleteGList(toUnicodeDirs, GString); deleteGHash(displayFonts, DisplayFontParam); deleteGHash(displayCIDFonts, DisplayFontParam); @@ -793,7 +793,7 @@ GlobalParams::~GlobalParams() { delete cMapDirs; delete cidToUnicodeCache; - delete tqunicodeMapCache; + delete unicodeMapCache; delete cMapCache; } @@ -825,7 +825,7 @@ UnicodeMap *GlobalParams::getResidentUnicodeMap(const GString *encodingName) { FILE *GlobalParams::getUnicodeMapFile(const GString *encodingName) { GString *fileName; - if (!(fileName = (GString *)tqunicodeMaps->lookup(encodingName))) { + if (!(fileName = (GString *)unicodeMaps->lookup(encodingName))) { return NULL; } return fopen(fileName->getCString(), "r"); @@ -959,7 +959,7 @@ UnicodeMap *GlobalParams::getUnicodeMap(GString *encodingName) { map->incRefCnt(); return map; } - return tqunicodeMapCache->getUnicodeMap(encodingName); + return unicodeMapCache->getUnicodeMap(encodingName); } CMap *GlobalParams::getCMap(GString *collection, GString *cMapName) { diff --git a/filters/kword/pdf/xpdf/xpdf/GlobalParams.h b/filters/kword/pdf/xpdf/xpdf/GlobalParams.h index 1f3e4c53..86114a15 100644 --- a/filters/kword/pdf/xpdf/xpdf/GlobalParams.h +++ b/filters/kword/pdf/xpdf/xpdf/GlobalParams.h @@ -237,7 +237,7 @@ private: // [GString] GHash *residentUnicodeMaps; // mappings from Unicode to char codes, // indexed by encoding name [UnicodeMap] - GHash *tqunicodeMaps; // files for mappings from Unicode to char + GHash *unicodeMaps; // files for mappings from Unicode to char // codes, indexed by encoding name [GString] GHash *cMapDirs; // list of CMap dirs, indexed by collection // name [GList[GString]] @@ -263,7 +263,7 @@ private: GBool psEmbedCIDTrueType; // embed CID TrueType fonts? GBool psOPI; // generate PostScript OPI comments? GBool psASCIIHex; // use ASCIIHex instead of ASCII85? - GString *textEncoding; // encoding (tqunicodeMap) to use for text + GString *textEncoding; // encoding (unicodeMap) to use for text // output EndOfLineKind textEOL; // type of EOL marker to use for text // output @@ -280,7 +280,7 @@ private: GBool errQuiet; // suppress error messages? CIDToUnicodeCache *cidToUnicodeCache; - UnicodeMapCache *tqunicodeMapCache; + UnicodeMapCache *unicodeMapCache; CMapCache *cMapCache; }; diff --git a/filters/kword/pdf/xpdf/xpdf/TTFont.cc b/filters/kword/pdf/xpdf/xpdf/TTFont.cc index 6077f3c0..6107fd43 100644 --- a/filters/kword/pdf/xpdf/xpdf/TTFont.cc +++ b/filters/kword/pdf/xpdf/xpdf/TTFont.cc @@ -48,7 +48,7 @@ TTFontEngine::~TTFontEngine() { TTFontFile::TTFontFile(TTFontEngine *engineA, char *fontFileName, char **fontEnc, GBool pdfFontHasEncoding) { TT_Face_Properties props; - TT_UShort tqunicodeCmap, macRomanCmap, msSymbolCmap; + TT_UShort unicodeCmap, macRomanCmap, msSymbolCmap; TT_UShort platform, encoding, i; int j; @@ -77,11 +77,11 @@ TTFontFile::TTFontFile(TTFontEngine *engineA, char *fontFileName, // and use (0xf000 + char code). // 3. If none of these rules apply, use the first cmap and hope for // the best (this shouldn't happen). - tqunicodeCmap = macRomanCmap = msSymbolCmap = 0xffff; + unicodeCmap = macRomanCmap = msSymbolCmap = 0xffff; for (i = 0; i < props.num_CharMaps; ++i) { if (!TT_Get_CharMap_ID(face, i, &platform, &encoding)) { if (platform == 3 && encoding == 1) { - tqunicodeCmap = i; + unicodeCmap = i; } else if (platform == 1 && encoding == 0) { macRomanCmap = i; } else if (platform == 3 && encoding == 0) { @@ -93,8 +93,8 @@ TTFontFile::TTFontFile(TTFontEngine *engineA, char *fontFileName, mode = ttFontModeCharCode; charMapOffset = 0; if (pdfFontHasEncoding) { - if (tqunicodeCmap != 0xffff) { - i = tqunicodeCmap; + if (unicodeCmap != 0xffff) { + i = unicodeCmap; mode = ttFontModeUnicode; } else if (macRomanCmap != 0xffff) { i = macRomanCmap; diff --git a/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc b/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc index d197e5cf..fe1185d7 100644 --- a/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc +++ b/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc @@ -46,7 +46,7 @@ UnicodeMap *UnicodeMap::parse(GString *encodingNameA) { char *tok1, *tok2, *tok3; if (!(f = globalParams->getUnicodeMapFile(encodingNameA))) { - error(-1, "Couldn't find tqunicodeMap file for the '%s' encoding", + error(-1, "Couldn't find unicodeMap file for the '%s' encoding", encodingNameA->getCString()); return NULL; } @@ -93,11 +93,11 @@ UnicodeMap *UnicodeMap::parse(GString *encodingNameA) { eMap->nBytes = nBytes; ++map->eMapsLen; } else { - error(-1, "Bad line (%d) in tqunicodeMap file for the '%s' encoding", + error(-1, "Bad line (%d) in unicodeMap file for the '%s' encoding", line, encodingNameA->getCString()); } } else { - error(-1, "Bad line (%d) in tqunicodeMap file for the '%s' encoding", + error(-1, "Bad line (%d) in unicodeMap file for the '%s' encoding", line, encodingNameA->getCString()); } ++line; @@ -110,8 +110,8 @@ UnicodeMap *UnicodeMap::parse(GString *encodingNameA) { UnicodeMap::UnicodeMap(GString *encodingNameA) { encodingName = encodingNameA; - tqunicodeOut = gFalse; - kind = tqunicodeMapUser; + unicodeOut = gFalse; + kind = unicodeMapUser; ranges = NULL; len = 0; eMaps = NULL; @@ -119,11 +119,11 @@ UnicodeMap::UnicodeMap(GString *encodingNameA) { refCnt = 1; } -UnicodeMap::UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA, +UnicodeMap::UnicodeMap(const char *encodingNameA, GBool unicodeOutA, UnicodeMapRange *rangesA, int lenA) { encodingName = new GString(encodingNameA); - tqunicodeOut = tqunicodeOutA; - kind = tqunicodeMapResident; + unicodeOut = unicodeOutA; + kind = unicodeMapResident; ranges = rangesA; len = lenA; eMaps = NULL; @@ -131,11 +131,11 @@ UnicodeMap::UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA, refCnt = 1; } -UnicodeMap::UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA, +UnicodeMap::UnicodeMap(const char *encodingNameA, GBool unicodeOutA, UnicodeMapFunc funcA) { encodingName = new GString(encodingNameA); - tqunicodeOut = tqunicodeOutA; - kind = tqunicodeMapFunc; + unicodeOut = unicodeOutA; + kind = unicodeMapFunc; func = funcA; eMaps = NULL; eMapsLen = 0; @@ -144,7 +144,7 @@ UnicodeMap::UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA, UnicodeMap::~UnicodeMap() { delete encodingName; - if (kind == tqunicodeMapUser && ranges) { + if (kind == unicodeMapUser && ranges) { gfree(ranges); } if (eMaps) { @@ -170,7 +170,7 @@ int UnicodeMap::mapUnicode(Unicode u, char *buf, int bufSize) { int a, b, m, n, i, j; Guint code; - if (kind == tqunicodeMapFunc) { + if (kind == unicodeMapFunc) { return (*func)(u, buf, bufSize); } @@ -219,7 +219,7 @@ int UnicodeMap::mapUnicode(Unicode u, char *buf, int bufSize) { UnicodeMapCache::UnicodeMapCache() { int i; - for (i = 0; i < tqunicodeMapCacheSize; ++i) { + for (i = 0; i < unicodeMapCacheSize; ++i) { cache[i] = NULL; } } @@ -227,7 +227,7 @@ UnicodeMapCache::UnicodeMapCache() { UnicodeMapCache::~UnicodeMapCache() { int i; - for (i = 0; i < tqunicodeMapCacheSize; ++i) { + for (i = 0; i < unicodeMapCacheSize; ++i) { if (cache[i]) { cache[i]->decRefCnt(); } @@ -242,7 +242,7 @@ UnicodeMap *UnicodeMapCache::getUnicodeMap(GString *encodingName) { cache[0]->incRefCnt(); return cache[0]; } - for (i = 1; i < tqunicodeMapCacheSize; ++i) { + for (i = 1; i < unicodeMapCacheSize; ++i) { if (cache[i] && cache[i]->match(encodingName)) { map = cache[i]; for (j = i; j >= 1; --j) { @@ -254,10 +254,10 @@ UnicodeMap *UnicodeMapCache::getUnicodeMap(GString *encodingName) { } } if ((map = UnicodeMap::parse(encodingName))) { - if (cache[tqunicodeMapCacheSize - 1]) { - cache[tqunicodeMapCacheSize - 1]->decRefCnt(); + if (cache[unicodeMapCacheSize - 1]) { + cache[unicodeMapCacheSize - 1]->decRefCnt(); } - for (j = tqunicodeMapCacheSize - 1; j >= 1; --j) { + for (j = unicodeMapCacheSize - 1; j >= 1; --j) { cache[j] = cache[j - 1]; } cache[0] = map; diff --git a/filters/kword/pdf/xpdf/xpdf/UnicodeMap.h b/filters/kword/pdf/xpdf/xpdf/UnicodeMap.h index 35506aab..189f3154 100644 --- a/filters/kword/pdf/xpdf/xpdf/UnicodeMap.h +++ b/filters/kword/pdf/xpdf/xpdf/UnicodeMap.h @@ -25,9 +25,9 @@ class GString; //------------------------------------------------------------------------ enum UnicodeMapKind { - tqunicodeMapUser, // read from a file - tqunicodeMapResident, // static list of ranges - tqunicodeMapFunc // function pointer + unicodeMapUser, // read from a file + unicodeMapResident, // static list of ranges + unicodeMapFunc // function pointer }; typedef int (*UnicodeMapFunc)(Unicode u, char *buf, int bufSize); @@ -49,12 +49,12 @@ public: static UnicodeMap *parse(GString *encodingNameA); // Create a resident UnicodeMap. - UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA, + UnicodeMap(const char *encodingNameA, GBool unicodeOutA, UnicodeMapRange *rangesA, int lenA); // Create a resident UnicodeMap that uses a function instead of a // list of ranges. - UnicodeMap(const char *encodingNameA, GBool tqunicodeOutA, + UnicodeMap(const char *encodingNameA, GBool unicodeOutA, UnicodeMapFunc funcA); ~UnicodeMap(); @@ -64,7 +64,7 @@ public: GString *getEncodingName() { return encodingName; } - GBool isUnicode() { return tqunicodeOut; } + GBool isUnicode() { return unicodeOut; } // Return true if this UnicodeMap matches the specified // <encodingNameA>. @@ -82,7 +82,7 @@ private: GString *encodingName; UnicodeMapKind kind; - GBool tqunicodeOut; + GBool unicodeOut; union { UnicodeMapRange *ranges; // (user, resident) UnicodeMapFunc func; // (func) @@ -95,7 +95,7 @@ private: //------------------------------------------------------------------------ -#define tqunicodeMapCacheSize 4 +#define unicodeMapCacheSize 4 class UnicodeMapCache { public: @@ -110,7 +110,7 @@ public: private: - UnicodeMap *cache[tqunicodeMapCacheSize]; + UnicodeMap *cache[unicodeMapCacheSize]; }; #endif diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFApp.cc b/filters/kword/pdf/xpdf/xpdf/XPDFApp.cc index d0bda665..e456310b 100644 --- a/filters/kword/pdf/xpdf/xpdf/XPDFApp.cc +++ b/filters/kword/pdf/xpdf/xpdf/XPDFApp.cc @@ -54,8 +54,8 @@ static XrmOptionDescRec xOpts[] = { {"-fg", "*Foreground", XrmoptionSepArg, NULL}, {"-background", "*Background", XrmoptionSepArg, NULL}, {"-bg", "*Background", XrmoptionSepArg, NULL}, - {"-tqgeometry", ".tqgeometry", XrmoptionSepArg, NULL}, - {"-g", ".tqgeometry", XrmoptionSepArg, NULL}, + {"-geometry", ".geometry", XrmoptionSepArg, NULL}, + {"-g", ".geometry", XrmoptionSepArg, NULL}, {"-font", "*.fontList", XrmoptionSepArg, NULL}, {"-fn", "*.fontList", XrmoptionSepArg, NULL}, {"-title", ".title", XrmoptionSepArg, NULL}, @@ -69,7 +69,7 @@ static XrmOptionDescRec xOpts[] = { #define nXOpts (sizeof(xOpts) / sizeof(XrmOptionDescRec)) struct XPDFAppResources { - String tqgeometry; + String geometry; String title; Bool installCmap; int rgbCubeSize; @@ -85,7 +85,7 @@ static Bool defReverseVideo = False; static Bool defViKeys = False; static XtResource xResources[] = { - { "geometry", "Geometry", XtRString, sizeof(String), XtOffsetOf(XPDFAppResources, tqgeometry), XtRString, (XtPointer)NULL }, + { "geometry", "Geometry", XtRString, sizeof(String), XtOffsetOf(XPDFAppResources, geometry), XtRString, (XtPointer)NULL }, { "title", "Title", XtRString, sizeof(String), XtOffsetOf(XPDFAppResources, title), XtRString, (XtPointer)NULL }, { "installCmap", "InstallCmap", XtRBool, sizeof(Bool), XtOffsetOf(XPDFAppResources, installCmap), XtRBool, (XtPointer)&defInstallCmap }, { "rgbCubeSize", "RgbCubeSize", XtRInt, sizeof(int), XtOffsetOf(XPDFAppResources, rgbCubeSize), XtRInt, (XtPointer)&defRGBCubeSize }, @@ -156,7 +156,7 @@ void XPDFApp::getResources() { XtGetApplicationResources(appShell, &resources, xResources, nXResources, NULL, 0); - tqgeometry = resources.tqgeometry ? new GString(resources.tqgeometry) + geometry = resources.geometry ? new GString(resources.geometry) : (GString *)NULL; title = resources.title ? new GString(resources.title) : (GString *)NULL; installCmap = (GBool)resources.installCmap; @@ -180,8 +180,8 @@ void XPDFApp::getResources() { XPDFApp::~XPDFApp() { deleteGList(viewers, XPDFViewer); - if (tqgeometry) { - delete tqgeometry; + if (geometry) { + delete geometry; } if (title) { delete title; diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFApp.h b/filters/kword/pdf/xpdf/xpdf/XPDFApp.h index 46aa28dc..4875456e 100644 --- a/filters/kword/pdf/xpdf/xpdf/XPDFApp.h +++ b/filters/kword/pdf/xpdf/xpdf/XPDFApp.h @@ -58,7 +58,7 @@ public: void remoteQuit(); //----- resource/option values - GString *getGeometry() { return tqgeometry; } + GString *getGeometry() { return geometry; } GString *getTitle() { return title; } GBool getInstallCmap() { return installCmap; } int getRGBCubeSize() { return rgbCubeSize; } @@ -90,7 +90,7 @@ private: Widget remoteWin; //----- resource/option values - GString *tqgeometry; + GString *geometry; GString *title; GBool installCmap; int rgbCubeSize; diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc b/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc index 290861b9..8f5baeb5 100644 --- a/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc +++ b/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc @@ -16,7 +16,7 @@ struct _XPDFTreeEntry { Widget widget; - XPDFTreeEntry *tqchildren; + XPDFTreeEntry *children; XPDFTreeEntry *next; }; @@ -56,7 +56,7 @@ static void insertChildOnList(XPDFTreeEntry *e, XPDFTreeEntry **listHead); static void deleteChildFromList(XPDFTreeEntry *e, XPDFTreeEntry **listHead); static void createGC(Widget widget); static void destroyGC(Widget widget); -static void tqlayout(Widget widget, Widget instigator); +static void layout(Widget widget, Widget instigator); static int layoutSubtree(XPDFTreeWidget w, Widget instigator, XPDFTreeEntry *e, Position x, Position y, Boolean visible); @@ -66,7 +66,7 @@ static void calcSize(Widget widget, Widget instigator, static void calcSubtreeSize(XPDFTreeWidget w, Widget instigator, XPDFTreeEntry *e, Dimension *width, Dimension *height); -static Boolean needRetqlayout(Widget oldWidget, Widget newWidget); +static Boolean needRelayout(Widget oldWidget, Widget newWidget); static void click(Widget widget, XEvent *event, String *params, Cardinal *numParams); static Boolean findPosition(XPDFTreeWidget w, int x, int y, @@ -158,7 +158,7 @@ externaldef(xpdftreeclassrec) XPDFTreeClassRec xpdfTreeClassRec = { XtVersion, // version NULL, // callback_private defaultTranslations, // tm_table - &queryGeometry, // query_tqgeometry + &queryGeometry, // query_geometry NULL, // display_accelerator NULL // extension }, @@ -195,9 +195,9 @@ externaldef(xpdftreeclassrec) XPDFTreeClassRec xpdfTreeClassRec = { { // XPDFTree &createGC, // createGC &destroyGC, // destroyGC - &tqlayout, // tqlayout + &layout, // layout &calcSize, // calcSize - &needRetqlayout, // needRetqlayout + &needRelayout, // needRelayout NULL // extension } }; @@ -218,14 +218,14 @@ static void classPartInitialize(WidgetClass widgetCls) { if (wc->treeClass.destroyGC == XPDFInheritDestroyGC) { wc->treeClass.destroyGC = sc->treeClass.destroyGC; } - if (wc->treeClass.tqlayout == XPDFInheritLayout) { - wc->treeClass.tqlayout = sc->treeClass.tqlayout; + if (wc->treeClass.layout == XPDFInheritLayout) { + wc->treeClass.layout = sc->treeClass.layout; } if (wc->treeClass.calcSize == XPDFInheritCalcSize) { wc->treeClass.calcSize = sc->treeClass.calcSize; } - if (wc->treeClass.needRetqlayout == XPDFInheritNeedRetqlayout) { - wc->treeClass.needRetqlayout = sc->treeClass.needRetqlayout; + if (wc->treeClass.needRelayout == XPDFInheritNeedRelayout) { + wc->treeClass.needRelayout = sc->treeClass.needRelayout; } } @@ -259,8 +259,8 @@ static void destroy(Widget widget) { } static void destroySubtree(XPDFTreeEntry *e) { - if (e->tqchildren) { - destroySubtree(e->tqchildren); + if (e->children) { + destroySubtree(e->children); } if (e->next) { destroySubtree(e->next); @@ -270,10 +270,10 @@ static void destroySubtree(XPDFTreeEntry *e) { static void resize(Widget widget) { XPDFTreeWidgetClass cls = (XPDFTreeWidgetClass)XtClass(widget); - if (cls->treeClass.tqlayout) { - (*cls->treeClass.tqlayout)(widget, NULL); + if (cls->treeClass.layout) { + (*cls->treeClass.layout)(widget, NULL); } else { - tqlayout(widget, NULL); + layout(widget, NULL); } } @@ -301,11 +301,11 @@ static void redisplaySubtree(XPDFTreeWidget w, XPDFTreeEntry *e, c = XPDFTreeCPart(e->widget); x = e->widget->core.x; y = e->widget->core.y + e->widget->core.height / 2; - if (e->tqchildren) { + if (e->children) { if (c->entryExpanded) { drawExpandedIcon(w, x - 8, y); y2 = y; // make gcc happy - for (child = e->tqchildren; child; child = child->next) { + for (child = e->children; child; child = child->next) { y2 = child->widget->core.y + child->widget->core.height / 2; XDrawLine(XtDisplay((Widget)w), XtWindow((Widget)w), w->tree.dottedGC, x - 8, y2, x + 6, y2); @@ -346,16 +346,16 @@ static Boolean setValues(Widget oldWidget, Widget requestWidget, XPDFTreeWidget ow = (XPDFTreeWidget)oldWidget; XPDFTreeWidget nw = (XPDFTreeWidget)newWidget; XPDFTreeWidgetClass cls = (XPDFTreeWidgetClass)XtClass(nw); - Boolean retqlayout, redisp; + Boolean relayout, redisp; - // check to see if tqlayout-affecting resources have changed - if (cls->treeClass.needRetqlayout) { - retqlayout = (*cls->treeClass.needRetqlayout)((Widget)ow, (Widget)nw); + // check to see if layout-affecting resources have changed + if (cls->treeClass.needRelayout) { + relayout = (*cls->treeClass.needRelayout)((Widget)ow, (Widget)nw); } else { - retqlayout = needRetqlayout((Widget)ow, (Widget)nw); + relayout = needRelayout((Widget)ow, (Widget)nw); } redisp = False; - if (retqlayout) { + if (relayout) { // calculate a new ideal size (reset the widget size first so // calcSize will compute a new one) @@ -372,14 +372,14 @@ static Boolean setValues(Widget oldWidget, Widget requestWidget, calcSize((Widget)nw, NULL, &nw->core.width, &nw->core.height); } - // if resources have changed but size hasn't, tqlayout manually + // if resources have changed but size hasn't, layout manually // (because Xt just looks at the size) if (nw->core.width == ow->core.width && nw->core.height == ow->core.height) { - if (cls->treeClass.tqlayout) { - (*cls->treeClass.tqlayout)((Widget)nw, NULL); + if (cls->treeClass.layout) { + (*cls->treeClass.layout)((Widget)nw, NULL); } else { - tqlayout((Widget)nw, NULL); + layout((Widget)nw, NULL); } redisp = True; } @@ -393,13 +393,13 @@ static void setValuesAlmost(Widget oldWidget, Widget newWidget, XtWidgetGeometry *reply) { XPDFTreeWidgetClass cls = (XPDFTreeWidgetClass)XtClass(newWidget); - // our parent rejected a tqgeometry request, so accept the compromise - // and retqlayout + // our parent rejected a geometry request, so accept the compromise + // and relayout if (!reply->request_mode) { - if (cls->treeClass.tqlayout) { - (*cls->treeClass.tqlayout)(newWidget, NULL); + if (cls->treeClass.layout) { + (*cls->treeClass.layout)(newWidget, NULL); } else { - tqlayout(newWidget, NULL); + layout(newWidget, NULL); } } *request = *reply; @@ -454,7 +454,7 @@ static XtGeometryResult geometryManager(Widget widget, return XtGeometryNo; } - // save the current tqgeometry + // save the current geometry curWidth = w->core.width; curHeight = w->core.height; curBW = w->core.border_width; @@ -480,7 +480,7 @@ static XtGeometryResult geometryManager(Widget widget, calcSize((Widget)w, widget, &parentReq.width, &reply->height); } - // send tqgeometry request to our parent + // send geometry request to our parent parentReq.request_mode = CWWidth | CWHeight; if (request->request_mode & XtCWQueryOnly) { parentReq.request_mode |= XtCWQueryOnly; @@ -491,15 +491,15 @@ static XtGeometryResult geometryManager(Widget widget, } if (result == XtGeometryNo || (request->request_mode & XtCWQueryOnly)) { - // restore the original tqgeometry + // restore the original geometry w->core.width = curWidth; w->core.height = curHeight; w->core.border_width = curBW; } else { - if (cls->treeClass.tqlayout) { - (*cls->treeClass.tqlayout)((Widget)w, widget); + if (cls->treeClass.layout) { + (*cls->treeClass.layout)((Widget)w, widget); } else { - tqlayout((Widget)w, widget); + layout((Widget)w, widget); } } @@ -529,11 +529,11 @@ static void changeManaged(Widget widget) { while (XtMakeResizeRequest(widget, width, height, &width, &height) == XtGeometryAlmost) ; - // retqlayout - if (cls->treeClass.tqlayout) { - (*cls->treeClass.tqlayout)(widget, NULL); + // relayout + if (cls->treeClass.layout) { + (*cls->treeClass.layout)(widget, NULL); } else { - tqlayout(widget, NULL); + layout(widget, NULL); } #if XmVERSION > 1 @@ -552,10 +552,10 @@ static void initConstraint(Widget requestWidget, Widget newWidget, c = XPDFTreeCPart(newWidget); c->e = (XPDFTreeEntry *)gmalloc(sizeof(XPDFTreeEntry)); c->e->widget = newWidget; - c->e->tqchildren = NULL; + c->e->children = NULL; c->e->next = NULL; if (c->entryParent) { - insertChildOnList(c->e, &XPDFTreeCPart(c->entryParent)->e->tqchildren); + insertChildOnList(c->e, &XPDFTreeCPart(c->entryParent)->e->children); } else { insertChildOnList(c->e, &w->tree.root); } @@ -573,11 +573,11 @@ static void deleteSubtree(Widget widget) { if (!c->e) { return; } - while (c->e->tqchildren) { - deleteSubtree(c->e->tqchildren->widget); + while (c->e->children) { + deleteSubtree(c->e->children->widget); } if (c->entryParent) { - deleteChildFromList(c->e, &XPDFTreeCPart(c->entryParent)->e->tqchildren); + deleteChildFromList(c->e, &XPDFTreeCPart(c->entryParent)->e->children); } else { deleteChildFromList(c->e, &w->tree.root); } @@ -591,7 +591,7 @@ static Boolean constraintSetValues(Widget oldWidget, Widget requestWidget, XPDFTreeWidget w = (XPDFTreeWidget)XtParent(newWidget); XPDFTreeWidgetClass cls = (XPDFTreeWidgetClass)XtClass((Widget)w); XPDFTreeConstraint oc, nc; - Boolean retqlayout; + Boolean relayout; Dimension width, height; if (!XtIsManaged(newWidget)) { @@ -599,25 +599,25 @@ static Boolean constraintSetValues(Widget oldWidget, Widget requestWidget, } oc = XPDFTreeCPart(oldWidget); nc = XPDFTreeCPart(newWidget); - retqlayout = False; + relayout = False; if (nc->entryParent != oc->entryParent || nc->entryPosition != oc->entryPosition) { if (oc->entryParent) { - deleteChildFromList(oc->e, &XPDFTreeCPart(oc->entryParent)->e->tqchildren); + deleteChildFromList(oc->e, &XPDFTreeCPart(oc->entryParent)->e->children); } else { deleteChildFromList(oc->e, &w->tree.root); } if (nc->entryParent) { - insertChildOnList(nc->e, &XPDFTreeCPart(nc->entryParent)->e->tqchildren); + insertChildOnList(nc->e, &XPDFTreeCPart(nc->entryParent)->e->children); } else { insertChildOnList(nc->e, &w->tree.root); } - retqlayout = True; + relayout = True; } else if (nc->entryExpanded != oc->entryExpanded) { - retqlayout = True; + relayout = True; } - if (retqlayout) { + if (relayout) { // calculate a new ideal size (reset the widget size first so // calcSize will compute a new one) @@ -634,15 +634,15 @@ static Boolean constraintSetValues(Widget oldWidget, Widget requestWidget, while (XtMakeResizeRequest((Widget)w, width, height, &width, &height) == XtGeometryAlmost) ; - // retqlayout the widget - if (cls->treeClass.tqlayout) { - (*cls->treeClass.tqlayout)((Widget)w, NULL); + // relayout the widget + if (cls->treeClass.layout) { + (*cls->treeClass.layout)((Widget)w, NULL); } else { - tqlayout((Widget)w, NULL); + layout((Widget)w, NULL); } } - return retqlayout; + return relayout; } static void insertChildOnList(XPDFTreeEntry *e, XPDFTreeEntry **listHead) { @@ -701,7 +701,7 @@ static void destroyGC(Widget widget) { XtReleaseGC(widget, w->tree.dottedGC); } -static void tqlayout(Widget widget, Widget instigator) { +static void layout(Widget widget, Widget instigator) { XPDFTreeWidget w = (XPDFTreeWidget)widget; XPDFTreeEntry *e; Position x, y; @@ -745,9 +745,9 @@ static int layoutSubtree(XPDFTreeWidget w, Widget instigator, } } - // place this entry's tqchildren + // place this entry's children x += xpdfTreeIndent; - for (child = e->tqchildren; child; child = child->next) { + for (child = e->children; child; child = child->next) { y = layoutSubtree(w, instigator, child, x, y, visible && (!c || c->entryExpanded)); } @@ -820,9 +820,9 @@ static void calcSubtreeSize(XPDFTreeWidget w, Widget instigator, h1 = 0; } - // if this entry is expanded, get size of all of its tqchildren + // if this entry is expanded, get size of all of its children if (c->entryExpanded) { - for (child = e->tqchildren; child; child = child->next) { + for (child = e->children; child; child = child->next) { calcSubtreeSize(w, instigator, child, &w2, &h2); w2 += xpdfTreeIndent; if (w2 > w1) { @@ -836,7 +836,7 @@ static void calcSubtreeSize(XPDFTreeWidget w, Widget instigator, *height = h1; } -static Boolean needRetqlayout(Widget oldWidget, Widget newWidget) { +static Boolean needRelayout(Widget oldWidget, Widget newWidget) { XPDFTreeWidget ow = (XPDFTreeWidget)oldWidget; XPDFTreeWidget nw = (XPDFTreeWidget)newWidget; @@ -907,13 +907,13 @@ static Boolean findPositionInSubtree(XPDFTreeWidget w, int x, int y, return True; } else if (x >= child->core.x - 16 && x < child->core.x - 4 && y >= y1 - 6 && y < y1 + 6 && - (*e)->tqchildren) { + (*e)->children) { *onExpandIcon = True; return True; } c = XPDFTreeCPart(child); if (!c || c->entryExpanded) { - for (e2 = (*e)->tqchildren; e2; e2 = e2->next) { + for (e2 = (*e)->children; e2; e2 = e2->next) { *e = e2; if (findPositionInSubtree(w, x, y, e, onExpandIcon)) { return True; diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h b/filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h index 9f31f9e2..16ab137a 100644 --- a/filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h +++ b/filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h @@ -22,14 +22,14 @@ typedef Boolean (*XPDFNeedRelayoutProc)(Widget oldWidget, Widget newWidget); #define XPDFInheritDestroyGC ((XtWidgetProc)_XtInherit) #define XPDFInheritLayout ((XPDFLayoutProc)_XtInherit) #define XPDFInheritCalcSize ((XPDFCalcSizeProc)_XtInherit) -#define XPDFInheritNeedRetqlayout ((XPDFNeedRelayoutProc)_XtInherit) +#define XPDFInheritNeedRelayout ((XPDFNeedRelayoutProc)_XtInherit) typedef struct { XtWidgetProc createGC; XtWidgetProc destroyGC; - XPDFLayoutProc tqlayout; + XPDFLayoutProc layout; XPDFCalcSizeProc calcSize; - XPDFNeedRelayoutProc needRetqlayout; + XPDFNeedRelayoutProc needRelayout; XtPointer extension; } XPDFTreeClassPart; diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc index de691914..a8c8f8f0 100644 --- a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc +++ b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc @@ -501,9 +501,9 @@ void XPDFViewer::initWindow() { XtSetArg(args[n], XmNdeleteResponse, XmDO_NOTHING); ++n; if (app->getFullScreen()) { XtSetArg(args[n], XmNmwmDecorations, 0); ++n; - XtSetArg(args[n], XmNtqgeometry, "+0+0"); ++n; + XtSetArg(args[n], XmNgeometry, "+0+0"); ++n; } else if (app->getGeometry()) { - XtSetArg(args[n], XmNtqgeometry, app->getGeometry()->getCString()); ++n; + XtSetArg(args[n], XmNgeometry, app->getGeometry()->getCString()); ++n; } win = XtCreatePopupShell("win", topLevelShellWidgetClass, app->getAppShell(), args, n); @@ -633,7 +633,7 @@ void XPDFViewer::initWindow() { XtSetArg(args[n], XmNbottomAttachment, XmATTACH_FORM); ++n; s = XmStringCreateLocalized(" of 00000"); XtSetArg(args[n], XmNlabelString, s); ++n; - XtSetArg(args[n], XmNtqalignment, XmALIGNMENT_BEGINNING); ++n; + XtSetArg(args[n], XmNalignment, XmALIGNMENT_BEGINNING); ++n; XtSetArg(args[n], XmNrecomputeSize, False); ++n; pageCountLabel = XmCreateLabel(toolBar, "pageCountLabel", args, n); XmStringFree(s); @@ -751,7 +751,7 @@ void XPDFViewer::initWindow() { s = XmStringCreateLocalized(""); XtSetArg(args[n], XmNlabelString, s); ++n; XtSetArg(args[n], XmNrecomputeSize, True); ++n; - XtSetArg(args[n], XmNtqalignment, XmALIGNMENT_BEGINNING); ++n; + XtSetArg(args[n], XmNalignment, XmALIGNMENT_BEGINNING); ++n; linkLabel = XmCreateLabel(toolBar, "linkLabel", args, n); XmStringFree(s); XtManageChild(linkLabel); diff --git a/filters/kword/pdf/xpdf/xpdf/xpdf.cc b/filters/kword/pdf/xpdf/xpdf/xpdf.cc index d4103df2..ef47fb6e 100644 --- a/filters/kword/pdf/xpdf/xpdf/xpdf.cc +++ b/filters/kword/pdf/xpdf/xpdf/xpdf.cc @@ -44,9 +44,9 @@ static GBool printHelp = gFalse; static ArgDesc argDesc[] = { {"-g", argStringDummy, NULL, 0, - "initial window tqgeometry"}, - {"-tqgeometry", argStringDummy, NULL, 0, - "initial window tqgeometry"}, + "initial window geometry"}, + {"-geometry", argStringDummy, NULL, 0, + "initial window geometry"}, {"-title", argStringDummy, NULL, 0, "window title"}, {"-cmap", argFlagDummy, NULL, 0, diff --git a/filters/kword/rtf/export/ExportFilter.cc b/filters/kword/rtf/export/ExportFilter.cc index 2fa566fa..8d160b57 100644 --- a/filters/kword/rtf/export/ExportFilter.cc +++ b/filters/kword/rtf/export/ExportFilter.cc @@ -21,7 +21,7 @@ */ #include <tqstring.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqfile.h> #include <tqfileinfo.h> #include <tqfontinfo.h> @@ -174,7 +174,7 @@ TQString RTFWorker::makeTable(const FrameAnchor& anchor) for (it=paraList->begin();it!=end;++it) { rowText += endOfParagraph; - rowText += ProcessParagraphData( (*it).text,(*it).tqlayout,(*it).formattingList); + rowText += ProcessParagraphData( (*it).text,(*it).layout,(*it).formattingList); rowText += m_eol; endOfParagraph = "\\par"; // The problem is that the last paragraph ends with \cell not with \par } @@ -264,7 +264,7 @@ TQString RTFWorker::makeImage(const FrameAnchor& anchor) // throw away WMF metaheader (22 bytes) for( uint i=0; i<image.size()-22; i++) - image.tqat(i) = image.tqat(i+22); // As we use uint, we need at() ( [] uses int only .) + image.at(i) = image.at(i+22); // As we use uint, we need at() ( [] uses int only .) image.resize( image.size()-22 ); } } @@ -362,7 +362,7 @@ TQString RTFWorker::formatTextParagraph(const TQString& strText, } TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, - const LayoutData& tqlayout, const ValueListFormatData ¶FormatDataList) + const LayoutData& layout, const ValueListFormatData ¶FormatDataList) { TQString str; TQString content; @@ -374,40 +374,40 @@ TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, markup += "\\intbl"; //lists - if (tqlayout.counter.style) + if (layout.counter.style) { markup += "{\\pntext\\pard\\plain"; - if( tqlayout.formatData.text.fontSize >= 0) + if( layout.formatData.text.fontSize >= 0) { markup += "\\fs"; - markup += TQString::number((2 * tqlayout.formatData.text.fontSize)); - markup += lookupFont("\\f",tqlayout.formatData.text.fontName); + markup += TQString::number((2 * layout.formatData.text.fontSize)); + markup += lookupFont("\\f",layout.formatData.text.fontName); } markup += " "; - markup += tqlayout.counter.text; + markup += layout.counter.text; markup += "\\tab}{\\*\\pn"; - if (tqlayout.counter.style > 5) + if (layout.counter.style > 5) { markup += "\\pnlvlblt "; markup += "{\\pntxtb "; - if (!tqlayout.counter.lefttext.isEmpty() && tqlayout.counter.lefttext != "{" && tqlayout.counter.lefttext != "}") + if (!layout.counter.lefttext.isEmpty() && layout.counter.lefttext != "{" && layout.counter.lefttext != "}") { - markup += tqlayout.counter.lefttext; + markup += layout.counter.lefttext; } - switch (tqlayout.counter.style) + switch (layout.counter.style) { case 6: { //custom bullets (one char) //TODO: use correct character/sign for bullet - markup += tqlayout.counter.customCharacter; + markup += layout.counter.customCharacter; break; } case 7: { //custom bullets (complex) - markup += tqlayout.counter.text; + markup += layout.counter.text; break; } case 8: @@ -435,7 +435,7 @@ TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, { //disc bullets //TODO: use correct character/sign for bullet - markup += tqlayout.counter.text; + markup += layout.counter.text; break; } default: @@ -445,23 +445,23 @@ TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, } else { - if (tqlayout.counter.numbering!=0) + if (layout.counter.numbering!=0) { markup += "\\pnlvl"; - markup += TQString::number(tqlayout.counter.depth + 1); + markup += TQString::number(layout.counter.depth + 1); markup += "\\pnprev1"; } - else if (tqlayout.counter.style==1) + else if (layout.counter.style==1) { markup += "\\pnlvlbody"; } else { markup += "\\pnlvl"; - markup += TQString::number(11 - tqlayout.counter.style); + markup += TQString::number(11 - layout.counter.style); } - switch (tqlayout.counter.style) + switch (layout.counter.style) { case 1: { @@ -492,18 +492,18 @@ TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, markup += "\\pndec"; } markup += "{\\pntxtb "; - markup += tqlayout.counter.lefttext; + markup += layout.counter.lefttext; markup += " }"; } markup += "{\\pntxta "; - markup += tqlayout.counter.righttext; + markup += layout.counter.righttext; markup += " }"; // ### FIXME: that is too late! And why at every list paragraph? (See bug #88241) - if (tqlayout.counter.start!=0) + if (layout.counter.start!=0) { markup += "\\pnstart"; - markup += TQString::number(tqlayout.counter.start); + markup += TQString::number(layout.counter.start); } else { @@ -511,15 +511,15 @@ TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, } markup += "\\pnindent0\\pnhang"; - if( tqlayout.formatData.text.fontSize > 0 ) + if( layout.formatData.text.fontSize > 0 ) { markup += "\\pnfs"; - markup += TQString::number((2 * tqlayout.formatData.text.fontSize)); + markup += TQString::number((2 * layout.formatData.text.fontSize)); } - if( !tqlayout.formatData.text.fontName.isEmpty() ) + if( !layout.formatData.text.fontName.isEmpty() ) { - markup += lookupFont("\\pnf", tqlayout.formatData.text.fontName); + markup += lookupFont("\\pnf", layout.formatData.text.fontName); } markup += "}"; @@ -527,20 +527,20 @@ TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, LayoutData styleLayout; - markup += lookupStyle(tqlayout.styleName, styleLayout); - markup += layoutToRtf(styleLayout,tqlayout,true); + markup += lookupStyle(layout.styleName, styleLayout); + markup += layoutToRtf(styleLayout,layout,true); - if ( 1==tqlayout.formatData.text.verticalAlignment ) + if ( 1==layout.formatData.text.verticalAlignment ) { markup += "\\sub"; //Subscript } - else if ( 2==tqlayout.formatData.text.verticalAlignment ) + else if ( 2==layout.formatData.text.verticalAlignment ) { markup += "\\super"; //Superscript } - if (tqlayout.pageBreakBefore) + if (layout.pageBreakBefore) content += "\\page "; @@ -554,7 +554,7 @@ TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, TQString partialText; - FormatData formatRef = tqlayout.formatData; + FormatData formatRef = layout.formatData; for ( paraFormatDataIt = paraFormatDataList.begin (); paraFormatDataIt != paraFormatDataList.end (); @@ -728,7 +728,7 @@ TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, const TQString prefixSaved = m_prefix; m_prefix = TQString(); for (it=paraList->begin();it!=end;++it) - fstr += ProcessParagraphData( (*it).text, (*it).tqlayout,(*it).formattingList); + fstr += ProcessParagraphData( (*it).text, (*it).layout,(*it).formattingList); m_prefix = prefixSaved; content += "{\\super "; content += automatic ? "\\chftn " : value; @@ -779,7 +779,7 @@ TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, } } - if (tqlayout.pageBreakAfter) + if (layout.pageBreakAfter) content += "\\page"; if (!content.isEmpty()) @@ -807,10 +807,10 @@ TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, } bool RTFWorker::doFullParagraph(const TQString& paraText, - const LayoutData& tqlayout, const ValueListFormatData& paraFormatDataList) + const LayoutData& layout, const ValueListFormatData& paraFormatDataList) { kdDebug(30515) << "Entering RTFWorker::doFullParagraph" << endl << paraText << endl; - TQString par = ProcessParagraphData( paraText, tqlayout, paraFormatDataList); + TQString par = ProcessParagraphData( paraText, layout, paraFormatDataList); m_textBody += par; kdDebug(30515) << "Quiting RTFWorker::doFullParagraph" << endl; return true; @@ -836,7 +836,7 @@ bool RTFWorker::doHeader(const HeaderData& header) TQValueList<ParaData>::ConstIterator it; TQValueList<ParaData>::ConstIterator end(header.para.end()); for (it=header.para.begin();it!=end;++it) - content += ProcessParagraphData( (*it).text,(*it).tqlayout,(*it).formattingList); + content += ProcessParagraphData( (*it).text,(*it).layout,(*it).formattingList); if (content!="\\par\\pard\\plain") { @@ -871,7 +871,7 @@ bool RTFWorker::doFooter(const FooterData& footer) TQValueList<ParaData>::ConstIterator it; TQValueList<ParaData>::ConstIterator end(footer.para.end()); for (it=footer.para.begin();it!=end;++it) - content += ProcessParagraphData( (*it).text,(*it).tqlayout,(*it).formattingList); + content += ProcessParagraphData( (*it).text,(*it).layout,(*it).formattingList); if (content!="\\par\\pard\\plain") { @@ -967,10 +967,10 @@ void RTFWorker::writeFontData(void) } #else else - // TQFontInfo:tqstyleHint() does not guess anything, it just returns what is in the TQFont. Nothing put in, nothing gets out. + // TQFontInfo:styleHint() does not guess anything, it just returns what is in the TQFont. Nothing put in, nothing gets out. { TQFontInfo info(*it); - switch (info.tqstyleHint()) + switch (info.styleHint()) { case TQFont::SansSerif: default: @@ -1182,7 +1182,7 @@ TQString RTFWorker::closeSpan(const FormatData& , const FormatData& ) return result; } -// The following function encodes the kword tqunicode characters into +// The following function encodes the kword unicode characters into // RTF seven bit ASCII. This affects any 8 bit characters. // They are encoded either with \' or with \u TQString RTFWorker::escapeRtfText ( const TQString& text ) const @@ -1192,8 +1192,8 @@ TQString RTFWorker::escapeRtfText ( const TQString& text ) const const uint length = text.length(); for ( uint i = 0; i < length; i++ ) { - TQChar TQCh ( text.at( i ) ); // get out one tqunicode char from the string - const ushort ch = TQCh.tqunicode(); // take tqunicode value of the char + TQChar TQCh ( text.at( i ) ); // get out one unicode char from the string + const ushort ch = TQCh.unicode(); // take unicode value of the char if ( TQCh == '\\' ) escapedText += "\\\\"; // back-slash else if ( TQCh == '{' ) escapedText += "\\{"; @@ -1226,7 +1226,7 @@ TQString RTFWorker::escapeRtfText ( const TQString& text ) const } else if ( ch >= 256) // check for a higher code non-ASCII character { - // encode this as decimal tqunicode with a replacement character. + // encode this as decimal unicode with a replacement character. escapedText += "\\u"; escapedText += TQString::number ( ch, 10 ); // We decompose the character. If it works, the first character is whitout any accent. @@ -1270,15 +1270,15 @@ bool RTFWorker::doFullPaperBorders (const double top, const double left, return true; } -bool RTFWorker::doFullDefineStyle(LayoutData& tqlayout) +bool RTFWorker::doFullDefineStyle(LayoutData& layout) { //Register the new style in the style list - m_styleList << tqlayout; + m_styleList << layout; // Now we must register a few things (with help of the lookup methods.) - lookupFont("\\f", tqlayout.formatData.text.fontName); - lookupColor(TQString(), tqlayout.formatData.text.fgColor); - lookupColor(TQString(), tqlayout.formatData.text.bgColor); + lookupFont("\\f", layout.formatData.text.fontName); + lookupColor(TQString(), layout.formatData.text.fgColor); + lookupColor(TQString(), layout.formatData.text.bgColor); return true; } @@ -1459,121 +1459,121 @@ TQString RTFWorker::textFormatToRtf(const TextFormatting& formatOrigin, } TQString RTFWorker::layoutToRtf(const LayoutData& layoutOrigin, - const LayoutData& tqlayout, const bool force) + const LayoutData& layout, const bool force) { TQString strLayout; - if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment)) + if (force || (layoutOrigin.alignment!=layout.alignment)) { - if (tqlayout.tqalignment=="left") + if (layout.alignment=="left") strLayout += "\\ql"; - else if (tqlayout.tqalignment== "right") + else if (layout.alignment== "right") strLayout += "\\qr"; - else if (tqlayout.tqalignment=="center") + else if (layout.alignment=="center") strLayout += "\\qc"; - else if (tqlayout.tqalignment=="justify") + else if (layout.alignment=="justify") strLayout += "\\qj"; - else if ( tqlayout.tqalignment=="auto") + else if ( layout.alignment=="auto") { // ### TODO: what for BIDI? //strLayout += "\\ql"; } else { - kdWarning(30515) << "Unknown tqalignment: " << tqlayout.tqalignment << endl; + kdWarning(30515) << "Unknown alignment: " << layout.alignment << endl; } } - if ((tqlayout.indentLeft>=0.0) - && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))) + if ((layout.indentLeft>=0.0) + && (force || (layoutOrigin.indentLeft!=layout.indentLeft))) { strLayout += "\\li"; - strLayout += TQString::number(int(tqlayout.indentLeft)*20, 10); + strLayout += TQString::number(int(layout.indentLeft)*20, 10); } - if ((tqlayout.indentRight>=0.0) - && (force || (layoutOrigin.indentRight!=tqlayout.indentRight))) + if ((layout.indentRight>=0.0) + && (force || (layoutOrigin.indentRight!=layout.indentRight))) { strLayout += "\\ri"; - strLayout += TQString::number(int(tqlayout.indentRight)*20, 10); + strLayout += TQString::number(int(layout.indentRight)*20, 10); } - if (force || (layoutOrigin.indentFirst!=tqlayout.indentFirst)) + if (force || (layoutOrigin.indentFirst!=layout.indentFirst)) { strLayout += "\\fi"; - strLayout += TQString::number(int(tqlayout.indentFirst)*20, 10); + strLayout += TQString::number(int(layout.indentFirst)*20, 10); } - if ((tqlayout.marginBottom>=0.0) - && (force || (layoutOrigin.marginBottom!=tqlayout.marginBottom))) + if ((layout.marginBottom>=0.0) + && (force || (layoutOrigin.marginBottom!=layout.marginBottom))) { strLayout += "\\sa"; - strLayout += TQString::number(int(tqlayout.marginBottom)*20 ,10); + strLayout += TQString::number(int(layout.marginBottom)*20 ,10); } - if ((tqlayout.marginTop>=0.0) - && (force || (layoutOrigin.marginTop!=tqlayout.marginTop))) + if ((layout.marginTop>=0.0) + && (force || (layoutOrigin.marginTop!=layout.marginTop))) { strLayout += "\\sb"; - strLayout += TQString::number(int(tqlayout.marginTop)*20, 10); + strLayout += TQString::number(int(layout.marginTop)*20, 10); } - if (force || (layoutOrigin.keepLinesTogether!=tqlayout.keepLinesTogether)) + if (force || (layoutOrigin.keepLinesTogether!=layout.keepLinesTogether)) { - if(tqlayout.keepLinesTogether) strLayout += "\\keep"; + if(layout.keepLinesTogether) strLayout += "\\keep"; } - // Note: there seems to be too many problems of using a page break in a tqlayout + // Note: there seems to be too many problems of using a page break in a layout // - KWord's RTF import filter makes the page break immediately (also in styles) // - AbiWord's RTF import does not like \*\pgbrk // ### TODO: decide if we really remove this code #if 0 - if (force || (layoutOrigin.pageBreakBefore!=tqlayout.pageBreakBefore)) + if (force || (layoutOrigin.pageBreakBefore!=layout.pageBreakBefore)) { - if(tqlayout.pageBreakBefore) strLayout += "\\pagebb"; + if(layout.pageBreakBefore) strLayout += "\\pagebb"; } // Note: RTF doesn't specify "page break after" // \*\pgbrk0 is used after OpenOffice.org Writer - if (force || (layoutOrigin.pageBreakAfter!=tqlayout.pageBreakAfter)) + if (force || (layoutOrigin.pageBreakAfter!=layout.pageBreakAfter)) { - if(tqlayout.pageBreakAfter) strLayout += "\\*\\pgbrk0"; + if(layout.pageBreakAfter) strLayout += "\\*\\pgbrk0"; } #endif if (force - || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType ) - || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) ) + || ( layoutOrigin.lineSpacingType != layout.lineSpacingType ) + || ( layoutOrigin.lineSpacing != layout.lineSpacing ) ) { - if ( tqlayout.lineSpacingType==LayoutData::LS_SINGLE ) + if ( layout.lineSpacingType==LayoutData::LS_SINGLE ) ;// do nothing, single linespace is default in RTF - else if ( tqlayout.lineSpacingType==LayoutData::LS_ONEANDHALF ) + else if ( layout.lineSpacingType==LayoutData::LS_ONEANDHALF ) strLayout += "\\sl360\\slmult1"; // one-and-half linespace - else if ( tqlayout.lineSpacingType==LayoutData::LS_DOUBLE ) + else if ( layout.lineSpacingType==LayoutData::LS_DOUBLE ) strLayout += "\\sl480\\slmult1"; // double linespace - else if ( tqlayout.lineSpacingType==LayoutData::LS_ATLEAST ) - strLayout += TQString("\\sl%1\\slmult0").tqarg(int(tqlayout.lineSpacing)*20); + else if ( layout.lineSpacingType==LayoutData::LS_ATLEAST ) + strLayout += TQString("\\sl%1\\slmult0").arg(int(layout.lineSpacing)*20); - else if ( tqlayout.lineSpacingType==LayoutData::LS_MULTIPLE ) - strLayout += TQString("\\sl%1\\slmult1").tqarg( int(tqlayout.lineSpacing)*240 ); + else if ( layout.lineSpacingType==LayoutData::LS_MULTIPLE ) + strLayout += TQString("\\sl%1\\slmult1").arg( int(layout.lineSpacing)*240 ); - else if ( tqlayout.lineSpacingType==LayoutData::LS_CUSTOM ) + else if ( layout.lineSpacingType==LayoutData::LS_CUSTOM ) // "Custom" in KWord is like "Exactly" in MS Word - strLayout += TQString("\\sl-%1\\slmult0").tqarg(int(tqlayout.lineSpacing)*20); + strLayout += TQString("\\sl-%1\\slmult0").arg(int(layout.lineSpacing)*20); else - kdWarning(30515) << "Unsupported lineSpacingType: " << tqlayout.lineSpacingType << " (Ignoring!)" << endl; + kdWarning(30515) << "Unsupported lineSpacingType: " << layout.lineSpacingType << " (Ignoring!)" << endl; } - if (!tqlayout.tabulatorList.isEmpty() - && (force || (layoutOrigin.tabulatorList!=tqlayout.tabulatorList) )) + if (!layout.tabulatorList.isEmpty() + && (force || (layoutOrigin.tabulatorList!=layout.tabulatorList) )) { TabulatorList::ConstIterator it; - for (it=tqlayout.tabulatorList.begin();it!=tqlayout.tabulatorList.end();++it) + for (it=layout.tabulatorList.begin();it!=layout.tabulatorList.end();++it) { switch ((*it).m_type) { @@ -1606,7 +1606,7 @@ TQString RTFWorker::layoutToRtf(const LayoutData& layoutOrigin, // shadow support // note shadow in KWord is more full-feature/sophisticated than RTF // here we just treat KWord's shadow as simple \shad mark-up - if( tqlayout.shadowDistance > 0 ) + if( layout.shadowDistance > 0 ) { strLayout += "\\shad"; } @@ -1615,7 +1615,7 @@ TQString RTFWorker::layoutToRtf(const LayoutData& layoutOrigin, // This must remain last, as it adds a terminating space. strLayout+=textFormatToRtf(layoutOrigin.formatData.text, - tqlayout.formatData.text,force); + layout.formatData.text,force); return strLayout; } @@ -1708,9 +1708,9 @@ TQString RTFWorker::lookupStyle(const TQString& styleName, LayoutData& returnLay } kdDebug(30515) << "New style: " << styleName << " count: " << counter << endl; - LayoutData tqlayout; - m_styleList << tqlayout; - returnLayout=tqlayout; + LayoutData layout; + m_styleList << layout; + returnLayout=layout; strMarkup += TQString::number(counter); return strMarkup; diff --git a/filters/kword/rtf/export/ExportFilter.h b/filters/kword/rtf/export/ExportFilter.h index 88158efe..f5707680 100644 --- a/filters/kword/rtf/export/ExportFilter.h +++ b/filters/kword/rtf/export/ExportFilter.h @@ -44,7 +44,7 @@ public: virtual bool doCloseFile(void); ///< Close file in normal conditions virtual bool doOpenDocument(void); virtual bool doCloseDocument(void); - virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout, + virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout, const ValueListFormatData& paraFormatDataList); virtual bool doFullDocumentInfo(const KWEFDocumentInfo& docInfo); virtual bool doOpenTextFrameSet(void); @@ -53,7 +53,7 @@ public: const double width, const double height, const int orientation); virtual bool doFullPaperBorders (const double top, const double left, const double bottom, const double right); - virtual bool doFullDefineStyle(LayoutData& tqlayout); + virtual bool doFullDefineStyle(LayoutData& layout); virtual bool doHeader(const HeaderData& header); virtual bool doFooter(const FooterData& footer); virtual bool doVariableSettings(const VariableSettingsData& vs); @@ -69,7 +69,7 @@ private: */ TQString escapeRtfText ( const TQString& text ) const; TQString ProcessParagraphData ( const TQString ¶Text, - const LayoutData& tqlayout, const ValueListFormatData ¶FormatDataList); + const LayoutData& layout, const ValueListFormatData ¶FormatDataList); TQString formatTextParagraph(const TQString& strText, const FormatData& formatOrigin, const FormatData& format); TQString makeTable(const FrameAnchor& anchor); @@ -81,7 +81,7 @@ private: TQString textFormatToRtf(const TextFormatting& formatOrigin, const TextFormatting& formatData, const bool force); TQString layoutToRtf(const LayoutData& layoutOrigin, - const LayoutData& tqlayout, const bool force); + const LayoutData& layout, const bool force); TQString lookupFont(const TQString& markup, const TQString& fontName); TQString lookupColor(const TQString& markup, const TQColor& color); TQString lookupStyle(const TQString& styleName, LayoutData& returnLayout); diff --git a/filters/kword/rtf/export/rtfexport.cc b/filters/kword/rtf/export/rtfexport.cc index 15ff976b..6f23530b 100644 --- a/filters/kword/rtf/export/rtfexport.cc +++ b/filters/kword/rtf/export/rtfexport.cc @@ -57,7 +57,7 @@ RTFExport::RTFExport(KoFilter *, const char *, const TQStringList &) : KoFilter() { } -KoFilter::ConversiontqStatus RTFExport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus RTFExport::convert( const TQCString& from, const TQCString& to ) { if ((from != "application/x-kword") || (to != "text/rtf" && to != "application/msword" )) { @@ -77,7 +77,7 @@ KoFilter::ConversiontqStatus RTFExport::convert( const TQCString& from, const TQ return KoFilter::StupidError; } - KoFilter::ConversiontqStatus result=leader->convert(m_chain, from,to ); + KoFilter::ConversionStatus result=leader->convert(m_chain, from,to ); delete leader; delete worker; diff --git a/filters/kword/rtf/export/rtfexport.h b/filters/kword/rtf/export/rtfexport.h index 060139ed..f43f6a07 100644 --- a/filters/kword/rtf/export/rtfexport.h +++ b/filters/kword/rtf/export/rtfexport.h @@ -22,7 +22,7 @@ #define RTFEXPORT_H #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfile.h> #include <tqobject.h> @@ -39,7 +39,7 @@ public: RTFExport(KoFilter *parent, const char *name, const TQStringList &); virtual ~RTFExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // RTFEXPORT_H diff --git a/filters/kword/rtf/import/rtfimport.cpp b/filters/kword/rtf/import/rtfimport.cpp index 94fad697..eb8c467d 100644 --- a/filters/kword/rtf/import/rtfimport.cpp +++ b/filters/kword/rtf/import/rtfimport.cpp @@ -98,7 +98,7 @@ static RTFProperty propertyTable[] = MEMBER( 0L, "b", setToggleProperty, state.format.bold, 0 ), // \bin is handled in the tokenizer MEMBER( "@colortbl", "blue", setNumericProperty, blue, 0 ), - MEMBER( 0L, "box", setEnumProperty, state.tqlayout.border, 0 ), + MEMBER( 0L, "box", setEnumProperty, state.layout.border, 0 ), PROP( 0L, "brdrb", selectLayoutBorder, 0L, 3 ), PROP( 0L, "brdrcf", setBorderColor, 0L, 0 ), PROP( 0L, "brdrdash", setBorderStyle, 0L, RTFBorder::Dashes ), @@ -148,7 +148,7 @@ static RTFProperty propertyTable[] = MEMBER( "@rtf", "facingp", setFlagProperty, facingPages, true ), PROP( 0L, "fcharset", setCharset, 0L, 0 ), // Not needed with TQt PROP( "@fonttbl", "fdecor", setFontStyleHint, 0L, TQFont::Decorative ), - MEMBER( 0L, "fi", setNumericProperty, state.tqlayout.firstIndent, 0 ), + MEMBER( 0L, "fi", setNumericProperty, state.layout.firstIndent, 0 ), PROP( "@fonttbl", "fmodern", setFontStyleHint, 0L, TQFont::TypeWriter ), PROP( "@fonttbl", "fnil", setFontStyleHint, 0L, TQFont::AnyStyle ), MEMBER( 0L, "footery", setNumericProperty, state.section.footerMargin, 0 ), @@ -162,13 +162,13 @@ static RTFProperty propertyTable[] = MEMBER( "@colortbl", "green", setNumericProperty, green, 0 ), MEMBER( 0L, "headery", setNumericProperty, state.section.headerMargin, 0 ), MEMBER( 0L, "i", setToggleProperty, state.format.italic, 0 ), - MEMBER( 0L, "intbl", setFlagProperty, state.tqlayout.inTable, true ), + MEMBER( 0L, "intbl", setFlagProperty, state.layout.inTable, true ), PROP( "@pict", "jpegblip", setPictureType, 0L, RTFPicture::JPEG ), - MEMBER( 0L, "keep", setFlagProperty, state.tqlayout.keep, true ), - MEMBER( 0L, "keepn", setFlagProperty, state.tqlayout.keepNext, true ), + MEMBER( 0L, "keep", setFlagProperty, state.layout.keep, true ), + MEMBER( 0L, "keepn", setFlagProperty, state.layout.keepNext, true ), MEMBER( "@rtf", "landscape", setFlagProperty, landscape, true ), PROP( 0L, "ldblquote", insertSymbol, 0L, 0x201c ), - MEMBER( 0L, "li", setNumericProperty, state.tqlayout.leftIndent, 0 ), + MEMBER( 0L, "li", setNumericProperty, state.layout.leftIndent, 0 ), PROP( 0L, "line", insertSymbol, 0L, 0x000a ), PROP( 0L, "lquote", insertSymbol, 0L, 0x2018 ), PROP( 0L, "ltrmark", insertSymbol, 0L, 0x200e ), @@ -180,14 +180,14 @@ static RTFProperty propertyTable[] = MEMBER( "@rtf", "margt", setNumericProperty, topMargin, 0 ), MEMBER( 0L, "nosupersub", setEnumProperty, state.format.vertAlign, RTFFormat::Normal ), PROP( "Text", "page", insertPageBreak, 0L, 0 ), - MEMBER( 0L, "pagebb", setFlagProperty, state.tqlayout.pageBB, true ), + MEMBER( 0L, "pagebb", setFlagProperty, state.layout.pageBB, true ), MEMBER( "@rtf", "paperh", setNumericProperty, paperHeight, 0 ), MEMBER( "@rtf", "paperw", setNumericProperty, paperWidth, 0 ), PROP( "Text", "par", insertParagraph, 0L, 0 ), PROP( 0L, "pard", setParagraphDefaults, 0L, 0 ), PROP( 0L, "pc", setPcCodepage, 0L, 0 ), PROP( 0L, "pca", setPcaCodepage, 0L, 0 ), - MEMBER( 0L, "pgbrk", setToggleProperty, state.tqlayout.pageBA, true ), + MEMBER( 0L, "pgbrk", setToggleProperty, state.layout.pageBA, true ), MEMBER( "@pict", "piccropb", setNumericProperty, picture.cropBottom, 0 ), MEMBER( "@pict", "piccropl", setNumericProperty, picture.cropLeft, 0 ), MEMBER( "@pict", "piccropr", setNumericProperty, picture.cropRight, 0 ), @@ -202,25 +202,25 @@ static RTFProperty propertyTable[] = PROP( 0L, "plain", setPlainFormatting, 0L, 0 ), PROP( "@pict", "pmmetafile", setPictureType, 0L, RTFPicture::WMF ), PROP( "@pict", "pngblip", setPictureType, 0L, RTFPicture::PNG ), - MEMBER( 0L, "qc", setEnumProperty, state.tqlayout.tqalignment, RTFLayout::Centered ), - MEMBER( 0L, "qj", setEnumProperty, state.tqlayout.tqalignment, RTFLayout::Justified ), - MEMBER( 0L, "ql", setEnumProperty, state.tqlayout.tqalignment, RTFLayout::Left ), + MEMBER( 0L, "qc", setEnumProperty, state.layout.alignment, RTFLayout::Centered ), + MEMBER( 0L, "qj", setEnumProperty, state.layout.alignment, RTFLayout::Justified ), + MEMBER( 0L, "ql", setEnumProperty, state.layout.alignment, RTFLayout::Left ), PROP( 0L, "qmspace", insertSymbol, 0L, 0x2004 ), - MEMBER( 0L, "qr", setEnumProperty, state.tqlayout.tqalignment, RTFLayout::Right ), + MEMBER( 0L, "qr", setEnumProperty, state.layout.alignment, RTFLayout::Right ), PROP( 0L, "rdblquote", insertSymbol, 0L, 0x201d ), MEMBER( "@colortbl", "red", setNumericProperty, red, 0 ), - MEMBER( 0L, "ri", setNumericProperty, state.tqlayout.rightIndent, 0 ), + MEMBER( 0L, "ri", setNumericProperty, state.layout.rightIndent, 0 ), PROP( "Text", "row", insertTableRow, 0L, 0 ), PROP( 0L, "rquote", insertSymbol, 0L, 0x2019 ), PROP( 0L, "rtlmark", insertSymbol, 0L, 0x200f ), - MEMBER( 0L, "s", setNumericProperty, state.tqlayout.style, 0 ), - MEMBER( 0L, "sa", setNumericProperty, state.tqlayout.spaceAfter, 0 ), - MEMBER( 0L, "sb", setNumericProperty, state.tqlayout.spaceBefore, 0 ), + MEMBER( 0L, "s", setNumericProperty, state.layout.style, 0 ), + MEMBER( 0L, "sa", setNumericProperty, state.layout.spaceAfter, 0 ), + MEMBER( 0L, "sb", setNumericProperty, state.layout.spaceBefore, 0 ), MEMBER( 0L, "scaps", setToggleProperty, state.format.smallCaps, 0 ), PROP( "Text", "sect", insertPageBreak, 0L, 0 ), PROP( 0L, "sectd", setSectionDefaults, 0L, 0 ), - MEMBER( 0L, "sl", setNumericProperty, state.tqlayout.spaceBetween, 0 ), - MEMBER( 0L, "slmult", setToggleProperty, state.tqlayout.spaceBetweenMultiple, 0 ), + MEMBER( 0L, "sl", setNumericProperty, state.layout.spaceBetween, 0 ), + MEMBER( 0L, "slmult", setToggleProperty, state.layout.spaceBetweenMultiple, 0 ), MEMBER( "@stylesheet", "snext", setNumericProperty, style.next, 0 ), MEMBER( 0L, "strike", setToggleProperty, state.format.strike, 0 ), MEMBER( 0L, "striked", setToggleProperty, state.format.striked, 0 ), @@ -228,18 +228,18 @@ static RTFProperty propertyTable[] = MEMBER( 0L, "super", setEnumProperty, state.format.vertAlign, RTFFormat::SuperScript ), PROP( 0L, "tab", insertSymbol, 0L, 0x0009 ), MEMBER( 0L, "titlepg", setFlagProperty, state.section.titlePage, true ), - MEMBER( 0L, "tldot", setEnumProperty, state.tqlayout.tab.leader, RTFTab::Dots ), - MEMBER( 0L, "tlhyph", setEnumProperty, state.tqlayout.tab.leader, RTFTab::Hyphens ), - MEMBER( 0L, "tlth", setEnumProperty, state.tqlayout.tab.leader, RTFTab::ThickLine ), - MEMBER( 0L, "tlul", setEnumProperty, state.tqlayout.tab.leader, RTFTab::Underline ), - MEMBER( 0L, "tqc", setEnumProperty, state.tqlayout.tab.type, RTFTab::Centered ), - MEMBER( 0L, "tqdec", setEnumProperty, state.tqlayout.tab.type, RTFTab::Decimal ), - MEMBER( 0L, "tqr", setEnumProperty, state.tqlayout.tab.type, RTFTab::FlushRight ), + MEMBER( 0L, "tldot", setEnumProperty, state.layout.tab.leader, RTFTab::Dots ), + MEMBER( 0L, "tlhyph", setEnumProperty, state.layout.tab.leader, RTFTab::Hyphens ), + MEMBER( 0L, "tlth", setEnumProperty, state.layout.tab.leader, RTFTab::ThickLine ), + MEMBER( 0L, "tlul", setEnumProperty, state.layout.tab.leader, RTFTab::Underline ), + MEMBER( 0L, "tqc", setEnumProperty, state.layout.tab.type, RTFTab::Centered ), + MEMBER( 0L, "tqdec", setEnumProperty, state.layout.tab.type, RTFTab::Decimal ), + MEMBER( 0L, "tqr", setEnumProperty, state.layout.tab.type, RTFTab::FlushRight ), MEMBER( 0L, "trleft", setNumericProperty, state.tableRow.left, 0 ), MEMBER( 0L, "trowd", setTableRowDefaults, state.tableRow, 0 ), - MEMBER( 0L, "trqc", setEnumProperty, state.tableRow.tqalignment, RTFLayout::Centered ), - MEMBER( 0L, "trql", setEnumProperty, state.tableRow.tqalignment, RTFLayout::Left ), - MEMBER( 0L, "trqr", setEnumProperty, state.tableRow.tqalignment, RTFLayout::Right ), + MEMBER( 0L, "trqc", setEnumProperty, state.tableRow.alignment, RTFLayout::Centered ), + MEMBER( 0L, "trql", setEnumProperty, state.tableRow.alignment, RTFLayout::Left ), + MEMBER( 0L, "trqr", setEnumProperty, state.tableRow.alignment, RTFLayout::Right ), MEMBER( 0L, "trrh", setNumericProperty, state.tableRow.height, 0 ), PROP( 0L, "tx", insertTabDef, 0L, 0 ), MEMBER( 0L, "u", insertUnicodeSymbol, state.format.uc, 0 ), @@ -309,7 +309,7 @@ RTFImport::RTFImport( KoFilter *, const char *, const TQStringList& ) fnnum=0; } -KoFilter::ConversiontqStatus RTFImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus RTFImport::convert( const TQCString& from, const TQCString& to ) { // This filter only supports RTF to KWord conversion if ((from != "text/rtf") || (to != "application/x-kword")) @@ -384,7 +384,7 @@ KoFilter::ConversiontqStatus RTFImport::convert( const TQCString& from, const TQ if ( !m_batch ) { force = ( KMessageBox::warningYesNo( 0L, - i18n("The RTF (Rich Text Format) document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").tqarg( token.value ), + i18n("The RTF (Rich Text Format) document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").arg( token.value ), i18n("KWord's RTF Import Filter") ) == KMessageBox::Yes ); } if ( !force ) @@ -403,7 +403,7 @@ KoFilter::ConversiontqStatus RTFImport::convert( const TQCString& from, const TQ if ( !m_batch ) { force = ( KMessageBox::warningYesNo( 0L, - i18n("The PWD (PocketWord's Rich Text Format) document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").tqarg( token.value ), + i18n("The PWD (PocketWord's Rich Text Format) document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").arg( token.value ), i18n("KWord's RTF Import Filter") ) == KMessageBox::Yes ); } if ( !force ) @@ -422,7 +422,7 @@ KoFilter::ConversiontqStatus RTFImport::convert( const TQCString& from, const TQ if ( !m_batch ) { force = ( KMessageBox::warningYesNo( 0L, - i18n("The URTF (\"Unicode Rich Text Format\") document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").tqarg( token.value ), + i18n("The URTF (\"Unicode Rich Text Format\") document has an unexpected version number: %1. Continuing might result in an erroneous conversion. Do you want to continue?").arg( token.value ), i18n("KWord's RTF Import Filter") ) == KMessageBox::Yes ); } if ( !force ) @@ -439,7 +439,7 @@ KoFilter::ConversiontqStatus RTFImport::convert( const TQCString& from, const TQ if ( !m_batch ) { KMessageBox::error( 0L, - i18n("The RTF document cannot be loaded, as it has an unexpected first keyword: \\%1.").tqarg( token.text ), + i18n("The RTF document cannot be loaded, as it has an unexpected first keyword: \\%1.").arg( token.text ), i18n("KWord's RTF Import Filter"), 0 ); } return KoFilter::WrongFormat; @@ -731,7 +731,7 @@ KoFilter::ConversiontqStatus RTFImport::convert( const TQCString& from, const TQ // Search for 'following' style for (TQValueList<RTFStyle>::ConstIterator it2=styleSheet.begin();it2!=endStyleSheet;++it2) { - if ((*it2).tqlayout.style == (*it).next) + if ((*it2).layout.style == (*it).next) { mainDoc.addNode( "FOLLOWING" ); mainDoc.setAttribute( "name", CheckAndEscapeXmlText( (*it2).name )); @@ -739,7 +739,7 @@ KoFilter::ConversiontqStatus RTFImport::convert( const TQCString& from, const TQ break; } } - addLayout( mainDoc, (*it).name, (*it).tqlayout, false ); + addLayout( mainDoc, (*it).name, (*it).layout, false ); addFormat( mainDoc, kwFormat, 0L ); mainDoc.closeNode( "STYLE" ); } @@ -793,7 +793,7 @@ KoFilter::ConversiontqStatus RTFImport::convert( const TQCString& from, const TQ for (TQMap<TQString,int>::ConstIterator it=debugUnknownKeywords.begin(); it!=debugUnknownKeywords.end();it++) - kdDebug(30515) << "Unknown keyword: " << TQString( "%1" ).tqarg( it.data(), 4 ) << " * " << it.key() << endl; + kdDebug(30515) << "Unknown keyword: " << TQString( "%1" ).arg( it.data(), 4 ) << " * " << it.key() << endl; return KoFilter::OK; } @@ -911,7 +911,7 @@ void RTFImport::setEnumProperty( RTFProperty *property ) void RTFImport::setFontStyleHint( RTFProperty* property ) { - font.tqstyleHint = TQFont::StyleHint( property->value ); + font.styleHint = TQFont::StyleHint( property->value ); } void RTFImport::setPictureType( RTFProperty* property ) @@ -933,15 +933,15 @@ void RTFImport::setUnderlineProperty( RTFProperty* property ) void RTFImport::setBorderStyle( RTFProperty *property ) { - if (state.tqlayout.border) + if (state.layout.border) { - state.tqlayout.border->style = static_cast <RTFBorder::BorderStyle> ( property->value ); + state.layout.border->style = static_cast <RTFBorder::BorderStyle> ( property->value ); } else { for (uint i=0; i < 4; i++) { - state.tqlayout.borders[i].style = static_cast <RTFBorder::BorderStyle> ( property->value ); + state.layout.borders[i].style = static_cast <RTFBorder::BorderStyle> ( property->value ); } } } @@ -949,30 +949,30 @@ void RTFImport::setBorderStyle( RTFProperty *property ) void RTFImport::setBorderProperty( RTFProperty *property ) { //kdDebug() << "setBorderProperty: " << endl; - if (state.tqlayout.border) + if (state.layout.border) { - state.tqlayout.border->width = token.value; + state.layout.border->width = token.value; } else { for (uint i=0; i < 4; i++) { - state.tqlayout.borders[i].width = token.value; + state.layout.borders[i].width = token.value; } } } void RTFImport::setBorderColor( RTFProperty * ) { - if (state.tqlayout.border) + if (state.layout.border) { - state.tqlayout.border->color = token.value; + state.layout.border->color = token.value; } else { for (uint i=0; i < 4; i++) { - state.tqlayout.borders[i].color = token.value; + state.layout.borders[i].color = token.value; } } } @@ -1008,34 +1008,34 @@ void RTFImport::setPlainFormatting( RTFProperty * ) void RTFImport::setParagraphDefaults( RTFProperty * ) { - RTFLayout &tqlayout = state.tqlayout; + RTFLayout &layout = state.layout; - tqlayout.tablist.clear(); - tqlayout.tab.type = RTFTab::Left; - tqlayout.tab.leader = RTFTab::None; + layout.tablist.clear(); + layout.tab.type = RTFTab::Left; + layout.tab.leader = RTFTab::None; for (uint i=0; i < 4; i++) { - RTFBorder &border = tqlayout.borders[i]; + RTFBorder &border = layout.borders[i]; border.color = -1; border.width = 0; border.style = RTFBorder::None; } - tqlayout.firstIndent = 0; - tqlayout.leftIndent = 0; - tqlayout.rightIndent = 0; - tqlayout.spaceBefore = 0; - tqlayout.spaceAfter = 0; - tqlayout.spaceBetween = 0; - tqlayout.spaceBetweenMultiple = false; - tqlayout.style = 0; - tqlayout.tqalignment = RTFLayout::Left; - tqlayout.border = 0L; - tqlayout.inTable = false; - tqlayout.keep = false; - tqlayout.keepNext = false; - tqlayout.pageBB = false; - tqlayout.pageBA = false; + layout.firstIndent = 0; + layout.leftIndent = 0; + layout.rightIndent = 0; + layout.spaceBefore = 0; + layout.spaceAfter = 0; + layout.spaceBetween = 0; + layout.spaceBetweenMultiple = false; + layout.style = 0; + layout.alignment = RTFLayout::Left; + layout.border = 0L; + layout.inTable = false; + layout.keep = false; + layout.keepNext = false; + layout.pageBB = false; + layout.pageBA = false; } void RTFImport::setSectionDefaults( RTFProperty * ) @@ -1054,7 +1054,7 @@ void RTFImport::setTableRowDefaults( RTFProperty * ) tableRow.height = 0; tableRow.left = 0; - tableRow.tqalignment = RTFLayout::Left; + tableRow.alignment = RTFLayout::Left; tableRow.cells.clear(); tableCell.bgcolor = -1; @@ -1069,17 +1069,17 @@ void RTFImport::setTableRowDefaults( RTFProperty * ) void RTFImport::selectLayoutBorder( RTFProperty * property ) { - state.tqlayout.border = & state.tqlayout.borders [ property->value ]; + state.layout.border = & state.layout.borders [ property->value ]; } void RTFImport::selectLayoutBorderFromCell( RTFProperty * property ) { - state.tqlayout.border = & state.tableCell.borders [ property->value ]; + state.layout.border = & state.tableCell.borders [ property->value ]; } void RTFImport::insertParagraph( RTFProperty * ) { - if (state.tqlayout.inTable) + if (state.layout.inTable) { if (textState->table == 0) { @@ -1110,10 +1110,10 @@ void RTFImport::insertPageBreak( RTFProperty * ) void RTFImport::insertTableCell( RTFProperty * ) { //{{ - bool b = state.tqlayout.inTable; - state.tqlayout.inTable = true; + bool b = state.layout.inTable; + state.layout.inTable = true; insertParagraph(); - state.tqlayout.inTable = b; + state.layout.inTable = b; //}} textState->frameSets << textState->cell.toString(); textState->cell.clear( 3 ); @@ -1130,14 +1130,14 @@ void RTFImport::insertTableRow( RTFProperty * ) { char buf[64]; sprintf( buf, "Table %d", textState->table ); - RTFLayout::Alignment align = row.tqalignment; + RTFLayout::Alignment align = row.alignment; // Store the current state on the stack stateStack.push( state ); resetState(); - state.tqlayout.tqalignment = align; // table tqalignment + state.layout.alignment = align; // table alignment - // Add anchor for new table (default tqlayout) + // Add anchor for new table (default layout) addAnchor( buf ); addParagraph( textState->node, false ); @@ -1202,9 +1202,9 @@ void RTFImport::insertCellDef( RTFProperty * ) void RTFImport::insertTabDef( RTFProperty * ) { - RTFTab tab = state.tqlayout.tab; + RTFTab tab = state.layout.tab; tab.position = token.value; - state.tqlayout.tablist.push( tab ); + state.layout.tablist.push( tab ); tab.type = RTFTab::Left; tab.leader = RTFTab::None; } @@ -1321,7 +1321,7 @@ void RTFImport::parseFontTable( RTFProperty * ) if (token.type == RTFTokenizer::OpenGroup) { font.name = TQString(); - font.tqstyleHint = TQFont::AnyStyle; + font.styleHint = TQFont::AnyStyle; font.fixedPitch = 0; } else if (token.type == RTFTokenizer::PlainText) @@ -1344,7 +1344,7 @@ void RTFImport::parseFontTable( RTFProperty * ) // Use TQt to look up the closest matching installed font TQFont qFont( font.name ); qFont.setFixedPitch( (font.fixedPitch == 1) ); - qFont.setStyleHint( font.tqstyleHint ); + qFont.setStyleHint( font.styleHint ); for(;!qFont.exactMatch();) { int space=font.name.findRev(' ', font.name.length()); @@ -1362,7 +1362,7 @@ void RTFImport::parseFontTable( RTFProperty * ) else fontTable.insert( state.format.font, newFontName ); font.name.truncate( 0 ); - font.tqstyleHint = TQFont::AnyStyle; + font.styleHint = TQFont::AnyStyle; font.fixedPitch = 0; } } @@ -1386,8 +1386,8 @@ void RTFImport::parseStyleSheet( RTFProperty * ) *strchr( token.text, ';' ) = 0; // ### TODO: is this allowed with multi-byte Asian characters? style.name += textCodec->toUnicode( token.text ); style.format = state.format; - style.tqlayout = state.tqlayout; - style.next = (style.next == -1) ? style.tqlayout.style : style.next; + style.layout = state.layout; + style.next = (style.next == -1) ? style.layout.style : style.next; styleSheet << style; style.name.truncate( 0 ); style.next = -1; @@ -1538,8 +1538,8 @@ void RTFImport::parsePicture( RTFProperty * ) // Add anchor to rich text destination addAnchor( frameName ); - // It is safe, as we call tqcurrentDateTime only once for each picture - const TQDateTime dt(TQDateTime::tqcurrentDateTime()); + // It is safe, as we call currentDateTime only once for each picture + const TQDateTime dt(TQDateTime::currentDateTime()); // Add pixmap or clipart (key) pictures.addKey( dt, idStr, pictName ); @@ -1614,7 +1614,7 @@ void RTFImport::addImportedPicture( const TQString& rawFileName ) // Add anchor to rich text destination addAnchor( frameName ); - // It is safe, as we call tqcurrentDateTime only once for each picture + // It is safe, as we call currentDateTime only once for each picture const TQDateTime dt( pic.getKey().lastModified() ); // Add picture key @@ -2055,7 +2055,7 @@ void RTFImport::addFormat( DomNode &node, const KWFormat& format, const RTFForma int vertAlign0 = ~vertAlign; int fontSize0 = ~fontSize; - // Adjust vertical tqalignment and font size if (\dn, \up) are used + // Adjust vertical alignment and font size if (\dn, \up) are used if (format.fmt.vertAlign == RTFFormat::Normal && format.fmt.baseline) { if (format.fmt.baseline < 0) @@ -2261,40 +2261,40 @@ void RTFImport::addFormat( DomNode &node, const KWFormat& format, const RTFForma node.closeNode( "FORMAT" ); } -void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout &tqlayout, bool frameBreak ) +void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout &layout, bool frameBreak ) { - // Style name and tqalignment + // Style name and alignment node.addNode( "NAME" ); node.setAttribute( "value", CheckAndEscapeXmlText(name) ); node.closeNode( "NAME" ); node.addNode( "FLOW" ); - node.setAttribute( "align", alignN[tqlayout.tqalignment] ); + node.setAttribute( "align", alignN[layout.alignment] ); node.closeNode( "FLOW" ); // Indents - if (tqlayout.firstIndent || tqlayout.leftIndent || tqlayout.rightIndent) + if (layout.firstIndent || layout.leftIndent || layout.rightIndent) { node.addNode( "INDENTS" ); - if (tqlayout.firstIndent) - node.setAttribute( "first", .05*tqlayout.firstIndent ); - if (tqlayout.leftIndent) - node.setAttribute( "left", .05*tqlayout.leftIndent ); - if (tqlayout.rightIndent) - node.setAttribute( "right", .05*tqlayout.rightIndent ); + if (layout.firstIndent) + node.setAttribute( "first", .05*layout.firstIndent ); + if (layout.leftIndent) + node.setAttribute( "left", .05*layout.leftIndent ); + if (layout.rightIndent) + node.setAttribute( "right", .05*layout.rightIndent ); node.closeNode( "INDENTS" ); } // Offets - if (tqlayout.spaceBefore || tqlayout.spaceAfter) + if (layout.spaceBefore || layout.spaceAfter) { node.addNode( "OFFSETS" ); - if (tqlayout.spaceBefore) - node.setAttribute( "before", .05*tqlayout.spaceBefore ); - if (tqlayout.spaceAfter) - node.setAttribute( "after", .05*tqlayout.spaceAfter ); + if (layout.spaceBefore) + node.setAttribute( "before", .05*layout.spaceBefore ); + if (layout.spaceAfter) + node.setAttribute( "after", .05*layout.spaceAfter ); node.closeNode( "OFFSETS" ); } @@ -2304,10 +2304,10 @@ void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout TQString lineSpacingType; TQString lineSpacingValue; - if ( tqlayout.spaceBetweenMultiple ) + if ( layout.spaceBetweenMultiple ) { // Note: 240 is a sort of magic value for one line (Once upon a time, it meant 12pt for a single line) - switch (tqlayout.spaceBetween ) + switch (layout.spaceBetween ) { case 240: { @@ -2326,10 +2326,10 @@ void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout } default: { - if ( tqlayout.spaceBetween > 0 ) + if ( layout.spaceBetween > 0 ) { lineSpacingType = "multiple"; - lineSpacingValue.setNum( tqlayout.spaceBetween / 240.0 ); + lineSpacingValue.setNum( layout.spaceBetween / 240.0 ); } break; } @@ -2337,16 +2337,16 @@ void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout } else { - if (tqlayout.spaceBetween > 0) + if (layout.spaceBetween > 0) { lineSpacingType = "atleast"; - lineSpacingValue.setNum( 0.05*tqlayout.spaceBetween ); + lineSpacingValue.setNum( 0.05*layout.spaceBetween ); } - if (tqlayout.spaceBetween < 0) + if (layout.spaceBetween < 0) { // negative linespace means "exact" lineSpacingType = "fixed" ; - lineSpacingValue.setNum( -0.05*tqlayout.spaceBetween ); + lineSpacingValue.setNum( -0.05*layout.spaceBetween ); } } @@ -2359,20 +2359,20 @@ void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout node.closeNode( "LINESPACING" ); } - if (tqlayout.keep || tqlayout.pageBB || tqlayout.pageBA || frameBreak || tqlayout.keepNext) + if (layout.keep || layout.pageBB || layout.pageBA || frameBreak || layout.keepNext) { node.addNode( "PAGEBREAKING" ); - node.setAttribute( "linesTogether", boolN[tqlayout.keep] ); - node.setAttribute( "hardFrameBreak", boolN[tqlayout.pageBB] ); - node.setAttribute( "hardFrameBreakAfter", boolN[tqlayout.pageBA || frameBreak] ); - node.setAttribute( "keepWithNext", boolN[tqlayout.keepNext] ); + node.setAttribute( "linesTogether", boolN[layout.keep] ); + node.setAttribute( "hardFrameBreak", boolN[layout.pageBB] ); + node.setAttribute( "hardFrameBreakAfter", boolN[layout.pageBA || frameBreak] ); + node.setAttribute( "keepWithNext", boolN[layout.keepNext] ); node.closeNode( "PAGEBREAKING" ); } // Paragraph borders for (uint i=0; i < 4; i++) { - const RTFBorder &border = tqlayout.borders[i]; + const RTFBorder &border = layout.borders[i]; if (border.style != RTFBorder::None || border.width > 0) { @@ -2386,21 +2386,21 @@ void RTFImport::addLayout( DomNode &node, const TQString &name, const RTFLayout } // Add automatic tab stop for hanging indent - if (tqlayout.firstIndent < 0 && tqlayout.leftIndent > 0) + if (layout.firstIndent < 0 && layout.leftIndent > 0) { node.addNode( "TABULATOR" ); node.setAttribute( "type", 0 ); - node.setAttribute( "ptpos", .05*tqlayout.leftIndent ); + node.setAttribute( "ptpos", .05*layout.leftIndent ); node.closeNode( "TABULATOR" ); } // Tabulators - if (!tqlayout.tablist.isEmpty()) + if (!layout.tablist.isEmpty()) { // ### TODO: use ConstIterator - for (uint i=0; i < tqlayout.tablist.count(); i++) + for (uint i=0; i < layout.tablist.count(); i++) { - const RTFTab &tab = tqlayout.tablist[i]; + const RTFTab &tab = layout.tablist[i]; int l = (int)tab.leader; node.addNode( "TABULATOR" ); node.setAttribute( "type", tab.type ); @@ -2422,12 +2422,12 @@ void RTFImport::addParagraph( DomNode &node, bool frameBreak ) // Search for style in style sheet TQString name; const RTFFormat* format = &state.format; - const int styleNum = state.tqlayout.style; + const int styleNum = state.layout.style; const TQValueList<RTFStyle>::ConstIterator endStyleSheet = styleSheet.end(); for ( TQValueList<RTFStyle>::ConstIterator it=styleSheet.begin(); it!=endStyleSheet; ++it ) { - if ( (*it).tqlayout.style == styleNum ) + if ( (*it).layout.style == styleNum ) { if ( textState->length > 0 ) { @@ -2468,9 +2468,9 @@ void RTFImport::addParagraph( DomNode &node, bool frameBreak ) node.closeNode( "FORMATS" ); } - // Write out tqlayout and format + // Write out layout and format node.addNode( "LAYOUT" ); - addLayout( node, name, state.tqlayout, frameBreak ); + addLayout( node, name, state.layout, frameBreak ); addFormat( node, kwFormat, 0L ); node.closeNode( "LAYOUT" ); node.closeNode( "PARAGRAPH" ); diff --git a/filters/kword/rtf/import/rtfimport.h b/filters/kword/rtf/import/rtfimport.h index bf4f20b7..37ecfce6 100644 --- a/filters/kword/rtf/import/rtfimport.h +++ b/filters/kword/rtf/import/rtfimport.h @@ -25,7 +25,7 @@ #include <tqstring.h> #include <tqvaluelist.h> #include <tqvaluestack.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include "rtfimport_dom.h" #include "rtfimport_tokenizer.h" #include <tqptrlist.h> @@ -93,7 +93,7 @@ struct RTFTab struct RTFFont { TQString name; - TQFont::StyleHint tqstyleHint; + TQFont::StyleHint styleHint; int fixedPitch; int number; }; @@ -124,7 +124,7 @@ struct RTFLayout RTFTab tab; RTFBorder borders[4]; RTFBorder *border; - Alignment tqalignment; + Alignment alignment; int style; int firstIndent, leftIndent, rightIndent; int spaceBefore, spaceAfter; @@ -173,7 +173,7 @@ struct RTFStyle { TQString name; RTFFormat format; - RTFLayout tqlayout; + RTFLayout layout; int next; }; @@ -198,7 +198,7 @@ struct RTFTableRow { TQValueList<RTFTableCell> cells; TQStringList frameSets; - RTFLayout::Alignment tqalignment; + RTFLayout::Alignment alignment; int height; int left; }; @@ -232,7 +232,7 @@ struct RTFGroupState RTFTableRow tableRow; RTFTableCell tableCell; RTFFormat format; - RTFLayout tqlayout; + RTFLayout layout; RTFSectionLayout section; /// '}' will close the current destination bool brace0; @@ -255,7 +255,7 @@ public: * @param to the mimetype for KWord * @return true if the document was successfully converted */ - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); /** * Skip the keyword, as we do not need to do anything with it @@ -408,7 +408,7 @@ public: void insertSymbol( RTFProperty *property ); /// Insert special character (hexadecimal escape value). void insertHexSymbol( RTFProperty * ); - /// Insert tqunicode character (keyword \\u). + /// Insert unicode character (keyword \\u). void insertUnicodeSymbol( RTFProperty * ); /** * Insert a date or time field @@ -489,13 +489,13 @@ public: */ void addFormat( DomNode &node, const KWFormat& format, const RTFFormat* baseFormat ); /** - * Add tqlayout information to document node. + * Add layout information to document node. * @param node the document node (destination) * @param name the name of the current style - * @param tqlayout the paragraph tqlayout information + * @param layout the paragraph layout information * @param frameBreak paragraph is always the last in a frame if true */ - void addLayout( DomNode &node, const TQString &name, const RTFLayout &tqlayout, bool frameBreak ); + void addLayout( DomNode &node, const TQString &name, const RTFLayout &layout, bool frameBreak ); /** * Add paragraph information to document node. * @param node the document node (destination) diff --git a/filters/kword/rtf/import/rtfimport_dom.cpp b/filters/kword/rtf/import/rtfimport_dom.cpp index 95fa43fc..75855dbf 100644 --- a/filters/kword/rtf/import/rtfimport_dom.cpp +++ b/filters/kword/rtf/import/rtfimport_dom.cpp @@ -12,7 +12,7 @@ #include <stdio.h> #include <tqdatetime.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqcolor.h> #include <kdebug.h> @@ -30,7 +30,7 @@ TQString CheckAndEscapeXmlText(const TQString& strText) for (uint i=0; i<strReturn.length(); i++) { ch = strReturn[i]; - const int test = ch.tqunicode(); + const int test = ch.unicode(); // The i+= is for the additional characters if (test == 38) { strReturn.replace(i, 1, "&"); i+=4; } // & diff --git a/filters/kword/rtf/status.html b/filters/kword/rtf/status.html index 27239e52..904da9db 100644 --- a/filters/kword/rtf/status.html +++ b/filters/kword/rtf/status.html @@ -52,14 +52,14 @@ - Document information (author, title, comments, company).<br> - Page size and margins.<br> - Headers and footers (with margins).<br> - - Tables (including non-rectangular), horizontal tqalignment.<br> + - Tables (including non-rectangular), horizontal alignment.<br> - Table cell background color and borders (style, color, width).<br> - Embedded pictures (JPEG/PNG/BMP) and clipart (EMF/WMF).<br> - Word 97-2000 picture support.<br> - Style sheet.<br> - Character formatting (size, color, bold, italic, underline, strikeout, subscript, superscript...).<br> - Font mapping (using TQFont/TQFontInfo).<br> - - Paragraph tqlayout (horizontal tqalignment, indents, space before/after, frame break).<br> + - Paragraph layout (horizontal alignment, indents, space before/after, frame break).<br> - Paragraph borders (style, color, width).<br> - Tabulators, automatic tabulator for hanging indent.<br> - Unicode and codepages support.<br> @@ -76,7 +76,7 @@ - Fix line spacing.<br> - Columns.<br> - Improve list handling.<br> - - Shaps, especially picture that are in tqshapes<br> + - Shaps, especially picture that are in shapes<br> </td> </tr> @@ -85,7 +85,7 @@ <td> 15 July 2001: First useful version (rewritten for TQDom).<br> 18 July 2001: Fixed function <code>finishTable()</code> (some tables crashed KWord).<br> - 23 July 2001: Added table tqalignment, background color and cell borders.<br> + 23 July 2001: Added table alignment, background color and cell borders.<br> 31 August 2001: Faster version, uses read buffers and optimized XML output.<br> 2 October 2001: Clipart import fixed (requires libwmf).<br> 23 July 2002: Added field and hyperlink support, fixed embedded pictures.<br> diff --git a/filters/kword/starwriter/pole.cpp b/filters/kword/starwriter/pole.cpp index d9751e15..9323cdbc 100644 --- a/filters/kword/starwriter/pole.cpp +++ b/filters/kword/starwriter/pole.cpp @@ -36,7 +36,7 @@ class Entry unsigned long size; unsigned start; bool dir; - std::vector<Entry*> tqchildren; + std::vector<Entry*> children; Entry(); ~Entry(); private: @@ -257,9 +257,9 @@ Entry::Entry() Entry::~Entry() { - for( unsigned i=0; i<tqchildren.size(); i++ ) + for( unsigned i=0; i<children.size(); i++ ) { - Entry* entry = tqchildren[ i ]; + Entry* entry = children[ i ]; delete entry; } } @@ -657,7 +657,7 @@ Entry* StorageIO::buildTree( Entry* parent, int index, const unsigned char* dire // append as another child entry->parent = parent; - if( parent ) parent->tqchildren.push_back( entry ); + if( parent ) parent->children.push_back( entry ); // check previous int prev = readU32( dirent + 0x44+p ); @@ -725,9 +725,9 @@ Entry* StorageIO::entry( const std::string& name ) std::string entryname = *it; Entry *child = (Entry*) 0L; if( entry->dir ) - for( unsigned j=0; j < entry->tqchildren.size(); j++ ) - if( entry->tqchildren[j]->name == entryname ) - child = entry->tqchildren[j]; + for( unsigned j=0; j < entry->children.size(); j++ ) + if( entry->children[j]->name == entryname ) + child = entry->children[j]; if( !child ) return (Entry*) 0L; entry = child; } @@ -912,10 +912,10 @@ std::list<std::string> Storage::listDirectory() // sentinel: do nothing if not a directory if( !io->current_dir->dir ) return entries; - // find all tqchildren belongs to this directory - for( unsigned i = 0; i<io->current_dir->tqchildren.size(); i++ ) + // find all children belongs to this directory + for( unsigned i = 0; i<io->current_dir->children.size(); i++ ) { - Entry* e = io->current_dir->tqchildren[i]; + Entry* e = io->current_dir->children[i]; if( e ) entries.push_back( e->name ); } @@ -930,9 +930,9 @@ bool Storage::enterDirectory( const std::string& directory ) if( !io->current_dir ) return false; // look for the specified sub-dir - for( unsigned i = 0; i<io->current_dir->tqchildren.size(); i++ ) + for( unsigned i = 0; i<io->current_dir->children.size(); i++ ) { - Entry* e = io->current_dir->tqchildren[i]; + Entry* e = io->current_dir->children[i]; if( e ) if( e->name == directory ) if ( e->dir ) { diff --git a/filters/kword/starwriter/starwriterimport.cc b/filters/kword/starwriter/starwriterimport.cc index a9bd80d3..43dc1b62 100644 --- a/filters/kword/starwriter/starwriterimport.cc +++ b/filters/kword/starwriter/starwriterimport.cc @@ -58,7 +58,7 @@ StarWriterImport::~StarWriterImport() { } -KoFilter::ConversiontqStatus StarWriterImport::convert(const TQCString& from, const TQCString& to) +KoFilter::ConversionStatus StarWriterImport::convert(const TQCString& from, const TQCString& to) { // Check for proper conversion // When 4.x is supported, use also: || (from != "application/x-starwriter") @@ -345,7 +345,7 @@ bool StarWriterImport::parseTable(TQByteArray n) TQ_UINT8 row, column; // Set table name - tableName = TQString("Table %1").tqarg(tablesNumber); + tableName = TQString("Table %1").arg(tablesNumber); tablesNumber++; // Skip useless sections and retrieve the right point @@ -381,8 +381,8 @@ bool StarWriterImport::parseTable(TQByteArray n) text = convertToKWordString(s); // FIXME: check this stuff - TQString frameName = TQString("%1 Cell %2,%3").tqarg(tableName).tqarg(row).tqarg(column); - tableText.append(TQString(" <FRAMESET name=\"%1\" frameType=\"1\" frameInfo=\"0\" removable=\"0\" visible=\"1\" grpMgr=\"%2\" row=\"%3\" col=\"%4\" rows=\"1\" cols=\"1\" protectSize=\"0\">\n").tqarg(frameName).tqarg(tableName).tqarg(row).tqarg(column)); + TQString frameName = TQString("%1 Cell %2,%3").arg(tableName).arg(row).arg(column); + tableText.append(TQString(" <FRAMESET name=\"%1\" frameType=\"1\" frameInfo=\"0\" removable=\"0\" visible=\"1\" grpMgr=\"%2\" row=\"%3\" col=\"%4\" rows=\"1\" cols=\"1\" protectSize=\"0\">\n").arg(frameName).arg(tableName).arg(row).arg(column)); tableText.append(" <FRAME runaround=\"1\" copy=\"0\" newFrameBehavior=\"1\" runaroundSide=\"biggest\" autoCreateNewFrame=\"0\" bleftpt=\"2.8\" brightpt=\"2.8\" btoppt=\"2.8\" bbottompt=\"2.8\" runaroundGap=\"2.8\" />\n"); tableText.append(" <PARAGRAPH>\n"); tableText.append(" <TEXT xml:space=\"preserve\">" + text + "</TEXT>\n"); @@ -408,7 +408,7 @@ bool StarWriterImport::parseTable(TQByteArray n) bodyStuff.append(" <TEXT xml:space=\"preserve\">#</TEXT>\n"); bodyStuff.append(" <FORMATS>\n"); bodyStuff.append(" <FORMAT id=\"6\" pos=\"0\" len=\"1\">\n"); - bodyStuff.append(TQString(" <ANCHOR type=\"frameset\" instance=\"%1\" />\n").tqarg(tableName)); + bodyStuff.append(TQString(" <ANCHOR type=\"frameset\" instance=\"%1\" />\n").arg(tableName)); bodyStuff.append(" </FORMAT>\n"); bodyStuff.append(" </FORMATS>\n"); bodyStuff.append(" </PARAGRAPH>\n"); diff --git a/filters/kword/starwriter/starwriterimport.h b/filters/kword/starwriter/starwriterimport.h index b030c2ba..f71a71ed 100644 --- a/filters/kword/starwriter/starwriterimport.h +++ b/filters/kword/starwriter/starwriterimport.h @@ -34,7 +34,7 @@ class StarWriterImport: public KoFilter public: StarWriterImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~StarWriterImport(); - KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); + KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to); private: // most important OLE streams diff --git a/filters/kword/starwriter/status.html b/filters/kword/starwriter/status.html index 6919c589..d7667e6c 100644 --- a/filters/kword/starwriter/status.html +++ b/filters/kword/starwriter/status.html @@ -7,7 +7,7 @@ <META NAME="GENERATOR" CONTENT="Quanta Plus"> </HEAD> <BODY> - <H2 align="center">tqStatus of the</H2> + <H2 align="center">Status of the</H2> <H1 align="center">StarWriter 5.x filter for KWord</H1> <P>Author: <A HREF="mailto:info@marcozanon.com">Marco Zanon</A> diff --git a/filters/kword/wml/wmlexport.cc b/filters/kword/wml/wmlexport.cc index 92908c57..36d267be 100644 --- a/filters/kword/wml/wmlexport.cc +++ b/filters/kword/wml/wmlexport.cc @@ -23,10 +23,10 @@ #include <unistd.h> #endif -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqfile.h> #include <tqfileinfo.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> #include <KoFilterChain.h> @@ -51,7 +51,7 @@ class WMLWorker : public KWEFBaseWorker virtual bool doCloseFile(void); virtual bool doOpenDocument(void); virtual bool doCloseDocument(void); - virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout, + virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout, const ValueListFormatData& paraFormatDataList); private: TQString filename; @@ -97,7 +97,7 @@ bool WMLWorker::doCloseDocument(void) } bool WMLWorker::doFullParagraph(const TQString& paraText, - const LayoutData& tqlayout, const ValueListFormatData& paraFormatDataList) + const LayoutData& layout, const ValueListFormatData& paraFormatDataList) { TQString wmlText; TQString text = paraText; @@ -131,7 +131,7 @@ bool WMLWorker::doFullParagraph(const TQString& paraText, } // sentinel check - TQString align = tqlayout.tqalignment.lower(); + TQString align = layout.alignment.lower(); if( ( align!="left" ) && ( align!="right" ) && ( align!="center" ) ) align = "left"; @@ -145,7 +145,7 @@ WMLExport::WMLExport( KoFilter *, const char *, const TQStringList& ): { } -KoFilter::ConversiontqStatus WMLExport::convert( const TQCString& from, +KoFilter::ConversionStatus WMLExport::convert( const TQCString& from, const TQCString& to ) { // check for proper conversion @@ -155,7 +155,7 @@ KoFilter::ConversiontqStatus WMLExport::convert( const TQCString& from, WMLWorker* worker = new WMLWorker(); KWEFKWordLeader* leader = new KWEFKWordLeader( worker ); - KoFilter::ConversiontqStatus result; + KoFilter::ConversionStatus result; result = leader->convert( m_chain, from, to ); delete worker; diff --git a/filters/kword/wml/wmlexport.h b/filters/kword/wml/wmlexport.h index 8d3a105e..2f81c897 100644 --- a/filters/kword/wml/wmlexport.h +++ b/filters/kword/wml/wmlexport.h @@ -35,7 +35,7 @@ class WMLExport : public KoFilter virtual ~WMLExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __WMLEXPORT_H diff --git a/filters/kword/wml/wmlimport.cc b/filters/kword/wml/wmlimport.cc index e44c10ae..83e14d9f 100644 --- a/filters/kword/wml/wmlimport.cc +++ b/filters/kword/wml/wmlimport.cc @@ -54,7 +54,7 @@ class WMLConverter: public WMLParser virtual bool doOpenCard( TQString, TQString ); virtual bool doCloseCard(); virtual bool doParagraph( TQString text, WMLFormatList formatList, - WMLLayout tqlayout ); + WMLLayout layout ); private: TQString m_title; }; @@ -105,13 +105,13 @@ static TQString WMLFormatAsXML( WMLFormat format ) return result; } -static TQString WMLLayoutAsXML( WMLLayout tqlayout ) +static TQString WMLLayoutAsXML( WMLLayout layout ) { TQString result; TQString align = "left"; - if( tqlayout.align == WMLLayout::Center ) align = "center"; - if( tqlayout.align == WMLLayout::Right ) align = "right"; + if( layout.align == WMLLayout::Center ) align = "center"; + if( layout.align == WMLLayout::Right ) align = "right"; TQFont font = KoGlobal::defaultFont(); TQString fontFamily = font.family(); @@ -161,7 +161,7 @@ bool WMLConverter::doCloseCard() } bool WMLConverter::doParagraph( TQString atext, WMLFormatList formatList, - WMLLayout tqlayout ) + WMLLayout layout ) { TQString text, formats; @@ -183,7 +183,7 @@ bool WMLConverter::doParagraph( TQString atext, WMLFormatList formatList, root.append( "<PARAGRAPH>\n" ); root.append( "<TEXT>" + text + "</TEXT>\n" ); root.append( "<FORMATS>" + formats + "</FORMATS>\n" ); - root.append( WMLLayoutAsXML( tqlayout) ); + root.append( WMLLayoutAsXML( layout) ); root.append( "</PARAGRAPH>\n" ); return TRUE; @@ -231,7 +231,7 @@ void WMLConverter::parse( const char* filename ) } -KoFilter::ConversiontqStatus WMLImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus WMLImport::convert( const TQCString& from, const TQCString& to ) { // check for proper conversion if( to!= "application/x-kword" || from != "text/vnd.wap.wml" ) diff --git a/filters/kword/wml/wmlimport.h b/filters/kword/wml/wmlimport.h index 049ff8db..1c169af1 100644 --- a/filters/kword/wml/wmlimport.h +++ b/filters/kword/wml/wmlimport.h @@ -37,7 +37,7 @@ class WMLImport : public KoFilter virtual ~WMLImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __WMLIMPORT_H diff --git a/filters/kword/wml/wmlparser.cpp b/filters/kword/wml/wmlparser.cpp index ecbb235c..81ccbd24 100644 --- a/filters/kword/wml/wmlparser.cpp +++ b/filters/kword/wml/wmlparser.cpp @@ -403,7 +403,7 @@ WMLFormat& WMLFormat::operator=( const WMLFormat& f ) return *this; } -// paragraph tqlayout info +// paragraph layout info WMLLayout::WMLLayout() { align = Left; diff --git a/filters/kword/wordperfect/export/wp5.cc b/filters/kword/wordperfect/export/wp5.cc index bffdecf1..ac211d04 100644 --- a/filters/kword/wordperfect/export/wp5.cc +++ b/filters/kword/wordperfect/export/wp5.cc @@ -23,10 +23,10 @@ #include <unistd.h> #endif -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqfile.h> #include <tqfileinfo.h> -#include <tqtextstream.h> +#include <textstream.h> #include <KWEFBaseWorker.h> #include <KWEFKWordLeader.h> @@ -125,7 +125,7 @@ bool WPFiveWorker::doOpenDocument(void) for( int i=0; i<14; i++ ) output << index_header[i]; // document area starts, mark it for the header fields - document_area_ptr = output.tqdevice()->at(); + document_area_ptr = output.device()->at(); return true; } @@ -143,7 +143,7 @@ static TQCString WPFiveEscape( const TQString& text ) for( unsigned int i=0; i < text.length(); i++ ) { - int c = text[i].tqunicode(); + int c = text[i].unicode(); if( c < 32 ) result += '.'; else if ( c == 32 ) result += 0x20 ; // hard space else if ( c < 128 ) result += text[i].latin1(); @@ -155,7 +155,7 @@ static TQCString WPFiveEscape( const TQString& text ) bool WPFiveWorker::doFullParagraph(const TQString& paraText, - const LayoutData& /*tqlayout*/, const ValueListFormatData& paraFormatDataList) + const LayoutData& /*layout*/, const ValueListFormatData& paraFormatDataList) { ValueListFormatData::ConstIterator it; for( it = paraFormatDataList.begin(); it!=paraFormatDataList.end(); ++it ) diff --git a/filters/kword/wordperfect/export/wp5.h b/filters/kword/wordperfect/export/wp5.h index 0791459b..dc75e2f7 100644 --- a/filters/kword/wordperfect/export/wp5.h +++ b/filters/kword/wordperfect/export/wp5.h @@ -36,7 +36,7 @@ class WPFiveWorker : public KWEFBaseWorker virtual bool doCloseFile(void); virtual bool doOpenDocument(void); virtual bool doCloseDocument(void); - virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout, + virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout, const ValueListFormatData& paraFormatDataList); private: TQString filename; diff --git a/filters/kword/wordperfect/export/wp6.cc b/filters/kword/wordperfect/export/wp6.cc index 21c59606..a9dd9109 100644 --- a/filters/kword/wordperfect/export/wp6.cc +++ b/filters/kword/wordperfect/export/wp6.cc @@ -23,10 +23,10 @@ #include <unistd.h> #endif -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqfile.h> #include <tqfileinfo.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqvaluevector.h> #include <KWEFBaseWorker.h> @@ -125,7 +125,7 @@ bool WPSixWorker::doOpenDocument(void) for( int i=0; i<14; i++ ) output << index_header[i]; // document area starts, mark it for the header fields - document_area_ptr = output.tqdevice()->at(); + document_area_ptr = output.device()->at(); return true; } @@ -144,7 +144,7 @@ static TQCString WPSixEscape( const TQString& text ) for( unsigned int i=0; i < text.length(); i++ ) { - int c = text[i].tqunicode(); + int c = text[i].unicode(); if( c < 32 ) result += '.'; else if ( c == 32 ) result += 0x80 ; // hard space else if ( c < 128 ) result += text[i].latin1(); @@ -155,14 +155,14 @@ static TQCString WPSixEscape( const TQString& text ) } bool WPSixWorker::doFullParagraph(const TQString& paraText, - const LayoutData& tqlayout, const ValueListFormatData& paraFormatDataList) + const LayoutData& layout, const ValueListFormatData& paraFormatDataList) { - // handle paragraph tqalignment/justification (default to left) + // handle paragraph alignment/justification (default to left) unsigned char wp_align[] = { 0xd3, 5, 12, 0, 0, 1, 0, 0, 2, 12, 0, 0xd3 }; - if( tqlayout.tqalignment == "left" ) wp_align[7] = 0; - if( tqlayout.tqalignment == "justify" ) wp_align[7] = 1; - if( tqlayout.tqalignment == "center" ) wp_align[7] = 2; - if( tqlayout.tqalignment == "right" ) wp_align[7] = 3; + if( layout.alignment == "left" ) wp_align[7] = 0; + if( layout.alignment == "justify" ) wp_align[7] = 1; + if( layout.alignment == "center" ) wp_align[7] = 2; + if( layout.alignment == "right" ) wp_align[7] = 3; output.writeRawBytes( (const char*)wp_align, 12 ); ValueListFormatData::ConstIterator it; diff --git a/filters/kword/wordperfect/export/wp6.h b/filters/kword/wordperfect/export/wp6.h index 73397338..05abb60f 100644 --- a/filters/kword/wordperfect/export/wp6.h +++ b/filters/kword/wordperfect/export/wp6.h @@ -36,7 +36,7 @@ class WPSixWorker : public KWEFBaseWorker virtual bool doCloseFile(void); virtual bool doOpenDocument(void); virtual bool doCloseDocument(void); - virtual bool doFullParagraph(const TQString& paraText, const LayoutData& tqlayout, + virtual bool doFullParagraph(const TQString& paraText, const LayoutData& layout, const ValueListFormatData& paraFormatDataList); private: TQString filename; diff --git a/filters/kword/wordperfect/export/wpexport.cc b/filters/kword/wordperfect/export/wpexport.cc index 43a688c3..f1dde8ad 100644 --- a/filters/kword/wordperfect/export/wpexport.cc +++ b/filters/kword/wordperfect/export/wpexport.cc @@ -23,10 +23,10 @@ #include <unistd.h> #endif -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqfile.h> #include <tqfileinfo.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> #include <KoFilterChain.h> @@ -47,7 +47,7 @@ WPExport::WPExport( KoFilter *, const char *, const TQStringList& ): { } -KoFilter::ConversiontqStatus +KoFilter::ConversionStatus WPExport::convert( const TQCString& from, const TQCString& to ) { @@ -69,7 +69,7 @@ WPExport::convert( const TQCString& from, KWEFKWordLeader* leader = new KWEFKWordLeader( worker ); - KoFilter::ConversiontqStatus result; + KoFilter::ConversionStatus result; result = leader->convert( m_chain, from, to ); delete worker; diff --git a/filters/kword/wordperfect/export/wpexport.h b/filters/kword/wordperfect/export/wpexport.h index 55f43a47..16e81a1b 100644 --- a/filters/kword/wordperfect/export/wpexport.h +++ b/filters/kword/wordperfect/export/wpexport.h @@ -35,7 +35,7 @@ class WPExport : public KoFilter virtual ~WPExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __WPEXPORT_H diff --git a/filters/kword/wordperfect/import/kwordfilter.cpp b/filters/kword/wordperfect/import/kwordfilter.cpp index de9246cc..1b3b83df 100644 --- a/filters/kword/wordperfect/import/kwordfilter.cpp +++ b/filters/kword/wordperfect/import/kwordfilter.cpp @@ -128,7 +128,7 @@ KWordFilter::parse (const TQString & filename) tokens.append( new Token( Token::HardReturn ) ); TQString text; - TQString tqlayout; + TQString layout; TQString formats; int LeftMargin = 0; int TopMargin = 36; @@ -253,32 +253,32 @@ KWordFilter::parse (const TQString & filename) formats.append( " " + fmt ); formats.append ( " </FORMAT>\n" ); - tqlayout = ""; - tqlayout.append( "<LAYOUT>\n" ); - tqlayout.append( " <NAME value=\"Standard\" />\n" ); - tqlayout.append( " <FLOW align=\"" + mapAlign( align ) + "\" />\n" ); - tqlayout.append( " <LINESPACING value=\"" + mapLinespace( linespace) + "\" />\n" ); - tqlayout.append( " <LEFTBORDER width=\"0\" style=\"0\" />\n" ); - tqlayout.append( " <RIGHTBORDER width=\"0\" style=\"0\" />\n" ); - tqlayout.append( " <TOPBORDER width=\"0\" style=\"0\" />\n" ); - tqlayout.append( " <BOTTOMBORDER width=\"0\" style=\"0\" />\n" ); + layout = ""; + layout.append( "<LAYOUT>\n" ); + layout.append( " <NAME value=\"Standard\" />\n" ); + layout.append( " <FLOW align=\"" + mapAlign( align ) + "\" />\n" ); + layout.append( " <LINESPACING value=\"" + mapLinespace( linespace) + "\" />\n" ); + layout.append( " <LEFTBORDER width=\"0\" style=\"0\" />\n" ); + layout.append( " <RIGHTBORDER width=\"0\" style=\"0\" />\n" ); + layout.append( " <TOPBORDER width=\"0\" style=\"0\" />\n" ); + layout.append( " <BOTTOMBORDER width=\"0\" style=\"0\" />\n" ); lm = LeftMargin + LeftMarginAdjust - frameLeftMargin; rm = RightMargin + RightMarginAdjust - frameRightMargin; - tqlayout.append( " <INDENTS left=\"" + TQString::number( TQMAX( 0, lm ) ) + "\"" + + layout.append( " <INDENTS left=\"" + TQString::number( TQMAX( 0, lm ) ) + "\"" + " right=\"" + TQString::number( TQMAX( 0 , rm ) ) + "\"" + " first=\"0\" />\n" ); - tqlayout.append( " <OFFSETS />\n" ); - tqlayout.append( " <PAGEBREAKING />\n" ); - tqlayout.append( " <COUNTER />\n" ); - tqlayout.append( " <FORMAT id=\"1\">\n" ); - tqlayout.append( " <WEIGHT value=\"50\" />\n" ); - tqlayout.append( " <ITALIC value=\"0\" />\n" ); - tqlayout.append( " <UNDERLINE value=\"0\" />\n" ); - tqlayout.append( " <STRIKEOUT value=\"0\" />\n" ); - tqlayout.append( " <CHARSET value=\"0\" />\n" ); - tqlayout.append( " <VERTALIGN value=\"0\" />\n" ); - tqlayout.append( " </FORMAT>\n" ); - tqlayout.append( "</LAYOUT>\n" ); + layout.append( " <OFFSETS />\n" ); + layout.append( " <PAGEBREAKING />\n" ); + layout.append( " <COUNTER />\n" ); + layout.append( " <FORMAT id=\"1\">\n" ); + layout.append( " <WEIGHT value=\"50\" />\n" ); + layout.append( " <ITALIC value=\"0\" />\n" ); + layout.append( " <UNDERLINE value=\"0\" />\n" ); + layout.append( " <STRIKEOUT value=\"0\" />\n" ); + layout.append( " <CHARSET value=\"0\" />\n" ); + layout.append( " <VERTALIGN value=\"0\" />\n" ); + layout.append( " </FORMAT>\n" ); + layout.append( "</LAYOUT>\n" ); // encode text for XML-ness // FIXME could be faster without TQRegExp @@ -294,7 +294,7 @@ KWordFilter::parse (const TQString & filename) root.append( "<FORMATS>\n"); root.append( formats ); root.append( "</FORMATS>\n"); - root.append( tqlayout ); + root.append( layout ); root.append( "</PARAGRAPH>\n" ); // for the next paragraph diff --git a/filters/kword/wordperfect/import/parser.cpp b/filters/kword/wordperfect/import/parser.cpp index 7b87e5a6..96a2559c 100644 --- a/filters/kword/wordperfect/import/parser.cpp +++ b/filters/kword/wordperfect/import/parser.cpp @@ -1002,7 +1002,7 @@ Parser::handleTab (TQMemArray < TQ_UINT8 > data) } -// the following tables maps WP charset/charcode to tqunicode character +// the following tables maps WP charset/charcode to unicode character // WP multinational characters (charset 1) static unsigned multinational_map[] = { diff --git a/filters/kword/wordperfect/import/wpimport.cc b/filters/kword/wordperfect/import/wpimport.cc index 460915af..09fc4d5c 100644 --- a/filters/kword/wordperfect/import/wpimport.cc +++ b/filters/kword/wordperfect/import/wpimport.cc @@ -227,7 +227,7 @@ WPImport::WPImport( KoFilter *, const char *, const TQStringList& ): KoFilter() { } -KoFilter::ConversiontqStatus WPImport::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus WPImport::convert( const TQCString& from, const TQCString& to ) { // check for proper conversion if(to!= "application/vnd.sun.xml.writer" || from != "application/wordperfect" ) diff --git a/filters/kword/wordperfect/import/wpimport.h b/filters/kword/wordperfect/import/wpimport.h index 02cd323d..3fc52796 100644 --- a/filters/kword/wordperfect/import/wpimport.h +++ b/filters/kword/wordperfect/import/wpimport.h @@ -48,7 +48,7 @@ class WPImport : public KoFilter virtual ~WPImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif // __WPIMPORT_H diff --git a/filters/kword/wordperfect/status_old.html b/filters/kword/wordperfect/status_old.html index 1db3dc09..5465048d 100644 --- a/filters/kword/wordperfect/status_old.html +++ b/filters/kword/wordperfect/status_old.html @@ -55,7 +55,7 @@ <li>font information: size, typeface, color</li> <li>WP extended character converted to Unicode</li> <li>character formatting: bold, italics, underline, double underline, strikeout, superscript, subscript</li> - <li>paragraph tqlayout: linespacing, justification</li> + <li>paragraph layout: linespacing, justification</li> <li>page settings: margins</li> <li>document summary: title, author, abstract</li> </ul> diff --git a/filters/libdialogfilter/exportsizedia.cpp b/filters/libdialogfilter/exportsizedia.cpp index f079e2a5..f632080e 100644 --- a/filters/libdialogfilter/exportsizedia.cpp +++ b/filters/libdialogfilter/exportsizedia.cpp @@ -20,7 +20,7 @@ #include <tqcheckbox.h> #include <tqimage.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpaintdevice.h> #include <tqrect.h> @@ -107,7 +107,7 @@ void ExportSizeDia::setupGUI() mainLayout->addWidget( percentHeight, 4, 0 ); mainLayout->addWidget( m_percWidthEdit, 4, 1 ); - /* Display the main tqlayout */ + /* Display the main layout */ //mainLayout->addStretch( 5 ); mainLayout->activate(); } diff --git a/filters/liboofilter/ooutils.cc b/filters/liboofilter/ooutils.cc index 9a4ac58b..a04633fe 100644 --- a/filters/liboofilter/ooutils.cc +++ b/filters/liboofilter/ooutils.cc @@ -209,7 +209,7 @@ void OoUtils::importTabulators( TQDomElement& parentElement, const KoStyleStack& if ( !styleStack.hasChildNodeNS( ooNS::style, "tab-stops" ) ) // 3.11.10 return; TQDomElement tabStops = styleStack.childNodeNS( ooNS::style, "tab-stops" ); - //kdDebug(30519) << k_funcinfo << tabStops.childNodes().count() << " tab stops in tqlayout." << endl; + //kdDebug(30519) << k_funcinfo << tabStops.childNodes().count() << " tab stops in layout." << endl; for ( TQDomNode it = tabStops.firstChild(); !it.isNull(); it = it.nextSibling() ) { TQDomElement tabStop = it.toElement(); @@ -227,7 +227,7 @@ void OoUtils::importTabulators( TQDomElement& parentElement, const KoStyleStack& else if ( type == "char" ) { TQString delimiterChar = tabStop.attributeNS( ooNS::style, "char", TQString() ); // single character elem.setAttribute( "alignchar", delimiterChar ); - kOfficeType = 3; // "tqalignment on decimal point" + kOfficeType = 3; // "alignment on decimal point" } elem.setAttribute( "type", kOfficeType ); @@ -235,7 +235,7 @@ void OoUtils::importTabulators( TQDomElement& parentElement, const KoStyleStack& double pos = KoUnit::parseValue( tabStop.attributeNS( ooNS::style, "position", TQString() ) ); elem.setAttribute( "ptpos", pos ); - // TODO Convert leaderChar's tqunicode value to the KOffice enum + // TODO Convert leaderChar's unicode value to the KOffice enum // (blank/dots/line/dash/dash-dot/dash-dot-dot, 0 to 5) TQString leaderChar = tabStop.attributeNS( ooNS::style, "leader-char", TQString() ); // single character if ( !leaderChar.isEmpty() ) @@ -499,7 +499,7 @@ void OoUtils::createDocumentInfo(TQDomDocument &_meta, TQDomDocument & docinfo) } } -KoFilter::ConversiontqStatus OoUtils::loadAndParse(const TQString& fileName, TQDomDocument& doc, KoStore *m_store ) +KoFilter::ConversionStatus OoUtils::loadAndParse(const TQString& fileName, TQDomDocument& doc, KoStore *m_store ) { kdDebug(30518) << "loadAndParse: Trying to open " << fileName << endl; @@ -508,13 +508,13 @@ KoFilter::ConversiontqStatus OoUtils::loadAndParse(const TQString& fileName, TQD kdWarning(30519) << "Entry " << fileName << " not found!" << endl; return KoFilter::FileNotFound; } - KoFilter::ConversiontqStatus converttqStatus = loadAndParse( m_store->device(),doc, fileName ); + KoFilter::ConversionStatus convertStatus = loadAndParse( m_store->device(),doc, fileName ); m_store->close(); - return converttqStatus; + return convertStatus; } -KoFilter::ConversiontqStatus OoUtils::loadAndParse(TQIODevice* io, TQDomDocument& doc, const TQString & fileName) +KoFilter::ConversionStatus OoUtils::loadAndParse(TQIODevice* io, TQDomDocument& doc, const TQString & fileName) { TQXmlInputSource source( io ); // Copied from TQDomDocumentPrivate::setContent, to change the whitespace thing @@ -538,7 +538,7 @@ KoFilter::ConversiontqStatus OoUtils::loadAndParse(TQIODevice* io, TQDomDocument } -KoFilter::ConversiontqStatus OoUtils::loadAndParse(const TQString& filename, TQDomDocument& doc, KZip * m_zip) +KoFilter::ConversionStatus OoUtils::loadAndParse(const TQString& filename, TQDomDocument& doc, KZip * m_zip) { kdDebug(30519) << "Trying to open " << filename << endl; @@ -562,12 +562,12 @@ KoFilter::ConversiontqStatus OoUtils::loadAndParse(const TQString& filename, TQD const KZipFileEntry* f = static_cast<const KZipFileEntry *>(entry); kdDebug(30519) << "Entry " << filename << " has size " << f->size() << endl; TQIODevice* io = f->device(); - KoFilter::ConversiontqStatus converttqStatus = loadAndParse( io,doc, filename ); + KoFilter::ConversionStatus convertStatus = loadAndParse( io,doc, filename ); delete io; - return converttqStatus; + return convertStatus; } -KoFilter::ConversiontqStatus OoUtils::loadThumbnail( TQImage& thumbnail, KZip * m_zip ) +KoFilter::ConversionStatus OoUtils::loadThumbnail( TQImage& thumbnail, KZip * m_zip ) { const TQString filename( "Thumbnails/thumbnail.png" ); kdDebug(30519) << "Trying to open thumbnail " << filename << endl; diff --git a/filters/liboofilter/ooutils.h b/filters/liboofilter/ooutils.h index 70de64c8..a668d961 100644 --- a/filters/liboofilter/ooutils.h +++ b/filters/liboofilter/ooutils.h @@ -80,14 +80,14 @@ namespace OoUtils void importTextPosition( const TQString& text_position, TQString& value, TQString& relativetextsize ); void createDocumentInfo(TQDomDocument &_meta, TQDomDocument & docinfo); - KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc, KZip * m_zip); - KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc, KoStore *m_store ); + KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc, KZip * m_zip); + KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc, KoStore *m_store ); /// Load an OASIS thumbnail - KoFilter::ConversiontqStatus loadThumbnail( TQImage& thumbnail, KZip * m_zip ); + KoFilter::ConversionStatus loadThumbnail( TQImage& thumbnail, KZip * m_zip ); // Internal - KoFilter::ConversiontqStatus loadAndParse(TQIODevice* io, TQDomDocument& doc, const TQString & fileName); + KoFilter::ConversionStatus loadAndParse(TQIODevice* io, TQDomDocument& doc, const TQString & fileName); } #endif /* OOUTILS_H */ diff --git a/filters/olefilters/olefilter.cc b/filters/olefilters/olefilter.cc index ef4f6cd0..0f052e13 100644 --- a/filters/olefilters/olefilter.cc +++ b/filters/olefilters/olefilter.cc @@ -69,7 +69,7 @@ OLEFilter::~OLEFilter() delete docfile; } -KoFilter::ConversiontqStatus OLEFilter::convert( const TQCString& from, const TQCString& to ) +KoFilter::ConversionStatus OLEFilter::convert( const TQCString& from, const TQCString& to ) { if(to!="application/x-kword" && to!="application/x-kspread" && @@ -118,9 +118,9 @@ void OLEFilter::commSlotDelayStream( const char* delay ) emit internalCommDelayStream( delay ); } -void OLEFilter::commSlotShapeID( unsigned int& tqshapeID ) +void OLEFilter::commSlotShapeID( unsigned int& shapeID ) { - emit internalCommShapeID( tqshapeID ); + emit internalCommShapeID( shapeID ); } void OLEFilter::slotSavePart( @@ -153,7 +153,7 @@ void OLEFilter::slotSavePart( if ( srcMime == KMimeType::defaultMimeType() ) kdWarning( s_area ) << "Couldn't determine the mimetype from the extension" << endl; - KoFilter::ConversiontqStatus status; + KoFilter::ConversionStatus status; TQCString destMime( mimeType.latin1() ); storageId = TQString::number( embedPart( srcMime.latin1(), destMime, status, nameIN ) ); @@ -234,7 +234,7 @@ void OLEFilter::slotSavePic( else { // It's not here, so let's generate one. - storageId = TQString( "pictures/picture%1.%2" ).tqarg( numPic++ ).tqarg( extension ); + storageId = TQString( "pictures/picture%1.%2" ).arg( numPic++ ).arg( extension ); imageMap.insert(nameIN, storageId); KoStoreDevice* pic = m_chain->storageFile( storageId, KoStore::Write ); if(!pic) diff --git a/filters/olefilters/olefilter.h b/filters/olefilters/olefilter.h index 80a03737..2759ea50 100644 --- a/filters/olefilters/olefilter.h +++ b/filters/olefilters/olefilter.h @@ -39,11 +39,11 @@ public: OLEFilter(KoFilter *parent, const char *name, const TQStringList&); virtual ~OLEFilter(); - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); public slots: void commSlotDelayStream( const char* delay ); - void commSlotShapeID( unsigned int& tqshapeID ); + void commSlotShapeID( unsigned int& shapeID ); protected slots: // This slot saves the document informations to the KOffice tar storage. @@ -100,7 +100,7 @@ protected slots: signals: // Forwarding signals for inter-filter communication - void internalCommShapeID( unsigned int& tqshapeID ); + void internalCommShapeID( unsigned int& shapeID ); void internalCommDelayStream( const char* delay ); private: diff --git a/filters/olefilters/powerpoint97/powerpoint.cc b/filters/olefilters/powerpoint97/powerpoint.cc index b53acfc5..d28430dd 100644 --- a/filters/olefilters/powerpoint97/powerpoint.cc +++ b/filters/olefilters/powerpoint97/powerpoint.cc @@ -782,7 +782,7 @@ void Powerpoint::opSlideAtom( { struct { - TQ_UINT8 tqlayout[12]; // Slide tqlayout descriptor. + TQ_UINT8 layout[12]; // Slide layout descriptor. TQ_INT32 masterId; // Id of the master of the slide. Zero for a master slide. TQ_INT32 notesId; // Id for the corresponding notes slide. Zero if slide has no notes. TQ_UINT16 flags; @@ -790,7 +790,7 @@ void Powerpoint::opSlideAtom( Header tmp; tmp.type = 1015; - tmp.length = sizeof(data.tqlayout); + tmp.length = sizeof(data.layout); invokeHandler(tmp, tmp.length, operands); operands >> data.masterId >> data.notesId >> data.flags; @@ -819,7 +819,7 @@ void Powerpoint::opSlidePersistAtom( struct { TQ_UINT32 psrReference; // Logical reference to the slide persist object. - TQ_UINT32 flags; // If bit 3 set then slide contains tqshapes other than placeholders. + TQ_UINT32 flags; // If bit 3 set then slide contains shapes other than placeholders. TQ_INT32 numberTexts; // Number of placeholder texts stored with the persist object. TQ_INT32 slideId; // Unique slide identifier, used for OLE link monikers for example. TQ_UINT32 reserved; @@ -1056,7 +1056,7 @@ void Powerpoint::opTextHeaderAtom( // 1 Body // 2 Notes // 3 Not Used - // 4 Other (Text in a tqshape) + // 4 Other (Text in a shape) // 5 Center body (subtitle in title slide) // 6 Center title (title in title slide) // 7 Half body (body in two-column slide) diff --git a/filters/olefilters/powerpoint97/pptSlide.h b/filters/olefilters/powerpoint97/pptSlide.h index 026e2ef1..78e9cb0a 100644 --- a/filters/olefilters/powerpoint97/pptSlide.h +++ b/filters/olefilters/powerpoint97/pptSlide.h @@ -34,7 +34,7 @@ DESCRIPTION #define BODY_TEXT 1 //body #define NOTES_TEXT 2 //notes #define NOTUSED_TEXT 3 //not used -#define OTHER_TEXT 4 //other(test in tqshape) +#define OTHER_TEXT 4 //other(test in shape) #define CENTER_BODY_TEXT 5 //center body(subtitle in title slide) #define CENTER_TITLE_TEXT 6 //center title(title in title slide) #define HALF_BODY_TEXT 7 //half body(body in two-column slide) diff --git a/filters/olefilters/powerpoint97/pptxml.cc b/filters/olefilters/powerpoint97/pptxml.cc index 96a03567..270cc30f 100644 --- a/filters/olefilters/powerpoint97/pptxml.cc +++ b/filters/olefilters/powerpoint97/pptxml.cc @@ -143,7 +143,7 @@ void PptXml::gotDrawing( ourKey = "vectorGraphic" + TQString::number(id) + "." + type; if (type == "msod") { - filterArgs = "tqshape-id="; + filterArgs = "shape-id="; filterArgs += TQString::number(id); filterArgs += ";delay-stream="; filterArgs += TQString::number(0); diff --git a/filters/xsltfilter/export/xsl/kword/xslfo/main.xsl b/filters/xsltfilter/export/xsl/kword/xslfo/main.xsl index b8bb24de..e619bf21 100644 --- a/filters/xsltfilter/export/xsl/kword/xslfo/main.xsl +++ b/filters/xsltfilter/export/xsl/kword/xslfo/main.xsl @@ -39,7 +39,7 @@ <xsl:value-of select="@editor"/> </xsl:comment> <fo:root> - <fo:tqlayout-master-set> + <fo:layout-master-set> <fo:simple-page-master margin-right="0.5cm" margin-left="0.5cm" margin-bottom="0.5cm" margin-top="0.75cm" page-width="21cm" page-height="29.7cm" master-name="first"> @@ -61,7 +61,7 @@ <fo:conditional-page-master-reference master-name="rest" /> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> - </fo:tqlayout-master-set> + </fo:layout-master-set> <xsl:apply-templates select="FRAMESETS"/> </fo:root> </xsl:template> diff --git a/filters/xsltfilter/export/xsltdialog.ui b/filters/xsltfilter/export/xsltdialog.ui index a52e922c..ff542dc3 100644 --- a/filters/xsltfilter/export/xsltdialog.ui +++ b/filters/xsltfilter/export/xsltdialog.ui @@ -49,7 +49,7 @@ <property name="name"> <cstring>xsltList</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>200</height> @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -145,7 +145,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/filters/xsltfilter/export/xsltexport.cc b/filters/xsltfilter/export/xsltexport.cc index 545ffde2..b1d9d84e 100644 --- a/filters/xsltfilter/export/xsltexport.cc +++ b/filters/xsltfilter/export/xsltexport.cc @@ -40,7 +40,7 @@ XSLTExport::XSLTExport(KoFilter *, const char *, const TQStringList&) : KoFilter() { } -KoFilter::ConversiontqStatus XSLTExport::convert( const TQCString& from, const TQCString&) +KoFilter::ConversionStatus XSLTExport::convert( const TQCString& from, const TQCString&) { if(from != "application/x-kword" && from != "application/x-kontour" && from != "application/x-kspread" && diff --git a/filters/xsltfilter/export/xsltexport.h b/filters/xsltfilter/export/xsltexport.h index eac9712a..b9947255 100644 --- a/filters/xsltfilter/export/xsltexport.h +++ b/filters/xsltfilter/export/xsltexport.h @@ -32,6 +32,6 @@ public: XSLTExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~XSLTExport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; #endif /* __XSLTEXPORT_H__ */ diff --git a/filters/xsltfilter/export/xsltexportdia.cc b/filters/xsltfilter/export/xsltexportdia.cc index 8d36f43b..aade6891 100644 --- a/filters/xsltfilter/export/xsltexportdia.cc +++ b/filters/xsltfilter/export/xsltexportdia.cc @@ -64,7 +64,7 @@ XSLTExportDia::XSLTExportDia(KoStoreDevice* in, const TQCString &format, TQWidge TQString value; while(i < 10) { - value = _config->readPathEntry( TQString("Recent%1").tqarg(i) ); + value = _config->readPathEntry( TQString("Recent%1").arg(i) ); kdDebug() << "recent : " << value << endl; if(!value.isEmpty()) { @@ -227,9 +227,9 @@ void XSLTExportDia::okSlot() { kdDebug() << "save : " << _recentList.first() << endl; #if KDE_IS_VERSION(3,1,3) - _config->writePathEntry( TQString("Recent%1").tqarg(i), _recentList.first()); + _config->writePathEntry( TQString("Recent%1").arg(i), _recentList.first()); #else - _config->writeEntry( TQString("Recent%1").tqarg(i), _recentList.first()); + _config->writeEntry( TQString("Recent%1").arg(i), _recentList.first()); #endif _recentList.pop_front(); i = i + 1; diff --git a/filters/xsltfilter/import/xsltdialog.ui b/filters/xsltfilter/import/xsltdialog.ui index a52e922c..ff542dc3 100644 --- a/filters/xsltfilter/import/xsltdialog.ui +++ b/filters/xsltfilter/import/xsltdialog.ui @@ -49,7 +49,7 @@ <property name="name"> <cstring>xsltList</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>200</height> @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -145,7 +145,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/filters/xsltfilter/import/xsltimport.cc b/filters/xsltfilter/import/xsltimport.cc index e73bdf18..999d9594 100644 --- a/filters/xsltfilter/import/xsltimport.cc +++ b/filters/xsltfilter/import/xsltimport.cc @@ -24,7 +24,7 @@ #include <kgenericfactory.h> #include <kglobal.h> #include <klocale.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include "xsltimportdia.h" @@ -36,7 +36,7 @@ XSLTImport::XSLTImport(KoFilter *, const char *, const TQStringList&) : KoFilter() { } -KoFilter::ConversiontqStatus XSLTImport::convert( const TQCString&, const TQCString& to ) +KoFilter::ConversionStatus XSLTImport::convert( const TQCString&, const TQCString& to ) { TQString config; diff --git a/filters/xsltfilter/import/xsltimport.h b/filters/xsltfilter/import/xsltimport.h index fead8d80..89767a32 100644 --- a/filters/xsltfilter/import/xsltimport.h +++ b/filters/xsltfilter/import/xsltimport.h @@ -21,7 +21,7 @@ #define __XSLTIMPORT_H__ #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfile.h> #include <tqobject.h> @@ -38,7 +38,7 @@ class XSLTImport : public KoFilter XSLTImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~XSLTImport() {} - virtual KoFilter::ConversiontqStatus convert( const TQCString& from, + virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to ); }; diff --git a/filters/xsltfilter/import/xsltimportdia.cc b/filters/xsltfilter/import/xsltimportdia.cc index 2e278bf2..c3fb4b97 100644 --- a/filters/xsltfilter/import/xsltimportdia.cc +++ b/filters/xsltfilter/import/xsltimportdia.cc @@ -59,7 +59,7 @@ XSLTImportDia::XSLTImportDia(KoStore* out, const TQCString &format, TQWidget* pa TQString value; while(i < 10) { - value = _config->readPathEntry( TQString("Recent%1").tqarg(i) ); + value = _config->readPathEntry( TQString("Recent%1").arg(i) ); kdDebug() << "recent : " << value << endl; if(!value.isEmpty()) { @@ -226,9 +226,9 @@ void XSLTImportDia::okSlot() { kdDebug() << "save : " << _recentList.first() << endl; #if KDE_IS_VERSION(3,1,3) - _config->writePathEntry( TQString("Recent%1").tqarg(i), _recentList.first()); + _config->writePathEntry( TQString("Recent%1").arg(i), _recentList.first()); #else - _config->writeEntry( TQString("Recent%1").tqarg(i), _recentList.first()); + _config->writeEntry( TQString("Recent%1").arg(i), _recentList.first()); #endif _recentList.pop_front(); i = i + 1; diff --git a/filters/xsltfilter/kword2xslfo.xsl b/filters/xsltfilter/kword2xslfo.xsl index ea36238b..4268afba 100644 --- a/filters/xsltfilter/kword2xslfo.xsl +++ b/filters/xsltfilter/kword2xslfo.xsl @@ -36,7 +36,7 @@ <xsl:value-of select="@editor"/> </xsl:comment> <fo:root> - <fo:tqlayout-master-set> + <fo:layout-master-set> <fo:simple-page-master margin-right="0.5cm" margin-left="0.5cm" margin-bottom="0.5cm" margin-top="0.75cm" page-width="21cm" page-height="29.7cm" master-name="first"> @@ -58,7 +58,7 @@ <fo:conditional-page-master-reference master-name="rest" /> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> - </fo:tqlayout-master-set> + </fo:layout-master-set> <xsl:apply-templates select="FRAMESETS"/> </fo:root> </xsl:template> diff --git a/karbon/commands/vbooleancmd.h b/karbon/commands/vbooleancmd.h index 3a3478d3..c782c838 100644 --- a/karbon/commands/vbooleancmd.h +++ b/karbon/commands/vbooleancmd.h @@ -37,8 +37,8 @@ public: enum VBooleanType { intersect, - tqshape_union, - tqshape_xor, + shape_union, + shape_xor, substract }; diff --git a/karbon/commands/vreplacingcmd.cc b/karbon/commands/vreplacingcmd.cc index 2275dba8..427ecdca 100644 --- a/karbon/commands/vreplacingcmd.cc +++ b/karbon/commands/vreplacingcmd.cc @@ -44,7 +44,7 @@ VReplacingCmd::execute() bool successful = false; - // Create new tqshapes if they don't exist yet. + // Create new shapes if they don't exist yet. if( !m_newObjects ) { m_newObjects = new VSelection(); @@ -65,11 +65,11 @@ VReplacingCmd::execute() { successful = true; - // Insert new tqshape right before old tqshape. + // Insert new shape right before old shape. itr.current()->parent()->insertInfrontOf( newObject, itr.current() ); - // Add new tqshape to list of new objects. + // Add new shape to list of new objects. m_newObjects->append( newObject ); } // No success. diff --git a/karbon/commands/vshapecmd.cc b/karbon/commands/vshapecmd.cc index ae0ad2dc..9a59fcd9 100644 --- a/karbon/commands/vshapecmd.cc +++ b/karbon/commands/vshapecmd.cc @@ -25,33 +25,33 @@ #include "vshapecmd.h" -VShapeCmd::VShapeCmd( VDocument* doc, const TQString& name, VPath* tqshape, const TQString& icon ) - : VCommand( doc, name, icon ), m_tqshape( tqshape ) +VShapeCmd::VShapeCmd( VDocument* doc, const TQString& name, VPath* shape, const TQString& icon ) + : VCommand( doc, name, icon ), m_shape( shape ) { } void VShapeCmd::execute() { - if( !m_tqshape ) + if( !m_shape ) return; - if( m_tqshape->state() == VObject::deleted ) + if( m_shape->state() == VObject::deleted ) { document()->selection()->clear(); - m_tqshape->setState( VObject::normal ); - document()->selection()->append( m_tqshape ); + m_shape->setState( VObject::normal ); + document()->selection()->append( m_shape ); } else { - m_tqshape->setState( VObject::normal ); - m_tqshape->setFill( *( document()->selection()->fill() ) ); - m_tqshape->setStroke( *( document()->selection()->stroke() ) ); + m_shape->setState( VObject::normal ); + m_shape->setFill( *( document()->selection()->fill() ) ); + m_shape->setStroke( *( document()->selection()->stroke() ) ); // Add path: - document()->append( m_tqshape ); + document()->append( m_shape ); document()->selection()->clear(); - document()->selection()->append( m_tqshape ); + document()->selection()->append( m_shape ); } setSuccess( true ); @@ -60,11 +60,11 @@ VShapeCmd::execute() void VShapeCmd::unexecute() { - if( !m_tqshape ) + if( !m_shape ) return; - document()->selection()->take( *m_tqshape ); - m_tqshape->setState( VObject::deleted ); + document()->selection()->take( *m_shape ); + m_shape->setState( VObject::deleted ); setSuccess( false ); } diff --git a/karbon/commands/vshapecmd.h b/karbon/commands/vshapecmd.h index 30607fcd..d4742a67 100644 --- a/karbon/commands/vshapecmd.h +++ b/karbon/commands/vshapecmd.h @@ -28,13 +28,13 @@ class VPath; /* * Provides a common base class for creation commands since they all have * a similar execute / unexecute behaviour and all build a VPath. Upon - * execution() the tqshape will be added to the document and selected, upon undoing + * execution() the shape will be added to the document and selected, upon undoing * it will be set to the deleted state. */ class KARBONCOMMAND_EXPORT VShapeCmd : public VCommand { public: - VShapeCmd( VDocument* doc, const TQString& name, VPath* tqshape, const TQString& icon = "14_polygon" ); + VShapeCmd( VDocument* doc, const TQString& name, VPath* shape, const TQString& icon = "14_polygon" ); virtual ~VShapeCmd() {} virtual void execute(); @@ -43,8 +43,8 @@ public: virtual bool changesSelection() const { return true; } protected: - /// Pointer to the created tqshape. - VPath *m_tqshape; + /// Pointer to the created shape. + VPath *m_shape; }; #endif diff --git a/karbon/commands/vtextcmd.h b/karbon/commands/vtextcmd.h index 708250c8..2fb0a75a 100644 --- a/karbon/commands/vtextcmd.h +++ b/karbon/commands/vtextcmd.h @@ -23,7 +23,7 @@ #include <tqfont.h> -#include "vtqshapecmd.h" +#include "vshapecmd.h" // create a text-object. diff --git a/karbon/commands/vtransformcmd.cc b/karbon/commands/vtransformcmd.cc index f0173920..dc1038ab 100644 --- a/karbon/commands/vtransformcmd.cc +++ b/karbon/commands/vtransformcmd.cc @@ -484,7 +484,7 @@ VTranslatePointCmd::translatePoints() segment->setPoint( pnts[i], segment->point( pnts[i] ).transform( m_mat ) ); } - // tqinvalidate all changed subpaths + // invalidate all changed subpaths VObjectListIterator itr( m_subpaths ); for( ; itr.current(); ++itr ) itr.current()->invalidateBoundingBox(); diff --git a/karbon/core/vcomposite.cc b/karbon/core/vcomposite.cc index 570b06dc..25636211 100644 --- a/karbon/core/vcomposite.cc +++ b/karbon/core/vcomposite.cc @@ -377,7 +377,7 @@ VPath::saveOasis( KoStore *store, KoXmlWriter *docWriter, KoGenStyles &mainStyle double w = boundingBox().width(); double h = boundingBox().height(); - docWriter->addAttribute( "svg:viewBox", TQString( "%1 %2 %3 %4" ).tqarg( x ).tqarg( y ).tqarg( w ).tqarg( h ) ); + docWriter->addAttribute( "svg:viewBox", TQString( "%1 %2 %3 %4" ).arg( x ).arg( y ).arg( w ).arg( h ) ); docWriter->addAttributePt( "svg:x", x ); docWriter->addAttributePt( "svg:y", y ); docWriter->addAttributePt( "svg:width", w ); @@ -456,7 +456,7 @@ VPath::loadOasis( const TQDomElement &element, KoOasisLoadingContext &context ) viewbox = element.attributeNS( KoXmlNS::svg, "viewBox", TQString() ); } - else if( element.localName() == "custom-tqshape" ) + else if( element.localName() == "custom-shape" ) { TQDomNodeList list = element.childNodes(); for( uint i = 0; i < list.count(); ++i ) @@ -467,7 +467,7 @@ VPath::loadOasis( const TQDomElement &element, KoOasisLoadingContext &context ) if( e.namespaceURI() != KoXmlNS::draw ) continue; - if( e.localName() == "enhanced-tqgeometry" ) + if( e.localName() == "enhanced-geometry" ) { TQString data = e.attributeNS( KoXmlNS::draw, "enhanced-path", TQString() ); if( ! data.isEmpty() ) @@ -742,12 +742,12 @@ VPath::buildSvgTransform( const TQWMatrix &mat ) const TQString transform; if( !mat.isIdentity() ) { - transform = TQString( "matrix(%1, %2, %3, %4, %5, %6)" ).tqarg( mat.m11() ) - .tqarg( mat.m12() ) - .tqarg( mat.m21() ) - .tqarg( mat.m22() ) - .tqarg( mat.dx() ) - .tqarg( mat.dy() ); + transform = TQString( "matrix(%1, %2, %3, %4, %5, %6)" ).arg( mat.m11() ) + .arg( mat.m12() ) + .arg( mat.m21() ) + .arg( mat.m22() ) + .arg( mat.dx() ) + .arg( mat.dy() ); } return transform; } @@ -764,12 +764,12 @@ VPath::buildOasisTransform( const TQWMatrix &mat ) const TQString transform; if( !mat.isIdentity() ) { - transform = TQString( "matrix(%1, %2, %3, %4, %5pt, %6pt)" ).tqarg( mat.m11() ) - .tqarg( mat.m12() ) - .tqarg( mat.m21() ) - .tqarg( mat.m22() ) - .tqarg( mat.dx() ) - .tqarg( mat.dy() ); + transform = TQString( "matrix(%1, %2, %3, %4, %5pt, %6pt)" ).arg( mat.m11() ) + .arg( mat.m12() ) + .arg( mat.m21() ) + .arg( mat.m22() ) + .arg( mat.dx() ) + .arg( mat.dy() ); } return transform; } diff --git a/karbon/core/vdocument.h b/karbon/core/vdocument.h index 45270d2e..aa35b834 100644 --- a/karbon/core/vdocument.h +++ b/karbon/core/vdocument.h @@ -83,7 +83,7 @@ public: * Draw the document frame to a painting device. * * @param painter abstraction that is used to render to a painting device. - * @param pl tqlayout describing the page to draw on (restricting the painter) + * @param pl layout describing the page to draw on (restricting the painter) * @param drawPageMargins if @c true, also draw the crop marks for the page margins, * otherwise, don't draw them. */ diff --git a/karbon/core/vfill.cc b/karbon/core/vfill.cc index d1cd9d13..dfa4d5df 100644 --- a/karbon/core/vfill.cc +++ b/karbon/core/vfill.cc @@ -83,7 +83,7 @@ VFill::saveOasis( KoGenStyles &mainStyles, KoGenStyle &style ) const style.addProperty( "draw:fill", "solid" ); style.addProperty( "draw:fill-color", TQColor( m_color ).name() ); if( m_color.opacity() < 1 ) - style.addProperty( "draw:opacity", TQString( "%1%" ).tqarg( m_color.opacity() * 100. ) ); + style.addProperty( "draw:opacity", TQString( "%1%" ).arg( m_color.opacity() * 100. ) ); } else if( m_type == grad ) { @@ -91,7 +91,7 @@ VFill::saveOasis( KoGenStyles &mainStyles, KoGenStyle &style ) const TQString grad = m_gradient.saveOasis( mainStyles ); style.addProperty( "draw:fill-gradient-name", grad ); if( m_color.opacity() < 1 ) - style.addProperty( "draw:opacity", TQString( "%1%" ).tqarg( m_color.opacity() * 100. ) ); + style.addProperty( "draw:opacity", TQString( "%1%" ).arg( m_color.opacity() * 100. ) ); } else if( m_type == patt ) style.addProperty( "draw:fill", "hatch" ); diff --git a/karbon/core/vfill.h b/karbon/core/vfill.h index 0e562949..89662198 100644 --- a/karbon/core/vfill.h +++ b/karbon/core/vfill.h @@ -33,10 +33,10 @@ class KoOasisLoadingContext; /** - * Manages the fill of tqshapes. + * Manages the fill of shapes. * * The fill can be solid or gradient. - * Also two fill rules are supported that effect how the tqshape is + * Also two fill rules are supported that effect how the shape is * filled. For explanation see the TQPainter documentation. * * Default is no fill and even-odd filling rule. diff --git a/karbon/core/vgradient.cc b/karbon/core/vgradient.cc index 60d89241..577d1373 100644 --- a/karbon/core/vgradient.cc +++ b/karbon/core/vgradient.cc @@ -208,10 +208,10 @@ VGradient::saveOasis( KoGenStyles &mainStyles ) const for( colorstop = colorStops.first(); colorstop; colorstop = colorStops.next() ) { elementWriter.startElement( "svg:stop" ); - elementWriter.addAttribute( "svg:offset", TQString( "%1" ).tqarg( colorstop->rampPoint ) ); + elementWriter.addAttribute( "svg:offset", TQString( "%1" ).arg( colorstop->rampPoint ) ); elementWriter.addAttribute( "svg:color", TQColor( colorstop->color ).name() ); if( colorstop->color.opacity() < 1 ) - elementWriter.addAttribute( "svg:stop-opacity", TQString( "%1" ).tqarg( colorstop->color.opacity() ) ); + elementWriter.addAttribute( "svg:stop-opacity", TQString( "%1" ).arg( colorstop->color.opacity() ) ); elementWriter.endElement(); } diff --git a/karbon/core/vgroup.cc b/karbon/core/vgroup.cc index 51d991e1..1d18f54f 100644 --- a/karbon/core/vgroup.cc +++ b/karbon/core/vgroup.cc @@ -215,7 +215,7 @@ VGroup::loadOasis( const TQDomElement &element, KoOasisLoadingContext &context ) context.styleStack().save(); - if( e.localName() == "path" || e.localName() == "custom-tqshape" ) + if( e.localName() == "path" || e.localName() == "custom-shape" ) { VPath* composite = new VPath( this ); composite->loadOasis( e, context ); diff --git a/karbon/core/vobject.h b/karbon/core/vobject.h index 899422ee..eccc6180 100644 --- a/karbon/core/vobject.h +++ b/karbon/core/vobject.h @@ -57,7 +57,7 @@ public: hidden_locked = 3, /**< hidden and locked (r/o) */ deleted = 4, /**< deleted, nearly dead */ - // tqshape specific states: + // shape specific states: selected = 5, /**< visible, active and can be manipulated by tools */ edit = 6 /**< visible, active and is currently manipulated by a tool */ }; diff --git a/karbon/core/vpath.cc b/karbon/core/vpath.cc index e5366966..ea05fc76 100644 --- a/karbon/core/vpath.cc +++ b/karbon/core/vpath.cc @@ -716,13 +716,13 @@ VSubpath::saveSvgPath( TQString &d ) const if( segment->prev() ) { d += TQString( "L%1 %2" ). - tqarg( segment->knot().x() ).tqarg( segment->knot().y() ); + arg( segment->knot().x() ).arg( segment->knot().y() ); } // Moveto. else { d += TQString( "M%1 %2" ). - tqarg( segment->knot().x() ).tqarg( segment->knot().y() ); + arg( segment->knot().x() ).arg( segment->knot().y() ); } } // Bezier ( degree >= 3 ). diff --git a/karbon/core/vstroke.cc b/karbon/core/vstroke.cc index 0ec27fb2..d0cea9c7 100644 --- a/karbon/core/vstroke.cc +++ b/karbon/core/vstroke.cc @@ -117,7 +117,7 @@ VStroke::saveOasis( KoGenStyle &style ) const style.addProperty( "svg:stroke-color", TQColor( m_color ).name() ); style.addPropertyPt( "svg:stroke-width", m_lineWidth ); if( m_color.opacity() < 1 ) - style.addProperty( "svg:stroke-opacity", TQString( "%1%" ).tqarg( m_color.opacity() * 100. ) ); + style.addProperty( "svg:stroke-opacity", TQString( "%1%" ).arg( m_color.opacity() * 100. ) ); } else if( m_type == none ) style.addProperty( "draw:stroke", "none" ); diff --git a/karbon/core/vtext.cc b/karbon/core/vtext.cc index c45d91cb..4c7d3989 100644 --- a/karbon/core/vtext.cc +++ b/karbon/core/vtext.cc @@ -128,7 +128,7 @@ VText::VText( VObject* parent, VState state ) m_stroke = new VStroke( this ); m_fill = new VFill(); m_position = (VText::Position)0; - m_tqalignment = (VText::Alignment)0; + m_alignment = (VText::Alignment)0; m_shadow = false; m_translucentShadow = false; m_shadowAngle = 0; @@ -137,8 +137,8 @@ VText::VText( VObject* parent, VState state ) } -VText::VText( const TQFont &font, const VSubpath& basePath, Position position, Alignment tqalignment, const TQString& text ) - : VObject( 0L ), m_font( font ), m_basePath( basePath ), m_position( position ), m_tqalignment( tqalignment ), m_text( text ) +VText::VText( const TQFont &font, const VSubpath& basePath, Position position, Alignment alignment, const TQString& text ) + : VObject( 0L ), m_font( font ), m_basePath( basePath ), m_position( position ), m_alignment( alignment ), m_text( text ) { m_glyphs.setAutoDelete( true ); m_boundingBoxIsInvalid = true; @@ -148,7 +148,7 @@ VText::VText( const TQFont &font, const VSubpath& basePath, Position position, A } VText::VText( const VText& text ) - : VObject( text ), m_font( text.m_font ), m_basePath( text.m_basePath ), m_position( text.m_position ), m_tqalignment( text.m_tqalignment ), m_text( text.m_text ), m_shadow( text.m_shadow ), m_translucentShadow( text.m_translucentShadow ), m_shadowDistance( text.m_shadowDistance ), m_shadowAngle( text.m_shadowAngle ), m_offset( text.m_offset ) + : VObject( text ), m_font( text.m_font ), m_basePath( text.m_basePath ), m_position( text.m_position ), m_alignment( text.m_alignment ), m_text( text.m_text ), m_shadow( text.m_shadow ), m_translucentShadow( text.m_translucentShadow ), m_shadowDistance( text.m_shadowDistance ), m_shadowAngle( text.m_shadowAngle ), m_offset( text.m_offset ) { m_stroke = new VStroke( *text.m_stroke ); m_stroke->setParent( this ); @@ -323,7 +323,7 @@ VText::save( TQDomElement& element ) const me.setAttribute( "italic", m_font.italic() ); me.setAttribute( "bold", m_font.bold() ); me.setAttribute( "position", m_position ); - me.setAttribute( "tqalignment", m_tqalignment ); + me.setAttribute( "alignment", m_alignment ); me.setAttribute( "shadow", m_shadow ); me.setAttribute( "translucentshadow", m_translucentShadow ); me.setAttribute( "shadowangle", m_shadowAngle ); @@ -349,7 +349,7 @@ VText::load( const TQDomElement& element ) m_font.setWeight( TQFont::Normal ); m_font.setBold( element.attribute( "bold" ).toInt() == 1 ); m_position = (Position)element.attribute( "position", "0" ).toInt(); - m_tqalignment = (Alignment)element.attribute( "tqalignment", "0" ).toInt(); + m_alignment = (Alignment)element.attribute( "alignment", "0" ).toInt(); m_shadow = ( element.attribute( "shadow" ).toInt() == 1 ); m_translucentShadow = ( element.attribute( "translucentshadow" ).toInt() == 1 ); m_shadowAngle = element.attribute( "shadowangle" ).toInt(); @@ -473,7 +473,7 @@ VText::traceText() bool foundCharmap = false; - // Try to choose tqunicode charmap + // Try to choose unicode charmap for( int charmap = 0; charmap < fontFace->num_charmaps; charmap++ ) { if( fontFace->charmaps[charmap]->encoding == ft_encoding_unicode ) @@ -481,14 +481,14 @@ VText::traceText() FT_Error error = FT_Set_Charmap( fontFace, fontFace->charmaps[charmap] ); if( error ) { - kdDebug(38000) << "traceText(), unable to select tqunicode charmap." << endl; + kdDebug(38000) << "traceText(), unable to select unicode charmap." << endl; continue; } foundCharmap = true; } } - // Choose first charmap if no tqunicode charmap was found + // Choose first charmap if no unicode charmap was found if( ! foundCharmap ) { error = FT_Set_Charmap( fontFace, fontFace->charmaps[0] ); @@ -518,7 +518,7 @@ VText::traceText() { // get the glyph index for the current character TQChar character = m_text.at( i ); - glyphIndex = FT_Get_Char_Index( fontFace, character.tqunicode() ); + glyphIndex = FT_Get_Char_Index( fontFace, character.unicode() ); if( ! glyphIndex ) { kdDebug(38000) << "traceText(), unable get index of char : " << character << endl; @@ -575,7 +575,7 @@ VText::traceText() kdDebug(38000) << "traceText(), using offset : " << m_offset << endl; float x = m_offset * pathLength; - switch( m_tqalignment ) + switch( m_alignment ) { case Left: x += 0; break; case Center: x -= 0.5 * l; break; diff --git a/karbon/core/vtext.h b/karbon/core/vtext.h index ef40ac28..234332df 100644 --- a/karbon/core/vtext.h +++ b/karbon/core/vtext.h @@ -57,7 +57,7 @@ public: }; VText( VObject* parent, VState state = normal ); - VText( const TQFont &font, const VSubpath& basePath, Position position, Alignment tqalignment, const TQString& text ); + VText( const TQFont &font, const VSubpath& basePath, Position position, Alignment alignment, const TQString& text ); VText( const VText& text ); virtual ~VText(); virtual DCOPObject* dcopObject(); @@ -70,8 +70,8 @@ public: virtual VSubpath& basePath() { return m_basePath; } virtual void setPosition( Position position ) { m_position = position; } virtual Position position() { return m_position; } - virtual void tqsetAlignment( Alignment tqalignment ) { m_tqalignment = tqalignment; } - virtual Alignment tqalignment() { return m_tqalignment; } + virtual void setAlignment( Alignment alignment ) { m_alignment = alignment; } + virtual Alignment alignment() { return m_alignment; } virtual void setUseShadow( bool state ) { m_shadow = state; } virtual bool useShadow() { return m_shadow; } virtual void setShadow( int angle, int distance, bool translucent ) @@ -118,8 +118,8 @@ private: VSubpath m_basePath; // The text position Position m_position; - // The text tqalignment - Alignment m_tqalignment; + // The text alignment + Alignment m_alignment; // The text to draw TQString m_text; // Shadow parameters diff --git a/karbon/dialogs/vcolortab.cc b/karbon/dialogs/vcolortab.cc index 56fecc0b..e6e30667 100644 --- a/karbon/dialogs/vcolortab.cc +++ b/karbon/dialogs/vcolortab.cc @@ -20,7 +20,7 @@ #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <kcolordialog.h> #include <klocale.h> diff --git a/karbon/dialogs/vconfiguredlg.cc b/karbon/dialogs/vconfiguredlg.cc index 141006dc..19e3ef90 100644 --- a/karbon/dialogs/vconfiguredlg.cc +++ b/karbon/dialogs/vconfiguredlg.cc @@ -22,7 +22,7 @@ #include <tqcheckbox.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <tqvgroupbox.h> #include <tqcombobox.h> @@ -218,10 +218,10 @@ VConfigMiscPage::VConfigMiscPage( KarbonView* view, TQVBox* box, char* name ) KoUnit::Unit unit = view->part()->unit(); TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Misc" ), box, "GroupBox" ); - tmpTQGroupBox->tqlayout()->setSpacing(KDialog::spacingHint()); - tmpTQGroupBox->tqlayout()->setMargin(KDialog::marginHint()); + tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint()); + tmpTQGroupBox->layout()->setMargin(KDialog::marginHint()); - TQGridLayout* grid = new TQGridLayout(tmpTQGroupBox->tqlayout(), 4, 2 ); + TQGridLayout* grid = new TQGridLayout(tmpTQGroupBox->layout(), 4, 2 ); m_oldUndoRedo = 30; diff --git a/karbon/dialogs/vstrokedlg.cc b/karbon/dialogs/vstrokedlg.cc index 2428de11..56df7227 100644 --- a/karbon/dialogs/vstrokedlg.cc +++ b/karbon/dialogs/vstrokedlg.cc @@ -20,7 +20,7 @@ #include <tqcombobox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtabwidget.h> #include <tqradiobutton.h> #include <tqvbuttongroup.h> diff --git a/karbon/dockers/vcolordocker.cc b/karbon/dockers/vcolordocker.cc index c6453575..9579303e 100644 --- a/karbon/dockers/vcolordocker.cc +++ b/karbon/dockers/vcolordocker.cc @@ -19,7 +19,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtabwidget.h> #include <tqwidget.h> #include <tqcolor.h> diff --git a/karbon/dockers/vdocumentdocker.cc b/karbon/dockers/vdocumentdocker.cc index 98b0b883..bdb7ad44 100644 --- a/karbon/dockers/vdocumentdocker.cc +++ b/karbon/dockers/vdocumentdocker.cc @@ -19,7 +19,7 @@ #include <tqhbuttongroup.h> #include <tqinputdialog.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqlistview.h> #include <tqptrvector.h> @@ -206,12 +206,12 @@ VDocumentPreview::paintEvent( TQPaintEvent* ) } TQPainter pw( &pixmap ); - pw.setPen( tqcolorGroup().light() ); + pw.setPen( colorGroup().light() ); pw.drawLine( 1, 1, 1, height() - 2 ); pw.drawLine( 1, 1, width() - 2, 1 ); pw.drawLine( width() - 1, height() - 1, 0, height() - 1 ); pw.drawLine( width() - 1, height() - 1, width() - 1, 0 ); - pw.setPen( tqcolorGroup().dark() ); + pw.setPen( colorGroup().dark() ); pw.drawLine( 0, 0, width() - 1, 0 ); pw.drawLine( 0, 0, 0, height() - 1 ); pw.drawLine( width() - 2, height() - 2, width() - 2, 1 ); @@ -224,33 +224,33 @@ VDocumentTab::VDocumentTab( KarbonView* view, TQWidget* parent ) : TQWidget( parent, "DocumentTab" ), m_view( view ) { TQFrame* frame; - TQGridLayout* tqlayout = new TQGridLayout( this ); - tqlayout->setMargin( 3 ); - tqlayout->setSpacing( 2 ); - tqlayout->addMultiCellWidget( m_documentPreview = new VDocumentPreview( m_view, this ), 0, 7, 2, 2 ); - tqlayout->addWidget( new TQLabel( i18n( "document width", "Width:" ), this ), 0, 0 ); - tqlayout->addWidget( new TQLabel( i18n( "Height:" ), this ), 1, 0 ); - tqlayout->addMultiCellWidget( frame = new TQFrame( this ), 2, 2, 0, 1 ); + TQGridLayout* layout = new TQGridLayout( this ); + layout->setMargin( 3 ); + layout->setSpacing( 2 ); + layout->addMultiCellWidget( m_documentPreview = new VDocumentPreview( m_view, this ), 0, 7, 2, 2 ); + layout->addWidget( new TQLabel( i18n( "document width", "Width:" ), this ), 0, 0 ); + layout->addWidget( new TQLabel( i18n( "Height:" ), this ), 1, 0 ); + layout->addMultiCellWidget( frame = new TQFrame( this ), 2, 2, 0, 1 ); frame->setFrameShape( TQFrame::HLine ); - tqlayout->addWidget( new TQLabel( i18n( "Layers:" ), this ), 3, 0 ); - tqlayout->addWidget( new TQLabel( i18n( "Format:" ), this ), 4, 0 ); - tqlayout->addMultiCellWidget( frame = new TQFrame( this ), 5, 5, 0, 1 ); + layout->addWidget( new TQLabel( i18n( "Layers:" ), this ), 3, 0 ); + layout->addWidget( new TQLabel( i18n( "Format:" ), this ), 4, 0 ); + layout->addMultiCellWidget( frame = new TQFrame( this ), 5, 5, 0, 1 ); frame->setFrameShape( TQFrame::HLine ); - //tqlayout->addMultiCellWidget( new TQLabel( i18n( "Zoom factor:" ), this ), 6, 6, 0, 1 ); - tqlayout->addWidget( m_width = new TQLabel( this ), 0, 1 ); - tqlayout->addWidget( m_height = new TQLabel( this ), 1, 1 ); - tqlayout->addWidget( m_layers = new TQLabel( this ), 3, 1 ); - tqlayout->addWidget( m_format = new TQLabel( this ), 4, 1 ); - tqlayout->setRowStretch( 7, 1 ); - tqlayout->setColStretch( 0, 0 ); - tqlayout->setColStretch( 1, 0 ); - tqlayout->setColStretch( 2, 2 ); - //tqlayout->addWidget( - - m_width->tqsetAlignment( AlignRight ); - m_height->tqsetAlignment( AlignRight ); - m_layers->tqsetAlignment( AlignRight ); - m_format->tqsetAlignment( AlignRight ); + //layout->addMultiCellWidget( new TQLabel( i18n( "Zoom factor:" ), this ), 6, 6, 0, 1 ); + layout->addWidget( m_width = new TQLabel( this ), 0, 1 ); + layout->addWidget( m_height = new TQLabel( this ), 1, 1 ); + layout->addWidget( m_layers = new TQLabel( this ), 3, 1 ); + layout->addWidget( m_format = new TQLabel( this ), 4, 1 ); + layout->setRowStretch( 7, 1 ); + layout->setColStretch( 0, 0 ); + layout->setColStretch( 1, 0 ); + layout->setColStretch( 2, 2 ); + //layout->addWidget( + + m_width->setAlignment( AlignRight ); + m_height->setAlignment( AlignRight ); + m_layers->setAlignment( AlignRight ); + m_format->setAlignment( AlignRight ); connect( view->part()->commandHistory(), TQT_SIGNAL( commandAdded( VCommand* ) ), this, TQT_SLOT( slotCommandAdded( VCommand* ) ) ); connect( view->part()->commandHistory(), TQT_SIGNAL( commandExecuted() ), this, TQT_SLOT( slotCommandExecuted() ) ); @@ -320,7 +320,7 @@ VObjectListViewItem::~VObjectListViewItem() TQString VObjectListViewItem::key( int, bool ) const { - return TQString( "%1" ).tqarg( m_key ); + return TQString( "%1" ).arg( m_key ); } void @@ -329,7 +329,7 @@ VObjectListViewItem::update() // text description VSelectionDescription selectionDesc; selectionDesc.visit( *m_object ); - setText( 0, TQString( "%1" ).tqarg( selectionDesc.shortDescription() ) ); + setText( 0, TQString( "%1" ).arg( selectionDesc.shortDescription() ) ); // draw thumb preview (16x16) TQPixmap preview; @@ -438,7 +438,7 @@ VLayerListViewItem::pos() TQString VLayerListViewItem::key( int, bool ) const { - return TQString( "%1" ).tqarg( m_key ); + return TQString( "%1" ).arg( m_key ); } int @@ -454,8 +454,8 @@ VLayersTab::VLayersTab( KarbonView* view, TQWidget* parent ) { TQToolButton* button; - TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 1 ); - tqlayout->addWidget( m_layersListView = new TQListView( this ), 1 ); + TQVBoxLayout* layout = new TQVBoxLayout( this, 1 ); + layout->addWidget( m_layersListView = new TQListView( this ), 1 ); m_buttonGroup = new TQHButtonGroup( this ); m_buttonGroup->setInsideMargin( 3 ); button = new TQToolButton( m_buttonGroup ); @@ -474,9 +474,9 @@ VLayersTab::VLayersTab( KarbonView* view, TQWidget* parent ) button->setIconSet( SmallIcon( "14_layer_deletelayer" ) ); button->setTextLabel( i18n( "Delete" ) ); m_buttonGroup->insert( button ); - tqlayout->addWidget( m_buttonGroup, 0); - tqlayout->setSpacing( 0 ); - tqlayout->setMargin( 3 ); + layout->addWidget( m_buttonGroup, 0); + layout->setSpacing( 0 ); + layout->setMargin( 3 ); m_layersListView->setAllColumnsShowFocus( true ); m_layersListView->addColumn( i18n( "Item" ), 120 ); @@ -497,7 +497,7 @@ VLayersTab::VLayersTab( KarbonView* view, TQWidget* parent ) connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotButtonClicked( int ) ) ); connect( view->part()->commandHistory(), TQT_SIGNAL( commandExecuted( VCommand*) ), this, TQT_SLOT( slotCommandExecuted( VCommand* ) ) ); - tqlayout->activate(); + layout->activate(); updateLayers(); } // VLayersTab::VLayersTab @@ -531,7 +531,7 @@ VLayersTab::resetSelection() for(; it.current(); ++it ) { it.current()->setSelected( false ); - it.current()->tqrepaint(); + it.current()->repaint(); } } @@ -556,14 +556,14 @@ VLayersTab::selectActiveLayer() for(; it.current(); ++it ) { it.current()->setSelected( false ); - it.current()->tqrepaint(); + it.current()->repaint(); } VLayerListViewItem *layerItem = m_layers[ m_document->activeLayer() ]; if( layerItem ) { layerItem->setSelected( true ); - layerItem->tqrepaint(); + layerItem->repaint(); kdDebug(38000) << "selecting active layer: " << layerItem->text() << endl; } } @@ -620,7 +620,7 @@ VLayersTab::updateChildItems( TQListViewItem *item ) updateChildItems( objectItem ); objectItem->update(); - objectItem->tqrepaint(); + objectItem->repaint(); } } @@ -676,7 +676,7 @@ VLayersTab::itemClicked( TQListViewItem* item, const TQPoint &, int col ) toggleState( layerItem->layer(), col ); layerItem->update(); - layerItem->tqrepaint(); + layerItem->repaint(); updateChildItems( layerItem ); @@ -703,7 +703,7 @@ VLayersTab::itemClicked( TQListViewItem* item, const TQPoint &, int col ) objectItem->setSelected( false ); objectItem->update(); - objectItem->tqrepaint(); + objectItem->repaint(); if( dynamic_cast<VGroup*>( objectItem->object() ) ) updateChildItems( objectItem ); @@ -740,7 +740,7 @@ VLayersTab::selectionChangedFromList() && (state != VObject::hidden_locked) ) { m_document->selection()->append( objectItem->object() ); - objectItem->tqrepaint(); + objectItem->repaint(); } } @@ -1203,16 +1203,16 @@ VHistoryItem::paintFocus( TQPainter*, const TQColorGroup&, const TQRect& ) VHistoryTab::VHistoryTab( KarbonPart* part, TQWidget* parent ) : TQWidget( parent ), m_part( part ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->setMargin( 3 ); - tqlayout->setSpacing( 2 ); - tqlayout->add( m_history = new TQListView( this ) ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->setMargin( 3 ); + layout->setSpacing( 2 ); + layout->add( m_history = new TQListView( this ) ); m_history->setVScrollBarMode( TQListView::AlwaysOn ); m_history->setSelectionMode( TQListView::NoSelection ); m_history->addColumn( i18n( "Commands" ) ); m_history->setResizeMode( TQListView::AllColumns ); m_history->setRootIsDecorated( true ); - tqlayout->add( m_groupCommands = new TQCheckBox( i18n( "Group commands" ), this ) ); + layout->add( m_groupCommands = new TQCheckBox( i18n( "Group commands" ), this ) ); m_history->setSorting( 0, true ); VHistoryGroupItem* group = 0; diff --git a/karbon/dockers/vstrokedocker.cc b/karbon/dockers/vstrokedocker.cc index f30b3042..4fa0b94b 100644 --- a/karbon/dockers/vstrokedocker.cc +++ b/karbon/dockers/vstrokedocker.cc @@ -20,7 +20,7 @@ #include <tqhbuttongroup.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqwidget.h> #include <tqtooltip.h> diff --git a/karbon/dockers/vstyledocker.cc b/karbon/dockers/vstyledocker.cc index 5b7633b1..79021604 100644 --- a/karbon/dockers/vstyledocker.cc +++ b/karbon/dockers/vstyledocker.cc @@ -19,7 +19,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtabwidget.h> #include <tqsize.h> #include <tqhbuttongroup.h> @@ -128,9 +128,9 @@ ClipartWidget::ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonP { KIconLoader il; - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( m_clipartChooser = new ClipartChooser( TQSize( 32, 32 ), this ) ); - tqlayout->addWidget( m_buttonGroup = new TQHButtonGroup( this ) ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->addWidget( m_clipartChooser = new ClipartChooser( TQSize( 32, 32 ), this ) ); + layout->addWidget( m_buttonGroup = new TQHButtonGroup( this ) ); TQToolButton* m_addClipartButton; m_buttonGroup->insert( m_addClipartButton = new TQToolButton( m_buttonGroup ) ); m_buttonGroup->insert( m_importClipartButton = new TQToolButton( m_buttonGroup ) ); @@ -145,7 +145,7 @@ ClipartWidget::ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonP m_buttonGroup->setInsideMargin( 3 ); //setFrameStyle( Box | Sunken ); - tqlayout->setMargin( 3 ); + layout->setMargin( 3 ); connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotButtonClicked( int ) ) ); //connect( m_deleteClipartButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteClipart() ) ); @@ -263,7 +263,7 @@ ClipartWidget::importClipart() else { KoFilterManager man( m_part ); - KoFilter::ConversiontqStatus status; + KoFilter::ConversionStatus status; TQString importedFile = man.import( fname, status ); if( status == KoFilter::OK ) m_part->mergeNativeFormat( importedFile ); diff --git a/karbon/dockers/vtransformdocker.cc b/karbon/dockers/vtransformdocker.cc index 7e93577b..5f079afd 100644 --- a/karbon/dockers/vtransformdocker.cc +++ b/karbon/dockers/vtransformdocker.cc @@ -19,7 +19,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwidget.h> #include <tqwmatrix.h> #include <tqtooltip.h> diff --git a/karbon/karbon_drag.cpp b/karbon/karbon_drag.cpp index 3c60e94d..88ce476e 100644 --- a/karbon/karbon_drag.cpp +++ b/karbon/karbon_drag.cpp @@ -21,7 +21,7 @@ #include <tqcstring.h> #include <tqdom.h> -#include <tqtextstream.h> +#include <textstream.h> #include "vdocument.h" @@ -46,7 +46,7 @@ KarbonDrag::format( int i ) const } TQByteArray -KarbonDrag::tqencodedData( const char* mimetype ) const +KarbonDrag::encodedData( const char* mimetype ) const { TQCString result; @@ -85,7 +85,7 @@ KarbonDrag::decode( TQMimeSource* e, VObjectList& sl, VDocument& vdoc ) if( e->provides( m_decodeFormats[0] ) ) { TQDomDocument doc( "clip" ); - TQByteArray data = e->tqencodedData( m_decodeFormats[0] ); + TQByteArray data = e->encodedData( m_decodeFormats[0] ); doc.setContent( TQCString( data, data.size()+1 ) ); TQDomElement clip = doc.documentElement(); // Try to parse the clipboard data diff --git a/karbon/karbon_drag.h b/karbon/karbon_drag.h index 0fb80119..f514b55d 100644 --- a/karbon/karbon_drag.h +++ b/karbon/karbon_drag.h @@ -36,7 +36,7 @@ class KarbonDrag : public TQDragObject public: KarbonDrag( TQWidget* dragSource = 0, const char* name = 0 ); const char* format( int i ) const; - TQByteArray tqencodedData( const char* mimetype ) const; + TQByteArray encodedData( const char* mimetype ) const; static bool canDecode( TQMimeSource * ); static bool decode( TQMimeSource* e, VObjectList& sl, VDocument& vdoc ); void setObjectList( VObjectList l ); diff --git a/karbon/karbon_factory.cc b/karbon/karbon_factory.cc index 1d267e1b..90c8c29a 100644 --- a/karbon/karbon_factory.cc +++ b/karbon/karbon_factory.cc @@ -49,8 +49,8 @@ KarbonFactory::KarbonFactory( TQObject* parent, const char* name ) KarbonToolRegistry::instance(); // Load plugins - KTrader::OfferList offers = KTrader::self() -> query(TQString::tqfromLatin1("Karbon/CoreModule"), - TQString::tqfromLatin1("Type == 'Service'")); + KTrader::OfferList offers = KTrader::self() -> query(TQString::fromLatin1("Karbon/CoreModule"), + TQString::fromLatin1("Type == 'Service'")); KTrader::OfferList::ConstIterator iter; diff --git a/karbon/karbon_part.cc b/karbon/karbon_part.cc index 64dafd6a..955b21f5 100644 --- a/karbon/karbon_part.cc +++ b/karbon/karbon_part.cc @@ -109,9 +109,9 @@ DCOPObject* KarbonPart::dcopObject() } void -KarbonPart::setPageLayout( KoPageLayout& tqlayout, KoUnit::Unit _unit ) +KarbonPart::setPageLayout( KoPageLayout& layout, KoUnit::Unit _unit ) { - m_pageLayout = tqlayout; + m_pageLayout = layout; m_doc.setUnit( _unit ); m_doc.setWidth( m_pageLayout.ptWidth ); m_doc.setHeight( m_pageLayout.ptHeight ); @@ -308,7 +308,7 @@ KarbonPart::loadOasis( const TQDomDocument &doc, KoOasisStyles &styles, const TQ return false; } - TQString masterPageName = "Standard"; // use default tqlayout as fallback + TQString masterPageName = "Standard"; // use default layout as fallback TQDomElement *master = styles.masterPages()[ masterPageName ]; if ( !master ) //last test... master = styles.masterPages()[ "Default" ]; @@ -319,7 +319,7 @@ KarbonPart::loadOasis( const TQDomDocument &doc, KoOasisStyles &styles, const TQ master = it.current(); } Q_ASSERT( master ); - const TQDomElement *style = master ? styles.findStyle( master->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() ) ) : 0; + const TQDomElement *style = master ? styles.findStyle( master->attributeNS( KoXmlNS::style, "page-layout-name", TQString() ) ) : 0; if( style ) { m_pageLayout.loadOasis( *style ); @@ -371,7 +371,7 @@ KarbonPart::saveOasis( KoStore *store, KoXmlWriter *manifestWriter ) KoGenStyle pageLayout = m_pageLayout.saveOasis(); TQString layoutName = mainStyles.lookup( pageLayout, "PL" ); KoGenStyle masterPage( KoGenStyle::STYLE_MASTER ); - masterPage.addAttribute( "style:page-tqlayout-name", layoutName ); + masterPage.addAttribute( "style:page-layout-name", layoutName ); mainStyles.lookup( masterPage, "Default", KoGenStyles::DontForceNumbering ); KTempFile contentTmpFile; @@ -435,7 +435,7 @@ KarbonPart::saveOasis( KoStore *store, KoXmlWriter *manifestWriter ) it = styleList.begin(); for( ; it != styleList.end(); ++it ) - (*it).style->writeStyle( styleWriter, mainStyles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties" ); + (*it).style->writeStyle( styleWriter, mainStyles, "style:page-layout", (*it).name, "style:page-layout-properties" ); styleWriter->endElement(); // office:automatic-styles @@ -495,19 +495,19 @@ KarbonPart::saveOasisSettings( KoXmlWriter &/*settingsWriter*/ ) void KarbonPart::insertObject( VObject* object ) { - // don't tqrepaint here explicitly. some commands might want to insert many + // don't repaint here explicitly. some commands might want to insert many // objects. m_doc.append( object ); setModified( true ); } void -KarbonPart::addCommand( VCommand* cmd, bool tqrepaint ) +KarbonPart::addCommand( VCommand* cmd, bool repaint ) { m_commandHistory->addCommand( cmd ); setModified( true ); - if( tqrepaint ) + if( repaint ) repaintAllViews(); } @@ -530,12 +530,12 @@ KarbonPart::clearHistory() } void -KarbonPart::repaintAllViews( bool tqrepaint ) +KarbonPart::repaintAllViews( bool repaint ) { TQPtrListIterator<KoView> itr( views() ); for( ; itr.current() ; ++itr ) - static_cast<KarbonView*>( itr.current() )->canvasWidget()->repaintAll( tqrepaint ); + static_cast<KarbonView*>( itr.current() )->canvasWidget()->repaintAll( repaint ); } void @@ -561,19 +561,19 @@ KarbonPart::paintContent( TQPainter& painter, const TQRect& rect, painter.eraseRect( rect ); VPainterFactory *painterFactory = new VPainterFactory; //TQPaintDeviceMetrics metrics( painter.device() ); - painterFactory->setPainter( painter.tqdevice(), rect.width(), rect.height() ); + painterFactory->setPainter( painter.device(), rect.width(), rect.height() ); VPainter *p = painterFactory->painter(); //VPainter *p = new VKoPainter( painter.device() ); p->begin(); p->setZoomFactor( zoomFactor ); - kdDebug(38000) << "painter.tqworldMatrix().dx() : " << painter.tqworldMatrix().dx() << endl; - kdDebug(38000) << "painter.tqworldMatrix().dy() : " << painter.tqworldMatrix().dy() << endl; + kdDebug(38000) << "painter.worldMatrix().dx() : " << painter.worldMatrix().dx() << endl; + kdDebug(38000) << "painter.worldMatrix().dy() : " << painter.worldMatrix().dy() << endl; kdDebug(38000) << "rect.x() : "<< rect.x() << endl; kdDebug(38000) << "rect.y() : "<< rect.y() << endl; kdDebug(38000) << "rect.width() : "<< rect.width() << endl; kdDebug(38000) << "rect.height() : "<< rect.height() << endl; r = document().boundingBox(); - TQWMatrix mat = painter.tqworldMatrix(); + TQWMatrix mat = painter.worldMatrix(); mat.scale( 1, -1 ); mat.translate( 0, -r.height() * zoomFactor ); p->setWorldMatrix( mat ); diff --git a/karbon/karbon_part.h b/karbon/karbon_part.h index 34e0e04b..9c9ae91a 100644 --- a/karbon/karbon_part.h +++ b/karbon/karbon_part.h @@ -73,7 +73,7 @@ public: void insertObject( VObject* object ); /// insert a command into the undo/redo-history: - void addCommand( VCommand* cmd, bool tqrepaint = false ); + void addCommand( VCommand* cmd, bool repaint = false ); // access static document: VDocument& document() { return m_doc; } @@ -102,13 +102,13 @@ public: void initConfig(); unsigned int maxRecentFiles() const { return m_maxRecentFiles; } - void setPageLayout( KoPageLayout& tqlayout, KoUnit::Unit _unit ); + void setPageLayout( KoPageLayout& layout, KoUnit::Unit _unit ); bool mergeNativeFormat( const TQString & file ); public slots: - /// tqrepaint all views attached to this koDocument - void repaintAllViews( bool tqrepaint = true ); + /// repaint all views attached to this koDocument + void repaintAllViews( bool repaint = true ); void repaintAllViews( const KoRect& ); void slotDocumentRestored(); void slotCommandExecuted( VCommand * ); diff --git a/karbon/karbon_part_iface.cc b/karbon/karbon_part_iface.cc index d90c506e..3c7f30ac 100644 --- a/karbon/karbon_part_iface.cc +++ b/karbon/karbon_part_iface.cc @@ -81,14 +81,14 @@ TQString KarbonPartIface::widthInUnits() { TQString val = KoUnit::toUserStringValue( m_part->document().width(), m_part->unit() ); - return TQString( "%1%2" ).tqarg( val ).tqarg( m_part->unitName() ); + return TQString( "%1%2" ).arg( val ).arg( m_part->unitName() ); } TQString KarbonPartIface::heightInUnits() { TQString val = KoUnit::toUserStringValue( m_part->document().height(), m_part->unit() ); - return TQString( "%1%2" ).tqarg( val ).tqarg( m_part->unitName() ); + return TQString( "%1%2" ).arg( val ).arg( m_part->unitName() ); } double diff --git a/karbon/karbon_view.cc b/karbon/karbon_view.cc index 33340690..f76dd156 100644 --- a/karbon/karbon_view.cc +++ b/karbon/karbon_view.cc @@ -22,7 +22,7 @@ #include <tqdragobject.h> #include <tqiconset.h> #include <tqapplication.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqpopupmenu.h> #include <tqpaintdevicemetrics.h> #include <tqpainter.h> @@ -119,20 +119,20 @@ KarbonView::KarbonView( KarbonPart* p, TQWidget* parent, const char* name ) setClientBuilder( this ); if( !p->isReadWrite() ) - setXMLFile( TQString::tqfromLatin1( "karbon_readonly.rc" ) ); + setXMLFile( TQString::fromLatin1( "karbon_readonly.rc" ) ); else - setXMLFile( TQString::tqfromLatin1( "karbon.rc" ) ); + setXMLFile( TQString::fromLatin1( "karbon.rc" ) ); m_dcop = 0L; dcopObject(); // build it // set up status bar message m_status = new KStatusBarLabel( TQString(), 0, statusBar() ); - m_status->tqsetAlignment( AlignLeft | AlignVCenter ); + m_status->setAlignment( AlignLeft | AlignVCenter ); m_status->setMinimumWidth( 300 ); addStatusBarItem( m_status, 1 ); m_cursorCoords = new KStatusBarLabel( TQString(), 0, statusBar() ); - m_cursorCoords->tqsetAlignment( AlignLeft | AlignVCenter ); + m_cursorCoords->setAlignment( AlignLeft | AlignVCenter ); m_cursorCoords->setMinimumWidth( 50 ); addStatusBarItem( m_cursorCoords, 0 ); m_smallPreview = new VSmallPreview( this, name ); @@ -462,7 +462,7 @@ KarbonView::fileImportGraphic() else { KoFilterManager man( part() ); - KoFilter::ConversiontqStatus status; + KoFilter::ConversionStatus status; TQString importedFile = man.import( fname, status ); part()->mergeNativeFormat( importedFile ); if( !importedFile.isEmpty() ) @@ -494,7 +494,7 @@ KarbonView::addSelectionToClipboard() const KarbonDrag* kd = new KarbonDrag(); kd->setObjectList( part()->document().selection()->objects() ); - TQApplication::tqclipboard()->setData( kd ); + TQApplication::clipboard()->setData( kd ); } void @@ -503,7 +503,7 @@ KarbonView::editPaste() KarbonDrag kd; VObjectList objects; - if( !kd.decode( TQApplication::tqclipboard()->data(), objects, part()->document() ) ) + if( !kd.decode( TQApplication::clipboard()->data(), objects, part()->document() ) ) return; // Paste with a small offset. @@ -769,7 +769,7 @@ KarbonView::viewModeChanged() void KarbonView::setZoomAt( double zoom, const KoPoint &p ) { - TQString zoomText = TQString( "%1%" ).tqarg( zoom * 100.0, 0, 'f', 2 ); + TQString zoomText = TQString( "%1%" ).arg( zoom * 100.0, 0, 'f', 2 ); TQStringList stl = m_zoomAction->items(); if( stl.first() == "25%" ) { @@ -1171,7 +1171,7 @@ KarbonView::mouseEvent( TQMouseEvent* event, const KoPoint &p ) xy.setX(KoUnit::toUserValue(xy.x(), part()->unit())); xy.setY(KoUnit::toUserValue(xy.y(), part()->unit())); - m_cursorCoords->setText( TQString( "%1, %2" ).tqarg(KGlobal::_locale->formatNumber(xy.x(), 2)).tqarg(KGlobal::_locale->formatNumber(xy.y(), 2)) ); + m_cursorCoords->setText( TQString( "%1, %2" ).arg(KGlobal::_locale->formatNumber(xy.x(), 2)).arg(KGlobal::_locale->formatNumber(xy.y(), 2)) ); if( toolController() ) return toolController()->mouseEvent( event, p ); @@ -1310,11 +1310,11 @@ void KarbonView::pageLayout() { KoHeadFoot hf; - KoPageLayout tqlayout = part()->pageLayout(); + KoPageLayout layout = part()->pageLayout(); KoUnit::Unit unit = part()->unit(); - if( KoPageLayoutDia::pageLayout( tqlayout, hf, FORMAT_AND_BORDERS | DISABLE_UNIT, unit ) ) + if( KoPageLayoutDia::pageLayout( layout, hf, FORMAT_AND_BORDERS | DISABLE_UNIT, unit ) ) { - part()->setPageLayout( tqlayout, unit ); + part()->setPageLayout( layout, unit ); m_horizRuler->setUnit( unit ); m_vertRuler->setUnit( unit ); m_canvas->resizeContents( int( ( part()->pageLayout().ptWidth + 300 ) * zoom() ), @@ -1444,9 +1444,9 @@ KarbonView::repaintAll( const KoRect &r ) } void -KarbonView::repaintAll( bool tqrepaint ) +KarbonView::repaintAll( bool repaint ) { - m_canvas->repaintAll( tqrepaint ); + m_canvas->repaintAll( repaint ); } void KarbonView::setPos( const KoPoint& p ) diff --git a/karbon/karbon_view.h b/karbon/karbon_view.h index 13afd9f1..ac3dc8dd 100644 --- a/karbon/karbon_view.h +++ b/karbon/karbon_view.h @@ -274,7 +274,7 @@ private: // dcop DCOPObject *m_dcop; - //tqStatus Bar + //Status Bar TQLabel *m_status; // Ordinary status TQLabel *m_cursorCoords; // Cursor coordinates VSmallPreview *m_smallPreview; // Stroke and Fill diff --git a/karbon/karbon_view_iface.cc b/karbon/karbon_view_iface.cc index 5d919f8f..3fdf1778 100644 --- a/karbon/karbon_view_iface.cc +++ b/karbon/karbon_view_iface.cc @@ -143,7 +143,7 @@ void KarbonViewIface::pathWhirlPinch() //m_view->pathWhirlPinch(); } -void KarbonViewIface::tqrepaint() +void KarbonViewIface::repaint() { m_view->canvasWidget()->repaintAll(); } diff --git a/karbon/karbon_view_iface.h b/karbon/karbon_view_iface.h index fcd4cf55..59756746 100644 --- a/karbon/karbon_view_iface.h +++ b/karbon/karbon_view_iface.h @@ -61,7 +61,7 @@ k_dcop: void pathRoundCorners(); void pathWhirlPinch(); - void tqrepaint(); + void repaint(); private: KarbonView* m_view; diff --git a/karbon/plugins/shadoweffect/shadoweffectplugin.cc b/karbon/plugins/shadoweffect/shadoweffectplugin.cc index dea09571..fc6da1da 100644 --- a/karbon/plugins/shadoweffect/shadoweffectplugin.cc +++ b/karbon/plugins/shadoweffect/shadoweffectplugin.cc @@ -142,7 +142,7 @@ VCreateShadowCmd::execute() bool successful = false; - // Create new tqshapes if they don't exist yet. + // Create new shapes if they don't exist yet. if( !m_newObjects ) { m_newObjects = new VSelection(); @@ -169,11 +169,11 @@ VCreateShadowCmd::execute() if(newObject) { - // Insert new tqshape right before old tqshape. + // Insert new shape right before old shape. itr.current()->parent()->insertInfrontOf( newObject, itr.current() ); - // Add new tqshape to list of new objects. + // Add new shape to list of new objects. m_newObjects->append( newObject ); } } diff --git a/karbon/plugins/shadoweffect/vshadowdecorator.cc b/karbon/plugins/shadoweffect/vshadowdecorator.cc index b3c00bdd..99ee8c8c 100644 --- a/karbon/plugins/shadoweffect/vshadowdecorator.cc +++ b/karbon/plugins/shadoweffect/vshadowdecorator.cc @@ -69,7 +69,7 @@ VShadowDecorator::draw( VPainter* painter, const KoRect* rect ) const if( m_object->fill()->type() != VFill::none ) m_object->fill()->setColor( black ); m_object->stroke()->setColor( black ); - TQWMatrix mat = painter->tqworldMatrix(); + TQWMatrix mat = painter->worldMatrix(); painter->setWorldMatrix( mat.translate( shadowDx * painter->zoomFactor(), -shadowDy * painter->zoomFactor()) ); m_object->draw( painter, rect ); m_object->setFill( *fill ); diff --git a/karbon/render/art_rgb.c b/karbon/render/art_rgb.c index 6dd84bde..4d30fad4 100644 --- a/karbon/render/art_rgb.c +++ b/karbon/render/art_rgb.c @@ -30,10 +30,10 @@ /* This is really slow. Is there any way we might speed it up? Two ideas: - First, maybe we should be working at 32-bit tqalignment. Then, + First, maybe we should be working at 32-bit alignment. Then, this can be a simple loop over word stores. - Second, we can keep working at 24-bit tqalignment, but have some + Second, we can keep working at 24-bit alignment, but have some intelligence about storing. For example, we can iterate over 4-pixel chunks (aligned at 4 pixels), with an inner loop something like: @@ -100,7 +100,7 @@ art_rgb_fill_run_ (art_u8 *buf, art_u32 rgb, int n) *buf++ = b; } } else { - /* handle prefix up to byte tqalignment */ + /* handle prefix up to byte alignment */ /* I'm worried about this cast on sizeof(long) != sizeof(uchar *) architectures, but it _should_ work. */ for (i = 0; ((unsigned long)buf) & 3; i++) diff --git a/karbon/render/art_rgb_svp.c b/karbon/render/art_rgb_svp.c index 2052d2ff..617f1abe 100644 --- a/karbon/render/art_rgb_svp.c +++ b/karbon/render/art_rgb_svp.c @@ -120,7 +120,7 @@ art_rgb_svp_callback_ (void *callback_data, int y, * @rowstride: Rowstride of @buf buffer. * @alphagamma: #ArtAlphaGamma for gamma-correcting the rendering. * - * Renders the tqshape specified with @svp into the @buf RGB buffer. + * Renders the shape specified with @svp into the @buf RGB buffer. * @x1 - @x0 specifies the width, and @y1 - @y0 specifies the height, * of the rectangle rendered. The new pixels are stored starting at * the first byte of @buf. Thus, the @x0 and @y0 parameters specify @@ -400,7 +400,7 @@ art_rgb_svp_alpha_opaque_callback_ (void *callback_data, int y, * @rowstride: Rowstride of @buf buffer. * @alphagamma: #ArtAlphaGamma for gamma-correcting the compositing. * - * Renders the tqshape specified with @svp over the @buf RGB buffer. + * Renders the shape specified with @svp over the @buf RGB buffer. * @x1 - @x0 specifies the width, and @y1 - @y0 specifies the height, * of the rectangle rendered. The new pixels are stored starting at * the first byte of @buf. Thus, the @x0 and @y0 parameters specify diff --git a/karbon/render/vkopainter.h b/karbon/render/vkopainter.h index 75ac0bd1..eac4c204 100644 --- a/karbon/render/vkopainter.h +++ b/karbon/render/vkopainter.h @@ -52,7 +52,7 @@ public: // matrix manipulation virtual void setWorldMatrix( const TQWMatrix & ); - virtual const TQWMatrix tqworldMatrix() { return m_matrix; } + virtual const TQWMatrix worldMatrix() { return m_matrix; } virtual void setZoomFactor( double ); virtual double zoomFactor() { return m_zoomFactor; } diff --git a/karbon/render/vpainter.h b/karbon/render/vpainter.h index 84ad9d13..b61d854a 100644 --- a/karbon/render/vpainter.h +++ b/karbon/render/vpainter.h @@ -57,7 +57,7 @@ public: // matrix manipulation virtual void setWorldMatrix( const TQWMatrix & ) = 0; - virtual const TQWMatrix tqworldMatrix() = 0; + virtual const TQWMatrix worldMatrix() = 0; virtual void setZoomFactor( double ) = 0; virtual double zoomFactor() { return 1.0; } diff --git a/karbon/render/vqpainter.cc b/karbon/render/vqpainter.cc index 7f380287..51819ae3 100644 --- a/karbon/render/vqpainter.cc +++ b/karbon/render/vqpainter.cc @@ -81,9 +81,9 @@ VTQPainter::end() } const TQWMatrix -VTQPainter::tqworldMatrix() +VTQPainter::worldMatrix() { - return m_painter->tqworldMatrix(); + return m_painter->worldMatrix(); } void @@ -153,13 +153,13 @@ VTQPainter::fillPath() { // we probably dont need filling for qpainter //m_index = 0; - m_painter->tqdrawPolygon( m_pa, FALSE, 0, m_index ); + m_painter->drawPolygon( m_pa, FALSE, 0, m_index ); } void VTQPainter::strokePath() { - m_painter->tqdrawPolyline( m_pa, 0, m_index ); + m_painter->drawPolyline( m_pa, 0, m_index ); m_index = 0; } @@ -265,7 +265,7 @@ VTQPainter::drawRect( const KoRect &rect ) void VTQPainter::drawImage( const TQImage &image, const TQWMatrix &affine ) { - TQWMatrix matrix = m_painter->tqworldMatrix(); + TQWMatrix matrix = m_painter->worldMatrix(); double m11 = affine.m11() * matrix.m11() * m_zoomFactor + affine.m12() * matrix.m21(); double m12 = (affine.m11() * matrix.m12() + affine.m12() * matrix.m22() ) * m_zoomFactor; diff --git a/karbon/render/vqpainter.h b/karbon/render/vqpainter.h index d1a556db..5cf3ecd1 100644 --- a/karbon/render/vqpainter.h +++ b/karbon/render/vqpainter.h @@ -44,7 +44,7 @@ public: // matrix manipulation virtual void setWorldMatrix( const TQWMatrix & ); - virtual const TQWMatrix tqworldMatrix(); + virtual const TQWMatrix worldMatrix(); virtual void setZoomFactor( double ); virtual double zoomFactor() { return m_zoomFactor; } diff --git a/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c b/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c index b9cf9376..7e955610 100644 --- a/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c +++ b/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c @@ -1103,19 +1103,19 @@ xlib_window_is_viewable (Window w) XWindowAttributes wa; while (w != 0) { - Window parent, root, *tqchildren; - int ntqchildren; + Window parent, root, *children; + int nchildren; XGetWindowAttributes (gdk_pixbuf_dpy, w, &wa); if (wa.map_state != IsViewable) return 0; if (!XQueryTree (gdk_pixbuf_dpy, w, &root, - &parent, &tqchildren, &ntqchildren)) + &parent, &children, &nchildren)) return 0; - if (ntqchildren > 0) - XFree (tqchildren); + if (nchildren > 0) + XFree (children); if (parent == root) return 1; diff --git a/karbon/shapes/vellipse.cc b/karbon/shapes/vellipse.cc index 0b5fd80c..ef5bb070 100644 --- a/karbon/shapes/vellipse.cc +++ b/karbon/shapes/vellipse.cc @@ -254,7 +254,7 @@ VEllipse::loadOasis( const TQDomElement &element, KoOasisLoadingContext &context double startAngle = element.attributeNS( KoXmlNS::draw, "start-angle", TQString() ).toDouble(); double endAngle = element.attributeNS( KoXmlNS::draw, "end-angle", TQString() ).toDouble(); - // the tqshape gets mirrored in y-direction, so make the angles temporary clockwise + // the shape gets mirrored in y-direction, so make the angles temporary clockwise // just for creating the path m_startAngle = 360.0 - endAngle; m_endAngle = 360.0 - startAngle; diff --git a/karbon/shapes/vpolygon.cc b/karbon/shapes/vpolygon.cc index 650b4698..1735471f 100644 --- a/karbon/shapes/vpolygon.cc +++ b/karbon/shapes/vpolygon.cc @@ -108,8 +108,8 @@ VPolygon::save( TQDomElement& element ) const me.setAttribute( "x", m_topLeft.x() ); me.setAttribute( "y", m_topLeft.y() ); - me.setAttribute( "width", TQString("%1pt").tqarg( m_width ) ); - me.setAttribute( "height", TQString("%1pt").tqarg( m_height ) ); + me.setAttribute( "width", TQString("%1pt").arg( m_width ) ); + me.setAttribute( "height", TQString("%1pt").arg( m_height ) ); me.setAttribute( "points", m_points ); diff --git a/karbon/shapes/vpolyline.cc b/karbon/shapes/vpolyline.cc index d716c325..cef5bda2 100644 --- a/karbon/shapes/vpolyline.cc +++ b/karbon/shapes/vpolyline.cc @@ -157,7 +157,7 @@ VPolyline::loadOasis( const TQDomElement &element, KoOasisLoadingContext &contex p2.setX( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "x2", TQString() ) ) ); p2.setY( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "y2", TQString() ) ) ); - m_points = TQString( "%1,%2 %3,%4" ).tqarg( p1.x() ).tqarg( p1.y() ).tqarg( p2.x() ).tqarg( p2.y() ); + m_points = TQString( "%1,%2 %3,%4" ).arg( p1.x() ).arg( p1.y() ).arg( p2.x() ).arg( p2.y() ); moveTo( p1 ); lineTo( p2 ); diff --git a/karbon/shapes/vrectangle.cc b/karbon/shapes/vrectangle.cc index bb3512fd..bbeef50f 100644 --- a/karbon/shapes/vrectangle.cc +++ b/karbon/shapes/vrectangle.cc @@ -125,8 +125,8 @@ VRectangle::save( TQDomElement& element ) const me.setAttribute( "x", m_topLeft.x() ); me.setAttribute( "y", m_topLeft.y() ); - me.setAttribute( "width", TQString("%1pt").tqarg( m_width ) ); - me.setAttribute( "height", TQString("%1pt").tqarg( m_height ) ); + me.setAttribute( "width", TQString("%1pt").arg( m_width ) ); + me.setAttribute( "height", TQString("%1pt").arg( m_height ) ); me.setAttribute( "rx", m_rx ); me.setAttribute( "ry", m_ry ); diff --git a/karbon/shapes/vstar.h b/karbon/shapes/vstar.h index d82cdf9e..e6134662 100644 --- a/karbon/shapes/vstar.h +++ b/karbon/shapes/vstar.h @@ -23,11 +23,11 @@ #include "vcomposite.h" #include <koffice_export.h> /** - * This tqshape offers star-like tqshapes with a lot of parameters : + * This shape offers star-like shapes with a lot of parameters : * * Types : * - * Star - fully connected star tqshape. + * Star - fully connected star shape. * Star outline - like star but without the cross connections. * Framed star - like star outline but with an enclosing path. * Spoke - basically a star outline with inner radius of zero. @@ -42,7 +42,7 @@ * Inner radius - inner radius where star has to connect to. This value * doesn't apply to polygon, spoke and wheel. * Inner angle - extra radius amount for inner radius. - * Roundness - uses curves instead of lines for the star tqshape. + * Roundness - uses curves instead of lines for the star shape. */ class KARBONBASE_EXPORT VStar : public VPath { diff --git a/karbon/tools/vellipsetool.cc b/karbon/tools/vellipsetool.cc index 41936226..b0f981af 100644 --- a/karbon/tools/vellipsetool.cc +++ b/karbon/tools/vellipsetool.cc @@ -152,7 +152,7 @@ VEllipseTool::refreshUnit() } VPath* -VEllipseTool::tqshape( bool interactive ) const +VEllipseTool::shape( bool interactive ) const { if( interactive ) { @@ -270,7 +270,7 @@ VEllipseTool::setup( KActionCollection *collection ) { m_action = new KRadioAction( i18n( "Ellipse Tool" ), "14_ellipse", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Ellipse" ) ); - m_action->setExclusiveGroup( "tqshapes" ); + m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; } } diff --git a/karbon/tools/vellipsetool.h b/karbon/tools/vellipsetool.h index 859cac96..5a605c53 100644 --- a/karbon/tools/vellipsetool.h +++ b/karbon/tools/vellipsetool.h @@ -70,7 +70,7 @@ public: virtual void setup(KActionCollection *collection); virtual bool showDialog() const; virtual TQString uiname() { return i18n( "Ellipse Tool" ); } - virtual VPath *tqshape( bool interactive = false ) const; + virtual VPath *shape( bool interactive = false ) const; void refreshUnit(); protected: diff --git a/karbon/tools/vpatterntool.cc b/karbon/tools/vpatterntool.cc index 893c8481..92a981ba 100644 --- a/karbon/tools/vpatterntool.cc +++ b/karbon/tools/vpatterntool.cc @@ -22,7 +22,7 @@ #include <tqtoolbutton.h> #include <tqframe.h> #include <tqhbuttongroup.h> -#include <tqlayout.h> +#include <layout.h> #include <tqfileinfo.h> #include <tqlabel.h> #include <tqcursor.h> @@ -49,9 +49,9 @@ VPatternWidget::VPatternWidget( TQPtrList<KoIconItem>* patterns, VTool*, TQWidge : KDialogBase( parent, "", true, i18n( "Choose Pattern" ), Ok | Cancel ), m_pattern( 0 ) { TQWidget *base = new TQWidget( this ); - TQVBoxLayout* tqlayout = new TQVBoxLayout( base ); - tqlayout->addWidget( m_patternChooser = new KoIconChooser( TQSize( 32, 32 ), base ) ); - tqlayout->addWidget( m_buttonGroup = new TQHButtonGroup( base ) ); + TQVBoxLayout* layout = new TQVBoxLayout( base ); + layout->addWidget( m_patternChooser = new KoIconChooser( TQSize( 32, 32 ), base ) ); + layout->addWidget( m_buttonGroup = new TQHButtonGroup( base ) ); m_buttonGroup->insert( m_importPatternButton = new TQToolButton( m_buttonGroup ) ); m_buttonGroup->insert( m_deletePatternButton = new TQToolButton( m_buttonGroup ) ); m_patternChooser->setFixedSize( 180, 120 ); @@ -65,7 +65,7 @@ VPatternWidget::VPatternWidget( TQPtrList<KoIconItem>* patterns, VTool*, TQWidge m_deletePatternButton->setEnabled( false ); //setFrameStyle( Box | Sunken ); - tqlayout->setMargin( 3 ); + layout->setMargin( 3 ); connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotButtonClicked( int ) ) ); connect( m_patternChooser, TQT_SIGNAL( selected( KoIconItem* ) ), this, TQT_SLOT( patternSelected( KoIconItem* ) ) ); diff --git a/karbon/tools/vpolygontool.cc b/karbon/tools/vpolygontool.cc index db1ffb88..fdd02299 100644 --- a/karbon/tools/vpolygontool.cc +++ b/karbon/tools/vpolygontool.cc @@ -119,7 +119,7 @@ VPolygonTool::arrowKeyReleased( TQt::Key key ) } VPath* -VPolygonTool::tqshape( bool interactive ) const +VPolygonTool::shape( bool interactive ) const { if( interactive ) { @@ -158,7 +158,7 @@ VPolygonTool::setup( KActionCollection *collection ) shortcut.append(KShortcut( TQt::Key_F9 ) ); m_action = new KRadioAction( i18n( "Polygon Tool" ), "14_polygon", shortcut, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Polygon" ) ); - m_action->setExclusiveGroup( "tqshapes" ); + m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; } } diff --git a/karbon/tools/vpolygontool.h b/karbon/tools/vpolygontool.h index 052d7e50..cb1dabab 100644 --- a/karbon/tools/vpolygontool.h +++ b/karbon/tools/vpolygontool.h @@ -38,7 +38,7 @@ public: virtual bool showDialog() const; virtual TQString uiname() { return i18n( "Polygon Tool" ); } - virtual VPath *tqshape( bool interactive = false ) const; + virtual VPath *shape( bool interactive = false ) const; void refreshUnit(); diff --git a/karbon/tools/vrectangletool.cc b/karbon/tools/vrectangletool.cc index 7d949ac7..1b9d9c0f 100644 --- a/karbon/tools/vrectangletool.cc +++ b/karbon/tools/vrectangletool.cc @@ -101,7 +101,7 @@ VRectangleTool::refreshUnit() } VPath * -VRectangleTool::tqshape( bool interactive ) const +VRectangleTool::shape( bool interactive ) const { if( interactive ) { @@ -136,7 +136,7 @@ VRectangleTool::setup( KActionCollection *collection ) { m_action = new KRadioAction( i18n( "Rectangle Tool" ), "14_rectangle", TQt::Key_Plus+TQt::Key_F9, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Rectangle" ) ); - m_action->setExclusiveGroup( "tqshapes" ); + m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; } } diff --git a/karbon/tools/vrectangletool.h b/karbon/tools/vrectangletool.h index b902b1ab..ce39a119 100644 --- a/karbon/tools/vrectangletool.h +++ b/karbon/tools/vrectangletool.h @@ -39,7 +39,7 @@ public: virtual void setup(KActionCollection *collection); virtual bool showDialog() const; virtual TQString uiname() { return i18n( "Rectangle Tool" ); } - virtual VPath* tqshape( bool interactive = false ) const; + virtual VPath* shape( bool interactive = false ) const; void refreshUnit(); diff --git a/karbon/tools/vroundrecttool.cc b/karbon/tools/vroundrecttool.cc index b7f354cf..c88bacd8 100644 --- a/karbon/tools/vroundrecttool.cc +++ b/karbon/tools/vroundrecttool.cc @@ -40,7 +40,7 @@ VRoundRectTool::VRoundRectOptionsWidget::VRoundRectOptionsWidget( KarbonPart *pa KoUnit::Unit unit = KoUnit::U_CM; m_width = new KoUnitDoubleSpinBox( group, 0.0, KoUnit::fromUserValue( 1000.0, unit ), KoUnit::fromUserValue( 0.5, unit ), KoUnit::fromUserValue( 10.0, unit ), unit ); - new TQLabel( i18n( "Height (%1):" ).tqarg(KoUnit::unitName( m_part->unit() )), group ); + new TQLabel( i18n( "Height (%1):" ).arg(KoUnit::unitName( m_part->unit() )), group ); m_height = new KoUnitDoubleSpinBox( group, 0.0, KoUnit::fromUserValue( 1000.0, unit ), KoUnit::fromUserValue( 0.5, unit ), KoUnit::fromUserValue( 10.0, unit ), unit ); new TQLabel( i18n( "Edge radius X:" ), group ); @@ -132,7 +132,7 @@ void VRoundRectTool::refreshUnit() } VPath* -VRoundRectTool::tqshape( bool interactive ) const +VRoundRectTool::shape( bool interactive ) const { if( interactive ) { @@ -172,7 +172,7 @@ VRoundRectTool::setup( KActionCollection *collection ) { m_action = new KRadioAction( i18n( "Round Rectangle Tool" ), "14_roundrect", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Round Rectangle" ) ); - m_action->setExclusiveGroup( "tqshapes" ); + m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; } } diff --git a/karbon/tools/vroundrecttool.h b/karbon/tools/vroundrecttool.h index 59a2fab0..5149ff2f 100644 --- a/karbon/tools/vroundrecttool.h +++ b/karbon/tools/vroundrecttool.h @@ -43,7 +43,7 @@ public: virtual void setup(KActionCollection *collection); virtual TQString uiname() { return i18n( "Round Rectangle Tool" ); } - virtual VPath* tqshape( bool interactive = false ) const; + virtual VPath* shape( bool interactive = false ) const; void refreshUnit(); diff --git a/karbon/tools/vselecttool.cc b/karbon/tools/vselecttool.cc index e29e1afb..e6b87f62 100644 --- a/karbon/tools/vselecttool.cc +++ b/karbon/tools/vselecttool.cc @@ -424,11 +424,11 @@ VSelectTool::updateStatusBar() const double b = KoUnit::toUserValue( rect.bottom(), view()->part()->unit() ); // print bottom-left (%1,%2), top-right (%3,%4) corner of selection bounding box and document unit (%5) - TQString selectMessage = i18n( "[(left,bottom), (right,top)] (actual unit)", "Selection [(%1, %2), (%3, %4)] (%5)").tqarg( x, 0, 'f', 1 ).tqarg( y, 0, 'f', 1 ).tqarg( r, 0, 'f', 1 ).tqarg( b, 0, 'f', 1 ).tqarg( view()->part()->unitName() ); + TQString selectMessage = i18n( "[(left,bottom), (right,top)] (actual unit)", "Selection [(%1, %2), (%3, %4)] (%5)").arg( x, 0, 'f', 1 ).arg( y, 0, 'f', 1 ).arg( r, 0, 'f', 1 ).arg( b, 0, 'f', 1 ).arg( view()->part()->unitName() ); VSelectionDescription selectionDesc; selectionDesc.visit( *view()->part()->document().selection() ); - selectMessage += TQString( "(%1)" ).tqarg( selectionDesc.description() ); + selectMessage += TQString( "(%1)" ).arg( selectionDesc.description() ); view()->statusMessage()->setText( selectMessage ); } diff --git a/karbon/tools/vshapetool.cc b/karbon/tools/vshapetool.cc index 49197773..9b59104d 100644 --- a/karbon/tools/vshapetool.cc +++ b/karbon/tools/vshapetool.cc @@ -52,8 +52,8 @@ TQString VShapeTool::contextHelp() { TQString s = i18n( "<qt><b>Shape tool</b><br>" ); - s += i18n( "<i>Click and drag</i> to place your own tqshape.<br>" ); - s += i18n( "<i>Click</i> to place a tqshape using the tool properties values.</qt>" ); + s += i18n( "<i>Click and drag</i> to place your own shape.<br>" ); + s += i18n( "<i>Click</i> to place a shape using the tool properties values.</qt>" ); return s; } @@ -77,7 +77,7 @@ VShapeTool::draw() VPainter* painter = view()->painterFactory()->editpainter(); painter->setRasterOp( TQt::NotROP ); - VPath* composite = tqshape(); + VPath* composite = shape(); composite->setState( VPath::edit ); composite->draw( painter, &composite->boundingBox() ); delete( composite ); @@ -101,7 +101,7 @@ VShapeTool::mouseButtonRelease() if( showDialog() ) { - VPath* composite = tqshape( true ); + VPath* composite = shape( true ); if( composite ) { @@ -136,7 +136,7 @@ VShapeTool::mouseDragRelease() VShapeCmd* cmd = new VShapeCmd( &view()->part()->document(), - uiname(), tqshape(), icon() ); + uiname(), shape(), icon() ); view()->part()->addCommand( cmd, true ); diff --git a/karbon/tools/vshapetool.h b/karbon/tools/vshapetool.h index 2a774e94..f66b5719 100644 --- a/karbon/tools/vshapetool.h +++ b/karbon/tools/vshapetool.h @@ -58,7 +58,7 @@ protected: // Make it "abstract": virtual ~VShapeTool(); - virtual VPath* tqshape( bool interactive = false ) const = 0; + virtual VPath* shape( bool interactive = false ) const = 0; /** * Output coordinates. diff --git a/karbon/tools/vsinustool.cc b/karbon/tools/vsinustool.cc index f95bc2c5..65a8a62f 100644 --- a/karbon/tools/vsinustool.cc +++ b/karbon/tools/vsinustool.cc @@ -20,7 +20,7 @@ #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <knuminput.h> @@ -120,7 +120,7 @@ VSinusTool::refreshUnit() } VPath* -VSinusTool::tqshape( bool interactive ) const +VSinusTool::shape( bool interactive ) const { if( interactive ) return @@ -155,7 +155,7 @@ VSinusTool::setup( KActionCollection *collection ) { m_action = new KRadioAction( i18n( "Sinus Tool" ), "14_sinus", TQt::SHIFT+TQt::Key_S, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Sinus" ) ); - m_action->setExclusiveGroup( "tqshapes" ); + m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; } } diff --git a/karbon/tools/vsinustool.h b/karbon/tools/vsinustool.h index 71669ebd..4aa1c464 100644 --- a/karbon/tools/vsinustool.h +++ b/karbon/tools/vsinustool.h @@ -38,7 +38,7 @@ public: virtual bool showDialog() const; virtual TQString uiname() { return i18n( "Sinus Tool" ); } - virtual VPath *tqshape( bool interactive = false ) const; + virtual VPath *shape( bool interactive = false ) const; void refreshUnit(); diff --git a/karbon/tools/vspiraltool.cc b/karbon/tools/vspiraltool.cc index 304c8637..e0c78e1d 100644 --- a/karbon/tools/vspiraltool.cc +++ b/karbon/tools/vspiraltool.cc @@ -165,7 +165,7 @@ VSpiralTool::refreshUnit() } VPath* -VSpiralTool::tqshape( bool interactive ) const +VSpiralTool::shape( bool interactive ) const { if( interactive ) { @@ -206,7 +206,7 @@ VSpiralTool::setup( KActionCollection *collection ) { m_action = new KRadioAction( i18n( "Spiral Tool" ), "14_spiral", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Spiral" ) ); - m_action->setExclusiveGroup( "tqshapes" ); + m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; } } diff --git a/karbon/tools/vspiraltool.h b/karbon/tools/vspiraltool.h index 5787063d..072e3bea 100644 --- a/karbon/tools/vspiraltool.h +++ b/karbon/tools/vspiraltool.h @@ -41,7 +41,7 @@ public: virtual bool showDialog() const; virtual TQString uiname() { return i18n( "Spiral Tool" ); } - virtual VPath* tqshape( bool interactive = false ) const; + virtual VPath* shape( bool interactive = false ) const; void refreshUnit(); diff --git a/karbon/tools/vstartool.cc b/karbon/tools/vstartool.cc index 42c74f4e..114bab75 100644 --- a/karbon/tools/vstartool.cc +++ b/karbon/tools/vstartool.cc @@ -198,7 +198,7 @@ VStarTool::arrowKeyReleased( TQt::Key key ) } VPath* -VStarTool::tqshape( bool interactive ) const +VStarTool::shape( bool interactive ) const { if( interactive ) { @@ -241,7 +241,7 @@ VStarTool::setup( KActionCollection *collection ) shortcut.append(KShortcut( TQt::Key_F9 ) ); m_action = new KRadioAction( i18n( "Star Tool" ), "14_star", shortcut, this, TQT_SLOT( activate() ), collection, name() ); m_action->setToolTip( i18n( "Draw a star" ) ); - m_action->setExclusiveGroup( "tqshapes" ); + m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; } } diff --git a/karbon/tools/vstartool.h b/karbon/tools/vstartool.h index 07d744c0..ce073d0c 100644 --- a/karbon/tools/vstartool.h +++ b/karbon/tools/vstartool.h @@ -74,7 +74,7 @@ public: virtual bool showDialog() const; virtual void setup(KActionCollection *collection); virtual TQString uiname() { return i18n( "Star Tool" ); } - virtual VPath* tqshape( bool interactive = false ) const; + virtual VPath* shape( bool interactive = false ) const; void refreshUnit(); diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc index a3500160..29293e8b 100644 --- a/karbon/tools/vtexttool.cc +++ b/karbon/tools/vtexttool.cc @@ -23,7 +23,7 @@ #include <tqcombobox.h> #include <tqcursor.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpainter.h> #include <tqpixmap.h> @@ -173,7 +173,7 @@ ShadowPreview::paintEvent( TQPaintEvent* ) p.lineTo( KoPoint( w, h ) ); p.lineTo( KoPoint( w, 0 ) ); p.lineTo( KoPoint( 0, 0 ) ); - VColor c( tqcolorGroup().background() ); + VColor c( colorGroup().background() ); c.setOpacity( .8 ); p.setBrush( VFill( c ) ); p.fillPath(); @@ -183,13 +183,13 @@ ShadowPreview::paintEvent( TQPaintEvent* ) TQPainter painter( this ); painter.drawPixmap( 2, 2, pm ); - painter.setPen( tqcolorGroup().light() ); + painter.setPen( colorGroup().light() ); painter.moveTo( 1, height() - 1 ); painter.lineTo( 1, 1 ); painter.lineTo( width() - 1, 1 ); painter.lineTo( width() - 1, height() - 1 ); painter.lineTo( 1, height() - 1 ); - painter.setPen( tqcolorGroup().dark() ); + painter.setPen( colorGroup().dark() ); painter.moveTo( 0, height() - 1 ); painter.lineTo( 0, 0 ); painter.lineTo( width() - 1, 0 ); @@ -205,22 +205,22 @@ ShadowWidget::ShadowWidget( TQWidget* parent, const char* name, int angle, int d : TQGroupBox( parent, name ) { setTitle( i18n( "Shadow" ) ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); - - TQGridLayout* tqlayout = new TQGridLayout( this ); - tqlayout->addRowSpacing( 0, 12 ); - tqlayout->setMargin( 3 ); - tqlayout->setSpacing( 2 ); - tqlayout->setColStretch( 0, 1 ); - tqlayout->setColStretch( 1, 0 ); - tqlayout->setColStretch( 2, 2 ); - tqlayout->addMultiCellWidget( m_preview = new ShadowPreview( this ), 1, 3, 0, 0 ); - tqlayout->addWidget( new TQLabel( i18n( "Angle:" ), this ), 1, 1 ); - tqlayout->addWidget( m_angle = new KIntNumInput( this ), 1, 2 ); - tqlayout->addWidget( new TQLabel( i18n( "Distance:" ), this ), 2, 1 ); - tqlayout->addWidget( m_distance = new KIntNumInput( this ), 2, 2 ); - tqlayout->addWidget( m_useShadow = new TQCheckBox( i18n( "Shadow" ), this ), 3, 1 ); - tqlayout->addWidget( m_translucent = new TQCheckBox( i18n( "Draw translucent shadow" ), this ), 3, 2 ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); + + TQGridLayout* layout = new TQGridLayout( this ); + layout->addRowSpacing( 0, 12 ); + layout->setMargin( 3 ); + layout->setSpacing( 2 ); + layout->setColStretch( 0, 1 ); + layout->setColStretch( 1, 0 ); + layout->setColStretch( 2, 2 ); + layout->addMultiCellWidget( m_preview = new ShadowPreview( this ), 1, 3, 0, 0 ); + layout->addWidget( new TQLabel( i18n( "Angle:" ), this ), 1, 1 ); + layout->addWidget( m_angle = new KIntNumInput( this ), 1, 2 ); + layout->addWidget( new TQLabel( i18n( "Distance:" ), this ), 2, 1 ); + layout->addWidget( m_distance = new KIntNumInput( this ), 2, 2 ); + layout->addWidget( m_useShadow = new TQCheckBox( i18n( "Shadow" ), this ), 3, 1 ); + layout->addWidget( m_translucent = new TQCheckBox( i18n( "Draw translucent shadow" ), this ), 3, 2 ); m_distance->setRange( 1, 37, 1, true ); m_angle->setRange( 0, 360, 10, true ); m_angle->setValue( angle ); @@ -255,7 +255,7 @@ void ShadowWidget::setShadowAngle( int angle ) { m_angle->setValue( angle ); - m_preview->tqrepaint(); + m_preview->repaint(); } int @@ -268,7 +268,7 @@ void ShadowWidget::setShadowDistance( int distance ) { m_distance->setValue( distance ); - m_preview->tqrepaint(); + m_preview->repaint(); } int @@ -281,7 +281,7 @@ void ShadowWidget::setTranslucent( bool translucent ) { m_translucent->setChecked( translucent ); - m_preview->tqrepaint(); + m_preview->repaint(); } bool ShadowWidget::isTranslucent() @@ -301,13 +301,13 @@ ShadowWidget::setShadowValues( int angle, int distance, bool translucent ) void ShadowWidget::updatePreview( int ) { - m_preview->tqrepaint(); + m_preview->repaint(); } void ShadowWidget::updatePreview() { - m_preview->tqrepaint(); + m_preview->repaint(); bool ok = m_useShadow->isChecked(); m_angle->setEnabled( ok ); m_distance->setEnabled( ok ); @@ -317,7 +317,7 @@ ShadowWidget::updatePreview() VTextOptionsWidget::VTextOptionsWidget( VTextTool* tool, TQWidget *parent ) : KDialogBase( parent, "", true, i18n( "Text" ), Ok | Cancel ), m_tool( tool ) { - //tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); + //setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); //setFrameStyle( Box | Sunken ); TQWidget *base = new TQWidget( this ); TQVBoxLayout* mainLayout = new TQVBoxLayout( base ); @@ -387,13 +387,13 @@ VTextOptionsWidget::VTextOptionsWidget( VTextTool* tool, TQWidget *parent ) m_convertToShapes->setEnabled( true ); - m_textAlignment->insertItem( i18n( "Horizontal tqalignment", "Left") ); - m_textAlignment->insertItem( i18n( "Horizontal tqalignment", "Center") ); - m_textAlignment->insertItem( i18n( "Horizontal tqalignment", "Right") ); + m_textAlignment->insertItem( i18n( "Horizontal alignment", "Left") ); + m_textAlignment->insertItem( i18n( "Horizontal alignment", "Center") ); + m_textAlignment->insertItem( i18n( "Horizontal alignment", "Right") ); - m_textPosition->insertItem( i18n( "Vertical tqalignment", "Above") ); - m_textPosition->insertItem( i18n( "Vertical tqalignment", "On") ); - m_textPosition->insertItem( i18n( "Vertical tqalignment", "Under") ); + m_textPosition->insertItem( i18n( "Vertical alignment", "Above") ); + m_textPosition->insertItem( i18n( "Vertical alignment", "On") ); + m_textPosition->insertItem( i18n( "Vertical alignment", "Under") ); m_textOffset->setRange( 0.0, 100.0, 1.0, true ); @@ -518,12 +518,12 @@ VText::Position VTextOptionsWidget::position() } void -VTextOptionsWidget::tqsetAlignment( VText::Alignment tqalignment ) +VTextOptionsWidget::setAlignment( VText::Alignment alignment ) { - m_textAlignment->setCurrentItem( tqalignment ); + m_textAlignment->setCurrentItem( alignment ); } -VText::Alignment VTextOptionsWidget::tqalignment() +VText::Alignment VTextOptionsWidget::alignment() { return ( VText::Alignment ) m_textAlignment->currentItem(); } @@ -768,7 +768,7 @@ VTextTool::createText( VSubpath &path ) m_text = 0L; delete m_editedText; - m_editedText = new VText( m_optionsWidget->font(), path, m_optionsWidget->position(), m_optionsWidget->tqalignment(), m_optionsWidget->text() ); + m_editedText = new VText( m_optionsWidget->font(), path, m_optionsWidget->position(), m_optionsWidget->alignment(), m_optionsWidget->text() ); if( ! m_editedText ) return false; @@ -803,7 +803,7 @@ VTextTool::textChanged() m_editedText->setText( m_optionsWidget->text() ); m_editedText->setFont( m_optionsWidget->font() ); m_editedText->setPosition( m_optionsWidget->position() ); - m_editedText->tqsetAlignment( m_optionsWidget->tqalignment() ); + m_editedText->setAlignment( m_optionsWidget->alignment() ); m_editedText->setOffset( 0.01 * m_optionsWidget->offset() ); #ifdef HAVE_KARBONTEXT m_editedText->traceText(); @@ -829,7 +829,7 @@ VTextTool::accept() m_editedText->font(), m_editedText->basePath(), m_editedText->position(), - m_editedText->tqalignment(), + m_editedText->alignment(), m_editedText->offset(), m_editedText->text(), m_optionsWidget->useShadow(), @@ -932,7 +932,7 @@ VTextTool::visitVText( VText& text ) m_optionsWidget->setFont( text.font() ); m_optionsWidget->setText( text.text() ); m_optionsWidget->setPosition( text.position() ); - m_optionsWidget->tqsetAlignment( text.tqalignment() ); + m_optionsWidget->setAlignment( text.alignment() ); m_optionsWidget->setOffset( text.offset() * 100.0 ); m_optionsWidget->setUseShadow( text.useShadow() ); m_optionsWidget->setShadow( text.shadowAngle(), text.shadowDistance(), text.translucentShadow() ); @@ -962,7 +962,7 @@ VTextTool::VTextCmd::VTextCmd( VDocument* doc, const TQString& name, VText* text m_textModifications->newPosition = newPosition; m_textModifications->oldPosition = text->position(); m_textModifications->newAlignment = newAlignment; - m_textModifications->oldAlignment = text->tqalignment(); + m_textModifications->oldAlignment = text->alignment(); m_textModifications->newOffset = newOffset; m_textModifications->oldOffset = text->offset(); m_textModifications->newText = newText; @@ -1007,7 +1007,7 @@ VTextTool::VTextCmd::execute() m_text->setFont( m_textModifications->newFont ); m_text->setBasePath( m_textModifications->newBasePath ); m_text->setPosition( m_textModifications->newPosition ); - m_text->tqsetAlignment( m_textModifications->newAlignment ); + m_text->setAlignment( m_textModifications->newAlignment ); m_text->setOffset( m_textModifications->newOffset ); m_text->setText( m_textModifications->newText ); m_text->setUseShadow( m_textModifications->newUseShadow ); @@ -1041,7 +1041,7 @@ VTextTool::VTextCmd::unexecute() m_text->setFont( m_textModifications->oldFont ); m_text->setBasePath( m_textModifications->oldBasePath ); m_text->setPosition( m_textModifications->oldPosition ); - m_text->tqsetAlignment( m_textModifications->oldAlignment ); + m_text->setAlignment( m_textModifications->oldAlignment ); m_text->setOffset( m_textModifications->oldOffset ); m_text->setText( m_textModifications->oldText ); m_text->setUseShadow( m_textModifications->oldUseShadow ); diff --git a/karbon/tools/vtexttool.h b/karbon/tools/vtexttool.h index cd3c4e87..48357dbf 100644 --- a/karbon/tools/vtexttool.h +++ b/karbon/tools/vtexttool.h @@ -113,8 +113,8 @@ public: TQString text(); void setPosition( VText::Position position ); VText::Position position(); - void tqsetAlignment( VText::Alignment tqalignment ); - VText::Alignment tqalignment(); + void setAlignment( VText::Alignment alignment ); + VText::Alignment alignment(); void setOffset( double offset ); double offset(); void setUseShadow( bool state ); diff --git a/karbon/usablity-review.txt b/karbon/usablity-review.txt index 237dc828..5d2eb8b4 100644 --- a/karbon/usablity-review.txt +++ b/karbon/usablity-review.txt @@ -79,7 +79,7 @@ unselects is not one of the outside objects. It is impossible to select an object that is completely inside another. A perfect solution would: -* make the 'hit area' based more on the outside of the tqshape. +* make the 'hit area' based more on the outside of the shape. A line should not be selected when clicked more then pixels next to it. Text should be selected when clicked in the white area of a 'D' diff --git a/karbon/vtool.h b/karbon/vtool.h index 877dc41b..2b8bc72e 100644 --- a/karbon/vtool.h +++ b/karbon/vtool.h @@ -37,7 +37,7 @@ enum enumToolType { TOOL_SELECT = 0, // TOOL_FREEHAND = 1, // - TOOL_SHAPE = 2, // Geometric tqshapes like ellipses and lines + TOOL_SHAPE = 2, // Geometric shapes like ellipses and lines TOOL_MANIPULATION = 3, // TOOL_MISC = 4 // }; diff --git a/karbon/widgets/vcanvas.cc b/karbon/widgets/vcanvas.cc index d96018b9..9fa5dcd6 100644 --- a/karbon/widgets/vcanvas.cc +++ b/karbon/widgets/vcanvas.cc @@ -152,7 +152,7 @@ VCanvas::eventFilter( TQObject* object, TQEvent* event ) } -// This causes a tqrepaint normally, so just overwriting it omits the repainting +// This causes a repaint normally, so just overwriting it omits the repainting void VCanvas::focusInEvent( TQFocusEvent * ) { @@ -228,7 +228,7 @@ VCanvas::viewportPaintEvent( TQPaintEvent *e ) setYMirroring( p ); // TRICK : slightly adjust the matrix so libart AA looks better - TQWMatrix mat = p->tqworldMatrix(); + TQWMatrix mat = p->worldMatrix(); p->setWorldMatrix( mat.translate( -.5, -.5 ) ); // set up clippath @@ -305,7 +305,7 @@ VCanvas::drawDocument( TQPainter* /*painter*/, const KoRect&, bool drawVObjects p->setZoomFactor( m_view->zoom() ); setYMirroring( p ); // TRICK : slightly adjust the matrix so libart AA looks better - TQWMatrix mat = p->tqworldMatrix(); + TQWMatrix mat = p->worldMatrix(); p->setWorldMatrix( mat.translate( -.5, -.5 ) ); m_part->document().drawPage( p, m_part->pageLayout(), m_view->showPageMargins() ); diff --git a/karbon/widgets/vcolorslider.cc b/karbon/widgets/vcolorslider.cc index 3e2af4f0..6c32465e 100644 --- a/karbon/widgets/vcolorslider.cc +++ b/karbon/widgets/vcolorslider.cc @@ -20,7 +20,7 @@ /* vcolorslider.cc */ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <knuminput.h> #include <kselect.h> @@ -53,15 +53,15 @@ VColorSlider::~VColorSlider() void VColorSlider::init() { m_isDragging = false; - TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 3 ); + TQHBoxLayout *layout = new TQHBoxLayout( this, 3 ); m_label = new TQLabel( this ); m_gradientSelect = new KGradientSelector( Qt::Horizontal, this ); m_spinBox = new KIntSpinBox( this ); - tqlayout->addWidget( m_label ); - tqlayout->addWidget( m_gradientSelect, 2 ); - tqlayout->addWidget( m_spinBox ); + layout->addWidget( m_label ); + layout->addWidget( m_gradientSelect, 2 ); + layout->addWidget( m_spinBox ); setValue( 0 ); setMinValue( 0 ); @@ -72,7 +72,7 @@ void VColorSlider::init() m_gradientSelect->installEventFilter( this ); - tqlayout->activate(); + layout->activate(); } void VColorSlider::setLabel( const TQString& label ) diff --git a/karbon/widgets/vgradienttabwidget.cc b/karbon/widgets/vgradienttabwidget.cc index f65cfd74..0dd365f1 100644 --- a/karbon/widgets/vgradienttabwidget.cc +++ b/karbon/widgets/vgradienttabwidget.cc @@ -19,7 +19,7 @@ #include <tqlabel.h> #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqgroupbox.h> #include <tqpushbutton.h> #include <tqfileinfo.h> @@ -93,9 +93,9 @@ void VGradientListItem::paint( TQPainter* painter ) painter->drawPixmap( 0, 0, m_pixmap ); painter->restore(); if ( isSelected() ) - painter->setPen( listBox()->tqcolorGroup().highlightedText() ); + painter->setPen( listBox()->colorGroup().highlightedText() ); else - painter->setPen( listBox()->tqcolorGroup().base() ); + painter->setPen( listBox()->colorGroup().base() ); painter->drawRect( r ); painter->flush(); } // VGradientListItem::paint @@ -151,13 +151,13 @@ void VGradientPreview::paintEvent( TQPaintEvent* ) TQPainter p( &pixmap ); - p.setPen( tqcolorGroup().light() ); + p.setPen( colorGroup().light() ); p.moveTo( 1, height() - 1 ); p.lineTo( 1, 1 ); p.lineTo( width() - 1, 1 ); p.lineTo( width() - 1, height() - 1 ); p.lineTo( 1, height() - 1 ); - p.setPen( tqcolorGroup().dark() ); + p.setPen( colorGroup().dark() ); p.moveTo( 0, height() - 1 ); p.lineTo( 0, 0 ); p.lineTo( width() - 1, 0 ); diff --git a/karbon/widgets/vgradientwidget.cc b/karbon/widgets/vgradientwidget.cc index f1c55ea1..7e9ecd75 100644 --- a/karbon/widgets/vgradientwidget.cc +++ b/karbon/widgets/vgradientwidget.cc @@ -117,7 +117,7 @@ void VGradientWidget::paintEvent( TQPaintEvent* ) TQPainter p( &pixmap ); - p.setPen( tqcolorGroup().light() ); + p.setPen( colorGroup().light() ); // light frame around widget p.moveTo( 1, height() - 1 ); p.lineTo( 1, 1 ); @@ -129,7 +129,7 @@ void VGradientWidget::paintEvent( TQPaintEvent* ) p.moveTo( 1, 3 + gh ); p.lineTo( width() - 1, 3 + gh ); - p.setPen( tqcolorGroup().dark() ); + p.setPen( colorGroup().dark() ); // left-top frame around widget p.moveTo( 0, height() - 1 ); p.lineTo( 0, 0 ); @@ -151,7 +151,7 @@ void VGradientWidget::paintEvent( TQPaintEvent* ) m_pntArea.setRect( 2, height() - ph - 2, w, ph ); // clear point area - p.fillRect( m_pntArea.x(), m_pntArea.y(), m_pntArea.width(), m_pntArea.height(), tqcolorGroup().background() ); + p.fillRect( m_pntArea.x(), m_pntArea.y(), m_pntArea.width(), m_pntArea.height(), colorGroup().background() ); p.setClipRect( m_pntArea.x(), m_pntArea.y(), m_pntArea.width(), m_pntArea.height() ); p.translate( m_pntArea.x(), m_pntArea.y() ); @@ -244,7 +244,7 @@ void VGradientWidget::mouseDoubleClickEvent( TQMouseEvent* e ) if( currentPoint % 2 == 1 ) { // ramp point hit -> change color - VColorDlg* d = new VColorDlg( m_gradient->m_colorStops.at( currentPoint / 2 )->color, this->tqtopLevelWidget() ); + VColorDlg* d = new VColorDlg( m_gradient->m_colorStops.at( currentPoint / 2 )->color, this->topLevelWidget() ); if( d->exec() == TQDialog::Accepted ) { m_gradient->m_colorStops.at( currentPoint / 2 )->color = d->Color(); @@ -256,7 +256,7 @@ void VGradientWidget::mouseDoubleClickEvent( TQMouseEvent* e ) else if( currentPoint == 0 ) { // now point hit -> create new color stop - VColorDlg* d = new VColorDlg( m_gradient->m_colorStops.at( 0 )->color, this->tqtopLevelWidget() ); + VColorDlg* d = new VColorDlg( m_gradient->m_colorStops.at( 0 )->color, this->topLevelWidget() ); if( d->exec() == TQDialog::Accepted ) { m_gradient->addStop( d->Color(), (float)( e->x() - 2 ) / ( m_pntArea.width() ), 0.5 ); diff --git a/karbon/widgets/vreference.cc b/karbon/widgets/vreference.cc index f400fc13..0040c3ef 100644 --- a/karbon/widgets/vreference.cc +++ b/karbon/widgets/vreference.cc @@ -21,14 +21,14 @@ /* vreference.cc */ #include <tqbuttongroup.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include "vreference.h" VReference::VReference( TQWidget *parent, const char *name ) : TQFrame ( parent, name ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); mButtonGroup = new TQButtonGroup (3,Qt::Vertical, this ); TQRadioButton* radio = new TQRadioButton ( mButtonGroup ); mButtonGroup->insert( radio, TopLeft ); @@ -54,8 +54,8 @@ VReference::VReference( TQWidget *parent, const char *name ) : TQFrame ( parent, this, TQT_SLOT( setReferencePoint( int ) ) ); mButtonGroup->setButton( Center ); - tqlayout->addWidget( mButtonGroup ); - tqlayout->activate(); + layout->addWidget( mButtonGroup ); + layout->activate(); setReferencePoint( Center ); } diff --git a/karbon/widgets/vruler.cc b/karbon/widgets/vruler.cc index de03eb23..28b7db9f 100644 --- a/karbon/widgets/vruler.cc +++ b/karbon/widgets/vruler.cc @@ -114,7 +114,7 @@ void VRuler::setUnit(KoUnit::Unit u) m_unit = u; drawRuler(); updatePointer(m_currentPosition, m_currentPosition); - tqrepaint(); + repaint(); } void VRuler::setZoom(double zoom) @@ -123,7 +123,7 @@ void VRuler::setZoom(double zoom) recalculateSize(); drawRuler(); updatePointer(m_currentPosition, m_currentPosition); - tqrepaint(); + repaint(); } void VRuler::updatePointer(TQ_INT32 x, TQ_INT32 y) @@ -131,7 +131,7 @@ void VRuler::updatePointer(TQ_INT32 x, TQ_INT32 y) if (m_pixmapBuffer) { if (m_orientation == Qt::Horizontal) { if (m_currentPosition != -1) - tqrepaint(m_currentPosition, 1, MARKER_WIDTH, MARKER_HEIGHT); + repaint(m_currentPosition, 1, MARKER_WIDTH, MARKER_HEIGHT); if (x != -1) { bitBlt(this, x, 1, &m_pixmapMarker, 0, 0, MARKER_WIDTH, MARKER_HEIGHT); @@ -139,7 +139,7 @@ void VRuler::updatePointer(TQ_INT32 x, TQ_INT32 y) } } else { if (m_currentPosition != -1) - tqrepaint(1, m_currentPosition, MARKER_HEIGHT, MARKER_WIDTH); + repaint(1, m_currentPosition, MARKER_HEIGHT, MARKER_WIDTH); if (y != -1) { bitBlt(this, 1, y, &m_pixmapMarker, 0, 0, MARKER_HEIGHT, MARKER_WIDTH); @@ -158,7 +158,7 @@ void VRuler::updateVisibleArea(TQ_INT32 xpos, TQ_INT32 ypos) //kdDebug() << "--###-- VRuler::updateVisibleArea(" << xpos << ", " << ypos << ")" << endl; drawRuler(); - tqrepaint(); + repaint(); updatePointer(m_currentPosition, m_currentPosition); //kdDebug() << "--###-- VRuler::updatePointer(" << m_currentPosition << ", " << m_currentPosition << ")" << endl; } @@ -188,7 +188,7 @@ void VRuler::drawRuler() p.begin(m_pixmapBuffer); p.setPen(TQColor(0x70, 0x70, 0x70)); - p.setBackgroundColor(tqcolorGroup().background()); + p.setBackgroundColor(colorGroup().background()); p.eraseRect(0, 0, m_pixmapBuffer -> width(), m_pixmapBuffer -> height()); switch (m_unit) { diff --git a/karbon/widgets/vsmallpreview.cc b/karbon/widgets/vsmallpreview.cc index 6e35d921..1cd6af0e 100644 --- a/karbon/widgets/vsmallpreview.cc +++ b/karbon/widgets/vsmallpreview.cc @@ -22,7 +22,7 @@ #include <tqcolor.h> #include <tqframe.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpixmap.h> #include <klocale.h> @@ -42,21 +42,21 @@ VSmallPreview::VSmallPreview( TQWidget* parent, const char* name ) : TQWidget( parent, name ) { - /* Create widget tqlayout */ - TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 4 ); + /* Create widget layout */ + TQHBoxLayout *layout = new TQHBoxLayout( this, 4 ); m_strokeLabel = new TQLabel( i18n( "Stroke: None" ), this ); - tqlayout->addWidget( m_strokeLabel ); + layout->addWidget( m_strokeLabel ); m_strokeFrame = new TQFrame( this ); m_strokeFrame->setFixedWidth ( FRAMEWIDTH ); m_strokeFrame->setFrameStyle( TQFrame::GroupBoxPanel | TQFrame::Plain ); - tqlayout->addWidget( m_strokeFrame ); + layout->addWidget( m_strokeFrame ); m_fillLabel = new TQLabel( i18n( "Fill: None" ), this ); - tqlayout->addWidget( m_fillLabel ); + layout->addWidget( m_fillLabel ); m_fillFrame = new TQFrame( this ); m_fillFrame->setFixedWidth ( FRAMEWIDTH ); m_fillFrame->setFrameStyle( TQFrame::GroupBoxPanel | TQFrame::Plain ); - tqlayout->addWidget( m_fillFrame ); - tqlayout->activate(); + layout->addWidget( m_fillFrame ); + layout->activate(); m_fill = VFill(); m_stroke = VStroke(); diff --git a/karbon/widgets/vstrokefillpreview.cc b/karbon/widgets/vstrokefillpreview.cc index 473ce4db..f69d5d85 100644 --- a/karbon/widgets/vstrokefillpreview.cc +++ b/karbon/widgets/vstrokefillpreview.cc @@ -195,7 +195,7 @@ VStrokeFillPreview::update( const VStroke &s, const VFill &f ) m_painter->end(); - tqrepaint(); + repaint(); } void diff --git a/karbon/widgets/vstrokefillpreview.h b/karbon/widgets/vstrokefillpreview.h index 1790c9c9..53234b09 100644 --- a/karbon/widgets/vstrokefillpreview.h +++ b/karbon/widgets/vstrokefillpreview.h @@ -37,9 +37,9 @@ public: VStrokeFillPreview( KarbonPart *part, TQWidget* parent = 0L, const char* name = 0L ); ~VStrokeFillPreview(); - virtual TQSize tqsizeHint() const + virtual TQSize sizeHint() const { return TQSize( 50, 50 ); } - virtual TQSize tqminimumSizeHint() const + virtual TQSize minimumSizeHint() const { return TQSize( 20, 20 ); } virtual TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); } diff --git a/karbon/widgets/vtranslate.cc b/karbon/widgets/vtranslate.cc index e13da689..faa4d837 100644 --- a/karbon/widgets/vtranslate.cc +++ b/karbon/widgets/vtranslate.cc @@ -20,7 +20,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqstring.h> #include <klocale.h> #include <knuminput.h> @@ -34,38 +34,38 @@ VTranslate::VTranslate( TQWidget* parent, const char* name ) { setCaption( i18n( "Translate" ) ); - TQVBoxLayout *maintqlayout = new TQVBoxLayout(this, 7); - maintqlayout->addSpacing(5); + TQVBoxLayout *mainlayout = new TQVBoxLayout(this, 7); + mainlayout->addSpacing(5); - TQGridLayout *inputtqlayout = new TQGridLayout(this, 5, 3); - maintqlayout->addLayout(inputtqlayout); + TQGridLayout *inputlayout = new TQGridLayout(this, 5, 3); + mainlayout->addLayout(inputlayout); m_labelX = new TQLabel(i18n("X:"), this); - inputtqlayout->addWidget(m_labelX, 0, 0); + inputlayout->addWidget(m_labelX, 0, 0); labely = new TQLabel(i18n("Y:"), this); - inputtqlayout->addWidget(labely, 1, 0); - inputtqlayout->addColSpacing(1, 1); - inputtqlayout->addColSpacing(3, 5); + inputlayout->addWidget(labely, 1, 0); + inputlayout->addColSpacing(1, 1); + inputlayout->addColSpacing(3, 5); m_inputX = new KDoubleNumInput( this ); m_inputX->setRange(-10000.00, 10000.00, 1.00, false); //range is just for example - for now :-) - inputtqlayout->addWidget(m_inputX, 0, 2); + inputlayout->addWidget(m_inputX, 0, 2); m_inputY = new KDoubleNumInput( this ); m_inputY->setRange(-10000.00, 10000.00, 1.00, false); - inputtqlayout->addWidget(m_inputY, 1, 2); + inputlayout->addWidget(m_inputY, 1, 2); m_labelUnit1 = new TQLabel("", this); - inputtqlayout->addWidget(m_labelUnit1, 0, 4); + inputlayout->addWidget(m_labelUnit1, 0, 4); m_labelUnit2 = new TQLabel("", this); - inputtqlayout->addWidget(m_labelUnit2, 1, 4); - maintqlayout->addSpacing(5); + inputlayout->addWidget(m_labelUnit2, 1, 4); + mainlayout->addSpacing(5); m_checkBoxPosition = new TQCheckBox(i18n("Relative &position"), this); - maintqlayout->addWidget(m_checkBoxPosition); - maintqlayout->addSpacing(5); + mainlayout->addWidget(m_checkBoxPosition); + mainlayout->addSpacing(5); m_buttonDuplicate = new TQPushButton(i18n("&Duplicate"), this); - maintqlayout->addWidget(m_buttonDuplicate); - maintqlayout->addSpacing(1); + mainlayout->addWidget(m_buttonDuplicate); + mainlayout->addSpacing(1); m_buttonApply = new KPushButton(KStdGuiItem::apply(), this); - maintqlayout->addWidget(m_buttonApply); + mainlayout->addWidget(m_buttonApply); - maintqlayout->activate(); + mainlayout->activate(); setFixedSize(baseSize()); //Set the size tp fixed values } diff --git a/kchart/csvimportdialog.cc b/kchart/csvimportdialog.cc index 38cfd8c2..b0e52fea 100644 --- a/kchart/csvimportdialog.cc +++ b/kchart/csvimportdialog.cc @@ -27,11 +27,11 @@ #include <tqlineedit.h> #include <tqcombobox.h> #include <tqspinbox.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqbuttongroup.h> #include <tqpushbutton.h> #include <tqradiobutton.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <kapplication.h> #include <kdebug.h> @@ -60,14 +60,14 @@ CSVImportDialog::CSVImportDialog(TQWidget* parent, TQByteArray& fileArray) kapp->restoreOverrideCursor(); TQStringList encodings; - encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" ); - encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->name() ); + encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" ); + encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() ); encodings += KGlobal::charsets()->descriptiveEncodingNames(); // Add a few non-standard encodings, which might be useful for text files const TQString description(i18n("Descriptive encoding name","Other ( %1 )")); - encodings << description.tqarg("Apple Roman"); // Apple - encodings << description.tqarg("IBM 850") << description.tqarg("IBM 866"); // MS DOS - encodings << description.tqarg("CP 1258"); // Windows + encodings << description.arg("Apple Roman"); // Apple + encodings << description.arg("IBM 850") << description.arg("IBM 866"); // MS DOS + encodings << description.arg("CP 1258"); // Windows m_dialog->comboBoxEncoding->insertStringList(encodings); m_formatList << i18n( "Text" ); @@ -82,7 +82,7 @@ CSVImportDialog::CSVImportDialog(TQWidget* parent, TQByteArray& fileArray) fillTable(); - //resize(tqsizeHint()); + //resize(sizeHint()); resize( 600, 400 ); // Try to show as much as possible of the table view setMainWidget(m_dialog); @@ -611,7 +611,7 @@ TQTextCodec* CSVImportDialog::getCodec(void) const // Default: UTF-8 kdWarning(30502) << "Cannot find encoding:" << strCodec << endl; // ### TODO: what parent to use? - KMessageBox::error( 0, i18n("Cannot find encoding: %1").tqarg( strCodec ) ); + KMessageBox::error( 0, i18n("Cannot find encoding: %1").arg( strCodec ) ); return 0; } diff --git a/kchart/csvimportdialogui.ui b/kchart/csvimportdialogui.ui index a061c0cc..4e53b54d 100644 --- a/kchart/csvimportdialogui.ui +++ b/kchart/csvimportdialogui.ui @@ -68,7 +68,7 @@ </attribute> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <property name="geometry"> <rect> @@ -84,7 +84,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -122,7 +122,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>106</width> <height>20</height> @@ -173,7 +173,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -274,7 +274,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> @@ -364,7 +364,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> @@ -381,7 +381,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> @@ -430,7 +430,7 @@ <property name="textFormat"> <enum>AutoText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -479,7 +479,7 @@ <property name="textFormat"> <enum>AutoText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -523,7 +523,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>468</width> <height>20</height> @@ -540,7 +540,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>468</width> <height>20</height> @@ -557,7 +557,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>611</width> <height>20</height> @@ -574,7 +574,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>20</height> diff --git a/kchart/kchartBackgroundPixmapConfigPage.cc b/kchart/kchartBackgroundPixmapConfigPage.cc index c0d3d70e..54127a9a 100644 --- a/kchart/kchartBackgroundPixmapConfigPage.cc +++ b/kchart/kchartBackgroundPixmapConfigPage.cc @@ -33,7 +33,7 @@ #include <tqradiobutton.h> #include <tqbuttongroup.h> #include <tqspinbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqhbox.h> #include <tqpushbutton.h> #include <tqlabel.h> diff --git a/kchart/kchartColorConfigPage.cc b/kchart/kchartColorConfigPage.cc index d5666802..9e4123b3 100644 --- a/kchart/kchartColorConfigPage.cc +++ b/kchart/kchartColorConfigPage.cc @@ -24,7 +24,7 @@ #include <kdialog.h> #include <klocale.h> #include <kcolorbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqbuttongroup.h> #include <tqwhatsthis.h> @@ -51,11 +51,11 @@ KChartColorConfigPage::KChartColorConfigPage( KChartParams* params, TQVBoxLayout* toplevel = new TQVBoxLayout( this, 14 ); TQButtonGroup* gb = new TQButtonGroup( 0, Qt::Vertical, i18n("Colors"), this ); - gb->tqlayout()->setSpacing(KDialog::spacingHint()); - gb->tqlayout()->setMargin(KDialog::marginHint()); + gb->layout()->setSpacing(KDialog::spacingHint()); + gb->layout()->setMargin(KDialog::marginHint()); toplevel->addWidget( gb); TQString wtstr; - TQGridLayout* grid = new TQGridLayout( gb->tqlayout(), 8, 3 ); + TQGridLayout* grid = new TQGridLayout( gb->layout(), 8, 3 ); const int labelAlign = AlignRight | AlignVCenter; int row = -1; @@ -63,7 +63,7 @@ KChartColorConfigPage::KChartColorConfigPage( KChartParams* params, { \ ++row; \ TQLabel* l = new TQLabel( title, gb ); \ - l->tqsetAlignment( labelAlign ); \ + l->setAlignment( labelAlign ); \ grid->addWidget( l, row, 0 ); \ btn = new KColorButton( gb ); \ l->setBuddy( btn ); \ @@ -140,7 +140,7 @@ KChartColorConfigPage::KChartColorConfigPage( KChartParams* params, /*TQLabel* edgeLA = new TQLabel( i18n( "Edge color (pies only)" ), this ); - edgeLA->tqsetAlignment( AlignRight | AlignVCenter ); + edgeLA->setAlignment( AlignRight | AlignVCenter ); grid->addWidget( edgeLA, 6, 0 ); _edgeCB = new KColorButton( this ); grid->addWidget( _edgeCB, 6, 1 );*/ @@ -149,11 +149,11 @@ KChartColorConfigPage::KChartColorConfigPage( KChartParams* params, // TQString labeltext; // labeltext.sprintf( i18n( "Data color #%d:"), i ); // TQLabel* dataLA = new TQLabel( labeltext, this ); -// dataLA->tqsetAlignment(AlignRight | AlignVCenter); -// dataLA->resize( dataLA->tqsizeHint() ); +// dataLA->setAlignment(AlignRight | AlignVCenter); +// dataLA->resize( dataLA->sizeHint() ); // grid->addWidget( dataLA, i, 2 ); // _dataCB[i] = new KColorButton( this ); -// _dataCB[i]->resize( _dataCB[i]->tqsizeHint() ); +// _dataCB[i]->resize( _dataCB[i]->sizeHint() ); // grid->addWidget( _dataCB[i], i, 3 ); // grid->addRowSpacing(i,_textCB->height()); // grid->setRowStretch(i,0); @@ -191,7 +191,7 @@ void KChartColorConfigPage::initDataColorList() extColor.resize( m_params->maxDataColor() ); if(i<m_params->maxDataColor()) { - _dataColorLB->insertItem(m_params->legendText( i ).isEmpty() ? i18n("Series %1").tqarg(i+1) :m_params->legendText( i ) ); + _dataColorLB->insertItem(m_params->legendText( i ).isEmpty() ? i18n("Series %1").arg(i+1) :m_params->legendText( i ) ); extColor[i] =m_params->dataColor(i); } } diff --git a/kchart/kchartComboConfigPage.cc b/kchart/kchartComboConfigPage.cc index 72453584..1e1dd871 100644 --- a/kchart/kchartComboConfigPage.cc +++ b/kchart/kchartComboConfigPage.cc @@ -24,7 +24,7 @@ #include <klocale.h> #include <kdebug.h> #include <kdialog.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqradiobutton.h> #include <tqbuttongroup.h> @@ -40,11 +40,11 @@ KChartComboPage::KChartComboPage( KChartParams* params, { //TQVBoxLayout* toplevel = new TQVBoxLayout( this, 10 ); - TQGridLayout* tqlayout = new TQGridLayout(this, 2, 2,KDialog::marginHint(), KDialog::spacingHint() ); - //toplevel->addLayout( tqlayout ); + TQGridLayout* layout = new TQGridLayout(this, 2, 2,KDialog::marginHint(), KDialog::spacingHint() ); + //toplevel->addLayout( layout ); TQButtonGroup* gb = new TQButtonGroup( i18n("HLC Style"), this ); TQGridLayout *grid1 = new TQGridLayout(gb,7,1,KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->addWidget(gb,0,0); + layout->addWidget(gb,0,0); diamond=new TQRadioButton( i18n("Diamond"), gb ); ; grid1->addWidget(diamond,0,0); @@ -54,7 +54,7 @@ KChartComboPage::KChartComboPage( KChartParams* params, grid1->addWidget(connecting,2,0); icap=new TQRadioButton( i18n("Icap"), gb ); grid1->addWidget(icap,3,0); - gb->tqsetAlignment(TQt::AlignLeft); + gb->setAlignment(TQt::AlignLeft); grid1->addColSpacing(0,diamond->width()); grid1->addColSpacing(0,closeconnected->width()); grid1->addColSpacing(0,connecting->width()); @@ -63,7 +63,7 @@ KChartComboPage::KChartComboPage( KChartParams* params, grid1->activate(); //it's not good but I don't know how //to reduce space - tqlayout->addColSpacing(1,300); + layout->addColSpacing(1,300); } void KChartComboPage::init() diff --git a/kchart/kchartDataConfigPage.cc b/kchart/kchartDataConfigPage.cc index 3766903c..84b6e872 100644 --- a/kchart/kchartDataConfigPage.cc +++ b/kchart/kchartDataConfigPage.cc @@ -27,7 +27,7 @@ #include <kdebug.h> #include <tqhbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqlineedit.h> #include <tqlistbox.h> @@ -82,10 +82,10 @@ KChartDataConfigPage::KChartDataConfigPage( KChartParams* params, TQButtonGroup *gb = new TQVButtonGroup( i18n( "Data Format" ), this ); m_rowMajor = new TQRadioButton( i18n( "Data in rows" ), gb ); - m_rowMajor->resize( m_rowMajor->tqsizeHint() ); + m_rowMajor->resize( m_rowMajor->sizeHint() ); m_colMajor = new TQRadioButton( i18n( "Data in columns" ), gb ); - m_colMajor->resize( m_colMajor->tqsizeHint() ); + m_colMajor->resize( m_colMajor->sizeHint() ); grid1->addWidget(gb, 2, 0); @@ -93,7 +93,7 @@ KChartDataConfigPage::KChartDataConfigPage( KChartParams* params, TQWhatsThis::add(m_rowMajor, i18n("By default one row is considered to be a data set and each column holds the individual values of the data series. This sets the data in rows on your chart.")); TQWhatsThis::add(m_colMajor, i18n("Here you can choose to have each column hold one data set. Note that the values are not really swapped but only their interpretation.")); - m_colMajor->resize( m_colMajor->tqsizeHint() ); + m_colMajor->resize( m_colMajor->sizeHint() ); grid1->addWidget(gb, 1, 0); grid1->setColStretch(3, 0); diff --git a/kchart/kchartDataEditor.cc b/kchart/kchartDataEditor.cc index db1ce1f3..b89f5256 100644 --- a/kchart/kchartDataEditor.cc +++ b/kchart/kchartDataEditor.cc @@ -1,7 +1,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> #include <tqspinbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqregexp.h> #include <tqwhatsthis.h> @@ -183,16 +183,16 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) : // Create the Rows setting m_rowsLA = new TQLabel( i18n("# Rows:" ), page ); - m_rowsLA->resize( m_rowsLA->tqsizeHint() ); + m_rowsLA->resize( m_rowsLA->sizeHint() ); m_rowsSB = new kchartDataSpinBox( page ); - m_rowsSB->resize( m_rowsSB->tqsizeHint() ); + m_rowsSB->resize( m_rowsSB->sizeHint() ); m_rowsSB->setMinValue(1); // Create the columns setting m_colsLA = new TQLabel( i18n("# Columns:" ), page ); - m_colsLA->resize( m_colsLA->tqsizeHint() ); + m_colsLA->resize( m_colsLA->sizeHint() ); m_colsSB = new kchartDataSpinBox( page ); - m_colsSB->resize( m_colsSB->tqsizeHint() ); + m_colsSB->resize( m_colsSB->sizeHint() ); m_colsSB->setMinValue(1); #if 0 @@ -240,7 +240,7 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) : connect( m_removeColButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeCurrentColumn() ) ); - // Start the tqlayout. The buttons are at the top. + // Start the layout. The buttons are at the top. TQVBoxLayout *topLayout = new TQVBoxLayout( page ); TQHBoxLayout* insertRemoveLayout = new TQHBoxLayout( ); @@ -429,7 +429,7 @@ void kchartDataEditor::setData( KChartParams *params, KDChartTableData *dat ) if (t.isValid()) { if ( t.type() == TQVariant::Double ) { m_table->setText(row, col, - TQString("%1").tqarg(t.toDouble())); + TQString("%1").arg(t.toDouble())); } else if ( t.type() == TQVariant::String ) kdDebug(35001) << "I cannot handle strings in the table yet" diff --git a/kchart/kchartFontConfigPage.cc b/kchart/kchartFontConfigPage.cc index eef71cb6..bbda1f68 100644 --- a/kchart/kchartFontConfigPage.cc +++ b/kchart/kchartFontConfigPage.cc @@ -27,7 +27,7 @@ #include <kcolorbutton.h> #include <kdebug.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqlineedit.h> #include <tqlistbox.h> @@ -55,7 +55,7 @@ public: void setFont( const TQFont& font ) { _font = font; - listBox()->tqrepaint(); + listBox()->repaint(); } TQFont font() const { return _font; @@ -90,14 +90,14 @@ KChartFontConfigPage::KChartFontConfigPage( KChartParams* params, // The listbox m_list = new TQListBox(this); - m_list->resize( m_list->tqsizeHint() ); + m_list->resize( m_list->sizeHint() ); grid->addWidget(m_list, 0, 0); // Row 0-0, col 0-1 // The font button. m_fontButton = new TQPushButton( this); m_fontButton->setText(i18n("Font...")); TQWhatsThis::add(m_fontButton, i18n("Select an item in the list above and click on this button to display the KDE font dialog in order to choose a new font for this item.")); - m_fontButton->resize( m_fontButton->tqsizeHint() ); + m_fontButton->resize( m_fontButton->sizeHint() ); grid->addWidget( m_fontButton, 1, 0); #if 0 diff --git a/kchart/kchartHeaderFooterConfigPage.cc b/kchart/kchartHeaderFooterConfigPage.cc index c097c381..89ef02f4 100644 --- a/kchart/kchartHeaderFooterConfigPage.cc +++ b/kchart/kchartHeaderFooterConfigPage.cc @@ -23,7 +23,7 @@ #include <kapplication.h> #include <kdialog.h> #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqlineedit.h> #include <tqbuttongroup.h> @@ -39,64 +39,64 @@ KChartHeaderFooterConfigPage::KChartHeaderFooterConfigPage( KChartParams* params TQWidget* parent ) : TQWidget( parent ),_params( params ) { - TQGridLayout* tqlayout = new TQGridLayout( this, 4, 3 ); - tqlayout->setSpacing( KDialog::spacingHint() ); - tqlayout->setMargin( KDialog::marginHint() ); + TQGridLayout* layout = new TQGridLayout( this, 4, 3 ); + layout->setSpacing( KDialog::spacingHint() ); + layout->setMargin( KDialog::marginHint() ); TQLabel *lab=new TQLabel(i18n("Title:"), this); TQWhatsThis::add(lab, i18n("Write here the title of your chart if you want one. The title will be centered on top above your chart.")); - tqlayout->addWidget(lab,0,0); + layout->addWidget(lab,0,0); titleEdit=new TQLineEdit(this); TQWhatsThis::add(titleEdit, i18n("Write here the title of your chart if you want one. The title will be centered on top above your chart.")); - tqlayout->addWidget(titleEdit,0,1); + layout->addWidget(titleEdit,0,1); titleColorButton=new KColorButton(this); TQWhatsThis::add(titleColorButton, i18n("Click on this button to choose the color for the title font.")); - tqlayout->addWidget(titleColorButton,0,2); + layout->addWidget(titleColorButton,0,2); titleFontButton=new TQPushButton(i18n("Font..."),this); TQWhatsThis::add(titleFontButton, i18n("Click on this button to choose the font family, style and size for the title.")); - tqlayout->addWidget(titleFontButton,0,3); + layout->addWidget(titleFontButton,0,3); connect( titleFontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeTitleFont())); lab=new TQLabel(i18n("Subtitle:"),this); TQWhatsThis::add(lab, i18n("Write here the subtitle of your chart if you want one. The subtitle will be centered on top just below the title.")); - tqlayout->addWidget(lab,1,0); + layout->addWidget(lab,1,0); subtitleEdit=new TQLineEdit(this); TQWhatsThis::add(subtitleEdit, i18n("Write here the subtitle of your chart if you want one. The subtitle will be centered on top just below the title.")); - tqlayout->addWidget(subtitleEdit,1,1); + layout->addWidget(subtitleEdit,1,1); subtitleColorButton=new KColorButton(this); TQWhatsThis::add(subtitleColorButton, i18n("Click on this button to choose the color for the subtitle font.")); - tqlayout->addWidget(subtitleColorButton,1,2); + layout->addWidget(subtitleColorButton,1,2); subtitleFontButton=new TQPushButton(i18n("Font..."),this); TQWhatsThis::add(subtitleFontButton, i18n("Click on this button to choose the font family, style and size for the subtitle.")); - tqlayout->addWidget(subtitleFontButton,1,3); + layout->addWidget(subtitleFontButton,1,3); connect( subtitleFontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeSubtitleFont())); lab=new TQLabel(i18n("Footer:"),this); TQWhatsThis::add(lab, i18n("Write here the footer of your chart if you want one. The footer will be centered at the bottom just below your chart.")); - tqlayout->addWidget(lab,2,0); + layout->addWidget(lab,2,0); footerEdit=new TQLineEdit(this); TQWhatsThis::add(footerEdit, i18n("Write here the subtitle of your chart if you want one. The subtitle will be centered on top just below the title.")); - tqlayout->addWidget(footerEdit,2,1); + layout->addWidget(footerEdit,2,1); footerColorButton=new KColorButton(this); TQWhatsThis::add(footerColorButton, i18n("Click on this button to choose the color for the footer font.")); - tqlayout->addWidget(footerColorButton,2,2); + layout->addWidget(footerColorButton,2,2); footerFontButton=new TQPushButton(i18n("Font..."),this); TQWhatsThis::add(footerFontButton, i18n("Click on this button to choose the font family, style and size for the footer.")); connect( footerFontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeFooterFont())); - tqlayout->addWidget(footerFontButton,2,3); + layout->addWidget(footerFontButton,2,3); - tqlayout->addItem( new TQSpacerItem( 5, 5, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 3, 0 ); + layout->addItem( new TQSpacerItem( 5, 5, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 3, 0 ); - tqlayout->activate(); + layout->activate(); } void KChartHeaderFooterConfigPage::init() diff --git a/kchart/kchartLegendConfigPage.cc b/kchart/kchartLegendConfigPage.cc index 39d99963..2c027138 100644 --- a/kchart/kchartLegendConfigPage.cc +++ b/kchart/kchartLegendConfigPage.cc @@ -49,15 +49,15 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params, TQWidget( parent ),_params( params ) { //Layout for 4 blocks - TQGridLayout* tqlayout = new TQGridLayout( this, 3, 2, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout* layout = new TQGridLayout( this, 3, 2, KDialog::marginHint(), KDialog::spacingHint() ); //1. Block: General settings TQButtonGroup* gb = new TQButtonGroup( 0, Qt::Vertical, i18n("General"), this ); - gb->tqlayout()->setSpacing(KDialog::spacingHint()); - gb->tqlayout()->setMargin(KDialog::marginHint()); - tqlayout->addWidget( gb, 0, 0 ); + gb->layout()->setSpacing(KDialog::spacingHint()); + gb->layout()->setMargin(KDialog::marginHint()); + layout->addWidget( gb, 0, 0 ); - TQGridLayout *grid2 = new TQGridLayout( gb->tqlayout(), 4, 2 ); + TQGridLayout *grid2 = new TQGridLayout( gb->layout(), 4, 2 ); TQLabel* lab = new TQLabel( i18n("Title:"), gb ); TQWhatsThis::add(lab, i18n("Write here the title of the legend, which is displayed at the top of the legend box.")); @@ -70,11 +70,11 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params, gb = new TQButtonGroup( 0, Qt::Vertical, i18n("Legend Position"), this ); TQWhatsThis::add(gb, i18n("<qt>Choose the location of the legend on the chart by " "clicking a location button.\nUse the central button to <b>hide</b> the legend.</qt>")); - gb->tqlayout()->setSpacing(KDialog::spacingHint()); - gb->tqlayout()->setMargin(KDialog::marginHint()); + gb->layout()->setSpacing(KDialog::spacingHint()); + gb->layout()->setMargin(KDialog::marginHint()); gb->setExclusive( true ); - TQGridLayout *grid1 = new TQGridLayout( gb->tqlayout(), 5, 5 ); + TQGridLayout *grid1 = new TQGridLayout( gb->layout(), 5, 5 ); lTopLeft = addButton( grid1, gb, i18n("Top-Left"), "chart_legend_topleft", 0, 0 ); lTopLeftTop = addButton( grid1, gb, i18n("Top-Left-Top"), "chart_legend_toplefttop", 0, 1 ); @@ -98,17 +98,17 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params, lBottomRightBottom= addButton( grid1, gb, i18n("Bottom-Right-Bottom"), "chart_legend_bottomrightbottom",4, 3 ); lBottomRight = addButton( grid1, gb, i18n("Bottom-Right"), "chart_legend_bottomright", 4, 4 ); - gb->tqsetAlignment( TQt::AlignLeft ); - tqlayout->addMultiCellWidget( gb, 1,2, 0,0 ); + gb->setAlignment( TQt::AlignLeft ); + layout->addMultiCellWidget( gb, 1,2, 0,0 ); // 3. Block: Font gb = new TQButtonGroup( 0, Qt::Vertical, i18n("Font"), this ); TQWhatsThis::add(gb, i18n("This Font box can be used to set different fonts for the legend title and the individual entries.")); - gb->tqlayout()->setSpacing(KDialog::spacingHint()); - gb->tqlayout()->setMargin(KDialog::marginHint()); - tqlayout->addWidget( gb, 0, 1 ); + gb->layout()->setSpacing(KDialog::spacingHint()); + gb->layout()->setMargin(KDialog::marginHint()); + layout->addWidget( gb, 0, 1 ); - TQGridLayout *grid4 = new TQGridLayout( gb->tqlayout(), 4, 2 ); + TQGridLayout *grid4 = new TQGridLayout( gb->layout(), 4, 2 ); titleLegendFontButton = new TQPushButton( gb ); lab = new TQLabel( i18n("Legend title font:"), gb ); @@ -134,9 +134,9 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params, orientationGroup = new TQVButtonGroup( i18n("Orientation"), this ); TQWhatsThis::add(orientationGroup, i18n("Select, if the legend's items should be drawn next to each other, or below each other.")); orientationGroup->setRadioButtonExclusive(true); - orientationGroup->tqlayout()->setSpacing(KDialog::spacingHint()); - orientationGroup->tqlayout()->setMargin(KDialog::marginHint()); - tqlayout->addWidget( orientationGroup, 1, 1 ); + orientationGroup->layout()->setSpacing(KDialog::spacingHint()); + orientationGroup->layout()->setMargin(KDialog::marginHint()); + layout->addWidget( orientationGroup, 1, 1 ); TQRadioButton* orientation = new TQRadioButton( i18n("Vertically"), orientationGroup ); orientation = new TQRadioButton( i18n("Horizontally"), orientationGroup ); @@ -145,11 +145,11 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params, // 5. Block: Text Colors gb = new TQButtonGroup( 0, Qt::Vertical, i18n("Color"), this ); TQWhatsThis::add(gb, i18n("This Color box can be used to set different colors for the legend title and text.")); - gb->tqlayout()->setSpacing(KDialog::spacingHint()); - gb->tqlayout()->setMargin(KDialog::marginHint()); - tqlayout->addWidget( gb, 2, 1 ); + gb->layout()->setSpacing(KDialog::spacingHint()); + gb->layout()->setMargin(KDialog::marginHint()); + layout->addWidget( gb, 2, 1 ); - TQGridLayout *grid3 = new TQGridLayout( gb->tqlayout(), 6, 2 ); + TQGridLayout *grid3 = new TQGridLayout( gb->layout(), 6, 2 ); lab = new TQLabel( i18n("Legend title color:"), gb ); grid3->addWidget( lab, 0, 0 ); @@ -177,7 +177,7 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params, //it's not good but I don't know how //to reduce space - tqlayout->addColSpacing( 1, 300 ); + layout->addColSpacing( 1, 300 ); } void KChartLegendConfigPage::init() @@ -364,7 +364,7 @@ void KChartLegendConfigPage::apply() _params->setLegendFontRelSize(textLegend.pointSize()); } -TQPushButton* KChartLegendConfigPage::addButton( TQGridLayout* tqlayout, +TQPushButton* KChartLegendConfigPage::addButton( TQGridLayout* layout, TQButtonGroup* gb, const TQString &toolTipText, const TQString &icon, @@ -378,7 +378,7 @@ TQPushButton* KChartLegendConfigPage::addButton( TQGridLayout* tqlayout, KIcon::DefaultState, KChartFactory::global() ) ); TQToolTip::add( button, toolTipText ); - tqlayout->addWidget( button, posY, posX ); + layout->addWidget( button, posY, posX ); return button; } diff --git a/kchart/kchartLegendConfigPage.h b/kchart/kchartLegendConfigPage.h index 8419baa8..efab8b31 100644 --- a/kchart/kchartLegendConfigPage.h +++ b/kchart/kchartLegendConfigPage.h @@ -23,7 +23,7 @@ #include <tqwidget.h> #include <tqbutton.h> -#include <tqlayout.h> +#include <layout.h> class TQVButtonGroup; class TQRadioButton; @@ -64,7 +64,7 @@ private: TQPushButton *titleLegendFontButton, *textLegendFontButton; TQButton::ToggleState titleLegendIsRelative, textLegendIsRelative; - TQPushButton* addButton( TQGridLayout* tqlayout, TQButtonGroup* gb, + TQPushButton* addButton( TQGridLayout* layout, TQButtonGroup* gb, const TQString &toolTipText, const TQString &icon, int posY, int posX ); }; diff --git a/kchart/kchartLine3dConfigPage.cc b/kchart/kchartLine3dConfigPage.cc index adf56a3d..b3a3eaf5 100644 --- a/kchart/kchartLine3dConfigPage.cc +++ b/kchart/kchartLine3dConfigPage.cc @@ -23,7 +23,7 @@ #include <kapplication.h> #include <klocale.h> #include <kdialog.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqbuttongroup.h> @@ -67,7 +67,7 @@ KChartLine3dConfigPage::KChartLine3dConfigPage( KChartParams* params, tmpLabel = new TQLabel( i18n( "Rotation around the X-axis in degrees:" ), this ); - tmpLabel->resize( tmpLabel->tqsizeHint() ); + tmpLabel->resize( tmpLabel->sizeHint() ); grid1->addWidget(tmpLabel,4,0); angle3dX=new KIntNumInput(0, this, 10); @@ -75,7 +75,7 @@ KChartLine3dConfigPage::KChartLine3dConfigPage( KChartParams* params, angle3dX->setRange(0, 90, 1); tmpLabel = new TQLabel( i18n( "Rotation around the Y-axis in degrees:" ), this ); - tmpLabel->resize( tmpLabel->tqsizeHint() ); + tmpLabel->resize( tmpLabel->sizeHint() ); grid1->addWidget(tmpLabel,5,0); angle3dY=new KIntNumInput(0, this, 10); @@ -84,11 +84,11 @@ KChartLine3dConfigPage::KChartLine3dConfigPage( KChartParams* params, tmpLabel = new TQLabel( i18n( "Depth:" ), this ); - tmpLabel->resize( tmpLabel->tqsizeHint() ); + tmpLabel->resize( tmpLabel->sizeHint() ); grid1->addWidget(tmpLabel,6,0); depth=new KDoubleNumInput(0, this); - depth->resize(100,depth->tqsizeHint().height()); + depth->resize(100,depth->sizeHint().height()); grid1->addWidget(depth,6,1); depth->setRange(0,40, 0.1); #endif @@ -101,7 +101,7 @@ KChartLine3dConfigPage::KChartLine3dConfigPage( KChartParams* params, grid1->activate(); //it's not good but I don't know how //to reduce space - //tqlayout->addColSpacing(1,300); + //layout->addColSpacing(1,300); } void KChartLine3dConfigPage::slotChange3DParameter(bool b) diff --git a/kchart/kchartPageLayout.cc b/kchart/kchartPageLayout.cc index 8fd9c9d0..6bb5b9fc 100644 --- a/kchart/kchartPageLayout.cc +++ b/kchart/kchartPageLayout.cc @@ -22,7 +22,7 @@ #include "kchart_params.h" #include <knumvalidator.h> #include <tqlineedit.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <tqlabel.h> #include <tqgroupbox.h> @@ -43,10 +43,10 @@ KChartPageLayout::KChartPageLayout( KChartParams* _params, TQWidget* parent, con setMainWidget(page); // FIXME: The following code is strange, since it is written to - // use a grid tqlayout with a standard TQWidget. However, with the + // use a grid layout with a standard TQWidget. However, with the // TQGroupBox, it looks better, and since it actually works, there // is no immediate need for rewriting. In the sake of clarity, it - // should be done though, and we should use the tqlayout + // should be done though, and we should use the layout // capabilities of the groupbox instead.. setButtonText( KDialogBase::User1, i18n("&Reset") ); diff --git a/kchart/kchartParameter3dConfigPage.cc b/kchart/kchartParameter3dConfigPage.cc index 760c9786..39005e29 100644 --- a/kchart/kchartParameter3dConfigPage.cc +++ b/kchart/kchartParameter3dConfigPage.cc @@ -23,7 +23,7 @@ #include <kapplication.h> #include <kdialog.h> #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqbuttongroup.h> @@ -38,17 +38,17 @@ KChartParameter3dConfigPage::KChartParameter3dConfigPage( KChartParams* params, TQWidget* parent ) : TQWidget( parent ),m_params( params ) { - TQGridLayout* tqlayout = new TQGridLayout(this, 2, 2,KDialog::marginHint(),KDialog::spacingHint()); + TQGridLayout* layout = new TQGridLayout(this, 2, 2,KDialog::marginHint(),KDialog::spacingHint()); TQButtonGroup* gb = new TQButtonGroup( 0, Qt::Vertical, i18n("3D Parameters"), this ); - gb->tqlayout()->setSpacing(KDialog::spacingHint()); - gb->tqlayout()->setMargin(KDialog::marginHint()); + gb->layout()->setSpacing(KDialog::spacingHint()); + gb->layout()->setMargin(KDialog::marginHint()); - // The grid tqlayout inside the buttongroup. - TQGridLayout *grid1 = new TQGridLayout(gb->tqlayout(), 5, 3); - tqlayout->addWidget(gb,0,0); + // The grid layout inside the buttongroup. + TQGridLayout *grid1 = new TQGridLayout(gb->layout(), 5, 3); + layout->addWidget(gb,0,0); // The main on/off checkbox. bar3d=new TQCheckBox(i18n("3D bar"),gb); @@ -64,7 +64,7 @@ KChartParameter3dConfigPage::KChartParameter3dConfigPage( KChartParams* params, grid1->addWidget(drawShadowColor,1,0); TQLabel *tmpLabel = new TQLabel( i18n( "Angle:" ), gb ); - tmpLabel->resize( tmpLabel->tqsizeHint() ); + tmpLabel->resize( tmpLabel->sizeHint() ); grid1->addWidget(tmpLabel,2,0); angle3d=new KIntNumInput(0, gb, 10); @@ -73,16 +73,16 @@ KChartParameter3dConfigPage::KChartParameter3dConfigPage( KChartParams* params, angle3d->setRange(0, 90, 1); tmpLabel = new TQLabel( i18n( "Depth:" ), gb ); - tmpLabel->resize( tmpLabel->tqsizeHint() ); + tmpLabel->resize( tmpLabel->sizeHint() ); grid1->addWidget(tmpLabel,3,0); depth=new KDoubleNumInput(0, gb); TQWhatsThis::add(depth, i18n("You can set here the depth of the 3D effect from 0 to 2. 0 will give you no depth at all.\nDefault is 1.")); - depth->resize(100,depth->tqsizeHint().height()); + depth->resize(100,depth->sizeHint().height()); grid1->addWidget(depth,3,1); depth->setRange(0, 2.0, 0.1); - gb->tqsetAlignment(TQt::AlignLeft); + gb->setAlignment(TQt::AlignLeft); grid1->addColSpacing(0,depth->width()); grid1->addColSpacing(0,angle3d->width()); grid1->setColStretch(2,1); @@ -90,7 +90,7 @@ KChartParameter3dConfigPage::KChartParameter3dConfigPage( KChartParams* params, //it's not good but I don't know how //to reduce space - //tqlayout->addColSpacing(1,300); + //layout->addColSpacing(1,300); } diff --git a/kchart/kchartParameterConfigPage.cc b/kchart/kchartParameterConfigPage.cc index bffa3099..cd9e0f03 100644 --- a/kchart/kchartParameterConfigPage.cc +++ b/kchart/kchartParameterConfigPage.cc @@ -23,7 +23,7 @@ #include <kapplication.h> #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqlineedit.h> @@ -44,17 +44,17 @@ KChartParameterConfigPage::KChartParameterConfigPage( KChartParams* params, TQWidget* parent ) : TQWidget( parent ),_params( params ) { - // toplevel tqlayout + // toplevel layout TQVBoxLayout* toplevel = new TQVBoxLayout( this, 10 ); - TQGridLayout* tqlayout = new TQGridLayout( 1, 3 ); - toplevel->addLayout( tqlayout ); + TQGridLayout* layout = new TQGridLayout( 1, 3 ); + toplevel->addLayout( layout ); // The "Parameters" button group TQButtonGroup* gb1 = new TQButtonGroup( 0, Qt::Vertical, i18n("Parameters"), this ); - gb1->tqlayout()->setSpacing(KDialog::spacingHint()); - gb1->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *grid1 = new TQGridLayout(gb1->tqlayout(),9,1); + gb1->layout()->setSpacing(KDialog::spacingHint()); + gb1->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *grid1 = new TQGridLayout(gb1->layout(),9,1); grid = new TQCheckBox( i18n( "Grid" ), gb1 ); TQWhatsThis::add(grid, i18n("If this is checked, the grid is shown. If you uncheck this option, the grid will not be displayed anymore.")); @@ -93,9 +93,9 @@ KChartParameterConfigPage::KChartParameterConfigPage( KChartParams* params, // The "Settings" button group TQButtonGroup* gb2 = new TQButtonGroup( 0, Qt::Vertical, i18n("Settings"), this ); - gb2->tqlayout()->setSpacing(KDialog::spacingHint()); - gb2->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *grid2 = new TQGridLayout(gb2->tqlayout(),8,1); + gb2->layout()->setSpacing(KDialog::spacingHint()); + gb2->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *grid2 = new TQGridLayout(gb2->layout(),8,1); TQBoxLayout * l = new TQVBoxLayout( grid2 ); @@ -160,8 +160,8 @@ KChartParameterConfigPage::KChartParameterConfigPage( KChartParams* params, ylabel2_fmt->setMaximumWidth(130); grid2->addWidget(ylabel2_fmt,5,1); #endif - tqlayout->addWidget(gb1,0,0); - tqlayout->addWidget(gb2,0,1); + layout->addWidget(gb1,0,0); + layout->addWidget(gb2,0,1); #if 0 grid1->activate(); diff --git a/kchart/kchartParameterPieConfigPage.cc b/kchart/kchartParameterPieConfigPage.cc index 632e46d1..0921cced 100644 --- a/kchart/kchartParameterPieConfigPage.cc +++ b/kchart/kchartParameterPieConfigPage.cc @@ -26,7 +26,7 @@ #include <kdebug.h> #include <kdialog.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqbuttongroup.h> #include <tqcheckbox.h> diff --git a/kchart/kchartParameterPolarConfigPage.cc b/kchart/kchartParameterPolarConfigPage.cc index 807cd54e..63d5e5ee 100644 --- a/kchart/kchartParameterPolarConfigPage.cc +++ b/kchart/kchartParameterPolarConfigPage.cc @@ -26,7 +26,7 @@ #include <kdebug.h> #include <kdialog.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqbuttongroup.h> #include <tqcheckbox.h> diff --git a/kchart/kchartPieConfigPage.cc b/kchart/kchartPieConfigPage.cc index 9a71b9b1..5bfd36c0 100644 --- a/kchart/kchartPieConfigPage.cc +++ b/kchart/kchartPieConfigPage.cc @@ -22,7 +22,7 @@ #include <kapplication.h> #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <kfontdialog.h> @@ -50,35 +50,35 @@ KChartPieConfigPage::KChartPieConfigPage( KChartParams* params, KDialog::spacingHint()); // The listview list = new TQListView( this ); - list->resize( list->tqsizeHint() ); + list->resize( list->sizeHint() ); grid->addMultiCellWidget(list,0,9,0,0); list->addColumn( i18n("Hide Piece") ); list->setRootIsDecorated( TRUE ); TQLabel* label = new TQLabel( i18n( "Column active:" ), this ); - label->resize( label->tqsizeHint() ); + label->resize( label->sizeHint() ); grid->addWidget( label,0,1); column = new TQSpinBox(1, data->cols(), 1, this); - column->resize(100, column->tqsizeHint().height() ); + column->resize(100, column->sizeHint().height() ); grid->addWidget( column,1,1); column->setValue(col+1); label = new TQLabel( i18n( "Move piece to:" ), this ); - label->resize( label->tqsizeHint() ); + label->resize( label->sizeHint() ); grid->addWidget( label,2,1); dist = new TQSpinBox(0, 400, 1, this); - dist->resize(100, dist->tqsizeHint().height() ); + dist->resize(100, dist->sizeHint().height() ); grid->addWidget( dist,3,1); label = new TQLabel( i18n( "Explode factor (%):" ), this ); - label->resize( label->tqsizeHint() ); + label->resize( label->sizeHint() ); grid->addWidget( label,4,1); explose = new TQSpinBox(0, 100, 1, this); - explose->resize(100, explose->tqsizeHint().height() ); + explose->resize(100, explose->sizeHint().height() ); grid->addWidget( explose,5,1); grid->addColSpacing(0,list->width()); diff --git a/kchart/kchartPrinterDlg.cc b/kchart/kchartPrinterDlg.cc index 9bd898d6..1d69a0af 100644 --- a/kchart/kchartPrinterDlg.cc +++ b/kchart/kchartPrinterDlg.cc @@ -21,7 +21,7 @@ */ // TQt includes -#include <tqlayout.h> +#include <layout.h> // KDE includes #include <kdebug.h> @@ -37,9 +37,9 @@ namespace KChart : KPrintDialogPage( parent, name ) { setTitle( i18n( "KChart Options" ) ); - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->setMargin( KDialog::marginHint() ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->setMargin( KDialog::marginHint() ); + layout->setSpacing( KDialog::spacingHint() ); txtSizex = new KIntNumInput(this ); txtSizex->setSuffix("%"); txtSizex->setMinValue(1); @@ -51,12 +51,12 @@ namespace KChart txtSizey->setMaxValue(100); txtSizey->setValue(100); - tqlayout->addWidget( new TQLabel(i18n("Print Size"), this) ); - tqlayout->addWidget( new TQLabel(i18n("Width: "), this) ); - tqlayout->addWidget( txtSizex ); - tqlayout->addWidget( new TQLabel(i18n("Height: "), this) ); - tqlayout->addWidget( txtSizey ); - tqlayout->addStretch( 1 ); + layout->addWidget( new TQLabel(i18n("Print Size"), this) ); + layout->addWidget( new TQLabel(i18n("Width: "), this) ); + layout->addWidget( txtSizex ); + layout->addWidget( new TQLabel(i18n("Height: "), this) ); + layout->addWidget( txtSizey ); + layout->addStretch( 1 ); } void KChartPrinterDlg::getOptions( TQMap<TQString, TQString>& opts, bool ) diff --git a/kchart/kchartSubTypeChartPage.cc b/kchart/kchartSubTypeChartPage.cc index 13585d7a..01afbd1b 100644 --- a/kchart/kchartSubTypeChartPage.cc +++ b/kchart/kchartSubTypeChartPage.cc @@ -31,7 +31,7 @@ #include <tqspinbox.h> #include <tqlabel.h> #include <tqhgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwhatsthis.h> #include <tqvbox.h> @@ -56,7 +56,7 @@ KChartHiloSubTypeChartPage::KChartHiloSubTypeChartPage( KChartParams* params, subtypeBG->insert( stacked, KDChartParams::AreaStacked ); percent = new TQRadioButton( i18n("HiLoOpenClose"), subtypeBG ); subtypeBG->insert( percent, KDChartParams::AreaPercent ); - subtypeBG->setFixedWidth( subtypeBG->tqsizeHint().width() ); + subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() ); connect( subtypeBG, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotChangeSubType( int ) ) ); @@ -64,7 +64,7 @@ KChartHiloSubTypeChartPage::KChartHiloSubTypeChartPage( KChartParams* params, TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose.")); toplevel->addWidget( exampleGB, 2 ); exampleLA = new TQLabel( exampleGB ); - exampleLA->tqsetAlignment( AlignCenter | AlignVCenter ); + exampleLA->setAlignment( AlignCenter | AlignVCenter ); // PENDING(kalle) Make image scale with available space once TQt 2.2 is out. } @@ -135,7 +135,7 @@ KChartAreaSubTypeChartPage::KChartAreaSubTypeChartPage( KChartParams* params, subtypeBG->insert( stacked, KDChartParams::AreaStacked ); percent = new TQRadioButton( i18n( "Percent" ), subtypeBG ); subtypeBG->insert( percent, KDChartParams::AreaPercent ); - subtypeBG->setFixedWidth( subtypeBG->tqsizeHint().width() ); + subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() ); connect( subtypeBG, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotChangeSubType( int ) ) ); @@ -143,7 +143,7 @@ KChartAreaSubTypeChartPage::KChartAreaSubTypeChartPage( KChartParams* params, TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose.")); toplevel->addWidget( exampleGB, 2 ); exampleLA = new TQLabel( exampleGB ); - exampleLA->tqsetAlignment( AlignCenter | AlignVCenter ); + exampleLA->setAlignment( AlignCenter | AlignVCenter ); // PENDING(kalle) Make image scale with available space once TQt 2.2 is out. } @@ -219,14 +219,14 @@ KChartBarSubTypeChartPage::KChartBarSubTypeChartPage( KChartParams* params, percent = new TQRadioButton( i18n( "Percent" ), subtypeBG ); subtypeBG->insert( percent, KDChartParams::BarPercent ); - subtypeBG->setFixedWidth( subtypeBG->tqsizeHint().width() ); + subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() ); connect( subtypeBG, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotChangeSubType( int ) ) ); //TQHBox *hbox = new TQHBox( this ); new TQLabel( i18n( "Number of lines: "), left ); m_numLines = new TQSpinBox( left ); - // FIXME: Use a grid tqlayout instead + // FIXME: Use a grid layout instead new TQLabel( "", left); left->setStretchFactor( left, 1 ); @@ -234,7 +234,7 @@ KChartBarSubTypeChartPage::KChartBarSubTypeChartPage( KChartParams* params, TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose.")); toplevel->addWidget( exampleGB, 2 ); exampleLA = new TQLabel( exampleGB ); - exampleLA->tqsetAlignment( AlignCenter | AlignVCenter ); + exampleLA->setAlignment( AlignCenter | AlignVCenter ); } void KChartBarSubTypeChartPage::init() @@ -309,7 +309,7 @@ KChartLineSubTypeChartPage::KChartLineSubTypeChartPage( KChartParams* params, subtypeBG->insert( stacked, KDChartParams::AreaStacked ); percent = new TQRadioButton( i18n( "Percent" ), subtypeBG ); subtypeBG->insert( percent, KDChartParams::AreaPercent ); - subtypeBG->setFixedWidth( subtypeBG->tqsizeHint().width() ); + subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() ); connect( subtypeBG, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotChangeSubType( int ) ) ); @@ -317,7 +317,7 @@ KChartLineSubTypeChartPage::KChartLineSubTypeChartPage( KChartParams* params, TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose.")); toplevel->addWidget( exampleGB, 2 ); exampleLA = new TQLabel( exampleGB ); - exampleLA->tqsetAlignment( AlignCenter | AlignVCenter ); + exampleLA->setAlignment( AlignCenter | AlignVCenter ); // PENDING(kalle) Make image scale with available space once TQt 2.2 is out. } @@ -388,7 +388,7 @@ KChartPolarSubTypeChartPage::KChartPolarSubTypeChartPage( KChartParams* params, subtypeBG->insert( stacked, KDChartParams::AreaStacked ); percent = new TQRadioButton( i18n( "Percent" ), subtypeBG ); subtypeBG->insert( percent, KDChartParams::AreaPercent ); - subtypeBG->setFixedWidth( subtypeBG->tqsizeHint().width() ); + subtypeBG->setFixedWidth( subtypeBG->sizeHint().width() ); connect( subtypeBG, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotChangeSubType( int ) ) ); @@ -396,7 +396,7 @@ KChartPolarSubTypeChartPage::KChartPolarSubTypeChartPage( KChartParams* params, TQWhatsThis::add(exampleGB, i18n("Preview the sub-type you choose.")); toplevel->addWidget( exampleGB, 2 ); exampleLA = new TQLabel( exampleGB ); - exampleLA->tqsetAlignment( AlignCenter | AlignVCenter ); + exampleLA->setAlignment( AlignCenter | AlignVCenter ); // PENDING(kalle) Make image scale with available space once TQt 2.2 is out. } diff --git a/kchart/kchartWizardLabelsLegendPage.cc b/kchart/kchartWizardLabelsLegendPage.cc index 396264d8..4389ce07 100644 --- a/kchart/kchartWizardLabelsLegendPage.cc +++ b/kchart/kchartWizardLabelsLegendPage.cc @@ -8,7 +8,7 @@ #include <tqlabel.h> #include <klocale.h> #include <kfontdialog.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqcolor.h> diff --git a/kchart/kchartWizardSelectChartSubTypePage.cc b/kchart/kchartWizardSelectChartSubTypePage.cc index 74804042..deeca478 100644 --- a/kchart/kchartWizardSelectChartSubTypePage.cc +++ b/kchart/kchartWizardSelectChartSubTypePage.cc @@ -10,7 +10,7 @@ #include <tqlabel.h> #include <tqptrcollection.h> #include <tqobjectlist.h> -#include <tqlayout.h> +#include <layout.h> #include <tqhbox.h> #include <kdebug.h> @@ -44,7 +44,7 @@ KChartWizardSelectChartSubTypePage::KChartWizardSelectChartSubTypePage( TQWidget TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Chart Sub Type" ), this ); grp->setRadioButtonExclusive( true ); - grp->tqlayout(); + grp->layout(); lay1->addWidget(grp); m_normal = new TQRadioButton( i18n( "Normal" ), grp ); m_stacked = new TQRadioButton( i18n( "Stacked" ), grp ); diff --git a/kchart/kchartWizardSelectChartTypePage.cc b/kchart/kchartWizardSelectChartTypePage.cc index 9928c2db..dc4cbf8a 100644 --- a/kchart/kchartWizardSelectChartTypePage.cc +++ b/kchart/kchartWizardSelectChartTypePage.cc @@ -28,8 +28,8 @@ KChartButton::KChartButton(TQWidget *parent, const TQString & _text, const TQPix // The text TQLabel *label = new TQLabel(_text, this); - label->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); - tqsetSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed); + label->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); + setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed); } KChartButton::~KChartButton() diff --git a/kchart/kchartWizardSelectChartTypePage.h b/kchart/kchartWizardSelectChartTypePage.h index 2fb8d612..bc39b505 100644 --- a/kchart/kchartWizardSelectChartTypePage.h +++ b/kchart/kchartWizardSelectChartTypePage.h @@ -1,7 +1,7 @@ #ifndef _kchartWIZARDSELECTCHARTTYPEPAGE_H #define _kchartWIZARDSELECTCHARTTYPEPAGE_H -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <tqwidget.h> diff --git a/kchart/kchartWizardSelectDataFormatPage.cc b/kchart/kchartWizardSelectDataFormatPage.cc index 38606259..588d1635 100644 --- a/kchart/kchartWizardSelectDataFormatPage.cc +++ b/kchart/kchartWizardSelectDataFormatPage.cc @@ -5,7 +5,7 @@ #include <tqhbox.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqlineedit.h> #include <tqlistbox.h> @@ -51,10 +51,10 @@ KChartWizardSelectDataFormatPage::KChartWizardSelectDataFormatPage( TQWidget* pa TQButtonGroup *gb = new TQVButtonGroup( i18n( "Data Format" ), this ); m_rowMajor = new TQRadioButton( i18n( "Data in rows" ), gb ); - m_rowMajor->resize( m_rowMajor->tqsizeHint() ); + m_rowMajor->resize( m_rowMajor->sizeHint() ); m_colMajor = new TQRadioButton( i18n( "Data in columns" ), gb ); - m_colMajor->resize( m_colMajor->tqsizeHint() ); + m_colMajor->resize( m_colMajor->sizeHint() ); grid1->addWidget(gb, 3, 0); diff --git a/kchart/kchartWizardSetupAxesPage.cc b/kchart/kchartWizardSetupAxesPage.cc index 76be1f0d..b3734e13 100644 --- a/kchart/kchartWizardSetupAxesPage.cc +++ b/kchart/kchartWizardSetupAxesPage.cc @@ -7,7 +7,7 @@ #include <tqlineedit.h> #include <tqcheckbox.h> #include <tqgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kfontdialog.h> #include <knumvalidator.h> diff --git a/kchart/kchartWizardSetupDataPage.cc b/kchart/kchartWizardSetupDataPage.cc index b2ba26ac..1d057d4c 100644 --- a/kchart/kchartWizardSetupDataPage.cc +++ b/kchart/kchartWizardSetupDataPage.cc @@ -22,7 +22,7 @@ KChartWizardSetupDataPage::KChartWizardSetupDataPage( TQWidget* parent, tmpTQGroupBox = new TQButtonGroup( this, "GroupBox_1" ); tmpTQGroupBox->setGeometry( 260, 10, 130, 80 ); tmpTQGroupBox->setFrameStyle( 49 ); - tmpTQGroupBox->tqsetAlignment( 1 ); + tmpTQGroupBox->setAlignment( 1 ); datarow = new TQRadioButton( this, "RadioButton_1" ); datarow->setGeometry( 270, 40, 100, 20 ); @@ -57,7 +57,7 @@ KChartWizardSetupDataPage::KChartWizardSetupDataPage( TQWidget* parent, tmpTQLabel = new TQLabel( this, "Label_4" ); tmpTQLabel->setGeometry( 280, 110, 100, 30 ); tmpTQLabel->setText( i18n("Use first row as description") ); - tmpTQLabel->tqsetAlignment( 1313 ); + tmpTQLabel->setAlignment( 1313 ); rowdescript = new TQCheckBox( this, "CheckBox_4" ); rowdescript->setGeometry( 260, 150, 20, 30 ); @@ -69,7 +69,7 @@ KChartWizardSetupDataPage::KChartWizardSetupDataPage( TQWidget* parent, tmpTQLabel = new TQLabel( this, "Label_5" ); tmpTQLabel->setGeometry( 280, 150, 100, 30 ); tmpTQLabel->setText( i18n("Use first column as description") ); - tmpTQLabel->tqsetAlignment( 1313 ); + tmpTQLabel->setAlignment( 1313 ); TQFrame* tmpTQFrame; tmpTQFrame = new TQFrame( this, "Frame_1" ); diff --git a/kchart/kchart_params.cc b/kchart/kchart_params.cc index ddf3d1b4..55a158d7 100644 --- a/kchart/kchart_params.cc +++ b/kchart/kchart_params.cc @@ -252,7 +252,7 @@ bool KChartParams::loadOasis( const TQDomElement &chartElem, // If we can't find out what charttype it is, we might as well end here. if ( !knownType ) { - errorMessage = i18n( "Unknown chart type %1" ).tqarg( chartClass ); + errorMessage = i18n( "Unknown chart type %1" ).arg( chartClass ); kdDebug(35001) << errorMessage << endl; return false; } @@ -701,7 +701,7 @@ bool KChartParams::loadOasisAxis( const TQDomElement &axisElem, // chart:visible - true if labels + ticks should be shown. - // tqchildren: + // children: // chart: // chart: // chart: diff --git a/kchart/kchart_part.cc b/kchart/kchart_part.cc index f0fda2f0..358f5ab7 100644 --- a/kchart/kchart_part.cc +++ b/kchart/kchart_part.cc @@ -30,7 +30,7 @@ using std::cerr; #include <kdebug.h> #include <tqdom.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqbuffer.h> #include <tqpainter.h> @@ -225,12 +225,12 @@ void KChartPart::generateBarChartTemplate() // Fill column label, but only on the first iteration. if (row == 0) { - m_colLabels << i18n("Column %1").tqarg(col + 1); + m_colLabels << i18n("Column %1").arg(col + 1); } } // Fill row label. - m_rowLabels << i18n("Row %1").tqarg(row + 1); + m_rowLabels << i18n("Row %1").arg(row + 1); } } @@ -994,7 +994,7 @@ bool KChartPart::loadOasis( const TQDomDocument& doc, if ( localName.isEmpty() ) setErrorMessage( i18n( "Invalid OASIS OpenDocument file. No tag found inside office:body." ) ); else - setErrorMessage( i18n( "This document is not a chart, but %1. Please try opening it with the appropriate application." ).tqarg( KoDocument::tagNameToDocumentType( localName ) ) ); + setErrorMessage( i18n( "This document is not a chart, but %1. Please try opening it with the appropriate application." ).arg( KoDocument::tagNameToDocumentType( localName ) ) ); return false; } diff --git a/kchart/kchart_view.cc b/kchart/kchart_view.cc index 5b1cc6b2..b009e1ca 100644 --- a/kchart/kchart_view.cc +++ b/kchart/kchart_view.cc @@ -678,7 +678,7 @@ void KChartView::importData() TQFile inFile(filename); if (!inFile.open(IO_ReadOnly)) { KMessageBox::sorry( 0, i18n("The file %1 could not be read.") - .tqarg(filename) ); + .arg(filename) ); inFile.close(); return; } diff --git a/kchart/kdchart/KDChart.cpp b/kchart/kdchart/KDChart.cpp index 415f013a..4d8fd0c8 100644 --- a/kchart/kdchart/KDChart.cpp +++ b/kchart/kdchart/KDChart.cpp @@ -302,7 +302,7 @@ void KDChart::paint( TQPainter* painter, } //qDebug("xxx" ); if( (params || data) && !setupGeometry( painter, params, data, drawRect ) ){ - qDebug("ERROR: KDChart::paint() could not calculate the chart tqgeometry."); + qDebug("ERROR: KDChart::paint() could not calculate the chart geometry."); bOk = false; } }else{ @@ -388,7 +388,7 @@ void KDChart::initInterpreter( TQSInterpreter* interpreter ) void KDChart::initProject( TQSProject* project ) { - project->createScript( TQString::tqfromLatin1( "KDCHART_Globals" ), globals() ); + project->createScript( TQString::fromLatin1( "KDCHART_Globals" ), globals() ); privateInitInterpreter( project->interpreter() ); } @@ -431,20 +431,20 @@ TQString KDChart::globals() for( TQMapIterator<char*,double> it= intMap.begin(); it != intMap.end(); ++it ) { // This is written this way to be efficient - globals += TQString::tqfromLatin1( "const " ); + globals += TQString::fromLatin1( "const " ); globals += it.key(); globals += " = "; globals += TQString::number( it.data() ); globals += ";\n"; } - globals += TQString::tqfromLatin1( "const KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT=\"%1\";\n" ) - .tqarg( TQString::tqfromLatin1( KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT ) ); - globals += TQString::tqfromLatin1( "const KDCHART_AXIS_LABELS_AUTO_LIMIT = 140319.64;\n" ); - globals += TQString::tqfromLatin1( "const KDCHART_DEFAULT_AXIS_GRID_COLOR = new Color(\"%1\");\n" ) - .tqarg(KDCHART_DEFAULT_AXIS_GRID_COLOR.name()); - globals += TQString::tqfromLatin1( "const KDCHART_DATA_VALUE_AUTO_COLOR = new Color(\"%1\");\n" ) - .tqarg( (KDCHART_DATA_VALUE_AUTO_COLOR)->name()); + globals += TQString::fromLatin1( "const KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT=\"%1\";\n" ) + .arg( TQString::fromLatin1( KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT ) ); + globals += TQString::fromLatin1( "const KDCHART_AXIS_LABELS_AUTO_LIMIT = 140319.64;\n" ); + globals += TQString::fromLatin1( "const KDCHART_DEFAULT_AXIS_GRID_COLOR = new Color(\"%1\");\n" ) + .arg(KDCHART_DEFAULT_AXIS_GRID_COLOR.name()); + globals += TQString::fromLatin1( "const KDCHART_DATA_VALUE_AUTO_COLOR = new Color(\"%1\");\n" ) + .arg( (KDCHART_DATA_VALUE_AUTO_COLOR)->name()); TQMap<char*,TQColor> colorMap; @@ -469,14 +469,14 @@ TQString KDChart::globals() colorMap.insert( "TQt.darkYellow", TQt::darkYellow ); for( TQMapIterator<char*,TQColor> it2= colorMap.begin(); it2 != colorMap.end(); ++it2 ) { // This is written this way to be efficient - globals += TQString::tqfromLatin1( it2.key() ); - globals += TQString::tqfromLatin1( " = new Color( " ); + globals += TQString::fromLatin1( it2.key() ); + globals += TQString::fromLatin1( " = new Color( " ); globals += TQString::number( it2.data().red() ); globals += ','; globals += TQString::number( it2.data().green() ); globals += ','; globals += TQString::number( it2.data().blue() ); - globals += TQString::tqfromLatin1( " );\n" ); + globals += TQString::fromLatin1( " );\n" ); } //qDebug( "%s",globals.latin1() ); return globals; diff --git a/kchart/kdchart/KDChartAreaPainter.cpp b/kchart/kdchart/KDChartAreaPainter.cpp index 6c47aeed..2fca8d62 100644 --- a/kchart/kdchart/KDChartAreaPainter.cpp +++ b/kchart/kdchart/KDChartAreaPainter.cpp @@ -43,7 +43,7 @@ KDChartLinesPainter( params ) { // This constructor intentionally left blank so far; we cannot setup the - // tqgeometry yet since we do not know the size of the painter. + // geometry yet since we do not know the size of the painter. } diff --git a/kchart/kdchart/KDChartAxesPainter.cpp b/kchart/kdchart/KDChartAxesPainter.cpp index 6124abe8..ee9dc879 100644 --- a/kchart/kdchart/KDChartAxesPainter.cpp +++ b/kchart/kdchart/KDChartAxesPainter.cpp @@ -65,7 +65,7 @@ int secondsSinceUTCStart( const TQDateTime& dt ) KDChartPainter( params ) { // Intentionally left blank. - // We cannot setup the tqgeometry yet + // We cannot setup the geometry yet // since we do not know the size of the painter. } @@ -680,7 +680,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, anchor.setY( p2.y() + static_cast < int > ( pYDelta * (iLabel - 0.5) ) ); // allow for shearing and/or scaling of the painter - anchor = painter->tqworldMatrix().map( anchor ); + anchor = painter->worldMatrix().map( anchor ); TQString text; if( cv.isDateTime ){ @@ -1762,7 +1762,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, KDDrawText::drawRotatedText( painter, nRotation, - painter->tqworldMatrix().map( + painter->worldMatrix().map( TQPoint( static_cast<int>( cv.pTextsX ), static_cast<int>( cv.pTextsY ) ) ), label, @@ -2823,7 +2823,7 @@ void KDChartAxesPainter::calculateLabelTexts( const double secHour = 60.0 * secMin; const double secDay = 24.0 * secHour; // - // we temporarily disable week tqalignment until bug + // we temporarily disable week alignment until bug // is fixed (1st week of year must not start in the // preceeding year but rather be shown incompletely) // @@ -3661,7 +3661,7 @@ TQString KDChartAxesPainter::truncateBehindComma( const double nVal, sVal.setNum( nVal, 'f', bUseAutoDigits ? nTrustedPrecision : TQMIN(behindComma, nTrustedPrecision) ); //qDebug("nVal: %f sVal: "+sVal, nVal ); - //qDebug( TQString(" %1").tqarg(sVal)); + //qDebug( TQString(" %1").arg(sVal)); if ( bUseAutoDigits ) { int comma = sVal.find( '.' ); if ( -1 < comma ) { @@ -3697,7 +3697,7 @@ TQString KDChartAxesPainter::truncateBehindComma( const double nVal, } } } - //qDebug( TQString(" - %1").tqarg(trueBehindComma)); + //qDebug( TQString(" - %1").arg(trueBehindComma)); return sVal; } @@ -4424,7 +4424,7 @@ void KDChartAxesPainter::paintData( TQPainter* painter, //ourClipRect.setLeft( ourClipRect.left() + 1 ); //ourClipRect.setRight( ourClipRect.right() - 1 ); - const TQWMatrix & world = painter->tqworldMatrix(); + const TQWMatrix & world = painter->worldMatrix(); ourClipRect = #if COMPAT_TQT_VERSION >= 0x030000 world.mapRect( ourClipRect ); diff --git a/kchart/kdchart/KDChartAxisParams.cpp b/kchart/kdchart/KDChartAxisParams.cpp index a6e337f2..b24892b1 100644 --- a/kchart/kdchart/KDChartAxisParams.cpp +++ b/kchart/kdchart/KDChartAxisParams.cpp @@ -297,7 +297,7 @@ become wider or more narrow. Also the graphical representation of the date will be comparable since all your charts will use the same scale if you wish this. -- Let the program calculate the chart tqlayout based upon the kind +- Let the program calculate the chart layout based upon the kind of and width of the labels to be drawn at the axes. Also the program can calculate the labels for you and find the boundary values for start and end of the scale automatically. diff --git a/kchart/kdchart/KDChartAxisParams.h b/kchart/kdchart/KDChartAxisParams.h index b5819709..c2f9be9c 100644 --- a/kchart/kdchart/KDChartAxisParams.h +++ b/kchart/kdchart/KDChartAxisParams.h @@ -33,7 +33,7 @@ #include <tqcolor.h> #include <tqmap.h> #include <tqobject.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqstringlist.h> #include <tqdatetime.h> #include <tqvariant.h> diff --git a/kchart/kdchart/KDChartBWPainter.cpp b/kchart/kdchart/KDChartBWPainter.cpp index 9f6e5fb5..7fed7520 100644 --- a/kchart/kdchart/KDChartBWPainter.cpp +++ b/kchart/kdchart/KDChartBWPainter.cpp @@ -55,7 +55,7 @@ KDChartAxesPainter( params ) { // This constructor intentionally left blank so far; we cannot setup the - // tqgeometry yet since we do not know the size of the painter. + // geometry yet since we do not know the size of the painter. } @@ -291,7 +291,7 @@ void KDChartBWPainter::specificPaintData( TQPainter* painter, const bool noBrush = TQt::NoBrush == params()->bWChartBrush().style(); - // Loop over the datasets, draw one box and whisker tqshape for each series. + // Loop over the datasets, draw one box and whisker shape for each series. for ( uint dataset = chartDatasetStart; dataset <= chartDatasetEnd; ++dataset ) { diff --git a/kchart/kdchart/KDChartBarPainter.cpp b/kchart/kdchart/KDChartBarPainter.cpp index f8ae89d2..8bfe1a76 100644 --- a/kchart/kdchart/KDChartBarPainter.cpp +++ b/kchart/kdchart/KDChartBarPainter.cpp @@ -48,7 +48,7 @@ KDChartBarPainter::KDChartBarPainter( KDChartParams* params ) : KDChartAxesPainter( params ) { // This constructor intentionally left blank so far; we cannot setup the - // tqgeometry yet since we do not know the size of the painter. + // geometry yet since we do not know the size of the painter. } @@ -226,7 +226,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter, ? 0.0 : static_cast<int>( valueBlockGap ) * numValues; - // Set some tqgeometry values that apply to bar charts only + // Set some geometry values that apply to bar charts only double totalNumberOfBars = 0.0; double spaceBetweenDatasets = 0.0; switch ( params()->barChartSubType() ) { diff --git a/kchart/kdchart/KDChartCustomBox.cpp b/kchart/kdchart/KDChartCustomBox.cpp index 9b4d7855..7066e889 100644 --- a/kchart/kdchart/KDChartCustomBox.cpp +++ b/kchart/kdchart/KDChartCustomBox.cpp @@ -28,7 +28,7 @@ **********************************************************************/ #include <tqpainter.h> #include <tqregion.h> -#include <tqpalette.h> +#include <palette.h> #include <tqpoint.h> #include <tqsimplerichtext.h> #include <tqpaintdevicemetrics.h> diff --git a/kchart/kdchart/KDChartCustomBox.h b/kchart/kdchart/KDChartCustomBox.h index 223920e4..2e1edf1a 100644 --- a/kchart/kdchart/KDChartCustomBox.h +++ b/kchart/kdchart/KDChartCustomBox.h @@ -30,7 +30,7 @@ #define __KDCHARTCUSTOMBOX_H__ #include <tqobject.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfont.h> #include <tqdom.h> #include "KDChartGlobal.h" @@ -181,7 +181,7 @@ public: \param deltaAlign The way how \c deltaX and \deltaY affect the position of the box. Leave this parameter to its default value KDCHART_AlignAuto to have the delta values used according to the box's main \c align settings, otherwise specify your own - tqalignment settings: e.g. right means there will be a gap between the right side of + alignment settings: e.g. right means there will be a gap between the right side of the box and its anchor point - if the main \c align parameter is set to right too the anchor point will to be outside of the box / if \c align is set to left (but the \c deltaAlign to right) the anchor point will be inside the box. @@ -192,7 +192,7 @@ public: \li \c TQt::AlignRight | TQt::AlignTop \li \c TQt::AlignRight | TQt::AlignBottom Using AlignVCenter or AlignHCenter or AlignCenter does not make sense here: - center delta tqalignment will cause KDChart to ignore the respective delta + center delta alignment will cause KDChart to ignore the respective delta settings: deltaX or deltaY or both will become ineffective. \param deltaScaleGlobal If true the actual delta X and delta Y values will be calculated by \c deltaX and \c deltaY based upon the size of the @@ -297,7 +297,7 @@ public: \param deltaAlign The way how \c deltaX and \deltaY affect the position of the box. Leave this parameter to its default value KDCHART_AlignAuto to have the delta values used according to the box's main \c align settings, otherwise specify your own - tqalignment settings: e.g. TQt::AlignRight means the box will be moved to the left + alignment settings: e.g. TQt::AlignRight means the box will be moved to the left (by the amount calculated using the \c deltaX value), so there will be a gap between the right side of the box and its anchor point IF the main \c align flag is set to TQt::AlignRight too, so the anchor point will to be outside of the @@ -310,7 +310,7 @@ public: \li \c TQt::AlignRight | TQt::AlignTop \li \c TQt::AlignRight | TQt::AlignBottom Using AlignVCenter or AlignHCenter or AlignCenter does not make sense here: - center delta tqalignment will cause KDChart to ignore the respective delta + center delta alignment will cause KDChart to ignore the respective delta settings: deltaX or deltaY or both will become ineffective. \note Moving of the box due to \c deltaAlign settings is applied after the box is rotated: e.g. this means a gap specified by \c deltaAlign = TQt::AlignTop @@ -643,7 +643,7 @@ public slots: // PENDING(blackie) merge slots sections. Set this to KDHART_KDCHART_AlignAuto to have the delta values used according to the box's main \c align settings, otherwise specify your own - tqalignment settings: e.g. right means there will be a gap between the right side of + alignment settings: e.g. right means there will be a gap between the right side of the box and its anchor point - if the main \c align parameter is set to right too the anchor point will to be outside of the box / if \c align is set to left (but the \c deltaAlign to right) the anchor point will be inside the box. @@ -654,7 +654,7 @@ public slots: // PENDING(blackie) merge slots sections. \li \c TQt::AlignRight | TQt::AlignTop \li \c TQt::AlignRight | TQt::AlignBottom Using AlignVCenter or AlignHCenter or AlignCenter does not make sense here: - center delta tqalignment will cause KDChart to ignore the respective delta + center delta alignment will cause KDChart to ignore the respective delta settings: deltaX or deltaY or both will become ineffective. \note Moving of the box due to \c deltaAlign settings is applied after the box is rotated: e.g. this means a gap specified by \c deltaAlign = TQt::AlignTop diff --git a/kchart/kdchart/KDChartDataIntern.h b/kchart/kdchart/KDChartDataIntern.h index a1d6562b..fe8cfc8f 100644 --- a/kchart/kdchart/KDChartDataIntern.h +++ b/kchart/kdchart/KDChartDataIntern.h @@ -231,7 +231,7 @@ public: } } // Note: We do *not* compare the _propSetID here since it contains - // no values but is used to handle some tqlayout information... + // no values but is used to handle some layout information... } return bRet; } @@ -289,7 +289,7 @@ public: /* NOOP */; } // Note: We do *not* copy the _propSetID here since it contains - // no values but is used to handle some tqlayout information... + // no values but is used to handle some layout information... } } diff --git a/kchart/kdchart/KDChartEnums.h b/kchart/kdchart/KDChartEnums.h index 82956e8c..71373d56 100644 --- a/kchart/kdchart/KDChartEnums.h +++ b/kchart/kdchart/KDChartEnums.h @@ -53,10 +53,10 @@ class KDCHART_EXPORT KDChartEnums :public TQObject public: /** - Text tqlayout policy: what to do if text that is to be drawn would + Text layout policy: what to do if text that is to be drawn would cover neighboring text or neighboring areas. - \li \c LayoutJustOverwrite Just ignore the tqlayout collision and write the text nevertheless. + \li \c LayoutJustOverwrite Just ignore the layout collision and write the text nevertheless. \li \c LayoutPolicyRotate Try counter-clockwise rotation to make the text fit into the space. \li \c LayoutPolicyShiftVertically Shift the text baseline upwards (or downwards, resp.) and draw a connector line between the text and its anchor. \li \c LayoutPolicyShiftHorizontally Shift the text baseline to the left (or to the right, resp.) and draw a connector line between the text and its anchor. @@ -71,11 +71,11 @@ public: LayoutPolicyShrinkFontSize }; /** - Converts the specified text tqlayout policy enum to a + Converts the specified text layout policy enum to a string representation. - \param type the text tqlayout policy to convert - \return the string representation of the text tqlayout policy enum + \param type the text layout policy to convert + \return the string representation of the text layout policy enum */ static TQString layoutPolicyToString( TextLayoutPolicy type ) { switch( type ) { @@ -90,7 +90,7 @@ public: case LayoutPolicyShrinkFontSize: return "ShrinkFontSize"; default: // should not happen - qDebug( "Unknown text tqlayout policy" ); + qDebug( "Unknown text layout policy" ); return "JustOverwrite"; } } @@ -150,10 +150,10 @@ public: /** - Converts the specified string to a text tqlayout policy enum value. + Converts the specified string to a text layout policy enum value. \param string the string to convert - \return the text tqlayout policy enum value + \return the text layout policy enum value */ static TextLayoutPolicy stringToLayoutPolicy( const TQString& string ) { if( string == "JustOverwrite" ) @@ -240,7 +240,7 @@ public: \image html "../refman_images/positions.png" \image latex "../refman_images/positions.png" "the PositionFlag enum" width=4in - \note The position and tqalignment of content to be printed at (or + \note The position and alignment of content to be printed at (or inside of, resp.) an area or a point -- like for printing data value texts next to their graphical representations (which might be a bar, line, pie slice,...) -- is specified by two parameters: a \c PositionFlag and a uint holding a combination of \c TQt::AlignmentFlags. @@ -249,10 +249,10 @@ public: The position of content and the way it is aligned to this position is shown in the following drawing, note that annotation #2 and annotation #3 - share the same PositionFlag but have different tqalignment flags set: + share the same PositionFlag but have different alignment flags set: - \image html "../refman_images/tqalignment.png" - \image latex "../refman_images/tqalignment.png" "positioning and aligning" width=4in + \image html "../refman_images/alignment.png" + \image latex "../refman_images/alignment.png" "positioning and aligning" width=4in \sa KDChartParams::setPrintDataValues */ diff --git a/kchart/kdchart/KDChartHiLoPainter.cpp b/kchart/kdchart/KDChartHiLoPainter.cpp index bb8b2e39..d8f766c2 100644 --- a/kchart/kdchart/KDChartHiLoPainter.cpp +++ b/kchart/kdchart/KDChartHiLoPainter.cpp @@ -49,7 +49,7 @@ KDChartAxesPainter( params ) { // This constructor intentionally left blank so far; we cannot setup the - // tqgeometry yet since we do not know the size of the painter. + // geometry yet since we do not know the size of the painter. } diff --git a/kchart/kdchart/KDChartLinesPainter.cpp b/kchart/kdchart/KDChartLinesPainter.cpp index a7e01092..9f0995e8 100644 --- a/kchart/kdchart/KDChartLinesPainter.cpp +++ b/kchart/kdchart/KDChartLinesPainter.cpp @@ -56,7 +56,7 @@ KDChartLinesPainter::KDChartLinesPainter( KDChartParams* params ) : KDChartAxesPainter( params ) { // This constructor intentionally left blank so far; we cannot setup the - // tqgeometry yet since we do not know the size of the painter. + // geometry yet since we do not know the size of the painter. } diff --git a/kchart/kdchart/KDChartObjectFactory.cpp b/kchart/kdchart/KDChartObjectFactory.cpp index b1dac73e..a53f84c0 100644 --- a/kchart/kdchart/KDChartObjectFactory.cpp +++ b/kchart/kdchart/KDChartObjectFactory.cpp @@ -15,42 +15,42 @@ // PENDING(blackie) Clean up code in this file, so it uses the correct getter methods like getBool. KDChartObjectFactory::KDChartObjectFactory() { - registerClass( TQString::tqfromLatin1( "KDChartWidget" ) ); - registerClass( TQString::tqfromLatin1( "KDChartParams" ), new KDChartParams ); - registerClass( TQString::tqfromLatin1( "KDChartTableData" ) ); - registerClass( TQString::tqfromLatin1( "KDChartAxisParams" ), new KDChartAxisParams ); - registerClass( TQString::tqfromLatin1( "KDChartEnums" ), 0, new KDChartEnums ); - registerClass( TQString::tqfromLatin1( "KDChartTextPiece" ) ); - registerClass( TQString::tqfromLatin1( "KDChartCustomBox" ), new KDChartCustomBox ); - registerClass( TQString::tqfromLatin1( "KDChartPropertySet" ), new KDChartPropertySet ); - registerClass( TQString::tqfromLatin1( "KDFrame" ), TQString(), new KDFrame ); - - registerClass( TQString::tqfromLatin1( "TQt" ), TQString(), new TQtFactory() ); - registerClass( TQString::tqfromLatin1( "TQFont" ), TQString(), new TQFontFactory ); + registerClass( TQString::fromLatin1( "KDChartWidget" ) ); + registerClass( TQString::fromLatin1( "KDChartParams" ), new KDChartParams ); + registerClass( TQString::fromLatin1( "KDChartTableData" ) ); + registerClass( TQString::fromLatin1( "KDChartAxisParams" ), new KDChartAxisParams ); + registerClass( TQString::fromLatin1( "KDChartEnums" ), 0, new KDChartEnums ); + registerClass( TQString::fromLatin1( "KDChartTextPiece" ) ); + registerClass( TQString::fromLatin1( "KDChartCustomBox" ), new KDChartCustomBox ); + registerClass( TQString::fromLatin1( "KDChartPropertySet" ), new KDChartPropertySet ); + registerClass( TQString::fromLatin1( "KDFrame" ), TQString(), new KDFrame ); + + registerClass( TQString::fromLatin1( "TQt" ), TQString(), new TQtFactory() ); + registerClass( TQString::fromLatin1( "TQFont" ), TQString(), new TQFontFactory ); } TQObject* KDChartObjectFactory::create( const TQString& className, const TQSArgumentList& args, TQObject* /*context*/ ) { - if ( className == TQString::tqfromLatin1( "KDChartWidget" ) ) + if ( className == TQString::fromLatin1( "KDChartWidget" ) ) return createKDChartWidget( args ); - if ( className == TQString::tqfromLatin1("KDChartParams") ) + if ( className == TQString::fromLatin1("KDChartParams") ) return new KDChartParams(); - else if ( className == TQString::tqfromLatin1("KDChartTableData") ) + else if ( className == TQString::fromLatin1("KDChartTableData") ) return createKDChartTableData( args ); - else if ( className == TQString::tqfromLatin1("KDChartAxisParams") ) + else if ( className == TQString::fromLatin1("KDChartAxisParams") ) return new KDChartAxisParams(); - else if ( className == TQString::tqfromLatin1( "KDChartTextPiece" ) ) + else if ( className == TQString::fromLatin1( "KDChartTextPiece" ) ) return createKDChartTextPiece( args ); - else if ( className == TQString::tqfromLatin1( "KDChartCustomBox" ) ) + else if ( className == TQString::fromLatin1( "KDChartCustomBox" ) ) return createKDChartCustomBox( args ); - else if ( className == TQString::tqfromLatin1( "KDChartPropertySet" ) ) + else if ( className == TQString::fromLatin1( "KDChartPropertySet" ) ) return createKDChartPropertySet( args ); else @@ -98,7 +98,7 @@ TQObject* KDChartObjectFactory::createKDChartTextPiece( const TQSArgumentList& a TQString str; if ( !getString( args, 1, &str, "KDChartTextPiece" ) ) return 0; - if ( !checkIsTQtVariant( args, 2, TQVariant::Font, TQString::tqfromLatin1( "TQFont" ), "KDChartTextPiece" ) ) return 0; + if ( !checkIsTQtVariant( args, 2, TQVariant::Font, TQString::fromLatin1( "TQFont" ), "KDChartTextPiece" ) ) return 0; TQFont font = args[1].variant().toFont(); return new KDChartTextPiece( str, font ); @@ -145,13 +145,13 @@ TQObject* KDChartObjectFactory::createKDChartCustomBox( const TQSArgumentList& a TQColor color = TQt::black; if ( args.count() >= 9 ) { - if ( !checkIsTQtVariant( args, 9, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartCustomBox" ) ) return 0; + if ( !checkIsTQtVariant( args, 9, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartCustomBox" ) ) return 0; color = args[8].variant().toColor(); } TQBrush paper = TQt::NoBrush; if ( args.count() >= 10 ) { - if ( !checkIsTQtVariant( args, 10, TQVariant::Brush, TQString::tqfromLatin1( "TQBrush" ), "KDChartCustomBox" ) ) return 0; + if ( !checkIsTQtVariant( args, 10, TQVariant::Brush, TQString::fromLatin1( "TQBrush" ), "KDChartCustomBox" ) ) return 0; paper = args[9].variant().toBrush(); } @@ -235,13 +235,13 @@ TQObject* KDChartObjectFactory::createKDChartCustomBox( const TQSArgumentList& a TQColor color = TQt::black; if ( args.count() >= 8 ) { - if ( !checkIsTQtVariant( args, 8, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartCustomBox" ) ) return 0; + if ( !checkIsTQtVariant( args, 8, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartCustomBox" ) ) return 0; color = args[7].variant().toColor(); } TQBrush paper = TQt::NoBrush; if ( args.count() >= 9 ) { - if ( !checkIsTQtVariant( args, 9, TQVariant::Brush, TQString::tqfromLatin1( "TQBrush" ), "KDChartCustomBox" ) ) return 0; + if ( !checkIsTQtVariant( args, 9, TQVariant::Brush, TQString::fromLatin1( "TQBrush" ), "KDChartCustomBox" ) ) return 0; paper = args[8].variant().toBrush(); } @@ -318,7 +318,7 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList& if ( !getNumber( args, 4,&idLineColor, "KDChartPropertySet" ) ) return 0; - if ( !checkIsTQtVariant( args, 5, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0; + if ( !checkIsTQtVariant( args, 5, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0; TQColor lineColor = args[4].variant().toColor(); int idLineStyle; @@ -362,7 +362,7 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList& int idExtraLinesColor; if ( !getNumber( args, 18,&idExtraLinesColor, "KDChartPropertySet" ) ) return 0; - if ( !checkIsTQtVariant( args, 19, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0; + if ( !checkIsTQtVariant( args, 19, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0; TQColor extraLinesColor = args[18].variant().toColor(); int idExtraLinesStyle; @@ -380,13 +380,13 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList& int idExtraMarkersSize; if ( !getNumber( args, 24,&idExtraMarkersSize, "KDChartPropertySet" ) ) return 0; - if ( !checkIsTQtVariant( args, 25, TQVariant::Size, TQString::tqfromLatin1( "TQSize" ), "KDChartPropertySet" ) ) return 0; + if ( !checkIsTQtVariant( args, 25, TQVariant::Size, TQString::fromLatin1( "TQSize" ), "KDChartPropertySet" ) ) return 0; TQSize extraMarkersSize = args[24].variant().toSize(); int idExtraMarkersColor; if ( !getNumber( args, 26,&idExtraMarkersColor, "KDChartPropertySet" ) ) return 0; - if ( !checkIsTQtVariant( args, 27, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0; + if ( !checkIsTQtVariant( args, 27, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0; TQColor extraMarkersColor = args[26].variant().toColor(); int idExtraMarkersStyle; @@ -404,7 +404,7 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList& int idBarColor; if ( !getNumber( args, 32,&idBarColor, "KDChartPropertySet" ) ) return 0; - if ( !checkIsTQtVariant( args, 33, TQVariant::Color, TQString::tqfromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0; + if ( !checkIsTQtVariant( args, 33, TQVariant::Color, TQString::fromLatin1( "TQColor" ), "KDChartPropertySet" ) ) return 0; TQColor barColor = args[32].variant().toColor(); KDChartPropertySet* set = new KDChartPropertySet; @@ -438,11 +438,11 @@ bool KDChartObjectFactory::isNumber( const TQVariant& v ) bool KDChartObjectFactory::checkArgCount( const TQString& className, int count, int min, int max ) { if ( count < min ) { - throwError( TQObject::tr( "Too few arguments when creating %1 object." ).tqarg( className ) ); + throwError( TQObject::tr( "Too few arguments when creating %1 object." ).arg( className ) ); return false; } if ( count > max ) { - throwError( TQObject::tr( "Too many arguments when creating %1 object." ).tqarg( className ) ); + throwError( TQObject::tr( "Too many arguments when creating %1 object." ).arg( className ) ); return false; } return true; @@ -453,7 +453,7 @@ bool KDChartObjectFactory::checkArgsIsTQtClass( const TQSArgumentList& args, int { const TQSArgument& arg = args[index-1]; if ( arg.type() != TQSArgument::TQObjectPtr || !arg.qobject()->inherits( expected ) ) { - throwError( TQObject::tr( "Invalid type for argument no %1 to %2, must be a %3" ).tqarg(index).tqarg(constructing).tqarg(expected) ); + throwError( TQObject::tr( "Invalid type for argument no %1 to %2, must be a %3" ).arg(index).arg(constructing).arg(expected) ); return false; } return true; @@ -464,7 +464,7 @@ bool KDChartObjectFactory::getString( const TQSArgumentList& args, int index, TQ { const TQSArgument& arg = args[index-1]; if ( arg.type() != TQSArgument::Variant || arg.variant().type() != TQVariant::String ) { - throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a string" ).tqarg(index).tqarg(constructing) ); + throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a string" ).arg(index).arg(constructing) ); return false; } else { @@ -477,7 +477,7 @@ bool KDChartObjectFactory::getNumber( const TQSArgumentList& args, int index, do { const TQSArgument& arg = args[index-1]; if ( arg.type() != TQSArgument::Variant || !isNumber(arg.variant()) ) { - throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a number" ).tqarg(index).tqarg( constructing ) ); + throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a number" ).arg(index).arg( constructing ) ); return false; } else { @@ -508,7 +508,7 @@ bool KDChartObjectFactory::getBool( const TQSArgumentList& args, int index, bool { const TQSArgument& arg = args[index-1]; if ( arg.type() != TQSArgument::Variant || arg.variant().type() != TQVariant::Bool ) { - throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a boolean" ).tqarg(index).tqarg( constructing ) ); + throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a boolean" ).arg(index).arg( constructing ) ); return false; } else { @@ -521,7 +521,7 @@ bool KDChartObjectFactory::checkIsTQtVariant( const TQSArgumentList& args, int i { const TQSArgument& arg = args[index-1]; if ( arg.type() != TQSArgument::Variant || arg.variant().type() != expected ) { - throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a %3").tqarg(index).tqarg(constructing).tqarg(variantName) ); + throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a %3").arg(index).arg(constructing).arg(variantName) ); return false; } else diff --git a/kchart/kdchart/KDChartPainter.cpp b/kchart/kdchart/KDChartPainter.cpp index 156d5d82..849d2b29 100644 --- a/kchart/kdchart/KDChartPainter.cpp +++ b/kchart/kdchart/KDChartPainter.cpp @@ -103,7 +103,7 @@ _legendTitleWidth( 0 ), _legendTitleMetricsHeight( 0 ) { // This constructor intentionally left blank so far; we cannot setup the - // tqgeometry yet since we do not know the size of the painter. + // geometry yet since we do not know the size of the painter. } /** @@ -657,7 +657,7 @@ void KDChartPainter::paintDataValues( TQPainter* painter, } if ( rotation ) { - anchor = painter->tqworldMatrix().map( anchor ); + anchor = painter->worldMatrix().map( anchor ); // Temporary solution for fixing the data labels size // bug when in TQPrinter::HighResolution mode: @@ -707,7 +707,7 @@ void KDChartPainter::paintDataValues( TQPainter* painter, true, true, 5 ); - //anchor = painter->tqworldMatrix().map( anchor ); + //anchor = painter->worldMatrix().map( anchor ); if( allowOverlapping ) { drawThisOne = true; @@ -850,7 +850,7 @@ void KDChartPainter::paintDataValues( TQPainter* painter, /* NOTE: The following will be REMOVED again once -the tqlayout policy feature is implemented !!! +the layout policy feature is implemented !!! */ TQRect textRect( region->pTextRegion->boundingRect() ); @@ -979,7 +979,7 @@ TQPoint KDChartPainter::calculateAnchor( const KDChartCustomBox & box, // Rule: // // A box may be aligned to another box (and the 2nd box may again be - // aligned to a 3rd box and so on) but NO CIRCULAR tqalignment is allowed. + // aligned to a 3rd box and so on) but NO CIRCULAR alignment is allowed. // if( !box.anchorBeingCalculated() ) { @@ -1650,7 +1650,7 @@ void KDChartPainter::paintHeaderFooter( TQPainter* painter, params()->headerFooterFontRelSize( iHdFt ) * averageValueP1000 ) ); painter->setPen( params()->headerFooterColor( iHdFt ) ); painter->setFont( actFont ); - // Note: The tqalignment flags used here match the rect calculation + // Note: The alignment flags used here match the rect calculation // done in KDChartPainter::setupGeometry(). // AlignTop is done to ensure that the hd/ft texts of the same // group (e.g. Hd2L and Hd2 and Hd2R) have the same baselines. @@ -2063,7 +2063,7 @@ void KDChartPainter::calculateAllAxesRects( int nAxesBottom = TQMAX( nAxesBottom0 + nAxesBottomADD, nMinDistance ); - // for micro tqalignment with the X axis, we adjust the Y axis - but not for Area Charts: + // for micro alignment with the X axis, we adjust the Y axis - but not for Area Charts: // otherwise the areas drawn would overwrite the Y axis line. int nAxesLeft = TQMAX( nAxesLeft0 + nAxesLeftADD, nMinDistance ) - (bIsAreaChart ? 0 : 1); @@ -2143,10 +2143,10 @@ void KDChartPainter::calculateAllAxesRects( /** This method will be called whenever any parameters that affect - tqgeometry have been changed. It will compute the appropriate + geometry have been changed. It will compute the appropriate positions for the various parts of the chart (legend, axes, data area etc.). The implementation in KDChartPainter computes a - standard tqgeometry that should be suitable for most chart + standard geometry that should be suitable for most chart types. Subclasses can provide their own implementations. \param data the data that will be displayed as a chart @@ -2158,7 +2158,7 @@ void KDChartPainter::setupGeometry( TQPainter* painter, const TQRect& drawRect ) { //qDebug("INVOKING: KDChartPainter::setupGeometry()"); - // avoid recursion from tqrepaint() being called due to params() changed signals... + // avoid recursion from repaint() being called due to params() changed signals... const bool oldBlockSignalsState = params()->signalsBlocked(); const_cast < KDChartParams* > ( params() )->blockSignals( true ); diff --git a/kchart/kdchart/KDChartParams.cpp b/kchart/kdchart/KDChartParams.cpp index aac8928f..e59443fb 100644 --- a/kchart/kdchart/KDChartParams.cpp +++ b/kchart/kdchart/KDChartParams.cpp @@ -707,7 +707,7 @@ bool KDChartParams::calculateProperties( int startId, KDChartPropertySet& rSet ) break; ++i; }while( properties(id, propSet) ); - // retrieve marker tqalignment + // retrieve marker alignment propSet.deepCopy( &startSet ); i=0; do{ if( propSet.hasOwnMarkerAlign( id, markerAlign ) ){ @@ -750,7 +750,7 @@ bool KDChartParams::calculateProperties( int startId, KDChartPropertySet& rSet ) // extra lines: - // retrieve tqalignment of extra lines + // retrieve alignment of extra lines propSet.deepCopy( &startSet ); i=0; do{ if( propSet.hasOwnExtraLinesAlign( id, extraLinesAlign ) ){ @@ -813,7 +813,7 @@ bool KDChartParams::calculateProperties( int startId, KDChartPropertySet& rSet ) // markers at the ends of the extra lines: - // retrieve marker tqalignment + // retrieve marker alignment propSet.deepCopy( &startSet ); i=0; do{ if( propSet.hasOwnExtraMarkersAlign( id, extraMarkersAlign ) ){ @@ -976,7 +976,7 @@ aligned to. This must be a reasonable combination of TQt::AlignmentFlags. \param negativeDeltaX The X distance between the <b>anchor point</b> -- specified by \c negativePosition (or \c - positivePosition, resp.) -- and the internal <b>tqalignment point</b> + positivePosition, resp.) -- and the internal <b>alignment point</b> of the text -- specified by \c negativeAlign (or \c positiveAlign, resp.). <b>Note: </b> For better compatibility to the dynamic font size this parameter is interpreted as being a per-cent value of the @@ -987,7 +987,7 @@ size of the chart and the specification made via parameter \c size. \param negativeDeltaY The Y distance between the <b>anchor point</b> -- specified by \c negativePosition (or \c - positivePosition, resp.) -- and the internal <b>tqalignment point</b> + positivePosition, resp.) -- and the internal <b>alignment point</b> of the text -- specified by \c negativeAlign (or \c positiveAlign, resp.). <b>Note: </b> For better compatibility to the dynamic font size this parameter is interpreted as being a per-cent value of the @@ -1002,7 +1002,7 @@ special values that you might find usefull for Pie charts or for Ring charts: \c KDCHART_SAGGITAL_ROTATION and \c KDCHART_TANGENTIAL_ROTATION both leading to individual calculation of appropriate rotation for each data value. Rotation -will be performed around the internal <b>tqalignment point</b> of the +will be performed around the internal <b>alignment point</b> of the text -- specified by \c negativeAlign (or \c positiveAlign, resp.). The following parameters apply to values greater than zero or equal zero: @@ -1013,7 +1013,7 @@ aligned to. This must be a reasonable combination of TQt::AlignmentFlags. \param negativeDeltaX The X distance between the <b>anchor point</b> -- specified by \c negativePosition (or \c - positivePosition, resp.) -- and the internal <b>tqalignment point</b> + positivePosition, resp.) -- and the internal <b>alignment point</b> of the text -- specified by \c negativeAlign (or \c positiveAlign, resp.). <b>Note: </b> For better compatibility to the dynamic font size this parameter is interpreted as being a per-cent value of the @@ -1023,7 +1023,7 @@ delta value are calculated dynamically before painting based on the size of the chart and the specification made via parameter \c size. \param positiveDeltaY The Y distance between the <b>anchor point</b> -- specified by \c negativePosition (or \c - positivePosition, resp.) -- and the internal <b>tqalignment point</b> + positivePosition, resp.) -- and the internal <b>alignment point</b> of the text -- specified by \c negativeAlign (or \c positiveAlign, resp.). <b>Note: </b> For better compatibility to the dynamic font size this parameter is interpreted as being a per-cent value of the @@ -1038,7 +1038,7 @@ special values that you might find usefull for Pie charts or for Ring charts: \c KDCHART_SAGGITAL_ROTATION and \c KDCHART_TANGENTIAL_ROTATION both leading to individual calculation of appropriate rotation for each data value. Rotation -will be performed around the internal <b>tqalignment point</b> of the +will be performed around the internal <b>alignment point</b> of the text -- specified by \c negativeAlign (or \c positiveAlign, resp.). \param layoutPolicy The way to handle too narrow space conflicts: @@ -1872,10 +1872,10 @@ TQString KDChartParams::dataRegionFrameAreaName( uint dataRow, uint data3rd ) { return TQString( "%1/%2/%3/%4" ) - .tqarg( KDChartEnums::AreaChartDataRegion, 5 ) - .tqarg( dataRow, 5 ) - .tqarg( dataCol, 5 ) - .tqarg( data3rd, 5 ); + .arg( KDChartEnums::AreaChartDataRegion, 5 ) + .arg( dataRow, 5 ) + .arg( dataCol, 5 ) + .arg( data3rd, 5 ); } @@ -2609,7 +2609,7 @@ const KDChartParams::KDChartFrameSettings* KDChartParams::frameSettings( uint ar { if( pIterIdx ) *pIterIdx = 0; - const TQString key( TQString( "%1/-----/-----/-----" ).tqarg( area, 5 ) ); + const TQString key( TQString( "%1/-----/-----/-----" ).arg( area, 5 ) ); KDChartFrameSettings* it = _areaDict.find( key ); bFound = ( it != 0 ); if( bFound ) @@ -2643,7 +2643,7 @@ const KDChartParams::KDChartFrameSettings* KDChartParams::frameSettings( uint ar */ bool KDChartParams::removeFrame( uint area ) { - return _areaDict.remove( TQString( "%1/-----/-----/-----" ).tqarg( area, 5 ) ); + return _areaDict.remove( TQString( "%1/-----/-----/-----" ).arg( area, 5 ) ); } @@ -3807,9 +3807,9 @@ int KDChartParams::dataValuesRotation( uint chart, bool negative ) const a data text covers a neighboring data text (or a neighboring data area, resp.). - \note A tqlayout policy different from LayoutJustOverwrite from does + \note A layout policy different from LayoutJustOverwrite from does not mean that this policy is followed in any case. Rather than - giving up when the selected policy does not result in a good tqlayout + giving up when the selected policy does not result in a good layout the program will automatically try the next policy: if LayoutPolicyRotate did not succeed LayoutPolicyShiftVertically will be tried, if this did not succeed either @@ -4617,7 +4617,7 @@ void KDChartParams::setThreeDBarAngle( uint angle ) point. Only used if chartType() == Line and if threeDLines() == false. The default is not to draw markers. - \note Use the setLineMarkerStyle function to specify the tqshape + \note Use the setLineMarkerStyle function to specify the shape of the markers, use the setLineWidth function to set the width of the lines connecting the markers (or to surpress drawing of such lines, resp.) @@ -7487,7 +7487,7 @@ void KDChartParams::setAxisParams( uint n, You might want to use those sections to show some marginal information like department name, print date, page number... <br> <b>Note:</b> Those headers <b>share the same area</b> so make sure to - specify propper horizontal tqalignment for each section when using more than + specify propper horizontal alignment for each section when using more than one of them. By default \c HdFtPosHeader0 has centered alignement, \c HdFtPosHeader0L is aligned to the left and \c HdFtPosHeader0R to the right side. All of them are vertically aligned to the bottom, you may @@ -7504,7 +7504,7 @@ void KDChartParams::setAxisParams( uint n, You could use this headers to show the main information such as project name, chart title or period of time (e.g. census year). <br> Like their counterparts they share the same part of the printable area so the - restrictions regarding tqalignment mentioned above apply also to these three + restrictions regarding alignment mentioned above apply also to these three sections. \li Up to three <b>additional headers</b> ( \c HdFtPosHeader2 , \c @@ -7513,7 +7513,7 @@ void KDChartParams::setAxisParams( uint n, This headers could show additional information such as project phase, chart sub-title or sub-period of time (e.g. census quarter-year). <br> Like their counterparts they share the same part of the printable area so the - restrictions regarding tqalignment mentioned above apply also to these three + restrictions regarding alignment mentioned above apply also to these three sections. <p> @@ -7524,7 +7524,7 @@ void KDChartParams::setAxisParams( uint n, You might want to use these footers instead of (or additional to) the main header(s) for showing the main information... <br> Like their header-counterparts they share the same part of the printable area - so the restrictions regarding tqalignment mentioned above apply also to these + so the restrictions regarding alignment mentioned above apply also to these three sections. \li Up to three <b>additional footers</b> ( \c HdFtPosFooter2 , \c @@ -7533,7 +7533,7 @@ void KDChartParams::setAxisParams( uint n, This footers could show additional information instead of (or additional to) the additional header(s). <br> Like their counterparts they share the same part of the printable area so the - restrictions regarding tqalignment mentioned above apply also to these three + restrictions regarding alignment mentioned above apply also to these three sections. \li Up to three <b>trailing footers</b> ( \c HdFtPosFooter0 , \c @@ -7542,7 +7542,7 @@ void KDChartParams::setAxisParams( uint n, You might want to use those sections to show some marginal information instead of (or additional to) the leading header(s). <br> Like their counterparts they share the same part of the printable area so the - restrictions regarding tqalignment mentioned above apply also to these three + restrictions regarding alignment mentioned above apply also to these three sections. \note The names \c HdFtPosHeader or \c HdFtPosFooter are the basic names also returned by \c basicAxisPos. diff --git a/kchart/kdchart/KDChartParams.h b/kchart/kdchart/KDChartParams.h index 16722694..2e054d81 100644 --- a/kchart/kdchart/KDChartParams.h +++ b/kchart/kdchart/KDChartParams.h @@ -37,7 +37,7 @@ #include <tqdict.h> #include <tqintdict.h> #include <tqobject.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqsimplerichtext.h> #include <tqdom.h> #include <limits.h> @@ -393,7 +393,7 @@ public slots: bool addFrameHeightToLayout = true ) { _areaDict.setAutoDelete( TRUE ); - _areaDict.replace( TQString( "%1/-----/-----/-----" ).tqarg( area, 5 ), + _areaDict.replace( TQString( "%1/-----/-----/-----" ).arg( area, 5 ), new KDChartFrameSettings(0,0,0, frame, outerGapX, @@ -436,7 +436,7 @@ public slots: shadowWidth, sunPos ); - _areaDict.replace( TQString( "%1/-----/-----/-----" ).tqarg( area, 5 ), + _areaDict.replace( TQString( "%1/-----/-----/-----" ).arg( area, 5 ), new KDChartFrameSettings( 0,0,0, frame, outerGapX, outerGapY, diff --git a/kchart/kdchart/KDChartParams_io.cpp b/kchart/kdchart/KDChartParams_io.cpp index 4f17e653..86f37d68 100644 --- a/kchart/kdchart/KDChartParams_io.cpp +++ b/kchart/kdchart/KDChartParams_io.cpp @@ -2194,12 +2194,12 @@ bool KDChartParams::loadXML( const TQDomDocument& doc ) TQString str; if(areaId == KDChartEnums::AreaChartDataRegion) str = TQString( "%1/%2/%3/%4" ) - .tqarg( areaId, 5 ) - .tqarg( frameSettings->dataRow(), 5 ) - .tqarg( frameSettings->dataCol(), 5 ) - .tqarg( 0, 5 );//frameSettings->data3rd(), 5 ); + .arg( areaId, 5 ) + .arg( frameSettings->dataRow(), 5 ) + .arg( frameSettings->dataCol(), 5 ) + .arg( 0, 5 );//frameSettings->data3rd(), 5 ); else - str = TQString( "%1/-----/-----/-----" ).tqarg( areaId, 5 ); + str = TQString( "%1/-----/-----/-----" ).arg( areaId, 5 ); _areaDict.replace( str, frameSettings ); } } diff --git a/kchart/kdchart/KDChartPiePainter.cpp b/kchart/kdchart/KDChartPiePainter.cpp index ada03b44..a8e126cb 100644 --- a/kchart/kdchart/KDChartPiePainter.cpp +++ b/kchart/kdchart/KDChartPiePainter.cpp @@ -55,7 +55,7 @@ KDChartPainter( params ) { // This constructor intentionally left blank so far; we cannot setup the - // tqgeometry yet since we do not know the size of the painter. + // geometry yet since we do not know the size of the painter. } @@ -89,7 +89,7 @@ void KDChartPiePainter::paintData( TQPainter* painter, TQRect ourClipRect( _dataRect ); ourClipRect.addCoords( -1,-1,1,1 ); - const TQWMatrix & world = painter->tqworldMatrix(); + const TQWMatrix & world = painter->worldMatrix(); ourClipRect = #if COMPAT_TQT_VERSION >= 0x030000 world.mapRect( ourClipRect ); diff --git a/kchart/kdchart/KDChartPolarPainter.cpp b/kchart/kdchart/KDChartPolarPainter.cpp index 23430dbd..99cee953 100644 --- a/kchart/kdchart/KDChartPolarPainter.cpp +++ b/kchart/kdchart/KDChartPolarPainter.cpp @@ -50,7 +50,7 @@ KDChartPolarPainter::KDChartPolarPainter( KDChartParams* params ) : KDChartPainter( params ) { // This constructor intentionally left blank so far; we cannot setup the - // tqgeometry yet since we do not know the size of the painter. + // geometry yet since we do not know the size of the painter. } @@ -89,7 +89,7 @@ void KDChartPolarPainter::paintData( TQPainter* painter, // PENDING(khz) adjust the clip rect if neccessary... // - const TQWMatrix & world = painter->tqworldMatrix(); + const TQWMatrix & world = painter->worldMatrix(); ourClipRect = #if COMPAT_TQT_VERSION >= 0x030000 world.mapRect( ourClipRect ); @@ -515,7 +515,7 @@ void KDChartPolarPainter::paintData( TQPainter* painter, pt2 = center + polarToXY( r2, currentAngle ); pt3 = center + polarToXY( r3, currentAngle ); - //pt3 = painter->tqworldMatrix().map( pt3 ); + //pt3 = painter->worldMatrix().map( pt3 ); if( paraSagittal.axisShowGrid() ) { painter->setPen( TQPen( paraSagittal.axisGridColor(), @@ -538,7 +538,7 @@ void KDChartPolarPainter::paintData( TQPainter* painter, KDDrawText::drawRotatedText( painter, currentAngle+90, - painter->tqworldMatrix().map(pt3), + painter->worldMatrix().map(pt3), label, 0, TQt::AlignCenter ); @@ -673,7 +673,7 @@ void KDChartPolarPainter::paintCircularAxisLabel( TQPainter* painter, KDDrawText::drawRotatedText( painter, rotate ? txtAngle - 90 : 0, - painter->tqworldMatrix().map(center - polarToXY( static_cast<int>( currentRadiusPPU ), txtAngle )), + painter->worldMatrix().map(center - polarToXY( static_cast<int>( currentRadiusPPU ), txtAngle )), txt, 0, step diff --git a/kchart/kdchart/KDChartPropertySet.h b/kchart/kdchart/KDChartPropertySet.h index cdd64f78..bc618143 100644 --- a/kchart/kdchart/KDChartPropertySet.h +++ b/kchart/kdchart/KDChartPropertySet.h @@ -34,7 +34,7 @@ #include <kdchart_export.h> #include <tqdom.h> #include <tqcolor.h> -#include <tqbrush.h> +#include <brush.h> /** \file KDChartPropertySet.h @@ -721,14 +721,14 @@ public slots: } /** - Specify the ID of the property set specifying the tqalignment of the + Specify the ID of the property set specifying the alignment of the Marker to be displayed for this data value <b>or</b> specifying this flag directly. \note This function should be used for Line Charts only, otherwise the settings specified here will be ignored. - \param idMarkerAlign ID of the property set specifying the tqalignment + \param idMarkerAlign ID of the property set specifying the alignment of the Marker to be shown. Use special value KDChartPropertySet::UndefinedID to specify neither another property set's ID @@ -737,7 +737,7 @@ public slots: if you do NOT want to inherit another property set's settings but want to specify the flag by using the following parameter. - \param markerAlign The tqalignment of the marker to be shown. + \param markerAlign The alignment of the marker to be shown. This parameter is stored but ignored if the previous parameter is not set to KDChartPropertySet::OwnID. diff --git a/kchart/kdchart/KDChartRingPainter.cpp b/kchart/kdchart/KDChartRingPainter.cpp index 9740fa5e..ba1e6fed 100644 --- a/kchart/kdchart/KDChartRingPainter.cpp +++ b/kchart/kdchart/KDChartRingPainter.cpp @@ -53,7 +53,7 @@ KDChartPainter( params ) { // This constructor intentionally left blank so far; we cannot setup the - // tqgeometry yet since we do not know the size of the painter. + // geometry yet since we do not know the size of the painter. } @@ -84,7 +84,7 @@ void KDChartRingPainter::paintData( TQPainter* painter, TQRect ourClipRect( _dataRect ); - const TQWMatrix & world = painter->tqworldMatrix(); + const TQWMatrix & world = painter->worldMatrix(); ourClipRect = #if COMPAT_TQT_VERSION >= 0x030000 world.mapRect( ourClipRect ); diff --git a/kchart/kdchart/KDChartTableBase.cpp b/kchart/kdchart/KDChartTableBase.cpp index 1ebfa9fd..fcec2c53 100644 --- a/kchart/kdchart/KDChartTableBase.cpp +++ b/kchart/kdchart/KDChartTableBase.cpp @@ -74,7 +74,7 @@ future absicssa axis value: \verbatim - const TQDateTime currentTime( TQDateTime::tqcurrentDateTime() ); + const TQDateTime currentTime( TQDateTime::currentDateTime() ); for( int iCell = 0; iCell < usedValues; ++iCell ){ KDChartData& cell = myData.cell( 0, iCell ); // assign special property set ID if X value is in the future diff --git a/kchart/kdchart/KDChartTextPiece.cpp b/kchart/kdchart/KDChartTextPiece.cpp index b95165f7..e986c853 100644 --- a/kchart/kdchart/KDChartTextPiece.cpp +++ b/kchart/kdchart/KDChartTextPiece.cpp @@ -28,7 +28,7 @@ **********************************************************************/ #include "KDChartTextPiece.h" -#include <tqstylesheet.h> +#include <stylesheet.h> #include <tqsimplerichtext.h> #include <tqfontmetrics.h> #include <tqpainter.h> diff --git a/kchart/kdchart/KDChartTextPiece.h b/kchart/kdchart/KDChartTextPiece.h index adb176b2..ab1916b0 100644 --- a/kchart/kdchart/KDChartTextPiece.h +++ b/kchart/kdchart/KDChartTextPiece.h @@ -32,7 +32,7 @@ #include <tqstring.h> #include <tqfont.h> #include <tqregion.h> -#include <tqpalette.h> +#include <palette.h> #include <tqobject.h> #include <kdchart_export.h> diff --git a/kchart/kdchart/KDChartWidget.cpp b/kchart/kdchart/KDChartWidget.cpp index d530ea19..8217abfc 100644 --- a/kchart/kdchart/KDChartWidget.cpp +++ b/kchart/kdchart/KDChartWidget.cpp @@ -244,8 +244,8 @@ void KDChartWidget::resizeEvent( TQResizeEvent* /*event*/ ) display process, so this is turned off by default. If active data reporting is turned on when the widget is already - shown, data will be reported after the next tqrepaint(). Call - tqrepaint() explicitly if necessary. + shown, data will be reported after the next repaint(). Call + repaint() explicitly if necessary. Active data is currently supported for bar, pie, and line charts (the latter only with markers, as trying to hit the line would be @@ -281,7 +281,7 @@ bool KDChartWidget::isActiveData() const needs to be kept around. However, in most cases, it is worth spending the extra memory. Double-buffering is on by default. Turning double-buffering on or off does not trigger a - tqrepaint. + repaint. \param doublebuffered if true, turns double-buffering on, if false, turns double-buffering off diff --git a/kchart/kdchart/KDChartWrapperFactory.cpp b/kchart/kdchart/KDChartWrapperFactory.cpp index 2ff08f1a..b42c0379 100644 --- a/kchart/kdchart/KDChartWrapperFactory.cpp +++ b/kchart/kdchart/KDChartWrapperFactory.cpp @@ -17,16 +17,16 @@ KDChartWrapperFactory::KDChartWrapperFactory() TQObject* KDChartWrapperFactory::create( const TQString& className, void* ptr ) { - if ( className == TQString::tqfromLatin1( "KDChartParams" ) ) + if ( className == TQString::fromLatin1( "KDChartParams" ) ) return new KDChartParamsWrapper( static_cast<KDChartParams*>( ptr ) ); - if ( className == TQString::tqfromLatin1( "KDChartVectorTableData" ) ) + if ( className == TQString::fromLatin1( "KDChartVectorTableData" ) ) return new KDChartTableDataWrapper( static_cast<KDChartTableData*>( ptr ) ); - if ( className == TQString::tqfromLatin1( "KDChartCustomBox" ) ) + if ( className == TQString::fromLatin1( "KDChartCustomBox" ) ) return new KDChartCustomBoxWrapper( static_cast<KDChartCustomBox*>( ptr ) ); - if ( className == TQString::tqfromLatin1( "KDChartAxisParams" ) ) + if ( className == TQString::fromLatin1( "KDChartAxisParams" ) ) return new KDChartAxisParamsWrapper( static_cast<KDChartAxisParams*>( ptr ) ); return 0; diff --git a/kchart/kdchart/KDDrawText.cpp b/kchart/kdchart/KDDrawText.cpp index 70283da6..c0985134 100644 --- a/kchart/kdchart/KDDrawText.cpp +++ b/kchart/kdchart/KDDrawText.cpp @@ -408,7 +408,7 @@ void KDDrawText::drawRotatedTxt( TQPainter* painter, painter->drawLine( x+pBotRight.x(), y+pBotRight.y()-3, x+pBotRight.x(), y+pBotRight.y()+3 ); */ - // The horizontal and vertical tqalignment together define one of + // The horizontal and vertical alignment together define one of // NINE possible points: this point must be moved on the anchor. int hAlign = align & ( TQt::AlignLeft | TQt::AlignRight | TQt::AlignHCenter ); int vAlign = align & ( TQt::AlignTop | TQt::AlignBottom | TQt::AlignVCenter ); diff --git a/kchart/kdchart/KDDrawText.h b/kchart/kdchart/KDDrawText.h index 5fb9dbfd..7842e9b5 100644 --- a/kchart/kdchart/KDDrawText.h +++ b/kchart/kdchart/KDDrawText.h @@ -53,7 +53,7 @@ class KDDrawText const TQString& text, const TQFont* font = 0, int align = TQt::AlignLeft | TQt::AlignTop, - // useful for debugging of your tqlayout: + // useful for debugging of your layout: bool showAnchor = false, const TQFontMetrics* fontMet = 0, bool noFirstrotate = false, @@ -81,7 +81,7 @@ class KDDrawText const TQString& text, const TQFont* font = 0, int align = TQt::AlignLeft | TQt::AlignTop, - // usefull for debugging of your tqlayout: + // usefull for debugging of your layout: bool showAnchor = false, // speed-up parameters // used internally by drawCircleText() diff --git a/kchart/kdchart/KDFrame.cpp b/kchart/kdchart/KDFrame.cpp index 3904bf16..c760032f 100644 --- a/kchart/kdchart/KDFrame.cpp +++ b/kchart/kdchart/KDFrame.cpp @@ -28,7 +28,7 @@ **********************************************************************/ #include <tqpainter.h> -#include <tqbrush.h> +#include <brush.h> #include <KDFrame.h> #include <KDFrameProfileSection.h> diff --git a/kchart/kdchart/KDFrame.h b/kchart/kdchart/KDFrame.h index 78de8ffb..e3bd6a1d 100644 --- a/kchart/kdchart/KDFrame.h +++ b/kchart/kdchart/KDFrame.h @@ -36,7 +36,7 @@ #include <tqpen.h> #include <tqmap.h> #include <tqobject.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdom.h> #include <KDFrameProfileSection.h> diff --git a/kchart/kdchart/KDFrameProfileSection.h b/kchart/kdchart/KDFrameProfileSection.h index 9fe38adf..48f70bb3 100644 --- a/kchart/kdchart/KDFrameProfileSection.h +++ b/kchart/kdchart/KDFrameProfileSection.h @@ -104,7 +104,7 @@ public: /** - Profile Curvature Mode: specifying the tqshape of a frame profile section. + Profile Curvature Mode: specifying the shape of a frame profile section. (curvature setting will be ignored for \c DirPlain profiles) \li \c CvtFlat looking like a evenly sloping surface. diff --git a/kchart/kdchart/KDXMLTools.h b/kchart/kdchart/KDXMLTools.h index 4ebe6872..b68f5211 100644 --- a/kchart/kdchart/KDXMLTools.h +++ b/kchart/kdchart/KDXMLTools.h @@ -36,7 +36,7 @@ #include <tqdom.h> #include <tqstring.h> #include <tqcolor.h> -#include <tqbrush.h> +#include <brush.h> #include <tqsize.h> #include <tqrect.h> #include <tqfont.h> diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp index 9ba1dbd2..62aec420 100644 --- a/kdgantt/KDGanttMinimizeSplitter.cpp +++ b/kdgantt/KDGanttMinimizeSplitter.cpp @@ -39,8 +39,8 @@ #include "tqbitmap.h" #include "tqptrlist.h" #include "tqmemarray.h" -#include "tqlayout.h" -#include "tqlayoutengine_p.h" +#include "layout.h" +#include "layoutengine_p.h" #include "tqobjectlist.h" #include "tqstyle.h" #include "tqapplication.h" //sendPostedEvents @@ -66,7 +66,7 @@ KDGanttSplitterHandle::KDGanttSplitterHandle( Qt::Orientation o, setMouseTracking( true ); } -TQSize KDGanttSplitterHandle::tqsizeHint() const +TQSize KDGanttSplitterHandle::sizeHint() const { return TQSize(8,8); } @@ -110,7 +110,7 @@ void KDGanttSplitterHandle::mousePressEvent( TQMouseEvent *e ) _activeButton = onButton( e->pos() ); mouseOffset = s->pick(e->pos()); if ( _activeButton != 0) - tqrepaint(); + repaint(); updateCursor( e->pos() ); } } @@ -167,7 +167,7 @@ void KDGanttSplitterHandle::mouseReleaseEvent( TQMouseEvent *e ) s->moveSplitter( pos, id() ); } } - tqrepaint(); + repaint(); } int KDGanttSplitterHandle::onButton( const TQPoint& p ) @@ -240,16 +240,16 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * ) TQPainter p( &buffer ); // Draw the splitter rectangle - p.setBrush( tqcolorGroup().background() ); - p.setPen( tqcolorGroup().foreground() ); + p.setBrush( colorGroup().background() ); + p.setPen( colorGroup().foreground() ); p.drawRect( rect() ); parentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, rect(), - parentWidget()->tqcolorGroup()); + parentWidget()->colorGroup()); int sw = 8; // Hardcoded, given I didn't use styles anymore, I didn't like to use their size // arrow color - TQColor col = tqcolorGroup().background().dark( 200 ); + TQColor col = colorGroup().background().dark( 200 ); p.setBrush( col ); p.setPen( col ); @@ -258,13 +258,13 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * ) for ( TQValueList<TQPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) { if ( index == _activeButton ) { p.save(); - p.translate( parentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal ), - parentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical ) ); - p.tqdrawPolygon( *it, true ); + p.translate( parentWidget()->tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal ), + parentWidget()->tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical ) ); + p.drawPolygon( *it, true ); p.restore(); } else { - p.tqdrawPolygon( *it, true ); + p.drawPolygon( *it, true ); } index++; } @@ -321,7 +321,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i such a license) and are (C) Trolltech AS. A splitter lets the user control the size of child widgets by - dragging the boundary between the tqchildren. Any number of widgets + dragging the boundary between the children. Any number of widgets may be controlled. To show a TQListBox, a TQListView and a TQTextEdit side by side: @@ -334,14 +334,14 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i \endcode In KDGanttMinimizeSplitter, the boundary can be either horizontal or - vertical. The default is horizontal (the tqchildren are side by side) + vertical. The default is horizontal (the children are side by side) but you can use setOrientation( TQSplitter::Vertical ) to set it to vertical. Use setResizeMode() to specify that a widget should keep its size when the splitter is resized. - Although KDGanttMinimizeSplitter normally resizes the tqchildren only + Although KDGanttMinimizeSplitter normally resizes the children only at the end of a resize operation, if you call setOpaqueResize( TRUE ) the widgets are resized as often as possible. @@ -351,7 +351,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i sizes set by the user. If you hide() a child, its space will be distributed among the other - tqchildren. It will be reinstated when you show() it again. It is also + children. It will be reinstated when you show() it again. It is also possible to reorder the widgets within the splitter using moveToFirst() and moveToLast(). */ @@ -366,10 +366,10 @@ static TQSize minSize( const TQWidget* /*w*/ ) // This is the original version of minSize static TQSize minSizeHint( const TQWidget* w ) { - TQSize min = w->tqminimumSize(); + TQSize min = w->minimumSize(); TQSize s; if ( min.height() <= 0 || min.width() <= 0 ) - s = w->tqminimumSizeHint(); + s = w->minimumSizeHint(); if ( min.height() > 0 ) s.setHeight( min.height() ); if ( min.width() > 0 ) @@ -402,7 +402,7 @@ KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Qt::Orientation o, TQWidget *p } /*! - Destroys the splitter and any tqchildren. + Destroys the splitter and any children. */ KDGanttMinimizeSplitter::~KDGanttMinimizeSplitter() { @@ -415,9 +415,9 @@ void KDGanttMinimizeSplitter::init() { data = new TQSplitterData; if ( orient ==Qt::Horizontal ) - tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Minimum) ); + setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Minimum) ); else - tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Expanding) ); + setSizePolicy( TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Expanding) ); } @@ -435,9 +435,9 @@ void KDGanttMinimizeSplitter::setOrientation( Qt::Orientation o ) orient = o; if ( orient ==Qt::Horizontal ) - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ) ); else - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); KDGanttSplitterLayoutStruct *s = data->list.first(); while ( s ) { @@ -480,7 +480,7 @@ KDGanttSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( TQWidget *w, bo s->wid = newHandle; newHandle->setId(data->list.count()); s->isSplitter = TRUE; - s->sizer = pick( newHandle->tqsizeHint() ); + s->sizer = pick( newHandle->sizeHint() ); if ( first ) data->list.insert( 0, s ); else @@ -489,8 +489,8 @@ KDGanttSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( TQWidget *w, bo s = new KDGanttSplitterLayoutStruct; s->mode = Stretch; s->wid = w; - if ( !testWState( WState_Resized ) && w->tqsizeHint().isValid() ) - s->sizer = pick( w->tqsizeHint() ); + if ( !testWState( WState_Resized ) && w->sizeHint().isValid() ) + s->sizer = pick( w->sizeHint() ); else s->sizer = pick( w->size() ); s->isSplitter = FALSE; @@ -563,7 +563,7 @@ void KDGanttMinimizeSplitter::setRubberband( int p ) paint.setRasterOp( XorROP ); TQRect r = contentsRect(); const int rBord = 3; //Themable???? - int sw = tqstyle().tqpixelMetric(TQStyle::PM_SplitterWidth, this); + int sw = tqstyle().pixelMetric(TQStyle::PM_SplitterWidth, this); if ( orient ==Qt::Horizontal ) { if ( opaqueOldPos >= 0 ) paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(), @@ -603,7 +603,7 @@ bool KDGanttMinimizeSplitter::event( TQEvent *e ) void KDGanttMinimizeSplitter::drawSplitter( TQPainter *p, TQCOORD x, TQCOORD y, TQCOORD w, TQCOORD h ) { - tqstyle().tqdrawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), tqcolorGroup(), + tqstyle().tqdrawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), colorGroup(), (orientation() == Qt::Horizontal ? TQStyle::Style_Horizontal : 0)); } @@ -634,7 +634,7 @@ int KDGanttMinimizeSplitter::idAfter( TQWidget* w ) const close as possible to position \a p, which is the distance from the left (or top) edge of the widget. - For Arabic and Hebrew the tqlayout is reversed, and using this + For Arabic and Hebrew the layout is reversed, and using this function to set the position of the splitter might lead to unexpected results, since in Arabic and Hebrew the position of splitter one is to the left of the position of splitter zero. @@ -707,13 +707,13 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft ) } else { int dd, newLeft, nextPos; if( TQApplication::reverseLayout() && orient ==Qt::Horizontal ) { - dd = w->tqgeometry().right() - pos; - dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->tqmaximumSize()))); + dd = w->geometry().right() - pos; + dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize()))); newLeft = pos+1; nextPos = newLeft + dd; } else { dd = pos - pick( w->pos() ) + 1; - dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->tqmaximumSize()))); + dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize()))); newLeft = pos-dd+1; nextPos = newLeft - 1; } @@ -762,13 +762,13 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft ) int right, dd,/* newRight,*/ newLeft, nextPos; if ( TQApplication::reverseLayout() && orient ==Qt::Horizontal ) { dd = pos - left + 1; - dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->tqmaximumSize()))); + dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize()))); newLeft = pos-dd+1; nextPos = newLeft - 1; } else { - right = pick( w->tqgeometry().bottomRight() ); + right = pick( w->geometry().bottomRight() ); dd = right - pos + 1; - dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->tqmaximumSize()))); + dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize()))); /*newRight = pos+dd-1;*/ newLeft = pos; nextPos = newLeft + dd; @@ -822,7 +822,7 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max ) maxB += s->sizer; } else { minB += pick( minSize(s->wid) ); - maxB += pick( s->wid->tqmaximumSize() ); + maxB += pick( s->wid->maximumSize() ); } } for ( i = id; i < n; i++ ) { @@ -834,12 +834,12 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max ) maxA += s->sizer; } else { minA += pick( minSize(s->wid) ); - maxA += pick( s->wid->tqmaximumSize() ); + maxA += pick( s->wid->maximumSize() ); } } TQRect r = contentsRect(); if ( orient ==Qt::Horizontal && TQApplication::reverseLayout() ) { - int splitterWidth = tqstyle().tqpixelMetric(TQStyle::PM_SplitterWidth, this); + int splitterWidth = tqstyle().pixelMetric(TQStyle::PM_SplitterWidth, this); if ( min ) *min = pick(r.topRight()) - TQMIN( maxB, pick(r.size())-minA ) - splitterWidth; if ( max ) @@ -881,27 +881,27 @@ void KDGanttMinimizeSplitter::doResize() KDGanttSplitterLayoutStruct *s = data->list.at(i); if ( s->wid->isHidden() ) { a[i].stretch = 0; - a[i].tqsizeHint = a[i].tqminimumSize = 0; - a[i].tqmaximumSize = 0; + a[i].sizeHint = a[i].minimumSize = 0; + a[i].maximumSize = 0; } else if ( s->isSplitter ) { a[i].stretch = 0; - a[i].tqsizeHint = a[i].tqminimumSize = a[i].tqmaximumSize = s->sizer; + a[i].sizeHint = a[i].minimumSize = a[i].maximumSize = s->sizer; a[i].empty = FALSE; } else if ( s->mode == KeepSize ) { a[i].stretch = 0; - a[i].tqminimumSize = pick( minSize(s->wid) ); - a[i].tqsizeHint = s->sizer; - a[i].tqmaximumSize = pick( s->wid->tqmaximumSize() ); + a[i].minimumSize = pick( minSize(s->wid) ); + a[i].sizeHint = s->sizer; + a[i].maximumSize = pick( s->wid->maximumSize() ); a[i].empty = FALSE; } else if ( s->mode == FollowSizeHint ) { a[i].stretch = 0; - a[i].tqminimumSize = a[i].tqsizeHint = pick( s->wid->tqsizeHint() ); - a[i].tqmaximumSize = pick( s->wid->tqmaximumSize() ); + a[i].minimumSize = a[i].sizeHint = pick( s->wid->sizeHint() ); + a[i].maximumSize = pick( s->wid->maximumSize() ); a[i].empty = FALSE; } else { //proportional a[i].stretch = s->sizer; - a[i].tqmaximumSize = pick( s->wid->tqmaximumSize() ); - a[i].tqsizeHint = a[i].tqminimumSize = pick( minSize(s->wid) ); + a[i].maximumSize = pick( s->wid->maximumSize() ); + a[i].sizeHint = a[i].minimumSize = pick( minSize(s->wid) ); a[i].empty = FALSE; } } @@ -955,9 +955,9 @@ void KDGanttMinimizeSplitter::recalc( bool update ) } else { TQSize minS = minSize(s->wid); minl += pick( minS ); - maxl += pick( s->wid->tqmaximumSize() ); + maxl += pick( s->wid->maximumSize() ); mint = TQMAX( mint, trans( minS )); - int tm = trans( s->wid->tqmaximumSize() ); + int tm = trans( s->wid->maximumSize() ); if ( tm > 0 ) maxt = TQMIN( maxt, tm ); } @@ -968,7 +968,7 @@ void KDGanttMinimizeSplitter::recalc( bool update ) // nested splitters; be nice maxl = maxt = 0; } else { - // KDGanttMinimizeSplitter with no tqchildren yet + // KDGanttMinimizeSplitter with no children yet maxl = TQWIDGETSIZE_MAX; } } else { @@ -1107,7 +1107,7 @@ void KDGanttMinimizeSplitter::recalcId() /*! Reimplemented from superclass. */ -TQSize KDGanttMinimizeSplitter::tqsizeHint() const +TQSize KDGanttMinimizeSplitter::sizeHint() const { constPolish(); int l = 0; @@ -1121,7 +1121,7 @@ TQSize KDGanttMinimizeSplitter::tqsizeHint() const ++it; if ( o->isWidgetType() && !((TQWidget*)o)->isHidden() ) { - TQSize s = ((TQWidget*)o)->tqsizeHint(); + TQSize s = ((TQWidget*)o)->sizeHint(); if ( s.isValid() ) { l += pick( s ); t = TQMAX( t, trans( s ) ); @@ -1137,7 +1137,7 @@ TQSize KDGanttMinimizeSplitter::tqsizeHint() const \reimp */ -TQSize KDGanttMinimizeSplitter::tqminimumSizeHint() const +TQSize KDGanttMinimizeSplitter::minimumSizeHint() const { constPolish(); int l = 0; @@ -1231,7 +1231,7 @@ bool KDGanttMinimizeSplitter::isHidden( TQWidget *w ) const splitter. Giving the values to another splitter's setSizes() function will - produce a splitter with the same tqlayout as this one. + produce a splitter with the same layout as this one. Note that if you want to iterate over the list, you should iterate over a copy, e.g. @@ -1311,7 +1311,7 @@ void KDGanttMinimizeSplitter::processChildEvents() void KDGanttMinimizeSplitter::styleChange( TQStyle& old ) { - int sw = tqstyle().tqpixelMetric(TQStyle::PM_SplitterWidth, this); + int sw = tqstyle().pixelMetric(TQStyle::PM_SplitterWidth, this); KDGanttSplitterLayoutStruct *s = data->list.first(); while ( s ) { if ( s->isSplitter ) @@ -1366,9 +1366,9 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i int i; for ( i = start; i < start + count; i++ ) { chain[i].done = FALSE; - cHint += chain[i].tqsizeHint; - cMin += chain[i].tqminimumSize; - cMax += chain[i].tqmaximumSize; + cHint += chain[i].sizeHint; + cMin += chain[i].minimumSize; + cMax += chain[i].maximumSize; sumStretch += chain[i].stretch; if ( !chain[i].empty ) spacerCount++; @@ -1381,11 +1381,11 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i if ( space < cMin + spacerCount * spacer ) { // qDebug("not enough space"); for ( i = start; i < start+count; i++ ) { - chain[i].size = chain[i].tqminimumSize; + chain[i].size = chain[i].minimumSize; chain[i].done = TRUE; } } else if ( space < cHint + spacerCount*spacer ) { - // Less space than tqsizeHint, but more than minimum. + // Less space than sizeHint, but more than minimum. // Currently take space equally from each, like in TQt 2.x. // Commented-out lines will give more space to stretchier items. int n = count; @@ -1393,10 +1393,10 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i int overdraft = cHint - space_left; //first give to the fixed ones: for ( i = start; i < start+count; i++ ) { - if ( !chain[i].done && chain[i].tqminimumSize >= chain[i].tqsizeHint) { - chain[i].size = chain[i].tqsizeHint; + if ( !chain[i].done && chain[i].minimumSize >= chain[i].sizeHint) { + chain[i].size = chain[i].sizeHint; chain[i].done = TRUE; - space_left -= chain[i].tqsizeHint; + space_left -= chain[i].sizeHint; // sumStretch -= chain[i].stretch; n--; } @@ -1415,13 +1415,13 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i // else // fp_w += (fp_over * chain[i].stretch) / sumStretch; int w = fRound( fp_w ); - chain[i].size = chain[i].tqsizeHint - w; + chain[i].size = chain[i].sizeHint - w; fp_w -= toFixed( w ); //give the difference to the next - if ( chain[i].size < chain[i].tqminimumSize ) { + if ( chain[i].size < chain[i].minimumSize ) { chain[i].done = TRUE; - chain[i].size = chain[i].tqminimumSize; + chain[i].size = chain[i].minimumSize; finished = FALSE; - overdraft -= chain[i].tqsizeHint - chain[i].tqminimumSize; + overdraft -= chain[i].sizeHint - chain[i].minimumSize; // sumStretch -= chain[i].stretch; n--; break; @@ -1433,11 +1433,11 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i int space_left = space - spacerCount*spacer; // first give to the fixed ones, and handle non-expansiveness for ( i = start; i < start + count; i++ ) { - if ( !chain[i].done && (chain[i].tqmaximumSize <= chain[i].tqsizeHint + if ( !chain[i].done && (chain[i].maximumSize <= chain[i].sizeHint || wannaGrow && !chain[i].expansive) ) { - chain[i].size = chain[i].tqsizeHint; + chain[i].size = chain[i].sizeHint; chain[i].done = TRUE; - space_left -= chain[i].tqsizeHint; + space_left -= chain[i].sizeHint; sumStretch -= chain[i].stretch; n--; } @@ -1469,20 +1469,20 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i int w = fRound( fp_w ); chain[i].size = w; fp_w -= toFixed( w ); // give the difference to the next - if ( w < chain[i].tqsizeHint ) { - deficit += chain[i].tqsizeHint - w; - } else if ( w > chain[i].tqmaximumSize ) { - surplus += w - chain[i].tqmaximumSize; + if ( w < chain[i].sizeHint ) { + deficit += chain[i].sizeHint - w; + } else if ( w > chain[i].maximumSize ) { + surplus += w - chain[i].maximumSize; } } if ( deficit > 0 && surplus <= deficit ) { // give to the ones that have too little for ( i = start; i < start+count; i++ ) { if ( !chain[i].done && - chain[i].size < chain[i].tqsizeHint ) { - chain[i].size = chain[i].tqsizeHint; + chain[i].size < chain[i].sizeHint ) { + chain[i].size = chain[i].sizeHint; chain[i].done = TRUE; - space_left -= chain[i].tqsizeHint; + space_left -= chain[i].sizeHint; sumStretch -= chain[i].stretch; n--; } @@ -1492,10 +1492,10 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i // take from the ones that have too much for ( i = start; i < start+count; i++ ) { if ( !chain[i].done && - chain[i].size > chain[i].tqmaximumSize ) { - chain[i].size = chain[i].tqmaximumSize; + chain[i].size > chain[i].maximumSize ) { + chain[i].size = chain[i].maximumSize; chain[i].done = TRUE; - space_left -= chain[i].tqmaximumSize; + space_left -= chain[i].maximumSize; sumStretch -= chain[i].stretch; n--; } diff --git a/kdgantt/KDGanttMinimizeSplitter.h b/kdgantt/KDGanttMinimizeSplitter.h index 557026f1..7a56d7ce 100644 --- a/kdgantt/KDGanttMinimizeSplitter.h +++ b/kdgantt/KDGanttMinimizeSplitter.h @@ -72,8 +72,8 @@ public: void moveToLast( TQWidget * ); void refresh() { recalc( TRUE ); } - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; TQValueList<int> sizes() const; void setSizes( TQValueList<int> ); @@ -149,7 +149,7 @@ public: bool opaque() const { return s->opaqueResize(); } - TQSize tqsizeHint() const; + TQSize sizeHint() const; int id() const { return myId; } // data->list.at(id())->wid == this void setId( int i ) { myId = i; } diff --git a/kdgantt/KDGanttSemiSizingControl.cpp b/kdgantt/KDGanttSemiSizingControl.cpp index 8bede0d0..b51507f9 100644 --- a/kdgantt/KDGanttSemiSizingControl.cpp +++ b/kdgantt/KDGanttSemiSizingControl.cpp @@ -247,7 +247,7 @@ KDGanttSemiSizingControl::ArrowPosition KDGanttSemiSizingControl::arrowPosition( void KDGanttSemiSizingControl::init() { _but = new TQPushButton( this ); - _but->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + _but->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); connect( _but, TQT_SIGNAL( clicked() ), this, TQT_SLOT(changeState()) ); _layout = 0; TQWhatsThis::add( _but, "Click on this button to show the \nlegend at the bottom of the widget"); @@ -258,7 +258,7 @@ void KDGanttSemiSizingControl::init() void KDGanttSemiSizingControl::setup() { - //-------------------------------------------------- Setup tqlayout + //-------------------------------------------------- Setup layout delete _layout; TQBoxLayout* butLayout; // _layout will delete me @@ -395,7 +395,7 @@ TQPixmap KDGanttSemiSizingControl::pixmap( Direction direction ) { TQPainter p( &pix ); p.setPen( black ); - p.setBrush( tqcolorGroup().button() ); + p.setBrush( colorGroup().button() ); p.drawPolygon( arr ); TQBitmap bit( s, s ); bit.fill( color0 ); diff --git a/kdgantt/KDGanttSemiSizingControl.h b/kdgantt/KDGanttSemiSizingControl.h index 34b11a23..823eddac 100644 --- a/kdgantt/KDGanttSemiSizingControl.h +++ b/kdgantt/KDGanttSemiSizingControl.h @@ -36,7 +36,7 @@ #define KDGANTTSEMISIZINGCONTROL_H #include "KDGanttSizingControl.h" -#include <tqlayout.h> +#include <layout.h> class TQPushButton; class TQBoxLayout; diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp index f14ac027..b5d44d35 100644 --- a/kdgantt/KDGanttView.cpp +++ b/kdgantt/KDGanttView.cpp @@ -41,7 +41,7 @@ #include "itemAttributeDialog.h" #include <tqprinter.h> #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpaintdevicemetrics.h> #include <tqfile.h> #include <tqheader.h> @@ -186,7 +186,7 @@ KDGanttView::KDGanttView( TQWidget* parent, const char* name ) fDropEnabled = false; closingBlocked = false; myTimeHeader->computeTicks(); - centerTimelineAfterShow( TQDateTime::tqcurrentDateTime () ); + centerTimelineAfterShow( TQDateTime::currentDateTime () ); setDisplayEmptyTasksAsLine( false ); TQValueList<int> list; list.append(240); @@ -313,12 +313,12 @@ bool KDGanttView::close ( bool alsoDelete ) /*! Returns a useful size for the view. Returned width: - tqsizeHint().width() of the list view + width of TimeTable + sizeHint().width() of the list view + width of TimeTable Returned height: height() of TimeHeader + height() of TimeTable + height() of Legend (if shown) */ -TQSize KDGanttView::tqsizeHint() const +TQSize KDGanttView::sizeHint() const { bool block = myTimeTable->blockUpdating(); myTimeTable->setBlockUpdating( false ); @@ -342,9 +342,9 @@ TQSize KDGanttView::tqsizeHint() const if ( myLegend->isShown() ) hintHeight += myLegend->legendSizeHint().height() +10; hintHeight += myTimeTable->minimumHeight+myListView->frameWidth()*2+2; - int hintWid = myListView->tqsizeHint().width(); + int hintWid = myListView->sizeHint().width(); //hintWid += myTimeHeader->mySizeHint+myCanvasView->verticalScrollBar()->width(); - hintWid += myCanvasView->tqsizeHint().width(); + hintWid += myCanvasView->sizeHint().width(); // add 10 for the splitter-bars // qDebug("sizehint %d %d ",hintWid+10, hintHeight ); myTimeTable->setBlockUpdating( block ); @@ -539,7 +539,7 @@ void KDGanttView::slotMouseButtonPressed ( int button, TQListViewItem * item, the fastest mode. If Medium, there is extra repainting after releasing the scrollbar. This provides fast scrolling with updated content - after scrolling. Recommended, when tqrepaint problems occur. + after scrolling. Recommended, when repaint problems occur. This is the default value after startup. If Always, there is an extra update after every move of the scrollbar. This entails slow scrolling with updated @@ -622,7 +622,7 @@ void KDGanttView::slotHeaderSizeChanged() // legend is cleared - reinit legend with list legendItem* li; for ( li = myLegendItems->first(); li; li = myLegendItems->next() ) { - myLegend->addLegendItem(li->tqshape, li->color, li->text ); + myLegend->addLegendItem(li->shape, li->color, li->text ); } } } @@ -875,7 +875,7 @@ void KDGanttView::print( TQPrinter* printer , TQSize size = drawContents( 0, printListView, printTimeLine, printLegend ); // at the top, we want to print current time/date - TQString date = "Printing Time: " + TQDateTime::tqcurrentDateTime().toString(); + TQString date = "Printing Time: " + TQDateTime::currentDateTime().toString(); int hei = p.boundingRect(0,0, 5, 5, TQt::AlignLeft, date ).height(); p.drawText( 0, 0, date ); @@ -1216,7 +1216,7 @@ bool KDGanttView::showTaskLinks() const void KDGanttView::setFont(const TQFont& font) { myListView->setFont(font); - myListView->tqrepaint(); + myListView->repaint(); myTimeHeader->setFont(font); myLegend->setFont( font ); TQWidget::setFont( font ); @@ -1306,21 +1306,21 @@ bool KDGanttView::showTimeTablePopupMenu() const /*! - Sets the tqshapes for a certain type of Gantt item. Not all items use - all three tqshapes (e.g., only summary items use the middle tqshape). + Sets the shapes for a certain type of Gantt item. Not all items use + all three shapes (e.g., only summary items use the middle shape). - This setting overrides any tqshape settings made on individual items. + This setting overrides any shape settings made on individual items. These settings will be taken as initial values of any newly created item of this certain type. See also the documentation of the KDGanttViewItem class. - \param type the type of Gantt items for which to set the tqshapes - \param start the tqshape to use for the beginning of the item - \param middle the tqshape to use for the middle of the item - \param end the tqshape to use for the end of the item - \param overwriteExisting if true, overwrites existing tqshape settings + \param type the type of Gantt items for which to set the shapes + \param start the shape to use for the beginning of the item + \param middle the shape to use for the middle of the item + \param end the shape to use for the end of the item + \param overwriteExisting if true, overwrites existing shape settings in the individual items - \sa tqshapes() + \sa shapes() */ void KDGanttView::setShapes( KDGanttViewItem::Type type, KDGanttViewItem::Shape start, @@ -1344,18 +1344,18 @@ void KDGanttView::setShapes( KDGanttViewItem::Type type, /*! - Queries the tqshapes for a particular type of Gantt item. + Queries the shapes for a particular type of Gantt item. - \param type the type of Gantt items for which to query the tqshapes - \param start the start tqshape is returned in this parameter - \param middle the middle tqshape is returned in this parameter - \param end the end tqshape is returned in this parameter - \return true if there was a general tqshape set for the specified - type. If the return value is false, the values of the three tqshape + \param type the type of Gantt items for which to query the shapes + \param start the start shape is returned in this parameter + \param middle the middle shape is returned in this parameter + \param end the end shape is returned in this parameter + \return true if there was a general shape set for the specified + type. If the return value is false, the values of the three shape parameters are undefined. \sa setShapes() */ -bool KDGanttView::tqshapes( KDGanttViewItem::Type type, +bool KDGanttView::shapes( KDGanttViewItem::Type type, KDGanttViewItem::Shape& start, KDGanttViewItem::Shape& middle, KDGanttViewItem::Shape& end ) const @@ -1569,19 +1569,19 @@ void KDGanttView::clearLegend( ) /*! Adds an item to the legend. - \param tqshape the tqshape to display - \param tqshapeColor the color in which to display the tqshape + \param shape the shape to display + \param shapeColor the color in which to display the shape \param text the text to display \sa clearLegend() */ -void KDGanttView::addLegendItem( KDGanttViewItem::Shape tqshape, - const TQColor& tqshapeColor, +void KDGanttView::addLegendItem( KDGanttViewItem::Shape shape, + const TQColor& shapeColor, const TQString& text ) { - myLegend->addLegendItem( tqshape,tqshapeColor,text ); + myLegend->addLegendItem( shape,shapeColor,text ); legendItem* item = new legendItem; - item->tqshape = tqshape; - item->color = tqshapeColor; + item->shape = shape; + item->color = shapeColor; item->text = text; myLegendItems->append( item ); } @@ -3412,58 +3412,58 @@ TQDomDocument KDGanttView::saveXML( bool withPI ) const showTimeTablePopupMenu() ); // the Shapes element - TQDomElement tqshapesElement = doc.createElement( "Shapes" ); - docRoot.appendChild( tqshapesElement ); - TQDomElement tqshapesEventElement = doc.createElement( "Event" ); - tqshapesElement.appendChild( tqshapesEventElement ); + TQDomElement shapesElement = doc.createElement( "Shapes" ); + docRoot.appendChild( shapesElement ); + TQDomElement shapesEventElement = doc.createElement( "Event" ); + shapesElement.appendChild( shapesEventElement ); KDGanttViewItem::Shape start, middle, end; - if( tqshapes( KDGanttViewItem::Event, start, middle, end ) ) { - KDGanttXML::createStringNode( doc, tqshapesEventElement, "Start", - KDGanttViewItem::tqshapeToString( start ) ); - KDGanttXML::createStringNode( doc, tqshapesEventElement, "Middle", - KDGanttViewItem::tqshapeToString( middle ) ); - KDGanttXML::createStringNode( doc, tqshapesEventElement, "End", - KDGanttViewItem::tqshapeToString( end ) ); + if( shapes( KDGanttViewItem::Event, start, middle, end ) ) { + KDGanttXML::createStringNode( doc, shapesEventElement, "Start", + KDGanttViewItem::shapeToString( start ) ); + KDGanttXML::createStringNode( doc, shapesEventElement, "Middle", + KDGanttViewItem::shapeToString( middle ) ); + KDGanttXML::createStringNode( doc, shapesEventElement, "End", + KDGanttViewItem::shapeToString( end ) ); } else { - KDGanttXML::createStringNode( doc, tqshapesEventElement, "Start", + KDGanttXML::createStringNode( doc, shapesEventElement, "Start", "Undefined" ); - KDGanttXML::createStringNode( doc, tqshapesEventElement, "Middle", + KDGanttXML::createStringNode( doc, shapesEventElement, "Middle", "Undefined" ); - KDGanttXML::createStringNode( doc, tqshapesEventElement, "End", + KDGanttXML::createStringNode( doc, shapesEventElement, "End", "Undefined" ); } - TQDomElement tqshapesTaskElement = doc.createElement( "Task" ); - tqshapesElement.appendChild( tqshapesTaskElement ); - if( tqshapes( KDGanttViewItem::Task, start, middle, end ) ) { - KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Start", - KDGanttViewItem::tqshapeToString( start ) ); - KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Middle", - KDGanttViewItem::tqshapeToString( middle ) ); - KDGanttXML::createStringNode( doc, tqshapesTaskElement, "End", - KDGanttViewItem::tqshapeToString( end ) ); + TQDomElement shapesTaskElement = doc.createElement( "Task" ); + shapesElement.appendChild( shapesTaskElement ); + if( shapes( KDGanttViewItem::Task, start, middle, end ) ) { + KDGanttXML::createStringNode( doc, shapesTaskElement, "Start", + KDGanttViewItem::shapeToString( start ) ); + KDGanttXML::createStringNode( doc, shapesTaskElement, "Middle", + KDGanttViewItem::shapeToString( middle ) ); + KDGanttXML::createStringNode( doc, shapesTaskElement, "End", + KDGanttViewItem::shapeToString( end ) ); } else { - KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Start", + KDGanttXML::createStringNode( doc, shapesTaskElement, "Start", "Undefined" ); - KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Middle", + KDGanttXML::createStringNode( doc, shapesTaskElement, "Middle", "Undefined" ); - KDGanttXML::createStringNode( doc, tqshapesTaskElement, "End", + KDGanttXML::createStringNode( doc, shapesTaskElement, "End", "Undefined" ); } - TQDomElement tqshapesSummaryElement = doc.createElement( "Summary" ); - tqshapesElement.appendChild( tqshapesSummaryElement ); - if( tqshapes( KDGanttViewItem::Event, start, middle, end ) ) { - KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Start", - KDGanttViewItem::tqshapeToString( start ) ); - KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Middle", - KDGanttViewItem::tqshapeToString( middle ) ); - KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "End", - KDGanttViewItem::tqshapeToString( end ) ); + TQDomElement shapesSummaryElement = doc.createElement( "Summary" ); + shapesElement.appendChild( shapesSummaryElement ); + if( shapes( KDGanttViewItem::Event, start, middle, end ) ) { + KDGanttXML::createStringNode( doc, shapesSummaryElement, "Start", + KDGanttViewItem::shapeToString( start ) ); + KDGanttXML::createStringNode( doc, shapesSummaryElement, "Middle", + KDGanttViewItem::shapeToString( middle ) ); + KDGanttXML::createStringNode( doc, shapesSummaryElement, "End", + KDGanttViewItem::shapeToString( end ) ); } else { - KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Start", + KDGanttXML::createStringNode( doc, shapesSummaryElement, "Start", "Undefined" ); - KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Middle", + KDGanttXML::createStringNode( doc, shapesSummaryElement, "Middle", "Undefined" ); - KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "End", + KDGanttXML::createStringNode( doc, shapesSummaryElement, "End", "Undefined" ); } @@ -3601,7 +3601,7 @@ TQDomDocument KDGanttView::saveXML( bool withPI ) const TQDomElement legendItemElement = doc.createElement( "LegendItem" ); legendItemsElement.appendChild( legendItemElement ); KDGanttXML::createStringNode( doc, legendItemElement, "Shape", - KDGanttViewItem::tqshapeToString( current->tqshape ) ); + KDGanttViewItem::shapeToString( current->shape ) ); KDGanttXML::createColorNode( doc, legendItemElement, "Color", current->color ); KDGanttXML::createStringNode( doc, legendItemElement, "Text", @@ -3754,17 +3754,17 @@ void KDGanttView::editItem( KDGanttViewItem* item) /*! - This method returns the pixmap used for a certain tqshape, in the + This method returns the pixmap used for a certain shape, in the selected color and size. - \param tqshape the tqshape to generate - \param tqshapeColor the foreground color of the tqshape - \param backgroundColor the background color of the tqshape - \param itemSize the size of the tqshape - \return the generated tqshape pixmap + \param shape the shape to generate + \param shapeColor the foreground color of the shape + \param backgroundColor the background color of the shape + \param itemSize the size of the shape + \return the generated shape pixmap */ -TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape tqshape, - const TQColor& tqshapeColor, +TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape shape, + const TQColor& shapeColor, const TQColor& backgroundColor, int itemSize) { // 10 is a good value as size @@ -3774,11 +3774,11 @@ TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape tqshape, p.fill( backgroundColor ); TQPainter paint (&p); TQBrush b = TQBrush ( TQt::SolidPattern ); - b.setColor( tqshapeColor ); + b.setColor( shapeColor ); paint.setBrush( b ); TQPen pen( TQt::black, 1 ) ; paint.setPen( pen ); - switch (tqshape) { + switch (shape) { case KDGanttViewItem::TriangleDown:{ TQPointArray arr = TQPointArray(3); arr.setPoint(0,-size/2,-hei); @@ -3861,8 +3861,8 @@ void KDGanttView::initDefaults() myDefaultColor [ getIndex( KDGanttViewItem::Summary ) ] = TQt::cyan;//summary myDefaultColorHL [ getIndex( KDGanttViewItem::Summary ) ] = TQt::red; - // setting the default tqshape types - // currently, we take for each item for all three tqshapes (start, middle, end) the same default tqshape + // setting the default shape types + // currently, we take for each item for all three shapes (start, middle, end) the same default shape for (i = 0;i<3;++i) { myDefaultShape [3*getIndex( KDGanttViewItem::Event )+ i] = KDGanttViewItem::Diamond; //event myDefaultShape [3*getIndex( KDGanttViewItem::Task ) +i] = KDGanttViewItem::Square; //task @@ -4236,7 +4236,7 @@ TQColor KDGanttView::legendHeaderBackgroundColor () const may add as many widgets as you want. They are ordered horizontally from left to right. To remove a widget from the spacer widget, call widget->reparent(newParent,...) or delete the widget. Since the spacer - is a TQHBox, the tqlayout of the added widgets is managed by this + is a TQHBox, the layout of the added widgets is managed by this TQHBox. \param w A pointer to the widget to be added. diff --git a/kdgantt/KDGanttView.h b/kdgantt/KDGanttView.h index 02fdc5d7..902f82dc 100644 --- a/kdgantt/KDGanttView.h +++ b/kdgantt/KDGanttView.h @@ -39,7 +39,7 @@ #include <tqwidget.h> #include <tqlistview.h> #include <tqsplitter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqfont.h> #include <tqdom.h> #include <tqvbox.h> @@ -192,7 +192,7 @@ public: KDGanttViewItem::Shape middle, KDGanttViewItem::Shape end, bool overwriteExisting = true ); - bool tqshapes( KDGanttViewItem::Type type, + bool shapes( KDGanttViewItem::Type type, KDGanttViewItem::Shape& start, KDGanttViewItem::Shape& middle, KDGanttViewItem::Shape& end ) const; @@ -227,7 +227,7 @@ public: TQPtrList<KDGanttViewTaskLinkGroup> taskLinkGroups() const; // Legend-related stuff - void addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text ); + void addLegendItem( KDGanttViewItem::Shape shape, const TQColor& shapeColor, const TQString& text ); void clearLegend(); // Header-related stuff void setHorizonStart( const TQDateTime& start ); @@ -293,7 +293,7 @@ public: void setWeekendDays( int start, int end ); void weekendDays( int& start, int& end ) const; - static TQPixmap getPixmap( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor,const TQColor& backgroundColor, int itemSize); + static TQPixmap getPixmap( KDGanttViewItem::Shape shape, const TQColor& shapeColor,const TQColor& backgroundColor, int itemSize); void setHeaderVisible( bool ); bool headerVisible() const; @@ -325,7 +325,7 @@ public: virtual void lvStartDrag (KDGanttViewItem*); virtual bool lvDragMoveEvent (TQDragMoveEvent * e,KDGanttViewItem*, KDGanttViewItem*); virtual void lvDragEnterEvent (TQDragEnterEvent * e ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; KDGanttViewItem* getItemByName( const TQString& name ) const; TQDateTime getDateTimeForCoordX(int coordX, bool global = true ) const; KDGanttViewItem* getItemByListViewPos( const TQPoint& pos ) const; @@ -409,7 +409,7 @@ private slots: void slot_lvDropped(TQDropEvent* e, KDGanttViewItem* droppedItem, KDGanttViewItem* itemBelowMouse ); private: struct legendItem { - KDGanttViewItem::Shape tqshape; + KDGanttViewItem::Shape shape; TQColor color; TQString text; }; diff --git a/kdgantt/KDGanttViewItem.cpp b/kdgantt/KDGanttViewItem.cpp index fab1b3bd..62205b6b 100644 --- a/kdgantt/KDGanttViewItem.cpp +++ b/kdgantt/KDGanttViewItem.cpp @@ -52,20 +52,20 @@ directly. Instead, you should create items of one of the subclasses. This class provides methods common to all Gantt items. - The initialization of the tqshapes/colors of the item works as follows: + The initialization of the shapes/colors of the item works as follows: Shapes: - When a new item is created, the tqshapes are set to the default values + When a new item is created, the shapes are set to the default values for items of the type of this item, defined in the KDGanttView class with void setShapes( KDGanttViewItem::Type type, KDGanttViewItem::Shape start, KDGanttViewItem::Shape middle, KDGanttViewItem::Shape end ); If there is no default value defined for this type, - the tqshapes are set as follows: - For TaskViewItems all three tqshapes are set to Square. - For SummaryViewItems all three tqshapes are set to TriangleDown. - For EventViewItems all three tqshapes are set to Diamond. + the shapes are set as follows: + For TaskViewItems all three shapes are set to Square. + For SummaryViewItems all three shapes are set to TriangleDown. + For EventViewItems all three shapes are set to Diamond. Colors: When a new item is created, the colors are set to the default values @@ -75,7 +75,7 @@ const TQColor& middle, const TQColor& end ); If there is no default value defined for this type, - the colors of the tqshapes are set to the default color for items of this type, + the colors of the shapes are set to the default color for items of this type, defined in the KDGanttView class with: void setDefaultColor( KDGanttViewItem::Type type, const TQColor& ); The initial default color in the KDGanttView class is set to @@ -92,7 +92,7 @@ const TQColor& middle, const TQColor& end ); If there is no default value defined for this type, - the highlight colors of the tqshapes are set to the default color for + the highlight colors of the shapes are set to the default color for items of this type, defined in the KDGanttView class with: void setDefaultHighlightColor( KDGanttViewItem::Type type, const TQColor& ); The initial default highlight color in the KDGanttView class is set to red @@ -122,15 +122,15 @@ shown or not. In the other mode (set with setDisplaySubitemsAsGroup( true ); ), called "calendar mode", the item is displayed as follows: - If the item has no tqchildren, it is displayed as usual. - If the item is opened (i.e., its tqchildren are displayed), the + If the item has no children, it is displayed as usual. + If the item is opened (i.e., its children are displayed), the start/end time of this item is computed automatically according to - the earliest start time/latest end time of its tqchildren. The item - and its tqchildren are displayed as usual. - If the item is closed (i.e., its tqchildren are hidden in the left - list view), the item itself is hidden, and its tqchildren are displayed + the earliest start time/latest end time of its children. The item + and its children are displayed as usual. + If the item is closed (i.e., its children are hidden in the left + list view), the item itself is hidden, and its children are displayed on the timeline of this item instead. To control the painting of - overlapping tqchildren, call \a setPriority() for the childs. + overlapping children, call \a setPriority() for the childs. Blocking of user interaction to open item: If you want to block users to open items used as parents of calendar items, @@ -138,7 +138,7 @@ Example 1, Color: If you create an instance of a KDGanttView class and add a SummaryViewItem - without setting any color/tqshape values, you get an item with three tqshapes + without setting any color/shape values, you get an item with three shapes of the form TriangleDown in the color magenta. If the item is highlighted, the color will change to the highlight color red. @@ -147,12 +147,12 @@ \a KDGanttView::setCalendarMode( true ); \a KDGanttView::setDisplaySubitemsAsGroup( true ); Insert root items in the Gantt view. - Insert items as tqchildren of these root item in the Gantt view. + Insert items as children of these root item in the Gantt view. You may use any item type as parent and child; there are no limitations. It is, however, recommended to use KDGanttViewTaskItems - Actually, you may add child items to the tqchildren themselves. + Actually, you may add child items to the children themselves. Such a child behaves then like a parent. - Now set the start/end time of the tqchildren to specify a time + Now set the start/end time of the children to specify a time interval for these items. */ @@ -451,7 +451,7 @@ bool KDGanttViewItem::editable() const Useful to get a so called "calendar view" with many items in one row. When \a displaySubitemsAsGroup() is set to true, this item has a normal view, when it is expanded. If it is not expanded (and has at least one child), - the item itself is hidden, and all tqchildren are displayed instead. + the item itself is hidden, and all children are displayed instead. To manage the painting priority of the childs (if overlapping), you may set \a priority() of these items. @@ -735,7 +735,7 @@ TQString KDGanttViewItem::whatsThisText() const /*! Specifies whether this item should be shown highlighted. The user can also highlight items with the mouse. - If the item displays its subitems (tqchildren) as a group + If the item displays its subitems (children) as a group (displaySubitemsAsGroup() == true), all changes apply to all subitems as well. @@ -773,16 +773,16 @@ bool KDGanttViewItem::highlight() const /*! - Specifies the tqshapes to be used for this item. + Specifies the shapes to be used for this item. - It is advisable not to use this method, but rather set the tqshapes + It is advisable not to use this method, but rather set the shapes for all items of a type with KDGanttView::setShapes() in order to get a uniform Gantt view. - \param start the start tqshape - \param middle the middle tqshape - \param end the end tqshape - \sa tqshapes(), setColors(), colors() + \param start the start shape + \param middle the middle shape + \param end the end shape + \sa shapes(), setColors(), colors() */ void KDGanttViewItem::setShapes( Shape start, Shape middle, Shape end ) { @@ -799,20 +799,20 @@ void KDGanttViewItem::setShapes( Shape start, Shape middle, Shape end ) /*! - Creates tqshapes of the specified type \a tqshape. - The background tqshape color is set to black and the background tqshape - is slightly bit bigger than the foreground tqshape to have a black border - around the foreground tqshape. + Creates shapes of the specified type \a shape. + The background shape color is set to black and the background shape + is slightly bit bigger than the foreground shape to have a black border + around the foreground shape. - \param itemShape the foreground tqshape - \param middle itemShapeBack the background tqshape - \param tqshape the type of the tqshape + \param itemShape the foreground shape + \param middle itemShapeBack the background shape + \param shape the type of the shape (may be TriangleDown, TriangleUp, Diamond, Square, Circle) - \sa tqshapes(), setColors(), colors() + \sa shapes(), setColors(), colors() */ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape, KDCanvasPolygonItem* &itemShapeBack, - Shape tqshape ) + Shape shape ) { if ( itemShape && type() == Task ) return; @@ -823,7 +823,7 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape, TQCanvasPolygonalItem * itemBack; int size = myItemSize+2; int hei = (myItemSize/3)/2; - switch (tqshape) { + switch (shape) { case TriangleDown: { item = new KDCanvasPolygon(myGanttView->myTimeTable, this,Type_is_KDGanttViewItem); @@ -912,8 +912,8 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape, break; } default: - // Uninitialized tqshape, can e.g. be the case with free-busy - // items which don't have any tqshapes + // Uninitialized shape, can e.g. be the case with free-busy + // items which don't have any shapes return; } item->setBrush(Qt::SolidPattern); @@ -927,14 +927,14 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape, /*! - Returns the tqshapes used for this item + Returns the shapes used for this item - \param start returns the start tqshape - \param middle returns the middle tqshape - \param end returns the end tqshape + \param start returns the start shape + \param middle returns the middle shape + \param end returns the end shape \sa setShapes(), setColors(), colors() */ -void KDGanttViewItem::tqshapes( Shape& start, Shape& middle, Shape& end ) const +void KDGanttViewItem::shapes( Shape& start, Shape& middle, Shape& end ) const { start = myStartShape; middle = myMiddleShape; @@ -943,16 +943,16 @@ void KDGanttViewItem::tqshapes( Shape& start, Shape& middle, Shape& end ) const /*! - Specifies the colors in which to draw the tqshapes of this item. + Specifies the colors in which to draw the shapes of this item. It is advisable not to use this method, but rather set the colors for all items of a type with KDGanttView::setColors() in order to get a uniform Gantt view. - \param start the color for the start tqshape - \param middle the color for the middle tqshape - \param end the color for the end tqshape - \sa colors(), setShapes(), tqshapes(), setDefaultColor(), defaultColor() + \param start the color for the start shape + \param middle the color for the middle shape + \param end the color for the end shape + \sa colors(), setShapes(), shapes(), setDefaultColor(), defaultColor() */ void KDGanttViewItem::setColors( const TQColor& start, const TQColor& middle, const TQColor& end ) @@ -980,7 +980,7 @@ void KDGanttViewItem::setColors( const TQColor& start, const TQColor& middle, \param start returns the start color \param middle returns the middle color \param end returns the end color - \sa setColors(), setShapes(), tqshapes(), setDefaultColor(), defaultColor() + \sa setColors(), setShapes(), shapes(), setDefaultColor(), defaultColor() */ void KDGanttViewItem::colors( TQColor& start, TQColor& middle, TQColor& end ) const { @@ -992,21 +992,21 @@ void KDGanttViewItem::colors( TQColor& start, TQColor& middle, TQColor& end ) co /*! - Specifies the highlight colors in which to draw the tqshapes of this item. + Specifies the highlight colors in which to draw the shapes of this item. It is advisable not to use this method, but rather set the highlight colors for all items of a type with KDGanttView::setHighlightColors() in order to get a uniform Gantt view. - If the item displays its subitems (tqchildren) as a group, + If the item displays its subitems (children) as a group, (displaySubitemsAsGroup() == true) all changes apply to all subitems as well. - \param start the highlight color for the start tqshape - \param middle the highlight color for the middle tqshape - \param end the highlight color for the end tqshape - \sa highlightColors(), setShapes(), tqshapes() + \param start the highlight color for the start shape + \param middle the highlight color for the middle shape + \param end the highlight color for the end shape + \sa highlightColors(), setShapes(), shapes() */ void KDGanttViewItem::setHighlightColors( const TQColor& start, const TQColor& middle, const TQColor& end ) { @@ -1032,7 +1032,7 @@ void KDGanttViewItem::setHighlightColors( const TQColor& start, const TQColor& m \param start returns the start highlight color \param middle returns the middle highlight color \param end returns the end highlight color - \sa setHighlightColors(), setShapes(), tqshapes() + \sa setHighlightColors(), setShapes(), shapes() */ void KDGanttViewItem::highlightColors( TQColor& start, TQColor& middle, TQColor& end ) const { @@ -1048,7 +1048,7 @@ void KDGanttViewItem::highlightColors( TQColor& start, TQColor& middle, TQColor& It is advisable not to use this method, but rather set the text color for all items with KDGanttView::setTextColor() in order to get a uniform Gantt view. - If the item displays its subitems (tqchildren) as a group, + If the item displays its subitems (children) as a group, (displaySubitemsAsGroup() == true) all changes apply to all subitems as well. \param color the text color @@ -1086,7 +1086,7 @@ TQColor KDGanttViewItem::textColor() const /*! \enum KDGanttViewItem::Shape - This enum is used in order to specify the tqshapes of a Gantt chart + This enum is used in order to specify the shapes of a Gantt chart item. */ @@ -1140,7 +1140,7 @@ const TQPixmap* KDGanttViewItem::pixmap( int column ) const for all items of a type with KDGanttView::setDefaultColor() in order to get a uniform Gantt view. - If the item displays its subitems (tqchildren) as a group, + If the item displays its subitems (children) as a group, (displaySubitemsAsGroup() == true) all changes apply to all subitems as well. @@ -1187,7 +1187,7 @@ TQColor KDGanttViewItem::defaultColor() const for all items of a type with KDGanttView::setDefaultHighlightColor() in order to get a uniform Gantt view. - If the item displays its subitems (tqchildren) as a group, + If the item displays its subitems (children) as a group, (displaySubitemsAsGroup() == true) all changes apply to all subitems as well. @@ -1226,7 +1226,7 @@ TQColor KDGanttViewItem::defaultHighlightColor() const /*! Returns the first child of this item. - \return the first child of this item, 0 if this item has no tqchildren + \return the first child of this item, 0 if this item has no children */ KDGanttViewItem* KDGanttViewItem::firstChild() const { @@ -1467,10 +1467,10 @@ void KDGanttViewItem::initColorAndShapes(Type t) setDefaultColor( myGanttView->defaultColor(myType)); // set default highlight color setDefaultHighlightColor(myGanttView->defaultHighlightColor(myType)); - // set tqshapes - if (!( tqshapeDefined = (myGanttView->tqshapes(myType,myStartShape,myMiddleShape,myEndShape)))) { + // set shapes + if (!( shapeDefined = (myGanttView->shapes(myType,myStartShape,myMiddleShape,myEndShape)))) { - //qDebug("KDGantt::KDGanttViewItem created with not user defined tqshapes"); + //qDebug("KDGantt::KDGanttViewItem created with not user defined shapes"); }; setShapes(myStartShape,myMiddleShape,myEndShape); @@ -1484,12 +1484,12 @@ void KDGanttViewItem::initColorAndShapes(Type t) floatStartShape = (KDCanvasPolygonItem*)new KDCanvasRectangle(myGanttView->myTimeTable,this,Type_is_KDGanttViewItem); floatEndShape = (KDCanvasPolygonItem*)new KDCanvasRectangle(myGanttView->myTimeTable,this,Type_is_KDGanttViewItem); - // set color of tqshapes + // set color of shapes if (!( colorDefined = (myGanttView->colors(myType,myStartColor,myMiddleColor,myEndColor)))) { }; setColors(defaultColor(),defaultColor(), defaultColor()); - // set highlight color of tqshapes + // set highlight color of shapes if (!( colorHLDefined = (myGanttView->highlightColors(myType,myStartColorHL,myMiddleColorHL,myEndColorHL)))) { }; @@ -1506,9 +1506,9 @@ void KDGanttViewItem::initColorAndShapes(Type t) } -TQString KDGanttViewItem::tqshapeToString( Shape tqshape ) +TQString KDGanttViewItem::shapeToString( Shape shape ) { - switch( tqshape ) { + switch( shape ) { case TriangleDown: return "TriangleDown"; case TriangleUp: @@ -1569,13 +1569,13 @@ void KDGanttViewItem::createNode( TQDomDocument& doc, KDGanttXML::createBoolNode( doc, itemElement, "Open", isOpen() ); KDGanttXML::createBoolNode( doc, itemElement, "Highlight", highlight() ); Shape startShape, middleShape, endShape; - tqshapes( startShape, middleShape, endShape ); + shapes( startShape, middleShape, endShape ); KDGanttXML::createStringNode( doc, itemElement, "StartShape", - tqshapeToString( startShape ) ); + shapeToString( startShape ) ); KDGanttXML::createStringNode( doc, itemElement, "MiddleShape", - tqshapeToString( middleShape ) ); + shapeToString( middleShape ) ); KDGanttXML::createStringNode( doc, itemElement, "EndShape", - tqshapeToString( endShape ) ); + shapeToString( endShape ) ); KDGanttXML::createColorNode( doc, itemElement, "DefaultColor", defaultColor() ); TQColor startColor, middleColor, endColor; colors( startColor, middleColor, endColor ); @@ -1942,9 +1942,9 @@ void KDGanttViewItem::showSubitemTree( int CoordY ) /*! - Returns the start time of the tqchildren of this item. + Returns the start time of the children of this item. - \return the start time of the tqchildren of this item + \return the start time of the children of this item */ TQDateTime KDGanttViewItem::myChildStartTime() { @@ -1976,9 +1976,9 @@ TQDateTime KDGanttViewItem::myChildStartTime() /*! - Returns the end time of the tqchildren of this item. + Returns the end time of the children of this item. - \return the end time of the tqchildren of this item + \return the end time of the children of this item */ TQDateTime KDGanttViewItem::myChildEndTime() { @@ -2042,7 +2042,7 @@ void KDGanttViewItem::setShowNoInformation( bool show ) /*! If the name of this item is \a name (i.e., listViewText() == name), the pointer to this item is returned. Otherwise, it looks for an - item with name \a name in the set of tqchildren and subtqchildren of + item with name \a name in the set of children and subchildren of this item. \param name the name of the item \return the pointer to the item with name \a name @@ -2363,37 +2363,37 @@ bool KDGanttViewItem::isCalendar( ) const /*! \var KDGanttViewItem::startShape - the tqshape at the beginning of the item + the shape at the beginning of the item */ /*! \var KDGanttViewItem::midShape - the tqshape in the middle of the item + the shape in the middle of the item */ /*! \var KDGanttViewItem::endShape - the tqshape at the end of the item + the shape at the end of the item */ /*! \var KDGanttViewItem::startShapeBack - the background tqshape at the beginning of the item + the background shape at the beginning of the item */ /*! \var KDGanttViewItem::midShapeBack - the background tqshape in the middle of the item + the background shape in the middle of the item */ /*! \var KDGanttViewItem::endShapeBack - the background tqshape at the end of the item + the background shape at the end of the item */ diff --git a/kdgantt/KDGanttViewItem.h b/kdgantt/KDGanttViewItem.h index 972aa4d6..70ca358e 100644 --- a/kdgantt/KDGanttViewItem.h +++ b/kdgantt/KDGanttViewItem.h @@ -146,7 +146,7 @@ public: //bool isCalendar( ) const; void setShapes( Shape start, Shape middle, Shape end ); - void tqshapes( Shape& start, Shape& middle, Shape& end ) const; + void shapes( Shape& start, Shape& middle, Shape& end ) const; void setDefaultColor( const TQColor& ); TQColor defaultColor() const; void setColors( const TQColor& start, const TQColor& middle, @@ -196,7 +196,7 @@ private: friend class KDGanttViewItemDrag; friend class itemAttributeDialog; - static TQString tqshapeToString( Shape tqshape ); + static TQString shapeToString( Shape shape ); static Shape stringToShape( const TQString& string ); static TQString typeToString( Type type ); @@ -236,7 +236,7 @@ private: bool isMyTextCanvas(TQCanvasItem *tc); TQPoint myTextOffset; TQString _name; - bool tqshapeDefined; + bool shapeDefined; int _priority; static TQDict<KDGanttViewItem> sItemDict; }; diff --git a/kdgantt/KDGanttViewItemDrag.cpp b/kdgantt/KDGanttViewItemDrag.cpp index c73eff67..158da041 100644 --- a/kdgantt/KDGanttViewItemDrag.cpp +++ b/kdgantt/KDGanttViewItemDrag.cpp @@ -63,7 +63,7 @@ KDGanttViewItemDrag::KDGanttViewItemDrag( KDGanttViewItem* item , TQWidget *sour pix = *(item->pixmap()) ; else { KDGanttViewItem::Shape start, middle, end; - item->tqshapes( start, middle, end ); + item->shapes( start, middle, end ); TQColor st, mi, en; item->colors( st, mi, en ); pix =item->myGanttView->getPixmap( start, st, item->myGanttView->lvBackgroundColor(), 11 ); @@ -86,7 +86,7 @@ KDGanttViewItemDrag::KDGanttViewItemDrag( KDGanttViewItem* item , TQWidget *sour \param c the format of the data \return the encoded data of the drag object */ -TQByteArray KDGanttViewItemDrag::tqencodedData( const char * c) const +TQByteArray KDGanttViewItemDrag::encodedData( const char * c) const { TQString s ( c ); if ( s == "x-application/x-KDGanttViewItemDrag" ) { @@ -132,7 +132,7 @@ bool KDGanttViewItemDrag::canDecode ( const TQMimeSource * e ) bool KDGanttViewItemDrag::decode ( const TQMimeSource * e , TQString & string) { TQByteArray arr; - arr = e->tqencodedData( "x-application/x-KDGanttViewItemDrag"); + arr = e->encodedData( "x-application/x-KDGanttViewItemDrag"); TQDataStream s( arr, IO_ReadOnly ); s >> string; return true; diff --git a/kdgantt/KDGanttViewItemDrag.h b/kdgantt/KDGanttViewItemDrag.h index a4d6cb6f..9219c918 100644 --- a/kdgantt/KDGanttViewItemDrag.h +++ b/kdgantt/KDGanttViewItemDrag.h @@ -44,7 +44,7 @@ class KDGanttViewItemDrag :public TQStoredDrag public: KDGanttViewItemDrag(KDGanttViewItem* item, TQWidget *source, const char * name ) ; - TQByteArray tqencodedData( const char * c) const; + TQByteArray encodedData( const char * c) const; KDGanttViewItem* getItem(); static bool canDecode ( const TQMimeSource * e ); static bool decode ( const TQMimeSource * e, TQString & ); diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp index d158c75a..f44b8fb5 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -48,7 +48,7 @@ #include <tqtooltip.h> #include <tqapplication.h> #include <tqdrawutil.h> -#include <tqpalette.h> +#include <palette.h> #include <tqdragobject.h> #include <tqptrlist.h> #include <tqpen.h> @@ -702,12 +702,12 @@ KDTimeHeaderWidget:: KDTimeHeaderWidget( TQWidget* parent,KDGanttView* gant ) mySizeHint = 0; myGanttView = gant; flagDoNotRecomputeAfterChange = true; - TQDateTime start = (TQDateTime::tqcurrentDateTime ()).addSecs(-3600); + TQDateTime start = (TQDateTime::currentDateTime ()).addSecs(-3600); setHorizonStart(start); setHorizonEnd( start.addSecs(3600*2)); flagStartTimeSet = false; flagEndTimeSet = false; - myCenterDateTime = TQDateTime::tqcurrentDateTime (); + myCenterDateTime = TQDateTime::currentDateTime (); setScale(KDGanttView::Auto); //setScale(KDGanttView::Hour); myMaxScale = KDGanttView::Month; @@ -792,7 +792,7 @@ void KDTimeHeaderWidget::preparePopupMenu() if (flagZoomToFit) myPopupMenu->changeItem( 1, i18n("Zoom (Fit)")); else - myPopupMenu->changeItem( 1, i18n("Zoom (%1)").tqarg( TQString::number( zoomFactor(), 'f',3) ) ); + myPopupMenu->changeItem( 1, i18n("Zoom (%1)").arg( TQString::number( zoomFactor(), 'f',3) ) ); int i = 0; int id; while ( ( id = scalePopupMenu->idAt( i++ )) >= 0 ) { @@ -1140,7 +1140,7 @@ void KDTimeHeaderWidget::zoomToSelection( TQDateTime start, TQDateTime end) } flagDoNotRepaintAfterChange = false; updateTimeTable(); - tqrepaint(); + repaint(); moveTimeLineTo((getCoordX(start)-(viewWid-timeWid)/2)); // Since we have disconnected autoupdate of scrollbars, we must do it ourselves if (myGanttView && myGanttView->myCanvasView) @@ -2098,7 +2098,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) TQPainter p(this); int Width, Height; TQString testTextMinor,testTextMajor, tempStr; - TQRect tqitemRectMinor, tqitemRectMajor; + TQRect itemRectMinor, itemRectMajor; TQDate tempDate = myRealStart.date(); myRealEnd = myRealStart; // preparing the testtext for the differennt scales @@ -2121,25 +2121,25 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) testTextMinor = "12 AM"; testTextMajor = "Mon Aug 30, x"; if ( yearFormat() != KDGanttView::NoDate ) - testTextMajor += getYear(TQDate::tqcurrentDate()); + testTextMajor += getYear(TQDate::currentDate()); minorPerMajor = 2400; break; case KDGanttView::Day: minorItems = minorItems/(60*24); testTextMinor = "88"; - testTextMajor = "Aug 30, x"+getYear(TQDate::tqcurrentDate()); + testTextMajor = "Aug 30, x"+getYear(TQDate::currentDate()); minorPerMajor = 700; break; case KDGanttView::Week: minorItems = minorItems/(60*24*7); testTextMinor = "88"; - testTextMajor = "Aug x"+getYear(TQDate::tqcurrentDate()); + testTextMajor = "Aug x"+getYear(TQDate::currentDate()); minorPerMajor = 435; // 435 = 365days/12months/7days * 100 break; case KDGanttView::Month: minorItems = (minorItems*12)/(60*24*365); testTextMinor = "M"; - testTextMajor = "x"+getYear(TQDate::tqcurrentDate()); + testTextMajor = "x"+getYear(TQDate::currentDate()); minorPerMajor = 1200; break; case KDGanttView::Auto: @@ -2147,12 +2147,12 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) qDebug(" RealScale == Auto : This may not be! "); break; } - tqitemRectMinor = p.boundingRect ( 10, 10, 2, 2, TQt::AlignLeft,testTextMinor); - tqitemRectMajor = p.boundingRect ( 10, 10, 2, 2, TQt::AlignLeft,testTextMajor); + itemRectMinor = p.boundingRect ( 10, 10, 2, 2, TQt::AlignLeft,testTextMinor); + itemRectMajor = p.boundingRect ( 10, 10, 2, 2, TQt::AlignLeft,testTextMajor); p.end(); //qDebug(" tempMinorScaleCount %d ", tempMinorScaleCount); - Height = tqitemRectMinor.height()+tqitemRectMajor.height()+11; - Width = (tqitemRectMinor.width()+5); + Height = itemRectMinor.height()+itemRectMajor.height()+11; + Width = (itemRectMinor.width()+5); if (Width < minimumColumnWidth()) Width = minimumColumnWidth(); // if the desired width is greater than the maximum width of this widget // increase the minorscalecount @@ -2209,7 +2209,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) // checking, if enough space for majorscale // if not, increasing MajorScaleCount - while ((minorPerMajor*Width)/100 < tqitemRectMajor.width()) { + while ((minorPerMajor*Width)/100 < itemRectMajor.width()) { minorPerMajor = minorPerMajor/tempMajorScaleCount; ++tempMajorScaleCount; minorPerMajor = minorPerMajor*tempMajorScaleCount; @@ -2219,13 +2219,13 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) myGridMinorWidth = Width; // the width of this widget is the gridwidth * the amount of items Width *= minorItems; - // if size changed, reset tqgeometry + // if size changed, reset geometry if (width() != Width || height() != Height ) { resize( Width, Height ); emit sizeChanged( Width ); } - myMajorGridHeight = tqitemRectMajor.height()+5; + myMajorGridHeight = itemRectMajor.height()+5; TQTime tempTime = myRealStart.time(); TQDateTime tempDateTime; int i; @@ -2355,7 +2355,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale) myGanttView->myTimeTable->setBlockUpdating( block ); updateTimeTable(); centerDateTime(myCenterDateTime); - tqrepaint(); + repaint(); } @@ -2501,7 +2501,7 @@ void KDTimeHeaderWidget::mouseReleaseEvent ( TQMouseEvent * ) //zoomToSelection( getDateTimeForIndex(start),getDateTimeForIndex(end) ); } mouseDown = false; - tqrepaint(); + repaint(); } @@ -2516,11 +2516,11 @@ void KDTimeHeaderWidget::mouseMoveEvent ( TQMouseEvent * e ) if ( mouseDown ) { if ( e->pos().y() < -height() || e->pos().y() > 2* height() ) { mouseDown = false; - tqrepaint(); + repaint(); return; } endMouseDown = e->pos().x(); - //tqrepaint; + //repaint; int val = -1; if (endMouseDown < -x() ) { val = myGanttView->myCanvasView->horizontalScrollBar()->value() - @@ -2643,7 +2643,7 @@ TQSize KDLegendWidget::legendSize() TQSize KDLegendWidget::legendSizeHint() { TQApplication::sendPostedEvents( 0, TQEvent::LayoutHint ); - return TQSize( myLegend->tqsizeHint().width(), myLegend->tqsizeHint().height()+scroll->horizontalScrollBar()->height()); + return TQSize( myLegend->sizeHint().width(), myLegend->sizeHint().height()+scroll->horizontalScrollBar()->height()); } @@ -2664,7 +2664,7 @@ void KDLegendWidget::clearLegend ( ) myLegend->setFont( font() ); scroll->addChild( myLegend ); scroll->setResizePolicy( TQScrollView::AutoOneFit ); - myLegend->tqlayout()->setMargin( 11 ); + myLegend->layout()->setMargin( 11 ); myLegend->setFrameStyle( TQFrame::NoFrame ); if ( dock ) scroll->setMaximumHeight( 32000 ); @@ -2673,10 +2673,10 @@ void KDLegendWidget::clearLegend ( ) } -void KDLegendWidget::addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text ) +void KDLegendWidget::addLegendItem( KDGanttViewItem::Shape shape, const TQColor& shapeColor, const TQString& text ) { TQLabel * temp; - TQPixmap p = KDGanttView::getPixmap( tqshape, tqshapeColor, TQt::white, 10); + TQPixmap p = KDGanttView::getPixmap( shape, shapeColor, TQt::white, 10); TQWidget *w = new TQWidget( myLegend ); w->setBackgroundColor( TQt::white ); TQHBoxLayout *lay = new TQHBoxLayout( w ,0, 6); @@ -2896,7 +2896,7 @@ void KDListView::drawAllContents(TQPainter * p, int cx, int cy, int cw, int ch) c = fc; // draw to last interesting column - const TQColorGroup &cg = ( tqpalette().inactive() ); + const TQColorGroup &cg = ( palette().inactive() ); while ( c < lc && !drawables.isEmpty() ) { int i = header()->mapToLogical( c ); @@ -2933,7 +2933,7 @@ void KDListView::drawAllContents(TQPainter * p, int cx, int cy, int cw, int ch) if ( tx < 0 ) tx = header()->cellPos( cell ); - // do any tqchildren of current need to be painted? + // do any children of current need to be painted? /* FIXME: painting branches doesn't work for some reason... if ( ih != ith && rootIsDecorated() && @@ -2961,7 +2961,7 @@ void KDListView::drawAllContents(TQPainter * p, int cx, int cy, int cw, int ch) p->translate( rleft, crtop ); //kdDebug()<<k_funcinfo<<"paintBranches: "<<current->i->text(0)<<endl; - current->i->paintBranches( p, tqcolorGroup(), treeStepSize(), + current->i->paintBranches( p, colorGroup(), treeStepSize(), rtop - crtop, r.height() ); p->restore(); } @@ -3506,7 +3506,7 @@ TQString KDGanttCanvasView::getWhatsThisText(TQPoint p) void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e ) { //qDebug("mousepress! %d ", this); - //qDebug("focus %d ",tqApp->tqfocusWidget()); + //qDebug("focus %d ",tqApp->focusWidget()); setFocus(); currentLink = 0; currentItem = 0; diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h index 8b7bc215..618acb7a 100644 --- a/kdgantt/KDGanttViewSubwidgets.h +++ b/kdgantt/KDGanttViewSubwidgets.h @@ -49,9 +49,9 @@ #include <tqtimer.h> #include <tqgroupbox.h> #include <tqvgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> -#include <tqbrush.h> +#include <brush.h> #include <tqvbox.h> #include <tqdockwindow.h> #include <tqtimer.h> @@ -331,7 +331,7 @@ public: KDLegendWidget ( TQWidget* parent, KDGanttMinimizeSplitter* legendParent ); void showMe(bool); bool isShown(); - void addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text ); + void addLegendItem( KDGanttViewItem::Shape shape, const TQColor& shapeColor, const TQString& text ); void clearLegend(); void setFont( TQFont ); void drawToPainter( TQPainter *p ); diff --git a/kdgantt/KDGanttViewTaskItem.cpp b/kdgantt/KDGanttViewTaskItem.cpp index b51bcbd0..64ecbd84 100644 --- a/kdgantt/KDGanttViewTaskItem.cpp +++ b/kdgantt/KDGanttViewTaskItem.cpp @@ -43,7 +43,7 @@ This class represents calendar items in Gantt charts. - A calendar item in a Gantt chart has no start/end tqshape, + A calendar item in a Gantt chart has no start/end shape, it is displayed as a rectangle. You can set the colors as usual, where only the first argument of setColors( col, col, col ) diff --git a/kdgantt/KDGanttXMLTools.cpp b/kdgantt/KDGanttXMLTools.cpp index aea23944..db2d1ef5 100644 --- a/kdgantt/KDGanttXMLTools.cpp +++ b/kdgantt/KDGanttXMLTools.cpp @@ -33,7 +33,7 @@ **********************************************************************/ #include "KDGanttXMLTools.h" -#include <tqbrush.h> +#include <brush.h> #include <tqbuffer.h> #include <tqimage.h> #include <zlib.h> diff --git a/kdgantt/itemAttributeDialog.ui b/kdgantt/itemAttributeDialog.ui index a3616dca..5a34dbb5 100644 --- a/kdgantt/itemAttributeDialog.ui +++ b/kdgantt/itemAttributeDialog.ui @@ -64,7 +64,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> @@ -383,7 +383,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> @@ -462,7 +462,7 @@ <property name="text"> <string>Text color:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/kdgantt/itemAttributeDialog.ui.h b/kdgantt/itemAttributeDialog.ui.h index 3ab24af8..8624d45d 100644 --- a/kdgantt/itemAttributeDialog.ui.h +++ b/kdgantt/itemAttributeDialog.ui.h @@ -54,7 +54,7 @@ void itemAttributeDialog::ChangeText_clicked() myItem->setTextColor( c ); TQPixmap * pix = (TQPixmap *)ChangeText->pixmap(); pix->fill( myItem->textColor() ); - ChangeText->tqrepaint(); + ChangeText->repaint(); } @@ -62,7 +62,7 @@ void itemAttributeDialog::ChangeStart_clicked() { if ( !myItem) return; KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); TQColor st, mi, en; myItem->colors( st, mi, en ); TQColor c = TQColorDialog::getColor( st, this ); @@ -79,7 +79,7 @@ void itemAttributeDialog::ChangeMiddle_clicked() { if ( !myItem) return; KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); TQColor st, mi, en; myItem->colors( st, mi, en ); TQColor c = TQColorDialog::getColor( mi, this ); @@ -95,7 +95,7 @@ void itemAttributeDialog::ChangeEnd_clicked() { if ( !myItem) return; KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); TQColor st, mi, en; myItem->colors( st, mi, en ); TQColor c = TQColorDialog::getColor( en, this ); @@ -244,7 +244,7 @@ void itemAttributeDialog::reset( KDGanttViewItem * item ) // DateEdit3->setRange(item->startTime().date(), item->endTime().date().addYears(10)); LineEdit1->setText( item->text() ); KDGanttViewItem::Shape start, middle, end; - item->tqshapes( start, middle, end ); + item->shapes( start, middle, end ); TQColor st, mi, en; item->colors( st, mi, en ); ChangeStart->setPixmap( KDGanttView::getPixmap( start, st, backgroundColor(), 10 ) ); @@ -272,7 +272,7 @@ void itemAttributeDialog::HighStart_clicked() { if ( !myItem) return; KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); TQColor st, mi, en; myItem->highlightColors( st, mi, en ); TQColor c = TQColorDialog::getColor( st, this ); @@ -289,7 +289,7 @@ void itemAttributeDialog::HighMiddle_clicked() { if ( !myItem) return; KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); TQColor st, mi, en; myItem->highlightColors( st, mi, en ); TQColor c = TQColorDialog::getColor( mi, this ); @@ -306,7 +306,7 @@ void itemAttributeDialog::HighEnd_clicked() { if ( !myItem) return; KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); TQColor st, mi, en; myItem->highlightColors( st, mi, en ); TQColor c = TQColorDialog::getColor( en, this ); @@ -409,7 +409,7 @@ void itemAttributeDialog::LineEdit1_textChanged( const TQString & ) void itemAttributeDialog::StartBox_activated( const TQString & s ) { KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); start = KDGanttViewItem::stringToShape( s ); myItem->setShapes( start, middle, end ); reset( myItem ); @@ -419,7 +419,7 @@ void itemAttributeDialog::StartBox_activated( const TQString & s ) void itemAttributeDialog::MiddleBox_activated( const TQString & s ) { KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); middle = KDGanttViewItem::stringToShape( s ); myItem->setShapes( start, middle, end ); reset( myItem ); @@ -430,7 +430,7 @@ void itemAttributeDialog::MiddleBox_activated( const TQString & s ) void itemAttributeDialog::EndBox_activated( const TQString & s ) { KDGanttViewItem::Shape start, middle, end; - myItem->tqshapes( start, middle, end ); + myItem->shapes( start, middle, end ); end = KDGanttViewItem::stringToShape( s ); myItem->setShapes( start, middle, end ); reset( myItem ); diff --git a/kdgantt/qlayoutengine_p.h b/kdgantt/qlayoutengine_p.h index e87eb5de..15cd80de 100644 --- a/kdgantt/qlayoutengine_p.h +++ b/kdgantt/qlayoutengine_p.h @@ -56,21 +56,21 @@ #ifndef TQT_H -#include "tqabstracttqlayout.h" +#include "tqabstractlayout.h" #endif // TQT_H #ifndef TQT_NO_LAYOUT struct QLayoutStruct { - void initParameters() { tqminimumSize = tqsizeHint = 0; - tqmaximumSize = TQWIDGETSIZE_MAX; expansive = FALSE; empty = TRUE; } + void initParameters() { minimumSize = sizeHint = 0; + maximumSize = TQWIDGETSIZE_MAX; expansive = FALSE; empty = TRUE; } void init() { stretch = 0; initParameters(); } //permanent storage: int stretch; //parameters: - TQCOORD tqsizeHint; - TQCOORD tqmaximumSize; - TQCOORD tqminimumSize; + TQCOORD sizeHint; + TQCOORD maximumSize; + TQCOORD minimumSize; bool expansive; bool empty; //temporary storage: diff --git a/kexi/3rdparty/kexisql/src/btree.c b/kexi/3rdparty/kexisql/src/btree.c index edcba8c9..02e01249 100644 --- a/kexi/3rdparty/kexisql/src/btree.c +++ b/kexi/3rdparty/kexisql/src/btree.c @@ -101,7 +101,7 @@ typedef struct FreelistInfo FreelistInfo; ** This routine rounds up a number of bytes to the next multiple of 4. ** ** This might need to change for computer architectures that require -** and 8-byte tqalignment boundry for structures. +** and 8-byte alignment boundry for structures. */ #define ROUNDUP(X) ((X+3) & ~3) @@ -726,7 +726,7 @@ int sqliteBtreeOpen( } /* -** Close an open database and tqinvalidate all cursors. +** Close an open database and invalidate all cursors. */ static int fileBtreeClose(Btree *pBt){ while( pBt->pCursor ){ @@ -1998,7 +1998,7 @@ static void reparentPage(Pager *pPager, Pgno pgno, MemPage *pNewParent,int idx){ } /* -** Reparent all tqchildren of the given page to be the given page. +** Reparent all children of the given page to be the given page. ** In other words, for every child of pPage, invoke reparentPage() ** to make sure that each child knows that pPage is its parent. ** @@ -2321,7 +2321,7 @@ static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){ ** the siblings. An attempt is made to find NN siblings on either ** side of pPage. More siblings are taken from one side, however, if ** pPage there are fewer than NN siblings on the other side. If pParent - ** has NB or fewer tqchildren then all tqchildren of pParent are taken. + ** has NB or fewer children then all children of pParent are taken. */ nxDiv = idx - NN; if( nxDiv + NB > pParent->nCell ){ @@ -2547,7 +2547,7 @@ static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){ } /* - ** Reparent tqchildren of all cells. + ** Reparent children of all cells. */ for(i=0; i<nNew; i++){ reparentChildPages(pBt, apNew[i]); @@ -2794,7 +2794,7 @@ static int fileBtreeCreateTable(Btree *pBt, int *piTable){ } /* -** Erase the given database page and all its tqchildren. Return +** Erase the given database page and all its children. Return ** the page to the freelist. */ static int clearDatabasePage(Btree *pBt, Pgno pgno, int freePageFlag){ @@ -3274,8 +3274,8 @@ static int keyCompare( ** 3. Make sure no key is less than or equal to zLowerBound. ** 4. Make sure no key is greater than or equal to zUpperBound. ** 5. Check the integrity of overflow pages. -** 6. Recursively call checkTreePage on all tqchildren. -** 7. Verify that the depth of all tqchildren is the same. +** 6. Recursively call checkTreePage on all children. +** 7. Verify that the depth of all children is the same. ** 8. Make sure this page is at least 33% full or else it is ** the root of the tree. */ diff --git a/kexi/3rdparty/kexisql/src/btree_rb.c b/kexi/3rdparty/kexisql/src/btree_rb.c index 86feaa5b..3954fe6d 100644 --- a/kexi/3rdparty/kexisql/src/btree_rb.c +++ b/kexi/3rdparty/kexisql/src/btree_rb.c @@ -319,7 +319,7 @@ static void print_node(BtRbNode *pNode) /* * Check the following properties of the red-black tree: - * (1) - If a node is red, both of it's tqchildren are black + * (1) - If a node is red, both of it's children are black * (2) - Each path from a given node to a leaf (NULL) node passes thru the * same number of black nodes * @@ -951,10 +951,10 @@ static int memRbtreeDelete(RbtCursor* pCur) } /* First do a standard binary-tree delete (node pZ is to be deleted). How - * to do this depends on how many tqchildren pZ has: + * to do this depends on how many children pZ has: * - * If pZ has no tqchildren or one child, then splice out pZ. If pZ has two - * tqchildren, splice out the successor of pZ and replace the key and data of + * If pZ has no children or one child, then splice out pZ. If pZ has two + * children, splice out the successor of pZ and replace the key and data of * pZ with the key and data of the spliced out successor. */ if( pZ->pLeft && pZ->pRight ){ BtRbNode *pTmp; @@ -1008,7 +1008,7 @@ static int memRbtreeDelete(RbtCursor* pCur) } /* pZ now points at the spliced out node. pChild is the only child of pZ, or - * NULL if pZ has no tqchildren. If pZ is black, and not the tree root, then we + * NULL if pZ has no children. If pZ is black, and not the tree root, then we * will have violated the "same number of black nodes in every path to a * leaf" property of the red-black tree. The code in do_delete_balancing() * repairs this. */ diff --git a/kexi/3rdparty/kexisql/src/os.c b/kexi/3rdparty/kexisql/src/os.c index 79eb15e5..85872a5a 100644 --- a/kexi/3rdparty/kexisql/src/os.c +++ b/kexi/3rdparty/kexisql/src/os.c @@ -531,11 +531,11 @@ int sqliteOsOpenReadWrite( if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr ) return SQLITE_CANTOPEN; FSGetDataForkName(&dfName); - if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode, + if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, fsRdWrShPerm, &(id->refNum)) != noErr ){ - if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode, + if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, fsRdWrPerm, &(id->refNum)) != noErr ){ - if (FSOpenFork(&fsRef, dfName.length, dfName.tqunicode, + if (FSOpenFork(&fsRef, dfName.length, dfName.unicode, fsRdPerm, &(id->refNum)) != noErr ) return SQLITE_CANTOPEN; else @@ -650,7 +650,7 @@ int sqliteOsOpenExclusive(const char *zFilename, OsFile *id, int delFlag){ if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr ) return SQLITE_CANTOPEN; FSGetDataForkName(&dfName); - if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode, + if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, fsRdWrPerm, &(id->refNum)) != noErr ) return SQLITE_CANTOPEN; # else @@ -724,7 +724,7 @@ int sqliteOsOpenReadOnly(const char *zFilename, OsFile *id){ if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr ) return SQLITE_CANTOPEN; FSGetDataForkName(&dfName); - if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode, + if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, fsRdPerm, &(id->refNum)) != noErr ) return SQLITE_CANTOPEN; # else diff --git a/kexi/3rdparty/kexisql3/src/btree.c b/kexi/3rdparty/kexisql3/src/btree.c index 4ed6c51a..212be42e 100644 --- a/kexi/3rdparty/kexisql3/src/btree.c +++ b/kexi/3rdparty/kexisql3/src/btree.c @@ -126,7 +126,7 @@ ** 8 4 Right child (the Ptr(N+1) value). Omitted on leaves. ** ** The flags define the format of this btree page. The leaf flag means that -** this page has no tqchildren. The zerodata flag means that this page carries +** this page has no children. The zerodata flag means that this page carries ** only keys and no data. The intkey flag means that the key is a integer ** which is stored in the key size entry of the cell header rather than in ** the payload area. @@ -212,7 +212,7 @@ #include <assert.h> /* Round up a number to the next larger multiple of 8. This is used -** to force 8-byte tqalignment on 64-bit architectures. +** to force 8-byte alignment on 64-bit architectures. */ #define ROUND8(x) ((x+7)&~7) @@ -1286,14 +1286,14 @@ int sqlite3BtreeOpen( #endif } pBt->usableSize = pBt->pageSize - nReserve; - assert( (pBt->pageSize & 7)==0 ); /* 8-byte tqalignment of pageSize */ + assert( (pBt->pageSize & 7)==0 ); /* 8-byte alignment of pageSize */ sqlite3pager_set_pagesize(pBt->pPager, pBt->pageSize); *ppBtree = pBt; return SQLITE_OK; } /* -** Close an open database and tqinvalidate all cursors. +** Close an open database and invalidate all cursors. */ int sqlite3BtreeClose(Btree *pBt){ while( pBt->pCursor ){ @@ -1658,7 +1658,7 @@ int sqlite3BtreeBeginTrans(Btree *pBt, int wrflag){ #ifndef SQLITE_OMIT_AUTOVACUUM /* -** Set the pointer-map entries for all tqchildren of page pPage. Also, if +** Set the pointer-map entries for all children of page pPage. Also, if ** pPage contains cells that point to overflow pages, set the pointer ** map entries for the overflow pages as well. */ @@ -3425,7 +3425,7 @@ static int reparentPage(Btree *pBt, Pgno pgno, MemPage *pNewParent, int idx){ /* -** Change the pParent pointer of all tqchildren of pPage to point back +** Change the pParent pointer of all children of pPage to point back ** to pPage. ** ** In other words, for every child of pPage, invoke reparentPage() @@ -3879,7 +3879,7 @@ static int balance_nonroot(MemPage *pPage){ ** the siblings. An attempt is made to find NN siblings on either ** side of pPage. More siblings are taken from one side, however, if ** pPage there are fewer than NN siblings on the other side. If pParent - ** has NB or fewer tqchildren then all tqchildren of pParent are taken. + ** has NB or fewer children then all children of pParent are taken. */ nxDiv = idx - NN; if( nxDiv + NB > pParent->nCell ){ @@ -3911,7 +3911,7 @@ static int balance_nonroot(MemPage *pPage){ } /* Make nMaxCells a multiple of 2 in order to preserve 8-byte - ** tqalignment */ + ** alignment */ nMaxCells = (nMaxCells + 1)&~1; /* @@ -3930,13 +3930,13 @@ static int balance_nonroot(MemPage *pPage){ } szCell = (int*)&apCell[nMaxCells]; aCopy[0] = (u8*)&szCell[nMaxCells]; - assert( ((aCopy[0] - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */ + assert( ((aCopy[0] - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */ for(i=1; i<NB; i++){ aCopy[i] = &aCopy[i-1][pBt->pageSize+ROUND8(sizeof(MemPage))]; - assert( ((aCopy[i] - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */ + assert( ((aCopy[i] - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */ } aSpace = &aCopy[NB-1][pBt->pageSize+ROUND8(sizeof(MemPage))]; - assert( ((aSpace - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */ + assert( ((aSpace - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */ #ifndef SQLITE_OMIT_AUTOVACUUM if( pBt->autoVacuum ){ aFrom = &aSpace[5*pBt->pageSize]; @@ -4199,7 +4199,7 @@ static int balance_nonroot(MemPage *pPage){ #ifndef SQLITE_OMIT_AUTOVACUUM /* If this is an auto-vacuum database, update the pointer map entries ** that point to the siblings that were rearranged. These can be: left - ** tqchildren of cells, the right-child of the page, or overflow pages + ** children of cells, the right-child of the page, or overflow pages ** pointed to by cells. */ if( pBt->autoVacuum ){ @@ -4284,7 +4284,7 @@ static int balance_nonroot(MemPage *pPage){ } /* - ** Reparent tqchildren of all cells. + ** Reparent children of all cells. */ for(i=0; i<nNew; i++){ rc = reparentChildPages(apNew[i]); @@ -4842,7 +4842,7 @@ int sqlite3BtreeCreateTable(Btree *pBt, int *piTable, int flags){ } /* -** Erase the given database page and all its tqchildren. Return +** Erase the given database page and all its children. Return ** the page to the freelist. */ static int clearDatabasePage( @@ -5457,8 +5457,8 @@ static void checkList( ** NO 3. Make sure no key is less than or equal to zLowerBound. ** NO 4. Make sure no key is greater than or equal to zUpperBound. ** 5. Check the integrity of overflow pages. -** 6. Recursively call checkTreePage on all tqchildren. -** 7. Verify that the depth of all tqchildren is the same. +** 6. Recursively call checkTreePage on all children. +** 7. Verify that the depth of all children is the same. ** 8. Make sure this page is at least 33% full or else it is ** the root of the tree. */ diff --git a/kexi/3rdparty/kexisql3/src/build.c b/kexi/3rdparty/kexisql3/src/build.c index 9818c954..67ed7975 100644 --- a/kexi/3rdparty/kexisql3/src/build.c +++ b/kexi/3rdparty/kexisql3/src/build.c @@ -2331,7 +2331,7 @@ void sqlite3CreateIndex( sqliteFree(zStmt); /* Fill the index with data and reparse the schema. Code an OP_Expire - ** to tqinvalidate all pre-compiled statements. + ** to invalidate all pre-compiled statements. */ if( pTblName ){ sqlite3RefillIndex(pParse, pIndex, iMem); diff --git a/kexi/3rdparty/kexisql3/src/expr.c b/kexi/3rdparty/kexisql3/src/expr.c index ac209552..8d9cfbbd 100644 --- a/kexi/3rdparty/kexisql3/src/expr.c +++ b/kexi/3rdparty/kexisql3/src/expr.c @@ -623,7 +623,7 @@ void sqlite3ExprListDelete(ExprList *pList){ ** Walk an expression tree. Call xFunc for each node visited. ** ** The return value from xFunc determines whether the tree walk continues. -** 0 means continue walking the tree. 1 means do not walk tqchildren +** 0 means continue walking the tree. 1 means do not walk children ** of the current node but continue with siblings. 2 means abandon ** the tree walk completely. ** @@ -1949,7 +1949,7 @@ void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){ */ op = ((pExpr->op+(TK_ISNULL&1))^1)-(TK_ISNULL&1); - /* Verify correct tqalignment of TK_ and OP_ constants + /* Verify correct alignment of TK_ and OP_ constants */ assert( pExpr->op!=TK_ISNULL || op==OP_NotNull ); assert( pExpr->op!=TK_NOTNULL || op==OP_IsNull ); diff --git a/kexi/3rdparty/kexisql3/src/main.c b/kexi/3rdparty/kexisql3/src/main.c index 8d6acd5c..83356f43 100644 --- a/kexi/3rdparty/kexisql3/src/main.c +++ b/kexi/3rdparty/kexisql3/src/main.c @@ -467,7 +467,7 @@ int sqlite3_create_function( /* Check if an existing function is being overridden or deleted. If so, ** and there are active VMs, then return SQLITE_BUSY. If a function ** is being overridden/deleted but there are no active VMs, allow the - ** operation to continue but tqinvalidate all precompiled statements. + ** operation to continue but invalidate all precompiled statements. */ p = sqlite3FindFunction(db, zFunctionName, nName, nArg, enc, 0); if( p && p->iPrefEnc==enc && p->nArg==nArg ){ @@ -667,7 +667,7 @@ const char *sqlite3_errmsg(sqlite3 *db){ ** error. */ const void *sqlite3_errmsg16(sqlite3 *db){ - /* Because all the characters in the string are in the tqunicode + /* Because all the characters in the string are in the unicode ** range 0x00-0xFF, if we pad the big-endian string with a ** zero byte, we can obtain the little-endian string with ** &big_endian[1]. @@ -934,7 +934,7 @@ int sqlite3_create_collation( /* Check if this call is removing or replacing an existing collation ** sequence. If so, and there are active VMs, return busy. If there - ** are no active VMs, tqinvalidate any pre-compiled statements. + ** are no active VMs, invalidate any pre-compiled statements. */ pColl = sqlite3FindCollSeq(db, (u8)enc, zName, strlen(zName), 0); if( pColl && pColl->xCmp ){ diff --git a/kexi/3rdparty/kexisql3/src/os_mac.c b/kexi/3rdparty/kexisql3/src/os_mac.c index f393b423..285d0805 100644 --- a/kexi/3rdparty/kexisql3/src/os_mac.c +++ b/kexi/3rdparty/kexisql3/src/os_mac.c @@ -84,11 +84,11 @@ int sqlite3OsOpenReadWrite( if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr ) return SQLITE_CANTOPEN; FSGetDataForkName(&dfName); - if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode, + if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, fsRdWrShPerm, &(id->refNum)) != noErr ){ - if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode, + if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, fsRdWrPerm, &(id->refNum)) != noErr ){ - if (FSOpenFork(&fsRef, dfName.length, dfName.tqunicode, + if (FSOpenFork(&fsRef, dfName.length, dfName.unicode, fsRdPerm, &(id->refNum)) != noErr ) return SQLITE_CANTOPEN; else @@ -149,7 +149,7 @@ int sqlite3OsOpenExclusive(const char *zFilename, OsFile *id, int delFlag){ if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr ) return SQLITE_CANTOPEN; FSGetDataForkName(&dfName); - if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode, + if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, fsRdWrPerm, &(id->refNum)) != noErr ) return SQLITE_CANTOPEN; # else @@ -185,7 +185,7 @@ int sqlite3OsOpenReadOnly(const char *zFilename, OsFile *id){ if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr ) return SQLITE_CANTOPEN; FSGetDataForkName(&dfName); - if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode, + if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, fsRdPerm, &(id->refNum)) != noErr ) return SQLITE_CANTOPEN; # else diff --git a/kexi/3rdparty/kexisql3/src/os_win.c b/kexi/3rdparty/kexisql3/src/os_win.c index 8c729136..2b0a00ec 100644 --- a/kexi/3rdparty/kexisql3/src/os_win.c +++ b/kexi/3rdparty/kexisql3/src/os_win.c @@ -104,7 +104,7 @@ static WCHAR *utf8ToUnicode(const char *zFilename){ ** Convert UTF-32 to UTF-8. Space to hold the returned string is ** obtained from sqliteMalloc(). */ -static char *tqunicodeToUtf8(const WCHAR *zWideFilename){ +static char *unicodeToUtf8(const WCHAR *zWideFilename){ int nByte; char *zFilename; @@ -449,7 +449,7 @@ int sqlite3OsTempFileName(char *zBuf){ char *zMulti; WCHAR zWidePath[SQLITE_TEMPNAME_SIZE]; GetTempPathW(SQLITE_TEMPNAME_SIZE-30, zWidePath); - zMulti = tqunicodeToUtf8(zWidePath); + zMulti = unicodeToUtf8(zWidePath); if( zMulti ){ strncpy(zTempPath, zMulti, SQLITE_TEMPNAME_SIZE-30); zTempPath[SQLITE_TEMPNAME_SIZE-30] = 0; @@ -881,7 +881,7 @@ char *sqlite3OsFullPathname(const char *zRelative){ if( zTemp==0 ) return 0; GetFullPathNameW(zWide, nByte, zTemp, &zNotUsedW); sqliteFree(zWide); - zFull = tqunicodeToUtf8(zTemp); + zFull = unicodeToUtf8(zTemp); sqliteFree(zTemp); }else{ nByte = GetFullPathNameA(zRelative, 0, 0, &zNotUsed) + 1; diff --git a/kexi/3rdparty/kexisql3/src/pager.c b/kexi/3rdparty/kexisql3/src/pager.c index 60cb43bd..4b981350 100644 --- a/kexi/3rdparty/kexisql3/src/pager.c +++ b/kexi/3rdparty/kexisql3/src/pager.c @@ -1076,7 +1076,7 @@ static int pager_playback_one_page(Pager *pPager, OsFile *jfd, int useCksum){ ** ** The master journal file contains the names of all child journals. ** To tell if a master journal can be deleted, check to each of the -** tqchildren. If all tqchildren are either missing or do not refer to +** children. If all children are either missing or do not refer to ** a different master journal, then this master journal can be deleted. */ static int pager_delmaster(const char *zMaster){ diff --git a/kexi/3rdparty/kexisql3/src/prepare.c b/kexi/3rdparty/kexisql3/src/prepare.c index 23bfa533..a0c7be87 100644 --- a/kexi/3rdparty/kexisql3/src/prepare.c +++ b/kexi/3rdparty/kexisql3/src/prepare.c @@ -527,7 +527,7 @@ int sqlite3_prepare16( if( zTail8 && pzTail ){ /* If sqlite3_prepare returns a tail pointer, we calculate the - ** equivalent pointer into the UTF-16 string by counting the tqunicode + ** equivalent pointer into the UTF-16 string by counting the unicode ** characters between zSql8 and zTail8, and then returning a pointer ** the same number of characters into the UTF-16 string. */ diff --git a/kexi/3rdparty/kexisql3/src/sqlite3.h b/kexi/3rdparty/kexisql3/src/sqlite3.h index be29db69..414c6cac 100644 --- a/kexi/3rdparty/kexisql3/src/sqlite3.h +++ b/kexi/3rdparty/kexisql3/src/sqlite3.h @@ -1248,7 +1248,7 @@ int sqlite3_transfer_bindings(sqlite3_stmt*, sqlite3_stmt*); ** is NULL pointer, then SQLite does a search for an appropriate temporary ** file directory. ** -** Once sqlite3_open() has been called, changing this variable will tqinvalidate +** Once sqlite3_open() has been called, changing this variable will invalidate ** the current temporary database, if any. */ extern char *sqlite3_temp_directory; diff --git a/kexi/3rdparty/kexisql3/src/utf.c b/kexi/3rdparty/kexisql3/src/utf.c index 5efbfe78..d42ab759 100644 --- a/kexi/3rdparty/kexisql3/src/utf.c +++ b/kexi/3rdparty/kexisql3/src/utf.c @@ -43,11 +43,11 @@ ** ** When converting malformed UTF-8 strings to UTF-16, one instance of the ** replacement character U+FFFD for each byte that cannot be interpeted as -** part of a valid tqunicode character. +** part of a valid unicode character. ** ** When converting malformed UTF-16 strings to UTF-8, one instance of the ** replacement character U+FFFD for each pair of bytes that cannot be -** interpeted as part of a valid tqunicode character. +** interpeted as part of a valid unicode character. ** ** This file contains the following public routines: ** @@ -427,10 +427,10 @@ int sqlite3VdbeMemHandleBom(Mem *pMem){ #endif /* SQLITE_OMIT_UTF16 */ /* -** pZ is a UTF-8 encoded tqunicode string. If nByte is less than zero, -** return the number of tqunicode characters in pZ up to (but not including) +** pZ is a UTF-8 encoded unicode string. If nByte is less than zero, +** return the number of unicode characters in pZ up to (but not including) ** the first 0x00 byte. If nByte is not less than zero, return the -** number of tqunicode characters in the first nByte of pZ (or up to +** number of unicode characters in the first nByte of pZ (or up to ** the first 0x00, whichever comes first). */ int sqlite3utf8CharLen(const char *z, int nByte){ @@ -451,10 +451,10 @@ int sqlite3utf8CharLen(const char *z, int nByte){ #ifndef SQLITE_OMIT_UTF16 /* -** pZ is a UTF-16 encoded tqunicode string. If nChar is less than zero, +** pZ is a UTF-16 encoded unicode string. If nChar is less than zero, ** return the number of bytes up to (but not including), the first pair ** of consecutive 0x00 bytes in pZ. If nChar is not less than zero, -** then return the number of bytes in the first nChar tqunicode characters +** then return the number of bytes in the first nChar unicode characters ** in pZ (or up until the first pair of 0x00 bytes, whichever comes first). */ int sqlite3utf16ByteLen(const void *zIn, int nChar){ diff --git a/kexi/3rdparty/kexisql3/src/vdbeInt.h b/kexi/3rdparty/kexisql3/src/vdbeInt.h index 89174271..4c732b09 100644 --- a/kexi/3rdparty/kexisql3/src/vdbeInt.h +++ b/kexi/3rdparty/kexisql3/src/vdbeInt.h @@ -133,7 +133,7 @@ typedef struct Mem Mem; ** No other flags may be set in this case. ** ** If the MEM_Str flag is set then Mem.z points at a string representation. -** Usually this is encoded in the same tqunicode encoding as the main +** Usually this is encoded in the same unicode encoding as the main ** database (see below for exceptions). If the MEM_Term flag is also ** set, then the string is nul terminated. The MEM_Int and MEM_Real ** flags may coexist with the MEM_Str flag. diff --git a/kexi/3rdparty/kexisql3/src/where.c b/kexi/3rdparty/kexisql3/src/where.c index 5ab2e4e6..c0457ffc 100644 --- a/kexi/3rdparty/kexisql3/src/where.c +++ b/kexi/3rdparty/kexisql3/src/where.c @@ -85,7 +85,7 @@ struct WhereTerm { i16 leftColumn; /* Column number of X in "X <op> <expr>" */ u16 operator; /* A WO_xx value describing <op> */ u8 flags; /* Bit flags. See below */ - u8 nChild; /* Number of tqchildren that must disable us */ + u8 nChild; /* Number of children that must disable us */ WhereClause *pWC; /* The clause this term is part of */ Bitmask prereqRight; /* Bitmask of tables used by pRight */ Bitmask prereqAll; /* Bitmask of tables referenced by p */ diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp b/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp index 8ea3b0b9..be51e60e 100644 --- a/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp +++ b/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp @@ -23,20 +23,20 @@ #include <KoUnitWidgets.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> -KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout) +KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& layout) : KoPageLayoutColumnsBase(parent) { m_columns = columns; TQHBoxLayout *lay = new TQHBoxLayout(previewPane); - m_preview = new KoPagePreview( previewPane, "Preview", tqlayout ); + m_preview = new KoPagePreview( previewPane, "Preview", layout ); lay->addWidget(m_preview); lay = new TQHBoxLayout(columnSpacingPane); m_spacing = new KoUnitDoubleSpinBox( columnSpacingPane ); m_spacing->setValue( m_columns.ptColumnSpacing ); m_spacing->setUnit( unit ); double dStep = KoUnit::fromUserValue( 0.2, unit ); - m_spacing->setMinMaxStep( 0, tqlayout.ptWidth/2, dStep ); + m_spacing->setMinMaxStep( 0, layout.ptWidth/2, dStep ); lay->addWidget(m_spacing); labelSpacing->setBuddy( m_spacing ); nColumns->setValue( m_columns.columns ); @@ -63,8 +63,8 @@ void KoPageLayoutColumns::nSpaceChanged( double spacing ) { emit propertyChange(m_columns); } -void KoPageLayoutColumns::setLayout(KoPageLayout &tqlayout) { - m_preview->setPageLayout( tqlayout ); +void KoPageLayoutColumns::setLayout(KoPageLayout &layout) { + m_preview->setPageLayout( layout ); } #include <KoPageLayoutColumns.moc> diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumns.h b/kexi/3rdparty/kolibs/KoPageLayoutColumns.h index 8ebac1b2..b9dcd6c2 100644 --- a/kexi/3rdparty/kolibs/KoPageLayoutColumns.h +++ b/kexi/3rdparty/kolibs/KoPageLayoutColumns.h @@ -43,15 +43,15 @@ public: * @param parent the parent widget * @param columns the KoColumns data structure that this dialog should be initialzed with * @param unit the unit-type (mm/cm/inch) that the dialog should show - * @param tqlayout the page tqlayout that the preview should be initialzed with. + * @param layout the page layout that the preview should be initialzed with. */ - KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout); + KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& layout); /** - * Update the page preview widget with the param tqlayout. - * @param tqlayout the new tqlayout + * Update the page preview widget with the param layout. + * @param layout the new layout */ - void setLayout(KoPageLayout &tqlayout); + void setLayout(KoPageLayout &layout); public slots: /** diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui b/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui index 325fe45e..07cced25 100644 --- a/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui +++ b/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp b/kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp index 00296957..5878ead5 100644 --- a/kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp +++ b/kexi/3rdparty/kolibs/KoPageLayoutHeader.cpp @@ -20,7 +20,7 @@ #include <KoPageLayoutHeader.moc> #include <KoUnitWidgets.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> KoPageLayoutHeader::KoPageLayoutHeader(TQWidget *parent, KoUnit::Unit unit, const KoKWHeaderFooter &kwhf) diff --git a/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui b/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui index b3bd7978..7f36378e 100644 --- a/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui +++ b/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui @@ -45,7 +45,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -120,7 +120,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -187,7 +187,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp index 649f4c26..83cdfbb0 100644 --- a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp +++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp @@ -27,15 +27,15 @@ #include <kmessagebox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqhbox.h> #include <tqvgroupbox.h> #include <tqhbuttongroup.h> -KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,const KoColumns& columns, bool unitChooser, bool enableBorders) +KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, KoUnit::Unit unit,const KoColumns& columns, bool unitChooser, bool enableBorders) : TQWidget(parent) { - m_layout = tqlayout; + m_layout = layout; m_unit = unit; TQGridLayout *grid1 = new TQGridLayout( this, 5, 2, 0, KDialog::spacingHint() ); @@ -60,7 +60,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayou else { TQString str=KoUnit::unitDescription(unit); - TQLabel *lpgUnit = new TQLabel( i18n("All values are given in %1.").tqarg(str), this ); + TQLabel *lpgUnit = new TQLabel( i18n("All values are given in %1.").arg(str), this ); grid1->addWidget( lpgUnit, 0, 0, TQt::AlignLeft ); } @@ -129,7 +129,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayou marginsFrame->setMargin( KDialog::marginHint() ); grid1->addWidget( marginsFrame, 3, 0 ); - TQGridLayout *marginsLayout = new TQGridLayout( marginsFrame->tqlayout(), 3, 3, + TQGridLayout *marginsLayout = new TQGridLayout( marginsFrame->layout(), 3, 3, KDialog::spacingHint() ); // left margin @@ -159,9 +159,9 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayou // ------------- spacers ----------- TQWidget* spacer1 = new TQWidget( this ); TQWidget* spacer2 = new TQWidget( this ); - spacer1->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, + spacer1->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); - spacer2->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, + spacer2->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); grid1->addWidget( spacer1, 4, 0 ); grid1->addWidget( spacer2, 4, 1 ); diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.h b/kexi/3rdparty/kolibs/KoPageLayoutSize.h index 06c08517..8e503551 100644 --- a/kexi/3rdparty/kolibs/KoPageLayoutSize.h +++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.h @@ -42,13 +42,13 @@ public: /** * Contructor * @param parent the parent widget - * @param tqlayout the page tqlayout that this widget should be initialzed with. + * @param layout the page layout that this widget should be initialzed with. * @param unit the unit-type (mm/cm/inch) that the dialog should show * @param columns the KoColumns (amout of columns) that the preview should be initialized with * @param unitChooser if true a combobox with the unit-type is shown for the user to change * @param enableBorders if true enable the user to change the margins (aka borders) of the page */ - KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit, + KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, KoUnit::Unit unit, const KoColumns& columns, bool unitChooser, bool enableBorders); /** @@ -76,11 +76,11 @@ public slots: signals: /** * Emitted whenever the user changed something in the dialog. - * @param tqlayout the update tqlayout structure with currently displayed info. + * @param layout the update layout structure with currently displayed info. * Note that the info may not be fully correct and physically possible (in which * case queryClose will return false) */ - void propertyChange(KoPageLayout &tqlayout); + void propertyChange(KoPageLayout &layout); protected: TQComboBox *cpgUnit; diff --git a/kexi/3rdparty/kolibs/koGlobal.cc b/kexi/3rdparty/kolibs/koGlobal.cc index 3541e6ea..a88e3bcd 100644 --- a/kexi/3rdparty/kolibs/koGlobal.cc +++ b/kexi/3rdparty/kolibs/koGlobal.cc @@ -133,7 +133,7 @@ void KoGlobal::createListOfLanguages() // currently have en_GB or en_US etc. const TQStringList translationList = KGlobal::dirs()->findAllResources("locale", - TQString::tqfromLatin1("*/entry.desktop")); + TQString::fromLatin1("*/entry.desktop")); for ( TQStringList::ConstIterator it = translationList.begin(); it != translationList.end(); ++it ) { diff --git a/kexi/3rdparty/kolibs/koPageLayout.cpp b/kexi/3rdparty/kolibs/koPageLayout.cpp index 7888ba7d..316eba19 100644 --- a/kexi/3rdparty/kolibs/koPageLayout.cpp +++ b/kexi/3rdparty/kolibs/koPageLayout.cpp @@ -62,7 +62,7 @@ KoGenStyle KoPageLayout::saveOasis() const void KoPageLayout::loadOasis(const TQDomElement &style) { - TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-tqlayout-properties" ) ); + TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-layout-properties" ) ); if ( !properties.isNull() ) { ptWidth = KoUnit::parseValue(properties.attributeNS( KoXmlNS::fo, "page-width", TQString() ) ); @@ -86,16 +86,16 @@ void KoPageLayout::loadOasis(const TQDomElement &style) KoPageLayout KoPageLayout::standardLayout() { - KoPageLayout tqlayout; - tqlayout.format = KoPageFormat::defaultFormat(); - tqlayout.orientation = PG_PORTRAIT; - tqlayout.ptWidth = MM_TO_POINT( KoPageFormat::width( tqlayout.format, tqlayout.orientation ) ); - tqlayout.ptHeight = MM_TO_POINT( KoPageFormat::height( tqlayout.format, tqlayout.orientation ) ); - tqlayout.ptLeft = MM_TO_POINT( 20.0 ); - tqlayout.ptRight = MM_TO_POINT( 20.0 ); - tqlayout.ptTop = MM_TO_POINT( 20.0 ); - tqlayout.ptBottom = MM_TO_POINT( 20.0 ); - return tqlayout; + KoPageLayout layout; + layout.format = KoPageFormat::defaultFormat(); + layout.orientation = PG_PORTRAIT; + layout.ptWidth = MM_TO_POINT( KoPageFormat::width( layout.format, layout.orientation ) ); + layout.ptHeight = MM_TO_POINT( KoPageFormat::height( layout.format, layout.orientation ) ); + layout.ptLeft = MM_TO_POINT( 20.0 ); + layout.ptRight = MM_TO_POINT( 20.0 ); + layout.ptTop = MM_TO_POINT( 20.0 ); + layout.ptBottom = MM_TO_POINT( 20.0 ); + return layout; } struct PageFormatInfo @@ -151,12 +151,12 @@ int KoPageFormat::printerPageSize( KoFormat format ) { if ( format == PG_SCREEN ) { - kdWarning() << "You use the page tqlayout SCREEN. Printing in DIN A4 LANDSCAPE." << endl; + kdWarning() << "You use the page layout SCREEN. Printing in DIN A4 LANDSCAPE." << endl; return KPrinter::A4; } else if ( format == PG_CUSTOM ) { - kdWarning() << "The used page tqlayout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl; + kdWarning() << "The used page layout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl; return KPrinter::A4; } else if ( format <= PG_LAST_FORMAT ) @@ -200,15 +200,15 @@ KoFormat KoPageFormat::guessFormat( double width, double height ) TQString KoPageFormat::formatString( KoFormat format ) { if ( format <= PG_LAST_FORMAT ) - return TQString::tqfromLatin1( pageFormatInfo[ format ].shortName ); - return TQString::tqfromLatin1( "A4" ); + return TQString::fromLatin1( pageFormatInfo[ format ].shortName ); + return TQString::fromLatin1( "A4" ); } KoFormat KoPageFormat::formatFromString( const TQString & string ) { for ( int i = 0 ; i <= PG_LAST_FORMAT ; ++i ) { - if (string == TQString::tqfromLatin1( pageFormatInfo[ i ].shortName )) + if (string == TQString::fromLatin1( pageFormatInfo[ i ].shortName )) return pageFormatInfo[ i ].format; } // We do not know the format name, so we have a custom format diff --git a/kexi/3rdparty/kolibs/koPageLayout.h b/kexi/3rdparty/kolibs/koPageLayout.h index 724f9275..eb922846 100644 --- a/kexi/3rdparty/kolibs/koPageLayout.h +++ b/kexi/3rdparty/kolibs/koPageLayout.h @@ -156,7 +156,7 @@ enum KoHFType { }; /** - * This structure defines the page tqlayout, including + * This structure defines the page layout, including * its size in pt, its format (e.g. A4), orientation, unit, margins etc. */ struct KoPageLayout @@ -193,18 +193,18 @@ struct KoPageLayout #ifndef SIMPLE_KOLIBS /** - * Save this page tqlayout to OASIS. + * Save this page layout to OASIS. */ KOFFICECORE_EXPORT KoGenStyle saveOasis() const; /** - * Load this page tqlayout from OASIS + * Load this page layout from OASIS */ KOFFICECORE_EXPORT void loadOasis(const TQDomElement &style); #endif /** - * @return a page tqlayout with the default page size depending on the locale settings, + * @return a page layout with the default page size depending on the locale settings, * default margins (2 cm), and portrait orientation. * @since 1.4 */ diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.cc b/kexi/3rdparty/kolibs/koPageLayoutDia.cc index d81d1870..b757eef9 100644 --- a/kexi/3rdparty/kolibs/koPageLayoutDia.cc +++ b/kexi/3rdparty/kolibs/koPageLayoutDia.cc @@ -34,7 +34,7 @@ #include <kmessagebox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqlineedit.h> #include <tqbuttongroup.h> @@ -49,10 +49,10 @@ /******************************************************************/ /*===================== constrcutor ==============================*/ -KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& tqlayout ) +KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& layout ) : TQGroupBox( i18n( "Page Preview" ), parent, name ) { - setPageLayout( tqlayout ); + setPageLayout( layout ); columns = 1; setMinimumSize( 150, 150 ); } @@ -62,15 +62,15 @@ KoPagePreview::~KoPagePreview() { } -/*=================== set tqlayout =================================*/ -void KoPagePreview::setPageLayout( const KoPageLayout &tqlayout ) +/*=================== set layout =================================*/ +void KoPagePreview::setPageLayout( const KoPageLayout &layout ) { // resolution[XY] is in pixel per pt double resolutionX = POINT_TO_INCH( static_cast<double>(KoGlobal::dpiX()) ); double resolutionY = POINT_TO_INCH( static_cast<double>(KoGlobal::dpiY()) ); - m_pageWidth = tqlayout.ptWidth * resolutionX; - m_pageHeight = tqlayout.ptHeight * resolutionY; + m_pageWidth = layout.ptWidth * resolutionX; + m_pageHeight = layout.ptHeight * resolutionY; double zh = 110.0 / m_pageHeight; double zw = 110.0 / m_pageWidth; @@ -79,19 +79,19 @@ void KoPagePreview::setPageLayout( const KoPageLayout &tqlayout ) m_pageWidth *= z; m_pageHeight *= z; - m_textFrameX = tqlayout.ptLeft * resolutionX * z; - m_textFrameY = tqlayout.ptTop * resolutionY * z; - m_textFrameWidth = m_pageWidth - ( tqlayout.ptLeft + tqlayout.ptRight ) * resolutionX * z; - m_textFrameHeight = m_pageHeight - ( tqlayout.ptTop + tqlayout.ptBottom ) * resolutionY * z; + m_textFrameX = layout.ptLeft * resolutionX * z; + m_textFrameY = layout.ptTop * resolutionY * z; + m_textFrameWidth = m_pageWidth - ( layout.ptLeft + layout.ptRight ) * resolutionX * z; + m_textFrameHeight = m_pageHeight - ( layout.ptTop + layout.ptBottom ) * resolutionY * z; - tqrepaint( true ); + repaint( true ); } -/*=================== set tqlayout =================================*/ +/*=================== set layout =================================*/ void KoPagePreview::setPageColumns( const KoColumns &_columns ) { columns = _columns.columns; - tqrepaint( true ); + repaint( true ); } /*======================== draw contents =========================*/ @@ -129,7 +129,7 @@ void KoPagePreview::drawContents( TQPainter *painter ) /*==================== constructor ===============================*/ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, - const KoPageLayout& tqlayout, + const KoPageLayout& layout, const KoHeadFoot& hf, int tabs, KoUnit::Unit unit, bool modal ) : KDialogBase( KDialogBase::Tabbed, i18n("Page Layout"), KDialogBase::Ok | KDialogBase::Cancel, @@ -137,7 +137,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, { flags = tabs; - m_layout = tqlayout; + m_layout = layout; m_unit = unit; m_pageSizeTab = 0; m_columnsTab = 0; @@ -154,7 +154,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, /*==================== constructor ===============================*/ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, - const KoPageLayout& tqlayout, + const KoPageLayout& layout, const KoHeadFoot& hf, const KoColumns& columns, const KoKWHeaderFooter& kwhf, @@ -164,7 +164,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, { flags = tabs; - m_layout = tqlayout; + m_layout = layout; m_column = columns; m_unit = unit; m_pageSizeTab = 0; @@ -186,14 +186,14 @@ KoPageLayoutDia::~KoPageLayoutDia() } /*======================= show dialog ============================*/ -bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent ) +bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent ) { bool res = false; - KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, tabs, unit ); + KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", layout, hf, tabs, unit ); if ( dlg->exec() == TQDialog::Accepted ) { res = true; - if ( tabs & FORMAT_AND_BORDERS ) tqlayout = dlg->tqlayout(); + if ( tabs & FORMAT_AND_BORDERS ) layout = dlg->layout(); if ( tabs & HEADER_AND_FOOTER ) hf = dlg->headFoot(); unit = dlg->unit(); } @@ -204,15 +204,15 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int ta } /*======================= show dialog ============================*/ -bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColumns& columns, +bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, KoColumns& columns, KoKWHeaderFooter &_kwhf, int tabs, KoUnit::Unit& unit, TQWidget* parent ) { bool res = false; - KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, columns, _kwhf, tabs, unit ); + KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", layout, hf, columns, _kwhf, tabs, unit ); if ( dlg->exec() == TQDialog::Accepted ) { res = true; - if ( tabs & FORMAT_AND_BORDERS ) tqlayout = dlg->tqlayout(); + if ( tabs & FORMAT_AND_BORDERS ) layout = dlg->layout(); if ( tabs & HEADER_AND_FOOTER ) hf = dlg->headFoot(); if ( tabs & COLUMNS ) columns = dlg->columns(); if ( tabs & KW_HEADER_AND_FOOTER ) _kwhf = dlg->headerFooter(); @@ -224,7 +224,7 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColu return res; } -/*===================== get a standard page tqlayout ===============*/ +/*===================== get a standard page layout ===============*/ KoPageLayout KoPageLayoutDia::standardLayout() { return KoPageLayout::standardLayout(); @@ -261,17 +261,17 @@ void KoPageLayoutDia::setupTab1( bool enableBorders ) this, TQT_SLOT (sizeUpdated( KoPageLayout&))); } -void KoPageLayoutDia::sizeUpdated(KoPageLayout &tqlayout) { - m_layout.ptWidth = tqlayout.ptWidth; - m_layout.ptHeight = tqlayout.ptHeight; - m_layout.ptLeft = tqlayout.ptLeft; - m_layout.ptRight = tqlayout.ptRight; - m_layout.ptTop = tqlayout.ptTop; - m_layout.ptBottom = tqlayout.ptBottom; - m_layout.format = tqlayout.format; - m_layout.orientation = tqlayout.orientation; +void KoPageLayoutDia::sizeUpdated(KoPageLayout &layout) { + m_layout.ptWidth = layout.ptWidth; + m_layout.ptHeight = layout.ptHeight; + m_layout.ptLeft = layout.ptLeft; + m_layout.ptRight = layout.ptRight; + m_layout.ptTop = layout.ptTop; + m_layout.ptBottom = layout.ptBottom; + m_layout.format = layout.format; + m_layout.orientation = layout.orientation; if(m_columnsTab) - m_columnsTab->setLayout(tqlayout); + m_columnsTab->setLayout(layout); } /*================ setup header and footer tab ===================*/ @@ -282,9 +282,9 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf ) // ------------- header --------------- TQGroupBox *gHead = new TQGroupBox( 0, Qt::Vertical, i18n( "Head Line" ), tab2 ); - gHead->tqlayout()->setSpacing(KDialog::spacingHint()); - gHead->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *headGrid = new TQGridLayout( gHead->tqlayout(), 2, 3 ); + gHead->layout()->setSpacing(KDialog::spacingHint()); + gHead->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *headGrid = new TQGridLayout( gHead->layout(), 2, 3 ); TQLabel *lHeadLeft = new TQLabel( i18n( "Left:" ), gHead ); headGrid->addWidget( lHeadLeft, 0, 0 ); @@ -311,9 +311,9 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf ) // ------------- footer --------------- TQGroupBox *gFoot = new TQGroupBox( 0, Qt::Vertical, i18n( "Foot Line" ), tab2 ); - gFoot->tqlayout()->setSpacing(KDialog::spacingHint()); - gFoot->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *footGrid = new TQGridLayout( gFoot->tqlayout(), 2, 3 ); + gFoot->layout()->setSpacing(KDialog::spacingHint()); + gFoot->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *footGrid = new TQGridLayout( gFoot->layout(), 2, 3 ); TQLabel *lFootLeft = new TQLabel( i18n( "Left:" ), gFoot ); footGrid->addWidget( lFootLeft, 0, 0 ); @@ -362,7 +362,7 @@ void KoPageLayoutDia::setupTab3() TQWidget *tab3 = addPage(i18n( "Col&umns" )); TQHBoxLayout *lay = new TQHBoxLayout(tab3); m_columnsTab = new KoPageLayoutColumns(tab3, m_column, m_unit, m_layout); - m_columnsTab->tqlayout()->setMargin(0); + m_columnsTab->layout()->setMargin(0); lay->addWidget(m_columnsTab); m_columnsTab->show(); connect (m_columnsTab, TQT_SIGNAL( propertyChange(KoColumns&)), @@ -382,7 +382,7 @@ void KoPageLayoutDia::setupTab4(const KoKWHeaderFooter kwhf ) TQWidget *tab4 = addPage(i18n( "H&eader && Footer" )); TQHBoxLayout *lay = new TQHBoxLayout(tab4); m_headerTab = new KoPageLayoutHeader(tab4, m_unit, kwhf); - m_headerTab->tqlayout()->setMargin(0); + m_headerTab->layout()->setMargin(0); lay->addWidget(m_headerTab); m_headerTab->show(); diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.h b/kexi/3rdparty/kolibs/koPageLayoutDia.h index 21fe7df3..1ed23ec5 100644 --- a/kexi/3rdparty/kolibs/koPageLayoutDia.h +++ b/kexi/3rdparty/kolibs/koPageLayoutDia.h @@ -61,7 +61,7 @@ public: ~KoPagePreview(); /** - * set page tqlayout + * set page layout */ void setPageLayout( const KoPageLayout& ); void setPageColumns( const KoColumns& ); @@ -78,7 +78,7 @@ protected: class KoPageLayoutDiaPrivate; /** - * With this dialog the user can specify the tqlayout of the paper during printing. + * With this dialog the user can specify the layout of the paper during printing. */ class KOFFICEUI_EXPORT KoPageLayoutDia : public KDialogBase { @@ -92,14 +92,14 @@ public: * * @param parent The parent of the dialog. * @param name The name of the dialog. - * @param tqlayout The tqlayout. + * @param layout The layout. * @param headfoot The header and the footer. * @param flags a variable with all features this dialog should show. * @param unit The unit to use for displaying the values to the user. * @param modal Whether the dialog is modal or not. */ KoPageLayoutDia( TQWidget* parent, const char* name, - const KoPageLayout& tqlayout, + const KoPageLayout& layout, const KoHeadFoot& headfoot, int flags, KoUnit::Unit unit, bool modal=true ); @@ -108,7 +108,7 @@ public: * * @param parent The parent of the dialog. * @param name The name of the dialog. - * @param tqlayout The tqlayout. + * @param layout The layout. * @param headfoot The header and the footer. * @param columns The number of columns on the page. * @param kwheadfoot The KWord header and footer. @@ -116,7 +116,7 @@ public: * @param unit The unit to use for displaying the values to the user */ KoPageLayoutDia( TQWidget* parent, const char* name, - const KoPageLayout& tqlayout, + const KoPageLayout& layout, const KoHeadFoot& headfoot, const KoColumns& columns, const KoKWHeaderFooter& kwheadfoot, @@ -128,26 +128,26 @@ public: ~KoPageLayoutDia(); /** - * Show page tqlayout dialog. + * Show page layout dialog. * See constructor for documentation on the parameters */ static bool pageLayout( KoPageLayout&, KoHeadFoot&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 ); /** - * Show page tqlayout dialog. + * Show page layout dialog. * See constructor for documentation on the parameters */ static bool pageLayout( KoPageLayout&, KoHeadFoot&, KoColumns&, KoKWHeaderFooter&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 ); /** - * Retrieves a standard page tqlayout. + * Retrieves a standard page layout. * Deprecated: better use KoPageLayout::standardLayout() */ static KDE_DEPRECATED KoPageLayout standardLayout(); /** - * Returns the tqlayout + * Returns the layout */ - const KoPageLayout& tqlayout() const { return m_layout; } + const KoPageLayout& layout() const { return m_layout; } /** * Returns the header and footer information @@ -177,7 +177,7 @@ private: TQLineEdit *eFootMid; TQLineEdit *eFootRight; - // tqlayout + // layout KoPageLayout m_layout; KoColumns m_column; @@ -189,7 +189,7 @@ protected slots: virtual void slotOk(); private slots: - void sizeUpdated(KoPageLayout &tqlayout); + void sizeUpdated(KoPageLayout &layout); void columnsUpdated(KoColumns &columns); private: diff --git a/kexi/3rdparty/kolibs/koUnit.cc b/kexi/3rdparty/kolibs/koUnit.cc index 506e24e1..e8dd16ff 100644 --- a/kexi/3rdparty/kolibs/koUnit.cc +++ b/kexi/3rdparty/kolibs/koUnit.cc @@ -185,15 +185,15 @@ KoUnit::Unit KoUnit::unit( const TQString &_unitName, bool* ok ) { if ( ok ) *ok = true; - if ( _unitName == TQString::tqfromLatin1( "mm" ) ) return U_MM; - if ( _unitName == TQString::tqfromLatin1( "cm" ) ) return U_CM; - if ( _unitName == TQString::tqfromLatin1( "dm" ) ) return U_DM; - if ( _unitName == TQString::tqfromLatin1( "in" ) - || _unitName == TQString::tqfromLatin1("inch") /*compat*/ ) return U_INCH; - if ( _unitName == TQString::tqfromLatin1( "pi" ) ) return U_PI; - if ( _unitName == TQString::tqfromLatin1( "dd" ) ) return U_DD; - if ( _unitName == TQString::tqfromLatin1( "cc" ) ) return U_CC; - if ( _unitName == TQString::tqfromLatin1( "pt" ) ) return U_PT; + if ( _unitName == TQString::fromLatin1( "mm" ) ) return U_MM; + if ( _unitName == TQString::fromLatin1( "cm" ) ) return U_CM; + if ( _unitName == TQString::fromLatin1( "dm" ) ) return U_DM; + if ( _unitName == TQString::fromLatin1( "in" ) + || _unitName == TQString::fromLatin1("inch") /*compat*/ ) return U_INCH; + if ( _unitName == TQString::fromLatin1( "pi" ) ) return U_PI; + if ( _unitName == TQString::fromLatin1( "dd" ) ) return U_DD; + if ( _unitName == TQString::fromLatin1( "cc" ) ) return U_CC; + if ( _unitName == TQString::fromLatin1( "pt" ) ) return U_PT; if ( ok ) *ok = false; return U_PT; @@ -201,14 +201,14 @@ KoUnit::Unit KoUnit::unit( const TQString &_unitName, bool* ok ) TQString KoUnit::unitName( Unit _unit ) { - if ( _unit == U_MM ) return TQString::tqfromLatin1( "mm" ); - if ( _unit == U_CM ) return TQString::tqfromLatin1( "cm" ); - if ( _unit == U_DM ) return TQString::tqfromLatin1( "dm" ); - if ( _unit == U_INCH ) return TQString::tqfromLatin1( "in" ); - if ( _unit == U_PI ) return TQString::tqfromLatin1( "pi" ); - if ( _unit == U_DD ) return TQString::tqfromLatin1( "dd" ); - if ( _unit == U_CC ) return TQString::tqfromLatin1( "cc" ); - return TQString::tqfromLatin1( "pt" ); + if ( _unit == U_MM ) return TQString::fromLatin1( "mm" ); + if ( _unit == U_CM ) return TQString::fromLatin1( "cm" ); + if ( _unit == U_DM ) return TQString::fromLatin1( "dm" ); + if ( _unit == U_INCH ) return TQString::fromLatin1( "in" ); + if ( _unit == U_PI ) return TQString::fromLatin1( "pi" ); + if ( _unit == U_DD ) return TQString::fromLatin1( "dd" ); + if ( _unit == U_CC ) return TQString::fromLatin1( "cc" ); + return TQString::fromLatin1( "pt" ); } #ifndef SIMPLE_KOLIBS diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.cc b/kexi/3rdparty/kolibs/koUnitWidgets.cc index 16ec9a55..9943ee7e 100644 --- a/kexi/3rdparty/kolibs/koUnitWidgets.cc +++ b/kexi/3rdparty/kolibs/koUnitWidgets.cc @@ -23,7 +23,7 @@ #include <kglobal.h> #include <klocale.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> // ---------------------------------------------------------------- @@ -89,7 +89,7 @@ KoUnitDoubleValidator::validate( TQString &s, int &pos ) const TQString KoUnitDoubleBase::getVisibleText( double value ) const { - const TQString num ( TQString( "%1%2").tqarg( KGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) ); + const TQString num ( TQString( "%1%2").arg( KGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) ); kdDebug(30004) << "getVisibleText: " << TQString::number( value, 'f', 12 ) << " => " << num << endl; return num; } @@ -222,7 +222,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, const char *name ) : KLineEdit( parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 ) { - tqsetAlignment( TQt::AlignRight ); + setAlignment( TQt::AlignRight ); m_validator = new KoUnitDoubleValidator( this, this ); setValidator( m_validator ); setUnit( KoUnit::U_PT ); @@ -234,7 +234,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, double lower, doub : KLineEdit( parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ), m_lowerInPoints( lower ), m_upperInPoints( upper ) { - tqsetAlignment( TQt::AlignRight ); + setAlignment( TQt::AlignRight ); m_validator = new KoUnitDoubleValidator( this, this ); setValidator( m_validator ); setUnit( unit ); @@ -286,7 +286,7 @@ double KoUnitDoubleLineEdit::value( void ) const KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, const char *name ) : KComboBox( true, parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 ) { - lineEdit()->tqsetAlignment( TQt::AlignRight ); + lineEdit()->setAlignment( TQt::AlignRight ); m_validator = new KoUnitDoubleValidator( this, this ); lineEdit()->setValidator( m_validator ); setUnit( KoUnit::U_PT ); @@ -299,7 +299,7 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, doub : KComboBox( true, parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ), m_lowerInPoints( lower ), m_upperInPoints( upper ) { - lineEdit()->tqsetAlignment( TQt::AlignRight ); + lineEdit()->setAlignment( TQt::AlignRight ); m_validator = new KoUnitDoubleValidator( this, this ); lineEdit()->setValidator( m_validator ); setUnit( unit ); @@ -378,48 +378,48 @@ double KoUnitDoubleComboBox::value( void ) const KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, const char *name ) : TQWidget( parent ), m_step( 1.0 ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 ); - //tqlayout->setMargin( 2 ); + TQGridLayout *layout = new TQGridLayout( this, 2, 3 ); + //layout->setMargin( 2 ); TQPushButton *up = new TQPushButton( "+", this ); //up->setFlat( true ); up->setMaximumHeight( 15 ); up->setMaximumWidth( 15 ); - tqlayout->addWidget( up, 0, 0 ); + layout->addWidget( up, 0, 0 ); connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) ); TQPushButton *down = new TQPushButton( "-", this ); down->setMaximumHeight( 15 ); down->setMaximumWidth( 15 ); - tqlayout->addWidget( down, 1, 0 ); + layout->addWidget( down, 1, 0 ); connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) ); m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( 0.0, KoUnit::U_PT ), KoUnit::ptToUnit( 9999.99, KoUnit::U_PT ), 0.0, KoUnit::U_PT, 2, name ); connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) ); - tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 ); + layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 ); } KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, double lower, double upper, double step, double value, KoUnit::Unit unit, unsigned int precision, const char *name ) : TQWidget( parent ), m_step( step )//, m_lowerInPoints( lower ), m_upperInPoints( upper ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 ); - //tqlayout->setMargin( 2 ); + TQGridLayout *layout = new TQGridLayout( this, 2, 3 ); + //layout->setMargin( 2 ); TQPushButton *up = new TQPushButton( "+", this ); //up->setFlat( true ); up->setMaximumHeight( 15 ); up->setMaximumWidth( 15 ); - tqlayout->addWidget( up, 0, 0 ); + layout->addWidget( up, 0, 0 ); connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) ); TQPushButton *down = new TQPushButton( "-", this ); down->setMaximumHeight( 15 ); down->setMaximumWidth( 15 ); - tqlayout->addWidget( down, 1, 0 ); + layout->addWidget( down, 1, 0 ); connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) ); m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( lower, unit ), KoUnit::ptToUnit( upper, unit ), value, unit, precision, name ); connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) ); - tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 ); + layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 ); } void diff --git a/kexi/core/kexi.cpp b/kexi/core/kexi.cpp index 24cd08e8..e297ee52 100644 --- a/kexi/core/kexi.cpp +++ b/kexi/core/kexi.cpp @@ -172,47 +172,47 @@ TQString Kexi::msgYouCanImproveData() { //-------------------------------------------------------------------------------- -ObjecttqStatus::ObjecttqStatus() +ObjectStatus::ObjectStatus() : msgHandler(0) { } -ObjecttqStatus::ObjecttqStatus(const TQString& message, const TQString& description) +ObjectStatus::ObjectStatus(const TQString& message, const TQString& description) : msgHandler(0) { - settqStatus(message, description); + setStatus(message, description); } -ObjecttqStatus::ObjecttqStatus(KexiDB::Object* dbObject, const TQString& message, const TQString& description) +ObjectStatus::ObjectStatus(KexiDB::Object* dbObject, const TQString& message, const TQString& description) : msgHandler(0) { - settqStatus(dbObject, message, description); + setStatus(dbObject, message, description); } -ObjecttqStatus::~ObjecttqStatus() +ObjectStatus::~ObjectStatus() { delete msgHandler; } -const ObjecttqStatus& ObjecttqStatus::status() const +const ObjectStatus& ObjectStatus::status() const { return *this; } -bool ObjecttqStatus::error() const +bool ObjectStatus::error() const { return !message.isEmpty() || (dynamic_cast<KexiDB::Object*>((TQObject*)dbObj) && dynamic_cast<KexiDB::Object*>((TQObject*)dbObj)->error()); } -void ObjecttqStatus::settqStatus(const TQString& message, const TQString& description) +void ObjectStatus::setStatus(const TQString& message, const TQString& description) { this->dbObj=0; this->message=message; this->description=description; } -void ObjecttqStatus::settqStatus(KexiDB::Object* dbObject, const TQString& message, const TQString& description) +void ObjectStatus::setStatus(KexiDB::Object* dbObject, const TQString& message, const TQString& description) { if (dynamic_cast<TQObject*>(dbObject)) { dbObj = dynamic_cast<TQObject*>(dbObject); @@ -221,7 +221,7 @@ void ObjecttqStatus::settqStatus(KexiDB::Object* dbObject, const TQString& messa this->description=description; } -void ObjecttqStatus::settqStatus(KexiDB::ResultInfo* result, const TQString& message, const TQString& description) +void ObjectStatus::setStatus(KexiDB::ResultInfo* result, const TQString& message, const TQString& description) { if (result) { if (message.isEmpty()) @@ -235,41 +235,41 @@ void ObjecttqStatus::settqStatus(KexiDB::ResultInfo* result, const TQString& mes this->description = description + " " + result->desc; } else - cleartqStatus(); + clearStatus(); } -void ObjecttqStatus::settqStatus(KexiDB::Object* dbObject, KexiDB::ResultInfo* result, +void ObjectStatus::setStatus(KexiDB::Object* dbObject, KexiDB::ResultInfo* result, const TQString& message, const TQString& description) { if (!dbObject) - settqStatus(result, message, description); + setStatus(result, message, description); else if (!result) - settqStatus(dbObject, message, description); + setStatus(dbObject, message, description); else { - settqStatus(dbObject, message, description); - settqStatus(result, this->message, this->description); + setStatus(dbObject, message, description); + setStatus(result, this->message, this->description); } } -void ObjecttqStatus::cleartqStatus() +void ObjectStatus::clearStatus() { message=TQString(); description=TQString(); } -TQString ObjecttqStatus::singleStatusString() const { +TQString ObjectStatus::singleStatusString() const { if (message.isEmpty() || description.isEmpty()) return message; return message + " " + description; } -void ObjecttqStatus::append( const ObjecttqStatus& othertqStatus ) { +void ObjectStatus::append( const ObjectStatus& otherStatus ) { if (message.isEmpty()) { - message = othertqStatus.message; - description = othertqStatus.description; + message = otherStatus.message; + description = otherStatus.description; return; } - const TQString s( othertqStatus.singleStatusString() ); + const TQString s( otherStatus.singleStatusString() ); if (s.isEmpty()) return; if (description.isEmpty()) { @@ -283,7 +283,7 @@ void ObjecttqStatus::append( const ObjecttqStatus& othertqStatus ) { class ObjectStatusMessageHandler : public KexiDB::MessageHandler { public: - ObjectStatusMessageHandler(ObjecttqStatus *status) + ObjectStatusMessageHandler(ObjectStatus *status) : KexiDB::MessageHandler() , m_status(status) { @@ -295,18 +295,18 @@ class ObjectStatusMessageHandler : public KexiDB::MessageHandler virtual void showErrorMessage(const TQString &title, const TQString &details = TQString()) { - m_status->settqStatus(title, details); + m_status->setStatus(title, details); } virtual void showErrorMessage(KexiDB::Object *obj, const TQString& msg = TQString()) { - m_status->settqStatus(obj, msg); + m_status->setStatus(obj, msg); } - ObjecttqStatus *m_status; + ObjectStatus *m_status; }; -ObjecttqStatus::operator KexiDB::MessageHandler*() +ObjectStatus::operator KexiDB::MessageHandler*() { if (!msgHandler) msgHandler = new ObjectStatusMessageHandler(this); @@ -330,14 +330,14 @@ void KEXI_UNFINISHED(const TQString& feature_name, const TQString& extra_text) TQString msg; if (feature_name.isEmpty()) msg = i18n("This function is not available for version %1 of %2 application.") - .tqarg(KEXI_VERSION_STRING) - .tqarg(KEXI_APP_NAME); + .arg(KEXI_VERSION_STRING) + .arg(KEXI_APP_NAME); else { TQString feature_name_(feature_name); msg = i18n("\"%1\" function is not available for version %2 of %3 application.") - .tqarg(feature_name_.replace("&","")) - .tqarg(KEXI_VERSION_STRING) - .tqarg(KEXI_APP_NAME); + .arg(feature_name_.replace("&","")) + .arg(KEXI_VERSION_STRING) + .arg(KEXI_APP_NAME); } TQString extra_text_(extra_text); diff --git a/kexi/core/kexi.h b/kexi/core/kexi.h index 426854e6..5a6804a5 100644 --- a/kexi/core/kexi.h +++ b/kexi/core/kexi.h @@ -87,43 +87,43 @@ namespace Kexi KEXICORE_EXPORT TQFont smallFont(TQWidget *init = 0); /*! Helper class for storing object status. */ - class KEXICORE_EXPORT ObjecttqStatus + class KEXICORE_EXPORT ObjectStatus { public: - ObjecttqStatus(); + ObjectStatus(); - ObjecttqStatus(const TQString& message, const TQString& description); + ObjectStatus(const TQString& message, const TQString& description); - ObjecttqStatus(KexiDB::Object* dbObject, const TQString& message, const TQString& description); + ObjectStatus(KexiDB::Object* dbObject, const TQString& message, const TQString& description); - ~ObjecttqStatus(); + ~ObjectStatus(); - const ObjecttqStatus& status() const; + const ObjectStatus& status() const; bool error() const; - void settqStatus(const TQString& message, const TQString& description); + void setStatus(const TQString& message, const TQString& description); //! Note: for safety, \a dbObject needs to be derived from TQObject, //! otherwise it won't be assigned - void settqStatus(KexiDB::Object* dbObject, + void setStatus(KexiDB::Object* dbObject, const TQString& message = TQString(), const TQString& description = TQString()); - void settqStatus(KexiDB::ResultInfo* result, + void setStatus(KexiDB::ResultInfo* result, const TQString& message = TQString(), const TQString& description = TQString()); - void settqStatus(KexiDB::Object* dbObject, KexiDB::ResultInfo* result, + void setStatus(KexiDB::Object* dbObject, KexiDB::ResultInfo* result, const TQString& message = TQString(), const TQString& description = TQString()); - void cleartqStatus(); + void clearStatus(); TQString singleStatusString() const; - void append( const ObjecttqStatus& othertqStatus ); + void append( const ObjectStatus& otherStatus ); KexiDB::Object *dbObject() const { return dynamic_cast<KexiDB::Object*>((TQObject*)dbObj); } - //! Helper returning pseudo handler that just updates this ObjecttqStatus object + //! Helper returning pseudo handler that just updates this ObjectStatus object //! by receiving a message operator KexiDB::MessageHandler*(); diff --git a/kexi/core/kexiactionproxy.cpp b/kexi/core/kexiactionproxy.cpp index 49cbeb3b..851a4d3a 100644 --- a/kexi/core/kexiactionproxy.cpp +++ b/kexi/core/kexiactionproxy.cpp @@ -193,7 +193,7 @@ bool KexiActionProxy::activateSharedAction(const char *action_name, bool alsoChe { TQPair<TQSignal*,bool> *p = m_signals[action_name]; if (!p || !p->second) { - //try in tqchildren... + //try in children... if (alsoCheckInChildren) { TQPtrListIterator<KexiActionProxy> it( m_sharedActionChildren ); for( ; it.current(); ++it ) { @@ -217,7 +217,7 @@ bool KexiActionProxy::isSupported(const char* action_name) const { TQPair<TQSignal*,bool> *p = m_signals[action_name]; if (!p) { - //not supported explicitly - try in tqchildren... + //not supported explicitly - try in children... if (m_focusedChild) return m_focusedChild->isSupported(action_name); TQPtrListIterator<KexiActionProxy> it( m_sharedActionChildren ); @@ -234,7 +234,7 @@ bool KexiActionProxy::isAvailable(const char* action_name, bool alsoCheckInChild { TQPair<TQSignal*,bool> *p = m_signals[action_name]; if (!p) { - //not supported explicitly - try in tqchildren... + //not supported explicitly - try in children... if (alsoCheckInChildren) { if (m_focusedChild) return m_focusedChild->isAvailable(action_name, alsoCheckInChildren); diff --git a/kexi/core/kexiactionproxy.h b/kexi/core/kexiactionproxy.h index facb09b3..163efced 100644 --- a/kexi/core/kexiactionproxy.h +++ b/kexi/core/kexiactionproxy.h @@ -150,7 +150,7 @@ class KEXICORE_EXPORT KexiActionProxy /*! Adds \a child of this proxy. Children will receive activateSharedAction() event, If activateSharedAction() "event" is not consumed by the main proxy, - we start to iterate over proxy tqchildren (in unspecified order) to and call + we start to iterate over proxy children (in unspecified order) to and call activateSharedAction() on every child until one of them accept the "event". If proxy child is destroyed, it is automatically detached from its parent proxy. diff --git a/kexi/core/kexiblobbuffer.cpp b/kexi/core/kexiblobbuffer.cpp index a4c57791..aeb621c4 100644 --- a/kexi/core/kexiblobbuffer.cpp +++ b/kexi/core/kexiblobbuffer.cpp @@ -289,7 +289,7 @@ KexiBLOBBuffer::Handle KexiBLOBBuffer::objectForId(Id_t id, bool stored) KexiDB::RowData rowData; tristate res = d->conn->querySingleRecord( schema, -// TQString::tqfromLatin1("SELECT o_data, o_name, o_caption, o_mime FROM kexi__blobs where o_id=") +// TQString::fromLatin1("SELECT o_data, o_name, o_caption, o_mime FROM kexi__blobs where o_id=") // +TQString::number(id), rowData); if (res!=true || rowData.size()<4) { diff --git a/kexi/core/kexicontexthelp.cpp b/kexi/core/kexicontexthelp.cpp index e806aaaf..4ec99e53 100644 --- a/kexi/core/kexicontexthelp.cpp +++ b/kexi/core/kexicontexthelp.cpp @@ -23,7 +23,7 @@ #include <kapplication.h> #include <klocale.h> #include <kaction.h> -#include <tqlayout.h> +#include <layout.h> #include <kdebug.h> #include <kiconloader.h> diff --git a/kexi/core/kexidbshortcutfile.cpp b/kexi/core/kexidbshortcutfile.cpp index 451eb66a..01f0adb3 100644 --- a/kexi/core/kexidbshortcutfile.cpp +++ b/kexi/core/kexidbshortcutfile.cpp @@ -97,7 +97,7 @@ bool KexiDBShortcutFile::loadProjectData(KexiProjectData& data, TQString* _group d->isDatabaseShortcut = false; } else { - //ERR: i18n("No valid "type" field specified for section \"%1\": unknown value \"%2\".").tqarg(group).tqarg(type) + //ERR: i18n("No valid "type" field specified for section \"%1\": unknown value \"%2\".").arg(group).arg(type) return false; } @@ -194,9 +194,9 @@ bool KexiDBShortcutFile::saveProjectData(const KexiProjectData& data, groupPrefix = "Database%1"; //do not i18n! int number = 1; - while (config.hasGroup(groupPrefix.tqarg(number))) //a new group key couldn't exist + while (config.hasGroup(groupPrefix.arg(number))) //a new group key couldn't exist number++; - groupKey = groupPrefix.tqarg(number); + groupKey = groupPrefix.arg(number); } if (_groupKey) //return this one (generated or found) *_groupKey = groupKey; diff --git a/kexi/core/kexidialogbase.cpp b/kexi/core/kexidialogbase.cpp index ff642741..67e81a5d 100644 --- a/kexi/core/kexidialogbase.cpp +++ b/kexi/core/kexidialogbase.cpp @@ -117,20 +117,20 @@ void KexiDialogBase::removeView(int mode) m_openedViewModes ^= mode; } -TQSize KexiDialogBase::tqminimumSizeHint() const +TQSize KexiDialogBase::minimumSizeHint() const { KexiViewBase *v = selectedView(); if (!v) - return KMdiChildView::tqminimumSizeHint(); - return v->tqminimumSizeHint() + TQSize(0, mdiParent() ? mdiParent()->captionHeight() : 0); + return KMdiChildView::minimumSizeHint(); + return v->minimumSizeHint() + TQSize(0, mdiParent() ? mdiParent()->captionHeight() : 0); } -TQSize KexiDialogBase::tqsizeHint() const +TQSize KexiDialogBase::sizeHint() const { KexiViewBase *v = selectedView(); if (!v) - return KMdiChildView::tqsizeHint(); - return v->preferredSizeHint( v->tqsizeHint() ); + return KMdiChildView::sizeHint(); + return v->preferredSizeHint( v->sizeHint() ); } /* @@ -377,9 +377,9 @@ tristate KexiDialogBase::switchToViewMode( int newViewMode, TQMap<TQString,TQStr delete newView; kdDebug() << "Switching to mode " << newViewMode << " failed. Previous mode " << prevViewMode << " restored." << endl; - const Kexi::ObjecttqStatus status(*this); - settqStatus(mainWin()->project()->dbConnection(), - i18n("Switching to other view failed (%1).").tqarg(Kexi::nameForViewMode(newViewMode)),""); + const Kexi::ObjectStatus status(*this); + setStatus(mainWin()->project()->dbConnection(), + i18n("Switching to other view failed (%1).").arg(Kexi::nameForViewMode(newViewMode)),""); append( status ); m_currentViewMode = prevViewMode; return false; @@ -517,7 +517,7 @@ tristate KexiDialogBase::storeNewData() if (cancel) return cancelled; if (!m_schemaData) { - settqStatus(m_parentWindow->project()->dbConnection(), i18n("Saving object's definition failed."),""); + setStatus(m_parentWindow->project()->dbConnection(), i18n("Saving object's definition failed."),""); return false; } @@ -594,7 +594,7 @@ tristate KexiDialogBase::storeData(bool dontAsk) return false; #define storeData_ERR \ - settqStatus(m_parentWindow->project()->dbConnection(), i18n("Saving object's data failed."),""); + setStatus(m_parentWindow->project()->dbConnection(), i18n("Saving object's data failed."),""); //save changes using transaction KexiDB::Transaction transaction = m_parentWindow->project()->dbConnection()->beginTransaction(); @@ -624,8 +624,8 @@ tristate KexiDialogBase::storeData(bool dontAsk) void KexiDialogBase::activate() { KexiViewBase *v = selectedView(); - //kdDebug() << "tqfocusWidget(): " << tqfocusWidget()->name() << endl; - if (KexiUtils::hasParent( TQT_TQOBJECT(v), TQT_TQOBJECT(KMdiChildView::focusedChildWidget())))//tqfocusWidget())) + //kdDebug() << "focusWidget(): " << focusWidget()->name() << endl; + if (KexiUtils::hasParent( TQT_TQOBJECT(v), TQT_TQOBJECT(KMdiChildView::focusedChildWidget())))//focusWidget())) KMdiChildView::activate(); else {//ah, focused widget is not in this view, move focus: if (v) diff --git a/kexi/core/kexidialogbase.h b/kexi/core/kexidialogbase.h index 6449004b..d98e9d04 100644 --- a/kexi/core/kexidialogbase.h +++ b/kexi/core/kexidialogbase.h @@ -75,7 +75,7 @@ class KEXICORE_EXPORT KexiDialogTempData : public TQObject class KEXICORE_EXPORT KexiDialogBase : public KMdiChildView, public KexiActionProxy, - public Kexi::ObjecttqStatus + public Kexi::ObjectStatus { Q_OBJECT TQ_OBJECT @@ -101,10 +101,10 @@ class KEXICORE_EXPORT KexiDialogBase : // virtual TQWidget* mainWidget() = 0; /*! reimplemented: minimum size hint is inherited from currently visible view. */ - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; /*! reimplemented: size hint is inherited from currently visible view. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; KexiMainWindow *mainWin() const { return m_parentWindow; } diff --git a/kexi/core/kexiguimsghandler.cpp b/kexi/core/kexiguimsghandler.cpp index 4121543e..5b2b2791 100644 --- a/kexi/core/kexiguimsghandler.cpp +++ b/kexi/core/kexiguimsghandler.cpp @@ -77,13 +77,13 @@ void KexiGUIMessageHandler::showErrorMessage(const TQString &msg, const TQString } void -KexiGUIMessageHandler::showErrorMessage(Kexi::ObjecttqStatus *status) +KexiGUIMessageHandler::showErrorMessage(Kexi::ObjectStatus *status) { showErrorMessage("", status); } void -KexiGUIMessageHandler::showErrorMessage(const TQString &message, Kexi::ObjecttqStatus *status) +KexiGUIMessageHandler::showErrorMessage(const TQString &message, Kexi::ObjectStatus *status) { if (status && status->error()) { TQString msg(message); @@ -106,7 +106,7 @@ KexiGUIMessageHandler::showErrorMessage(const TQString &message, Kexi::ObjecttqS else { showErrorMessage(message); } - status->cleartqStatus(); + status->clearStatus(); } void diff --git a/kexi/core/kexiguimsghandler.h b/kexi/core/kexiguimsghandler.h index af407ab1..362884dc 100644 --- a/kexi/core/kexiguimsghandler.h +++ b/kexi/core/kexiguimsghandler.h @@ -32,8 +32,8 @@ class KEXICORE_EXPORT KexiGUIMessageHandler : public KexiDB::MessageHandler virtual void showErrorMessage(KexiDB::Object *obj, const TQString& msg = TQString()); void showErrorMessage(const TQString&,const TQString&,KexiDB::Object *obj); - void showErrorMessage(Kexi::ObjecttqStatus *status); - void showErrorMessage(const TQString &message, Kexi::ObjecttqStatus *status); + void showErrorMessage(Kexi::ObjectStatus *status); + void showErrorMessage(const TQString &message, Kexi::ObjectStatus *status); /*! Displays a "Sorry" message with \a title text and optional \a details. */ void showSorryMessage(const TQString &title, const TQString &details = TQString()); diff --git a/kexi/core/kexiinternalpart.cpp b/kexi/core/kexiinternalpart.cpp index 93d73cac..49b3c46d 100644 --- a/kexi/core/kexiinternalpart.cpp +++ b/kexi/core/kexiinternalpart.cpp @@ -54,7 +54,7 @@ class KexiInternalPartManager fullname, 0, fullname); if (!part) { if (msgHdr) - msgHdr->showErrorMessage(i18n("Could not load \"%1\" plugin.").tqarg(partName)); + msgHdr->showErrorMessage(i18n("Could not load \"%1\" plugin.").arg(partName)); } else m_parts.insert(partName, part); @@ -118,8 +118,8 @@ KexiDialogBase* KexiInternalPart::findOrCreateKexiDialog( dlg->addView(view); dlg->setCaption( view->caption() ); dlg->setTabCaption( view->caption() ); - dlg->resize(view->tqsizeHint()); - dlg->setMinimumSize(view->tqminimumSizeHint().width(),view->tqminimumSizeHint().height()); + dlg->resize(view->sizeHint()); + dlg->setMinimumSize(view->minimumSizeHint().width(),view->minimumSizeHint().height()); dlg->setId( mainWin->generatePrivateID() ); dlg->registerDialog(); return dlg; diff --git a/kexi/core/kexipart.cpp b/kexi/core/kexipart.cpp index ba54fea7..49f1aeab 100644 --- a/kexi/core/kexipart.cpp +++ b/kexi/core/kexipart.cpp @@ -66,7 +66,7 @@ public: singleStatusString.prepend(TQString("\n\n")+i18n("Details:")+" "); if (KMessageBox::No==KMessageBox::questionYesNo(0, ((viewMode == Kexi::DesignViewMode) - ? i18n("Object \"%1\" could not be opened in Design View.").tqarg(item.name()) + ? i18n("Object \"%1\" could not be opened in Design View.").arg(item.name()) : i18n("Object could not be opened in Data View."))+"\n" + i18n("Do you want to open it in Text View?") + singleStatusString, 0, KStdGuiItem::open(), KStdGuiItem::cancel())) @@ -242,11 +242,11 @@ KexiDialogBase* Part::openInstance(KexiMainWindow *win, KexiPart::Item &item, in d->instanceActionsInitialized = true; } - m_status.cleartqStatus(); + m_status.clearStatus(); // KexiDialogBase *dlg = createInstance(win,item,viewMode); // if (!dlg) // return 0; -// TQString capt = TQString("%1 : %2").tqarg(item.name()).tqarg(instanceName()); +// TQString capt = TQString("%1 : %2").arg(item.name()).arg(instanceName()); KexiDialogBase *dlg = new KexiDialogBase(win); dlg->m_supportedViewModes = m_supportedViewModes; // dlg->m_neverSaved = item.neverSaved(); @@ -289,11 +289,11 @@ KexiDialogBase* Part::openInstance(KexiMainWindow *win, KexiPart::Item &item, in } if (!dlg->m_schemaData) { if (!m_status.error()) - m_status = Kexi::ObjecttqStatus( dlg->mainWin()->project()->dbConnection(), + m_status = Kexi::ObjectStatus( dlg->mainWin()->project()->dbConnection(), i18n("Could not load object's definition."), i18n("Object design may be corrupted.")); m_status.append( - Kexi::ObjecttqStatus(i18n("You can delete \"%1\" object and create it again.") - .tqarg(item.name()), TQString()) ); + Kexi::ObjectStatus(i18n("You can delete \"%1\" object and create it again.") + .arg(item.name()), TQString()) ); dlg->close(); delete dlg; @@ -339,9 +339,9 @@ KexiDialogBase* Part::openInstance(KexiMainWindow *win, KexiPart::Item &item, in dlg->show(); if (dlg->mdiParent() && dlg->mdiParent()->state()==KMdiChildFrm::Normal) //only resize dialog if it is in normal state - dlg->resize(dlg->tqsizeHint()); + dlg->resize(dlg->sizeHint()); - dlg->setMinimumSize(dlg->tqminimumSizeHint().width(),dlg->tqminimumSizeHint().height()); + dlg->setMinimumSize(dlg->minimumSizeHint().width(),dlg->minimumSizeHint().height()); //dirty only if it's a new object if (dlg->selectedView()) @@ -366,8 +366,8 @@ KexiDB::SchemaData* Part::loadSchemaData(KexiDialogBase * /*dlg*/, const KexiDB: bool Part::loadDataBlock( KexiDialogBase *dlg, TQString &dataString, const TQString& dataID) { if (!dlg->mainWin()->project()->dbConnection()->loadDataBlock( dlg->id(), dataString, dataID )) { - m_status = Kexi::ObjecttqStatus( dlg->mainWin()->project()->dbConnection(), - i18n("Could not load object's data."), i18n("Data identifier: \"%1\".").tqarg(dataID) ); + m_status = Kexi::ObjectStatus( dlg->mainWin()->project()->dbConnection(), + i18n("Could not load object's data."), i18n("Data identifier: \"%1\".").arg(dataID) ); m_status.append( *dlg ); return false; } @@ -431,11 +431,11 @@ tristate Part::rename(KexiMainWindow *win, KexiPart::Item &item, const TQString& GUIClient::GUIClient(KexiMainWindow *win, Part* part, bool partInstanceClient, const char* nameSuffix) : TQObject(part, (part->info()->objectName() - + (nameSuffix ? TQString(":%1").tqarg(nameSuffix) : TQString())).latin1() ) + + (nameSuffix ? TQString(":%1").arg(nameSuffix) : TQString())).latin1() ) , KXMLGUIClient(win) { if(!win->project()->data()->userMode()) - setXMLFile(TQString::tqfromLatin1("kexi")+part->info()->objectName() + setXMLFile(TQString::fromLatin1("kexi")+part->info()->objectName() +"part"+(partInstanceClient?"inst":"")+"ui.rc"); // new KAction(part->m_names["new"], part->info()->itemIcon(), 0, this, diff --git a/kexi/core/kexipart.h b/kexi/core/kexipart.h index f1168fd4..c448b8bf 100644 --- a/kexi/core/kexipart.h +++ b/kexi/core/kexipart.h @@ -186,7 +186,7 @@ class KEXICORE_EXPORT Part : public TQObject /*! \return action collection for mode \a viewMode. */ KActionCollection* actionCollectionForMode(int viewMode) const; - const Kexi::ObjecttqStatus& lastOperationtqStatus() const { return m_status; } + const Kexi::ObjectStatus& lastOperationStatus() const { return m_status; } /*! \return i18n'd message translated from \a englishMessage. This method is useful for messages like: @@ -309,7 +309,7 @@ class KEXICORE_EXPORT Part : public TQObject GUIClient *m_guiClient; TQIntDict<GUIClient> m_instanceGuiClients; KexiMainWindow* m_mainWin; - Kexi::ObjecttqStatus m_status; + Kexi::ObjectStatus m_status; /*! If you're implementing a new part, set this to value >0 in your ctor if you have well known (ie registered ID) for your part. diff --git a/kexi/core/kexipartmanager.cpp b/kexi/core/kexipartmanager.cpp index f6fcd7d8..d651f8d0 100644 --- a/kexi/core/kexipartmanager.cpp +++ b/kexi/core/kexipartmanager.cpp @@ -131,7 +131,7 @@ Manager::part(Info *i) if(!p) { kdDebug() << "Manager::part(): failed :( (ERROR #" << error << ")" << endl; kdDebug() << " " << KLibLoader::self()->lastErrorMessage() << endl; - i->setBroken(true, i18n("Error while loading plugin \"%1\"").tqarg(i->objectName())); + i->setBroken(true, i18n("Error while loading plugin \"%1\"").arg(i->objectName())); setError(i->errorMessage()); return 0; } @@ -198,7 +198,7 @@ Manager::infoForMimeType(const TQString &mimeType) Info *i = mimeType.isEmpty() ? 0 : m_partsByMime[mimeType.latin1()]; if (i) return i; - setError(i18n("No plugin for mime type \"%1\"").tqarg(mimeType)); + setError(i18n("No plugin for mime type \"%1\"").arg(mimeType)); return 0; } diff --git a/kexi/core/kexiproject.cpp b/kexi/core/kexiproject.cpp index 159de750..1dbe4eef 100644 --- a/kexi/core/kexiproject.cpp +++ b/kexi/core/kexiproject.cpp @@ -180,7 +180,7 @@ KexiProject::openInternal(bool *incompatibleWithKexi) *incompatibleWithKexi = false; kdDebug() << "KexiProject::open(): " << d->data->databaseName() <<" "<< d->data->connectionData()->driverName << endl; KexiDB::MessageTitle et(this, - i18n("Could not open project \"%1\".").tqarg(d->data->databaseName())); + i18n("Could not open project \"%1\".").arg(d->data->databaseName())); if (!createConnection()) { kdDebug() << "KexiProject::open(): !createConnection()" << endl; @@ -225,7 +225,7 @@ tristate KexiProject::create(bool forceOverwrite) { KexiDB::MessageTitle et(this, - i18n("Could not create project \"%1\".").tqarg(d->data->databaseName())); + i18n("Could not create project \"%1\".").arg(d->data->databaseName())); if (!createConnection()) return false; @@ -381,10 +381,10 @@ bool KexiProject::createInternalStructures(bool insideTransaction) } // 2.1 copy data (insert 0's into o_folder_id column) if (!d->connection->executeSQL( - TQString::tqfromLatin1("INSERT INTO kexi__blobs (o_data, o_name, o_caption, o_mime, o_folder_id) " + TQString::fromLatin1("INSERT INTO kexi__blobs (o_data, o_name, o_caption, o_mime, o_folder_id) " "SELECT o_data, o_name, o_caption, o_mime, 0 FROM kexi__blobs") ) // 2.2 remove the original kexi__blobs - || !d->connection->executeSQL(TQString::tqfromLatin1("DROP TABLE kexi__blobs")) //lowlevel + || !d->connection->executeSQL(TQString::fromLatin1("DROP TABLE kexi__blobs")) //lowlevel // 2.3 rename the copy back into kexi__blobs || !d->connection->drv_alterTableName(*kexi__blobsCopy, "kexi__blobs") ) @@ -529,9 +529,9 @@ KexiProject::initProject() d->data->setDescription( str ); /* KexiDB::RowData data; TQString sql = "select db_value from kexi__db where db_property='%1'"; - if (d->connection->querySingleRecord( sql.tqarg("project_caption"), data ) && !data[0].toString().isEmpty()) + if (d->connection->querySingleRecord( sql.arg("project_caption"), data ) && !data[0].toString().isEmpty()) d->data->setCaption(data[0].toString()); - if (d->connection->querySingleRecord( sql.tqarg("project_desc"), data) && !data[0].toString().isEmpty()) + if (d->connection->querySingleRecord( sql.arg("project_desc"), data) && !data[0].toString().isEmpty()) d->data->setDescription(data[0].toString());*/ return true; @@ -735,10 +735,10 @@ KexiDialogBase* KexiProject::openObject(KexiMainWindow *wnd, KexiPart::Item& ite return 0; KexiDialogBase *dlg = part->openInstance(wnd, item, viewMode, staticObjectArgs); if (!dlg) { - if (part->lastOperationtqStatus().error()) - setError(i18n("Opening object \"%1\" failed.").tqarg(item.name())+"<br>" - +part->lastOperationtqStatus().message, - part->lastOperationtqStatus().description); + if (part->lastOperationStatus().error()) + setError(i18n("Opening object \"%1\" failed.").arg(item.name())+"<br>" + +part->lastOperationStatus().message, + part->lastOperationStatus().description); return 0; } return dlg; @@ -817,13 +817,13 @@ bool KexiProject::renameObject( KexiMainWindow *wnd, KexiPart::Item& item, const } if (this->itemForMimeType(item.mimeType(), newName)!=0) { setError( i18n("Could not use this name. Object with name \"%1\" already exists.") - .tqarg(newName) ); + .arg(newName) ); return false; } } KexiDB::MessageTitle et(this, - i18n("Could not rename object \"%1\".").tqarg(item.name()) ); + i18n("Could not rename object \"%1\".").arg(item.name()) ); if (!checkWritable()) return false; KexiPart::Part *part = findPartFor(item); @@ -835,7 +835,7 @@ bool KexiProject::renameObject( KexiMainWindow *wnd, KexiPart::Item& item, const return false; } if (!part->rename(wnd, item, newName)) { - setError(part->lastOperationtqStatus().message, part->lastOperationtqStatus().description); + setError(part->lastOperationStatus().message, part->lastOperationStatus().description); return false; } if (!d->connection->executeSQL( "update kexi__objects set o_name=" @@ -960,7 +960,7 @@ KexiProject::createBlankProject(bool &cancelled, KexiProjectData* data, if (KMessageBox::Yes != KMessageBox::warningYesNo(0, "<qt>"+i18n( "The project %1 already exists.\n" "Do you want to replace it with a new, blank one?") - .tqarg(prj->data()->infoString())+"\n"+warningNoUndo+"</qt>", + .arg(prj->data()->infoString())+"\n"+warningNoUndo+"</qt>", TQString(), KGuiItem(i18n("Replace")), KStdGuiItem::cancel() )) //todo add serverInfoString() for server-based prj { @@ -985,7 +985,7 @@ tristate KexiProject::dropProject(KexiProjectData* data, KexiDB::MessageHandler* handler, bool dontAsk) { if (!dontAsk && KMessageBox::Yes != KMessageBox::warningYesNo(0, - i18n("Do you want to drop the project \"%1\"?").tqarg(data->KexiDB::SchemaData::objectName())+"\n"+warningNoUndo )) + i18n("Do you want to drop the project \"%1\"?").arg(data->KexiDB::SchemaData::objectName())+"\n"+warningNoUndo )) return cancelled; KexiProject prj( new KexiProjectData(*data), handler ); diff --git a/kexi/core/kexiprojectdata.cpp b/kexi/core/kexiprojectdata.cpp index 9f0106bc..9b9203c8 100644 --- a/kexi/core/kexiprojectdata.cpp +++ b/kexi/core/kexiprojectdata.cpp @@ -155,13 +155,13 @@ TQString KexiProjectData::infoString(bool nobr) const { if (constConnectionData()->fileName().isEmpty()) { //server-based - return TQString(nobr ? "<nobr>" : "") + TQString("\"%1\"").tqarg(databaseName()) + (nobr ? "</nobr>" : "") + return TQString(nobr ? "<nobr>" : "") + TQString("\"%1\"").arg(databaseName()) + (nobr ? "</nobr>" : "") + (nobr ? " <nobr>" : " ") + i18n("database connection", "(connection %1)") - .tqarg(constConnectionData()->serverInfoString()) + (nobr ? "</nobr>" : ""); + .arg(constConnectionData()->serverInfoString()) + (nobr ? "</nobr>" : ""); } //file-based return TQString(nobr ? "<nobr>" : "") - + TQString("\"%1\"").tqarg(constConnectionData()->fileName()) + (nobr ? "</nobr>" : ""); + + TQString("\"%1\"").arg(constConnectionData()->fileName()) + (nobr ? "</nobr>" : ""); } void KexiProjectData::setReadOnly(bool set) diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp index 6a696461..1ba85265 100644 --- a/kexi/core/kexisharedactionhost.cpp +++ b/kexi/core/kexisharedactionhost.cpp @@ -42,7 +42,7 @@ KexiSharedActionHostPrivate::KexiSharedActionHostPrivate(KexiSharedActionHost *h void KexiSharedActionHostPrivate::slotAction(const TQString& act_id) { - TQWidget *w = host->focusWindow(); //tqfocusWidget(); + TQWidget *w = host->focusWindow(); //focusWidget(); // while (w && !w->inherits("KexiDialogBase") && !w->inherits("KexiDockBase")) // w = w->parentWidget(); @@ -111,7 +111,7 @@ void KexiSharedActionHost::updateActionAvailable(const char *action_name, bool a }*/ if (!d) return; //sanity - TQWidget *fw = d->mainWin->tqfocusWidget(); + TQWidget *fw = d->mainWin->focusWidget(); while (fw && TQT_BASE_OBJECT(obj)!=TQT_BASE_OBJECT(fw)) fw = fw->parentWidget(); if (!fw) @@ -149,7 +149,7 @@ void KexiSharedActionHost::invalidateSharedActions(TQObject *o) KAction *a = *it; if (!insideDialogBase && d->mainWin->actionCollection()!=a->parentCollection()) { //o is not KexiDialogBase or its child: - // only tqinvalidate action if it comes from mainwindow's KActionCollection + // only invalidate action if it comes from mainwindow's KActionCollection // (thus part-actions are untouched when the focus is e.g. in the Property Editor) continue; } @@ -205,7 +205,7 @@ TQWidget* KexiSharedActionHost::focusWindow() TQWidget *aw = TQT_TQWIDGET(tqApp->activeWindow()); if (!aw) aw = d->mainWin; - fw = aw->tqfocusWidget(); + fw = aw->focusWidget(); } while (fw && !acceptsSharedActions(TQT_TQOBJECT(fw))) fw = fw->parentWidget(); diff --git a/kexi/core/kexisharedactionhost.h b/kexi/core/kexisharedactionhost.h index 91cc09f4..c7fcb181 100644 --- a/kexi/core/kexisharedactionhost.h +++ b/kexi/core/kexisharedactionhost.h @@ -69,7 +69,7 @@ class KEXICORE_EXPORT KexiSharedActionHost */ virtual bool acceptsSharedActions(TQObject *o); - /*! \return window widget that is currently focused (using TQWidget::tqfocusWidget()) + /*! \return window widget that is currently focused (using TQWidget::focusWidget()) and matches acceptsSharedActions(). If focused widget does not match, it's parent, grandparent, and so on is checked. If all this fails, or no widget has focus, NULL is returned. diff --git a/kexi/core/kexiviewbase.cpp b/kexi/core/kexiviewbase.cpp index e89f4a4e..65f2e68f 100644 --- a/kexi/core/kexiviewbase.cpp +++ b/kexi/core/kexiviewbase.cpp @@ -214,26 +214,26 @@ bool KexiViewBase::eventFilter( TQObject *o, TQEvent *e ) { if (e->type()==TQEvent::FocusIn || e->type()==TQEvent::FocusOut) {// && o->inherits(TQWIDGET_OBJECT_NAME_STRING)) { // //hp==true if currently focused widget is a child of this table view -// const bool hp = Kexi::hasParent( static_cast<TQWidget*>(o), tqfocusWidget()); +// const bool hp = Kexi::hasParent( static_cast<TQWidget*>(o), focusWidget()); // kexidbg << "KexiViewBase::eventFilter(): " << o->name() << " " << e->type() << endl; if (KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(o))) { - if (e->type()==TQEvent::FocusOut && tqfocusWidget() && !KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(tqfocusWidget()))) { + if (e->type()==TQEvent::FocusOut && focusWidget() && !KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(focusWidget()))) { //focus out: when currently focused widget is not a parent of this view emit focus(false); } else if (e->type()==TQEvent::FocusIn) { emit focus(true); } - if (e->type()==TQEvent::FocusOut) { // && tqfocusWidget() && Kexi::hasParent( this, tqfocusWidget())) { // && tqfocusWidget()->inherits("KexiViewBase")) { -// kdDebug() << tqfocusWidget()->className() << " " << tqfocusWidget()->name()<< endl; + if (e->type()==TQEvent::FocusOut) { // && focusWidget() && Kexi::hasParent( this, focusWidget())) { // && focusWidget()->inherits("KexiViewBase")) { +// kdDebug() << focusWidget()->className() << " " << focusWidget()->name()<< endl; // kdDebug() << o->className() << " " << o->name()<< endl; KexiViewBase *v = KexiUtils::findParent<KexiViewBase>(o, "KexiViewBase") ; -// TQWidget *www=v->tqfocusWidget(); +// TQWidget *www=v->focusWidget(); if (v) { while (v->m_parentView) v = v->m_parentView; - if (KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(v->tqfocusWidget()) )) - v->m_lastFocusedChildBeforeFocusOut = static_cast<TQWidget*>(v->tqfocusWidget()); -// v->m_lastFocusedChildBeforeFocusOut = static_cast<TQWidget*>(o); //tqfocusWidget(); + if (KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(v->focusWidget()) )) + v->m_lastFocusedChildBeforeFocusOut = static_cast<TQWidget*>(v->focusWidget()); +// v->m_lastFocusedChildBeforeFocusOut = static_cast<TQWidget*>(o); //focusWidget(); } } @@ -263,7 +263,7 @@ void KexiViewBase::setViewWidget(TQWidget* w, bool focusProxy) void KexiViewBase::addChildView( KexiViewBase* childView ) { - m_tqchildren.append( childView ); + m_children.append( childView ); addActionProxyChild( childView ); childView->m_parentView = this; // if (m_parentView) @@ -318,8 +318,8 @@ void KexiViewBase::setAvailable(const char* action_name, bool set) void KexiViewBase::updateActions(bool activated) { //do nothing here - //do the same for tqchildren :) - for (TQPtrListIterator<KexiViewBase> it(m_tqchildren); it.current(); ++it) { + //do the same for children :) + for (TQPtrListIterator<KexiViewBase> it(m_children); it.current(); ++it) { it.current()->updateActions(activated); } } diff --git a/kexi/core/kexiviewbase.h b/kexi/core/kexiviewbase.h index 139f0b2d..564f5a20 100644 --- a/kexi/core/kexiviewbase.h +++ b/kexi/core/kexiviewbase.h @@ -71,7 +71,7 @@ class KEXICORE_EXPORT KexiViewBase : public TQWidget, public KexiActionProxy /*! \return preferred size hint, that can be used to resize the view. It is computed using maximum of (a) \a otherSize and (b) current KMDI dock area's size, - so the view won't exceed this maximum size. The method is used e.g. in KexiDialogBase::tqsizeHint(). + so the view won't exceed this maximum size. The method is used e.g. in KexiDialogBase::sizeHint(). If you reimplement this method, do not forget to return value of yoursize.boundedTo( KexiViewBase::preferredSizeHint(otherSize) ). */ virtual TQSize preferredSizeHint(const TQSize& otherSize); @@ -270,7 +270,7 @@ class KEXICORE_EXPORT KexiViewBase : public TQWidget, public KexiActionProxy Can be useful when single class is used for more than one view (e.g. KexiDBForm). */ int m_viewMode; - TQPtrList<KexiViewBase> m_tqchildren; + TQPtrList<KexiViewBase> m_children; bool m_dirty : 1; diff --git a/kexi/doc/common/kde-default.css b/kexi/doc/common/kde-default.css index 59366d38..032a00db 100644 --- a/kexi/doc/common/kde-default.css +++ b/kexi/doc/common/kde-default.css @@ -90,7 +90,7 @@ DIV.INFORMALEXAMPLE { border-style: dotted; TABLE.programlisting TABLE.screen { border-style: none; background-color: rgb(224,224,224); - table-tqlayout: auto; /* 100%? */ + table-layout: auto; /* 100%? */ color: rgb(0,0,0); /* should be inherit */ } @@ -99,7 +99,7 @@ TABLE.screen { border-style: none; TABLE[class~=programlisting] TABLE[class~=screen] { border-style: none; background-color: rgb(224,224,224); - table-tqlayout: auto; + table-layout: auto; color: inherit; } */ diff --git a/kexi/doc/common/kde-web.css b/kexi/doc/common/kde-web.css index dfd98e8b..e61fa32a 100644 --- a/kexi/doc/common/kde-web.css +++ b/kexi/doc/common/kde-web.css @@ -85,7 +85,7 @@ DIV.INFORMALEXAMPLE { border-style: dotted; TABLE.programlisting TABLE.screen { border-style: none; background-color: rgb(224,224,224); - table-tqlayout: auto; /* 100%? */ + table-layout: auto; /* 100%? */ color: rgb(0,0,0); /* should be inherit */ } @@ -94,7 +94,7 @@ TABLE.screen { border-style: none; TABLE[class~=programlisting] TABLE[class~=screen] { border-style: none; background-color: rgb(224,224,224); - table-tqlayout: auto; + table-layout: auto; color: inherit; } */ diff --git a/kexi/doc/dev/kexi_guidelines.txt b/kexi/doc/dev/kexi_guidelines.txt index ab713e34..7c2dfaba 100644 --- a/kexi/doc/dev/kexi_guidelines.txt +++ b/kexi/doc/dev/kexi_guidelines.txt @@ -19,7 +19,7 @@ Focus on: convert to QString only on data displaying) Idea 3 -Directories tqlayout: +Directories layout: dialogs/ +-altertable/ +-datatable/ diff --git a/kexi/doc/handbook/html.tmp/01_02_00_db_spreadsheet.html b/kexi/doc/handbook/html.tmp/01_02_00_db_spreadsheet.html index b7b62ab9..e7959df7 100644 --- a/kexi/doc/handbook/html.tmp/01_02_00_db_spreadsheet.html +++ b/kexi/doc/handbook/html.tmp/01_02_00_db_spreadsheet.html @@ -168,7 +168,7 @@ In this case the very way the spreadsheet works is problematic. Fields for data <a name="reports"></a> <h4>Reports</h4> <p> -Databases enable grouping, limiting and summing up data in a form of a <em>report</em>. Spreadsheets are usually printed in a form of small tables without fully automatic control over page divisions and the tqlayout of fields. +Databases enable grouping, limiting and summing up data in a form of a <em>report</em>. Spreadsheets are usually printed in a form of small tables without fully automatic control over page divisions and the layout of fields. </p> <a name="programming"></a> diff --git a/kexi/doc/handbook/html.tmp/05_01_00_table_designing.html b/kexi/doc/handbook/html.tmp/05_01_00_table_designing.html index 2953a0f0..14c0b511 100644 --- a/kexi/doc/handbook/html.tmp/05_01_00_table_designing.html +++ b/kexi/doc/handbook/html.tmp/05_01_00_table_designing.html @@ -2,7 +2,7 @@ <H2>5.1. Designing Database Tables</H2> <p> -First, there will be two tables added to your database: <em>persons</em> and <em>phone_numbers</em>. These are exactly the same tables as described in chapter <a href="01_02_00_db_spreadsheet.html">1.2. A database and a spreadsheet</a>. A tqlayout for <em>Persons</em> can be found in section <a href="01_02_00_db_spreadsheet.html#data_integrity">Data integrity and validity</a> in that chapter. +First, there will be two tables added to your database: <em>persons</em> and <em>phone_numbers</em>. These are exactly the same tables as described in chapter <a href="01_02_00_db_spreadsheet.html">1.2. A database and a spreadsheet</a>. A layout for <em>Persons</em> can be found in section <a href="01_02_00_db_spreadsheet.html#data_integrity">Data integrity and validity</a> in that chapter. </p> <p> diff --git a/kexi/doc/handbook/html.tmp/05_04_00_form_designing.html b/kexi/doc/handbook/html.tmp/05_04_00_form_designing.html index bfab0a72..9cb671d1 100644 --- a/kexi/doc/handbook/html.tmp/05_04_00_form_designing.html +++ b/kexi/doc/handbook/html.tmp/05_04_00_form_designing.html @@ -196,7 +196,7 @@ It is right moment for testing your form. Click the <nobr><img src="icons/state_ To make it easier for the form's user to identify meaning of every field widget, these should have added text labels with appropriate titles. To create text labels <nobr><img src="icons/label.png" class="icon"> <em>Label</em></nobr> widget is used. </p> <p> -Insert three text label widgets onto the form, placing them on the left hand of the text fields (or on the right hand if your operating system uses right-to-left tqlayout). On inserting every new label, a text cursor appears inside where you can enter desired title. Enter consecutively: <em>Name</em>, <em>Surname</em> and <em>Street</em>. Additionally, on the top of the form insert another label displaying name of the form, i.e. "Persons". Enlarge this label's size and set larger font using <a href="aa_00_00_menu.html#menu_format_font">Format -> Font</a> menu command. +Insert three text label widgets onto the form, placing them on the left hand of the text fields (or on the right hand if your operating system uses right-to-left layout). On inserting every new label, a text cursor appears inside where you can enter desired title. Enter consecutively: <em>Name</em>, <em>Surname</em> and <em>Street</em>. Additionally, on the top of the form insert another label displaying name of the form, i.e. "Persons". Enlarge this label's size and set larger font using <a href="aa_00_00_menu.html#menu_format_font">Format -> Font</a> menu command. </p> <p> <br><img src="img/05_04_06_form_with_labels.png"> @@ -256,50 +256,50 @@ The following example presents a form where text fields and labels were placed b <br>An example form with widgets that cannot not fit in the window<br><br> </p> <p> -Using special tool called <em>widget layouts</em> can help to automatically lay out the form widgets. Widget tqlayout is an action of grouping two or more widgets so these are well positioned and have appropriate sizes. +Using special tool called <em>widget layouts</em> can help to automatically lay out the form widgets. Widget layout is an action of grouping two or more widgets so these are well positioned and have appropriate sizes. </p> <p> -Using tqlayout in this form improves tqalignment. Moreover, its space is better developed. Text fields are closer each other, spacing is constant. +Using layout in this form improves alignment. Moreover, its space is better developed. Text fields are closer each other, spacing is constant. <br> <br><img src="img/05_04_08_form_well_fit.png"> - <br>Example form with tqlayout used<br><br> + <br>Example form with layout used<br><br> </p> <p> -There are two methods to create widget tqlayout. +There are two methods to create widget layout. <ul> -<li>Select two or more widgets that should be placed in a common tqlayout, and select one of the tqlayout types from the context menu item <a href="aa_00_00_menu.html#menu_format_layout">Layout Widgets</a>.</li> -<li>Click a <a hrf="widget_containers">container widget</a> (or a form surface itself), where widgets are inserted and select one of the tqlayout types from the context menu item <a href="aa_00_00_menu.html#menu_format_layout">Layout Widgets</a>. All widgets existing within the container or within the form, being on the same level will be put into a single common tqlayout.</li> +<li>Select two or more widgets that should be placed in a common layout, and select one of the layout types from the context menu item <a href="aa_00_00_menu.html#menu_format_layout">Layout Widgets</a>.</li> +<li>Click a <a hrf="widget_containers">container widget</a> (or a form surface itself), where widgets are inserted and select one of the layout types from the context menu item <a href="aa_00_00_menu.html#menu_format_layout">Layout Widgets</a>. All widgets existing within the container or within the form, being on the same level will be put into a single common layout.</li> </ul> In each of these cases you can also use <em>Format -> Layout Widgets</em> menu. </p> <p> <img src="img/05_04_08_form_layout_selecting.png"> - <br>Selecting widgets that will be put into a tqlayout<br> + <br>Selecting widgets that will be put into a layout<br> <br><img src="img/05_04_08_form_layout_selected.png"> <br>Four widgets are selected<br><br> <br><img src="img/05_04_08_form_layout_popup.png"><br> - <br>Using the context menu for putting the widgets into a grid tqlayout<br><br> + <br>Using the context menu for putting the widgets into a grid layout<br><br> </p> <p> -Widget tqlayout is presented in the design view using a blue, green or red box drawn with broken line. This line is displayed only in the form's design view. +Widget layout is presented in the design view using a blue, green or red box drawn with broken line. This line is displayed only in the form's design view. </p> <p> <br> <br><img src="img/05_04_08_form_layout_grid.png"> - <br>Widgets within a grid tqlayout<br><br> + <br>Widgets within a grid layout<br><br> </p> <p> -Besides the grid type, there are other widget tqlayout types. +Besides the grid type, there are other widget layout types. <ul> <li>vertical <br> <br><img src="img/05_04_08_form_layout_vertical.png"> - <br>Vertical widget tqlayout<br><br> + <br>Vertical widget layout<br><br> </li> <li>horizontal <br> <br><img src="img/05_04_08_form_layout_horizontal.png"> - <br>Horizontal widget tqlayout<br><br> + <br>Horizontal widget layout<br><br> </li> <!-- TODO podzia³ poziomy / pionowy <br><img src="img/05_04_08_form_layout_vertical_splitter.png"> @@ -322,12 +322,12 @@ A <em>spring</em> in widget layouts is a special, invisible element allowing to </ol> </p> <p> -For the following example, the spring has been inserted on the left hand of the text label "Persons". The label is thus displayed on the right hand of the form. To make the spring work, it has been put into a common horizontal tqlayout with the label. +For the following example, the spring has been inserted on the left hand of the text label "Persons". The label is thus displayed on the right hand of the form. To make the spring work, it has been put into a common horizontal layout with the label. <br><img src="img/05_04_08_form_spring.png"> - <br>Horizontal tqlayout containing a spring and a text label<br><br> + <br>Horizontal layout containing a spring and a text label<br><br> </p> <p> -To make springs work you need to create a global widget tqlayout i.e. a tqlayout for the form itself. Then, springs can use edges of the form as a boundary for expanding. +To make springs work you need to create a global widget layout i.e. a layout for the form itself. Then, springs can use edges of the form as a boundary for expanding. </p> <a name="advanced_form_layouts"></a> @@ -337,21 +337,21 @@ Widget layouts can be combined (or nested). On the following example you can ide </p> <p> <ol> -<li>horizontal tqlayout with a spring, aligning the "Persons" text label to the right</li> -<li>grid tqlayout grouping widgets on the whole form</li> +<li>horizontal layout with a spring, aligning the "Persons" text label to the right</li> +<li>grid layout grouping widgets on the whole form</li> </ol> </p> <p> <img src="img/05_04_08_form_advanced_layout.png"> - <br>Two widget layouts combined: horizontal tqlayout inside of a grid tqlayout<br><br> + <br>Two widget layouts combined: horizontal layout inside of a grid layout<br><br> </p> <p> -The horizontal tqlayout is treat in the example as a single widget by the grid tqlayout - it takes exactly one "cell" of the grid. +The horizontal layout is treat in the example as a single widget by the grid layout - it takes exactly one "cell" of the grid. After opening a form designed this way in the data view, you can notice (by resizing the form) that: </p> <ul> <li>"Persons" text label thanks to the spring used is constantly aligned to the to the right side of the form</li> -<li>text fields take all of the available width thanks to putting them into the grid tqlayout</li> +<li>text fields take all of the available width thanks to putting them into the grid layout</li> <li>all the form's widgets are pushed to the top thanks to the spring used at the bottom of the form</li> </ul> <p> @@ -362,24 +362,24 @@ After opening a form designed this way in the data view, you can notice (by resi <a name="layout_breaking"></a> <H4>Removing widget layouts</H4> <p> -To remove widget tqlayout without removing widgets, perform one of these actions: +To remove widget layout without removing widgets, perform one of these actions: <ul> -<li>click with the &RMB; on the tqlayout's border and select <em>Break Layout</em> command from the context menu</li> -<li>click with the &LMB; on the tqlayout's border and select <em>Format -> Break Layout</em> menu command</li> +<li>click with the &RMB; on the layout's border and select <em>Break Layout</em> command from the context menu</li> +<li>click with the &LMB; on the layout's border and select <em>Format -> Break Layout</em> menu command</li> </ul> </p> <H4>Notes</H4> -<p>Removing widget tqlayout using the <em>Break Layout</em> command will not remove widgets contained in the tqlayout. If you want to remove the widgets as well, just select the tqlayout by clicking on its border and press <kbd>Delete</kbd> key or use <nobr><em>Edit -> <img src="icons/editdelete.png" class="icon"> Delete</em></nobr> menu command or context menu command. +<p>Removing widget layout using the <em>Break Layout</em> command will not remove widgets contained in the layout. If you want to remove the widgets as well, just select the layout by clicking on its border and press <kbd>Delete</kbd> key or use <nobr><em>Edit -> <img src="icons/editdelete.png" class="icon"> Delete</em></nobr> menu command or context menu command. </p> <a name="layout_size_types"></a> -<H4>Size policies for widgets within a tqlayout</H4> +<H4>Size policies for widgets within a layout</H4> <p> Instead of setting a fixed size for your widgets, in &kexi; you can choose between various widget's <em>size policies</em>. A size policy is a flexible strategy for controlling how a widget is stretched (or shrunk) depending on other neighbouring widgets and space available within the form. </p> <p> -After putting widgets into a <em>tqlayout</em>, typically each widget gets a proportional (<em>Preferred</em>) size policy. These widgets will be automatically resized with preferred settings, depending on their type and size of the entire tqlayout itself. For example, three buttons put into the horizontal tqlayout will be resized to fit their visible text. +After putting widgets into a <em>layout</em>, typically each widget gets a proportional (<em>Preferred</em>) size policy. These widgets will be automatically resized with preferred settings, depending on their type and size of the entire layout itself. For example, three buttons put into the horizontal layout will be resized to fit their visible text. </p> <p> For each widget inserted into the form, there are settings for size policy available in the <em>Property Editor</em>. The settings are presented as a group of properties called <em>Size Policy</em>. @@ -403,12 +403,12 @@ There are following values available on the drop down list for <em>Horizontal Si <li><b>Fixed</b> value means that the widget cannot be automatically resized; it should maintain the constant size defined on design time (width or height),</li> <li><p><b>Minimum</b> value means that the original size of the widget is set as minimal allowed, it is sufficient and there is no need for expanding the widget, but the widget will be expanded if needed. This type of policy can be used to force widget to be expanded to the whole width or height, especially if you set a <em>stretch</em> value greater than 0. <br><img src="img/05_04_09_size_policy_minimum.png"> - <br>Text field and two buttons within a grid tqlayout (<em>Minimum</em> horizontal size policy is set for both buttons, so these are slightly wider than needed)<br><br> + <br>Text field and two buttons within a grid layout (<em>Minimum</em> horizontal size policy is set for both buttons, so these are slightly wider than needed)<br><br> </p></li> <li><b>Maximum</b> value means that the original size of the widget is set as maximum allowed and can be decreased without breaking the widget's usability and readability if other widgets need more space,</li> <li><p><b>Preferred</b> value means that the original size of the widget is the best and preferred; the widget can be shrunk or expanded however and it will stay readable, <br><img src="img/05_04_09_size_policy_preferred.png"> - <br>Text field and two buttons within a grid tqlayout (<em>Preferred</em> horizontal size policy is set for both buttons)<br><br> + <br>Text field and two buttons within a grid layout (<em>Preferred</em> horizontal size policy is set for both buttons)<br><br> </p></li> <li><b>Expanding</b> value means that the original size of the widget is reasonable but the widget can be also shrunk; it can be expanded as well to take as much space as possible,</li> <li><b>Minimum Expanding</b> value means that the original size of the widget is allowed; it can be expanded to take as much space as possible,</li> @@ -432,7 +432,7 @@ The most frequently used size policies are <em>Preferred</em>, <em>Minimum</em> <a name="widget_adjusting"></a> <H3>5.4.10. Setting widgets size and position by hand</H3> <p> -In case when your form has no main tqlayout set for auto-positioning and auto-resizing its widgets, you will probably want to align widget's position and size so the form can look cleaner and be easier to use. The &kexi; form designer simplifies this task by offering the following groups of commands: +In case when your form has no main layout set for auto-positioning and auto-resizing its widgets, you will probably want to align widget's position and size so the form can look cleaner and be easier to use. The &kexi; form designer simplifies this task by offering the following groups of commands: </p> <ul> <li><p>Adjusting sizes of selected widgets. The commands are available in the <em>Format -> Adjust Widgets Size</em> submenu of the Menubar and in the <em>Adjust Widgets Size</em> submenu of the context menu. Toolbar's drop down button <nobr><img src="icons/aogrid.png" class="icon"> <em>Adjust Widgets Size</em></nobr> is also available. @@ -497,7 +497,7 @@ To change tab order, either: <li>Click a selected widget name on the widgets list and drag it to a desired position (up or down) using the mouse. </li> <li>Click a selected widget name on the widgets list and use <em>Move Up</em> or <em>Move Down</em> buttons, to move the widgets to a desired position.</li> -<li>Click the <em>Handle tab stops automatically</em> check box to set the automatic tab order for the form. If this option has been switched on, any changes made to the list of widgets by hand are not taken into account - &kexi; will be handling the tab orders on its own. The automatic ordering means that the top-left widget will be focused first (or the top-right if your operating system uses right-to-left tqlayout), and the order comes from the left to right (from the right to left, appropriately) and from the top to bottom. +<li>Click the <em>Handle tab stops automatically</em> check box to set the automatic tab order for the form. If this option has been switched on, any changes made to the list of widgets by hand are not taken into account - &kexi; will be handling the tab orders on its own. The automatic ordering means that the top-left widget will be focused first (or the top-right if your operating system uses right-to-left layout), and the order comes from the left to right (from the right to left, appropriately) and from the top to bottom. <br><img src="img/05_04_11_auto_tab_stop.png"> <br>Automatic tab order for a form<br><br> </li> diff --git a/kexi/doc/handbook/translation-status.txt b/kexi/doc/handbook/translation-status.txt index 65aa6008..acc00d00 100644 --- a/kexi/doc/handbook/translation-status.txt +++ b/kexi/doc/handbook/translation-status.txt @@ -72,7 +72,7 @@ DONE 5.4.9. Widget layouts DONE * Springs in widget layouts DONE * Advanced widget layouts DONE * Removing widget layouts -DONE * Size policies for widgets within a tqlayout +DONE * Size policies for widgets within a layout DONE 5.4.10. Setting widgets size and position by hand DONE 5.4.11. Setting the tab order DONE 5.5. Entering data using forms diff --git a/kexi/examples/Simple_Database.kexi.sql b/kexi/examples/Simple_Database.kexi.sql index b7712aa8..7ac415e1 100644 --- a/kexi/examples/Simple_Database.kexi.sql +++ b/kexi/examples/Simple_Database.kexi.sql @@ -83,7 +83,7 @@ INSERT INTO "kexi__objectdata" VALUES(4, '<!DOCTYPE UI> <property name="text" > <string>Name</string> </property> -<property name="tqalignment" > +<property name="alignment" > <set>WordBreak|AlignBottom</set> </property> </widget> @@ -141,7 +141,7 @@ INSERT INTO "kexi__objectdata" VALUES(4, '<!DOCTYPE UI> <property name="text" > <string>Surname</string> </property> -<property name="tqalignment" > +<property name="alignment" > <set>WordBreak|AlignBottom</set> </property> </widget> @@ -157,7 +157,7 @@ INSERT INTO "kexi__objectdata" VALUES(4, '<!DOCTYPE UI> <height>70</height> </rect> </property> -<property name="tqalignment" > +<property name="alignment" > <set>AlignTop|AlignRight</set> </property> <property name="storedPixmapId" > diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp index c9bad809..9f6f4cfd 100644 --- a/kexi/formeditor/commands.cpp +++ b/kexi/formeditor/commands.cpp @@ -19,7 +19,7 @@ */ #include <tqdom.h> #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqsplitter.h> #include <tqmetaobject.h> @@ -127,7 +127,7 @@ PropertyCommand::unexecute() WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(widg); TQWidget *subWidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : widg; - if (-1!=subWidget->tqmetaObject()->findProperty( m_property, true )) + if (-1!=subWidget->metaObject()->findProperty( m_property, true )) subWidget->setProperty(m_property, it.data()); } @@ -139,9 +139,9 @@ TQString PropertyCommand::name() const { if(m_oldvalues.count() >= 2) - return i18n("Change \"%1\" property for multiple widgets" ).tqarg(TQString(m_property)); + return i18n("Change \"%1\" property for multiple widgets" ).arg(TQString(m_property)); else - return i18n("Change \"%1\" property for widget \"%2\"" ).tqarg(TQString(m_property)).tqarg(TQString(m_oldvalues.begin().key())); + return i18n("Change \"%1\" property for widget \"%2\"" ).arg(TQString(m_property)).arg(TQString(m_oldvalues.begin().key())); } void @@ -435,10 +435,10 @@ AdjustSizeCommand::execute() { for(TQWidget *w = list.first(); w; w = list.next()) { ObjectTreeItem *item = m_form->objectTree()->lookup(w->name()); - if(item && !item->tqchildren()->isEmpty()) { // container + if(item && !item->children()->isEmpty()) { // container TQSize s; - if(item->container() && item->container()->tqlayout()) - s = w->tqsizeHint(); + if(item->container() && item->container()->layout()) + s = w->sizeHint(); else s = getSizeFromChildren(item); // minimum size for containers @@ -457,9 +457,9 @@ AdjustSizeCommand::execute() else if(item && item->container()) // empty container w->resize(item->container()->form()->gridSize() * 5, item->container()->form()->gridSize() * 5); // basic size else { - TQSize tqsizeHint(w->tqsizeHint()); - if (tqsizeHint.isValid()) - w->resize(tqsizeHint); + TQSize sizeHint(w->sizeHint()); + if (sizeHint.isValid()) + w->resize(sizeHint); } } break; @@ -545,17 +545,17 @@ AdjustSizeCommand::getSizeFromChildren(ObjectTreeItem *item) { TQSize s; // get size for each container, and keep the biggest one - for(ObjectTreeItem *tree = item->tqchildren()->first(); tree; tree = item->tqchildren()->next()) + for(ObjectTreeItem *tree = item->children()->first(); tree; tree = item->children()->next()) s = s.expandedTo(getSizeFromChildren(tree)); return s; } int tmpw = 0, tmph = 0; - for(ObjectTreeItem *tree = item->tqchildren()->first(); tree; tree = item->tqchildren()->next()) { + for(ObjectTreeItem *tree = item->children()->first(); tree; tree = item->children()->next()) { if(!tree->widget()) continue; - tmpw = TQMAX(tmpw, tree->widget()->tqgeometry().right()); - tmph = TQMAX(tmph, tree->widget()->tqgeometry().bottom()); + tmpw = TQMAX(tmpw, tree->widget()->geometry().right()); + tmph = TQMAX(tmph, tree->widget()->geometry().bottom()); } return TQSize(tmpw, tmph) + TQSize(10, 10); @@ -614,16 +614,16 @@ AdjustSizeCommand::debug() LayoutPropertyCommand::LayoutPropertyCommand(WidgetPropertySet *buf, const TQCString &wname, const TQVariant &oldValue, const TQVariant &value) - : PropertyCommand(buf, wname, oldValue, value, "tqlayout") + : PropertyCommand(buf, wname, oldValue, value, "layout") { m_form = FormManager::self()->activeForm(); ObjectTreeItem* titem = m_form->objectTree()->lookup(wname); if (!titem) return; //better this than a crash Container *m_container = titem->container(); - // We save the tqgeometry of each wigdet - for(ObjectTreeItem *it = m_container->objectTree()->tqchildren()->first(); it; it = m_container->objectTree()->tqchildren()->next()) - m_geometries.insert(it->name().latin1(), it->widget()->tqgeometry()); + // We save the geometry of each wigdet + for(ObjectTreeItem *it = m_container->objectTree()->children()->first(); it; it = m_container->objectTree()->children()->next()) + m_geometries.insert(it->name().latin1(), it->widget()->geometry()); } void @@ -655,7 +655,7 @@ LayoutPropertyCommand::unexecute() TQString LayoutPropertyCommand::name() const { - return i18n("Change tqlayout of widget \"%1\"").tqarg(TQString(m_oldvalues.begin().key())); + return i18n("Change layout of widget \"%1\"").arg(TQString(m_oldvalues.begin().key())); } void @@ -740,7 +740,7 @@ InsertWidgetCommand::execute() WidgetInfo *winfo = m_container->form()->library()->widgetInfoForClassName(m_class); KMessageBox::sorry(FormManager::self()->activeForm() ? FormManager::self()->activeForm()->widget() : 0, i18n("Could not insert widget of type \"%1\". A problem with widget's creation encountered.") - .tqarg(winfo ? winfo->name() : TQString())); + .arg(winfo ? winfo->name() : TQString())); kdWarning() << "InsertWidgetCommand::execute() ERROR: widget creation failed" << endl; return; } @@ -755,7 +755,7 @@ InsertWidgetCommand::execute() // if the insertRect is invalid (ie only one point), we use widget' size hint if(( (m_insertRect.width() < 21) && (m_insertRect.height() < 21))) { - TQSize s = w->tqsizeHint(); + TQSize s = w->sizeHint(); if(s.isEmpty()) s = TQSize(20, 20); // Minimum size to avoid creating a (0,0) widget @@ -802,7 +802,7 @@ InsertWidgetCommand::execute() for(TQValueList<TQCString>::ConstIterator it = list.constBegin(); it != endIt; ++it) item->addModifiedProperty(*it, w->property(*it)); - m_container->reloadLayout(); // reload the tqlayout to take the new wigdet into account + m_container->reloadLayout(); // reload the layout to take the new wigdet into account m_container->setSelectedWidget(w, false); if (m_container->form()->library()->internalProperty(w->className(), @@ -830,7 +830,7 @@ TQString InsertWidgetCommand::name() const { if(!m_name.isEmpty()) - return i18n("Insert widget \"%1\"").tqarg(TQString(m_name)); + return i18n("Insert widget \"%1\"").arg(TQString(m_name)); else return i18n("Insert widget"); } @@ -864,10 +864,10 @@ CreateLayoutCommand::CreateLayoutCommand(int layoutType, WidgetList &list, Form } for(TQWidget *w = list.first(); w; w = list.next()) m_list->append(w); - m_list->sort(); // we sort them now, before creating the tqlayout + m_list->sort(); // we sort them now, before creating the layout for(TQWidget *w = m_list->first(); w; w = m_list->next()) - m_pos.insert(w->name(), w->tqgeometry()); + m_pos.insert(w->name(), w->geometry()); ObjectTreeItem *item = form->objectTree()->lookup(m_list->first()->name()); if(item && item->parent()->container()) m_containername = item->parent()->name(); @@ -911,8 +911,8 @@ CreateLayoutCommand::execute() return; container->setSelectedWidget(0, false); - w->move(m_pos.begin().data().topLeft()); // we move the tqlayout at the position of the topleft widget - // tqsizeHint of these widgets depends on tqgeometry, so give them appropriate tqgeometry + w->move(m_pos.begin().data().topLeft()); // we move the layout at the position of the topleft widget + // sizeHint of these widgets depends on geometry, so give them appropriate geometry if(m_type == Container::HFlow) w->resize( TQSize(700, 20) ); else if(m_type == Container::VFlow) @@ -938,7 +938,7 @@ CreateLayoutCommand::execute() ((TQSplitter*)w)->setOrientation(Qt::Vertical); else if(tree->container()) { tree->container()->setLayout((Container::LayoutType)m_type); - w->resize(tree->container()->tqlayout()->tqsizeHint()); // the tqlayout doesn't have its own size + w->resize(tree->container()->layout()->sizeHint()); // the layout doesn't have its own size } container->setSelectedWidget(w, false); @@ -952,7 +952,7 @@ CreateLayoutCommand::unexecute() if(!parent) parent = m_form->objectTree(); - // We reparent every widget to the Container and take them out of the tqlayout + // We reparent every widget to the Container and take them out of the layout TQMap<TQCString,TQRect>::ConstIterator endIt = m_pos.constEnd(); for(TQMap<TQCString,TQRect>::ConstIterator it = m_pos.constBegin(); it != endIt; ++it) { @@ -973,7 +973,7 @@ CreateLayoutCommand::unexecute() if (!titem) return; //better this than a crash TQWidget *w = titem->widget(); - parent->container()->deleteWidget(w); // delete the tqlayout widget + parent->container()->deleteWidget(w); // delete the layout widget FormManager::self()->windowChanged(m_form->widget()); // to reload ObjectTreeView } @@ -1019,7 +1019,7 @@ BreakLayoutCommand::BreakLayoutCommand(Container *container) m_form = container->form(); m_type = container->layoutType(); - for(ObjectTreeItem *tree = container->objectTree()->tqchildren()->first(); tree; tree = container->objectTree()->tqchildren()->next()) + for(ObjectTreeItem *tree = container->objectTree()->children()->first(); tree; tree = container->objectTree()->children()->next()) { TQRect r(container->widget()->mapTo(container->widget()->parentWidget(), tree->widget()->pos()), tree->widget()->size()); m_pos.insert(tree->widget()->name(), r); @@ -1041,7 +1041,7 @@ BreakLayoutCommand::unexecute() TQString BreakLayoutCommand::name() const { - return i18n("Break Layout: \"%1\"").tqarg(m_name); + return i18n("Break Layout: \"%1\"").arg(m_name); } void @@ -1208,7 +1208,7 @@ PasteWidgetCommand::changePos(TQDomElement &el, const TQPoint &newpos) { //TQDomElement el = widg.cloneNode(true).toElement(); TQDomElement rect; - // Find the widget tqgeometry if there is one + // Find the widget geometry if there is one for(TQDomNode n = el.firstChild(); !n.isNull(); n = n.nextSibling()) { if((n.toElement().tagName() == "property") && (n.toElement().attribute("name") == "geometry")) @@ -1249,13 +1249,13 @@ PasteWidgetCommand::fixPos(TQDomElement &el, Container *container) int rh = h.text().toInt(); TQRect r(rx, ry, rw, rh); - TQWidget *w = m_form->widget()->tqchildAt(r.x() + 6, r.y() + 6, false); + TQWidget *w = m_form->widget()->childAt(r.x() + 6, r.y() + 6, false); if(!w) return; - while((w->tqgeometry() == r) && (w != 0))// there is already a widget there, with the same size + while((w->geometry() == r) && (w != 0))// there is already a widget there, with the same size { - w = m_form->widget()->tqchildAt(w->x() + 16, w->y() + 16, false); + w = m_form->widget()->childAt(w->x() + 16, w->y() + 16, false); r.moveBy(10,10); } @@ -1300,11 +1300,11 @@ PasteWidgetCommand::moveWidgetBy(TQDomElement &el, Container *container, const T TQRect r(rx + p.x(), ry + p.y(), rw, rh); kdDebug() << "Moving widget by " << p << " from " << rx << " " << ry << " to " << r.topLeft() << endl; - TQWidget *w = m_form->widget()->tqchildAt(r.x() + 6, r.y() + 6, false); + TQWidget *w = m_form->widget()->childAt(r.x() + 6, r.y() + 6, false); - while(w && (w->tqgeometry() == r))// there is already a widget there, with the same size + while(w && (w->geometry() == r))// there is already a widget there, with the same size { - w = m_form->widget()->tqchildAt(w->x() + 16, w->y() + 16, false); + w = m_form->widget()->childAt(w->x() + 16, w->y() + 16, false); r.moveBy(10,10); } diff --git a/kexi/formeditor/commands.h b/kexi/formeditor/commands.h index 64e5a253..41da4b60 100644 --- a/kexi/formeditor/commands.h +++ b/kexi/formeditor/commands.h @@ -105,7 +105,7 @@ class KFORMEDITOR_EXPORT GeometryPropertyCommand : public Command /*! This command is used when an item in 'Align Widgets position' is selected. You just need to give the list of widget names (the selected ones), and the - type of tqalignment (see the enum for possible values). */ + type of alignment (see the enum for possible values). */ class KFORMEDITOR_EXPORT AlignWidgetsCommand : public Command { public: @@ -150,7 +150,7 @@ class KFORMEDITOR_EXPORT AdjustSizeCommand : public Command TQMap<TQCString, TQSize> m_sizes; }; -/*! This command is used when switching the tqlayout of a Container. It remembers the old pos +/*! This command is used when switching the layout of a Container. It remembers the old pos of every widget inside the Container. */ class KFORMEDITOR_EXPORT LayoutPropertyCommand : public PropertyCommand { @@ -203,7 +203,7 @@ class KFORMEDITOR_EXPORT InsertWidgetCommand : public Command TQRect m_insertRect; }; -/*! This command is used when creating a tqlayout from some widgets using "Lay out in..." menu item. +/*! This command is used when creating a layout from some widgets using "Lay out in..." menu item. It remembers the old pos of every widget, and takes care of updating ObjectTree too. You need to supply a WidgetList of the selected widgets. */ class KFORMEDITOR_EXPORT CreateLayoutCommand : public Command diff --git a/kexi/formeditor/connectiondialog.cpp b/kexi/formeditor/connectiondialog.cpp index f683ce74..3fe0ac61 100644 --- a/kexi/formeditor/connectiondialog.cpp +++ b/kexi/formeditor/connectiondialog.cpp @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <tqhbox.h> #include <tqlabel.h> #include <tqregexp.h> @@ -51,7 +51,7 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent) , m_buffer(0) { TQFrame *frame = makeMainWidget(); - TQHBoxLayout *tqlayout = new TQHBoxLayout(frame, 0, 6); + TQHBoxLayout *layout = new TQHBoxLayout(frame, 0, 6); // Setup the details widget ///////// TQHBox *details = new TQHBox(frame); @@ -60,10 +60,10 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent) m_pixmapLabel = new TQLabel(details); m_pixmapLabel->setFixedWidth( int(IconSize(KIcon::Desktop) * 1.5) ); - m_pixmapLabel->tqsetAlignment(AlignHCenter | AlignTop); + m_pixmapLabel->setAlignment(AlignHCenter | AlignTop); m_textLabel = new TQLabel(details); - m_textLabel->tqsetAlignment(AlignLeft | AlignTop); + m_textLabel->setAlignment(AlignLeft | AlignTop); //setStatusOk(); // And the KexiTableView //////// @@ -74,21 +74,21 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent) initTable(); m_table->setData(m_data, false); m_table->adjustColumnWidthToContents(0); - tqlayout->addWidget(m_table); + layout->addWidget(m_table); //// Setup the icon toolbar ///////////////// - TQVBoxLayout *vtqlayout = new TQVBoxLayout(tqlayout, 3); + TQVBoxLayout *vlayout = new TQVBoxLayout(layout, 3); KPushButton *newItem = new KPushButton(SmallIconSet("filenew"), i18n("&New Connection"), frame); - vtqlayout->addWidget(newItem); + vlayout->addWidget(newItem); m_buttons.insert(BAdd, newItem); connect(newItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItem())); KPushButton *delItem = new KPushButton(SmallIconSet("editdelete"), i18n("&Remove Connection"), frame); - vtqlayout->addWidget(delItem); + vlayout->addWidget(delItem); m_buttons.insert(BRemove, delItem); connect(delItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeItem())); - vtqlayout->addStretch(); + vlayout->addStretch(); setInitialSize(TQSize(600, 300)); //setWFlags(WDestructiveClose); @@ -289,7 +289,7 @@ ConnectionDialog::updateSlotList(KexiTableItem *item) TQString signalArg(signal); signalArg = signalArg.remove( TQRegExp(".*[(]|[)]") ); - TQStrList slotList = tree->widget()->tqmetaObject()->slotNames(true); + TQStrList slotList = tree->widget()->metaObject()->slotNames(true); TQStrListIterator it(slotList); for(; it.current() != 0; ++it) { @@ -297,7 +297,7 @@ ConnectionDialog::updateSlotList(KexiTableItem *item) TQString slotArg(*it); slotArg = slotArg.remove( TQRegExp(".*[(]|[)]") ); - if(!signalArg.tqstartsWith(slotArg, true) && (!signal.isEmpty())) // args not compatible + if(!signalArg.startsWith(slotArg, true) && (!signal.isEmpty())) // args not compatible continue; KexiTableItem *item = m_slotsColumnData->createItem(); //new KexiTableItem(2); @@ -315,7 +315,7 @@ ConnectionDialog::updateSignalList(KexiTableItem *item) return; m_signalsColumnData->deleteAllRows(); - TQStrList signalList = tree->widget()->tqmetaObject()->signalNames(true); + TQStrList signalList = tree->widget()->metaObject()->signalNames(true); TQStrListIterator it(signalList); for(; it.current() != 0; ++it) { @@ -334,7 +334,7 @@ ConnectionDialog::checkConnection(KexiTableItem *item) { if( !item || (*item)[i].toString().isEmpty()) { - setStatusError( i18n("<qt>You have not selected item: <b>%1</b>.</qt>").tqarg(m_data->column(i)->captionAliasOrName()), + setStatusError( i18n("<qt>You have not selected item: <b>%1</b>.</qt>").arg(m_data->column(i)->captionAliasOrName()), item); return; } @@ -346,7 +346,7 @@ ConnectionDialog::checkConnection(KexiTableItem *item) TQString slot = (*item)[4].toString(); slot = slot.remove( TQRegExp(".*[(]|[)]") ); - if(!signal.tqstartsWith(slot, true)) + if(!signal.startsWith(slot, true)) { setStatusError( i18n("The signal/slot arguments are not compatible."), item); return; diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp index d1275adc..366f6a6d 100644 --- a/kexi/formeditor/container.cpp +++ b/kexi/formeditor/container.cpp @@ -23,7 +23,7 @@ #include <tqrect.h> #include <tqevent.h> #include <tqvaluevector.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcursor.h> #include <kdebug.h> @@ -73,7 +73,7 @@ EventEater::eventFilter(TQObject *, TQEvent *ev) } } // else if(ev->type() == TQEvent::ChildInserted) { - // widget's tqchildren have changed, we need to reinstall filter + // widget's children have changed, we need to reinstall filter // installRecursiveEventFilter(m_widget, this); // } @@ -180,7 +180,7 @@ Container::eventFilter(TQObject *s, TQEvent *e) unSelectWidget(m_moving); else // the widget is the only selected, so it means we want to copy it { - //m_copyRect = m_moving->tqgeometry(); + //m_copyRect = m_moving->geometry(); m_state = CopyingWidget; if(m_form->formWidget()) m_form->formWidget()->initBuffer(); @@ -333,7 +333,7 @@ Container::eventFilter(TQObject *s, TQEvent *e) return false; } - case TQEvent::Resize: // we are resizing a widget, so we set m_move to true -> the tqlayout will be reloaded when releasing mouse + case TQEvent::Resize: // we are resizing a widget, so we set m_move to true -> the layout will be reloaded when releasing mouse { if(m_form->interactiveMode()) m_state = MovingWidget; @@ -408,7 +408,7 @@ Container::eventFilter(TQObject *s, TQEvent *e) ObjectTreeItem *item = form()->objectTree()->lookup(form()->selectedWidgets()->first()->name()); if(!item || !item->parent()) return true; - ObjectTreeList *list = item->parent()->tqchildren(); + ObjectTreeList *list = item->parent()->children(); if(list->count() == 1) return true; int index = list->findRef(item); @@ -525,7 +525,7 @@ Container::handleMouseReleaseEvent(TQObject *s, TQMouseEvent *mev) //m_initialPos = TQPoint(); } - else if(m_state == MovingWidget) // one widget has been moved, so we need to update the tqlayout + else if(m_state == MovingWidget) // one widget has been moved, so we need to update the layout reloadLayout(); // cancel copying as user released Ctrl before releasing mouse button @@ -639,7 +639,7 @@ Container::setLayout(LayoutType type) return; } } - m_container->setGeometry(m_container->tqgeometry()); // just update tqlayout + m_container->setGeometry(m_container->geometry()); // just update layout m_layout->activate(); } @@ -654,14 +654,14 @@ Container::reloadLayout() void Container::createBoxLayout(WidgetList *list) { - TQBoxLayout *tqlayout = static_cast<TQBoxLayout*>(m_layout); + TQBoxLayout *layout = static_cast<TQBoxLayout*>(m_layout); - for(ObjectTreeItem *tree = m_tree->tqchildren()->first(); tree; tree = m_tree->tqchildren()->next()) + for(ObjectTreeItem *tree = m_tree->children()->first(); tree; tree = m_tree->children()->next()) list->append( tree->widget()); list->sort(); for(TQWidget *obj = list->first(); obj; obj = list->next()) - tqlayout->addWidget(obj); + layout->addWidget(obj); delete list; } @@ -669,7 +669,7 @@ void Container::createFlowLayout() { KexiFlowLayout *flow = dynamic_cast<KexiFlowLayout*>(m_layout); - if(!flow || m_tree->tqchildren()->isEmpty()) + if(!flow || m_tree->children()->isEmpty()) return; const int offset = 15; @@ -684,7 +684,7 @@ Container::createFlowLayout() } // fill the list - for(ObjectTreeItem *tree = m_tree->tqchildren()->first(); tree; tree = m_tree->tqchildren()->next()) + for(ObjectTreeItem *tree = m_tree->children()->first(); tree; tree = m_tree->children()->next()) list->append( tree->widget()); list->sort(); @@ -741,11 +741,11 @@ Container::createGridLayout(bool testOnly) int end=-1000; bool same = false; - for(ObjectTreeItem *tree = m_tree->tqchildren()->first(); tree; tree = m_tree->tqchildren()->next()) + for(ObjectTreeItem *tree = m_tree->children()->first(); tree; tree = m_tree->children()->next()) vlist->append( tree->widget()); vlist->sort(); - for(ObjectTreeItem *tree = m_tree->tqchildren()->first(); tree; tree = m_tree->tqchildren()->next()) + for(ObjectTreeItem *tree = m_tree->children()->first(); tree; tree = m_tree->children()->next()) hlist->append( tree->widget()); hlist->sort(); @@ -759,30 +759,30 @@ Container::createGridLayout(bool testOnly) for(; it2.current() != 0; ++it2) { TQWidget *nextw = it2.current(); - if((w->y() >= nextw->y()) || (nextw->y() >= w->tqgeometry().bottom())) + if((w->y() >= nextw->y()) || (nextw->y() >= w->geometry().bottom())) break; - if(!w->tqgeometry().intersects(nextw->tqgeometry())) + if(!w->geometry().intersects(nextw->geometry())) break; // If the geometries of the two widgets intersect each other, // we move one of the widget to the rght or bottom of the other if((nextw->y() - w->y()) > abs(nextw->x() - w->x())) - nextw->move(nextw->x(), w->tqgeometry().bottom()+1); + nextw->move(nextw->x(), w->geometry().bottom()+1); else if(nextw->x() >= w->x()) - nextw->move(w->tqgeometry().right()+1, nextw->y()); + nextw->move(w->geometry().right()+1, nextw->y()); else - w->move(nextw->tqgeometry().right()+1, nextw->y()); + w->move(nextw->geometry().right()+1, nextw->y()); } } } - // Then we count the number of rows in the tqlayout, and set their beginnings + // Then we count the number of rows in the layout, and set their beginnings for(WidgetListIterator it(*vlist); it.current() != 0; ++it) { TQWidget *w = it.current(); WidgetListIterator it2 = it; if(!same) { // this widget will make a new row - end = w->tqgeometry().bottom(); + end = w->geometry().bottom(); rows.append(w->y()); } @@ -796,9 +796,9 @@ Container::createGridLayout(bool testOnly) if(nextw->y() >= end) same = false; else { - same = !(same && (nextw->y() >= w->tqgeometry().bottom())); + same = !(same && (nextw->y() >= w->geometry().bottom())); if(!same) - end = w->tqgeometry().bottom(); + end = w->geometry().bottom(); } } kdDebug() << "the new grid will have n rows: n == " << rows.size() << endl; @@ -811,7 +811,7 @@ Container::createGridLayout(bool testOnly) TQWidget *w = it.current(); WidgetListIterator it2 = it; if(!same) { - end = w->tqgeometry().right(); + end = w->geometry().right(); cols.append(w->x()); } @@ -823,25 +823,25 @@ Container::createGridLayout(bool testOnly) if(nextw->x() >= end) same = false; else { - same = !(same && (nextw->x() >= w->tqgeometry().right())); + same = !(same && (nextw->x() >= w->geometry().right())); if(!same) - end = w->tqgeometry().right(); + end = w->geometry().right(); } } kdDebug() << "the new grid will have n columns: n == " << cols.size() << endl; - // We create the tqlayout .. - TQGridLayout *tqlayout=0; + // We create the layout .. + TQGridLayout *layout=0; if(!testOnly) { - tqlayout = new TQGridLayout(m_container, rows.size(), cols.size(), m_margin, m_spacing, "grid"); - m_layout = (TQLayout*)tqlayout; + layout = new TQGridLayout(m_container, rows.size(), cols.size(), m_margin, m_spacing, "grid"); + m_layout = (TQLayout*)layout; } // .. and we fill it with widgets for(WidgetListIterator it(*vlist); it.current() != 0; ++it) { TQWidget *w = it.current(); - TQRect r = w->tqgeometry(); + TQRect r = w->geometry(); uint wcol=0, wrow=0, endrow=0, endcol=0; uint i = 0; @@ -901,14 +901,14 @@ Container::createGridLayout(bool testOnly) ObjectTreeItem *item = m_form->objectTree()->lookup(w->name()); if(!endrow && !endcol) { if(!testOnly) - tqlayout->addWidget(w, wrow, wcol); + layout->addWidget(w, wrow, wcol); item->setGridPos(wrow, wcol, 0, 0); } else { if(!endcol) endcol = wcol; if(!endrow) endrow = wrow; if(!testOnly) - tqlayout->addMultiCellWidget(w, wrow, endrow, wcol, endcol); + layout->addMultiCellWidget(w, wrow, endrow, wcol, endcol); item->setGridPos(wrow, wcol, endrow-wrow+1, endcol-wcol+1); } } @@ -971,7 +971,7 @@ Container::drawConnection(TQMouseEvent *mev) { FormManager::self()->createdConnection()->setReceiver(m_moving->name()); FormManager::self()->createSlotMenu(m_moving); - m_container->tqrepaint(); + m_container->repaint(); return; } // the user clicked outside the menu, we cancel the connection @@ -997,12 +997,12 @@ Container::drawSelectionRect(TQMouseEvent *mev) setSelectedWidget(m_container, false); TQWidget *widgetToSelect = 0; // We check which widgets are in the rect and select them - for(ObjectTreeItem *item = m_tree->tqchildren()->first(); item; item = m_tree->tqchildren()->next()) + for(ObjectTreeItem *item = m_tree->children()->first(); item; item = m_tree->children()->next()) { TQWidget *w = item->widget(); if(!w) continue; - if(w->tqgeometry().intersects(r) && w != m_container) { + if(w->geometry().intersects(r) && w != m_container) { if (widgetToSelect) setSelectedWidget(widgetToSelect, true/*add*/, false/*raise*/, true/*moreWillBeSelected*/); widgetToSelect = w; //select later @@ -1013,7 +1013,7 @@ Container::drawSelectionRect(TQMouseEvent *mev) m_insertRect = TQRect(); m_state = DoingNothing; - m_container->tqrepaint(); + m_container->repaint(); } void @@ -1070,7 +1070,7 @@ Container::drawCopiedWidgetRect(TQMouseEvent *mev) //FormManager::self()->undo(); // undo last moving //m_moving->move(m_initialPos); if(m_form->formWidget()) { - m_container->tqrepaint(); + m_container->repaint(); m_form->formWidget()->initBuffer(); } m_state = CopyingWidget; @@ -1081,7 +1081,7 @@ Container::drawCopiedWidgetRect(TQMouseEvent *mev) if(m_form->formWidget()) { TQValueList<TQRect> rectList; for(TQWidget *w = m_form->selectedWidgets()->first(); w; w = m_form->selectedWidgets()->next()) { - TQRect drawRect = w->tqgeometry(); + TQRect drawRect = w->geometry(); TQPoint p = mev->pos() - m_grab; drawRect.moveBy(p.x(), p.y()); p = m_container->mapTo(m_form->widget(), TQPoint(0, 0)); diff --git a/kexi/formeditor/container.h b/kexi/formeditor/container.h index 36f35e82..bd46c7a1 100644 --- a/kexi/formeditor/container.h +++ b/kexi/formeditor/container.h @@ -104,9 +104,9 @@ class KFORMEDITOR_EXPORT Container : public TQObject void setObjectTree(ObjectTreeItem *t) { m_tree = t; } //! \return a pointer to the TQLayout of this Container, or 0 if there is not. - TQLayout* tqlayout() const { return m_layout; } + TQLayout* layout() const { return m_layout; } - //! \return the type of the tqlayout associated to this Container's widget (see LayoutType enum). + //! \return the type of the layout associated to this Container's widget (see LayoutType enum). LayoutType layoutType() const { return m_layType; } //! \return the margin of this Container. @@ -115,8 +115,8 @@ class KFORMEDITOR_EXPORT Container : public TQObject //! \return the spacing of this Container. int layoutSpacing() { return m_spacing; } - /*! Sets this Container to use \a type of tqlayout. The widget are inserted - automatically in the tqlayout following their positions. + /*! Sets this Container to use \a type of layout. The widget are inserted + automatically in the layout following their positions. \sa createBoxLayout(), createGridLayout() */ void setLayout(LayoutType type); @@ -129,7 +129,7 @@ class KFORMEDITOR_EXPORT Container : public TQObject //! \return the string representing the layoutType \a type. static TQString layoutTypeToString(int type); - //! \return the LayoutType (an int) for a given tqlayout name. + //! \return the LayoutType (an int) for a given layout name. static LayoutType stringToLayoutType(const TQString &name); /*! Stops the inline editing of the current widget (as when you click @@ -161,8 +161,8 @@ class KFORMEDITOR_EXPORT Container : public TQObject to Container's widget. */ void deleteWidget(TQWidget *w); - /*! Recreates the Container tqlayout. Calls this when a widget has been moved - or added to update the tqlayout. */ + /*! Recreates the Container layout. Calls this when a widget has been moved + or added to update the layout. */ void reloadLayout(); protected slots: @@ -178,7 +178,7 @@ class KFORMEDITOR_EXPORT Container : public TQObject /*! Internal function to create a KexiFlowLayout. */ void createFlowLayout(); - /*! Internal function to create a GridLayout. if \a testOnly is true, the tqlayout + /*! Internal function to create a GridLayout. if \a testOnly is true, the layout is simulated, and only the widget's grid info aris filled. */ void createGridLayout(bool testOnly=false); diff --git a/kexi/formeditor/editlistviewdialog.cpp b/kexi/formeditor/editlistviewdialog.cpp index d073b43d..5bfdfbfe 100644 --- a/kexi/formeditor/editlistviewdialog.cpp +++ b/kexi/formeditor/editlistviewdialog.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ #include <tqheader.h> -#include <tqlayout.h> +#include <layout.h> #include <klistview.h> #include <ktabwidget.h> @@ -46,45 +46,45 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent) m_contents = addPage(i18n("Contents")); ///////// Setup the "Contents" page ///////////////////////////// - TQHBoxLayout *tqlayout = new TQHBoxLayout(m_contents, 0, 6); + TQHBoxLayout *layout = new TQHBoxLayout(m_contents, 0, 6); //// Setup the icon toolbar ///////////////// - TQVBoxLayout *vtqlayout = new TQVBoxLayout(tqlayout, 3); + TQVBoxLayout *vlayout = new TQVBoxLayout(layout, 3); TQToolButton *newRow = new TQToolButton(m_contents); newRow->setIconSet(BarIconSet("edit_add")); newRow->setTextLabel(i18n("&Add Item"), true); - vtqlayout->addWidget(newRow); + vlayout->addWidget(newRow); m_buttons.insert(BNewRow, newRow); connect(newRow, TQT_SIGNAL(clicked()), this, TQT_SLOT(newRow())); TQToolButton *newChild = new TQToolButton(m_contents); newChild->setIconSet(BarIconSet("1rightarrow")); newChild->setTextLabel(i18n("New &Subitem"), true); - vtqlayout->addWidget(newChild); + vlayout->addWidget(newChild); m_buttons.insert(BNewChild, newChild); connect(newChild, TQT_SIGNAL(clicked()), this, TQT_SLOT(newChildRow())); TQToolButton *delRow = new TQToolButton(m_contents); delRow->setIconSet(BarIconSet("edit_remove")); delRow->setTextLabel(i18n("&Remove Item"), true); - vtqlayout->addWidget(delRow); + vlayout->addWidget(delRow); m_buttons.insert(BRemRow, delRow); connect(delRow, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeRow())); TQToolButton *rowUp = new TQToolButton(m_contents); rowUp->setIconSet(BarIconSet("1uparrow")); rowUp->setTextLabel(i18n("Move Item &Up"), true); - vtqlayout->addWidget(rowUp); + vlayout->addWidget(rowUp); m_buttons.insert(BRowUp, rowUp); connect(rowUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(MoveRowUp())); TQToolButton *rowDown = new TQToolButton(m_contents); rowDown->setIconSet(BarIconSet("1downarrow")); rowDown->setTextLabel(i18n("Move Item &Down"), true); - vtqlayout->addWidget(rowDown); + vlayout->addWidget(rowDown); m_buttons.insert(BRowDown, rowDown); connect(rowDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(MoveRowDown())); - vtqlayout->addStretch(); + vlayout->addStretch(); //// The listview /////////// m_listview = new KListView(m_contents, "editlistview_listview"); @@ -96,7 +96,7 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent) m_listview->setDropVisualizer(true); m_listview->setAcceptDrops(true); m_listview->setSorting(-1); - tqlayout->addWidget(m_listview); + layout->addWidget(m_listview); m_listview->setFocus(); connect(m_listview, TQT_SIGNAL(currentChanged(TQListViewItem*)), this, TQT_SLOT(updateButtons(TQListViewItem*))); connect(m_listview, TQT_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(updateButtons(TQListViewItem*))); diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp index acc72c24..c1056b3b 100644 --- a/kexi/formeditor/factories/containerfactory.cpp +++ b/kexi/formeditor/factories/containerfactory.cpp @@ -36,7 +36,7 @@ #include <tqscrollview.h> #include <tqtabbar.h> #include <tqsplitter.h> -#include <tqlayout.h> +#include <layout.h> #include <kiconloader.h> #include <kgenericfactory.h> @@ -73,7 +73,7 @@ ContainerWidget::~ContainerWidget() { } -TQSize ContainerWidget::tqsizeHint() const +TQSize ContainerWidget::sizeHint() const { return TQSize(30,30); //default } @@ -125,7 +125,7 @@ KFDTabWidget::~KFDTabWidget() } TQSize -KFDTabWidget::tqsizeHint() const +KFDTabWidget::sizeHint() const { TQSize s(30,30); // default min size for(int i=0; i < count(); i++) @@ -150,7 +150,7 @@ void KFDTabWidget::dropEvent( TQDropEvent *e ) emit handleDropEvent(e); } -/// Various tqlayout widgets /////////////////: +/// Various layout widgets /////////////////: HBox::HBox(TQWidget *parent, const char *name) : TQFrame(parent, name), m_preview(false) @@ -218,10 +218,10 @@ VFlow::paintEvent(TQPaintEvent *) } TQSize -VFlow::tqsizeHint() const +VFlow::sizeHint() const { - if(tqlayout()) - return tqlayout()->tqsizeHint(); + if(layout()) + return layout()->sizeHint(); else return TQSize(700, 50); // default } @@ -256,7 +256,7 @@ InsertPageCommand::execute() if(classname == "KFDTabWidget") { TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(parent); - TQString n = i18n("Page %1").tqarg(tab->count() + 1); + TQString n = i18n("Page %1").arg(tab->count() + 1); tab->addTab(page, n); tab->showPage(page); @@ -318,7 +318,7 @@ SubForm::SubForm(TQWidget *parent, const char *name) : TQScrollView(parent, name), m_form(0), m_widget(0) { setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); - viewport()->setPaletteBackgroundColor(tqcolorGroup().mid()); + viewport()->setPaletteBackgroundColor(colorGroup().mid()); } void @@ -455,7 +455,7 @@ ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStrin wSplitter->setName(i18n("Splitter")); wSplitter->setNamePrefix( i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "splitter")); - wSplitter->setDescription(i18n("A container that enables user to resize its tqchildren")); + wSplitter->setDescription(i18n("A container that enables user to resize its children")); addClass(wSplitter); KFormDesigner::WidgetInfo *wHFlow = new KFormDesigner::WidgetInfo(this); @@ -682,7 +682,7 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP int id = menu->insertItem(SmallIconSet("tab_new"), i18n("Add Page"), this, TQT_SLOT(addStackPage()) ); id = menu->insertItem(SmallIconSet("tab_remove"), i18n("Remove Page"), this, TQT_SLOT(removeStackPage()) ); -// if( ((TQWidgetStack*)m_widget)->tqchildren()->count() == 4) // == the stack has only one page +// if( ((TQWidgetStack*)m_widget)->children()->count() == 4) // == the stack has only one page if(stack->childrenListObject().count() == 4) // == the stack has only one page menu->setItemEnabled(id, false); @@ -860,7 +860,7 @@ void ContainerFactory::renameTabPage() #if TDE_VERSION < KDE_MAKE_VERSION(3,1,9) TQLineEdit::Normal, #endif - tab->tabLabel(w), &ok, w->tqtopLevelWidget()); + tab->tabLabel(w), &ok, w->topLevelWidget()); if(ok) tab->changeTab(w, name); } @@ -872,8 +872,8 @@ void ContainerFactory::reorderTabs(int oldpos, int newpos) if(!tab) return; - KFormDesigner::ObjectTreeItem *item = tab->tqchildren()->take(oldpos); - tab->tqchildren()->insert(newpos, item); + KFormDesigner::ObjectTreeItem *item = tab->children()->take(oldpos); + tab->children()->insert(newpos, item); } void ContainerFactory::addStackPage() diff --git a/kexi/formeditor/factories/containerfactory.h b/kexi/formeditor/factories/containerfactory.h index b88b437f..6f013e9c 100644 --- a/kexi/formeditor/factories/containerfactory.h +++ b/kexi/formeditor/factories/containerfactory.h @@ -126,7 +126,7 @@ class KFORMEDITOR_EXPORT VFlow : public TQFrame virtual ~VFlow(){;} void setPreviewMode() {m_preview = true;} virtual void paintEvent(TQPaintEvent *ev); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; protected: bool m_preview; @@ -144,7 +144,7 @@ class KFORMEDITOR_EXPORT ContainerWidget : public TQWidget ContainerWidget(TQWidget *parent, const char *name); virtual ~ContainerWidget(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; //! Used to emit handleDragMoveEvent() signal needed to control dragging over the container's surface virtual void dragMoveEvent( TQDragMoveEvent *e ); @@ -170,7 +170,7 @@ class KFORMEDITOR_EXPORT KFDTabWidget : public KFormDesigner::TabWidget KFDTabWidget(TQWidget *parent, const char *name); virtual ~KFDTabWidget(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; //! Used to emit handleDragMoveEvent() signal needed to control dragging over the container's surface virtual void dragMoveEvent( TQDragMoveEvent *e ); diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp index 24827e13..2607fcca 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.cpp +++ b/kexi/formeditor/factories/stdwidgetfactory.cpp @@ -431,13 +431,13 @@ StdWidgetFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, w = new KProgress(p, n); else if(c == "KDateWidget") - w = new KDateWidget(TQDate::tqcurrentDate(), p, n); + w = new KDateWidget(TQDate::currentDate(), p, n); else if(c == "KTimeWidget") w = new KTimeWidget(TQTime::currentTime(), p, n); else if(c == "KDateTimeWidget") - w = new KDateTimeWidget(TQDateTime::tqcurrentDateTime(), p, n); + w = new KDateTimeWidget(TQDateTime::currentDateTime(), p, n); else if(c == "Line") w = new Line(options & WidgetFactory::VerticalOrientation ? Qt::Vertical : Qt::Horizontal, p, n); @@ -492,7 +492,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes if(classname == "KLineEdit") { KLineEdit *lineedit = static_cast<KLineEdit*>(w); - createEditor(classname, lineedit->text(), lineedit, container, lineedit->tqgeometry(), lineedit->tqalignment(), true); + createEditor(classname, lineedit->text(), lineedit, container, lineedit->geometry(), lineedit->alignment(), true); return true; } else if(classname == TQLABEL_OBJECT_NAME_STRING) @@ -505,7 +505,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes editText(); } else - createEditor(classname, label->text(), label, container, label->tqgeometry(), label->tqalignment()); + createEditor(classname, label->text(), label, container, label->geometry(), label->alignment()); return true; } else if(classname == "KPushButton") @@ -531,7 +531,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes else if(classname == TQCHECKBOX_OBJECT_NAME_STRING) { TQCheckBox *check = static_cast<TQCheckBox*>(w); - //TQRect r(check->tqgeometry()); + //TQRect r(check->geometry()); //r.setX(r.x() + 20); TQRect r = w->tqstyle().subRect(TQStyle::SR_CheckBoxContents, w); TQRect editorRect = TQRect(check->x() + r.x(), check->y() + r.y(), r.width(), r.height()); @@ -605,13 +605,13 @@ StdWidgetFactory::changeText(const TQString &text) else changeProperty("text", text, m_container->form()); - /* By-hand method not needed as tqsizeHint() can do that for us + /* By-hand method not needed as sizeHint() can do that for us TQFontMetrics fm = w->fontMetrics(); TQSize s(fm.width( text ), fm.height()); int width; if(n == TQLABEL_OBJECT_NAME_STRING) // labels are resized to fit the text { - w->resize(w->tqsizeHint()); + w->resize(w->sizeHint()); WidgetFactory::m_editor->resize(w->size()); return; } @@ -624,7 +624,7 @@ StdWidgetFactory::changeText(const TQString &text) width = w->style().sizeFromContents( TQStyle::CT_RadioButton, w, s).width(); else return; - int width = w->tqsizeHint().width();*/ + int width = w->sizeHint().width();*/ #if 0 //not needed here, size hint is used on creation in InsertWidgetCommand::execute() if(w->width() < width) @@ -860,7 +860,7 @@ StdWidgetFactory::isPropertyVisibleInternal(const TQCString &classname, } else if(classname == "KexiPictureLabel") { - if((property == "text") || (property == "indent") || (property == "textFormat") || (property == "font") || (property == "tqalignment")) + if((property == "text") || (property == "indent") || (property == "textFormat") || (property == "font") || (property == "alignment")) return false; } else if(classname == TQLABEL_OBJECT_NAME_STRING) @@ -956,7 +956,7 @@ StdWidgetFactory::editText() } if(classname == TQLABEL_OBJECT_NAME_STRING) - widget()->resize(widget()->tqsizeHint()); + widget()->resize(widget()->sizeHint()); } void diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp index b5b20936..52d44966 100644 --- a/kexi/formeditor/form.cpp +++ b/kexi/formeditor/form.cpp @@ -364,10 +364,10 @@ Form::changeName(const TQCString &oldname, const TQCString &newname) return; if(!d->topTree->rename(oldname, newname)) // rename failed { - KMessageBox::sorry(widget()->tqtopLevelWidget(), - i18n("Renaming widget \"%1\" to \"%2\" failed.").tqarg(TQString(oldname)).tqarg(TQString(newname))); + KMessageBox::sorry(widget()->topLevelWidget(), + i18n("Renaming widget \"%1\" to \"%2\" failed.").arg(TQString(oldname)).arg(TQString(newname))); //moved to WidgetPropertySet::slotChangeProperty() -// KMessageBox::sorry(widget()->tqtopLevelWidget(), +// KMessageBox::sorry(widget()->topLevelWidget(), // i18n("A widget with this name already exists. " // "Please choose another name or rename existing widget.")); kdDebug() << "Form::changeName() : ERROR : A widget named " << newname << " already exists" << endl; @@ -499,7 +499,7 @@ void collectContainers(ObjectTreeItem* item, TQPtrDict<char>& containers) << " " << item->container()->objectTree()->name() << endl; containers.insert( item->container(), (const char *)1 ); } - for (ObjectTreeListIterator it(*item->tqchildren()); it.current(); ++it) + for (ObjectTreeListIterator it(*item->children()); it.current(); ++it) collectContainers(it.current(), containers); } @@ -528,7 +528,7 @@ Form::autoAssignTabStops() d->tabstops.clear(); /// We automatically sort widget from the top-left to bottom-right corner - //! \todo Handle RTL tqlayout (ie from top-right to bottom-left) + //! \todo Handle RTL layout (ie from top-right to bottom-left) foreach_list(WidgetListIterator, it, list) { TQWidget *w = it.current(); hlist.append(w); diff --git a/kexi/formeditor/form.h b/kexi/formeditor/form.h index 7df731c6..a8bd6dc0 100644 --- a/kexi/formeditor/form.h +++ b/kexi/formeditor/form.h @@ -67,7 +67,7 @@ class KFORMEDITOR_EXPORT FormWidget /*! This function inits the buffer used for double-buffering. Called before drawing rect. */ virtual void initBuffer() = 0; - /*! Clears the form, ie pastes the whole buffer to tqrepaint the Form. */ + /*! Clears the form, ie pastes the whole buffer to repaint the Form. */ virtual void clearForm() = 0; /*! This function highlights two widgets (to is optional), which are @@ -109,7 +109,7 @@ class FormPrivate PixmapCollection *pixcollection; - //! This map is used to store cursor tqshapes before inserting (so we can restore them later) + //! This map is used to store cursor shapes before inserting (so we can restore them later) TQMap<TQObject*,TQCursor> cursors; //!This string list is used to store the widgets which hasMouseTracking() == true (eg lineedits) @@ -231,10 +231,10 @@ class KFORMEDITOR_EXPORT Form : public TQObject //! @todo make gridSize configurable at global level int gridSize() { return 10; } - //! \return the default margin for all the tqlayout inside this Form. + //! \return the default margin for all the layout inside this Form. int defaultMargin() { return 11;} - //! \return the default spacing for all the tqlayout inside this Form. + //! \return the default spacing for all the layout inside this Form. int defaultSpacing() { return 6;} /*! This function is used by ObjectTree to emit childAdded() signal (as it is not a TQObject). */ @@ -285,7 +285,7 @@ class KFORMEDITOR_EXPORT Form : public TQObject (which are by default in order of creation).*/ void setAutoTabStops(bool autoTab) { d->autoTabstops = autoTab;} - /*! Tells the Form to reassign the tab stops because the widget tqlayout has changed + /*! Tells the Form to reassign the tab stops because the widget layout has changed (called for example before saving or displaying the tab order dialog). Automatically sorts widget from the top-left to bottom-right corner. Widget can be grouped with containers. In paticular, for tab widgets, diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp index 2759fe98..23c67fb4 100644 --- a/kexi/formeditor/formIO.cpp +++ b/kexi/formeditor/formIO.cpp @@ -23,11 +23,11 @@ #include <tqmetaobject.h> #include <tqdom.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqcursor.h> #include <tqbuffer.h> #include <tqimage.h> -#include <tqlayout.h> +#include <layout.h> #include <tqobjectlist.h> #include <tqdatetime.h> #include <tqlabel.h> @@ -66,7 +66,7 @@ void CustomWidget::paintEvent(TQPaintEvent *) { TQPainter p(this); - p.setPen(tqpalette().active().text()); + p.setPen(palette().active().text()); TQRect r(rect()); r.setX(r.x()+2); p.drawText(r, TQt::AlignTop, m_className); @@ -406,10 +406,10 @@ FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &parent, const WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(w); TQWidget *subwidget = w; bool addSubwidgetFlag = false; - int propertyId = w->tqmetaObject()->findProperty(name, true); + int propertyId = w->metaObject()->findProperty(name, true); if (propertyId == -1 && subpropIface && subpropIface->subwidget()) { // try property from subwidget subwidget = subpropIface->subwidget(); - propertyId = subpropIface->subwidget()->tqmetaObject()->findProperty(name, true); + propertyId = subpropIface->subwidget()->metaObject()->findProperty(name, true); addSubwidgetFlag = true; } if(propertyId == -1) @@ -420,7 +420,7 @@ FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &parent, const return; } - const TQMetaProperty *meta = subwidget->tqmetaObject()->property(propertyId, true); + const TQMetaProperty *meta = subwidget->metaObject()->property(propertyId, true); if (!meta->stored( subwidget )) //not storable return; TQDomElement propertyE = parent.createElement("property"); @@ -621,7 +621,7 @@ FormIO::writeVariant(TQDomDocument &parent, TQDomElement &parentNode, TQVariant case TQVariant::Cursor: { type = parent.createElement("cursor"); - valueE = parent.createTextNode(TQString::number(value.toCursor().tqshape())); + valueE = parent.createTextNode(TQString::number(value.toCursor().shape())); type.appendChild(valueE); break; } @@ -880,8 +880,8 @@ FormIO::readPropertyValue(TQDomNode node, TQObject *obj, const TQString &name) { WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(obj); TQObject *subobject = (subpropIface && subpropIface->subwidget()) ? TQT_TQOBJECT(subpropIface->subwidget()) : obj; - const int count = subobject->tqmetaObject()->findProperty(name.latin1(), true); - const TQMetaProperty *meta = count!=-1 ? subobject->tqmetaObject()->property(count, true) : 0; + const int count = subobject->metaObject()->findProperty(name.latin1(), true); + const TQMetaProperty *meta = count!=-1 ? subobject->metaObject()->property(count, true) : 0; if (meta) { if (meta->isSetType()) { @@ -964,14 +964,14 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do savePropertyValue(tclass, domDoc, "name", item->widget()->property("name"), item->widget()); - // Important: save dataSource property FIRST before properties like "tqalignment" + // Important: save dataSource property FIRST before properties like "alignment" // - needed when subproperties are defined after subwidget creation, and subwidget is created after setting "dataSource" // (this is the case for KexiDBAutoField) //! @todo more properties like "dataSource" may needed here... -// if (-1 != item->widget()->tqmetaObject()->findProperty("dataSource")) +// if (-1 != item->widget()->metaObject()->findProperty("dataSource")) // savePropertyValue(tclass, domDoc, "dataSource", item->widget()->property("dataSource"), item->widget()); - // We don't want to save the tqgeometry if the widget is inside a tqlayout (so parent.tagName() == "grid" for example) + // We don't want to save the geometry if the widget is inside a layout (so parent.tagName() == "grid" for example) if(item && !item->parent()) { // save form widget size, but not its position savePropertyValue(tclass, domDoc, "geometry", @@ -992,14 +992,14 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do for(TQMap<TQString,TQVariant>::ConstIterator it = map->constBegin(); it != endIt; ++it) { const TQCString name( it.key().latin1() ); - if(name == "hAlign" || name == "vAlign" || name == "wordbreak" || name == "tqalignment") { + if(name == "hAlign" || name == "vAlign" || name == "wordbreak" || name == "alignment") { if(!savedAlignment) // not to save it twice { - savePropertyValue(tclass, domDoc, "tqalignment", item->widget()->property("tqalignment"), item->widget()); + savePropertyValue(tclass, domDoc, "alignment", item->widget()->property("alignment"), item->widget()); savedAlignment = true; } } - else if(name == "name" || name == "geometry" || name == "tqlayout") { + else if(name == "name" || name == "geometry" || name == "layout") { // these have already been saved } else { @@ -1017,80 +1017,80 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do } } - // Saving container 's tqlayout if there is one - TQDomElement tqlayout; + // Saving container 's layout if there is one + TQDomElement layout; if(item->container() && item->container()->layoutType() != Container::NoLayout) { - if(item->container()->tqlayout()) // there is a tqlayout + if(item->container()->layout()) // there is a layout { - tqlayout = domDoc.createElement("temp"); - savePropertyValue(tqlayout, domDoc, "name", "unnamed", item->widget()); + layout = domDoc.createElement("temp"); + savePropertyValue(layout, domDoc, "name", "unnamed", item->widget()); if(item->modifiedProperties()->contains("layoutMargin")) - savePropertyElement(tqlayout, domDoc, "property", "margin", item->container()->layoutMargin()); + savePropertyElement(layout, domDoc, "property", "margin", item->container()->layoutMargin()); if(item->modifiedProperties()->contains("layoutSpacing")) - savePropertyElement(tqlayout, domDoc, "property", "spacing", item->container()->layoutSpacing()); - tclass.appendChild(tqlayout); + savePropertyElement(layout, domDoc, "property", "spacing", item->container()->layoutSpacing()); + tclass.appendChild(layout); } } int layoutType = item->container() ? item->container()->layoutType() : Container::NoLayout; switch(layoutType) { - case Container::Grid: // grid tqlayout + case Container::Grid: // grid layout { - tqlayout.setTagName("grid"); - for(ObjectTreeItem *objIt = item->tqchildren()->first(); objIt; objIt = item->tqchildren()->next()) - saveWidget(objIt, tqlayout, domDoc, true); + layout.setTagName("grid"); + for(ObjectTreeItem *objIt = item->children()->first(); objIt; objIt = item->children()->next()) + saveWidget(objIt, layout, domDoc, true); break; } case Container::HBox: case Container::VBox: { - // as we don't save tqgeometry, we need to sort widgets in the right order, not creation order + // as we don't save geometry, we need to sort widgets in the right order, not creation order WidgetList *list; - if(tqlayout.tagName() == "hbox") { + if(layout.tagName() == "hbox") { list = new HorWidgetList(item->container()->form()->toplevelContainer()->widget()); - tqlayout.setTagName("hbox"); + layout.setTagName("hbox"); } else { list = new VerWidgetList(item->container()->form()->toplevelContainer()->widget()); - tqlayout.setTagName("vbox"); + layout.setTagName("vbox"); } - for(ObjectTreeItem *objTree = item->tqchildren()->first(); objTree; objTree = item->tqchildren()->next()) + for(ObjectTreeItem *objTree = item->children()->first(); objTree; objTree = item->children()->next()) list->append(objTree->widget()); list->sort(); for(TQWidget *obj = list->first(); obj; obj = list->next()) { ObjectTreeItem *titem = item->container()->form()->objectTree()->lookup(obj->name()); if(item) - saveWidget(titem, tqlayout, domDoc); + saveWidget(titem, layout, domDoc); } delete list; break; } case Container::HFlow: case Container::VFlow: { - tqlayout.setTagName("grid"); - KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->tqlayout()); + layout.setTagName("grid"); + KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->layout()); if(!flow) break; WidgetList *list = (WidgetList*)flow->widgetList(); // save some special properties - savePropertyElement(tqlayout, domDoc, "property", "customLayout", Container::layoutTypeToString(item->container()->layoutType()) ); - savePropertyElement(tqlayout, domDoc, "property", "justify", TQVariant(static_cast<KexiFlowLayout*>(item->container()->tqlayout())->isJustified(), 3) ); + savePropertyElement(layout, domDoc, "property", "customLayout", Container::layoutTypeToString(item->container()->layoutType()) ); + savePropertyElement(layout, domDoc, "property", "justify", TQVariant(static_cast<KexiFlowLayout*>(item->container()->layout())->isJustified(), 3) ); - // fill the widget's grid info, ie just simulate grid tqlayout + // fill the widget's grid info, ie just simulate grid layout item->container()->createGridLayout(true); for(TQWidget *obj = list->first(); obj; obj = list->next()) { ObjectTreeItem *titem = item->container()->form()->objectTree()->lookup(obj->name()); if(item) - saveWidget(titem, tqlayout, domDoc, true); // save grid info for compatibility with TQtDesigner + saveWidget(titem, layout, domDoc, true); // save grid info for compatibility with TQtDesigner } delete list; break; } default: { - for(ObjectTreeItem *objIt = item->tqchildren()->first(); objIt; objIt = item->tqchildren()->next()) + for(ObjectTreeItem *objIt = item->children()->first(); objIt; objIt = item->children()->next()) saveWidget(objIt, tclass, domDoc); } } @@ -1153,7 +1153,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren else if(tagName == "vbox") classname = "VBox"; else if(tagName == "grid") { - // first, see if it is flow tqlayout + // first, see if it is flow layout for(TQDomNode child = n.firstChild(); !child.isNull(); child = child.nextSibling()) { if((child.toElement().tagName() == "property") && (child.toElement().attribute("name") == "customLayout")) @@ -1232,27 +1232,27 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren m_currentItem = item; // if we are inside a Grid, we need to insert the widget in the good cell if(container->layoutType() == Container::Grid) { - TQGridLayout *tqlayout = (TQGridLayout*)container->tqlayout(); + TQGridLayout *layout = (TQGridLayout*)container->layout(); if(el.hasAttribute("rowspan")) { // widget spans multiple cells - if(tqlayout) - tqlayout->addMultiCellWidget(w, el.attribute("row").toInt(), el.attribute("row").toInt() + el.attribute("rowspan").toInt()-1, + if(layout) + layout->addMultiCellWidget(w, el.attribute("row").toInt(), el.attribute("row").toInt() + el.attribute("rowspan").toInt()-1, el.attribute("column").toInt(), el.attribute("column").toInt() + el.attribute("colspan").toInt()-1); item->setGridPos(el.attribute("row").toInt(), el.attribute("column").toInt(), el.attribute("rowspan").toInt(), el.attribute("colspan").toInt()); } else { - if(tqlayout) - tqlayout->addWidget(w, el.attribute("row").toInt(), el.attribute("column").toInt()); + if(layout) + layout->addWidget(w, el.attribute("row").toInt(), el.attribute("column").toInt()); item->setGridPos(el.attribute("row").toInt(), el.attribute("column").toInt(), 0, 0); } } - else if(container->tqlayout()) - container->tqlayout()->add(w); + else if(container->layout()) + container->layout()->add(w); readChildNodes(item, container, el, w); - if(item->container() && item->container()->tqlayout()) - item->container()->tqlayout()->activate(); + if(item->container() && item->container()->layout()) + item->container()->layout()->activate(); // We add the autoSaveProperties in the modifProp list of the ObjectTreeItem, so that they are saved later TQValueList<TQCString> list(container->form()->library()->autoSaveProperties(w->className())); @@ -1261,7 +1261,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren = dynamic_cast<KFormDesigner::WidgetWithSubpropertiesInterface*>(w); TQWidget *subwidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : w; for(TQValueList<TQCString>::ConstIterator it = list.constBegin(); it != endIt; ++it) { - if(subwidget->tqmetaObject()->findProperty(*it, true) != -1) + if(subwidget->metaObject()->findProperty(*it, true) != -1) item->addModifiedProperty(*it, subwidget->property(*it)); } @@ -1337,7 +1337,7 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl //if(name == "geometry") // hasGeometryProp = true; if( ((eltag == "grid") || (eltag == "hbox") || (eltag == "vbox")) && - (name == "name")) // we don't care about tqlayout names + (name == "name")) // we don't care about layout names continue; if (node.attribute("subwidget")=="true") { @@ -1355,30 +1355,30 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl if(name == "buddy") m_buddies->insert(readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toString(), (TQLabel*)w); else if(((eltag == "grid") || (eltag == "hbox") || (eltag == "vbox")) && - item->container() && item->container()->tqlayout()) { + item->container() && item->container()->layout()) { // We load the margin of a Layout if(name == "margin") { int margin = readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toInt(); item->container()->setLayoutMargin(margin); - item->container()->tqlayout()->setMargin(margin); + item->container()->layout()->setMargin(margin); } // We load the spacing of a Layout else if(name == "spacing") { int spacing = readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toInt(); item->container()->setLayoutSpacing(spacing); - item->container()->tqlayout()->setSpacing(spacing); + item->container()->layout()->setSpacing(spacing); } else if((name == "justify")){ bool justify = readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toBool(); - KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->tqlayout()); + KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->layout()); if(flow) flow->setJustified(justify); } } // If the object doesn't have this property, we let the Factory handle it (maybe a special property) - else if(subwidget->tqmetaObject()->findProperty(name.latin1(), true) == -1) + else if(subwidget->metaObject()->findProperty(name.latin1(), true) == -1) { - if(w->className() == TQString::tqfromLatin1("CustomWidget")) + if(w->className() == TQString::fromLatin1("CustomWidget")) item->storeUnknownProperty(node); else { bool read = container->form()->library()->readSpecialProperty( @@ -1391,7 +1391,7 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl { TQVariant val( readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name) ); if(name == "geometry" && dynamic_cast<FormWidget*>(w)) { - //fix tqgeometry if needed - this is top level form widget + //fix geometry if needed - this is top level form widget TQRect r( val.toRect() ); if (r.left()<0) //negative X! r.moveLeft(0); @@ -1400,8 +1400,8 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl val = r; } subwidget->setProperty(name.latin1(), val); -// int count = w->tqmetaObject()->findProperty(name, true); -// const TQMetaProperty *meta = w->tqmetaObject()->property(count, true); +// int count = w->metaObject()->findProperty(name, true); +// const TQMetaProperty *meta = w->metaObject()->property(count, true); // if(meta && meta->isEnumType()) { // val = w->property(name.latin1()); //update: we want a numeric value of enum // } @@ -1419,7 +1419,7 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl loadWidget(container, node, w); } else if(tag == "grid") { - // first, see if it is flow tqlayout + // first, see if it is flow layout TQString layoutName; for(TQDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling()) { if((child.toElement().tagName() == "property") && (child.toElement().attribute("name") == "customLayout")) { @@ -1430,37 +1430,37 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl if(layoutName == "HFlow") { item->container()->m_layType = Container::HFlow; - KexiFlowLayout *tqlayout = new KexiFlowLayout(item->widget()); - tqlayout->setOrientation(Qt::Horizontal); - item->container()->m_layout = (TQLayout*)tqlayout; + KexiFlowLayout *layout = new KexiFlowLayout(item->widget()); + layout->setOrientation(Qt::Horizontal); + item->container()->m_layout = (TQLayout*)layout; } else if(layoutName == "VFlow") { item->container()->m_layType = Container::VFlow; - KexiFlowLayout *tqlayout = new KexiFlowLayout(item->widget()); - tqlayout->setOrientation(Qt::Vertical); - item->container()->m_layout = (TQLayout*)tqlayout; + KexiFlowLayout *layout = new KexiFlowLayout(item->widget()); + layout->setOrientation(Qt::Vertical); + item->container()->m_layout = (TQLayout*)layout; } - else { // grid tqlayout + else { // grid layout item->container()->m_layType = Container::Grid; - TQGridLayout *tqlayout = new TQGridLayout(item->widget(), 1, 1); - item->container()->m_layout = (TQLayout*)tqlayout; + TQGridLayout *layout = new TQGridLayout(item->widget(), 1, 1); + item->container()->m_layout = (TQLayout*)layout; } readChildNodes(item, container, node, w); } else if(tag == "vbox") { item->container()->m_layType = Container::VBox; - TQVBoxLayout *tqlayout = new TQVBoxLayout(item->widget()); - item->container()->m_layout = (TQLayout*)tqlayout; + TQVBoxLayout *layout = new TQVBoxLayout(item->widget()); + item->container()->m_layout = (TQLayout*)layout; readChildNodes(item, container, node, w); } else if(tag == "hbox") { item->container()->m_layType = Container::HBox; - TQHBoxLayout *tqlayout = new TQHBoxLayout(item->widget()); - item->container()->m_layout = (TQLayout*)tqlayout; + TQHBoxLayout *layout = new TQHBoxLayout(item->widget()); + item->container()->m_layout = (TQLayout*)layout; readChildNodes(item, container, node, w); } else {// unknown tag, we let the Factory handle it - if(w->className() == TQString::tqfromLatin1("CustomWidget")) + if(w->className() == TQString::fromLatin1("CustomWidget")) item->storeUnknownProperty(node); else { bool read = container->form()->library()->readSpecialProperty( diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp index a2ed0dac..75846dd3 100644 --- a/kexi/formeditor/formmanager.cpp +++ b/kexi/formeditor/formmanager.cpp @@ -227,7 +227,7 @@ FormManager::createActions(WidgetLibrary *lib, KActionCollection* collection, KX m_style->setEditable(false); KGlobal::config()->setGroup("General"); - TQString currentStyle = TQString::tqfromLatin1(kapp->tqstyle().name()).lower(); + TQString currentStyle = TQString::fromLatin1(kapp->tqstyle().name()).lower(); const TQStringList styles = TQStyleFactory::keys(); m_style->setItems(styles); m_style->setCurrentItem(0); @@ -413,7 +413,7 @@ FormManager::resetCreatedConnection() m_active->formWidget()->clearForm(); } if (m_active && m_active->widget()) - m_active->widget()->tqrepaint(); + m_active->widget()->repaint(); } void @@ -790,7 +790,7 @@ FormManager::createSignalMenu(TQWidget *w) m_sigSlotMenu = new KPopupMenu(); m_sigSlotMenu->insertTitle(SmallIcon("connection"), i18n("Signals")); - TQStrList list = w->tqmetaObject()->signalNames(true); + TQStrList list = w->metaObject()->signalNames(true); TQStrListIterator it(list); for(; it.current() != 0; ++it) m_sigSlotMenu->insertItem(*it); @@ -813,14 +813,14 @@ FormManager::createSlotMenu(TQWidget *w) TQString signalArg( m_connection->signal().remove( TQRegExp(".*[(]|[)]") ) ); - TQStrList list = w->tqmetaObject()->slotNames(true); + TQStrList list = w->metaObject()->slotNames(true); TQStrListIterator it(list); for(; it.current() != 0; ++it) { // we add the slot only if it is compatible with the signal TQString slotArg(*it); slotArg = slotArg.remove( TQRegExp(".*[(]|[)]") ); - if(!signalArg.tqstartsWith(slotArg, true)) // args not compatible + if(!signalArg.startsWith(slotArg, true)) // args not compatible continue; m_sigSlotMenu->insertItem(*it); @@ -845,7 +845,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu const uint widgetsCount = container->form()->selectedWidgets()->count(); const bool multiple = widgetsCount > 1; //const bool enableRemove = w != m_active->widget(); - // We only enabletqlayout creation if more than one widget with the same parent are selected + // We only enablelayout creation if more than one widget with the same parent are selected const bool enableLayout = multiple || w == container->widget(); m_menuWidget = w; @@ -863,14 +863,14 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu if(!multiple) { if(w == container->form()->widget()) - m_popup->insertTitle(SmallIcon("form"), i18n("%1 : Form").tqarg(w->name()) ); + m_popup->insertTitle(SmallIcon("form"), i18n("%1 : Form").arg(w->name()) ); else m_popup->insertTitle( SmallIcon( container->form()->library()->iconName(w->className())), TQString(w->name()) + " : " + n ); } else m_popup->insertTitle(SmallIcon("multiple_obj"), i18n("Multiple Widgets") - + TQString(" (%1)").tqarg(widgetsCount)); + + TQString(" (%1)").arg(widgetsCount)); KAction *a; #define PLUG_ACTION(_name, forceVisible) \ @@ -937,7 +937,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu // We create the signals menu KPopupMenu *sigMenu = new KPopupMenu(); - TQStrList list = w->tqmetaObject()->signalNames(true); + TQStrList list = w->metaObject()->signalNames(true); TQStrListIterator it(list); for(; it.current() != 0; ++it) sigMenu->insertItem(*it); @@ -1095,7 +1095,7 @@ void FormManager::createLayout(int layoutType) { WidgetList *list = m_active->selectedWidgets(); - // if only one widget is selected (a container), we modify its tqlayout + // if only one widget is selected (a container), we modify its layout if (list->isEmpty()) {//sanity check kdWarning() << "FormManager::createLayout(): list is empty!" << endl; return; @@ -1103,9 +1103,9 @@ FormManager::createLayout(int layoutType) if(list->count() == 1) { ObjectTreeItem *item = m_active->objectTree()->lookup(list->first()->name()); - if(!item || !item->container() || !m_propSet->contains("tqlayout")) + if(!item || !item->container() || !m_propSet->contains("layout")) return; - (*m_propSet)["tqlayout"] = Container::layoutTypeToString(layoutType); + (*m_propSet)["layout"] = Container::layoutTypeToString(layoutType); return; } @@ -1115,7 +1115,7 @@ FormManager::createLayout(int layoutType) kdDebug() << "comparing widget " << w->name() << " whose parent is " << w->parentWidget()->name() << " insteaed of " << parent->name() << endl; if(w->parentWidget() != parent) { - KMessageBox::sorry(m_active->widget()->tqtopLevelWidget(), i18n("<b>Cannot create the tqlayout.</b>\n" + KMessageBox::sorry(m_active->widget()->topLevelWidget(), i18n("<b>Cannot create the layout.</b>\n" "All selected widgets must have the same parent.")); kdDebug() << "FormManager::createLayout() widgets don't have the same parent widget" << endl; return; @@ -1143,7 +1143,7 @@ FormManager::breakLayout() else // normal container { if(activeForm()->selectedWidgets()->count() == 1) - (*m_propSet)["tqlayout"] = "NoLayout"; + (*m_propSet)["layout"] = "NoLayout"; else container->setLayout(Container::NoLayout); } @@ -1188,7 +1188,7 @@ FormManager::editTabOrder() { if(!activeForm() || !activeForm()->objectTree()) return; - TQWidget *topLevel = m_active->widget()->tqtopLevelWidget(); + TQWidget *topLevel = m_active->widget()->topLevelWidget(); TabStopDialog dlg(topLevel); //const bool oldAutoTabStops = m_active->autoTabStops(); if (dlg.exec(m_active) == TQDialog::Accepted) { @@ -1222,7 +1222,7 @@ FormManager::editFormPixmapCollection() if(!activeForm() || !activeForm()->objectTree()) return; - PixmapCollectionEditor dialog(activeForm()->pixmapCollection(), activeForm()->widget()->tqtopLevelWidget()); + PixmapCollectionEditor dialog(activeForm()->pixmapCollection(), activeForm()->widget()->topLevelWidget()); dialog.exec(); } @@ -1234,7 +1234,7 @@ FormManager::editConnections() if(!activeForm() || !activeForm()->objectTree()) return; - ConnectionDialog dialog(activeForm()->widget()->tqtopLevelWidget()); + ConnectionDialog dialog(activeForm()->widget()->topLevelWidget()); dialog.exec(activeForm()); } @@ -1380,9 +1380,9 @@ FormManager::selectAll() return; activeForm()->selectFormWidget(); - uint count = activeForm()->objectTree()->tqchildren()->count(); - for(ObjectTreeItem *it = activeForm()->objectTree()->tqchildren()->first(); it; - it = activeForm()->objectTree()->tqchildren()->next(), count--) + uint count = activeForm()->objectTree()->children()->count(); + for(ObjectTreeItem *it = activeForm()->objectTree()->children()->first(); it; + it = activeForm()->objectTree()->children()->next(), count--) { activeForm()->setSelectedWidget(it->widget(), /*add*/true, /*raise*/false, /*moreWillBeSelected*/count>1); } @@ -1493,14 +1493,14 @@ FormManager::emitWidgetSelected( KFormDesigner::Form* form, bool multiple ) WidgetList *wlist = form->selectedWidgets(); bool fontEnabled = false; for (WidgetListIterator it(*wlist); it.current(); ++it) { - if (-1 != it.current()->tqmetaObject()->findProperty("font", true)) { + if (-1 != it.current()->metaObject()->findProperty("font", true)) { fontEnabled = true; break; } } enableAction("format_font", fontEnabled); - // If the widgets selected is a container, we enable tqlayout actions + // If the widgets selected is a container, we enable layout actions bool containerSelected = false; if(!multiple) { @@ -1550,7 +1550,7 @@ FormManager::emitFormWidgetSelected( KFormDesigner::Form* form ) enableFormActions(); const bool twoSelected = form->selectedWidgets()->count()==2; - const bool hasChildren = !form->objectTree()->tqchildren()->isEmpty(); + const bool hasChildren = !form->objectTree()->children()->isEmpty(); // Layout actions enableAction("layout_menu", hasChildren); diff --git a/kexi/formeditor/formmanager.h b/kexi/formeditor/formmanager.h index a43100ff..677a3e7b 100644 --- a/kexi/formeditor/formmanager.h +++ b/kexi/formeditor/formmanager.h @@ -221,13 +221,13 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject bool isRedoing() const { return m_isRedoing; } public slots: - /*! Deletes the selected widget in active Form and all of its tqchildren. */ + /*! Deletes the selected widget in active Form and all of its children. */ void deleteWidget(); - /*! Copies the slected widget and all its tqchildren of the active Form using an XML representation. */ + /*! Copies the slected widget and all its children of the active Form using an XML representation. */ void copyWidget(); - /*! Cuts (ie Copies and deletes) the selected widget and all its tqchildren of + /*! Cuts (ie Copies and deletes) the selected widget and all its children of the active Form using an XML representation. */ void cutWidget(); @@ -258,22 +258,22 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject /*! Creates a dialog to edit the Connection of \ref activeForm(). */ void editConnections(); - //! Lay out selected widgets using HBox tqlayout (calls \ref CreateLayoutCommand). + //! Lay out selected widgets using HBox layout (calls \ref CreateLayoutCommand). void layoutHBox(); - //! Lay out selected widgets using VBox tqlayout. + //! Lay out selected widgets using VBox layout. void layoutVBox(); - //! Lay out selected widgets using Grid tqlayout. + //! Lay out selected widgets using Grid layout. void layoutGrid(); //! Lay out selected widgets in an horizontal splitter void layoutHSplitter(); //! Lay out selected widgets in a verticak splitter void layoutVSplitter(); - //! Lay out selected widgets using HFlow tqlayout + //! Lay out selected widgets using HFlow layout void layoutHFlow(); - //! Lay out selected widgets using VFlow tqlayout. + //! Lay out selected widgets using VFlow layout. void layoutVFlow(); - //! Breaks selected tqlayout(calls \ref BreakLayoutCommand). + //! Breaks selected layout(calls \ref BreakLayoutCommand). void breakLayout(); void alignWidgetsToLeft(); @@ -418,7 +418,7 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject Change this if you need to handle, eg. custom UI XML tags, as in Kexi's Form Designer. */ virtual bool saveFormToStringInternal(Form *form, TQString &dest, int indent = 0); #endif - /*! Function called by the "Lay out in..." menu items. It creates a tqlayout from the + /*! Function called by the "Lay out in..." menu items. It creates a layout from the currently selected widgets (that must have the same parent). Calls \ref CreateLayoutCommand. */ void createLayout(int layoutType); diff --git a/kexi/formeditor/kfdpixmapedit.cpp b/kexi/formeditor/kfdpixmapedit.cpp index db9a726e..64e65f1e 100644 --- a/kexi/formeditor/kfdpixmapedit.cpp +++ b/kexi/formeditor/kfdpixmapedit.cpp @@ -48,7 +48,7 @@ KFDPixmapEdit::selectPixmap() ObjectTreeItem *item = m_manager->activeForm()->objectTree()->lookup(m_manager->activeForm()->selectedWidget()->name()); TQString name = item ? item->pixmapName(property()->name()) : ""; - PixmapCollectionChooser dialog( m_manager->activeForm()->pixmapCollection(), name, tqtopLevelWidget() ); + PixmapCollectionChooser dialog( m_manager->activeForm()->pixmapCollection(), name, topLevelWidget() ); if(dialog.exec() == TQDialog::Accepted) { setValue(dialog.pixmap(), true); item->setPixmapName(property()->name(), dialog.pixmapName()); diff --git a/kexi/formeditor/objecttree.cpp b/kexi/formeditor/objecttree.cpp index e2ada714..a9b507f7 100644 --- a/kexi/formeditor/objecttree.cpp +++ b/kexi/formeditor/objecttree.cpp @@ -22,7 +22,7 @@ #include <tqwidget.h> #include <tqvariant.h> #include <tqdom.h> -#include <tqtextstream.h> +#include <textstream.h> #include "form.h" #include "container.h" @@ -64,14 +64,14 @@ ObjectTreeItem::rename(const TQString &name) void ObjectTreeItem::addChild(ObjectTreeItem *c) { - m_tqchildren.append(c); + m_children.append(c); c->setParent(this); } void ObjectTreeItem::removeChild(ObjectTreeItem *c) { - m_tqchildren.remove(c); + m_children.remove(c); } void @@ -141,10 +141,10 @@ ObjectTree::ObjectTree(const TQString &classn, const TQString &name, TQWidget *w ObjectTree::~ObjectTree() { -// for(ObjectTreeItem *it = tqchildren()->first(); it; it = tqchildren()->next()) +// for(ObjectTreeItem *it = children()->first(); it; it = children()->next()) // removeItem(it->name()); - while (tqchildren()->first()) { - removeItem(tqchildren()->first()); + while (children()->first()) { + removeItem(children()->first()); } } @@ -216,7 +216,7 @@ ObjectTree::removeItem(ObjectTreeItem *c) if (m_container && m_container->form()) m_container->form()->emitChildRemoved(c); - for(ObjectTreeItem *it = c->tqchildren()->first(); it; it = c->tqchildren()->next()) + for(ObjectTreeItem *it = c->children()->first(); it; it = c->children()->next()) removeItem(it->name()); m_treeDict.remove(c->name()); diff --git a/kexi/formeditor/objecttree.h b/kexi/formeditor/objecttree.h index b37d7caa..eaa95a0c 100644 --- a/kexi/formeditor/objecttree.h +++ b/kexi/formeditor/objecttree.h @@ -58,7 +58,7 @@ typedef TQMapConstIterator<TQString, TQVariant> TQVariantMapConstIterator; /*! @short An item representing a widget - Holds the properties of a widget (classname, name, parent, tqchildren ..). + Holds the properties of a widget (classname, name, parent, children ..). @author Lucijan Busch <lucijan@kde.org> */ class KFORMEDITOR_EXPORT ObjectTreeItem @@ -72,7 +72,7 @@ class KFORMEDITOR_EXPORT ObjectTreeItem TQWidget* widget() const { return m_widget; } EventEater* eventEater() const { return m_eater; } ObjectTreeItem* parent() const { return m_parent; } - ObjectTreeList* tqchildren() { return &m_tqchildren; } + ObjectTreeList* children() { return &m_children; } /*! \return a TQMap<TQString, TQVariant> of all modified properties for this widget. The TQVariant is the old value (ie first value) of the property whose name is the TQString. */ @@ -121,7 +121,7 @@ class KFORMEDITOR_EXPORT ObjectTreeItem protected: TQString m_className; TQString m_name; - ObjectTreeList m_tqchildren; + ObjectTreeList m_children; TQGuardedPtr<Container> m_container; TQMap<TQString, TQVariant> m_props; TQMap<TQString, TQVariant> *m_subprops; diff --git a/kexi/formeditor/objecttreeview.cpp b/kexi/formeditor/objecttreeview.cpp index 049df3a5..82cb67bb 100644 --- a/kexi/formeditor/objecttreeview.cpp +++ b/kexi/formeditor/objecttreeview.cpp @@ -191,10 +191,10 @@ ObjectTreeView::~ObjectTreeView() } TQSize -ObjectTreeView::tqsizeHint() const +ObjectTreeView::sizeHint() const { return TQSize( TQFontMetrics(font()).width(columnText(0)+columnText(1)+" "), - KListView::tqsizeHint().height()); + KListView::sizeHint().height()); } TQString @@ -367,7 +367,7 @@ ObjectTreeView::loadTree(ObjectTreeItem *item, ObjectTreeViewItem *parent) last = last->nextSibling(); treeItem->moveItem(last); - ObjectTreeList *list = item->tqchildren(); + ObjectTreeList *list = item->children(); for(ObjectTreeItem *it = list->first(); it; it = list->next()) loadTree(it, treeItem); diff --git a/kexi/formeditor/objecttreeview.h b/kexi/formeditor/objecttreeview.h index b625c0ad..2ddf867c 100644 --- a/kexi/formeditor/objecttreeview.h +++ b/kexi/formeditor/objecttreeview.h @@ -73,7 +73,7 @@ class KFORMEDITOR_EXPORT ObjectTreeView : public KListView ObjectTreeView(TQWidget *parent=0, const char *name=0, bool tabStop = false); virtual ~ObjectTreeView(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /*! Sets \a form as the current Form in the list. The list will automatically be filled with an item for each widget in the Form, and selection will be synced. diff --git a/kexi/formeditor/richtextdialog.cpp b/kexi/formeditor/richtextdialog.cpp index 168102b0..9c4a4112 100644 --- a/kexi/formeditor/richtextdialog.cpp +++ b/kexi/formeditor/richtextdialog.cpp @@ -16,7 +16,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <ktoolbar.h> #include <kfontcombo.h> @@ -146,10 +146,10 @@ RichTextDialog::buttonToggled(int id) if(!isOn) break; switch(id) { - case TBLeft: m_edit->tqsetAlignment(TQt::AlignLeft); break; - case TBCenter: m_edit->tqsetAlignment(TQt::AlignCenter); break; - case TBRight: m_edit->tqsetAlignment(TQt::AlignRight); break; - case TBJustify: m_edit->tqsetAlignment(TQt::AlignJustify); break; + case TBLeft: m_edit->setAlignment(TQt::AlignLeft); break; + case TBCenter: m_edit->setAlignment(TQt::AlignCenter); break; + case TBRight: m_edit->setAlignment(TQt::AlignRight); break; + case TBJustify: m_edit->setAlignment(TQt::AlignJustify); break; default: break; } } @@ -168,7 +168,7 @@ RichTextDialog::cursorPositionChanged(int, int) m_toolbar->setButton(TBUnder, m_edit->underline()); int id = 0; - switch(m_edit->tqalignment()) + switch(m_edit->alignment()) { case TQt::AlignLeft: id = TBLeft; break; case TQt::AlignCenter: id = TBCenter; break; diff --git a/kexi/formeditor/richtextdialog.h b/kexi/formeditor/richtextdialog.h index 25150873..f5ae41ea 100644 --- a/kexi/formeditor/richtextdialog.h +++ b/kexi/formeditor/richtextdialog.h @@ -30,7 +30,7 @@ class KColorCombo; namespace KFormDesigner { //! A simple dialog to edit rich text -/*! It allows to change font name, style and color, tqalignment. */ +/*! It allows to change font name, style and color, alignment. */ class KFORMEDITOR_EXPORT RichTextDialog : public KDialogBase { Q_OBJECT diff --git a/kexi/formeditor/scripting/formscript.cpp b/kexi/formeditor/scripting/formscript.cpp index 1123e093..aa32bc02 100644 --- a/kexi/formeditor/scripting/formscript.cpp +++ b/kexi/formeditor/scripting/formscript.cpp @@ -71,7 +71,7 @@ FormScript::execute(const TQString &functionName) m_script->callFunction(functionName); } catch(Kross::Api::Exception& e) { - kdDebug() << TQString("EXCEPTION type='%1' description='%2'").tqarg(e.type()).tqarg(e.description()) << endl; + kdDebug() << TQString("EXCEPTION type='%1' description='%2'").arg(e.type()).arg(e.description()) << endl; return false; } return true; diff --git a/kexi/formeditor/spring.cpp b/kexi/formeditor/spring.cpp index 1ec9a2b4..3e0651b1 100644 --- a/kexi/formeditor/spring.cpp +++ b/kexi/formeditor/spring.cpp @@ -47,25 +47,25 @@ Spring::setOrientation(Qt::Orientation orient) SizeType type = sizeType(); m_orient = orient; setSizeType(type); - tqrepaint(); + repaint(); } Spring::SizeType Spring::sizeType() const { if(m_orient ==Qt::Vertical) - return (SizeType)tqsizePolicy().verData(); + return (SizeType)sizePolicy().verData(); else - return (SizeType)tqsizePolicy().horData(); + return (SizeType)sizePolicy().horData(); } void Spring::setSizeType(SizeType size) { if(m_orient ==Qt::Vertical) - tqsetSizePolicy(TQSizePolicy::Minimum, (TQSizePolicy::SizeType)size); + setSizePolicy(TQSizePolicy::Minimum, (TQSizePolicy::SizeType)size); else - tqsetSizePolicy( (TQSizePolicy::SizeType)size, TQSizePolicy::Minimum); + setSizePolicy( (TQSizePolicy::SizeType)size, TQSizePolicy::Minimum); } void @@ -144,10 +144,10 @@ Spring::saveSpring(KFormDesigner::ObjectTreeItem *item, TQDomElement &parentNode if(parentNode.tagName() == "widget") KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "geometry", item->widget()->property("geometry"), item->widget()); - if(!item->widget()->tqsizeHint().isValid()) - KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "tqsizeHint", item->widget()->property("size"), item->widget()); + if(!item->widget()->sizeHint().isValid()) + KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "sizeHint", item->widget()->property("size"), item->widget()); else - KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "tqsizeHint", item->widget()->property("tqsizeHint"), item->widget()); + KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "sizeHint", item->widget()->property("sizeHint"), item->widget()); KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "orientation", item->widget()->property("orientation"), item->widget()); KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "sizeType", item->widget()->property("sizeType"), item->widget()); diff --git a/kexi/formeditor/tabstopdialog.cpp b/kexi/formeditor/tabstopdialog.cpp index f28c8e2a..20d81b9e 100644 --- a/kexi/formeditor/tabstopdialog.cpp +++ b/kexi/formeditor/tabstopdialog.cpp @@ -17,7 +17,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqtooltip.h> diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp index 0cfe0483..79f1b05f 100644 --- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp +++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp @@ -276,7 +276,7 @@ void KFormDesignerKDevPart::open() { m_openingFile = true; - KURL url = KFileDialog::getOpenURL("::kformdesigner", i18n("*.ui|TQt Designer UI Files"), m_workspace->tqtopLevelWidget()); + KURL url = KFileDialog::getOpenURL("::kformdesigner", i18n("*.ui|TQt Designer UI Files"), m_workspace->topLevelWidget()); if(!url.isEmpty()) ReadWritePart::openURL(url); m_openingFile = false; @@ -321,9 +321,9 @@ KFormDesignerKDevPart::saveAs() bool KFormDesignerKDevPart::closeForm(Form *form) { - int res = KMessageBox::warningYesNoCancel( m_workspace->tqtopLevelWidget(), + int res = KMessageBox::warningYesNoCancel( m_workspace->topLevelWidget(), i18n( "The form \"%1\" has been modified.\n" - "Do you want to save your changes or discard them?" ).tqarg( form->objectTree()->name() ), + "Do you want to save your changes or discard them?" ).arg( form->objectTree()->name() ), i18n( "Close Form" ), KStdGuiItem::save(), KStdGuiItem::discard() ); if(res == KMessageBox::Yes) @@ -397,7 +397,7 @@ KFormDesignerKDevPart::slotWidgetSelected(Form *form, bool multiple) ENABLE_ACTION("format_raise", true); ENABLE_ACTION("format_lower", true); - // If the widgets selected is a container, we enable tqlayout actions + // If the widgets selected is a container, we enable layout actions if(!multiple) { KFormDesigner::ObjectTreeItem *item = form->objectTree()->lookup( form->selectedWidgets()->first()->name() ); @@ -535,13 +535,13 @@ KFormDesignerKDevPart::~KFormDesignerKDevPart() ////// FormWidgetBase : helper widget to draw rects on top of widgets -//tqrepaint all tqchildren widgets +//repaint all children widgets static void repaintAll(TQWidget *w) { TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING); TQObjectListIt it(*list); for (TQObject *obj; (obj=it.current()); ++it ) { - static_cast<TQWidget*>(obj)->tqrepaint(); + static_cast<TQWidget*>(obj)->repaint(); } delete list; } @@ -639,7 +639,7 @@ FormWidgetBase::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint TQPixmap pix2 = TQPixmap::grabWidget(to); if((from != this) && (to != this)) - p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) ); + p.drawLine( from->parentWidget()->mapTo(this, from->geometry().center()), to->parentWidget()->mapTo(this, to->geometry().center()) ); p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1); p.drawPixmap(toPoint.x(), toPoint.y(), pix2); diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp index cd51817a..02996580 100644 --- a/kexi/formeditor/test/kfd_part.cpp +++ b/kexi/formeditor/test/kfd_part.cpp @@ -296,7 +296,7 @@ void KFormDesignerPart::open() { m_openingFile = true; - KURL url = KFileDialog::getOpenURL("::kformdesigner", i18n("*.ui|TQt Designer UI Files"), m_workspace->tqtopLevelWidget()); + KURL url = KFileDialog::getOpenURL("::kformdesigner", i18n("*.ui|TQt Designer UI Files"), m_workspace->topLevelWidget()); if(!url.isEmpty()) ReadWritePart::openURL(url); m_openingFile = false; @@ -332,7 +332,7 @@ void KFormDesignerPart::saveAs() { KURL url = KFileDialog::getSaveURL("::kformdesigner", i18n("*.ui|TQt Designer UI Files"), - m_workspace->tqtopLevelWidget()); + m_workspace->topLevelWidget()); if(url.isEmpty()) return; else @@ -342,9 +342,9 @@ KFormDesignerPart::saveAs() bool KFormDesignerPart::closeForm(Form *form) { - int res = KMessageBox::questionYesNoCancel( m_workspace->tqtopLevelWidget(), + int res = KMessageBox::questionYesNoCancel( m_workspace->topLevelWidget(), i18n( "The form \"%1\" has been modified.\n" - "Do you want to save your changes or discard them?" ).tqarg( form->objectTree()->name() ), + "Do you want to save your changes or discard them?" ).arg( form->objectTree()->name() ), i18n( "Close Form" ), KStdGuiItem::save(), KStdGuiItem::discard() ); if(res == KMessageBox::Yes) @@ -423,7 +423,7 @@ KFormDesignerPart::slotWidgetSelected(Form *form, bool multiple) ENABLE_ACTION("format_raise", true); ENABLE_ACTION("format_lower", true); - // If the widgets selected is a container, we enable tqlayout actions + // If the widgets selected is a container, we enable layout actions bool containerSelected = false; if(!multiple) { @@ -451,7 +451,7 @@ KFormDesignerPart::slotFormWidgetSelected(Form *form) enableFormActions(); const bool twoSelected = form->selectedWidgets()->count()==2; - const bool hasChildren = !form->objectTree()->tqchildren()->isEmpty(); + const bool hasChildren = !form->objectTree()->children()->isEmpty(); // Layout actions ENABLE_ACTION("layout_menu", hasChildren); @@ -558,14 +558,14 @@ KFormDesignerPart::setRedoEnabled(bool enabled, const TQString &text) ////// FormWidgetBase : helper widget to draw rects on top of widgets -//tqrepaint all tqchildren widgets +//repaint all children widgets static void repaintAll(TQWidget *w) { - w->tqrepaint(); + w->repaint(); TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING); TQObjectListIt it(*list); for (TQObject *obj; (obj=it.current()); ++it ) { - static_cast<TQWidget*>(obj)->tqrepaint(); + static_cast<TQWidget*>(obj)->repaint(); } delete list; } @@ -663,7 +663,7 @@ FormWidgetBase::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint TQPixmap pix2 = TQPixmap::grabWidget(to); if((from != this) && (to != this)) - p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) ); + p.drawLine( from->parentWidget()->mapTo(this, from->geometry().center()), to->parentWidget()->mapTo(this, to->geometry().center()) ); p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1); p.drawPixmap(toPoint.x(), toPoint.y(), pix2); diff --git a/kexi/formeditor/utils.cpp b/kexi/formeditor/utils.cpp index 6ce4bcae..53a9a15b 100644 --- a/kexi/formeditor/utils.cpp +++ b/kexi/formeditor/utils.cpp @@ -88,7 +88,7 @@ void KFormDesigner::setRecursiveCursor(TQWidget *w, Form *form) { ObjectTreeItem *tree = form->objectTree()->lookup(w->name()); - if(tree && ((tree->modifiedProperties()->contains("cursor")) || !tree->tqchildren()->isEmpty()) + if(tree && ((tree->modifiedProperties()->contains("cursor")) || !tree->children()->isEmpty()) && !w->inherits(TQLINEEDIT_OBJECT_NAME_STRING) && !w->inherits(TQTEXTEDIT_OBJECT_NAME_STRING) ) //fix weird behaviour return; // if the user has set a cursor for this widget or this is a container, don't change it @@ -108,7 +108,7 @@ KFormDesigner::getSizeFromChildren(TQWidget *w, const char *inheritClass) int tmpw = 0, tmph = 0; TQObjectList *list = w->queryList(inheritClass, 0, false, false); for(TQObject *o = list->first(); o; o = list->next()) { - TQRect r = ((TQWidget*)o)->tqgeometry(); + TQRect r = ((TQWidget*)o)->geometry(); tmpw = TQMAX(tmpw, r.right()); tmph = TQMAX(tmph, r.bottom()); } @@ -119,9 +119,9 @@ KFormDesigner::getSizeFromChildren(TQWidget *w, const char *inheritClass) // ----------------- -HorWidgetList::HorWidgetList(TQWidget *tqtopLevelWidget) +HorWidgetList::HorWidgetList(TQWidget *topLevelWidget) : WidgetList() - , m_tqtopLevelWidget(tqtopLevelWidget) + , m_topLevelWidget(topLevelWidget) { } @@ -133,14 +133,14 @@ int HorWidgetList::compareItems(TQPtrCollection::Item item1, TQPtrCollection::It { TQWidget *w1 = TQT_TQWIDGET(item1); TQWidget *w2 = TQT_TQWIDGET(item2); - return w1->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).x() - w2->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).x(); + return w1->mapTo(m_topLevelWidget, TQPoint(0,0)).x() - w2->mapTo(m_topLevelWidget, TQPoint(0,0)).x(); } // ----------------- -VerWidgetList::VerWidgetList(TQWidget *tqtopLevelWidget) +VerWidgetList::VerWidgetList(TQWidget *topLevelWidget) : WidgetList() - , m_tqtopLevelWidget(tqtopLevelWidget) + , m_topLevelWidget(topLevelWidget) { } @@ -157,9 +157,9 @@ int VerWidgetList::compareItems(TQPtrCollection::Item item1, TQPtrCollection::It TQObject *page1 = 0; TabWidget *tw1 = KFormDesigner::findParent<KFormDesigner::TabWidget>(w1, "KFormDesigner::TabWidget", page1); if (tw1) // special case - y1 = w1->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).y() + tw1->tabBarHeight() -2 -2; + y1 = w1->mapTo(m_topLevelWidget, TQPoint(0,0)).y() + tw1->tabBarHeight() -2 -2; else - y1 = w1->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).y(); + y1 = w1->mapTo(m_topLevelWidget, TQPoint(0,0)).y(); TQObject *page2 = 0; TabWidget *tw2 = KFormDesigner::findParent<KFormDesigner::TabWidget>(w2, "KFormDesigner::TabWidget", page2); @@ -169,16 +169,16 @@ int VerWidgetList::compareItems(TQPtrCollection::Item item1, TQPtrCollection::It } if (tw2) // special case - y2 = w2->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).y() + tw2->tabBarHeight() -2 -2; + y2 = w2->mapTo(m_topLevelWidget, TQPoint(0,0)).y() + tw2->tabBarHeight() -2 -2; else - y2 = w2->mapTo(m_tqtopLevelWidget, TQPoint(0,0)).y(); + y2 = w2->mapTo(m_topLevelWidget, TQPoint(0,0)).y(); kdDebug() << w1->name() << ": " << y1 << " " << " | " << w2->name() << ": " << y2 << endl; - //kdDebug() << w1->name() << ": " << w1->mapTo(m_tqtopLevelWidget, TQPoint(0,0)) << " " << w1->y() - //<< " | " << w2->name() << ":" /*<< w2->mapFrom(m_tqtopLevelWidget, TQPoint(0,w2->y()))*/ << " " << w2->y() << endl; + //kdDebug() << w1->name() << ": " << w1->mapTo(m_topLevelWidget, TQPoint(0,0)) << " " << w1->y() + //<< " | " << w2->name() << ":" /*<< w2->mapFrom(m_topLevelWidget, TQPoint(0,w2->y()))*/ << " " << w2->y() << endl; return y1 - y2; } diff --git a/kexi/formeditor/utils.h b/kexi/formeditor/utils.h index 3d078401..d6d56acb 100644 --- a/kexi/formeditor/utils.h +++ b/kexi/formeditor/utils.h @@ -71,22 +71,22 @@ typedef TQPtrListIterator<TQWidget> WidgetListIterator; class HorWidgetList : public WidgetList { public: - HorWidgetList(TQWidget *tqtopLevelWidget); + HorWidgetList(TQWidget *topLevelWidget); virtual ~HorWidgetList(); protected: virtual int compareItems(TQPtrCollection::Item item1, TQPtrCollection::Item item2); - TQWidget *m_tqtopLevelWidget; + TQWidget *m_topLevelWidget; }; //! @short A helper for sorting widgets vertically class VerWidgetList : public WidgetList { public: - VerWidgetList(TQWidget *tqtopLevelWidget); + VerWidgetList(TQWidget *topLevelWidget); virtual ~VerWidgetList(); protected: virtual int compareItems(TQPtrCollection::Item item1, TQPtrCollection::Item item2); - TQWidget *m_tqtopLevelWidget; + TQWidget *m_topLevelWidget; }; /*! This function is used to remove all the child widgets from a list, and @@ -94,18 +94,18 @@ class VerWidgetList : public WidgetList KFORMEDITOR_EXPORT void removeChildrenFromList(WidgetList &list); /*! This helper function install an event filter on \a object and all of its - tqchildren, directed to \a container. + children, directed to \a container. This is necessary to filter events for composed widgets. */ KFORMEDITOR_EXPORT void installRecursiveEventFilter(TQObject *object, TQObject *container); /*! This helper function removes an event filter installed before - on \a object and all of its tqchildren. + on \a object and all of its children. This is necessary to filter events for composed widgets. */ KFORMEDITOR_EXPORT void removeRecursiveEventFilter(TQObject *object, TQObject *container); KFORMEDITOR_EXPORT void setRecursiveCursor(TQWidget *w, Form *form); -/*! \return the size of \a w tqchildren. This can be used eg to get widget's tqsizeHint. */ +/*! \return the size of \a w children. This can be used eg to get widget's sizeHint. */ KFORMEDITOR_EXPORT TQSize getSizeFromChildren(TQWidget *widget, const char *inheritClass=TQWIDGET_OBJECT_NAME_STRING); } diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfactory.cpp index 178e2b74..9bec64ba 100644 --- a/kexi/formeditor/widgetfactory.cpp +++ b/kexi/formeditor/widgetfactory.cpp @@ -183,14 +183,14 @@ void WidgetFactory::hideClass(const char *classname) void WidgetFactory::createEditor(const TQCString &classname, const TQString &text, - TQWidget *w, Container *container, TQRect tqgeometry, + TQWidget *w, Container *container, TQRect geometry, int align, bool useFrame, bool multiLine, BackgroundMode background) { //#ifdef KEXI_KTEXTEDIT if (multiLine) { KTextEdit *textedit = new KTextEdit(text, TQString(), w->parentWidget()); textedit->setTextFormat(TQt::PlainText); - textedit->tqsetAlignment(align); + textedit->setAlignment(align); if (dynamic_cast<TQTextEdit*>(w)) { textedit->setWordWrap(dynamic_cast<TQTextEdit*>(w)->wordWrap()); textedit->setWrapPolicy(dynamic_cast<TQTextEdit*>(w)->wrapPolicy()); @@ -198,12 +198,12 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text, textedit->setPalette(w->palette()); textedit->setFont(w->font()); textedit->setResizePolicy(TQScrollView::Manual); - textedit->setGeometry(tqgeometry); + textedit->setGeometry(geometry); if(background == TQt::NoBackground) textedit->setBackgroundMode(w->backgroundMode()); else textedit->setBackgroundMode(background); -// textedit->setPaletteBackgroundColor(textedit->tqcolorGroup().color( TQColorGroup::Base )); +// textedit->setPaletteBackgroundColor(textedit->colorGroup().color( TQColorGroup::Base )); textedit->setPaletteBackgroundColor(w->paletteBackgroundColor()); for(int i =0; i <= textedit->paragraphs(); i++) textedit->setParagraphBackgroundColor(i, w->paletteBackgroundColor()); @@ -229,10 +229,10 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text, } else { KLineEdit *editor = new KLineEdit(text, w->parentWidget()); - editor->tqsetAlignment(align); + editor->setAlignment(align); editor->setPalette(w->palette()); editor->setFont(w->font()); - editor->setGeometry(tqgeometry); + editor->setGeometry(geometry); if(background == TQt::NoBackground) editor->setBackgroundMode(w->backgroundMode()); else @@ -253,7 +253,7 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text, //copy properties if available WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(w); TQWidget *subwidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : w; - if (-1!=m_editor->tqmetaObject()->findProperty("margin", true) && -1!=subwidget->tqmetaObject()->findProperty("margin", true)) + if (-1!=m_editor->metaObject()->findProperty("margin", true) && -1!=subwidget->metaObject()->findProperty("margin", true)) m_editor->setProperty("margin", subwidget->property("margin")); //#endif //js m_handles = new ResizeHandleSet(w, container->form(), true); @@ -314,10 +314,10 @@ WidgetFactory::disableFilter(TQWidget *w, Container *container) bool WidgetFactory::editList(TQWidget *w, TQStringList &list) { - KDialogBase dialog(w->tqtopLevelWidget(), "stringlist_dialog", true, i18n("Edit List of Items"), + KDialogBase dialog(w->topLevelWidget(), "stringlist_dialog", true, i18n("Edit List of Items"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, false); - KEditListBox *edit = new KEditListBox(i18n("Contents of %1").tqarg(w->name()), &dialog, "editlist"); + KEditListBox *edit = new KEditListBox(i18n("Contents of %1").arg(w->name()), &dialog, "editlist"); dialog.setMainWidget(edit); edit->insertStringList(list); // edit->show(); @@ -345,7 +345,7 @@ WidgetFactory::editRichText(TQWidget *w, TQString &text) void WidgetFactory::editListView(TQListView *listview) { - EditListViewDialog dlg(((TQWidget*)listview)->tqtopLevelWidget()); + EditListViewDialog dlg(((TQWidget*)listview)->topLevelWidget()); //dlg.exec(listview); } @@ -376,7 +376,7 @@ WidgetFactory::eventFilter(TQObject *obj, TQEvent *ev) if(obj != (TQObject *)w) return false; - TQWidget *focus = w->tqtopLevelWidget()->tqfocusWidget(); + TQWidget *focus = w->topLevelWidget()->focusWidget(); if(focus && w != focus && !w->child(focus->name(), focus->className())) resetEditor(); } @@ -456,7 +456,7 @@ WidgetFactory::resetEditor() if(m_widget) { disconnect(m_widget, 0, this, 0); - m_widget->tqrepaint(); + m_widget->repaint(); } //js delete m_handles; diff --git a/kexi/formeditor/widgetfactory.h b/kexi/formeditor/widgetfactory.h index 9e585625..7c9c5ceb 100644 --- a/kexi/formeditor/widgetfactory.h +++ b/kexi/formeditor/widgetfactory.h @@ -384,10 +384,10 @@ class KFORMEDITOR_EXPORT WidgetFactory : public TQObject /*! This function creates a KLineEdit to input some text and edit a widget's contents. This can be used in startEditing(). \a text is the text to display by default - in the line edit, \a w is the edited widget, \a tqgeometry is the tqgeometry the new line + in the line edit, \a w is the edited widget, \a geometry is the geometry the new line edit should have, and \a align is TQt::AlignmentFlags of the new line edit. */ void createEditor(const TQCString &classname, const TQString &text, - TQWidget *w, Container *container, TQRect tqgeometry, + TQWidget *w, Container *container, TQRect geometry, int align, bool useFrame=false, bool multiLine = false, BackgroundMode background = TQt::NoBackground); @@ -403,7 +403,7 @@ class KFORMEDITOR_EXPORT WidgetFactory : public TQObject into \a list when the user presses "Ok".*/ bool editList(TQWidget *w, TQStringList &list); - /*! This function creates a little editor to modify rich text. It supports tqalignment, + /*! This function creates a little editor to modify rich text. It supports alignment, subscript and superscript and all basic formatting properties. If the user presses "Ok", the edited text is put in \a text. If he presses "Cancel", nothing happens. */ diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp index c9f9bd9b..55f8cde6 100644 --- a/kexi/formeditor/widgetlibrary.cpp +++ b/kexi/formeditor/widgetlibrary.cpp @@ -79,10 +79,10 @@ class WidgetLibraryPrivate /*! @todo: reenable */ advancedProperties.insert("palette", (char*)1); advancedProperties.insert("backgroundOrigin", (char*)1); advancedProperties.insert("backgroundMode", (char*)1);//this is rather useless - advancedProperties.insert("tqlayout", (char*)1);// too large risk to break things + advancedProperties.insert("layout", (char*)1);// too large risk to break things // by providing this in propeditor - advancedProperties.insert("tqminimumSize", (char*)1); - advancedProperties.insert("tqmaximumSize", (char*)1); + advancedProperties.insert("minimumSize", (char*)1); + advancedProperties.insert("maximumSize", (char*)1); #ifdef KEXI_NO_UNFINISHED /*! @todo reenable */ advancedProperties.insert("paletteBackgroundPixmap", (char*)1); @@ -219,8 +219,8 @@ WidgetLibrary::lookupFactories() if (KFormDesigner::version()!=factoryVersion) { kdWarning() << TQString("WidgetLibrary::lookupFactories(): factory '%1'" " has version '%2' but required Widget Factory version is '%3'\n" - " -- skipping this factory!").tqarg(ptr->library()).tqarg(factoryVersion) - .tqarg(KFormDesigner::version()) << endl; + " -- skipping this factory!").arg(ptr->library()).arg(factoryVersion) + .arg(KFormDesigner::version()) << endl; continue; } d->services.insert(ptr->library().latin1(), new KService::Ptr( ptr )); @@ -532,7 +532,7 @@ WidgetLibrary::iconName(const TQCString &classname) if(wi) return wi->pixmap(); - return TQString::tqfromLatin1("unknown_widget"); + return TQString::fromLatin1("unknown_widget"); } bool @@ -739,7 +739,7 @@ WidgetFactory::CreateWidgetOptions WidgetLibrary::showOrientationSelectionPopup( textVertical = i18n("InsertQt::Vertical Widget", "InsertQt::Vertical"); KPopupMenu* popup = new KPopupMenu(parent, "orientationSelectionPopup"); - popup->insertTitle(SmallIcon(wclass->pixmap()), i18n("Insert Widget: %1").tqarg(wclass->name())); + popup->insertTitle(SmallIcon(wclass->pixmap()), i18n("Insert Widget: %1").arg(wclass->name())); popup->insertItem(iconHorizontal, textHorizontal, 1); popup->insertItem(iconVertical, textVertical, 2); popup->insertSeparator(); diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp index d06a5c2e..b76d326a 100644 --- a/kexi/formeditor/widgetpropertyset.cpp +++ b/kexi/formeditor/widgetpropertyset.cpp @@ -24,7 +24,7 @@ #include <tqmetaobject.h> #include <tqvariant.h> #include <tqevent.h> -#include <tqlayout.h> +#include <layout.h> #include <tqapplication.h> #include <tqeventloop.h> @@ -253,7 +253,7 @@ WidgetPropertySet::addWidget(TQWidget *w) //second widget, update metainfo d->set["this:className"].setValue("special:multiple"); d->set["this:classString"].setValue( - i18n("Multiple Widgets") + TQString(" (%1)").tqarg(d->widgets.count()) ); + i18n("Multiple Widgets") + TQString(" (%1)").arg(d->widgets.count()) ); d->set["this:iconName"].setValue("multiple_obj"); //name doesn't make sense for now d->set["name"].setValue(""); @@ -287,7 +287,7 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w) return; } - TQStrList pList = w->tqmetaObject()->propertyNames(true); + TQStrList pList = w->metaObject()->propertyNames(true); TQStrListIterator it(pList); // add subproperties if available @@ -309,7 +309,7 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w) const TQMetaProperty *subMeta = // special case - subproperty subpropIface ? subpropIface->findMetaSubproperty(it.current()) : 0; const TQMetaProperty *meta = subMeta ? subMeta - : w->tqmetaObject()->property( w->tqmetaObject()->findProperty(*it, true), true); + : w->metaObject()->property( w->metaObject()->findProperty(*it, true), true); if (!meta) continue; const char* propertyName = meta->name(); @@ -328,7 +328,7 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w) const bool oldValueExists = modifiedPropertiesIt!=modifiedProperties->constEnd(); if(meta->isEnumType()) { - if(qstrcmp(propertyName, "tqalignment") == 0) { + if(qstrcmp(propertyName, "alignment") == 0) { createAlignProperty(meta, w, subwidget); continue; } @@ -393,7 +393,7 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w) /*! let's forget it for now, until we have new complete events editor if (m_manager->lib()->advancedPropertiesVisible()) { // add the signals property - TQStrList strlist = w->tqmetaObject()->signalNames(true); + TQStrList strlist = w->metaObject()->signalNames(true); TQStrListIterator strIt(strlist); TQStringList list; for(; strIt.current() != 0; ++strIt) @@ -403,7 +403,7 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w) )); }*/ - if(KFormDesigner::FormManager::self()->activeForm() && tree->container()) // we are a container -> tqlayout property + if(KFormDesigner::FormManager::self()->activeForm() && tree->container()) // we are a container -> layout property createLayoutProperty(tree); } @@ -507,7 +507,7 @@ WidgetPropertySet::slotPropertyChanged(KoProperty::Set& set, KoProperty::Propert saveAlignProperty(property); return; } - else if((property == "tqlayout") || (property == "layoutMargin") || (property == "layoutSpacing")) { + else if((property == "layout") || (property == "layoutMargin") || (property == "layoutSpacing")) { saveLayoutProperty(property, value); return; } @@ -621,7 +621,7 @@ WidgetPropertySet::createPropertyCommandsInDesignMode(TQWidget* widget, else { WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(widget); TQWidget *subwidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : widget; - if (-1 != subwidget->tqmetaObject()->findProperty(it.key(), true) && subwidget->property(it.key())!=it.data()) { + if (-1 != subwidget->metaObject()->findProperty(it.key(), true) && subwidget->property(it.key())!=it.data()) { ObjectTreeItem *tree = KFormDesigner::FormManager::self()->activeForm()->objectTree()->lookup(widget->name()); if (tree) tree->addModifiedProperty(it.key(), subwidget->property(it.key())); @@ -678,7 +678,7 @@ WidgetPropertySet::isNameValid(const TQString &name) KMessageBox::sorry(KFormDesigner::FormManager::self()->activeForm()->widget(), i18n("Could not rename widget \"%1\" to \"%2\" because " "\"%3\" is not a valid name (identifier) for a widget.\n") - .tqarg(w->name()).tqarg(name).tqarg(name)); + .arg(w->name()).arg(name).arg(name)); d->slotPropertyChangedEnabled = false; d->set["name"].resetValue(); d->slotPropertyChangedEnabled = true; @@ -689,7 +689,7 @@ WidgetPropertySet::isNameValid(const TQString &name) KMessageBox::sorry( KFormDesigner::FormManager::self()->activeForm()->widget(), i18n("Could not rename widget \"%1\" to \"%2\" " "because a widget with the name \"%3\" already exists.\n") - .tqarg(w->name()).tqarg(name).tqarg(name)); + .arg(w->name()).arg(name).arg(name)); d->slotPropertyChangedEnabled = false; d->set["name"].resetValue(); d->slotPropertyChangedEnabled = true; @@ -740,7 +740,7 @@ WidgetPropertySet::eventFilter(TQObject *o, TQEvent *ev) if(d->set["geometry"].value() == o->property("geometry")) // to avoid infinite recursion return false; - d->set["geometry"] = TQT_TQWIDGET(o)->tqgeometry(); + d->set["geometry"] = TQT_TQWIDGET(o)->geometry(); } } else if(d->widgets.count() > 1 && ev->type() == TQEvent::Move) // the widget is being moved, we update the property @@ -775,8 +775,8 @@ WidgetPropertySet::createAlignProperty(const TQMetaProperty *meta, TQWidget *wid TQStringList list; TQString value; - const int tqalignment = subwidget->property("tqalignment").toInt(); - const TQStringList keys( TQStringList::fromStrList( meta->valueToKeys(tqalignment) ) ); + const int alignment = subwidget->property("alignment").toInt(); + const TQStringList keys( TQStringList::fromStrList( meta->valueToKeys(alignment) ) ); TQStrList *enumKeys = new TQStrList(meta->enumKeys()); const TQStringList possibleValues( TQStringList::fromStrList(*enumKeys) ); @@ -786,7 +786,7 @@ WidgetPropertySet::createAlignProperty(const TQMetaProperty *meta, TQWidget *wid bool isTopLevel = KFormDesigner::FormManager::self()->isTopLevel(widget); if(possibleValues.find("AlignHCenter")!=possibleValues.constEnd()) { - // Create the horizontal tqalignment property + // Create the horizontal alignment property if(keys.find("AlignHCenter")!=keys.constEnd() || keys.find("AlignCenter")!=keys.constEnd()) value = "AlignHCenter"; else if(keys.find("AlignRight")!=keys.constEnd()) @@ -812,7 +812,7 @@ WidgetPropertySet::createAlignProperty(const TQMetaProperty *meta, TQWidget *wid if(possibleValues.find("AlignTop")!=possibleValues.constEnd()) { - // Create the ver tqalignment property + // Create the ver alignment property if(keys.find("AlignTop")!=keys.constEnd()) value = "AlignTop"; else if(keys.find("AlignBottom")!=keys.constEnd()) @@ -837,7 +837,7 @@ WidgetPropertySet::createAlignProperty(const TQMetaProperty *meta, TQWidget *wid ) { // Create the wordbreak property KoProperty::Property *p = new KoProperty::Property("wordbreak", - TQVariant(tqalignment & TQt::WordBreak, 3), i18n("Word Break"), i18n("Word Break") ); + TQVariant(alignment & TQt::WordBreak, 3), i18n("Word Break"), i18n("Word Break") ); d->set.addProperty(p); updatePropertyValue(tree, "wordbreak"); if (!KFormDesigner::FormManager::self()->activeForm()->library()->isPropertyVisible( @@ -865,9 +865,9 @@ WidgetPropertySet::saveAlignProperty(const TQString &property) WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>( (TQWidget*)d->widgets.first() ); TQWidget *subwidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : (TQWidget*)d->widgets.first(); - int count = subwidget->tqmetaObject()->findProperty("tqalignment", true); - const TQMetaProperty *meta = subwidget->tqmetaObject()->property(count, true); - subwidget->setProperty("tqalignment", meta->keysToValue(list)); + int count = subwidget->metaObject()->findProperty("alignment", true); + const TQMetaProperty *meta = subwidget->metaObject()->property(count, true); + subwidget->setProperty("alignment", meta->keysToValue(list)); ObjectTreeItem *tree = KFormDesigner::FormManager::self()->activeForm()->objectTree()->lookup( d->widgets.first()->name() ); @@ -877,11 +877,11 @@ WidgetPropertySet::saveAlignProperty(const TQString &property) if(d->isUndoing) return; - if(d->lastCommand && d->lastCommand->property() == "tqalignment") + if(d->lastCommand && d->lastCommand->property() == "alignment") d->lastCommand->setValue(meta->keysToValue(list)); else { d->lastCommand = new PropertyCommand(this, d->widgets.first()->name(), - subwidget->property("tqalignment"), meta->keysToValue(list), "tqalignment"); + subwidget->property("alignment"), meta->keysToValue(list), "alignment"); KFormDesigner::FormManager::self()->activeForm()->addCommand(d->lastCommand, false); } } @@ -895,7 +895,7 @@ WidgetPropertySet::createLayoutProperty(ObjectTreeItem *item) if (!container || !KFormDesigner::FormManager::self()->activeForm() || !KFormDesigner::FormManager::self()->activeForm()->objectTree() || !container->widget()) return; - // special containers have no 'tqlayout' property, as it should not be changed + // special containers have no 'layout' property, as it should not be changed TQCString className = container->widget()->className(); if((className == "HBox") || (className == "VBox") || (className == "Grid")) return; @@ -905,12 +905,12 @@ WidgetPropertySet::createLayoutProperty(ObjectTreeItem *item) list << "NoLayout" << "HBox" << "VBox" << "Grid" << "HFlow" << "VFlow"; - KoProperty::Property *p = new KoProperty::Property("tqlayout", createValueList(0, list), value, + KoProperty::Property *p = new KoProperty::Property("layout", createValueList(0, list), value, i18n("Container's Layout"), i18n("Container's Layout")); p->setVisible( container->form()->library()->advancedPropertiesVisible() ); d->set.addProperty(p); - updatePropertyValue(item, "tqlayout"); + updatePropertyValue(item, "layout"); p = new KoProperty::Property("layoutMargin", container->layoutMargin(), i18n("Layout Margin"), i18n("Layout Margin")); d->set.addProperty(p); @@ -938,14 +938,14 @@ WidgetPropertySet::saveLayoutProperty(const TQString &prop, const TQVariant &val return; container = item->container(); - if(prop == "tqlayout") { + if(prop == "layout") { Container::LayoutType type = Container::stringToLayoutType(value.toString()); - if(d->lastCommand && d->lastCommand->property() == "tqlayout" && !d->isUndoing) + if(d->lastCommand && d->lastCommand->property() == "layout" && !d->isUndoing) d->lastCommand->setValue(value); else if(!d->isUndoing) { d->lastCommand = new LayoutPropertyCommand(this, d->widgets.first()->name(), - d->set["tqlayout"].oldValue(), value); + d->set["layout"].oldValue(), value); KFormDesigner::FormManager::self()->activeForm()->addCommand(d->lastCommand, false); } @@ -959,13 +959,13 @@ WidgetPropertySet::saveLayoutProperty(const TQString &prop, const TQVariant &val return; } - if(prop == "layoutMargin" && container->tqlayout()) { + if(prop == "layoutMargin" && container->layout()) { container->setLayoutMargin(value.toInt()); - container->tqlayout()->setMargin(value.toInt()); + container->layout()->setMargin(value.toInt()); } - else if(prop == "layoutSpacing" && container->tqlayout()) { + else if(prop == "layoutSpacing" && container->layout()) { container->setLayoutSpacing(value.toInt()); - container->tqlayout()->setSpacing(value.toInt()); + container->layout()->setSpacing(value.toInt()); } ObjectTreeItem *tree = KFormDesigner::FormManager::self()->activeForm()->objectTree()->lookup(d->widgets.first()->name()); @@ -1000,8 +1000,8 @@ WidgetPropertySet::initPropertiesDescription() d->propCaption["enabled"] = i18n("Enabled"); d->propCaption["geometry"] = i18n("Geometry"); d->propCaption["sizePolicy"] = i18n("Size Policy"); - d->propCaption["tqminimumSize"] = i18n("Minimum Size"); - d->propCaption["tqmaximumSize"] = i18n("Maximum Size"); + d->propCaption["minimumSize"] = i18n("Minimum Size"); + d->propCaption["maximumSize"] = i18n("Maximum Size"); d->propCaption["font"] = i18n("Font"); d->propCaption["cursor"] = i18n("Cursor"); d->propCaption["paletteForegroundColor"] = i18n("Foreground Color"); diff --git a/kexi/formeditor/widgetpropertyset.h b/kexi/formeditor/widgetpropertyset.h index afb303d1..896d309c 100644 --- a/kexi/formeditor/widgetpropertyset.h +++ b/kexi/formeditor/widgetpropertyset.h @@ -157,21 +157,21 @@ class KFORMEDITOR_EXPORT WidgetPropertySet : public TQObject // Following functions are used to create special types of properties, different // from TQ_PROPERTY - /*! Creates the properties related to tqalignment (ie hAlign, vAlign and WordBreak) for + /*! Creates the properties related to alignment (ie hAlign, vAlign and WordBreak) for the TQWidget \a widget. \a subwidget is the same as \a widget if the widget itself handles the property and it's a child widget if the child handles the property. For example, the second case is true for KexiDBAutoField. - \a meta is the TQMetaProperty for "tqalignment" property" of subwidget. */ + \a meta is the TQMetaProperty for "alignment" property" of subwidget. */ void createAlignProperty(const TQMetaProperty *meta, TQWidget *widget, TQWidget *subwidget); - /*! Saves the properties related to tqalignment (ie hAlign, vAlign and WordBreak) - and modifies the "tqalignment" property of the widget.*/ + /*! Saves the properties related to alignment (ie hAlign, vAlign and WordBreak) + and modifies the "alignment" property of the widget.*/ void saveAlignProperty(const TQString &property); - /*! Creates the "tqlayout" property, for the Container representing \a item. */ + /*! Creates the "layout" property, for the Container representing \a item. */ void createLayoutProperty(ObjectTreeItem *item); - /*! Saves the "tqlayout" property and changes the Container 's tqlayout ( + /*! Saves the "layout" property and changes the Container 's layout ( using Container::setLayout() ).*/ void saveLayoutProperty(const TQString &property, const TQVariant &value); diff --git a/kexi/formeditor/widgetwithsubpropertiesinterface.cpp b/kexi/formeditor/widgetwithsubpropertiesinterface.cpp index aa84f831..362214a1 100644 --- a/kexi/formeditor/widgetwithsubpropertiesinterface.cpp +++ b/kexi/formeditor/widgetwithsubpropertiesinterface.cpp @@ -41,11 +41,11 @@ void WidgetWithSubpropertiesInterface::setSubwidget(TQWidget *widget) TQAsciiDict<char> addedSubproperies(1024); if (m_subwidget) { //remember properties in the subwidget that are not present in the parent - for( TQMetaObject *tqmetaObject = m_subwidget->tqmetaObject(); tqmetaObject; tqmetaObject = tqmetaObject->tqsuperClass()) { - const int numProperties = tqmetaObject->numProperties(); + for( TQMetaObject *metaObject = m_subwidget->metaObject(); metaObject; metaObject = metaObject->superClass()) { + const int numProperties = metaObject->numProperties(); for (int i = 0; i < numProperties; i++) { - const char *propertyName = tqmetaObject->property( i )->name(); - if (dynamic_cast<TQObject*>(this)->tqmetaObject()->findProperty( propertyName, true )==-1 + const char *propertyName = metaObject->property( i )->name(); + if (dynamic_cast<TQObject*>(this)->metaObject()->findProperty( propertyName, true )==-1 && !addedSubproperies.find( propertyName ) ) { m_subproperies.append( propertyName ); @@ -73,10 +73,10 @@ const TQMetaProperty *WidgetWithSubpropertiesInterface::findMetaSubproperty(cons if (!m_subwidget || m_subproperies.find(name) == m_subproperies.constEnd()) { return 0; } - const int index = m_subwidget->tqmetaObject()->findProperty( name, true ); + const int index = m_subwidget->metaObject()->findProperty( name, true ); if (index==-1) return 0; - return m_subwidget->tqmetaObject()->property( index, true ); + return m_subwidget->metaObject()->property( index, true ); } TQVariant WidgetWithSubpropertiesInterface::subproperty( const char * name, bool &ok ) const diff --git a/kexi/kexidb/alter.cpp b/kexi/kexidb/alter.cpp index 5386d3d6..f4a1346f 100644 --- a/kexi/kexidb/alter.cpp +++ b/kexi/kexidb/alter.cpp @@ -181,7 +181,7 @@ int AlterTableHandler::alteringTypeForProperty(const TQCString& propertyName) if (KexiDB::isExtendedTableFieldProperty(propertyName)) return (int)ExtendedSchemaAlteringRequired; KexiDBWarn << TQString("AlterTableHandler::alteringTypeForProperty(): property \"%1\" not found!") - .tqarg(propertyName.data()) << endl; + .arg(propertyName.data()) << endl; } return res; } @@ -214,9 +214,9 @@ void AlterTableHandler::ChangeFieldPropertyAction::updateAlteringRequirements() TQString AlterTableHandler::ChangeFieldPropertyAction::debugString(const DebugOptions& debugOptions) { TQString s = TQString("Set \"%1\" property for table field \"%2\" to \"%3\"") - .tqarg(m_propertyName).tqarg(fieldName()).tqarg(m_newValue.toString()); + .arg(m_propertyName).arg(fieldName()).arg(m_newValue.toString()); if (debugOptions.showUID) - s.append(TQString(" (UID=%1)").tqarg(m_fieldUID)); + s.append(TQString(" (UID=%1)").arg(m_fieldUID)); return s; } @@ -267,7 +267,7 @@ static void debugActionDict(AlterTableHandler::ActionDict *dict, int fieldUID, b else fieldName = "??"; TQString dbg = TQString("Action dict for field \"%1\" (%2, UID=%3):") - .tqarg(fieldName).tqarg(dict->count()).tqarg(fieldUID); + .arg(fieldName).arg(dict->count()).arg(fieldUID); KexiDBDbg << dbg << endl; #ifdef KEXI_DEBUG_GUI if (simulate) @@ -495,9 +495,9 @@ void AlterTableHandler::RemoveFieldAction::updateAlteringRequirements() TQString AlterTableHandler::RemoveFieldAction::debugString(const DebugOptions& debugOptions) { - TQString s = TQString("Remove table field \"%1\"").tqarg(fieldName()); + TQString s = TQString("Remove table field \"%1\"").arg(fieldName()); if (debugOptions.showUID) - s.append(TQString(" (UID=%1)").tqarg(uid())); + s.append(TQString(" (UID=%1)").arg(uid())); return s; } @@ -583,11 +583,11 @@ void AlterTableHandler::InsertFieldAction::updateAlteringRequirements() TQString AlterTableHandler::InsertFieldAction::debugString(const DebugOptions& debugOptions) { TQString s = TQString("Insert table field \"%1\" at position %2") - .tqarg(m_field->name()).tqarg(m_index); + .arg(m_field->name()).arg(m_index); if (debugOptions.showUID) - s.append(TQString(" (UID=%1)").tqarg(m_fieldUID)); + s.append(TQString(" (UID=%1)").arg(m_fieldUID)); if (debugOptions.showFieldDebug) - s.append(TQString(" (%1)").tqarg(m_field->debugString())); + s.append(TQString(" (%1)").arg(m_field->debugString())); return s; } @@ -710,9 +710,9 @@ void AlterTableHandler::MoveFieldPositionAction::updateAlteringRequirements() TQString AlterTableHandler::MoveFieldPositionAction::debugString(const DebugOptions& debugOptions) { TQString s = TQString("Move table field \"%1\" to position %2") - .tqarg(fieldName()).tqarg(m_index); + .arg(fieldName()).arg(m_index); if (debugOptions.showUID) - s.append(TQString(" (UID=%1)").tqarg(uid())); + s.append(TQString(" (UID=%1)").arg(uid())); return s; } @@ -878,7 +878,7 @@ TableSchema* AlterTableHandler::execute(const TQString& tableName, ExecutionArgu } } // - Debug - TQString dbg = TQString("** Overall altering requirements: %1").tqarg(args.requirements); + TQString dbg = TQString("** Overall altering requirements: %1").arg(args.requirements); KexiDBDbg << dbg << endl; if (args.onlyComputeRequirements) { @@ -892,14 +892,14 @@ TableSchema* AlterTableHandler::execute(const TQString& tableName, ExecutionArgu if (args.simulate) KexiUtils::addAlterTableActionDebug(dbg, 0); #endif - dbg = TQString("** Ordered, simplified actions (%1, was %2):").tqarg(currentActionsCount).tqarg(allActionsCount); + dbg = TQString("** Ordered, simplified actions (%1, was %2):").arg(currentActionsCount).arg(allActionsCount); KexiDBDbg << dbg << endl; #ifdef KEXI_DEBUG_GUI if (args.simulate) KexiUtils::addAlterTableActionDebug(dbg, 0); #endif for (int i=0; i<allActionsCount; i++) { - debugAction(actionsVector[i], 1, args.simulate, TQString("%1: ").tqarg(i+1), args.debugString); + debugAction(actionsVector[i], 1, args.simulate, TQString("%1: ").arg(i+1), args.debugString); } if (args.requirements == 0) {//nothing to do @@ -918,7 +918,7 @@ TableSchema* AlterTableHandler::execute(const TQString& tableName, ExecutionArgu if (recreateTable) { TQString tempDestTableName; while (true) { - tempDestTableName = TQString("%1_temp%2%3").tqarg(newTable->name()).tqarg(TQString::number(rand(), 16)).tqarg(TQString::number(rand(), 16)); + tempDestTableName = TQString("%1_temp%2%3").arg(newTable->name()).arg(TQString::number(rand(), 16)).arg(TQString::number(rand(), 16)); if (!d->conn->tableSchema(tempDestTableName)) break; } @@ -1007,7 +1007,7 @@ TableSchema* AlterTableHandler::execute(const TQString& tableName, ExecutionArgu // -Some source fields can be skipped in case when there are deleted fields. // -Some destination fields can be skipped in case when there // are new empty fields without fixed/default value. - TQString sql = TQString("INSERT INTO %1 (").tqarg(d->conn->escapeIdentifier(newTable->name())); + TQString sql = TQString("INSERT INTO %1 (").arg(d->conn->escapeIdentifier(newTable->name())); //insert list of dest. fields bool first = true; TQString sourceFields; diff --git a/kexi/kexidb/connection.cpp b/kexi/kexidb/connection.cpp index 4af6cae6..017e75e4 100644 --- a/kexi/kexidb/connection.cpp +++ b/kexi/kexidb/connection.cpp @@ -254,8 +254,8 @@ bool Connection::connect() d->serverVersion.clear(); if (!(d->isConnected = drv_connect(d->serverVersion))) { setError(m_driver->isFileDriver() ? - i18n("Could not open \"%1\" project file.").tqarg(TQDir::convertSeparators(d->conn_data->fileName())) - : i18n("Could not connect to \"%1\" database server.").tqarg(d->conn_data->serverInfoString()) ); + i18n("Could not open \"%1\" project file.").arg(TQDir::convertSeparators(d->conn_data->fileName())) + : i18n("Could not connect to \"%1\" database server.").arg(d->conn_data->serverInfoString()) ); } return d->isConnected; } @@ -363,7 +363,7 @@ bool Connection::drv_databaseExists( const TQString &dbName, bool ignoreErrors ) if (list.find( dbName )==list.end()) { if (!ignoreErrors) - setError(ERR_OBJECT_NOT_FOUND, i18n("The database \"%1\" does not exist.").tqarg(dbName)); + setError(ERR_OBJECT_NOT_FOUND, i18n("The database \"%1\" does not exist.").arg(dbName)); return false; } @@ -384,19 +384,19 @@ bool Connection::databaseExists( const TQString &dbName, bool ignoreErrors ) if (!file.exists() || ( !file.isFile() && !file.isSymLink()) ) { if (!ignoreErrors) setError(ERR_OBJECT_NOT_FOUND, i18n("Database file \"%1\" does not exist.") - .tqarg(TQDir::convertSeparators(d->conn_data->fileName())) ); + .arg(TQDir::convertSeparators(d->conn_data->fileName())) ); return false; } if (!file.isReadable()) { if (!ignoreErrors) setError(ERR_ACCESS_RIGHTS, i18n("Database file \"%1\" is not readable.") - .tqarg(TQDir::convertSeparators(d->conn_data->fileName())) ); + .arg(TQDir::convertSeparators(d->conn_data->fileName())) ); return false; } if (!file.isWritable()) { if (!ignoreErrors) setError(ERR_ACCESS_RIGHTS, i18n("Database file \"%1\" is not writable.") - .tqarg(TQDir::convertSeparators(d->conn_data->fileName())) ); + .arg(TQDir::convertSeparators(d->conn_data->fileName())) ); return false; } return true; @@ -424,7 +424,7 @@ bool Connection::databaseExists( const TQString &dbName, bool ignoreErrors ) #define createDatabase_CLOSE \ { if (!closeDatabase()) { \ - setError(i18n("Database \"%1\" created but could not be closed after creation.").tqarg(dbName) ); \ + setError(i18n("Database \"%1\" created but could not be closed after creation.").arg(dbName) ); \ return false; \ } } @@ -438,12 +438,12 @@ bool Connection::createDatabase( const TQString &dbName ) return false; if (databaseExists( dbName )) { - setError(ERR_OBJECT_EXISTS, i18n("Database \"%1\" already exists.").tqarg(dbName) ); + setError(ERR_OBJECT_EXISTS, i18n("Database \"%1\" already exists.").arg(dbName) ); return false; } if (m_driver->isSystemDatabaseName( dbName )) { setError(ERR_SYSTEM_NAME_RESERVED, - i18n("Cannot create database \"%1\". This name is reserved for system database.").tqarg(dbName) ); + i18n("Cannot create database \"%1\". This name is reserved for system database.").arg(dbName) ); return false; } if (m_driver->isFileDriver()) { @@ -458,7 +458,7 @@ bool Connection::createDatabase( const TQString &dbName ) //low-level create if (!drv_createDatabase( dbName )) { - setError(i18n("Error creating database \"%1\" on the server.").tqarg(dbName) ); + setError(i18n("Error creating database \"%1\" on the server.").arg(dbName) ); closeDatabase();//sanity return false; } @@ -472,7 +472,7 @@ bool Connection::createDatabase( const TQString &dbName ) if (!tmpdbName.isEmpty() || !m_driver->d->isDBOpenedAfterCreate) { //db need to be opened if (!useDatabase( dbName, false/*not yet kexi compatible!*/ )) { - setError(i18n("Database \"%1\" created but could not be opened.").tqarg(dbName) ); + setError(i18n("Database \"%1\" created but could not be opened.").arg(dbName) ); return false; } } @@ -566,7 +566,7 @@ bool Connection::useDatabase( const TQString &dbName, bool kexiCompatible, bool if (!drv_useDatabase( my_dbName, cancelled, msgHandler )) { if (cancelled && *cancelled) return false; - TQString msg(i18n("Opening database \"%1\" failed.").tqarg( my_dbName )); + TQString msg(i18n("Opening database \"%1\" failed.").arg( my_dbName )); if (error()) setError( this, msg ); else @@ -589,7 +589,7 @@ bool Connection::useDatabase( const TQString &dbName, bool kexiCompatible, bool d->databaseVersion.major = num; /* if (true!=querySingleNumber( "select db_value from kexi__db where db_property=" + m_driver->escapeString(TQString("kexidb_major_ver")), num)) { - d->errorInvalidDBContents(notfound_str.tqarg("kexidb_major_ver")); + d->errorInvalidDBContents(notfound_str.arg("kexidb_major_ver")); return false; }*/ num = d->dbProperties->value("kexidb_minor_ver").toInt(&ok); @@ -598,7 +598,7 @@ bool Connection::useDatabase( const TQString &dbName, bool kexiCompatible, bool d->databaseVersion.minor = num; /* if (true!=querySingleNumber( "select db_value from kexi__db where db_property=" + m_driver->escapeString(TQString("kexidb_minor_ver")), num)) { - d->errorInvalidDBContents(notfound_str.tqarg("kexidb_minor_ver")); + d->errorInvalidDBContents(notfound_str.arg("kexidb_minor_ver")); return false; }*/ @@ -607,8 +607,8 @@ bool Connection::useDatabase( const TQString &dbName, bool kexiCompatible, bool if (m_driver->versionMajor()!=KexiDB::versionMajor()) { setError(ERR_INCOMPAT_DATABASE_VERSION, i18n("Database version (%1) does not match Kexi application's version (%2)") - .tqarg( TQString("%1.%2").tqarg(versionMajor()).tqarg(versionMinor()) ) - .tqarg( TQString("%1.%2").tqarg(KexiDB::versionMajor()).tqarg(KexiDB::versionMinor()) ) ); + .arg( TQString("%1.%2").arg(versionMajor()).arg(versionMinor()) ) + .arg( TQString("%1.%2").arg(KexiDB::versionMajor()).arg(KexiDB::versionMinor()) ) ); return false; } if (m_driver->versionMinor()!=KexiDB::versionMinor()) { @@ -686,7 +686,7 @@ bool Connection::useTemporaryDatabaseIfNeeded(TQString &tmpdbName) if (!ret) { setError(errorNum(), i18n("Error during starting temporary connection using \"%1\" database name.") - .tqarg(tmpdbName) ); + .arg(tmpdbName) ); return false; } } @@ -725,7 +725,7 @@ bool Connection::dropDatabase( const TQString &dbName ) } if (m_driver->isSystemDatabaseName( dbToDrop )) { - setError(ERR_SYSTEM_NAME_RESERVED, i18n("Cannot delete system database \"%1\".").tqarg(dbToDrop) ); + setError(ERR_SYSTEM_NAME_RESERVED, i18n("Cannot delete system database \"%1\".").arg(dbToDrop) ); return false; } @@ -765,7 +765,7 @@ TQStringList Connection::objectNames(int objType, bool* ok) if (objType==KexiDB::AnyObjectType) sql = "SELECT o_name FROM kexi__objects"; else - sql = TQString::tqfromLatin1("SELECT o_name FROM kexi__objects WHERE o_type=%1").tqarg(objType); + sql = TQString::fromLatin1("SELECT o_name FROM kexi__objects WHERE o_type=%1").arg(objType); Cursor *c = executeQuery(sql); if (!c) { @@ -852,7 +852,7 @@ TQValueList<int> Connection::objectIds(int objType) return list; Cursor *c = executeQuery( - TQString::tqfromLatin1("SELECT o_id, o_name FROM kexi__objects WHERE o_type=%1").tqarg(objType)); + TQString::fromLatin1("SELECT o_id, o_name FROM kexi__objects WHERE o_type=%1").arg(objType)); if (!c) return list; for (c->moveFirst(); !c->eof(); c->moveNext()) @@ -903,12 +903,12 @@ TQString Connection::createTableStatement( const KexiDB::TableSchema& tableSchem if (field->isFPNumericType() && field->precision()>0) { if (field->scale()>0) - v += TQString::tqfromLatin1("(%1,%2)").tqarg(field->precision()).tqarg(field->scale()); + v += TQString::fromLatin1("(%1,%2)").arg(field->precision()).arg(field->scale()); else - v += TQString::tqfromLatin1("(%1)").tqarg(field->precision()); + v += TQString::fromLatin1("(%1)").arg(field->precision()); } else if (field->type()==Field::Text && field->length()>0) - v += TQString::tqfromLatin1("(%1)").tqarg(field->length()); + v += TQString::fromLatin1("(%1)").arg(field->length()); if (autoinc) v += (" " + @@ -925,7 +925,7 @@ TQString Connection::createTableStatement( const KexiDB::TableSchema& tableSchem if (field->defaultValue().isValid()) { TQString valToSQL( m_driver->valueToSQL( field, field->defaultValue() ) ); if (!valToSQL.isEmpty()) //for sanity - v += TQString::tqfromLatin1(" DEFAULT ") + valToSQL; + v += TQString::fromLatin1(" DEFAULT ") + valToSQL; } } sql += v; @@ -1106,14 +1106,14 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, for (Field::ListIterator it = querySchema.fieldsIterator(); (f = it.current()); ++it, number++) { if (querySchema.isColumnVisible(number)) { if (!sql.isEmpty()) - sql += TQString::tqfromLatin1(", "); + sql += TQString::fromLatin1(", "); if (f->isQueryAsterisk()) { if (!singleTable && static_cast<QueryAsterisk*>(f)->isSingleTableAsterisk()) //single-table * sql += escapeIdentifier(f->table()->name(), options.identifierEscaping) + - TQString::tqfromLatin1(".*"); + TQString::fromLatin1(".*"); else //all-tables * (or simplified table.* when there's only one table) - sql += TQString::tqfromLatin1("*"); + sql += TQString::fromLatin1("*"); } else { if (f->isExpression()) { @@ -1137,7 +1137,7 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, } TQString aliasString = TQString(querySchema.columnAlias(number)); if (!aliasString.isEmpty()) - sql += (TQString::tqfromLatin1(" AS ") + aliasString); + sql += (TQString::fromLatin1(" AS ") + aliasString); //! @todo add option that allows to omit "AS" keyword } LookupFieldSchema *lookupFieldSchema = (options.addVisibleLookupColumns && f->table()) @@ -1159,16 +1159,16 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, { //add LEFT OUTER JOIN if (!s_additional_joins.isEmpty()) - s_additional_joins += TQString::tqfromLatin1(" "); + s_additional_joins += TQString::fromLatin1(" "); TQString internalUniqueTableAlias( TQString("__kexidb_") + lookupTable->name() + "_" + TQString::number(internalUniqueTableAliasNumber++) ); s_additional_joins += TQString("LEFT OUTER JOIN %1 AS %2 ON %3.%4=%5.%6") - .tqarg(escapeIdentifier(lookupTable->name(), options.identifierEscaping)) - .tqarg(internalUniqueTableAlias) - .tqarg(escapeIdentifier(f->table()->name(), options.identifierEscaping)) - .tqarg(escapeIdentifier(f->name(), options.identifierEscaping)) - .tqarg(internalUniqueTableAlias) - .tqarg(escapeIdentifier(boundField->name(), options.identifierEscaping)); + .arg(escapeIdentifier(lookupTable->name(), options.identifierEscaping)) + .arg(internalUniqueTableAlias) + .arg(escapeIdentifier(f->table()->name(), options.identifierEscaping)) + .arg(escapeIdentifier(f->name(), options.identifierEscaping)) + .arg(internalUniqueTableAlias) + .arg(escapeIdentifier(boundField->name(), options.identifierEscaping)); //add visibleField to the list of SELECTed fields //if it is not yet present there //not needed if (!querySchema.findTableField( visibleField->table()->name()+"."+visibleField->name() )) { @@ -1177,13 +1177,13 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, /* not true //table should be added after FROM if (!s_from_additional.isEmpty()) - s_from_additional += TQString::tqfromLatin1(", "); + s_from_additional += TQString::fromLatin1(", "); s_from_additional += escapeIdentifier(visibleField->table()->name(), options.identifierEscaping); */ } #endif if (!s_additional_fields.isEmpty()) - s_additional_fields += TQString::tqfromLatin1(", "); + s_additional_fields += TQString::fromLatin1(", "); // s_additional_fields += (internalUniqueTableAlias + "." //escapeIdentifier(visibleField->table()->name(), options.identifierEscaping) + "." // escapeIdentifier(visibleField->name(), options.identifierEscaping)); //! @todo Add lookup schema option for separator other than ' ' or even option for placeholders like "Name ? ?" @@ -1216,20 +1216,20 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, } //add LEFT OUTER JOIN if (!s_additional_joins.isEmpty()) - s_additional_joins += TQString::tqfromLatin1(" "); + s_additional_joins += TQString::fromLatin1(" "); TQString internalUniqueQueryAlias( kexidb_subquery_prefix + lookupQuery->name() + "_" + TQString::number(internalUniqueQueryAliasNumber++) ); s_additional_joins += TQString("LEFT OUTER JOIN (%1) AS %2 ON %3.%4=%5.%6") - .tqarg(selectStatement( *lookupQuery, params, options )) - .tqarg(internalUniqueQueryAlias) - .tqarg(escapeIdentifier(f->table()->name(), options.identifierEscaping)) - .tqarg(escapeIdentifier(f->name(), options.identifierEscaping)) - .tqarg(internalUniqueQueryAlias) - .tqarg(escapeIdentifier(boundColumnInfo->aliasOrName(), options.identifierEscaping)); + .arg(selectStatement( *lookupQuery, params, options )) + .arg(internalUniqueQueryAlias) + .arg(escapeIdentifier(f->table()->name(), options.identifierEscaping)) + .arg(escapeIdentifier(f->name(), options.identifierEscaping)) + .arg(internalUniqueQueryAlias) + .arg(escapeIdentifier(boundColumnInfo->aliasOrName(), options.identifierEscaping)); if (!s_additional_fields.isEmpty()) - s_additional_fields += TQString::tqfromLatin1(", "); + s_additional_fields += TQString::fromLatin1(", "); const TQValueList<uint> visibleColumns( lookupFieldSchema->visibleColumns() ); TQString expression; foreach (TQValueList<uint>::ConstIterator, visibleColumnsIt, visibleColumns) { @@ -1260,12 +1260,12 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, //add lookup fields if (!s_additional_fields.isEmpty()) - sql += (TQString::tqfromLatin1(", ") + s_additional_fields); + sql += (TQString::fromLatin1(", ") + s_additional_fields); if (options.alsoRetrieveROWID) { //append rowid column TQString s; if (!sql.isEmpty()) - s = TQString::tqfromLatin1(", "); + s = TQString::fromLatin1(", "); if (querySchema.masterTable()) s += (escapeIdentifier(querySchema.masterTable()->name())+"."); s += m_driver->beh->ROW_ID_FIELD_NAME; @@ -1275,7 +1275,7 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, sql.prepend("SELECT "); TableSchema::List* tables = querySchema.tables(); if ((tables && !tables->isEmpty()) || !subqueries_for_lookup_data.isEmpty()) { - sql += TQString::tqfromLatin1(" FROM "); + sql += TQString::fromLatin1(" FROM "); TQString s_from; if (tables) { TableSchema *table; @@ -1284,15 +1284,15 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, ++it, number++) { if (!s_from.isEmpty()) - s_from += TQString::tqfromLatin1(", "); + s_from += TQString::fromLatin1(", "); s_from += escapeIdentifier(table->name(), options.identifierEscaping); TQString aliasString = TQString(querySchema.tableAlias(number)); if (!aliasString.isEmpty()) - s_from += (TQString::tqfromLatin1(" AS ") + aliasString); + s_from += (TQString::fromLatin1(" AS ") + aliasString); } /*unused if (!s_from_additional.isEmpty()) {//additional tables list needed for lookup fields if (!s_from.isEmpty()) - s_from += TQString::tqfromLatin1(", "); + s_from += TQString::fromLatin1(", "); s_from += s_from_additional; }*/ } @@ -1302,11 +1302,11 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, subqueries_for_lookup_data.current(); ++it, subqueries_for_lookup_data_counter++) { if (!s_from.isEmpty()) - s_from += TQString::tqfromLatin1(", "); - s_from += TQString::tqfromLatin1("("); + s_from += TQString::fromLatin1(", "); + s_from += TQString::fromLatin1("("); s_from += selectStatement( *it.current(), params, options ); - s_from += TQString::tqfromLatin1(") AS %1%2") - .tqarg(kexidb_subquery_prefix).tqarg(subqueries_for_lookup_data_counter); + s_from += TQString::fromLatin1(") AS %1%2") + .arg(kexidb_subquery_prefix).arg(subqueries_for_lookup_data_counter); } sql += s_from; } @@ -1315,7 +1315,7 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, //JOINS if (!s_additional_joins.isEmpty()) { - sql += TQString::tqfromLatin1(" ") + s_additional_joins + TQString::tqfromLatin1(" "); + sql += TQString::fromLatin1(" ") + s_additional_joins + TQString::fromLatin1(" "); } //@todo: we're using WHERE for joins now; use INNER/LEFT/RIGHT JOIN later @@ -1328,24 +1328,24 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, wasWhere = true; } else - s_where += TQString::tqfromLatin1(" AND "); + s_where += TQString::fromLatin1(" AND "); Field::Pair *pair; TQString s_where_sub; for (TQPtrListIterator<Field::Pair> p_it(*rel->fieldPairs()); (pair = p_it.current()); ++p_it) { if (!s_where_sub.isEmpty()) - s_where_sub += TQString::tqfromLatin1(" AND "); + s_where_sub += TQString::fromLatin1(" AND "); s_where_sub += ( escapeIdentifier(pair->first->table()->name(), options.identifierEscaping) + - TQString::tqfromLatin1(".") + + TQString::fromLatin1(".") + escapeIdentifier(pair->first->name(), options.identifierEscaping) + - TQString::tqfromLatin1(" = ") + + TQString::fromLatin1(" = ") + escapeIdentifier(pair->second->table()->name(), options.identifierEscaping) + - TQString::tqfromLatin1(".") + + TQString::fromLatin1(".") + escapeIdentifier(pair->second->name(), options.identifierEscaping)); } if (rel->fieldPairs()->count()>1) { s_where_sub.prepend("("); - s_where_sub += TQString::tqfromLatin1(")"); + s_where_sub += TQString::fromLatin1(")"); } s_where += s_where_sub; } @@ -1362,7 +1362,7 @@ TQString Connection::selectStatement( KexiDB::QuerySchema& querySchema, } } if (!s_where.isEmpty()) - sql += TQString::tqfromLatin1(" WHERE ") + s_where; + sql += TQString::fromLatin1(" WHERE ") + s_where; //! \todo (js) add other sql parts //(use wasWhere here) @@ -1424,8 +1424,8 @@ TQ_ULLONG Connection::lastInsertedAutoIncValue(const TQString& aiFieldName, cons } RowData rdata; if (row_id<=0 || true!=querySingleRecord( - TQString::tqfromLatin1("SELECT ") + tableName + TQString::tqfromLatin1(".") + aiFieldName + TQString::tqfromLatin1(" FROM ") + tableName - + TQString::tqfromLatin1(" WHERE ") + m_driver->beh->ROW_ID_FIELD_NAME + TQString::tqfromLatin1("=") + TQString::number(row_id), rdata)) + TQString::fromLatin1("SELECT ") + tableName + TQString::fromLatin1(".") + aiFieldName + TQString::fromLatin1(" FROM ") + tableName + + TQString::fromLatin1(" WHERE ") + m_driver->beh->ROW_ID_FIELD_NAME + TQString::fromLatin1("=") + TQString::number(row_id), rdata)) { // KexiDBDbg << "Connection::lastInsertedAutoIncValue(): row_id<=0 || true!=querySingleRecord()" << endl; return (TQ_ULLONG)-1; //ULL; @@ -1541,7 +1541,7 @@ bool Connection::createTable( KexiDB::TableSchema* tableSchema, bool replaceExis if (m_driver->isSystemObjectName( tableName )) { clearError(); setError(ERR_SYSTEM_NAME_RESERVED, i18n("System name \"%1\" cannot be used as table name.") - .tqarg(tableSchema->name())); + .arg(tableSchema->name())); return false; } @@ -1550,7 +1550,7 @@ bool Connection::createTable( KexiDB::TableSchema* tableSchema, bool replaceExis clearError(); setError(ERR_SYSTEM_NAME_RESERVED, i18n("System name \"%1\" cannot be used as one of fields in \"%2\" table.") - .tqarg(sys_field->name()).tqarg(tableName)); + .arg(sys_field->name()).arg(tableName)); return false; } } @@ -1565,7 +1565,7 @@ bool Connection::createTable( KexiDB::TableSchema* tableSchema, bool replaceExis if (existingTable == tableSchema) { clearError(); setError(ERR_OBJECT_EXISTS, - i18n("Could not create the same table \"%1\" twice.").tqarg(tableSchema->name()) ); + i18n("Could not create the same table \"%1\" twice.").arg(tableSchema->name()) ); return false; } //TODO(js): update any structure (e.g. queries) that depend on this table! @@ -1579,7 +1579,7 @@ bool Connection::createTable( KexiDB::TableSchema* tableSchema, bool replaceExis else { if (this->tableSchema( tableSchema->name() ) != 0) { clearError(); - setError(ERR_OBJECT_EXISTS, i18n("Table \"%1\" already exists.").tqarg(tableSchema->name()) ); + setError(ERR_OBJECT_EXISTS, i18n("Table \"%1\" already exists.").arg(tableSchema->name()) ); return false; } } @@ -1707,7 +1707,7 @@ tristate Connection::dropTable( KexiDB::TableSchema* tableSchema, bool alsoRemov || this->tableSchema(tableSchema->name())!=tableSchema || this->tableSchema(tableSchema->id())!=tableSchema) { - setError(ERR_OBJECT_NOT_FOUND, errmsg.tqarg(tableSchema->name()) + setError(ERR_OBJECT_NOT_FOUND, errmsg.arg(tableSchema->name()) +i18n("Unexpected name or identifier.")); return false; } @@ -1718,7 +1718,7 @@ tristate Connection::dropTable( KexiDB::TableSchema* tableSchema, bool alsoRemov //sanity checks: if (m_driver->isSystemObjectName( tableSchema->name() )) { - setError(ERR_SYSTEM_NAME_RESERVED, errmsg.tqarg(tableSchema->name()) + d->strItIsASystemObject()); + setError(ERR_SYSTEM_NAME_RESERVED, errmsg.arg(tableSchema->name()) + d->strItIsASystemObject()); return false; } @@ -1757,7 +1757,7 @@ tristate Connection::dropTable( const TQString& table ) TableSchema* ts = tableSchema( table ); if (!ts) { setError(ERR_OBJECT_NOT_FOUND, i18n("Table \"%1\" does not exist.") - .tqarg(table)); + .arg(table)); return false; } return dropTable(ts); @@ -1772,7 +1772,7 @@ tristate Connection::alterTable( TableSchema& tableSchema, TableSchema& newTable if (&tableSchema == &newTableSchema) { setError(ERR_OBJECT_THE_SAME, i18n("Could not alter table \"%1\" using the same table.") - .tqarg(tableSchema.name())); + .arg(tableSchema.name())); return false; } //TODO(js): implement real altering @@ -1793,18 +1793,18 @@ bool Connection::alterTableName(TableSchema& tableSchema, const TQString& newNam { clearError(); if (&tableSchema!=d->tables[tableSchema.id()]) { - setError(ERR_OBJECT_NOT_FOUND, i18n("Unknown table \"%1\"").tqarg(tableSchema.name())); + setError(ERR_OBJECT_NOT_FOUND, i18n("Unknown table \"%1\"").arg(tableSchema.name())); return false; } if (newName.isEmpty() || !KexiUtils::isIdentifier(newName)) { - setError(ERR_INVALID_IDENTIFIER, i18n("Invalid table name \"%1\"").tqarg(newName)); + setError(ERR_INVALID_IDENTIFIER, i18n("Invalid table name \"%1\"").arg(newName)); return false; } const TQString oldTableName = tableSchema.name(); const TQString newTableName = newName.lower().stripWhiteSpace(); if (oldTableName.lower().stripWhiteSpace() == newTableName) { setError(ERR_OBJECT_THE_SAME, i18n("Could rename table \"%1\" using the same name.") - .tqarg(newTableName)); + .arg(newTableName)); return false; } //TODO: alter table name for server DB backends! @@ -1816,7 +1816,7 @@ bool Connection::alterTableName(TableSchema& tableSchema, const TQString& newNam if (!replace && destTableExists) { setError(ERR_OBJECT_EXISTS, i18n("Could not rename table \"%1\" to \"%2\". Table \"%3\" already exists.") - .tqarg(tableSchema.name()).tqarg(newName).tqarg(newName)); + .arg(tableSchema.name()).arg(newName).arg(newName)); return false; } @@ -1838,13 +1838,13 @@ bool Connection::alterTableName(TableSchema& tableSchema, const TQString& newNam } // the new table owns the previous table's id: - if (!executeSQL(TQString::tqfromLatin1("UPDATE kexi__objects SET o_id=%1 WHERE o_id=%2 AND o_type=%3") - .tqarg(origID).tqarg(tableSchema.id()).tqarg((int)TableObjectType))) + if (!executeSQL(TQString::fromLatin1("UPDATE kexi__objects SET o_id=%1 WHERE o_id=%2 AND o_type=%3") + .arg(origID).arg(tableSchema.id()).arg((int)TableObjectType))) { return false; } - if (!executeSQL(TQString::tqfromLatin1("UPDATE kexi__fields SET t_id=%1 WHERE t_id=%2") - .tqarg(origID).tqarg(tableSchema.id()))) + if (!executeSQL(TQString::fromLatin1("UPDATE kexi__fields SET t_id=%1 WHERE t_id=%2") + .arg(origID).arg(tableSchema.id()))) { return false; } @@ -1861,8 +1861,8 @@ bool Connection::alterTableName(TableSchema& tableSchema, const TQString& newNam // Update kexi__objects //TODO - if (!executeSQL(TQString::tqfromLatin1("UPDATE kexi__objects SET o_name=%1 WHERE o_id=%2") - .tqarg(m_driver->escapeString(tableSchema.name())).tqarg(tableSchema.id()))) + if (!executeSQL(TQString::fromLatin1("UPDATE kexi__objects SET o_name=%1 WHERE o_id=%2") + .arg(m_driver->escapeString(tableSchema.name())).arg(tableSchema.id()))) { alterTableName_ERR; return false; @@ -1889,8 +1889,8 @@ bool Connection::drv_alterTableName(TableSchema& tableSchema, const TQString& ne const TQString oldTableName = tableSchema.name(); tableSchema.setName(newName); - if (!executeSQL(TQString::tqfromLatin1("ALTER TABLE %1 RENAME TO %2") - .tqarg(escapeIdentifier(oldTableName)).tqarg(escapeIdentifier(newName)))) + if (!executeSQL(TQString::fromLatin1("ALTER TABLE %1 RENAME TO %2") + .arg(escapeIdentifier(oldTableName)).arg(escapeIdentifier(newName)))) { tableSchema.setName(oldTableName); //restore old name return false; @@ -1938,7 +1938,7 @@ bool Connection::dropQuery( const TQString& query ) QuerySchema* qs = querySchema( query ); if (!qs) { setError(ERR_OBJECT_NOT_FOUND, i18n("Query \"%1\" does not exist.") - .tqarg(query)); + .arg(query)); return false; } return dropQuery(qs); @@ -2014,7 +2014,7 @@ bool Connection::rollbackAutoCommitTransaction(const Transaction& trans) #define SET_ERR_TRANS_NOT_SUPP \ { setError(ERR_UNSUPPORTED_DRV_FEATURE, \ - i18n("Transactions are not supported for \"%1\" driver.").tqarg(m_driver->name() )); } + i18n("Transactions are not supported for \"%1\" driver.").arg(m_driver->name() )); } #define SET_BEGIN_TR_ERROR \ { if (!error()) \ @@ -2270,7 +2270,7 @@ bool Connection::setupObjectSchemaData( const RowData &data, SchemaData &sdata ) { //not found: retrieve schema /* KexiDB::Cursor *cursor; - if (!(cursor = executeQuery( TQString("select * from kexi__objects where o_id='%1'").tqarg(objId) ))) + if (!(cursor = executeQuery( TQString("select * from kexi__objects where o_id='%1'").arg(objId) ))) return false; if (!cursor->moveFirst()) { deleteCursor(cursor); @@ -2287,7 +2287,7 @@ bool Connection::setupObjectSchemaData( const RowData &data, SchemaData &sdata ) } sdata.m_name = data[2].toString(); if (!KexiUtils::isIdentifier( sdata.m_name )) { - setError(ERR_INVALID_IDENTIFIER, i18n("Invalid object name \"%1\"").tqarg(sdata.m_name)); + setError(ERR_INVALID_IDENTIFIER, i18n("Invalid object name \"%1\"").arg(sdata.m_name)); return false; } sdata.m_caption = data[3].toString(); @@ -2300,9 +2300,9 @@ bool Connection::setupObjectSchemaData( const RowData &data, SchemaData &sdata ) tristate Connection::loadObjectSchemaData( int objectID, SchemaData &sdata ) { RowData data; - if (true!=querySingleRecord(TQString::tqfromLatin1( + if (true!=querySingleRecord(TQString::fromLatin1( "SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE o_id=%1") - .tqarg(objectID), data)) + .arg(objectID), data)) return cancelled; return setupObjectSchemaData( data, sdata ); } @@ -2310,9 +2310,9 @@ tristate Connection::loadObjectSchemaData( int objectID, SchemaData &sdata ) tristate Connection::loadObjectSchemaData( int objectType, const TQString& objectName, SchemaData &sdata ) { RowData data; - if (true!=querySingleRecord(TQString::tqfromLatin1("SELECT o_id, o_type, o_name, o_caption, o_desc " + if (true!=querySingleRecord(TQString::fromLatin1("SELECT o_id, o_type, o_name, o_caption, o_desc " "FROM kexi__objects WHERE o_type=%1 AND lower(o_name)=%2") - .tqarg(objectType).tqarg(m_driver->valueToSQL(Field::Text, objectName.lower())), data)) + .arg(objectType).arg(m_driver->valueToSQL(Field::Text, objectName.lower())), data)) return cancelled; return setupObjectSchemaData( data, sdata ); } @@ -2324,9 +2324,9 @@ bool Connection::storeObjectSchemaData( SchemaData &sdata, bool newObject ) return false; if (newObject) { int existingID; - if (true == querySingleNumber(TQString::tqfromLatin1( + if (true == querySingleNumber(TQString::fromLatin1( "SELECT o_id FROM kexi__objects WHERE o_type=%1 AND lower(o_name)=%2") - .tqarg(sdata.type()).tqarg(m_driver->valueToSQL(Field::Text, sdata.name().lower())), existingID)) + .arg(sdata.type()).arg(m_driver->valueToSQL(Field::Text, sdata.name().lower())), existingID)) { //we already have stored a schema data with the same name and type: //just update it's properties as it would be existing object @@ -2366,9 +2366,9 @@ bool Connection::storeObjectSchemaData( SchemaData &sdata, bool newObject ) } //existing object: return executeSQL(TQString("UPDATE kexi__objects SET o_type=%2, o_caption=%3, o_desc=%4 WHERE o_id=%1") - .tqarg(sdata.id()).tqarg(sdata.type()) - .tqarg(m_driver->valueToSQL(KexiDB::Field::Text, sdata.caption())) - .tqarg(m_driver->valueToSQL(KexiDB::Field::Text, sdata.description())) ); + .arg(sdata.id()).arg(sdata.type()) + .arg(m_driver->valueToSQL(KexiDB::Field::Text, sdata.caption())) + .arg(m_driver->valueToSQL(KexiDB::Field::Text, sdata.description())) ); } tristate Connection::querySingleRecordInternal(RowData &data, const TQString* sql, QuerySchema* query, @@ -2407,7 +2407,7 @@ tristate Connection::querySingleRecord(QuerySchema& query, RowData &data, bool a bool Connection::checkIfColumnExists(Cursor *cursor, uint column) { if (column >= cursor->fieldCount()) { - setError(ERR_CURSOR_RECORD_FETCHING, i18n("Column %1 does not exist for the query.").tqarg(column)); + setError(ERR_CURSOR_RECORD_FETCHING, i18n("Column %1 does not exist for the query.").arg(column)); return false; } return true; @@ -2695,7 +2695,7 @@ bool Connection::loadExtendedTableSchemaData(TableSchema& tableSchema) int errorLine, errorColumn; if (!doc.setContent( extendedTableSchemaString, &errorMsg, &errorLine, &errorColumn )) loadExtendedTableSchemaData_ERR2( i18n("Error in XML data: \"%1\" in line %2, column %3.\nXML data: ") - .tqarg(errorMsg).tqarg(errorLine).tqarg(errorColumn) + extendedTableSchemaString.left(1024)); + .arg(errorMsg).arg(errorLine).arg(errorColumn) + extendedTableSchemaString.left(1024)); //! @todo look at the current format version (KEXIDB_EXTENDED_TABLE_SCHEMA_VERSION) @@ -2777,7 +2777,7 @@ KexiDB::Field* Connection::setupField( const RowData &data ) if (!KexiUtils::isIdentifier( data.at(2).toString() )) { setError(ERR_INVALID_IDENTIFIER, i18n("Invalid object name \"%1\"") - .tqarg( data.at(2).toString() )); + .arg( data.at(2).toString() )); ok = false; return 0; } @@ -2807,9 +2807,9 @@ KexiDB::TableSchema* Connection::setupTableSchema( const RowData &data ) KexiDB::Cursor *cursor; if (!(cursor = executeQuery( - TQString::tqfromLatin1("SELECT t_id, f_type, f_name, f_length, f_precision, f_constraints, " + TQString::fromLatin1("SELECT t_id, f_type, f_name, f_length, f_precision, f_constraints, " "f_options, f_default, f_order, f_caption, f_help" - " FROM kexi__fields WHERE t_id=%1 ORDER BY f_order").tqarg(t->m_id) ))) + " FROM kexi__fields WHERE t_id=%1 ORDER BY f_order").arg(t->m_id) ))) { delete t; return 0; @@ -2867,9 +2867,9 @@ TableSchema* Connection::tableSchema( const TQString& tableName ) return t; //not found: retrieve schema RowData data; - if (true!=querySingleRecord(TQString::tqfromLatin1( + if (true!=querySingleRecord(TQString::fromLatin1( "SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE lower(o_name)='%1' AND o_type=%2") - .tqarg(m_tableName).tqarg(KexiDB::TableObjectType), data)) + .arg(m_tableName).arg(KexiDB::TableObjectType), data)) return 0; return setupTableSchema(data); @@ -2882,9 +2882,9 @@ TableSchema* Connection::tableSchema( int tableId ) return t; //not found: retrieve schema RowData data; - if (true!=querySingleRecord(TQString::tqfromLatin1( + if (true!=querySingleRecord(TQString::fromLatin1( "SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE o_id=%1") - .tqarg(tableId), data)) + .arg(tableId), data)) return 0; return setupTableSchema(data); @@ -2904,7 +2904,7 @@ bool Connection::storeDataBlock( int objectID, const TQString &dataString, const { if (objectID<=0) return false; - TQString sql(TQString::tqfromLatin1("SELECT kexi__objectdata.o_id FROM kexi__objectdata WHERE o_id=%1").tqarg(objectID)); + TQString sql(TQString::fromLatin1("SELECT kexi__objectdata.o_id FROM kexi__objectdata WHERE o_id=%1").arg(objectID)); TQString sql_sub( KexiDB::sqlWhere(m_driver, KexiDB::Field::Text, "o_sub_id", dataID) ); bool ok, exists; @@ -2917,7 +2917,7 @@ bool Connection::storeDataBlock( int objectID, const TQString &dataString, const + " WHERE o_id=" + TQString::number(objectID) + " AND " + sql_sub ); } return executeSQL( - TQString::tqfromLatin1("INSERT INTO kexi__objectdata (o_id, o_data, o_sub_id) VALUES (") + TQString::fromLatin1("INSERT INTO kexi__objectdata (o_id, o_data, o_sub_id) VALUES (") + TQString::number(objectID) +"," + m_driver->valueToSQL( KexiDB::Field::LongText, dataString ) + "," + m_driver->valueToSQL( KexiDB::Field::Text, dataID ) + ")" ); } @@ -2943,7 +2943,7 @@ KexiDB::QuerySchema* Connection::setupQuerySchema( const RowData &data ) if (!loadDataBlock( objID, sqlText, "sql" )) { setError(ERR_OBJECT_NOT_FOUND, i18n("Could not find definition for query \"%1\". Removing this query is recommended.") - .tqarg(data[2].toString())); + .arg(data[2].toString())); return 0; } d->parser()->parse( sqlText ); @@ -2953,8 +2953,8 @@ KexiDB::QuerySchema* Connection::setupQuerySchema( const RowData &data ) setError(ERR_SQL_PARSE_ERROR, i18n("<p>Could not load definition for query \"%1\". " "SQL statement for this query is invalid:<br><tt>%2</tt></p>\n" - "<p>You can open this query in Text View and correct it.</p>").tqarg(data[2].toString()) - .tqarg(d->parser()->statement())); + "<p>You can open this query in Text View and correct it.</p>").arg(data[2].toString()) + .arg(d->parser()->statement())); return 0; } if (!setupObjectSchemaData( data, *query )) { @@ -2974,9 +2974,9 @@ QuerySchema* Connection::querySchema( const TQString& queryName ) return q; //not found: retrieve schema RowData data; - if (true!=querySingleRecord(TQString::tqfromLatin1( + if (true!=querySingleRecord(TQString::fromLatin1( "SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE lower(o_name)='%1' AND o_type=%2") - .tqarg(m_queryName).tqarg(KexiDB::QueryObjectType), data)) + .arg(m_queryName).arg(KexiDB::QueryObjectType), data)) return 0; return setupQuerySchema(data); @@ -2990,8 +2990,8 @@ QuerySchema* Connection::querySchema( int queryId ) //not found: retrieve schema clearError(); RowData data; - if (true!=querySingleRecord(TQString::tqfromLatin1( - "SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE o_id=%1").tqarg(queryId), data)) + if (true!=querySingleRecord(TQString::fromLatin1( + "SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects WHERE o_id=%1").arg(queryId), data)) return 0; return setupQuerySchema(data); @@ -3207,7 +3207,7 @@ bool Connection::updateRow(QuerySchema &query, RowData& data, RowEditBuffer& buf TQVariant val = data[ pkeyFieldsOrder[i] ]; if (val.isNull() || !val.isValid()) { setError(ERR_UPDATE_NULL_PKEY_FIELD, - i18n("Primary key's field \"%1\" cannot be empty.").tqarg(it.current()->name())); + i18n("Primary key's field \"%1\" cannot be empty.").arg(it.current()->name())); //js todo: pass the field's name somewhere! return false; } @@ -3291,7 +3291,7 @@ bool Connection::insertRow(QuerySchema &query, RowData& data, RowEditBuffer& buf KexiDBWarn << "NO ENTIRE MASTER TABLE's PKEY SPECIFIED!" << endl; setError(ERR_INSERT_NO_ENTIRE_MASTER_TABLES_PKEY, i18n("Could not insert row because it does not contain entire master table's primary key.") - .tqarg(query.name())); + .arg(query.name())); return false; } } @@ -3351,11 +3351,11 @@ bool Connection::insertRow(QuerySchema &query, RowData& data, RowEditBuffer& buf return false; } RowData aif_data; - TQString getAutoIncForInsertedValue = TQString::tqfromLatin1("SELECT ") + TQString getAutoIncForInsertedValue = TQString::fromLatin1("SELECT ") + query.autoIncrementSQLFieldsList(m_driver) - + TQString::tqfromLatin1(" FROM ") + + TQString::fromLatin1(" FROM ") + escapeIdentifier(id_columnInfo->field->table()->name()) - + TQString::tqfromLatin1(" WHERE ") + + TQString::fromLatin1(" WHERE ") + escapeIdentifier(id_columnInfo->field->name()) + "=" + TQString::number(last_id); if (true!=querySingleRecord(getAutoIncForInsertedValue, aif_data)) { @@ -3395,7 +3395,7 @@ bool Connection::deleteRow(QuerySchema &query, RowData& data, bool useROWID) KexiDBWarn << " -- NO MASTER TABLE!" << endl; setError(ERR_DELETE_NO_MASTER_TABLE, i18n("Could not delete row because there is no master table defined.") - .tqarg(query.name())); + .arg(query.name())); return false; } IndexSchema *pkey = (mt->primaryKey() && !mt->primaryKey()->fields()->isEmpty()) ? mt->primaryKey() : 0; @@ -3429,7 +3429,7 @@ bool Connection::deleteRow(QuerySchema &query, RowData& data, bool useROWID) TQVariant val = data[ pkeyFieldsOrder[i] ]; if (val.isNull() || !val.isValid()) { setError(ERR_DELETE_NULL_PKEY_FIELD, i18n("Primary key's field \"%1\" cannot be empty.") - .tqarg(it.current()->name())); + .arg(it.current()->name())); //js todo: pass the field's name somewhere! return false; } diff --git a/kexi/kexidb/cursor.cpp b/kexi/kexidb/cursor.cpp index dc95e30f..75c30cfa 100644 --- a/kexi/kexidb/cursor.cpp +++ b/kexi/kexidb/cursor.cpp @@ -57,7 +57,7 @@ Cursor::Cursor(Connection* conn, QuerySchema& query, uint options ) , m_options(options) { #ifdef KEXI_DEBUG_GUI - KexiUtils::addKexiDBDebug(TQString("Create cursor for query \"%1\": ").tqarg(query.name())+query.debugString()); + KexiUtils::addKexiDBDebug(TQString("Create cursor for query \"%1\": ").arg(query.name())+query.debugString()); #endif init(); } diff --git a/kexi/kexidb/dbobjectnamevalidator.cpp b/kexi/kexidb/dbobjectnamevalidator.cpp index 1edf5a25..9e384deb 100644 --- a/kexi/kexidb/dbobjectnamevalidator.cpp +++ b/kexi/kexidb/dbobjectnamevalidator.cpp @@ -45,7 +45,7 @@ Validator::Result ObjectNameValidator::internalCheck( return Validator::Ok; message = i18n("You cannot use name \"%1\" for your object.\n" "It is reserved for internal Kexi objects. Please choose another name.") - .tqarg(v.toString()); + .arg(v.toString()); details = i18n("Names of internal Kexi objects are starting with \"kexi__\"."); return Validator::Error; } diff --git a/kexi/kexidb/dbproperties.cpp b/kexi/kexidb/dbproperties.cpp index 44b69192..490a7390 100644 --- a/kexi/kexidb/dbproperties.cpp +++ b/kexi/kexidb/dbproperties.cpp @@ -38,31 +38,31 @@ bool DatabaseProperties::setValue( const TQString& _name, const TQVariant& value bool ok; //we need to know whether update or insert bool exists = m_conn->resultExists( - TQString::tqfromLatin1("SELECT 1 FROM kexi__db WHERE db_property=%1") - .tqarg(m_conn->driver()->escapeString(name)), ok); + TQString::fromLatin1("SELECT 1 FROM kexi__db WHERE db_property=%1") + .arg(m_conn->driver()->escapeString(name)), ok); if (!ok) { - setError(m_conn, i18n("Could not set value of database property \"%1\".").tqarg(name)); + setError(m_conn, i18n("Could not set value of database property \"%1\".").arg(name)); return false; } if (exists) { if (!m_conn->executeSQL( - TQString::tqfromLatin1("UPDATE kexi__db SET db_value=%1 WHERE db_property=%2") - .tqarg(m_conn->driver()->escapeString(value.toString())) - .tqarg(m_conn->driver()->escapeString(name)))) + TQString::fromLatin1("UPDATE kexi__db SET db_value=%1 WHERE db_property=%2") + .arg(m_conn->driver()->escapeString(value.toString())) + .arg(m_conn->driver()->escapeString(name)))) { - setError(m_conn, i18n("Could not set value of database property \"%1\".").tqarg(name)); + setError(m_conn, i18n("Could not set value of database property \"%1\".").arg(name)); return false; } return true; } if (!m_conn->executeSQL( - TQString::tqfromLatin1("INSERT INTO kexi__db (db_property, db_value) VALUES (%1, %2)") - .tqarg(m_conn->driver()->escapeString(name)) - .tqarg(m_conn->driver()->escapeString(value.toString())))) + TQString::fromLatin1("INSERT INTO kexi__db (db_property, db_value) VALUES (%1, %2)") + .arg(m_conn->driver()->escapeString(name)) + .arg(m_conn->driver()->escapeString(value.toString())))) { - setError(m_conn, i18n("Could not set value of database property \"%1\".").tqarg(name)); + setError(m_conn, i18n("Could not set value of database property \"%1\".").arg(name)); return false; } return true; @@ -76,31 +76,31 @@ bool DatabaseProperties::setCaption( const TQString& _name, const TQString& capt bool ok; //we need to know whether update or insert bool exists = m_conn->resultExists( - TQString::tqfromLatin1("SELECT 1 FROM kexi__db WHERE db_property=%1") - .tqarg(m_conn->driver()->escapeString(name)), ok); + TQString::fromLatin1("SELECT 1 FROM kexi__db WHERE db_property=%1") + .arg(m_conn->driver()->escapeString(name)), ok); if (!ok) { - setError(m_conn, i18n("Could not set caption for database property \"%1\".").tqarg(name)); + setError(m_conn, i18n("Could not set caption for database property \"%1\".").arg(name)); return false; } if (exists) { if (!m_conn->executeSQL( - TQString::tqfromLatin1("UPDATE kexi__db SET db_value=%1 WHERE db_property=%2") - .tqarg(m_conn->driver()->escapeString(caption)) - .tqarg(m_conn->driver()->escapeString(name)))) + TQString::fromLatin1("UPDATE kexi__db SET db_value=%1 WHERE db_property=%2") + .arg(m_conn->driver()->escapeString(caption)) + .arg(m_conn->driver()->escapeString(name)))) { - setError(m_conn, i18n("Could not set caption for database property \"%1\".").tqarg(name)); + setError(m_conn, i18n("Could not set caption for database property \"%1\".").arg(name)); return false; } return true; } if (!m_conn->executeSQL( - TQString::tqfromLatin1("INSERT INTO kexi__db (db_property, db_value) VALUES (%1, %2)") - .tqarg(m_conn->driver()->escapeString(name)) - .tqarg(m_conn->driver()->escapeString(caption)))) + TQString::fromLatin1("INSERT INTO kexi__db (db_property, db_value) VALUES (%1, %2)") + .arg(m_conn->driver()->escapeString(name)) + .arg(m_conn->driver()->escapeString(caption)))) { - setError(m_conn, i18n("Could not set caption for database property \"%1\".").tqarg(name)); + setError(m_conn, i18n("Could not set caption for database property \"%1\".").arg(name)); return false; } return true; @@ -111,9 +111,9 @@ TQVariant DatabaseProperties::value( const TQString& _name ) TQString result; TQString name(_name.stripWhiteSpace()); if (true!=m_conn->querySingleString( - TQString::tqfromLatin1("SELECT db_value FROM kexi__db WHERE db_property=") + TQString::fromLatin1("SELECT db_value FROM kexi__db WHERE db_property=") + m_conn->driver()->escapeString(name), result)) { - m_conn->setError(ERR_NO_DB_PROPERTY, i18n("Could not read database property \"%1\".").tqarg(name)); + m_conn->setError(ERR_NO_DB_PROPERTY, i18n("Could not read database property \"%1\".").arg(name)); return TQVariant(); } return result; @@ -126,9 +126,9 @@ TQString DatabaseProperties::caption( const TQString& _name ) //captions have ' ' prefix name.prepend(" "); if (true!=m_conn->querySingleString( - TQString::tqfromLatin1("SELECT db_value FROM kexi__db WHERE db_property=") + TQString::fromLatin1("SELECT db_value FROM kexi__db WHERE db_property=") + m_conn->driver()->escapeString(name), result)) { - setError(m_conn, i18n("Could not read database property \"%1\".").tqarg(name)); + setError(m_conn, i18n("Could not read database property \"%1\".").arg(name)); return TQString(); } return result; @@ -138,8 +138,8 @@ TQStringList DatabaseProperties::names() { TQStringList result; if (true!=m_conn->queryStringList( - TQString::tqfromLatin1("SELECT db_value FROM kexi__db WHERE db_property NOT LIKE ") - + m_conn->driver()->escapeString(TQString::tqfromLatin1(" %%")), result, 0 /*0-th*/)) { + TQString::fromLatin1("SELECT db_value FROM kexi__db WHERE db_property NOT LIKE ") + + m_conn->driver()->escapeString(TQString::fromLatin1(" %%")), result, 0 /*0-th*/)) { // ^^ exclude captions setError(m_conn, i18n("Could not read database properties.")); return TQStringList(); diff --git a/kexi/kexidb/driver.cpp b/kexi/kexidb/driver.cpp index 4db1b400..d760a004 100644 --- a/kexi/kexidb/driver.cpp +++ b/kexi/kexidb/driver.cpp @@ -106,16 +106,16 @@ bool Driver::isValid() { setError(ERR_INCOMPAT_DRIVER_VERSION, i18n("Incompatible database driver's \"%1\" version: found version %2, expected version %3.") - .tqarg(name()) - .tqarg(TQString("%1.%2").tqarg(version().major).tqarg(version().minor)) - .tqarg(TQString("%1.%2").tqarg(KexiDB::version().major).tqarg(KexiDB::version().minor))); + .arg(name()) + .arg(TQString("%1.%2").arg(version().major).arg(version().minor)) + .arg(TQString("%1.%2").arg(KexiDB::version().major).arg(KexiDB::version().minor))); return false; } - TQString inv_impl = i18n("Invalid database driver's \"%1\" implementation:\n").tqarg(name()); + TQString inv_impl = i18n("Invalid database driver's \"%1\" implementation:\n").arg(name()); TQString not_init = i18n("Value of \"%1\" is not initialized for the driver."); if (beh->ROW_ID_FIELD_NAME.isEmpty()) { - setError(ERR_INVALID_DRIVER_IMPL, inv_impl + not_init.tqarg("DriverBehaviour::ROW_ID_FIELD_NAME")); + setError(ERR_INVALID_DRIVER_IMPL, inv_impl + not_init.arg("DriverBehaviour::ROW_ID_FIELD_NAME")); return false; } @@ -135,7 +135,7 @@ TQString Driver::fileDBDriverMimeType() const { return d->fileDBDriverMimeType; } TQString Driver::defaultFileBasedDriverMimeType() -{ return TQString::tqfromLatin1("application/x-kexiproject-sqlite3"); } +{ return TQString::fromLatin1("application/x-kexiproject-sqlite3"); } TQString Driver::defaultFileBasedDriverName() { @@ -282,7 +282,7 @@ TQString Driver::valueToSQL( uint ftype, const TQVariant& v ) const return dateTimeToSQL( v.toDateTime() ); case Field::BLOB: { if (v.toByteArray().isEmpty()) - return TQString::tqfromLatin1("NULL"); + return TQString::fromLatin1("NULL"); if (v.type()==TQVariant::String) return escapeBLOB(v.toString().utf8()); return escapeBLOB(v.toByteArray()); diff --git a/kexi/kexidb/driver_p.cpp b/kexi/kexidb/driver_p.cpp index 8c7f096a..462ce608 100644 --- a/kexi/kexidb/driver_p.cpp +++ b/kexi/kexidb/driver_p.cpp @@ -85,7 +85,7 @@ void DriverPrivate::initInternalProperties() propertyCaptions["transaction_nested"] = i18n("Nested transactions support"); properties["kexidb_driver_version"] = - TQString("%1.%2").tqarg(version().major).tqarg(version().minor); + TQString("%1.%2").arg(version().major).arg(version().minor); propertyCaptions["kexidb_driver_version"] = i18n("KexiDB driver version"); } diff --git a/kexi/kexidb/drivermanager.cpp b/kexi/kexidb/drivermanager.cpp index 0a7ff574..1f348ddf 100644 --- a/kexi/kexidb/drivermanager.cpp +++ b/kexi/kexidb/drivermanager.cpp @@ -137,12 +137,12 @@ bool DriverManagerInternal::lookupDrivers() if (major_ver != KexiDB::version().major || minor_ver != KexiDB::version().minor) { KexiDBWarn << TQString("DriverManagerInternal::lookupDrivers(): '%1' driver" " has version '%2' but required KexiDB driver version is '%3.%4'\n" - " -- skipping this driver!").tqarg(srv_name.lower()).tqarg(srv_ver_str) - .tqarg(KexiDB::version().major).tqarg(KexiDB::version().minor) << endl; + " -- skipping this driver!").arg(srv_name.lower()).arg(srv_ver_str) + .arg(KexiDB::version().major).arg(KexiDB::version().minor) << endl; possibleProblems += TQString("\"%1\" database driver has version \"%2\" " "but required driver version is \"%3.%4\"") - .tqarg(srv_name.lower()).tqarg(srv_ver_str) - .tqarg(KexiDB::version().major).tqarg(KexiDB::version().minor); + .arg(srv_name.lower()).arg(srv_ver_str) + .arg(KexiDB::version().major).arg(KexiDB::version().minor); continue; } @@ -186,7 +186,7 @@ KexiDB::Driver::Info DriverManagerInternal::driverInfo(const TQString &name) { KexiDB::Driver::Info i = m_driversInfo[name.lower()]; if (!error() && i.name.isEmpty()) - setError(ERR_DRIVERMANAGER, i18n("Could not find database driver \"%1\".").tqarg(name) ); + setError(ERR_DRIVERMANAGER, i18n("Could not find database driver \"%1\".").arg(name) ); return i; } @@ -203,7 +203,7 @@ Driver* DriverManagerInternal::driver(const TQString& name) return drv; //cached if (!m_services_lcase.contains(name.lower())) { - setError(ERR_DRIVERMANAGER, i18n("Could not find database driver \"%1\".").tqarg(name) ); + setError(ERR_DRIVERMANAGER, i18n("Could not find database driver \"%1\".").arg(name) ); return 0; } @@ -216,7 +216,7 @@ Driver* DriverManagerInternal::driver(const TQString& name) if (!drv) { setError(ERR_DRIVERMANAGER, i18n("Could not load database driver \"%1\".") - .tqarg(name) ); + .arg(name) ); if (m_componentLoadingErrors.isEmpty()) {//fill errtable on demand m_componentLoadingErrors[KParts::ComponentFactory::ErrNoServiceFound]="ErrNoServiceFound"; m_componentLoadingErrors[KParts::ComponentFactory::ErrServiceProvidesNoLibrary]="ErrServiceProvidesNoLibrary"; @@ -360,7 +360,7 @@ KService::Ptr DriverManager::serviceInfo(const TQString &name) if (d_int->m_services_lcase.contains(name.lower())) { return *d_int->m_services_lcase.find(name.lower()); } else { - setError(ERR_DRIVERMANAGER, i18n("No such driver service: \"%1\".").tqarg(name) ); + setError(ERR_DRIVERMANAGER, i18n("No such driver service: \"%1\".").arg(name) ); return KService::Ptr(); } } @@ -425,7 +425,7 @@ TQString DriverManager::possibleProblemsInfoMsg() const for (TQStringList::ConstIterator it = d_int->possibleProblems.constBegin(); it!=d_int->possibleProblems.constEnd(); ++it) { - str += (TQString::tqfromLatin1("<li>") + *it + TQString::tqfromLatin1("</li>")); + str += (TQString::fromLatin1("<li>") + *it + TQString::fromLatin1("</li>")); } str += "</ul>"; return str; diff --git a/kexi/kexidb/drivers/mySQL/mysqlconnection.cpp b/kexi/kexidb/drivers/mySQL/mysqlconnection.cpp index 18682a4f..44853163 100644 --- a/kexi/kexidb/drivers/mySQL/mysqlconnection.cpp +++ b/kexi/kexidb/drivers/mySQL/mysqlconnection.cpp @@ -175,7 +175,7 @@ bool MySqlConnection::drv_containsTable( const TQString &tableName ) { bool success; return resultExists(TQString("show tables like %1") - .tqarg(driver()->escapeString(tableName)), success) && success; + .arg(driver()->escapeString(tableName)), success) && success; } bool MySqlConnection::drv_getTablesList( TQStringList &list ) diff --git a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp index 01d326af..0f2bcf9b 100644 --- a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp +++ b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp @@ -120,12 +120,12 @@ TQString MySqlDriver::escapeString(const TQString& str) const const int old_length = str.length(); int i; for ( i = 0; i < old_length; i++ ) { //anything to escape? - const unsigned int ch = str[i].tqunicode(); + const unsigned int ch = str[i].unicode(); if (ch == '\\' || ch == '\'' || ch == '"' || ch == '\n' || ch == '\r' || ch == '\t' || ch == '\b' || ch == '\0') break; } if (i >= old_length) { //no characters to escape - return TQString::tqfromLatin1("'") + str + TQString::tqfromLatin1("'"); + return TQString::fromLatin1("'") + str + TQString::fromLatin1("'"); } TQChar *new_string = new TQChar[ old_length * 3 + 1 ]; // a worst case approximation @@ -133,7 +133,7 @@ TQString MySqlDriver::escapeString(const TQString& str) const int new_length = 0; new_string[new_length++] = '\''; //prepend ' for ( i = 0; i < old_length; i++, new_length++ ) { - const unsigned int ch = str[i].tqunicode(); + const unsigned int ch = str[i].unicode(); if (ch == '\\') { new_string[new_length++] = '\\'; new_string[new_length] = '\\'; diff --git a/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp b/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp index c81f04ad..d6262bef 100644 --- a/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp +++ b/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp @@ -128,7 +128,7 @@ bool pqxxSqlConnection::drv_getDatabasesList( TQStringList &list ) // Read value of column 0 into a string N c[0].to(N); // Copy the result into the return list - list << TQString::tqfromLatin1 (N.c_str()); + list << TQString::fromLatin1 (N.c_str()); } return true; } @@ -190,15 +190,15 @@ bool pqxxSqlConnection::drv_useDatabase( const TQString &dbName, bool *cancelled if (data()->port == 0) data()->port = 5432; - conninfo += TQString::tqfromLatin1(" port='%1'").tqarg(data()->port); + conninfo += TQString::fromLatin1(" port='%1'").arg(data()->port); - conninfo += TQString::tqfromLatin1(" dbname='%1'").tqarg(dbName); + conninfo += TQString::fromLatin1(" dbname='%1'").arg(dbName); if (!data()->userName.isNull()) - conninfo += TQString::tqfromLatin1(" user='%1'").tqarg(data()->userName); + conninfo += TQString::fromLatin1(" user='%1'").arg(data()->userName); if (!data()->password.isNull()) - conninfo += TQString::tqfromLatin1(" password='%1'").tqarg(data()->password); + conninfo += TQString::fromLatin1(" password='%1'").arg(data()->password); try { @@ -346,7 +346,7 @@ bool pqxxSqlConnection::drv_containsTable( const TQString &tableName ) { bool success; return resultExists(TQString("select 1 from pg_class where relkind='r' and relname LIKE %1") - .tqarg(driver()->escapeString(tableName)), success) && success; + .arg(driver()->escapeString(tableName)), success) && success; } bool pqxxSqlConnection::drv_getTablesList( TQStringList &list ) diff --git a/kexi/kexidb/drivers/pqxx/pqxxcursor.h b/kexi/kexidb/drivers/pqxx/pqxxcursor.h index 637a33f3..8a61978d 100644 --- a/kexi/kexidb/drivers/pqxx/pqxxcursor.h +++ b/kexi/kexidb/drivers/pqxx/pqxxcursor.h @@ -79,7 +79,7 @@ inline TQVariant pgsqlCStrToVariant(const pqxx::result::field& r) switch(r.type()) { case BOOLOID: - return TQString::tqfromLatin1(r.c_str(), r.size())=="true"; //TODO check formatting + return TQString::fromLatin1(r.c_str(), r.size())=="true"; //TODO check formatting case INT2OID: case INT4OID: case INT8OID: diff --git a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp index 333df590..8967bc5e 100644 --- a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp +++ b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp @@ -133,9 +133,9 @@ bool pqxxSqlDriver::isSystemDatabaseName( const TQString& n ) const // TQString pqxxSqlDriver::escapeString( const TQString& str) const { - return TQString::tqfromLatin1("'") + return TQString::fromLatin1("'") + TQString::fromAscii( pqxx::sqlesc(std::string(str.utf8())).c_str() ) - + TQString::tqfromLatin1("'"); + + TQString::fromLatin1("'"); } //================================================================================== @@ -172,7 +172,7 @@ TQString pqxxSqlDriver::valueToSQL( uint ftype, const TQVariant& v ) const // use SQL compliant TRUE or FALSE as described here // http://www.postgresql.org/docs/8.0/interactive/datatype-boolean.html // 1 or 0 does not work - return v.toInt()==0 ? TQString::tqfromLatin1("FALSE") : TQString::tqfromLatin1("TRUE"); + return v.toInt()==0 ? TQString::fromLatin1("FALSE") : TQString::fromLatin1("TRUE"); } return Driver::valueToSQL(ftype, v); } diff --git a/kexi/kexidb/drivers/sqlite/sqliteadmin.cpp b/kexi/kexidb/drivers/sqlite/sqliteadmin.cpp index 14d2217a..1fb33233 100644 --- a/kexi/kexidb/drivers/sqlite/sqliteadmin.cpp +++ b/kexi/kexidb/drivers/sqlite/sqliteadmin.cpp @@ -46,7 +46,7 @@ bool SQLiteAdminTools::vacuum(const KexiDB::ConnectionData& data, const TQString #else KexiDB::DriverManager manager; KexiDB::Driver *drv = manager.driver(data.driverName); - TQString title( i18n("Could not compact database \"%1\".").tqarg(TQDir::convertSeparators(databaseName)) ); + TQString title( i18n("Could not compact database \"%1\".").arg(TQDir::convertSeparators(databaseName)) ); if (!drv) { setError(&manager, title); return false; diff --git a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp index 631f3bc6..cf478b94 100644 --- a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp +++ b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp @@ -130,7 +130,7 @@ bool SQLiteConnection::drv_containsTable( const TQString &tableName ) { bool success; return resultExists(TQString("select name from sqlite_master where type='table' and name LIKE %1") - .tqarg(driver()->escapeString(tableName)), success) && success; + .arg(driver()->escapeString(tableName)), success) && success; } bool SQLiteConnection::drv_getTablesList( TQStringList &list ) @@ -188,7 +188,7 @@ bool SQLiteConnection::drv_useDatabase( const TQString &dbName, bool *cancelled, d->res = sqlite3_open( //TQFile::encodeName( data()->fileName() ), - data()->fileName().utf8(), /* tqunicode expected since SQLite 3.1 */ + data()->fileName().utf8(), /* unicode expected since SQLite 3.1 */ &d->data, exclusiveFlag, allowReadonly /* If 1 and locking fails, try opening in read-only mode */ @@ -200,7 +200,7 @@ bool SQLiteConnection::drv_useDatabase( const TQString &dbName, bool *cancelled, if (KMessageBox::Continue != askQuestion( i18n("Do you want to open file \"%1\" as read-only?") - .tqarg(TQDir::convertSeparators(data()->fileName())) + .arg(TQDir::convertSeparators(data()->fileName())) + "\n\n" + i18n("The file is probably already open on this or another computer.") + " " + i18n("Could not gain exclusive access for writing the file."), @@ -264,7 +264,7 @@ bool SQLiteConnection::drv_dropDatabase( const TQString &dbName ) const TQString filename = data()->fileName(); if (TQFile(filename).exists() && !TQDir().remove(filename)) { setError(ERR_ACCESS_RIGHTS, i18n("Could not remove file \"%1\".") - .tqarg(TQDir::convertSeparators(filename)) + " " + .arg(TQDir::convertSeparators(filename)) + " " + i18n("Check the file's permissions and whether it is already opened and locked by another application.")); return false; } @@ -324,9 +324,9 @@ TQString SQLiteConnection::serverResultName() { TQString r = #ifdef SQLITE2 - TQString::tqfromLatin1( sqlite_error_string(d->res) ); + TQString::fromLatin1( sqlite_error_string(d->res) ); #else //SQLITE3 - TQString(); //tqfromLatin1( d->result_name ); + TQString(); //fromLatin1( d->result_name ); #endif return r.isEmpty() ? Connection::serverResultName() : r; } @@ -395,8 +395,8 @@ bool SQLiteConnection::drv_alterTableName(TableSchema& tableSchema, const TQStri //TODO indices, etc.??? // 3. copy all rows to the new table - if (!executeSQL(TQString::tqfromLatin1("INSERT INTO %1 SELECT * FROM %2") - .tqarg(escapeIdentifier(tableSchema.name())).tqarg(escapeIdentifier(oldTableName)))) + if (!executeSQL(TQString::fromLatin1("INSERT INTO %1 SELECT * FROM %2") + .arg(escapeIdentifier(tableSchema.name())).arg(escapeIdentifier(oldTableName)))) { drv_alterTableName_ERR; return false; diff --git a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp index 5239127c..20d80f9c 100644 --- a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp +++ b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp @@ -476,19 +476,19 @@ void SQLiteCursor::storeCurrentRow(RowData &data) const case Field::Integer: data[i] = TQVariant( TQCString(*col).toInt() ); case Field::BigInteger: - data[i] = TQVariant( TQString::tqfromLatin1(*col).toLongLong() ); + data[i] = TQVariant( TQString::fromLatin1(*col).toLongLong() ); case Field::Boolean: - data[i] = TQVariant( sqliteStringToBool(TQString::tqfromLatin1(*col)), 1 ); + data[i] = TQVariant( sqliteStringToBool(TQString::fromLatin1(*col)), 1 ); break; case Field::Date: - data[i] = TQDate::fromString( TQString::tqfromLatin1(*col), Qt::ISODate ); + data[i] = TQDate::fromString( TQString::fromLatin1(*col), Qt::ISODate ); break; case Field::Time: //TQDateTime - a hack needed because TQVariant(TQTime) has broken isNull() - data[i] = KexiUtils::stringToHackedTQTime(TQString::tqfromLatin1(*col)); + data[i] = KexiUtils::stringToHackedTQTime(TQString::fromLatin1(*col)); break; case Field::DateTime: { - TQString tmp( TQString::tqfromLatin1(*col) ); + TQString tmp( TQString::fromLatin1(*col) ); tmp[10] = 'T'; data[i] = TQDateTime::fromString( tmp, Qt::ISODate ); break; @@ -548,9 +548,9 @@ int SQLiteCursor::serverResult() TQString SQLiteCursor::serverResultName() { #ifdef SQLITE2 - return TQString::tqfromLatin1( sqlite_error_string(d->res) ); + return TQString::fromLatin1( sqlite_error_string(d->res) ); #else //SQLITE3 - return TQString::tqfromLatin1( d->result_name ); + return TQString::fromLatin1( d->result_name ); #endif } diff --git a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp index d24d906d..96802596 100644 --- a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp +++ b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp @@ -79,7 +79,7 @@ tristate SQLiteVacuum::run() } m_dlg = new KProgressDialog(0, 0, i18n("Compacting database"), "<qt>"+i18n("Compacting database \"%1\"...") - .tqarg("<nobr>"+TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())+"</nobr>") + .arg("<nobr>"+TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())+"</nobr>") ); m_dlg->adjustSize(); m_dlg->resize(300, m_dlg->height()); @@ -98,7 +98,7 @@ tristate SQLiteVacuum::run() const uint newSize = TQFileInfo(m_filePath).size(); const uint decrease = 100-100*newSize/origSize; KMessageBox::information(0, i18n("The database has been compacted. Current size decreased by %1% to %2.") - .tqarg(decrease).tqarg(KIO::convertSize(newSize))); + .arg(decrease).arg(KIO::convertSize(newSize))); } return m_result; } diff --git a/kexi/kexidb/expression.cpp b/kexi/kexidb/expression.cpp index 35ab8d70..d9a33b4c 100644 --- a/kexi/kexidb/expression.cpp +++ b/kexi/kexidb/expression.cpp @@ -82,7 +82,7 @@ Field::Type BaseExpr::type() TQString BaseExpr::debugString() { - return TQString("BaseExpr(%1,type=%1)").tqarg(m_token).tqarg(Driver::defaultSQLTypeName(type())); + return TQString("BaseExpr(%1,type=%1)").arg(m_token).arg(Driver::defaultSQLTypeName(type())); } bool BaseExpr::validate(ParseInfo& /*parseInfo*/) @@ -241,7 +241,7 @@ TQString UnaryExpr::debugString() return "UnaryExpr('" + tokenToDebugString() + "', " + (m_arg ? m_arg->debugString() : TQString("<NONE>")) - + TQString(",type=%1)").tqarg(Driver::defaultSQLTypeName(type())); + + TQString(",type=%1)").arg(Driver::defaultSQLTypeName(type())); } TQString UnaryExpr::toString(QuerySchemaParameterValueListIterator* params) @@ -256,7 +256,7 @@ TQString UnaryExpr::toString(QuerySchemaParameterValueListIterator* params) return (m_arg ? m_arg->toString(params) : "<NULL>") + " IS NULL"; if (m_token==SQL_IS_NOT_NULL) return (m_arg ? m_arg->toString(params) : "<NULL>") + " IS NOT NULL"; - return TQString("{INVALID_OPERATOR#%1} ").tqarg(m_token) + (m_arg ? m_arg->toString(params) : "<NULL>"); + return TQString("{INVALID_OPERATOR#%1} ").arg(m_token) + (m_arg ? m_arg->toString(params) : "<NULL>"); } void UnaryExpr::getQueryParameters(QuerySchemaParameterList& params) @@ -419,7 +419,7 @@ TQString BinaryExpr::debugString() + "," + (m_larg ? m_larg->debugString() : TQString("<NONE>")) + ",'" + tokenToDebugString() + "'," + (m_rarg ? m_rarg->debugString() : TQString("<NONE>")) - + TQString(",type=%1)").tqarg(Driver::defaultSQLTypeName(type())); + + TQString(",type=%1)").arg(Driver::defaultSQLTypeName(type())); } TQString BinaryExpr::tokenToString() @@ -449,7 +449,7 @@ TQString BinaryExpr::tokenToString() /* not handled here */ default:; } - return TQString("{INVALID_BINARY_OPERATOR#%1} ").tqarg(m_token); + return TQString("{INVALID_BINARY_OPERATOR#%1} ").arg(m_token); } TQString BinaryExpr::toString(QuerySchemaParameterValueListIterator* params) @@ -529,7 +529,7 @@ Field::Type ConstExpr::type() TQString ConstExpr::debugString() { return TQString("ConstExpr('") + tokenToDebugString() +"'," + toString() - + TQString(",type=%1)").tqarg(Driver::defaultSQLTypeName(type())); + + TQString(",type=%1)").arg(Driver::defaultSQLTypeName(type())); } TQString ConstExpr::toString(QuerySchemaParameterValueListIterator* params) @@ -601,13 +601,13 @@ void QueryParameterExpr::setType(Field::Type type) TQString QueryParameterExpr::debugString() { - return TQString("QueryParameterExpr('") + TQString::tqfromLatin1("[%2]").tqarg(value.toString()) - + TQString("',type=%1)").tqarg(Driver::defaultSQLTypeName(type())); + return TQString("QueryParameterExpr('") + TQString::fromLatin1("[%2]").arg(value.toString()) + + TQString("',type=%1)").arg(Driver::defaultSQLTypeName(type())); } TQString QueryParameterExpr::toString(QuerySchemaParameterValueListIterator* params) { - return params ? params->getPreviousValueAsString(type()) : TQString::tqfromLatin1("[%2]").tqarg(value.toString()); + return params ? params->getPreviousValueAsString(type()) : TQString::fromLatin1("[%2]").arg(value.toString()); } void QueryParameterExpr::getQueryParameters(QuerySchemaParameterList& params) @@ -656,7 +656,7 @@ VariableExpr* VariableExpr::copy() const TQString VariableExpr::debugString() { return TQString("VariableExpr(") + name - + TQString(",type=%1)").tqarg(field ? Driver::defaultSQLTypeName(type()) : TQString("FIELD NOT DEFINED YET")); + + TQString(",type=%1)").arg(field ? Driver::defaultSQLTypeName(type()) : TQString("FIELD NOT DEFINED YET")); } TQString VariableExpr::toString(QuerySchemaParameterValueListIterator* params) @@ -719,15 +719,15 @@ bool VariableExpr::validate(ParseInfo& parseInfo) parseInfo.errMsg = i18n("Ambiguous field name"); parseInfo.errDescr = i18n("Both table \"%1\" and \"%2\" have defined \"%3\" field. " "Use \"<tableName>.%4\" notation to specify table name.") - .tqarg(firstField->table()->name()).tqarg(f->table()->name()) - .tqarg(fieldName).tqarg(fieldName); + .arg(firstField->table()->name()).arg(f->table()->name()) + .arg(fieldName).arg(fieldName); return false; } } } if (!firstField) { parseInfo.errMsg = i18n("Field not found"); - parseInfo.errDescr = i18n("Table containing \"%1\" field not found").tqarg(fieldName); + parseInfo.errDescr = i18n("Table containing \"%1\" field not found").arg(fieldName); return false; } //ok @@ -754,8 +754,8 @@ bool VariableExpr::validate(ParseInfo& parseInfo) if (covered) { parseInfo.errMsg = i18n("Could not access the table directly using its name"); parseInfo.errDescr = i18n("Table \"%1\" is covered by aliases. Instead of \"%2\", " - "you can write \"%3\"").tqarg(tableName) - .tqarg(TQString(tableName+"."+fieldName)).tqarg(TQString(tableAlias+"."+fieldName.latin1())); + "you can write \"%3\"").arg(tableName) + .arg(TQString(tableName+"."+fieldName)).arg(TQString(tableAlias+"."+fieldName.latin1())); return false; } } @@ -773,7 +773,7 @@ bool VariableExpr::validate(ParseInfo& parseInfo) if (!ts) { parseInfo.errMsg = i18n("Table not found"); - parseInfo.errDescr = i18n("Unknown table \"%1\"").tqarg(tableName); + parseInfo.errDescr = i18n("Unknown table \"%1\"").arg(tableName); return false; } @@ -786,8 +786,8 @@ bool VariableExpr::validate(ParseInfo& parseInfo) //it's a table.* if (fieldName=="*") { if (positionsList->count()>1) { - parseInfo.errMsg = i18n("Ambiguous \"%1.*\" expression").tqarg(tableName); - parseInfo.errDescr = i18n("More than one \"%1\" table or alias defined").tqarg(tableName); + parseInfo.errMsg = i18n("Ambiguous \"%1.*\" expression").arg(tableName); + parseInfo.errDescr = i18n("More than one \"%1\" table or alias defined").arg(tableName); return false; } tableForQueryAsterisk = ts; @@ -800,7 +800,7 @@ bool VariableExpr::validate(ParseInfo& parseInfo) if (!realField) { parseInfo.errMsg = i18n("Field not found"); parseInfo.errDescr = i18n("Table \"%1\" has no \"%2\" field") - .tqarg(tableName).tqarg(fieldName); + .arg(tableName).arg(fieldName); return false; } @@ -815,9 +815,9 @@ bool VariableExpr::validate(ParseInfo& parseInfo) numberOfTheSameFields++; if (numberOfTheSameFields>1) { parseInfo.errMsg = i18n("Ambiguous \"%1.%2\" expression") - .tqarg(tableName).tqarg(fieldName); + .arg(tableName).arg(fieldName); parseInfo.errDescr = i18n("More than one \"%1\" table or alias defined containing \"%2\" field") - .tqarg(tableName).tqarg(fieldName); + .arg(tableName).arg(fieldName); return false; } } @@ -880,7 +880,7 @@ TQString FunctionExpr::debugString() res.append( TQString("FunctionExpr(") + name ); if (args) res.append(TQString(",") + args->debugString()); - res.append(TQString(",type=%1)").tqarg(Driver::defaultSQLTypeName(type()))); + res.append(TQString(",type=%1)").arg(Driver::defaultSQLTypeName(type()))); return res; } diff --git a/kexi/kexidb/field.cpp b/kexi/kexidb/field.cpp index 33e9e929..b12000ac 100644 --- a/kexi/kexidb/field.cpp +++ b/kexi/kexidb/field.cpp @@ -179,7 +179,7 @@ TQString Field::typeName(uint type) TQString Field::typeString(uint type) { m_typeNames.init(); - return (type <= LastType) ? m_typeNames.at((int)LastType+1 + type) : TQString("Type%1").tqarg(type); + return (type <= LastType) ? m_typeNames.at((int)LastType+1 + type) : TQString("Type%1").arg(type); } TQString Field::typeGroupName(uint typeGroup) @@ -191,7 +191,7 @@ TQString Field::typeGroupName(uint typeGroup) TQString Field::typeGroupString(uint typeGroup) { m_typeGroupNames.init(); - return (typeGroup <= LastTypeGroup) ? m_typeGroupNames.at((int)LastTypeGroup+1 + typeGroup) : TQString("TypeGroup%1").tqarg(typeGroup); + return (typeGroup <= LastTypeGroup) ? m_typeGroupNames.at((int)LastTypeGroup+1 + typeGroup) : TQString("TypeGroup%1").arg(typeGroup); } Field::Type Field::typeForString(const TQString& typeString) @@ -330,7 +330,7 @@ void Field::setType(Type t) { if (m_expr) { - KexiDBWarn << TQString("Field::setType(%1)").tqarg(t) + KexiDBWarn << TQString("Field::setType(%1)").arg(t) << " could not set type because the field has expression assigned!" << endl; return; } @@ -589,12 +589,12 @@ TQString Field::debugString() const dbg += (conn && conn->driver()) ? conn->driver()->sqlTypeName(type()) : Driver::defaultSQLTypeName(type()); if (isFPNumericType() && m_precision>0) { if (scale()>0) - dbg += TQString::tqfromLatin1("(%1,%2)").tqarg(m_precision).tqarg(scale()); + dbg += TQString::fromLatin1("(%1,%2)").arg(m_precision).arg(scale()); else - dbg += TQString::tqfromLatin1("(%1)").tqarg(m_precision); + dbg += TQString::fromLatin1("(%1)").arg(m_precision); } else if (m_type==Field::Text && m_length>0) - dbg += TQString::tqfromLatin1("(%1)").tqarg(m_length); + dbg += TQString::fromLatin1("(%1)").arg(m_length); if (m_constraints & Field::AutoInc) dbg += " AUTOINC"; if (m_constraints & Field::Unique) @@ -608,18 +608,18 @@ TQString Field::debugString() const if (m_constraints & Field::NotEmpty) dbg += " NOTEMPTY"; if (!m_defaultValue.isNull()) - dbg += TQString(" DEFAULT=[%1]").tqarg(m_defaultValue.typeName()) + KexiDB::variantToString(m_defaultValue); + dbg += TQString(" DEFAULT=[%1]").arg(m_defaultValue.typeName()) + KexiDB::variantToString(m_defaultValue); if (m_expr) dbg += " EXPRESSION=" + m_expr->debugString(); if (m_customProperties && !m_customProperties->isEmpty()) { - dbg += TQString(" CUSTOM PROPERTIES (%1): ").tqarg(m_customProperties->count()); + dbg += TQString(" CUSTOM PROPERTIES (%1): ").arg(m_customProperties->count()); bool first = true; foreach (CustomPropertiesMap::ConstIterator, it, *m_customProperties) { if (first) first = false; else dbg += ", "; - dbg += TQString("%1 = %2 (%3)").tqarg(TQString(it.key())).tqarg(TQString(it.data().toString())).tqarg(TQString(it.data().typeName())); + dbg += TQString("%1 = %2 (%3)").arg(TQString(it.key())).arg(TQString(it.data().toString())).arg(TQString(it.data().typeName())); } } return dbg; @@ -664,10 +664,10 @@ void Field::setCustomProperty(const TQCString& propertyName, const TQVariant& va //------------------------------------------------------- #define ADDTYPE(type, i18, str) this->at(Field::type) = i18; \ this->at(Field::type+Field::LastType+1) = str; \ - str2num.insert(TQString::tqfromLatin1(str).lower(), type) + str2num.insert(TQString::fromLatin1(str).lower(), type) #define ADDGROUP(type, i18, str) this->at(Field::type) = i18; \ this->at(Field::type+Field::LastTypeGroup+1) = str; \ - str2num.insert(TQString::tqfromLatin1(str).lower(), type) + str2num.insert(TQString::fromLatin1(str).lower(), type) Field::FieldTypeNames::FieldTypeNames() : TQValueVector<TQString>() diff --git a/kexi/kexidb/fieldlist.cpp b/kexi/kexidb/fieldlist.cpp index dea19876..292ba75e 100644 --- a/kexi/kexidb/fieldlist.cpp +++ b/kexi/kexidb/fieldlist.cpp @@ -94,7 +94,7 @@ void FieldList::renameField(KexiDB::Field *field, const TQString& newName) { if (!field || field != m_fields_by_name[ field->name() ]) { KexiDBFatal << "FieldList::renameField() no field found " - << (field ? TQString("\"%1\"").tqarg(field->name()) : TQString()) << endl; + << (field ? TQString("\"%1\"").arg(field->name()) : TQString()) << endl; return; } m_fields_by_name.take( field->name() ); @@ -157,7 +157,7 @@ void FieldList::debug() } static TQString subListWarning1(const TQString& fname) { - return TQString("FieldList::subList() could not find field \"%1\"").tqarg(fname); + return TQString("FieldList::subList() could not find field \"%1\"").arg(fname); } FieldList* FieldList::subList(const TQString& n1, const TQString& n2, @@ -212,7 +212,7 @@ FieldList* FieldList::subList(const TQValueList<uint>& list) foreach(TQValueList<uint>::ConstIterator, it, list) { f = field(*it); if (!f) { - KexiDBWarn << TQString("FieldList::subList() could not find field at position %1").tqarg(*it) << endl; + KexiDBWarn << TQString("FieldList::subList() could not find field at position %1").arg(*it) << endl; delete fl; return 0; } diff --git a/kexi/kexidb/fieldlist.h b/kexi/kexidb/fieldlist.h index fbf303a9..9db4f5a6 100644 --- a/kexi/kexidb/fieldlist.h +++ b/kexi/kexidb/fieldlist.h @@ -143,13 +143,13 @@ class KEXI_DB_EXPORT FieldList See @ref Connection::selectStatement() for example use. \a drvEscaping can be used to alter default escaping type. */ - TQString sqlFieldsList(Driver *driver, const TQString& separator = TQString::tqfromLatin1(","), + TQString sqlFieldsList(Driver *driver, const TQString& separator = TQString::fromLatin1(","), const TQString& tableAlias = TQString(), int drvEscaping = Driver::EscapeDriver|Driver::EscapeAsNecessary); /*! Like above, but this is convenient static function, so you can pass any \a list here. */ static TQString sqlFieldsList(Field::List* list, Driver *driver, - const TQString& separator = TQString::tqfromLatin1(","), const TQString& tableAlias = TQString(), + const TQString& separator = TQString::fromLatin1(","), const TQString& tableAlias = TQString(), int drvEscaping = Driver::EscapeDriver|Driver::EscapeAsNecessary); /*! @internal Renames field \a oldName to \a newName. diff --git a/kexi/kexidb/lookupfieldschema.cpp b/kexi/kexidb/lookupfieldschema.cpp index 62a0665e..05728d00 100644 --- a/kexi/kexidb/lookupfieldschema.cpp +++ b/kexi/kexidb/lookupfieldschema.cpp @@ -91,7 +91,7 @@ void LookupFieldSchema::RowSource::setValues(const TQStringList& values) TQString LookupFieldSchema::RowSource::debugString() const { return TQString("rowSourceType:'%1' rowSourceName:'%2' rowSourceValues:'%3'\n") - .tqarg(typeName()).tqarg(name()).tqarg(m_values ? m_values->join("|") : TQString()); + .arg(typeName()).arg(name()).arg(m_values ? m_values->join("|") : TQString()); } void LookupFieldSchema::RowSource::debug() const @@ -144,11 +144,11 @@ TQString LookupFieldSchema::debugString() const " boundColumn:%2 visibleColumns:%3 maximumListRows:%4 displayWidget:%5\n" " columnHeadersVisible:%6 limitToList:%7\n" " columnWidths:%8 )") - .tqarg(m_rowSource.debugString()) - .tqarg(m_boundColumn).tqarg(visibleColumnsString).tqarg(m_maximumListRows) - .tqarg( m_displayWidget==ComboBox ? "ComboBox" : "ListBox") - .tqarg(m_columnHeadersVisible).tqarg(m_limitToList) - .tqarg(columnWidthsStr); + .arg(m_rowSource.debugString()) + .arg(m_boundColumn).arg(visibleColumnsString).arg(m_maximumListRows) + .arg( m_displayWidget==ComboBox ? "ComboBox" : "ListBox") + .arg(m_columnHeadersVisible).arg(m_limitToList) + .arg(columnWidthsStr); } void LookupFieldSchema::debug() const diff --git a/kexi/kexidb/parser/parser_p.cpp b/kexi/kexidb/parser/parser_p.cpp index c2cece0b..38a7d386 100644 --- a/kexi/kexidb/parser/parser_p.cpp +++ b/kexi/kexidb/parser/parser_p.cpp @@ -142,10 +142,10 @@ void yyerror(const char *str) if (parser->isReservedKeyword(ctoken.latin1())) parser->setError( ParserError(i18n("Syntax Error"), - i18n("\"%1\" is a reserved keyword").tqarg(ctoken)+lexerErr, ctoken, current) ); + i18n("\"%1\" is a reserved keyword").arg(ctoken)+lexerErr, ctoken, current) ); else parser->setError( ParserError(i18n("Syntax Error"), - i18n("Syntax Error near \"%1\"").tqarg(ctoken)+lexerErr, ctoken, current) ); + i18n("Syntax Error near \"%1\"").arg(ctoken)+lexerErr, ctoken, current) ); } } } @@ -204,7 +204,7 @@ bool parseData(Parser *p, const char *data) { if(tableList.findRef(item->table()) == -1) { - ParserError err(i18n("Field List Error"), i18n("Unknown table '%1' in field list").tqarg(item->table()->name()), ctoken, current); + ParserError err(i18n("Field List Error"), i18n("Unknown table '%1' in field list").arg(item->table()->name()), ctoken, current); parser->setError(err); yyerror("fieldlisterror"); @@ -288,15 +288,15 @@ bool addColumn( ParseInfo& parseInfo, BaseExpr* columnExpr ) setError(i18n("Ambiguous field name"), i18n("Both table \"%1\" and \"%2\" have defined \"%3\" field. " "Use \"<tableName>.%4\" notation to specify table name.") - .tqarg(firstField->table()->name()).tqarg(f->table()->name()) - .tqarg(fieldName).tqarg(fieldName)); + .arg(firstField->table()->name()).arg(f->table()->name()) + .arg(fieldName).arg(fieldName)); return false; } } } if (!firstField) { setError(i18n("Field not found"), - i18n("Table containing \"%1\" field not found").tqarg(fieldName)); + i18n("Table containing \"%1\" field not found").arg(fieldName)); return false; } //ok @@ -321,8 +321,8 @@ bool addColumn( ParseInfo& parseInfo, BaseExpr* columnExpr ) if (covered) { setError(i18n("Could not access the table directly using its name"), i18n("Table \"%1\" is covered by aliases. Instead of \"%2\", " - "you can write \"%3\"").tqarg(tableName) - .tqarg(tableName+"."+fieldName).tqarg(tableAlias+"."+fieldName.latin1())); + "you can write \"%3\"").arg(tableName) + .arg(tableName+"."+fieldName).arg(tableAlias+"."+fieldName.latin1())); return false; } } @@ -348,8 +348,8 @@ bool addColumn( ParseInfo& parseInfo, BaseExpr* columnExpr ) if (fieldName=="*") { if (positionsList->count()>1) { - setError(i18n("Ambiguous \"%1.*\" expression").tqarg(tableName), - i18n("More than one \"%1\" table or alias defined").tqarg(tableName)); + setError(i18n("Ambiguous \"%1.*\" expression").arg(tableName), + i18n("More than one \"%1\" table or alias defined").arg(tableName)); return false; } parseInfo.querySchema->addAsterisk( new QueryAsterisk(parseInfo.querySchema, ts) ); @@ -368,9 +368,9 @@ bool addColumn( ParseInfo& parseInfo, BaseExpr* columnExpr ) if (otherTS->field(fieldName)) numberOfTheSameFields++; if (numberOfTheSameFields>1) { - setError(i18n("Ambiguous \"%1.%2\" expression").tqarg(tableName).tqarg(fieldName), + setError(i18n("Ambiguous \"%1.%2\" expression").arg(tableName).arg(fieldName), i18n("More than one \"%1\" table or alias defined containing \"%2\" field") - .tqarg(tableName).tqarg(fieldName)); + .arg(tableName).arg(fieldName)); return false; } } @@ -379,7 +379,7 @@ bool addColumn( ParseInfo& parseInfo, BaseExpr* columnExpr ) } else { setError(i18n("Field not found"), i18n("Table \"%1\" has no \"%2\" field") - .tqarg(tableName).tqarg(fieldName)); + .arg(tableName).arg(fieldName)); return false; } } @@ -436,7 +436,7 @@ QuerySchema* buildSelectQuery( TableSchema *s = parser->db()->tableSchema(TQString(tname)); if(!s) { setError(//i18n("Field List Error"), - i18n("Table \"%1\" does not exist").tqarg(TQString(tname))); + i18n("Table \"%1\" does not exist").arg(TQString(tname))); // yyerror("fieldlisterror"); CLEANUP; return 0; @@ -511,7 +511,7 @@ QuerySchema* buildSelectQuery( aliasVariable = e->toBinary()->right()->toVariable(); if (!aliasVariable) { setError(i18n("Invalid alias definition for column \"%1\"") - .tqarg(columnExpr->toString())); //ok? + .arg(columnExpr->toString())); //ok? CLEANUP; return 0; } @@ -542,7 +542,7 @@ QuerySchema* buildSelectQuery( e->toBinary()->m_larg = 0; } else { - setError(i18n("Invalid \"%1\" column definition").tqarg(e->toString())); //ok? + setError(i18n("Invalid \"%1\" column definition").arg(e->toString())); //ok? CLEANUP; return 0; } @@ -610,7 +610,7 @@ QuerySchema* buildSelectQuery( (*it).ascending, (*it).columnNumber-1 )) { setError(i18n("Could not define sorting - no column at position %1") - .tqarg((*it).columnNumber)); + .arg((*it).columnNumber)); CLEANUP; return 0; } @@ -619,7 +619,7 @@ QuerySchema* buildSelectQuery( Field * f = querySchema->findTableField((*it).aliasOrName); if (!f) { setError(i18n("Could not define sorting - " - "column name or alias \"%1\" does not exist").tqarg((*it).aliasOrName)); + "column name or alias \"%1\" does not exist").arg((*it).aliasOrName)); CLEANUP; return 0; } diff --git a/kexi/kexidb/parser/sqlparser.cpp b/kexi/kexidb/parser/sqlparser.cpp index 091d516b..c7c3aa99 100644 --- a/kexi/kexidb/parser/sqlparser.cpp +++ b/kexi/kexidb/parser/sqlparser.cpp @@ -3111,7 +3111,7 @@ YYACCEPT; Field *f = item->table()->field(item->name()); if(!f) { - ParserError err(i18n("Field List Error"), i18n("Unknown column '%1' in table '%2'").tqarg(item->name()).tqarg(schema->name()), ctoken, current); + ParserError err(i18n("Field List Error"), i18n("Unknown column '%1' in table '%2'").arg(item->name()).arg(schema->name()), ctoken, current); parser->setError(err); yyerror("fieldlisterror"); } diff --git a/kexi/kexidb/parser/sqlparser.y b/kexi/kexidb/parser/sqlparser.y index 7775885d..5a8357f2 100644 --- a/kexi/kexidb/parser/sqlparser.y +++ b/kexi/kexidb/parser/sqlparser.y @@ -1201,7 +1201,7 @@ IDENTIFIER Field *f = item->table()->field(item->name()); if(!f) { - ParserError err(i18n("Field List Error"), i18n("Unknown column '%1' in table '%2'").tqarg(item->name()).tqarg(schema->name()), ctoken, current); + ParserError err(i18n("Field List Error"), i18n("Unknown column '%1' in table '%2'").arg(item->name()).arg(schema->name()), ctoken, current); parser->setError(err); yyerror("fieldlisterror"); } @@ -1360,7 +1360,7 @@ ColWildCard: { $$ = new VariableExpr($1); KexiDBDbg << " Invalid identifier! " << $1 << endl; - setError(i18n("Invalid identifier \"%1\"").tqarg($1)); + setError(i18n("Invalid identifier \"%1\"").arg($1)); }*/ ; diff --git a/kexi/kexidb/queryschema.cpp b/kexi/kexidb/queryschema.cpp index b77f76a3..47e5d95c 100644 --- a/kexi/kexidb/queryschema.cpp +++ b/kexi/kexidb/queryschema.cpp @@ -53,7 +53,7 @@ TQString QueryColumnInfo::debugString() const { return field->name() + ( alias.isEmpty() ? TQString() - : (TQString::tqfromLatin1(" AS ") + TQString(alias)) ); + : (TQString::fromLatin1(" AS ") + TQString(alias)) ); } //======================================= @@ -402,11 +402,11 @@ TQString OrderByColumn::debugString() const if (m_column) { if (m_pos>-1) return TQString("COLUMN_AT_POSITION_%1(%2, %3)") - .tqarg(m_pos+1).tqarg(m_column->debugString()).tqarg(orderString); + .arg(m_pos+1).arg(m_column->debugString()).arg(orderString); else - return TQString("COLUMN(%1, %2)").tqarg(m_column->debugString()).tqarg(orderString); + return TQString("COLUMN(%1, %2)").arg(m_column->debugString()).arg(orderString); } - return m_field ? TQString("FIELD(%1, %2)").tqarg(m_field->debugString()).tqarg(orderString) + return m_field ? TQString("FIELD(%1, %2)").arg(m_field->debugString()).arg(orderString) : TQString("NONE"); } @@ -801,7 +801,7 @@ TQString QuerySchema::debugString() else { dbg1 = "<NONE>\n"; } - dbg1.prepend( TQString("(%1):\n").tqarg(fieldsExpandedCount) ); + dbg1.prepend( TQString("(%1):\n").arg(fieldsExpandedCount) ); dbg += dbg1; //it's safer to delete fieldsExpanded for now @@ -816,7 +816,7 @@ TQString QuerySchema::debugString() if (tablePos>=0) { TQCString tAlias = tableAlias(tablePos); if (!tAlias.isEmpty()) { - dbg2 += (TQString::tqfromLatin1(" field \"") + FieldList::field(i)->name() + dbg2 += (TQString::fromLatin1(" field \"") + FieldList::field(i)->name() + "\" uses alias \"" + TQString(tAlias) + "\" of table \"" + d->tables.at(tablePos)->name() + "\"\n"); } @@ -847,7 +847,7 @@ TQString QuerySchema::debugString() for (int i=0; it.current(); ++it, i++) { TQCString *alias = d->columnAlias(i); if (alias) - aliases += (TQString("field #%1: ").tqarg(i) + aliases += (TQString("field #%1: ").arg(i) + (it.current()->name().isEmpty() ? "<noname>" : it.current()->name()) + " -> " + (const char*)*alias + "\n"); } @@ -862,7 +862,7 @@ TQString QuerySchema::debugString() for (int i=0; t_it.current(); ++t_it, i++) { TQCString *alias = d->tableAliases[i]; if (alias) - aliases += (TQString("table #%1: ").tqarg(i) + aliases += (TQString("table #%1: ").arg(i) + (t_it.current()->name().isEmpty() ? "<noname>" : t_it.current()->name()) + " -> " + (const char*)*alias + "\n"); } @@ -872,7 +872,7 @@ TQString QuerySchema::debugString() if (!where.isEmpty()) dbg += (TQString("\n-WHERE EXPRESSION:\n") + where); if (!orderByColumnList().isEmpty()) - dbg += (TQString("\n-ORDER BY (%1):\n").tqarg(orderByColumnList().count()) + dbg += (TQString("\n-ORDER BY (%1):\n").arg(orderByColumnList().count()) + orderByColumnList().debugString()); return dbg; } @@ -1291,8 +1291,8 @@ void QuerySchema::computeFieldsExpanded() // (the expression object will be owned by column info) visibleColumn = new Field(); visibleColumn->setName( - TQString::tqfromLatin1("[multiple_visible_fields_%1]") - .tqarg( ++numberOfColumnsWithMultipleVisibleFields )); + TQString::fromLatin1("[multiple_visible_fields_%1]") + .arg( ++numberOfColumnsWithMultipleVisibleFields )); visibleColumn->setExpression( new ConstExpr(CHARACTER_STRING_LITERAL, TQVariant()/*not important*/)); if (!d->ownedVisibleColumns) { @@ -1310,7 +1310,7 @@ void QuerySchema::computeFieldsExpanded() if (!table( visibleField->table()->name() )) { } if (!sql.isEmpty()) - sql += TQString::tqfromLatin1(", "); + sql += TQString::fromLatin1(", "); sql += (escapeIdentifier(visibleField->table()->name(), drvEscaping) + "." + escapeIdentifier(visibleField->name(), drvEscaping)); }*/ @@ -1351,8 +1351,8 @@ void QuerySchema::computeFieldsExpanded() // (the expression object will be owned by column info) visibleColumn = new Field(); visibleColumn->setName( - TQString::tqfromLatin1("[multiple_visible_fields_%1]") - .tqarg( ++numberOfColumnsWithMultipleVisibleFields )); + TQString::fromLatin1("[multiple_visible_fields_%1]") + .arg( ++numberOfColumnsWithMultipleVisibleFields )); visibleColumn->setExpression( new ConstExpr(CHARACTER_STRING_LITERAL, TQVariant()/*not important*/)); if (!d->ownedVisibleColumns) { @@ -1370,7 +1370,7 @@ void QuerySchema::computeFieldsExpanded() if (!table( visibleField->table()->name() )) { } if (!sql.isEmpty()) - sql += TQString::tqfromLatin1(", "); + sql += TQString::fromLatin1(", "); sql += (escapeIdentifier(visibleField->table()->name(), drvEscaping) + "." + escapeIdentifier(visibleField->name(), drvEscaping)); }*/ @@ -1508,9 +1508,9 @@ void QuerySchema::computeFieldsExpanded() ci->setIndexForVisibleLookupValue( d->fieldsExpanded->size() + *index ); } else { - const TQString key( TQString::tqfromLatin1("[multiple_visible_fields_%1]_%2.%3") - .tqarg( ++numberOfColumnsWithMultipleVisibleFields ) - .tqarg(ci->field->table()->name()).tqarg(ci->field->name()) ); + const TQString key( TQString::fromLatin1("[multiple_visible_fields_%1]_%2.%3") + .arg( ++numberOfColumnsWithMultipleVisibleFields ) + .arg(ci->field->table()->name()).arg(ci->field->name()) ); uint *index = lookup_dict[ key ]; if (index) ci->setIndexForVisibleLookupValue( d->fieldsExpanded->size() + *index ); @@ -1542,9 +1542,9 @@ void QuerySchema::computeFieldsExpanded() ci->setIndexForVisibleLookupValue( d->fieldsExpanded->size() + *index ); } else { - const TQString key( TQString::tqfromLatin1("[multiple_visible_fields_%1]_%2.%3") - .tqarg( ++numberOfColumnsWithMultipleVisibleFields ) - .tqarg(ci->field->table()->name()).tqarg(ci->field->name()) ); + const TQString key( TQString::fromLatin1("[multiple_visible_fields_%1]_%2.%3") + .arg( ++numberOfColumnsWithMultipleVisibleFields ) + .arg(ci->field->table()->name()).arg(ci->field->name()) ); uint *index = lookup_dict[ key ]; if (index) ci->setIndexForVisibleLookupValue( d->fieldsExpanded->size() + *index ); diff --git a/kexi/kexidb/queryschemaparameter.cpp b/kexi/kexidb/queryschemaparameter.cpp index 4cead962..4418f6e9 100644 --- a/kexi/kexidb/queryschemaparameter.cpp +++ b/kexi/kexidb/queryschemaparameter.cpp @@ -36,12 +36,12 @@ QuerySchemaParameter::~QuerySchemaParameter() TQString QuerySchemaParameter::debugString() const { - return TQString("msg=\"%1\" type=\"%2\"").tqarg(Field::typeName(type)).tqarg(message); + return TQString("msg=\"%1\" type=\"%2\"").arg(Field::typeName(type)).arg(message); } void KexiDB::debug(const QuerySchemaParameterList& list) { - KexiDBDbg << TQString("Query parameters (%1):").tqarg(list.count()) << endl; + KexiDBDbg << TQString("Query parameters (%1):").arg(list.count()) << endl; foreach(QuerySchemaParameterListConstIterator, it, list) KexiDBDbg << " - " << (*it).debugString() << endl; } diff --git a/kexi/kexidb/schemadata.cpp b/kexi/kexidb/schemadata.cpp index 9b691349..9370a3ac 100644 --- a/kexi/kexidb/schemadata.cpp +++ b/kexi/kexidb/schemadata.cpp @@ -51,5 +51,5 @@ TQString SchemaData::schemaDataDebugString() const desc+="..."; } return TQString("id=%1 name='%2' caption='%3' desc='%4'") - .tqarg(m_id).tqarg(m_name).tqarg(m_caption).tqarg(desc); + .arg(m_id).arg(m_name).arg(m_caption).arg(desc); } diff --git a/kexi/kexidb/simplecommandlineapp.cpp b/kexi/kexidb/simplecommandlineapp.cpp index 904469bc..570043fe 100644 --- a/kexi/kexidb/simplecommandlineapp.cpp +++ b/kexi/kexidb/simplecommandlineapp.cpp @@ -140,7 +140,7 @@ SimpleCommandLineApp::SimpleCommandLineApp( userAtHost += "@"; userAtHost += (d->connData.hostName.isEmpty() ? "localhost" : d->connData.hostName); TQTextStream cout(stdout,IO_WriteOnly); - cout << i18n("Enter password for %1: ").tqarg(userAtHost); + cout << i18n("Enter password for %1: ").arg(userAtHost); //! @todo make use of pty/tty here! (and care about portability) TQTextStream cin(stdin,IO_ReadOnly); cin >> d->connData.password; diff --git a/kexi/kexidb/utils.cpp b/kexi/kexidb/utils.cpp index 9fa9ca01..594773af 100644 --- a/kexi/kexidb/utils.cpp +++ b/kexi/kexidb/utils.cpp @@ -138,7 +138,7 @@ void KexiDB::getHTMLErrorMesage(Object* obj, TQString& msg, TQString &details) if (!obj->serverErrorMsg().isEmpty()) details += "<p><b><nobr>" +i18n("Message from server:") + "</nobr></b><br>" + obj->serverErrorMsg(); if (!obj->recentSQLString().isEmpty()) - details += "<p><b><nobr>" +i18n("SQL statement:") + TQString("</nobr></b><br><tt>%1</tt>").tqarg(obj->recentSQLString()); + details += "<p><b><nobr>" +i18n("SQL statement:") + TQString("</nobr></b><br><tt>%1</tt>").arg(obj->recentSQLString()); int serverResult; TQString serverResultName; if (obj->serverResult()!=0) { @@ -159,9 +159,9 @@ void KexiDB::getHTMLErrorMesage(Object* obj, TQString& msg, TQString &details) if (!details.isEmpty() && !details.startsWith("<qt>")) { if (details.startsWith("<p>")) - details = TQString::tqfromLatin1("<qt>")+details; + details = TQString::fromLatin1("<qt>")+details; else - details = TQString::tqfromLatin1("<qt><p>")+details; + details = TQString::fromLatin1("<qt><p>")+details; } } @@ -179,7 +179,7 @@ int KexiDB::idForObjectName( Connection &conn, const TQString& objName, int objT { RowData data; if (true!=conn.querySingleRecord(TQString("select o_id from kexi__objects where lower(o_name)='%1' and o_type=%2") - .tqarg(objName.lower()).tqarg(objType), data)) + .arg(objName.lower()).arg(objType), data)) return 0; bool ok; int id = data[0].toInt(&ok); @@ -387,7 +387,7 @@ ConnectionTestDialog::ConnectionTestDialog(TQWidget* parent, KexiDB::MessageHandler& msgHandler) : KProgressDialog(parent, "testconn_dlg", i18n("Test Connection"), i18n("<qt>Testing connection to <b>%1</b> database server...</qt>") - .tqarg(data.serverInfoString(true)), true /*modal*/) + .arg(data.serverInfoString(true)), true /*modal*/) , m_thread(new ConnectionTestThread(this, data)) , m_connData(data) , m_msgHandler(&msgHandler) @@ -441,13 +441,13 @@ void ConnectionTestDialog::slotTimeout() else if (notResponding) { KMessageBox::sorry(0, i18n("<qt>Test connection to <b>%1</b> database server failed. The server is not responding.</qt>") - .tqarg(m_connData.serverInfoString(true)), + .arg(m_connData.serverInfoString(true)), i18n("Test Connection")); } else { KMessageBox::information(0, i18n("<qt>Test connection to <b>%1</b> database server established successfully.</qt>") - .tqarg(m_connData.serverInfoString(true)), + .arg(m_connData.serverInfoString(true)), i18n("Test Connection")); } // slotCancel(); @@ -493,7 +493,7 @@ void KexiDB::connectionTestDialog(TQWidget* parent, const KexiDB::ConnectionData int KexiDB::rowCount(Connection &conn, const TQString& sql) { int count = -1; //will be changed only on success of querySingleNumber() - TQString selectSql( TQString::tqfromLatin1("SELECT COUNT() FROM (") + sql + ")" ); + TQString selectSql( TQString::fromLatin1("SELECT COUNT() FROM (") + sql + ")" ); conn.querySingleNumber(selectSql, count); return count; } @@ -507,7 +507,7 @@ int KexiDB::rowCount(const KexiDB::TableSchema& tableSchema) } int count = -1; //will be changed only on success of querySingleNumber() tableSchema.connection()->querySingleNumber( - TQString::tqfromLatin1("SELECT COUNT(*) FROM ") + TQString::fromLatin1("SELECT COUNT(*) FROM ") + tableSchema.connection()->driver()->escapeIdentifier(tableSchema.name()), count ); @@ -523,7 +523,7 @@ int KexiDB::rowCount(KexiDB::QuerySchema& querySchema) } int count = -1; //will be changed only on success of querySingleNumber() querySchema.connection()->querySingleNumber( - TQString::tqfromLatin1("SELECT COUNT(*) FROM (") + TQString::fromLatin1("SELECT COUNT(*) FROM (") + querySchema.connection()->selectStatement(querySchema) + ")", count ); @@ -807,7 +807,7 @@ bool KexiDB::setFieldProperty( Field& field, const TQCString& propertyName, cons else { if (!field.table()) { KexiDBWarn << TQString("KexiDB::setFieldProperty() Cannot set \"%1\" property - no table assinged for field!") - .tqarg(propertyName.data()) << endl; + .arg(propertyName.data()) << endl; } else { LookupFieldSchema *lookup = field.table()->lookupFieldSchema(field); @@ -965,7 +965,7 @@ TQDomElement KexiDB::saveBooleanElementToDom(TQDomDocument& doc, TQDomElement& p TQDomElement numberEl( doc.createElement("bool") ); el.appendChild( numberEl ); numberEl.appendChild( doc.createTextNode( - value ? TQString::tqfromLatin1("true") : TQString::tqfromLatin1("false") ) ); + value ? TQString::fromLatin1("true") : TQString::fromLatin1("false") ) ); return el; } @@ -998,9 +998,9 @@ TQVariant KexiDB::emptyValueForType( KexiDB::Field::Type type ) return val; else { //special cases if (type==Field::Date) - return TQDate::tqcurrentDate(); + return TQDate::currentDate(); if (type==Field::DateTime) - return TQDateTime::tqcurrentDateTime(); + return TQDateTime::currentDateTime(); if (type==Field::Time) return TQTime::currentTime(); } @@ -1047,9 +1047,9 @@ TQVariant KexiDB::notEmptyValueForType( KexiDB::Field::Type type ) return val; else { //special cases if (type==Field::Date) - return TQDate::tqcurrentDate(); + return TQDate::currentDate(); if (type==Field::DateTime) - return TQDateTime::tqcurrentDateTime(); + return TQDateTime::currentDateTime(); if (type==Field::Time) return TQTime::currentTime(); } @@ -1076,11 +1076,11 @@ TQString KexiDB::escapeBLOB(const TQByteArray& array, BLOBEscapingType type) return TQString(); } if (type == BLOBEscapeXHex) - str = TQString::tqfromLatin1("X'"); + str = TQString::fromLatin1("X'"); else if (type == BLOBEscape0xHex) - str = TQString::tqfromLatin1("0x"); + str = TQString::fromLatin1("0x"); else if (type == BLOBEscapeOctal) - str = TQString::tqfromLatin1("'"); + str = TQString::fromLatin1("'"); int new_length = str.length(); //after X' or 0x, etc. if (type == BLOBEscapeOctal) { @@ -1228,7 +1228,7 @@ void KexiDB::getLimitsForType(Field::Type type, int &minValue, int &maxValue) void KexiDB::debugRowData(const RowData& rowData) { - KexiDBDbg << TQString("ROW DATA (%1 columns):").tqarg(rowData.count()) << endl; + KexiDBDbg << TQString("ROW DATA (%1 columns):").arg(rowData.count()) << endl; foreach(RowData::ConstIterator, it, rowData) KexiDBDbg << "- " << (*it) << endl; } diff --git a/kexi/kexidb/utils.h b/kexi/kexidb/utils.h index ec807d34..334ea20c 100644 --- a/kexi/kexidb/utils.h +++ b/kexi/kexidb/utils.h @@ -454,11 +454,11 @@ namespace KexiDB return TQString::fromUtf8(data, length); if (f->isIntegerType()) { if (f->type()==KexiDB::Field::BigInteger) - return TQVariant( TQString::tqfromLatin1(data, length).toLongLong() ); - return TQVariant( TQString::tqfromLatin1(data, length).toInt() ); + return TQVariant( TQString::fromLatin1(data, length).toLongLong() ); + return TQVariant( TQString::fromLatin1(data, length).toInt() ); } if (f->isFPNumericType()) - return TQString::tqfromLatin1(data, length).toDouble(); + return TQString::fromLatin1(data, length).toDouble(); if (f->type()==KexiDB::Field::BLOB) { TQByteArray ba; ba.duplicate(data, length); diff --git a/kexi/kexiutils/debuggui.cpp b/kexi/kexiutils/debuggui.cpp index cbee692d..23e2aaeb 100644 --- a/kexi/kexiutils/debuggui.cpp +++ b/kexi/kexiutils/debuggui.cpp @@ -21,7 +21,7 @@ #include "utils_p.h" #include <tqheader.h> -#include <tqlayout.h> +#include <layout.h> #include <ktabwidget.h> #include <klistview.h> diff --git a/kexi/kexiutils/identifier.cpp b/kexi/kexiutils/identifier.cpp index da5f7f96..ed1afdcb 100644 --- a/kexi/kexiutils/identifier.cpp +++ b/kexi/kexiutils/identifier.cpp @@ -27,7 +27,7 @@ bool KexiUtils::isIdentifier(const TQString& s) { uint i; for (i=0; i<s.length(); i++) { - TQChar c = s.tqat(i).lower(); + TQChar c = s.at(i).lower(); if (!((int)c=='_' || (int)c>='a' && (int)c<='z' || i>0 && (int)c>='0' && (int)c<='9')) break; } @@ -45,10 +45,10 @@ TQString KexiUtils::string2FileName(const TQString &s) inline TQString char2Identifier(const TQChar& c) { - if (c.tqunicode() >= TRANSLITERATION_TABLE_SIZE) + if (c.unicode() >= TRANSLITERATION_TABLE_SIZE) return TQString(TQChar('_')); - const char *const s = transliteration_table[c.tqunicode()]; - return s ? TQString::tqfromLatin1(s) : TQString(TQChar('_')); + const char *const s = transliteration_table[c.unicode()]; + return s ? TQString::fromLatin1(s) : TQString(TQChar('_')); } TQString KexiUtils::string2Identifier(const TQString &s) @@ -87,8 +87,8 @@ TQString KexiUtils::string2Identifier(const TQString &s) TQString KexiUtils::identifierExpectedMessage(const TQString &valueName, const TQVariant& v) { - return "<p>"+i18n("Value of \"%1\" column must be an identifier.").tqarg(valueName) - +"</p><p>"+i18n("\"%1\" is not a valid identifier.").tqarg(v.toString())+"</p>"; + return "<p>"+i18n("Value of \"%1\" column must be an identifier.").arg(valueName) + +"</p><p>"+i18n("\"%1\" is not a valid identifier.").arg(v.toString())+"</p>"; } //-------------------------------------------------------------------------------- diff --git a/kexi/kexiutils/longlongvalidator.cpp b/kexi/kexiutils/longlongvalidator.cpp index ca3a42dd..e7cce867 100644 --- a/kexi/kexiutils/longlongvalidator.cpp +++ b/kexi/kexiutils/longlongvalidator.cpp @@ -53,7 +53,7 @@ TQValidator::State LongLongValidator::validate( TQString &str, int & ) const if (m_base > 10) newStr = newStr.upper(); - if (newStr == TQString::tqfromLatin1("-")) {// a special case + if (newStr == TQString::fromLatin1("-")) {// a special case if ((m_min || m_max) && m_min >= 0) ok = false; else diff --git a/kexi/kexiutils/styleproxy.h b/kexi/kexiutils/styleproxy.h index 867ef23d..cf3eea50 100644 --- a/kexi/kexiutils/styleproxy.h +++ b/kexi/kexiutils/styleproxy.h @@ -67,10 +67,10 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle virtual void polishPopupMenu( TQPopupMenu* p ) { m_style->polishPopupMenu(p); } - virtual TQRect tqitemRect( TQPainter *p, const TQRect &r, + virtual TQRect itemRect( TQPainter *p, const TQRect &r, int flags, bool enabled, const TQPixmap *pixmap, const TQString &text, int len = -1 ) const { - return m_style->tqitemRect( p, r, flags, enabled, pixmap, text, len ); + return m_style->itemRect( p, r, flags, enabled, pixmap, text, len ); } virtual void drawItem( TQPainter *p, const TQRect &r, @@ -87,18 +87,18 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle m_style->tqdrawPrimitive( pe, p, r, cg, flags, option ); } - virtual void tqdrawControl( TQ_ControlElement element, + virtual void drawControl( TQ_ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQColorGroup &cg, SFlags how = Style_Default, const TQStyleOption& option = TQStyleOption::Default ) const { - m_style->tqdrawControl( element, p, widget, r, cg, how, option ); + m_style->drawControl( element, p, widget, r, cg, how, option ); } - virtual void tqdrawControlMask( TQ_ControlElement element, + virtual void drawControlMask( TQ_ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQStyleOption& option = TQStyleOption::Default ) const { - m_style->tqdrawControlMask( element, p, widget, r, option ); + m_style->drawControlMask( element, p, widget, r, option ); } virtual TQRect subRect( SubRect r, const TQWidget *widget ) const @@ -106,7 +106,7 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle return m_style->subRect( r, widget ); } - virtual void tqdrawComplexControl( TQ_ComplexControl control, + virtual void drawComplexControl( TQ_ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQColorGroup &cg, SFlags how = Style_Default, #ifdef TQ_TQDOC @@ -116,14 +116,14 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle #endif SCFlags subActive = SC_None, const TQStyleOption& option = TQStyleOption::Default ) const { - tqdrawComplexControl( control, p, widget, r, cg, how, sub, subActive, option ); + drawComplexControl( control, p, widget, r, cg, how, sub, subActive, option ); } - virtual void tqdrawComplexControlMask( TQ_ComplexControl control, + virtual void drawComplexControlMask( TQ_ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQStyleOption& option = TQStyleOption::Default ) const { - m_style->tqdrawComplexControlMask( control, p, widget, r, option ); + m_style->drawComplexControlMask( control, p, widget, r, option ); } virtual TQRect querySubControlMetrics( TQ_ComplexControl control, @@ -140,10 +140,10 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle return m_style->querySubControl( control, widget, pos, option ); } - virtual int tqpixelMetric( PixelMetric metric, + virtual int pixelMetric( PixelMetric metric, const TQWidget *widget = 0 ) const { - return m_style->tqpixelMetric( metric, widget ); + return m_style->pixelMetric( metric, widget ); } virtual TQSize tqsizeFromContents( ContentsType contents, @@ -153,11 +153,11 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle return m_style->tqsizeFromContents( contents, widget, contentsSize, option ); } - virtual int tqstyleHint( TQ_StyleHint stylehint, + virtual int styleHint( TQ_StyleHint stylehint, const TQWidget *widget = 0, const TQStyleOption& option = TQStyleOption::Default, TQStyleHintReturn* returnData = 0 ) const { - return m_style->tqstyleHint( stylehint, widget, option, returnData ); + return m_style->styleHint( stylehint, widget, option, returnData ); } virtual TQPixmap stylePixmap( StylePixmap stylepixmap, diff --git a/kexi/kexiutils/transliteration_table.h b/kexi/kexiutils/transliteration_table.h index 0eece11c..5be7dadc 100644 --- a/kexi/kexiutils/transliteration_table.h +++ b/kexi/kexiutils/transliteration_table.h @@ -1,4 +1,4 @@ -/* Transliteration table of 65535 tqunicode characters +/* Transliteration table of 65535 unicode characters Do not edit this file, it is generated by ./generate_transliteration_table.sh script. */ diff --git a/kexi/kexiutils/tristate.h b/kexi/kexiutils/tristate.h index 0a8df95c..f3864849 100644 --- a/kexi/kexiutils/tristate.h +++ b/kexi/kexiutils/tristate.h @@ -165,8 +165,8 @@ public: */ TQString toString() const { if (m_value==False) - return TQString::tqfromLatin1("false"); - return m_value==True ? TQString::tqfromLatin1("true") : TQString::tqfromLatin1("cancelled"); + return TQString::fromLatin1("false"); + return m_value==True ? TQString::fromLatin1("true") : TQString::fromLatin1("cancelled"); } private: diff --git a/kexi/kexiutils/utils.cpp b/kexi/kexiutils/utils.cpp index 7a1ab0f7..dca4998b 100644 --- a/kexi/kexiutils/utils.cpp +++ b/kexi/kexiutils/utils.cpp @@ -226,7 +226,7 @@ TQMap<TQString,TQString> KexiUtils::deserializeMap(const TQString& string) TQCString cstr(string.latin1()); TQByteArray array( size ); for (uint i=0; i<size; i++) { - array[i] = char(string[i].tqunicode()-1); + array[i] = char(string[i].unicode()-1); } TQMap<TQString,TQString> map; TQDataStream ds(array, IO_ReadOnly); @@ -244,17 +244,17 @@ TQString KexiUtils::stringToFileName(const TQString& string) void KexiUtils::simpleCrypt(TQString& string) { for (uint i=0; i<string.length(); i++) - string[i] = TQChar( string[i].tqunicode() + 47 + i ); + string[i] = TQChar( string[i].unicode() + 47 + i ); } void KexiUtils::simpleDecrypt(TQString& string) { for (uint i=0; i<string.length(); i++) - string[i] = TQChar( string[i].tqunicode() - 47 - i ); + string[i] = TQChar( string[i].unicode() - 47 - i ); } void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect, - const TQPixmap& pixmap, int tqalignment, bool scaledContents, bool keepAspectRatio) + const TQPixmap& pixmap, int alignment, bool scaledContents, bool keepAspectRatio) { if (pixmap.isNull()) return; @@ -285,21 +285,21 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect, img = img.smoothScale(w, h, TQ_ScaleMin); pos = rect.topLeft(); //0, 0); if (img.width() < w) { - int hAlign = TQApplication::horizontalAlignment( tqalignment ); + int hAlign = TQApplication::horizontalAlignment( alignment ); if ( hAlign & TQt::AlignRight ) pos.setX(pos.x() + w-img.width()); else if ( hAlign & TQt::AlignHCenter ) pos.setX(pos.x() + w/2-img.width()/2); } else if (img.height() < h) { - if ( tqalignment & TQt::AlignBottom ) + if ( alignment & TQt::AlignBottom ) pos.setY(pos.y() + h-img.height()); - else if ( tqalignment & TQt::AlignVCenter ) + else if ( alignment & TQt::AlignVCenter ) pos.setY(pos.y() + h/2-img.height()/2); } pixmapBuffer.convertFromImage(img); if (!fast) { - p2.tqbegin(TQT_TQPAINTDEVICE(&pixmapBuffer), p.tqdevice()); + p2.begin(TQT_TQPAINTDEVICE(&pixmapBuffer), p.device()); } else target->drawPixmap(pos, pixmapBuffer); @@ -307,7 +307,7 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect, else { if (!fast) { pixmapBuffer.resize(rect.size()-TQSize(lineWidth, lineWidth)); - p2.tqbegin(TQT_TQPAINTDEVICE(&pixmapBuffer), p.tqdevice()); + p2.begin(TQT_TQPAINTDEVICE(&pixmapBuffer), p.device()); p2.drawPixmap(TQRect(rect.x(), rect.y(), w, h), pixmap); } else @@ -315,7 +315,7 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect, } } else { - int hAlign = TQApplication::horizontalAlignment( tqalignment ); + int hAlign = TQApplication::horizontalAlignment( alignment ); if ( hAlign & TQt::AlignRight ) pos.setX(pos.x() + w-pixmap.width()); else if ( hAlign & TQt::AlignHCenter ) @@ -323,9 +323,9 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect, else //left, etc. pos.setX(pos.x()); - if ( tqalignment & TQt::AlignBottom ) + if ( alignment & TQt::AlignBottom ) pos.setY(pos.y() + h-pixmap.height()); - else if ( tqalignment & TQt::AlignVCenter ) + else if ( alignment & TQt::AlignVCenter ) pos.setY(pos.y() + h/2-pixmap.height()/2); else //top, etc. pos.setY(pos.y()); @@ -339,8 +339,8 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect, bitBlt( p.device(), // pos.x(), // pos.y(), - (int)p.tqworldMatrix().dx() + rect.x() + lineWidth + pos.x(), - (int)p.tqworldMatrix().dy() + rect.y() + lineWidth + pos.y(), + (int)p.worldMatrix().dx() + rect.x() + lineWidth + pos.x(), + (int)p.worldMatrix().dy() + rect.y() + lineWidth + pos.y(), &pixmapBuffer); } } diff --git a/kexi/kexiutils/utils.h b/kexi/kexiutils/utils.h index d7bdbae8..81e4f41e 100644 --- a/kexi/kexiutils/utils.h +++ b/kexi/kexiutils/utils.h @@ -184,7 +184,7 @@ namespace KexiUtils KEXIUTILS_EXPORT TQString stringToFileName(const TQString& string); /*! Performs a simple \a string encryption using rot47-like algorithm. - Each character's tqunicode value is increased by 47 + i (where i is index of the character). + Each character's unicode value is increased by 47 + i (where i is index of the character). The resulting string still contains redable characters. Do not use this for data that can be accessed by attackers! */ KEXIUTILS_EXPORT void simpleCrypt(TQString& string); @@ -212,7 +212,7 @@ namespace KexiUtils //! Draws pixmap on painter \a p using predefined parameters. //! Used in KexiDBImageBox and KexiBlobTableEdit. KEXIUTILS_EXPORT void drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect, - const TQPixmap& pixmap, int tqalignment, bool scaledContents, bool keepAspectRatio); + const TQPixmap& pixmap, int alignment, bool scaledContents, bool keepAspectRatio); //! @internal KEXIUTILS_EXPORT TQString ptrToStringInternal(void* ptr, uint size); diff --git a/kexi/kexiutils/validator.cpp b/kexi/kexiutils/validator.cpp index bec7a1ec..919a3b61 100644 --- a/kexi/kexiutils/validator.cpp +++ b/kexi/kexiutils/validator.cpp @@ -36,7 +36,7 @@ Validator::Result Validator::check(const TQString &valueName, const TQVariant& v { if (v.isNull() || v.type()==TQVariant::String && v.toString().isEmpty()) { if (!m_acceptsEmptyValue) { - message = Validator::msgColumnNotEmpty().tqarg(valueName); + message = Validator::msgColumnNotEmpty().arg(valueName); return Error; } return Ok; diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp index 0aa0cd35..8c246ad1 100644 --- a/kexi/main/kexifinddialog.cpp +++ b/kexi/main/kexifinddialog.cpp @@ -32,7 +32,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> #include <tqguardedptr.h> -#include <tqlayout.h> +#include <layout.h> #include <tqaccel.h> //! @internal @@ -82,8 +82,8 @@ KexiFindDialog::KexiFindDialog( TQWidget* parent ) , d( new Private() ) { m_search->setCurrentItem((int)KexiSearchAndReplaceViewInterface::Options::SearchDown); - tqlayout()->setMargin( KDialog::marginHint() ); - tqlayout()->setSpacing( KDialog::spacingHint() ); + layout()->setMargin( KDialog::marginHint() ); + layout()->setSpacing( KDialog::spacingHint() ); KAction *a = KStdAction::findNext(0, 0, 0); m_btnFind->setText(a->text()); m_btnFind->setIconSet(a->iconSet()); @@ -175,7 +175,7 @@ void KexiFindDialog::setCurrentLookInColumnName(const TQString& columnName) index = d->lookInColumnNames.findIndex( columnName ); if (index == -1) { kdWarning() << TQString("KexiFindDialog::setCurrentLookInColumn(%1) column name not found on the list") - .tqarg(columnName) << endl; + .arg(columnName) << endl; return; } index = index + 1/*"(All fields)"*/ + 1/*"(Current field)"*/; @@ -214,13 +214,13 @@ void KexiFindDialog::setObjectNameForCaption(const TQString& name) if (name.isEmpty()) setCaption(i18n("Replace")); else - setCaption(i18n("Replace in \"%1\"").tqarg(name)); + setCaption(i18n("Replace in \"%1\"").arg(name)); } else { if (name.isEmpty()) setCaption(i18n("Find")); else - setCaption(i18n("Find in \"%1\"").tqarg(name)); + setCaption(i18n("Find in \"%1\"").arg(name)); } } diff --git a/kexi/main/kexifinddialogbase.ui b/kexi/main/kexifinddialogbase.ui index 8ffc254d..133570e7 100644 --- a/kexi/main/kexifinddialogbase.ui +++ b/kexi/main/kexifinddialogbase.ui @@ -150,7 +150,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -243,7 +243,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>2</height> @@ -279,7 +279,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>20</height> diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 5594d577..3071dd38 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -111,7 +111,7 @@ # define KexiVDebug if (0) kdDebug() #endif -//first fix the tqgeometry +//first fix the geometry //#define KEXI_NO_CTXT_HELP 1 #ifndef KEXI_NO_CTXT_HELP @@ -127,7 +127,7 @@ //! width changes will be removed in KMDI //#define PROPEDITOR_VISIBILITY_CHANGES -//temporary fix to manage tqlayout +//temporary fix to manage layout #include "ksplitter.h" #define KDOCKWIDGET_P 1 @@ -245,8 +245,8 @@ KexiMainWindowImpl::KexiMainWindowImpl() int scnum = TQApplication::desktop()->screenNumber(parentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); d->config->setGroup("MainWindow"); - TQSize s ( d->config->readNumEntry( TQString::tqfromLatin1("Width %1").tqarg(desk.width()), 700 ), - d->config->readNumEntry( TQString::tqfromLatin1("Height %1").tqarg(desk.height()), 480 ) ); + TQSize s ( d->config->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 700 ), + d->config->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 480 ) ); resize (kMin (s.width(), desk.width()), kMin(s.height(), desk.height())); } @@ -360,7 +360,7 @@ KexiMainWindowImpl::KexiMainWindowImpl() TQToolButton *closeButton = new TQToolButton( tabWidget() ); closeButton->setAutoRaise( true ); closeButton->setPixmap( TQPixmap( kde2_closebutton ) ); - closeButton->setPaletteBackgroundColor(closeButton->tqpalette().active().background()); + closeButton->setPaletteBackgroundColor(closeButton->palette().active().background()); // closeButton->setIconSet(SmallIconSet("tab_remove")); tabWidget()->setCornerWidget( closeButton, TQt::TopRight ); closeButton->hide(); // hide until it's needed to avoid problems in "user mode" @@ -465,7 +465,7 @@ void KexiMainWindowImpl::switchToIDEAlMode(bool showMessage) else { KMessageBox::information(this, i18n("User interface mode will be switched to IDEAl at next %1 application startup.") - .tqarg(KEXI_APP_NAME)); + .arg(KEXI_APP_NAME)); //delayed d->mdiModeToSwitchAfterRestart = KMdi::IDEAlMode; } @@ -492,7 +492,7 @@ void KexiMainWindowImpl::switchToChildframeMode(bool showMessage) else { KMessageBox::information(this, i18n("User interface mode will be switched to Childframe at next %1 application startup.") - .tqarg(KEXI_APP_NAME)); + .arg(KEXI_APP_NAME)); //delayed d->mdiModeToSwitchAfterRestart = KMdi::ChildframeMode; } @@ -1281,7 +1281,7 @@ static TQString internalReason(KexiDB::Object *obj) const TQString &s = obj->errorMsg(); if (s.isEmpty()) return s; - return TQString("<br>(%1) ").tqarg(i18n("reason:")+" <i>"+s+"</i>"); + return TQString("<br>(%1) ").arg(i18n("reason:")+" <i>"+s+"</i>"); } tristate KexiMainWindowImpl::openProject(const KexiProjectData& projectData) @@ -1319,7 +1319,7 @@ tristate KexiMainWindowImpl::openProject(const KexiProjectData& projectData) if (incompatibleWithKexi) { if (KMessageBox::Yes == KMessageBox::questionYesNo(this, i18n("<qt>Database project %1 does not appear to have been created using Kexi.<br><br>" - "Do you want to import it as a new Kexi project?</qt>").tqarg(projectData.infoString()), + "Do you want to import it as a new Kexi project?</qt>").arg(projectData.infoString()), 0, KGuiItem(i18n("Import Database", "&Import..."), "database_import"), KStdGuiItem::quit())) { @@ -1447,9 +1447,9 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater() not_found_msg += (TQString("\"") + info["name"] + "\" - "); if (info["action"]=="new") not_found_msg += i18n("cannot create object - unknown object type \"%1\"") - .tqarg(info["type"]); + .arg(info["type"]); else - not_found_msg += i18n("unknown object type \"%1\"").tqarg(info["type"]); + not_found_msg += i18n("unknown object type \"%1\"").arg(info["type"]); not_found_msg += internalReason(&Kexi::partManager())+"<br></li>"; continue; } @@ -1457,7 +1457,7 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater() if (info["action"]=="new") { if (!newObject( i, openingCancelled) && !openingCancelled) { not_found_msg += "<li>"; - not_found_msg += (i18n("cannot create object of type \"%1\"").tqarg(info["type"])+ + not_found_msg += (i18n("cannot create object of type \"%1\"").arg(info["type"])+ internalReason(d->prj)+"<br></li>"); } else @@ -1551,7 +1551,7 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater() if (!not_found_msg.isEmpty()) showErrorMessage(i18n("You have requested selected objects to be automatically opened " "or processed on startup. Several objects cannot be opened or processed."), - TQString("<ul>%1</ul>").tqarg(not_found_msg) ); + TQString("<ul>%1</ul>").arg(not_found_msg) ); d->updatePropEditorVisibility(d->curDialog ? d->curDialog->currentViewMode() : 0); #if defined(KDOCKWIDGET_P) @@ -1788,7 +1788,7 @@ void KexiMainWindowImpl::slotLastActions() } #endif #ifdef TQ_WS_WIN - showMaximized();//js: workaround for not yet completed tqlayout settings storage on win32 + showMaximized();//js: workaround for not yet completed layout settings storage on win32 #endif } @@ -1836,7 +1836,7 @@ void KexiMainWindowImpl::initPropertyEditor() //1 dw->setMinimumWidth(200); - // ds->setSeparatorPos(d->propEditor->tqsizeHint().width(), true); + // ds->setSeparatorPos(d->propEditor->sizeHint().width(), true); //heh, this is for IDEAl only, I suppose? //js if (m_rightContainer) { @@ -1864,7 +1864,7 @@ void KexiMainWindowImpl::slotPartLoaded(KexiPart::Part* p) } //! internal -void KexiMainWindowImpl::slotCaptionForCurrentMDIChild(bool tqchildrenMaximized) +void KexiMainWindowImpl::slotCaptionForCurrentMDIChild(bool childrenMaximized) { //js todo: allow to set custom "static" app caption @@ -1877,18 +1877,18 @@ void KexiMainWindowImpl::slotCaptionForCurrentMDIChild(bool tqchildrenMaximized) //current dialog isn't attached! - find top level child if (m_pMdi->topChild()) { view = m_pMdi->topChild()->m_pClient; - tqchildrenMaximized = view->mdiParent()->state()==KMdiChildFrm::Maximized; + childrenMaximized = view->mdiParent()->state()==KMdiChildFrm::Maximized; } else view = 0; } - if (tqchildrenMaximized && view) { + if (childrenMaximized && view) { setCaption( d->curDialog->caption() - + (d->appCaptionPrefix.isEmpty() ? TQString() : (TQString::tqfromLatin1(" - ") + d->appCaptionPrefix)) ); + + (d->appCaptionPrefix.isEmpty() ? TQString() : (TQString::fromLatin1(" - ") + d->appCaptionPrefix)) ); } else { - setCaption( (d->appCaptionPrefix.isEmpty() ? TQString() : (d->appCaptionPrefix + TQString::tqfromLatin1(" - "))) + setCaption( (d->appCaptionPrefix.isEmpty() ? TQString() : (d->appCaptionPrefix + TQString::fromLatin1(" - "))) + d->origAppCaption ); } } @@ -2093,8 +2093,8 @@ KexiMainWindowImpl::restoreSettings() }*/ config->setGroup("MainWindow"); - TQSize s ( config->readNumEntry( TQString::tqfromLatin1("Width %1").tqarg(desk.width()), 700 ), - config->readNumEntry( TQString::tqfromLatin1("Height %1").tqarg(desk.height()), 480 ) ); + TQSize s ( config->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 700 ), + config->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 480 ) ); resize (kMin (s.width(), desk.width()), kMin(s.height(), desk.height())); } #endif @@ -3006,10 +3006,10 @@ bool KexiMainWindowImpl::switchToViewMode(int viewMode) } if (!d->curDialog->supportsViewMode( viewMode )) { showErrorMessage(i18n("Selected view is not supported for \"%1\" object.") - .tqarg(d->curDialog->partItem()->name()), + .arg(d->curDialog->partItem()->name()), i18n("Selected view (%1) is not supported by this object type (%2).") - .tqarg(Kexi::nameForViewMode(viewMode)) - .tqarg(d->curDialog->part()->instanceCaption()) ); + .arg(Kexi::nameForViewMode(viewMode)) + .arg(d->curDialog->part()->instanceCaption()) ); d->toggleLastCheckedMode(); return false; } @@ -3019,7 +3019,7 @@ bool KexiMainWindowImpl::switchToViewMode(int viewMode) tristate res = d->curDialog->switchToViewMode( viewMode ); if (!res) { updateCustomPropertyPanelTabs(0, Kexi::NoViewMode); //revert - showErrorMessage(i18n("Switching to other view failed (%1).").tqarg(Kexi::nameForViewMode(viewMode)), + showErrorMessage(i18n("Switching to other view failed (%1).").arg(Kexi::nameForViewMode(viewMode)), d->curDialog); d->toggleLastCheckedMode(); return false; @@ -3118,7 +3118,7 @@ tristate KexiMainWindowImpl::getNewObjectInfo( if (allowOverwriting) { int res = KMessageBox::warningYesNoCancel(this, "<p>"+part->i18nMessage("Object \"%1\" already exists.", 0) - .tqarg(d->nameDialog->widget()->nameText()) + .arg(d->nameDialog->widget()->nameText()) +"</p><p>"+i18n("Do you want to replace it?")+"</p>", 0, KGuiItem(i18n("&Replace"), "button_yes"), KGuiItem(i18n("&Choose Other Name...")), @@ -3135,11 +3135,11 @@ tristate KexiMainWindowImpl::getNewObjectInfo( else { KMessageBox::information(this, "<p>"+part->i18nMessage("Object \"%1\" already exists.", 0) - .tqarg(d->nameDialog->widget()->nameText()) + .arg(d->nameDialog->widget()->nameText()) +"</p><p>"+i18n("Please choose other name.")+"</p>"); // " For example: Table \"my_table\" already exists" , // "%1 \"%2\" already exists.\nPlease choose other name.") -// .tqarg(dlg->part()->instanceName()).tqarg(d->nameDialog->widget()->nameText())); +// .arg(dlg->part()->instanceName()).arg(d->nameDialog->widget()->nameText())); continue; } } @@ -3160,7 +3160,7 @@ tristate KexiMainWindowImpl::saveObject( KexiDialogBase *dlg, const TQString& me //data was saved in the past -just save again res = dlg->storeData(dontAsk); if (!res) - showErrorMessage(i18n("Saving \"%1\" object failed.").tqarg(dlg->partItem()->name()), + showErrorMessage(i18n("Saving \"%1\" object failed.").arg(dlg->partItem()->name()), d->curDialog); return res; } @@ -3177,7 +3177,7 @@ tristate KexiMainWindowImpl::saveObject( KexiDialogBase *dlg, const TQString& me if (~res) return cancelled; if (!res) { - showErrorMessage(i18n("Saving new \"%1\" object failed.").tqarg(dlg->partItem()->name()), + showErrorMessage(i18n("Saving new \"%1\" object failed.").arg(dlg->partItem()->name()), d->curDialog); return false; } @@ -3224,11 +3224,11 @@ tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool layoutTaskBar saveChanges.setToolTip(i18n("Save changes")); saveChanges.setWhatsThis( i18n( "Pressing this button will save all recent changes made in \"%1\" object." ) - .tqarg(dlg->partItem()->name()) ); + .arg(dlg->partItem()->name()) ); KGuiItem discardChanges( KStdGuiItem::discard() ); discardChanges.setWhatsThis( i18n( "Pressing this button will discard all recent changes made in \"%1\" object." ) - .tqarg(dlg->partItem()->name()) ); + .arg(dlg->partItem()->name()) ); //dialog's data is dirty: //--adidional message, e.g. table designer will return @@ -3243,7 +3243,7 @@ tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool layoutTaskBar const int questionRes = KMessageBox::warningYesNoCancel( this, "<p>"+dlg->part()->i18nMessage("Design of object \"%1\" has been modified.", dlg) - .tqarg(dlg->partItem()->name())+"</p><p>"+i18n("Do you want to save changes?")+"</p>" + .arg(dlg->partItem()->name())+"</p><p>"+i18n("Do you want to save changes?")+"</p>" + additionalMessage /*may be empty*/, TQString(), saveChanges, @@ -3380,9 +3380,9 @@ void KexiMainWindowImpl::attachWindow(KMdiChildView *pWnd, bool /*bShow*/, bool KMdiMainFrm::attachWindow(pWnd,true,bAutomaticResize); //for dialogs in normal state: decrease dialog's height if it exceeds area contents if (pWnd->mdiParent()->state() == KMdiChildFrm::Normal - && pWnd->tqgeometry().bottom() > pWnd->mdiParent()->mdiAreaContentsRect().bottom()) + && pWnd->geometry().bottom() > pWnd->mdiParent()->mdiAreaContentsRect().bottom()) { - TQRect r = pWnd->tqgeometry(); + TQRect r = pWnd->geometry(); r.setBottom( pWnd->mdiParent()->mdiAreaContentsRect().bottom() - 5 ); pWnd->setGeometry( r ); } @@ -3444,7 +3444,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e ) /* Fixes for popup menus behaviour: For hiding/showing: focus previously (d->focus_before_popup) focused window, if known, otherwise focus currently focused one. - And: just tqinvalidate actions. + And: just invalidate actions. */ if (e->type()==TQEvent::Hide || e->type()==TQEvent::Show) { KexiVDebug << e->type() << endl; @@ -3479,10 +3479,10 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e ) KexiVDebug << (focus_w ? focus_w->name() : "" ) << endl; KexiVDebug << "eventFilter: " <<e->type() << " " <<obj->name() <<endl; #ifdef KEXI_STATUSBAR_DEBUG - TQWidget *focus_widget = focus_w ? focus_w->tqfocusWidget() : 0; - d->statusBar->settqStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4") - .tqarg(focus_w ? focus_w->className() : "").tqarg(focus_w ? focus_w->name() : "") - .tqarg(focus_widget ? focus_widget->className() : "").tqarg(focus_widget ? focus_widget->name() : "") + TQWidget *focus_widget = focus_w ? focus_w->focusWidget() : 0; + d->statusBar->setStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4") + .arg(focus_w ? focus_w->className() : "").arg(focus_w ? focus_w->name() : "") + .arg(focus_widget ? focus_widget->className() : "").arg(focus_widget ? focus_widget->name() : "") ); #endif } @@ -3492,10 +3492,10 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e ) KexiVDebug << (focus_w ? focus_w->name() : "" ) << endl; KexiVDebug << "eventFilter: " <<e->type() << " " <<obj->name() <<endl; #ifdef KEXI_STATUSBAR_DEBUG - TQWidget *focus_widget = focus_w ? focus_w->tqfocusWidget() : 0; - d->statusBar->settqStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4") - .tqarg(focus_w ? focus_w->className() : "").tqarg(focus_w ? focus_w->name() : "") - .tqarg(focus_widget ? focus_widget->className() : "").tqarg(focus_widget ? focus_widget->name() : "") + TQWidget *focus_widget = focus_w ? focus_w->focusWidget() : 0; + d->statusBar->setStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4") + .arg(focus_w ? focus_w->className() : "").arg(focus_w ? focus_w->name() : "") + .arg(focus_widget ? focus_widget->className() : "").arg(focus_widget ? focus_widget->name() : "") ); #endif } @@ -3512,7 +3512,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e ) // invalidateSharedActions(); } else { -/* TQObject* o = tqfocusWidget(); +/* TQObject* o = focusWidget(); while (o && !o->inherits("KexiDialogBase") && !o->inherits("KexiDockBase")) o = o->parent();*/ //js invalidateSharedActions(focus_w); @@ -3534,7 +3534,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e ) return true; } - //remember currently focued window tqinvalidate act. + //remember currently focued window invalidate act. if (e->type()==TQEvent::FocusOut) { if (TQT_TQFOCUSEVENT(e)->reason()==TQFocusEvent::Popup) { if (KexiUtils::hasParent(TQT_TQOBJECT(d->curDialog), TQT_TQOBJECT(focus_w))) { @@ -3605,7 +3605,7 @@ KexiMainWindowImpl::openObject(KexiPart::Item* item, int viewMode, bool &opening if (!openingAllowed(item, viewMode)) { if (errorMessage) *errorMessage = i18n("opening is not allowed in \"data view/design view/text view\" mode", - "opening is not allowed in \"%1\" mode").tqarg(Kexi::nameForViewMode(viewMode)); + "opening is not allowed in \"%1\" mode").arg(Kexi::nameForViewMode(viewMode)); openingCancelled = true; return 0; } @@ -3790,7 +3790,7 @@ tristate KexiMainWindowImpl::removeObject( KexiPart::Item *item, bool dontAsk ) "<p>"+i18n("Do you want to permanently delete:\n" "%1\n" "If you click \"Delete\", you will not be able to undo the deletion.") - .tqarg( "</p><p>"+part->instanceCaption()+" \""+ item->name() + "\"?</p>" ), + .arg( "</p><p>"+part->instanceCaption()+" \""+ item->name() + "\"?</p>" ), 0, KGuiItem(i18n("Delete"), "editdelete"), KStdGuiItem::no())) return cancelled; } @@ -3865,7 +3865,7 @@ void KexiMainWindowImpl::renameObject( KexiPart::Item *item, const TQString& _ne const bool res = d->prj->renameObject(this, *item, newName); enableMessages(true); if (!res) { - showErrorMessage( d->prj, i18n("Renaming object \"%1\" failed.").tqarg(newName) ); + showErrorMessage( d->prj, i18n("Renaming object \"%1\" failed.").arg(newName) ); success = false; return; } @@ -3980,7 +3980,7 @@ void KexiMainWindowImpl::importantInfo(bool /*onStartup*/) if (onStartup && !d->showImportantInfoOnStartup) return; - TQString key = TQString("showImportantInfo %1").tqarg(KEXI_VERSION_STRING); + TQString key = TQString("showImportantInfo %1").arg(KEXI_VERSION_STRING); d->config->setGroup("Startup"); bool show = d->config->readBoolEntry(key,true); @@ -4005,7 +4005,7 @@ void KexiMainWindowImpl::importantInfo(bool /*onStartup*/) ts.setCodec( KGlobal::locale()->codecForEncoding() ); TQTextBrowser *tb = KexiUtils::findFirstChild<KTextBrowser>(&tipDialog,"KTextBrowser"); if (tb) { - tb->setText( TQString("<qt>%1</qt>").tqarg(ts.read()) ); + tb->setText( TQString("<qt>%1</qt>").arg(ts.read()) ); } f.close(); } @@ -4062,7 +4062,7 @@ KexiMainWindowImpl::initUserMode(KexiProjectData *projectData) #if 0 //todo reenable; autoopen objects are handled elsewhere KexiDB::TableSchema *sch = d->prj->dbConnection()->tableSchema("kexi__final"); TQString err_msg = i18n("Could not start project \"%1\" in Final Mode.") - .tqarg(static_cast<KexiDB::SchemaData*>(projectData)->name()); + .arg(static_cast<KexiDB::SchemaData*>(projectData)->name()); if(!sch) { hide(); @@ -4184,7 +4184,7 @@ void KexiMainWindowImpl::slotToolsCompactDatabase() if (!drv || !(drv->features() & KexiDB::Driver::CompactingDatabaseSupported)) { KMessageBox::information(this, "<qt>"+ i18n("Compacting database file <nobr>\"%1\"</nobr> is not supported.") - .tqarg(TQDir::convertSeparators(cdata.fileName()))); + .arg(TQDir::convertSeparators(cdata.fileName()))); return; } data = new KexiProjectData( cdata, cdata.fileName() ); @@ -4409,7 +4409,7 @@ tristate KexiMainWindowImpl::printActionForItem(KexiPart::Item* item, PrintActio if (dlg) { // accept row changes - TQWidget *prevFocusWidget = tqfocusWidget(); + TQWidget *prevFocusWidget = focusWidget(); dlg->setFocus(); d->action_data_save_row->activate(); if (prevFocusWidget) @@ -4423,11 +4423,11 @@ tristate KexiMainWindowImpl::printActionForItem(KexiPart::Item* item, PrintActio saveChanges.setToolTip(i18n("Save changes")); saveChanges.setWhatsThis( i18n( "Pressing this button will save all recent changes made in \"%1\" object." ) - .tqarg(item->name()) ); + .arg(item->name()) ); KGuiItem doNotSave( KStdGuiItem::no() ); doNotSave.setWhatsThis( i18n( "Pressing this button will ignore all unsaved changes made in \"%1\" object." ) - .tqarg(dlg->partItem()->name()) ); + .arg(dlg->partItem()->name()) ); TQString question; if (action == PrintItem) @@ -4441,7 +4441,7 @@ tristate KexiMainWindowImpl::printActionForItem(KexiPart::Item* item, PrintActio const int questionRes = KMessageBox::warningYesNoCancel( this, "<p>"+dlg->part()->i18nMessage("Design of object \"%1\" has been modified.", dlg) - .tqarg(item->name()) + "</p><p>" + question + "</p>", + .arg(item->name()) + "</p><p>" + question + "</p>", TQString(), saveChanges, doNotSave); diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h index 9dbedae3..141cd475 100644 --- a/kexi/main/keximainwindowimpl.h +++ b/kexi/main/keximainwindowimpl.h @@ -296,7 +296,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI virtual bool acceptsSharedActions(TQObject *w); /*! Performs lookup like in KexiSharedActionHost::focusWindow() - but starting from \a w instead of a widget returned by TQWidget::tqfocusWidget(). + but starting from \a w instead of a widget returned by TQWidget::focusWidget(). \return NULL if no widget matches acceptsSharedActions() or if \a w is NULL. */ TQWidget* findWindow(TQWidget *w); @@ -346,7 +346,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI void slotPartLoaded(KexiPart::Part* p); - void slotCaptionForCurrentMDIChild(bool tqchildrenMaximized); + void slotCaptionForCurrentMDIChild(bool childrenMaximized); void slotNoMaximizedChildFrmLeft(KMdiChildFrm*); void slotLastChildViewClosed(); void slotChildViewIsDetachedNow(TQWidget*); diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h index c79b58db..3eeccc94 100644 --- a/kexi/main/keximainwindowimpl_p.h +++ b/kexi/main/keximainwindowimpl_p.h @@ -219,8 +219,8 @@ void updatePropEditorDockWidthInfo() { void showStartProcessMsg(const TQStringList& args) { - wnd->showErrorMessage(i18n("Could not start %1 application.").tqarg(KEXI_APP_NAME), - i18n("Command \"%1\" failed.").tqarg(args.join(" "))); + wnd->showErrorMessage(i18n("Could not start %1 application.").arg(KEXI_APP_NAME), + i18n("Command \"%1\" failed.").arg(args.join(" "))); } void hideMenuItem(const TQString& menuName, const TQString& itemText, bool alsoSeparator) @@ -267,7 +267,7 @@ void updatePropEditorDockWidthInfo() { #endif } else { //propEditorToolWindow->show(); - TQWidget *origFocusWidget = tqApp->tqfocusWidget(); + TQWidget *origFocusWidget = tqApp->focusWidget(); wnd->makeWidgetDockVisible(propEditorTabWidget); if (origFocusWidget) origFocusWidget->setFocus(); diff --git a/kexi/main/kexinamedialog.cpp b/kexi/main/kexinamedialog.cpp index 45cbc449..f3e1acec 100644 --- a/kexi/main/kexinamedialog.cpp +++ b/kexi/main/kexinamedialog.cpp @@ -53,12 +53,12 @@ void KexiNameDialog::init() { TQGridLayout *lyr = new TQGridLayout(plainPage(), 2, 3); m_icon = new TQLabel( plainPage(), "icon" ); - m_icon->tqsetAlignment( int( AlignTop | AlignLeft ) ); - m_icon->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred,1,0)); + m_icon->setAlignment( int( AlignTop | AlignLeft ) ); + m_icon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred,1,0)); m_icon->setFixedWidth(50); lyr->addWidget(m_icon,0,0); - m_widget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred,1,0)); + m_widget->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred,1,0)); lyr->addWidget(m_widget,0,1); lyr->addItem(new TQSpacerItem( 25, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ), 0, 2); lyr->addItem(new TQSpacerItem( 5, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 1, 1); @@ -75,7 +75,7 @@ void KexiNameDialog::updateSize() { // resize( TQSize(400, 140 + (m_widget->lbl_message->isVisible()?m_widget->lbl_message->height():0) ) resize( TQSize(400, 140 + (!m_widget->lbl_message->text().isEmpty()?m_widget->lbl_message->height():0) ) - .expandedTo(tqminimumSizeHint()) ); + .expandedTo(minimumSizeHint()) ); // updateGeometry(); } diff --git a/kexi/main/kexinamewidget.cpp b/kexi/main/kexinamewidget.cpp index c6ca8f41..08210ac5 100644 --- a/kexi/main/kexinamewidget.cpp +++ b/kexi/main/kexinamewidget.cpp @@ -20,7 +20,7 @@ #include "kexinamewidget.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klineedit.h> #include <kmessagebox.h> @@ -66,8 +66,8 @@ void KexiNameWidget::init( lbl_message = new TQLabel( this, "message" ); setMessageText( message ); - lbl_message->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); - lbl_message->tqsetAlignment( TQLabel::AlignTop | TQLabel::WordBreak ); + lbl_message->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + lbl_message->setAlignment( TQLabel::AlignTop | TQLabel::WordBreak ); lyr->addMultiCellWidget( lbl_message, 0, 0, 0, 1 ); lbl_caption = new TQLabel( captionLabel.isEmpty() ? i18n( "Caption:" ) : captionLabel, @@ -79,17 +79,17 @@ void KexiNameWidget::init( lyr->addWidget( lbl_name, 2, 0 ); le_caption = new KLineEdit( nameText, this, "le_caption" ); - le_caption->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 1, 0)); + le_caption->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 1, 0)); lyr->addWidget( le_caption, 1, 1 ); le_name = new KLineEdit( nameText, this, "le_name" ); - le_name->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed,1,0)); + le_name->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed,1,0)); Validator *idValidator = new IdentifierValidator(0, "id_val"); le_name->setValidator( m_validator = new MultiValidator(idValidator, TQT_TQOBJECT(this), "val") ); lyr->addWidget( le_name, 2, 1 ); setFocusProxy(le_caption); - resize( TQSize(342, 123).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(342, 123).expandedTo(minimumSizeHint()) ); m_nameWarning = i18n("Please enter the name."); m_captionWarning = i18n("Please enter the caption."); diff --git a/kexi/main/kexinamewidget.h b/kexi/main/kexinamewidget.h index acbeed5c..1ab0ea89 100644 --- a/kexi/main/kexinamewidget.h +++ b/kexi/main/kexinamewidget.h @@ -21,7 +21,7 @@ #define KEXINAMEWIDGET_H #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klineedit.h> namespace KexiUtils { diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp index 9beffbf5..1218df23 100644 --- a/kexi/main/kexinewstuff.cpp +++ b/kexi/main/kexinewstuff.cpp @@ -55,7 +55,7 @@ KexiNewStuff::install(const TQString &fileName) KTar archive( fileName ); if ( !archive.open( IO_ReadOnly ) ) { - kdDebug() << TQString("KexiNewStuff::install: Failed to open archivefile \"%1\"").tqarg(fileName) << endl; + kdDebug() << TQString("KexiNewStuff::install: Failed to open archivefile \"%1\"").arg(fileName) << endl; return false; } const KArchiveDirectory *archiveDir = archive.directory(); diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp index e4bfd580..ab6fffab 100644 --- a/kexi/main/kexistatusbar.cpp +++ b/kexi/main/kexistatusbar.cpp @@ -22,7 +22,7 @@ #include "kexistatusbar.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpainter.h> #include <tqtimer.h> @@ -78,7 +78,7 @@ void KexiStatusBar::activePartChanged(KParts::Part *part) if (part && part->widget()) { if ((m_viewmsgIface = dynamic_cast<KTextEditor::ViewStatusMsgInterface*>(part->widget()))) { connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ), - this, TQT_SLOT( settqStatus( const TQString & ) ) ); + this, TQT_SLOT( setStatus( const TQString & ) ) ); # if TDE_VERSION < KDE_MAKE_VERSION(3,1,90) changeItem(m_map[ m_activePart ], m_msgID); @@ -110,7 +110,7 @@ void KexiStatusBar::cursorPositionChanged() #endif } -void KexiStatusBar::settqStatus(const TQString &str) +void KexiStatusBar::setStatus(const TQString &str) { kdDebug() << "KexiStatusBar::setStatus(" << str << ")" << endl; // m_status->setText(str); @@ -125,16 +125,16 @@ void KexiStatusBar::settqStatus(const TQString &str) void KexiStatusBar::setCursorPosition(int line, int col) { -// m_status->setText(i18n(" Line: %1 Col: %2 ").tqarg(line+1).tqarg(col)); - changeItem(i18n(" Line: %1 Col: %2 ").tqarg(line+1).tqarg(col), m_msgID); +// m_status->setText(i18n(" Line: %1 Col: %2 ").arg(line+1).arg(col)); + changeItem(i18n(" Line: %1 Col: %2 ").arg(line+1).arg(col), m_msgID); } /*void KexiStatusBar::addWidget ( TQWidget *widget, int stretch, bool permanent) { KStatusBar::addWidget(widget,stretch,permanent); - if(widget->tqsizeHint().height() + 4 > height()) - setFixedHeight(widget->tqsizeHint().height() + 4); + if(widget->sizeHint().height() + 4 > height()) + setFixedHeight(widget->sizeHint().height() + 4); }*/ void KexiStatusBar::setReadOnlyFlag(bool readOnly) diff --git a/kexi/main/kexistatusbar.h b/kexi/main/kexistatusbar.h index bab1277a..e8c31d41 100644 --- a/kexi/main/kexistatusbar.h +++ b/kexi/main/kexistatusbar.h @@ -48,7 +48,7 @@ class KexiStatusBar : public KStatusBar // virtual void addWidget( TQWidget *widget, int stretch = 0, bool permanent = false); public slots: - virtual void settqStatus(const TQString &str); + virtual void setStatus(const TQString &str); virtual void setReadOnlyFlag(bool readOnly); protected slots: @@ -58,7 +58,7 @@ class KexiStatusBar : public KStatusBar protected: int m_msgID, m_readOnlyID; -// TQLabel *m_status, *m_readOnlytqStatus; +// TQLabel *m_status, *m_readOnlyStatus; #if KexiStatusBar_KTEXTEDITOR_USED KTextEditor::ViewCursorInterface * m_cursorIface; diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp index 45ab5892..8591167f 100644 --- a/kexi/main/printing/kexisimpleprintingengine.cpp +++ b/kexi/main/printing/kexisimpleprintingengine.cpp @@ -30,7 +30,7 @@ #include <kdebug.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqcheckbox.h> #include <tqwhatsthis.h> @@ -278,7 +278,7 @@ void KexiSimplePrintingEngine::paintPage(int pageNumber, TQPainter& painter, boo } painter.setFont(m_mainFont); - m_dateTimeText = KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime(), + m_dateTimeText = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(), true, false); m_dateTimeWidth = painter.fontMetrics().width(m_dateTimeText+" "); m_mainLineSpacing = painter.fontMetrics().lineSpacing(); @@ -326,9 +326,9 @@ void KexiSimplePrintingEngine::paintPage(int pageNumber, TQPainter& painter, boo TQString pageNumString; if (m_pagesCount>0) pageNumString = i18n("Page (number) of (total)", "Page %1 of %2") - .tqarg(pageNumber+1).tqarg(m_pagesCount); + .arg(pageNumber+1).arg(m_pagesCount); else - pageNumString = i18n("Page %1").tqarg(pageNumber+1); + pageNumString = i18n("Page %1").arg(pageNumber+1); painter.drawText((int)m_leftMargin, (int)m_topMargin + m_pageHeight - m_mainLineSpacing, m_pageWidth, m_mainLineSpacing, diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp index 476f924a..1df66250 100644 --- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp +++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp @@ -38,7 +38,7 @@ #include <tqlabel.h> #include <tqtimer.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqcheckbox.h> #include <tqwhatsthis.h> @@ -356,7 +356,7 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi m_contents->openDataLink->setText( i18n("Open This Query") ); m_origCaptionLabelText = i18n("<h2>Page setup for printing \"%1\" query data</h2>"); } - m_contents->captionLabel->setText( m_origCaptionLabelText.tqarg(m_item->name()) ); + m_contents->captionLabel->setText( m_origCaptionLabelText.arg(m_item->name()) ); } connect(m_contents->headerTitleLineEdit,TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotTitleTextChanged(const TQString&))); @@ -442,8 +442,8 @@ void KexiSimplePrintingPageSetup::updatePageLayoutAndUnitInfo() TQString s; if (m_settings.pageLayout.format == PG_CUSTOM) { s += TQString(" (%1 %2 x %3 %4)") - .tqarg(m_settings.pageLayout.ptWidth).tqarg(KoUnit::unitName(m_unit)) - .tqarg(m_settings.pageLayout.ptHeight).tqarg(KoUnit::unitName(m_unit)); + .arg(m_settings.pageLayout.ptWidth).arg(KoUnit::unitName(m_unit)) + .arg(m_settings.pageLayout.ptHeight).arg(KoUnit::unitName(m_unit)); } else s += KoPageFormat::name(m_settings.pageLayout.format); diff --git a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui index 6b169f7e..ff46ee7a 100644 --- a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui +++ b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="6"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <hbox> <property name="name"> @@ -45,7 +45,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> @@ -106,7 +106,7 @@ <property name="text"> <string>Page title:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignBottom</set> </property> <property name="buddy" stdset="0"> @@ -115,7 +115,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="6"> <property name="name"> - <cstring>tqlayout19</cstring> + <cstring>layout19</cstring> </property> <hbox> <property name="name"> @@ -158,7 +158,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>230</width> <height>20</height> @@ -222,7 +222,7 @@ </widget> <widget class="TQLayoutWidget" row="12" column="0" rowspan="1" colspan="6"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> @@ -238,7 +238,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>6</height> @@ -343,7 +343,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -360,7 +360,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>4</height> @@ -377,7 +377,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>4</height> @@ -394,7 +394,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>4</height> @@ -411,7 +411,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>4</height> diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp index 68c1c673..d17aac45 100644 --- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp +++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp @@ -22,7 +22,7 @@ #include "kexisimpleprintpreviewwindow_p.h" #include <kexi_version.h> -#include <tqlayout.h> +#include <layout.h> #include <tqaccel.h> #include <tqtimer.h> #include <tqlabel.h> @@ -52,7 +52,7 @@ void KexiSimplePrintPreviewView::paintEvent( TQPaintEvent *pe ) return; TQPixmap pm(size()); //dbl buffered TQPainter p; - p.tqbegin(TQT_TQPAINTDEVICE(&pm), this); + p.begin(TQT_TQPAINTDEVICE(&pm), this); //! @todo only for screen! p.fillRect(TQRect(TQPoint(0,0),pm.size()), TQBrush(white));//pe->rect(), TQBrush(white)); if (m_window->currentPage()>=0) @@ -135,7 +135,7 @@ void KexiSimplePrintPreviewScrollView::setFullWidth() viewport()->setUpdatesEnabled(true); resize(size()+TQSize(1,1)); //to update pos. widget->enablePainting = true; - widget->tqrepaint(); + widget->repaint(); } void KexiSimplePrintPreviewScrollView::setContentsPos(int x, int y) @@ -157,7 +157,7 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow( , m_pageNumber(-1) , m_pagesCount(-1) { - setCaption(i18n("%1 - Print Preview - %2").tqarg(previewName).tqarg(KEXI_APP_NAME)); + setCaption(i18n("%1 - Print Preview - %2").arg(previewName).arg(KEXI_APP_NAME)); setIcon(DesktopIcon("filequickprint")); TQVBoxLayout *lyr = new TQVBoxLayout(this, 6); @@ -196,11 +196,11 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow( m_scrollView = new KexiSimplePrintPreviewScrollView(this); m_scrollView->setUpdatesEnabled(false); m_view = m_scrollView->widget; - m_scrollView->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + m_scrollView->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); lyr->addWidget(m_scrollView); TQWidget* navToolbarWidget = new TQWidget(this); //widget used to center the navigator toolbar - navToolbarWidget->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + navToolbarWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); TQHBoxLayout *navToolbarLyr = new TQHBoxLayout(navToolbarWidget); lyr->addWidget(navToolbarWidget); @@ -308,14 +308,14 @@ void KexiSimplePrintPreviewWindow::goToPage(int pageNumber) m_pageNumber = pageNumber; m_pagesCount = m_engine.pagesCount(); - m_view->tqrepaint(); //this will automatically paint a new page + m_view->repaint(); //this will automatically paint a new page m_navToolbar->setItemEnabled(m_idNext, pageNumber < ((int)m_engine.pagesCount()-1)); m_navToolbar->setItemEnabled(m_idLast, pageNumber < ((int)m_engine.pagesCount()-1)); m_navToolbar->setItemEnabled(m_idPrevious, pageNumber > 0); m_navToolbar->setItemEnabled(m_idFirst, pageNumber > 0); static_cast<TQLabel*>(m_navToolbar->getWidget(m_idPageNumberLabel))->setText( - i18n("Page (number) of (total)", "Page %1 of %2").tqarg(m_pageNumber+1).tqarg(m_engine.pagesCount())); + i18n("Page (number) of (total)", "Page %1 of %2").arg(m_pageNumber+1).arg(m_engine.pagesCount())); } void KexiSimplePrintPreviewWindow::setFullWidth() diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp index a9a2a316..c2c84011 100644 --- a/kexi/main/startup/KexiConnSelector.cpp +++ b/kexi/main/startup/KexiConnSelector.cpp @@ -42,10 +42,10 @@ #include <tqlabel.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqtooltip.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqgroupbox.h> #include <tqwidgetstack.h> #include <tqbuttongroup.h> @@ -149,8 +149,8 @@ KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set, TQToolTip::add(m_remote->btn_edit, i18n("Edit selected database connection")); TQToolTip::add(m_remote->btn_remove, i18n("Remove selected database connections")); d->stack->addWidget(m_remote); - if (m_remote->tqlayout()) - m_remote->tqlayout()->setMargin(0); + if (m_remote->layout()) + m_remote->layout()->setMargin(0); // connect(m_remote->btn_back,TQT_SIGNAL(clicked()),this,TQT_SLOT(showSimpleConn())); connect(m_remote->list,TQT_SIGNAL(doubleClicked(TQListViewItem*)), this,TQT_SLOT(slotConnectionItemExecuted(TQListViewItem*))); @@ -197,8 +197,8 @@ void KexiConnSelectorWidget::slotPrjTypeSelected(int id) if (m_remote->list->firstChild()) { m_remote->list->setSelected(m_remote->list->firstChild(),true); } - m_remote->descriptionEdit->setPaletteBackgroundColor(tqpalette().active().background()); - m_remote->descGroupBox->tqlayout()->setMargin(2); + m_remote->descriptionEdit->setPaletteBackgroundColor(palette().active().background()); + m_remote->descGroupBox->layout()->setMargin(2); m_remote->list->setFocus(); slotConnectionSelectionChanged(); } @@ -222,7 +222,7 @@ void KexiConnSelectorWidget::showSimpleConn() m_fileDlg = new KexiStartupFileDialog( d->startDirOrVariable, KexiStartupFileDialog::Opening, d->stack, "openExistingFileDlg"); m_fileDlg->setConfirmOverwrites( d->confirmOverwrites ); -// static_cast<TQVBoxLayout*>(m_file->tqlayout())->insertWidget( 2, m_fileDlg ); +// static_cast<TQVBoxLayout*>(m_file->layout())->insertWidget( 2, m_fileDlg ); d->stack->addWidget(m_fileDlg); for (TQWidget *w = parentWidget(true);w;w=w->parentWidget(true)) { @@ -350,9 +350,9 @@ bool KexiConnSelectorWidget::confirmOverwrites() const /*static TQString msgUnfinished() { return i18n("To define or change a connection, use command line options or click on .kexis file. " - "You can find example .kexis file at <a href=\"%1\">here</a>.").tqarg("") //temporary, please do not change for 0.8! + "You can find example .kexis file at <a href=\"%1\">here</a>.").arg("") //temporary, please do not change for 0.8! + "\nhttp://www.kexi-project.org/resources/testdb.kexis"; */ -// .tqarg("http://websvn.kde.org/*checkout*/branches/kexi/0.9/koffice/kexi/tests/startup/testdb.kexis"); +// .arg("http://websvn.kde.org/*checkout*/branches/kexi/0.9/koffice/kexi/tests/startup/testdb.kexis"); //} void KexiConnSelectorWidget::slotRemoteAddBtnClicked() @@ -407,7 +407,7 @@ void KexiConnSelectorWidget::slotRemoteRemoveBtnClicked() return; if (KMessageBox::Continue!=KMessageBox::warningContinueCancel(0, i18n("Do you want to remove database connection \"%1\" from the list of available connections?") - .tqarg(item->data()->serverInfoString(true)), TQString(), KStdGuiItem::del(), TQString(), + .arg(item->data()->serverInfoString(true)), TQString(), KStdGuiItem::del(), TQString(), KMessageBox::Notify|KMessageBox::Dangerous)) return; diff --git a/kexi/main/startup/KexiConnSelectorBase.ui b/kexi/main/startup/KexiConnSelectorBase.ui index 5c7bb64d..c55614e2 100644 --- a/kexi/main/startup/KexiConnSelectorBase.ui +++ b/kexi/main/startup/KexiConnSelectorBase.ui @@ -72,7 +72,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>60</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -166,7 +166,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> @@ -177,7 +177,7 @@ <property name="name"> <cstring>descGroupBox</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>80</height> @@ -205,7 +205,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>50</height> @@ -246,7 +246,7 @@ <p>You will see existing Kexi projects available for the selected connection. Here you may also add, edit or remove connections from the list. </string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> <property name="buddy" stdset="0"> @@ -268,7 +268,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> diff --git a/kexi/main/startup/KexiDBTitlePage.h b/kexi/main/startup/KexiDBTitlePage.h index 4ac59bc0..0ee1e4dd 100644 --- a/kexi/main/startup/KexiDBTitlePage.h +++ b/kexi/main/startup/KexiDBTitlePage.h @@ -22,7 +22,7 @@ #include "KexiDBTitlePageBase.h" -//! @short A helper widget used to displaying a line edit with a label and tqlayout +//! @short A helper widget used to displaying a line edit with a label and layout class KEXIMAIN_EXPORT KexiDBTitlePage : public KexiDBTitlePageBase { Q_OBJECT diff --git a/kexi/main/startup/KexiDBTitlePageBase.ui b/kexi/main/startup/KexiDBTitlePageBase.ui index 7b711ea3..e8a00ef9 100644 --- a/kexi/main/startup/KexiDBTitlePageBase.ui +++ b/kexi/main/startup/KexiDBTitlePageBase.ui @@ -40,7 +40,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>111</height> @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -76,7 +76,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> diff --git a/kexi/main/startup/KexiNewPrjTypeSelector.ui b/kexi/main/startup/KexiNewPrjTypeSelector.ui index 79f763ee..122137e1 100644 --- a/kexi/main/startup/KexiNewPrjTypeSelector.ui +++ b/kexi/main/startup/KexiNewPrjTypeSelector.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -74,7 +74,7 @@ <string>Kexi will create a new database project. Select a storage method which will be used to store the new project. </string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp index b24a66ab..9842cb41 100644 --- a/kexi/main/startup/KexiNewProjectWizard.cpp +++ b/kexi/main/startup/KexiNewProjectWizard.cpp @@ -46,7 +46,7 @@ #include <tqobjectlist.h> #include <tqlabel.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqheader.h> @@ -96,7 +96,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, //page: type selector m_prjtype_sel = new KexiNewPrjTypeSelector(this, "KexiNewPrjTypeSelector"); // lv_types = new KListView(m_prjtype_sel, "types listview"); -// m_prjtype_sel->lv_types->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum, 0, 2)); +// m_prjtype_sel->lv_types->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum, 0, 2)); #if KDE_IS_VERSION(3,3,9) m_prjtype_sel->lv_types->setShadeSortColumn(false); #endif @@ -127,8 +127,8 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, connect(m_prjtype_sel->lv_types,TQT_SIGNAL(returnPressed(TQListViewItem*)),this,TQT_SLOT(slotLvTypesExecuted(TQListViewItem*))); connect(m_prjtype_sel->lv_types,TQT_SIGNAL(selectionChanged( TQListViewItem*)),this,TQT_SLOT(slotLvTypesSelected(TQListViewItem*))); -// static_cast<TQVBoxLayout*>(m_prjtype_sel->tqlayout())->insertWidget(1,d->m_prjtype_sel->lv_types); -// static_cast<TQVBoxLayout*>(m_prjtype_sel->tqlayout())->insertStretch(3,1); +// static_cast<TQVBoxLayout*>(m_prjtype_sel->layout())->insertWidget(1,d->m_prjtype_sel->lv_types); +// static_cast<TQVBoxLayout*>(m_prjtype_sel->layout())->insertStretch(3,1); // updateGeometry(); addPage(m_prjtype_sel, i18n("Select Storage Method")); @@ -142,7 +142,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, m_conn_sel_widget = new TQWidget(this); TQVBoxLayout* conn_sel_lyr = new TQVBoxLayout(m_conn_sel_widget); TQLabel *conn_sel_label = new TQLabel(i18n("Enter a new Kexi project's file name:"), m_conn_sel_widget); - conn_sel_label->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); + conn_sel_label->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); conn_sel_lyr->addWidget( conn_sel_label ); conn_sel_lyr->addSpacing(KDialogBase::spacingHint()); @@ -301,7 +301,7 @@ void KexiNewProjectWizard::next() return; } m_project_selector->label->setText( - d->server_db_name_dblist_lbl_txt.tqarg(m_conn_sel->selectedConnectionData()->serverInfoString(false)) ); + d->server_db_name_dblist_lbl_txt.arg(m_conn_sel->selectedConnectionData()->serverInfoString(false)) ); m_server_db_name->le_caption->setFocus(); } @@ -342,7 +342,7 @@ void KexiNewProjectWizard::accept() if (KMessageBox::Continue!=KMessageBox::warningContinueCancel( this, "<qt>" +i18n("<b>A project with database name \"%1\" already exists</b>" "<p>Do you want to delete it and create a new one?") - .tqarg( m_server_db_name->le_dbname->text() ), TQString(), KStdGuiItem::del(), + .arg( m_server_db_name->le_dbname->text() ), TQString(), KStdGuiItem::del(), TQString(), KMessageBox::Notify|KMessageBox::Dangerous )) { m_server_db_name->le_dbname->setFocus(); diff --git a/kexi/main/startup/KexiOpenExistingFile.ui b/kexi/main/startup/KexiOpenExistingFile.ui index f11d7f58..b74936dd 100644 --- a/kexi/main/startup/KexiOpenExistingFile.ui +++ b/kexi/main/startup/KexiOpenExistingFile.ui @@ -35,7 +35,7 @@ <string><b>Select existing Kexi project file to open:</b> </string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -43,7 +43,7 @@ <property name="name"> <cstring>line</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>8</height> @@ -60,13 +60,13 @@ <property name="name"> <cstring>spacer</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>6</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>6</height> @@ -75,7 +75,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -112,7 +112,7 @@ <property name="text"> <string>Click "Advanced" button if you want to find an existing project on a server rather than a file.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp index 9353e3a6..05cd5293 100644 --- a/kexi/main/startup/KexiProjectSelector.cpp +++ b/kexi/main/startup/KexiProjectSelector.cpp @@ -31,7 +31,7 @@ #include <tqlabel.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <assert.h> @@ -248,7 +248,7 @@ KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *parent, const ch init(prj_set, showProjectNameColumn, showConnectionColumns); m_sel->label->setText( i18n("Select a project on <b>%1</b> database server to open:") - .tqarg(cdata->serverInfoString(false)) ); + .arg(cdata->serverInfoString(false)) ); } KexiProjectSelectorDialog::~KexiProjectSelectorDialog() diff --git a/kexi/main/startup/KexiProjectSelectorBase.ui b/kexi/main/startup/KexiProjectSelectorBase.ui index 18c80544..5159d9bb 100644 --- a/kexi/main/startup/KexiProjectSelectorBase.ui +++ b/kexi/main/startup/KexiProjectSelectorBase.ui @@ -43,7 +43,7 @@ <string><b>There are Kexi projects you have recently opened.</b> Select one you wish to open: </string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -103,7 +103,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>60</height> diff --git a/kexi/main/startup/KexiServerDBNamePage.ui b/kexi/main/startup/KexiServerDBNamePage.ui index b423d467..f482ed73 100644 --- a/kexi/main/startup/KexiServerDBNamePage.ui +++ b/kexi/main/startup/KexiServerDBNamePage.ui @@ -44,7 +44,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -55,7 +55,7 @@ <property name="name"> <cstring>le_dbname</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>20</height> @@ -89,7 +89,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>20</height> @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>12</height> diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp index c479a4e0..d405aee3 100644 --- a/kexi/main/startup/KexiStartup.cpp +++ b/kexi/main/startup/KexiStartup.cpp @@ -54,7 +54,7 @@ #include <tqcstring.h> #include <tqapplication.h> -#include <tqlayout.h> +#include <layout.h> namespace Kexi { static KStaticDeleter<KexiStartupHandler> Kexi_startupHandlerDeleter; @@ -126,7 +126,7 @@ void updateProgressBar(KProgressDialog *pd, char *buffer, int buflen) if (ok && percent>=0 && percent<=100 && pd->progressBar()->progress()<percent) { // kdDebug() << percent << endl; pd->progressBar()->setProgress(percent); - tqApp->tqprocessEvents(100); + tqApp->processEvents(100); } } } @@ -144,13 +144,13 @@ KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionD + i18n("Please enter the password.") + "</p>"; /* msg += cdata.userName.isEmpty() ? "<p>"+i18n("Please enter the password.") - : "<p>"+i18n("Please enter the password for user.").tqarg("<b>"+cdata.userName+"</b>");*/ + : "<p>"+i18n("Please enter the password for user.").arg("<b>"+cdata.userName+"</b>");*/ TQString srv = cdata.serverInfoString(false); if (srv.isEmpty() || srv.lower()=="localhost") srv = i18n("local database server"); - msg += ("</p><p>"+i18n("Database server: %1").tqarg(TQString("<nobr>")+srv+"</nobr>")+"</p>"); + msg += ("</p><p>"+i18n("Database server: %1").arg(TQString("<nobr>")+srv+"</nobr>")+"</p>"); TQString usr; if (cdata.userName.isEmpty()) @@ -158,7 +158,7 @@ KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionD else usr = cdata.userName; - msg += ("<p>"+i18n("Username: %1").tqarg(usr)+"</p>"); + msg += ("<p>"+i18n("Username: %1").arg(usr)+"</p>"); setPrompt( msg ); if (showDetailsButton) { @@ -176,7 +176,7 @@ KexiDBPasswordDialog::~KexiDBPasswordDialog() void KexiDBPasswordDialog::done(int r) { if (r == TQDialog::Accepted) { - m_cdata->password = TQString::tqfromLatin1(password()); + m_cdata->password = TQString::fromLatin1(password()); } // if (d->showConnectionDetailsExecuted || ret == TQDialog::Accepted) { /* } else { @@ -283,7 +283,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) KMessageBox::sorry( 0, "<qt>" +i18n("Could not read connection information from connection shortcut " "file <nobr>\"%1\"</nobr>.<br><br>Check whether the file has valid contents.") - .tqarg(TQDir::convertSeparators(connectionShortcut.fileName()))); + .arg(TQDir::convertSeparators(connectionShortcut.fileName()))); return false; } } @@ -295,7 +295,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) if (args->count()>0 && (!fileType.isEmpty() && fileType!="project" && fileType!="shortcut" && fileType!="connection")) { KMessageBox::sorry( 0, i18n("You have specified invalid argument (\"%1\") for \"type\" command-line option.") - .tqarg(fileType)); + .arg(fileType)); return false; } @@ -364,7 +364,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) const bool dropDB = args->isSet("dropdb"); const bool openExisting = !createDB && !dropDB; const bool readOnly = args->isSet("readonly"); - const TQString couldnotMsg = TQString::tqfromLatin1("\n") + const TQString couldnotMsg = TQString::fromLatin1("\n") +i18n("Could not start Kexi application this way."); if (createDB && dropDB) { @@ -434,7 +434,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) if (dropDB && !projectFileExists) { KMessageBox::sorry(0, i18n("Could not remove project.\nThe file \"%1\" does not exist.") - .tqarg(TQDir::convertSeparators(cdata.dbFileName()))); + .arg(TQDir::convertSeparators(cdata.dbFileName()))); return 0; } } @@ -476,7 +476,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) m_projectData = new KexiProjectData(); if (!d->shortcutFile->loadProjectData(*m_projectData, &d->shortcutFileGroupKey)) { KMessageBox::sorry(0, i18n("Could not open shortcut file\n\"%1\".") - .tqarg(TQDir::convertSeparators(cdata.fileName()))); + .arg(TQDir::convertSeparators(cdata.fileName()))); delete m_projectData; m_projectData = 0; delete d->shortcutFile; @@ -509,7 +509,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) d->connShortcutFile = new KexiDBConnShortcutFile(cdata.fileName()); if (!d->connShortcutFile->loadConnectionData(cdata, &d->shortcutFileGroupKey)) { KMessageBox::sorry(0, i18n("Could not open connection data file\n\"%1\".") - .tqarg(TQDir::convertSeparators(cdata.fileName()))); + .arg(TQDir::convertSeparators(cdata.fileName()))); delete d->connShortcutFile; d->connShortcutFile = 0; return false; @@ -612,7 +612,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) if (!alsoOpenDB) { if (ok) { KMessageBox::information( 0, i18n("Project \"%1\" created successfully.") - .tqarg( TQDir::convertSeparators(projectData()->databaseName()) )); + .arg( TQDir::convertSeparators(projectData()->databaseName()) )); } return ok; } @@ -622,7 +622,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) tristate res = KexiProject::dropProject(projectData(), &gui, false/*ask*/); if (res==true) KMessageBox::information( 0, i18n("Project \"%1\" dropped successfully.") - .tqarg( TQDir::convertSeparators(projectData()->databaseName()) )); + .arg( TQDir::convertSeparators(projectData()->databaseName()) )); return res!=false; } @@ -749,7 +749,7 @@ tristate KexiStartupHandler::detectActionForFile( if (!(options & SkipMessages)) KMessageBox::sorry(parent, i18n("<p>Could not open project.</p>") +i18n("<p>The file <nobr>\"%1\"</nobr> does not exist or is not readable.</p>") - .tqarg(TQDir::convertSeparators(dbFileName)) + .arg(TQDir::convertSeparators(dbFileName)) +i18n("Check the file's permissions and whether it is already opened " "and locked by another application.")); return false; @@ -781,7 +781,7 @@ tristate KexiStartupHandler::detectActionForFile( if (!(options & SkipMessages)) KMessageBox::sorry(parent, i18n("<p>Could not open project.</p>") +i18n("<p>The file <nobr>\"%1\"</nobr> is not readable.</p>") - .tqarg(TQDir::convertSeparators(dbFileName)) + .arg(TQDir::convertSeparators(dbFileName)) +i18n("Check the file's permissions and whether it is already opened " "and locked by another application.")); return false; @@ -804,7 +804,7 @@ tristate KexiStartupHandler::detectActionForFile( if ((options & SkipMessages) || KMessageBox::Yes != KMessageBox::questionYesNo( parent, i18n("\"%1\" is an external file of type:\n\"%2\".\n" "Do you want to import the file as a Kexi project?") - .tqarg(TQDir::convertSeparators(dbFileName)).tqarg(ptr.data()->comment()), + .arg(TQDir::convertSeparators(dbFileName)).arg(ptr.data()->comment()), i18n("Open External File"), KGuiItem(i18n("Import...")), KStdGuiItem::cancel() ) ) { return cancelled; @@ -830,8 +830,8 @@ tristate KexiStartupHandler::detectActionForFile( "The project file \"%1\" is recognized as compatible with \"%2\" database driver, " "while you have asked for \"%3\" database driver to be used.\n" "Do you want to use \"%4\" database driver?") - .tqarg(TQDir::convertSeparators(dbFileName)) - .tqarg(tmpDriverName).tqarg(suggestedDriverName).tqarg(tmpDriverName)); + .arg(TQDir::convertSeparators(dbFileName)) + .arg(tmpDriverName).arg(suggestedDriverName).arg(tmpDriverName)); if (KMessageBox::Yes == res) useDetectedDriver = true; else if (KMessageBox::Cancel == res) @@ -851,7 +851,7 @@ tristate KexiStartupHandler::detectActionForFile( && KMessageBox::Yes == KMessageBox::questionYesNo(parent, i18n( "Previous version of database file format (\"%1\") is detected in the \"%2\" " "project file.\nDo you want to convert the project to a new \"%3\" format (recommended)?") - .tqarg(detectedDriverName).tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat)) ) + .arg(detectedDriverName).arg(TQDir::convertSeparators(dbFileName)).arg(newFileFormat)) ) { // SQLite2ToSQLite3Migration *migr = new SQLite2ToSQLite3Migration migr( finfo.absFilePath() ); @@ -862,7 +862,7 @@ tristate KexiStartupHandler::detectActionForFile( KMessageBox::sorry(parent, i18n( "Failed to convert project file \"%1\" to a new \"%2\" format.\n" "The file format remains unchanged.") - .tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat) ); + .arg(TQDir::convertSeparators(dbFileName)).arg(newFileFormat) ); //continue... } if (res==true) @@ -872,19 +872,19 @@ tristate KexiStartupHandler::detectActionForFile( if (detectedDriverName.isEmpty()) { TQString possibleProblemsInfoMsg( Kexi::driverManager().possibleProblemsInfoMsg() ); if (!possibleProblemsInfoMsg.isEmpty()) { - possibleProblemsInfoMsg.prepend(TQString::tqfromLatin1("<p>")+i18n("Possible problems:")); - possibleProblemsInfoMsg += TQString::tqfromLatin1("</p>"); + possibleProblemsInfoMsg.prepend(TQString::fromLatin1("<p>")+i18n("Possible problems:")); + possibleProblemsInfoMsg += TQString::fromLatin1("</p>"); } if (!(options & SkipMessages)) KMessageBox::detailedSorry(parent, i18n( "The file \"%1\" is not recognized as being supported by Kexi.") - .tqarg(TQDir::convertSeparators(dbFileName)), - TQString::tqfromLatin1("<p>") + .arg(TQDir::convertSeparators(dbFileName)), + TQString::fromLatin1("<p>") +i18n("Database driver for this file type not found.\nDetected MIME type: %1") - .tqarg(mimename) + .arg(mimename) +(ptr.data()->comment().isEmpty() - ? TQString::tqfromLatin1(".") : TQString::tqfromLatin1(" (%1).").tqarg(ptr.data()->comment())) - +TQString::tqfromLatin1("</p>") + ? TQString::fromLatin1(".") : TQString::fromLatin1(" (%1).").arg(ptr.data()->comment())) + +TQString::fromLatin1("</p>") +possibleProblemsInfoMsg); return false; } @@ -894,7 +894,7 @@ tristate KexiStartupHandler::detectActionForFile( KexiProjectData* KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *parent) { - cleartqStatus(); + clearStatus(); cancelled = false; if (!cdata) return 0; @@ -917,13 +917,13 @@ KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled if (prjdlg.projectSet()) msgh.showErrorMessage(prjdlg.projectSet(), i18n("Could not load list of available projects for <b>%1</b> database server.") - .tqarg(cdata->serverInfoString(true))); + .arg(cdata->serverInfoString(true))); else msgh.showErrorMessage( i18n("Could not load list of available projects for <b>%1</b> database server.") - .tqarg(cdata->serverInfoString(true))); -// settqStatus(i18n("Could not load list of available projects for database server \"%1\"") -// .tqarg(cdata->serverInfoString(true)), prjdlg.projectSet()->errorMsg()); + .arg(cdata->serverInfoString(true))); +// setStatus(i18n("Could not load list of available projects for database server \"%1\"") +// .arg(cdata->serverInfoString(true)), prjdlg.projectSet()->errorMsg()); return 0; } if (prjdlg.exec()!=TQDialog::Accepted) { @@ -952,7 +952,7 @@ void KexiStartupHandler::slotSaveShortcutFileChanges() if (!ok) { KMessageBox::sorry(0, i18n("Failed saving connection data to\n\"%1\" file.") - .tqarg(TQDir::convertSeparators(d->shortcutFile->fileName()))); + .arg(TQDir::convertSeparators(d->shortcutFile->fileName()))); } } diff --git a/kexi/main/startup/KexiStartup.h b/kexi/main/startup/KexiStartup.h index fe1b3cf0..23d8e832 100644 --- a/kexi/main/startup/KexiStartup.h +++ b/kexi/main/startup/KexiStartup.h @@ -59,7 +59,7 @@ class KEXIMAIN_EXPORT KexiDBPasswordDialog : public KPasswordDialog /*! Handles startup actions for Kexi application. */ class KEXIMAIN_EXPORT KexiStartupHandler - : public TQObject, public KexiStartupData, public Kexi::ObjecttqStatus + : public TQObject, public KexiStartupData, public Kexi::ObjectStatus { Q_OBJECT TQ_OBJECT diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp index 7f67bc76..b2ad8cfd 100644 --- a/kexi/main/startup/KexiStartupDialog.cpp +++ b/kexi/main/startup/KexiStartupDialog.cpp @@ -25,7 +25,7 @@ #include "KexiConnSelector.h" #include "KexiConnSelectorBase.h" -#include <tqlayout.h> +#include <layout.h> #include <tqtabwidget.h> #include <tqcombobox.h> #include <tqcheckbox.h> @@ -324,7 +324,7 @@ void KexiStartupDialog::setupPageTemplates() tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint()); TQLabel *lbl_blank = new TQLabel( i18n("Kexi will create a new blank database project.")+clickMsg, templPageFrame ); - lbl_blank->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); + lbl_blank->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); lbl_blank->setMargin(0); tmplyr->addWidget( lbl_blank ); tmplyr->addStretch(1); @@ -342,7 +342,7 @@ void KexiStartupDialog::setupPageTemplates() TQLabel *lbl_templ = new TQLabel( i18n("Kexi will create a new database project using selected template.\n" "Select template and click \"OK\" button to proceed."), templPageFrame ); - lbl_templ->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); + lbl_templ->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); lbl_templ->setMargin(0); tmplyr->addWidget( lbl_templ ); @@ -389,7 +389,7 @@ void KexiStartupDialog::setupPageTemplates() TQLabel *lbl_import = new TQLabel( i18n("Kexi will import the structure and data of an existing database as a new database project.") +clickMsg, templPageFrame ); - lbl_import->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); + lbl_import->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); lbl_import->setMargin(0); tmplyr->addWidget( lbl_import ); tmplyr->addStretch(1); diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp index 429499f4..d919463d 100644 --- a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp +++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp @@ -123,8 +123,8 @@ void TemplatesPage::itemClicked(TQIconViewItem *item) { return; } TQString t = TQString("<h2>%1</h2><p>%2</p>") - .tqarg(static_cast<TemplateItem*>(item)->name) - .tqarg(static_cast<TemplateItem*>(item)->description); + .arg(static_cast<TemplateItem*>(item)->name) + .arg(static_cast<TemplateItem*>(item)->description); #ifndef DB_TEMPLATES t += TQString("<p>") + i18n("We are sorry, templates are not yet available.") +"</p>"; #endif diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp index cd54602b..8dd74298 100644 --- a/kexi/main/startup/KexiStartupFileDialog.cpp +++ b/kexi/main/startup/KexiStartupFileDialog.cpp @@ -23,7 +23,7 @@ #include <core/kexi.h> #include <kexiutils/utils.h> -#include <tqlayout.h> +#include <layout.h> #include <tqobjectlist.h> #include <tqpushbutton.h> #include <tqapplication.h> @@ -42,14 +42,14 @@ KexiStartupFileDialog::KexiStartupFileDialog( , m_confirmOverwrites(true) , m_filtersUpdated(false) { - tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum); + setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum); setMode( mode ); TQPoint point( 0, 0 ); reparent( parentWidget(), point ); - if (tqlayout()) - tqlayout()->setMargin(0); + if (layout()) + layout()->setMargin(0); setMinimumHeight(100); setSizeGripEnabled ( false ); @@ -300,7 +300,7 @@ bool KexiStartupFileDialog::checkFileName() if (mode() & KFile::ExistingOnly) { if ( !fi.exists() ) { KMessageBox::error( this, "<qt>"+i18n( "The file \"%1\" does not exist." ) - .tqarg( TQDir::convertSeparators(path) ) ); + .arg( TQDir::convertSeparators(path) ) ); return false; } else if (mode() & KFile::File) { @@ -310,7 +310,7 @@ bool KexiStartupFileDialog::checkFileName() } else if (!fi.isReadable()) { KMessageBox::error( this, "<qt>"+i18n( "The file \"%1\" is not readable." ) - .tqarg( TQDir::convertSeparators(path) ) ); + .arg( TQDir::convertSeparators(path) ) ); return false; } } @@ -329,7 +329,7 @@ bool KexiStartupFileDialog::askForOverwriting(const TQString& filePath, TQWidget if (!fi.exists()) return true; const int res = KMessageBox::warningYesNo( parent, i18n( "The file \"%1\" already exists.\n" - "Do you want to overwrite it?").tqarg( TQDir::convertSeparators(filePath) ), TQString(), + "Do you want to overwrite it?").arg( TQDir::convertSeparators(filePath) ), TQString(), i18n("Overwrite"), KStdGuiItem::no() ); if (res == KMessageBox::Yes) return true; diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp index c81de131..36b8c527 100644 --- a/kexi/main/startup/KexiStartupFileDialog_win.cpp +++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp @@ -120,27 +120,27 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f /* KURL u; u.setPath( TQDir::rootDirPath() ); - TQString text = i18n("Root Directory: %1").tqarg( u.path() ); + TQString text = i18n("Root Directory: %1").arg( u.path() ); d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, KIcon::Small ), text ); u.setPath( TQDir::homeDirPath() ); - text = i18n("Home Directory: %1").tqarg( u.path( +1 ) ); + text = i18n("Home Directory: %1").arg( u.path( +1 ) ); d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, KIcon::Small ), text ); KURL docPath; docPath.setPath( KGlobalSettings::documentPath() ); if ( u.path(+1) != docPath.path(+1) ) { - text = i18n("Documents: %1").tqarg( docPath.path( +1 ) ); + text = i18n("Documents: %1").arg( docPath.path( +1 ) ); d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, KIcon::Small ), text ); } u.setPath( KGlobalSettings::desktopPath() ); - text = i18n("Desktop: %1").tqarg( u.path( +1 ) ); + text = i18n("Desktop: %1").arg( u.path( +1 ) ); d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, KIcon::Small ), text ); @@ -185,7 +185,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f coll->action( "up" )->plug( toolbar ); coll->action( "up" )->setWhatsThis(i18n("<qt>Click this button to enter the parent directory.<p>" "For instance, if the current location is file:/home/%1 clicking this " - "button will take you to file:/home.</qt>").tqarg(getlogin())); + "button will take you to file:/home.</qt>").arg(getlogin())); coll->action( "back" )->plug( toolbar ); coll->action( "back" )->setWhatsThis(i18n("Click this button to move backwards one step in the browsing history.")); coll->action( "forward" )->plug( toolbar ); @@ -197,7 +197,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f coll->action( "mkdir" )->setWhatsThis(i18n("Click this button to create a new directory.")); d->bookmarkHandler = new KFileBookmarkHandler( this ); - toolbar->insertButton(TQString::tqfromLatin1("bookmark"), + toolbar->insertButton(TQString::fromLatin1("bookmark"), (int)HOTLIST_BUTTON, true, i18n("Bookmarks")); toolbar->getButton(HOTLIST_BUTTON)->setPopup( d->bookmarkHandler->menu(), @@ -441,7 +441,7 @@ void KexiStartupFileDialogBase::setMimeFilter( const TQStringList& mimeTypes, //(js) filterWidget->setMimeFilter( mimeTypes, defaultType ); //(js) TQStringList types = TQStringList::split(" ", filterWidget->currentFilter()); -//(js) types.append( TQString::tqfromLatin1( "inode/directory" )); +//(js) types.append( TQString::fromLatin1( "inode/directory" )); //(js) ops->clearFilter(); //(js) ops->setMimeFilter( types ); //(js) d->hasDefaultFilter = !defaultType.isEmpty(); diff --git a/kexi/main/startup/KexiStartup_p.cpp b/kexi/main/startup/KexiStartup_p.cpp index e8139e18..e959ccdc 100644 --- a/kexi/main/startup/KexiStartup_p.cpp +++ b/kexi/main/startup/KexiStartup_p.cpp @@ -73,7 +73,7 @@ tristate SQLite2ToSQLite3Migration::run() m_dlg = new KProgressDialog(0, 0, TQString(), i18n("Saving \"%1\" project file to a new \"%2\" database format...") - .tqarg(TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())).tqarg("SQLite3") + .arg(TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())).arg("SQLite3") ); m_dlg->setModal(true); connect(m_dlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelClicked())); diff --git a/kexi/migration/importoptionsdlg.cpp b/kexi/migration/importoptionsdlg.cpp index 50d6726d..46479e66 100644 --- a/kexi/migration/importoptionsdlg.cpp +++ b/kexi/migration/importoptionsdlg.cpp @@ -22,8 +22,8 @@ #include <tqdir.h> #include <tqlabel.h> -#include <tqlayout.h> -#include <tqtextcodec.h> +#include <layout.h> +#include <textcodec.h> #include <tqcheckbox.h> #include <kapplication.h> @@ -53,16 +53,16 @@ OptionsDialog::OptionsDialog( const TQString& databaseFile, const TQString& sele KDialogBase::spacingHint()); m_encodingComboBox = new KexiCharacterEncodingComboBox(plainPage(), selectedEncoding); - m_encodingComboBox->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + m_encodingComboBox->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); lyr->addWidget( m_encodingComboBox, 1, 1 ); TQLabel* lbl = new TQLabel( i18n("<h3>Text encoding for Microsoft Access database</h3>\n" "<p>Database file \"%1\" appears to be created by a version of Microsoft Access older than 2000.</p>" "<p>In order to properly import national characters, you may need to choose a proper text encoding " "if the database was created on a computer with a different character set.</p>") - .tqarg(TQDir::convertSeparators(databaseFile)), plainPage()); - lbl->tqsetAlignment( TQt::AlignAuto | TQt::WordBreak ); - lbl->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + .arg(TQDir::convertSeparators(databaseFile)), plainPage()); + lbl->setAlignment( TQt::AlignAuto | TQt::WordBreak ); + lbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); lyr->addMultiCellWidget( lbl, 0, 0, 0, 2 ); TQLabel* lbl2 = new TQLabel( m_encodingComboBox, i18n("Text encoding:"), plainPage()); diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp index 9c1b4559..cd1c94b3 100644 --- a/kexi/migration/importwizard.cpp +++ b/kexi/migration/importwizard.cpp @@ -24,7 +24,7 @@ #include "importoptionsdlg.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbuttongroup.h> #include <tqradiobutton.h> #include <tqcheckbox.h> @@ -110,7 +110,7 @@ ImportWizard::ImportWizard(TQWidget *parent, TQMap<TQString,TQString>* args) } } - m_sourceDBEncoding = TQString::tqfromLatin1(KGlobal::locale()->encoding()); //default + m_sourceDBEncoding = TQString::fromLatin1(KGlobal::locale()->encoding()); //default } //=========================================================== @@ -148,19 +148,19 @@ void ImportWizard::setupIntro() TQVBoxLayout *vbox = new TQVBoxLayout(m_introPage, KDialog::marginHint()); TQLabel *lblIntro = new TQLabel(m_introPage); - lblIntro->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak ); + lblIntro->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak ); TQString msg; if (m_predefinedConnectionData) { //predefined import: server source msg = i18n("<qt>Database Importing wizard is about to import \"%1\" database " "<nobr>(connection %2)</nobr> into a Kexi database.</qt>") - .tqarg(m_predefinedDatabaseName).tqarg(m_predefinedConnectionData->serverInfoString()); + .arg(m_predefinedDatabaseName).arg(m_predefinedConnectionData->serverInfoString()); } else if (!m_predefinedDatabaseName.isEmpty()) { //predefined import: file source //! @todo this message is currently ok for files only KMimeType::Ptr mimeTypePtr = KMimeType::mimeType(m_predefinedMimeType); msg = i18n("<qt>Database Importing wizard is about to import <nobr>\"%1\"</nobr> file " "of type \"%2\" into a Kexi database.</qt>") - .tqarg(TQDir::convertSeparators(m_predefinedDatabaseName)).tqarg(mimeTypePtr->comment()); + .arg(TQDir::convertSeparators(m_predefinedDatabaseName)).arg(mimeTypePtr->comment()); } else { msg = i18n("Database Importing wizard allows you to import an existing database " @@ -247,7 +247,7 @@ void ImportWizard::setupDstType() TQHBoxLayout *hbox = new TQHBoxLayout(vbox); TQLabel *lbl = new TQLabel(i18n("Destination database type:")+" ", m_dstTypePage); - lbl->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop); + lbl->setAlignment(TQt::AlignAuto|TQt::AlignTop); hbox->addWidget(lbl); m_dstPrjTypeSelector = new KexiPrjTypeSelector(m_dstTypePage); @@ -274,7 +274,7 @@ void ImportWizard::setupDstTitle() { m_dstTitlePage = new KexiDBTitlePage(i18n("Destination project's caption:"), this, "KexiDBTitlePage"); - m_dstTitlePage->tqlayout()->setMargin( KDialog::marginHint() ); + m_dstTitlePage->layout()->setMargin( KDialog::marginHint() ); m_dstTitlePage->updateGeometry(); m_dstNewDBNameLineEdit = m_dstTitlePage->le_caption; addPage(m_dstTitlePage, i18n("Select Destination Database Project's Caption")); @@ -339,10 +339,10 @@ void ImportWizard::setupImporting() m_importingPage->hide(); TQVBoxLayout *vbox = new TQVBoxLayout(m_importingPage, KDialog::marginHint()); m_lblImportingTxt = new TQLabel(m_importingPage); - m_lblImportingTxt->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak ); + m_lblImportingTxt->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak ); m_lblImportingErrTxt = new TQLabel(m_importingPage); - m_lblImportingErrTxt->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak ); + m_lblImportingErrTxt->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak ); m_progressBar = new KProgress(100, m_importingPage); m_progressBar->hide(); @@ -374,7 +374,7 @@ void ImportWizard::setupFinish() m_finishPage->hide(); TQVBoxLayout *vbox = new TQVBoxLayout(m_finishPage, KDialog::marginHint()); m_finishLbl = new TQLabel(m_finishPage); - m_finishLbl->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak ); + m_finishLbl->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak ); vbox->addWidget( m_finishLbl ); m_openImportedProjectCheckBox = new TQCheckBox(i18n("Open imported project"), @@ -398,7 +398,7 @@ bool ImportWizard::checkUserInput() finishtxt = finishtxt + "<br>" + i18n("No new database name was entered."); } - Kexi::ObjecttqStatus result; + Kexi::ObjectStatus result; KexiMigrate* sourceDriver = prepareImport(result); if (sourceDriver && sourceDriver->isSourceAndDestinationDataSourceTheSame()) { @@ -551,11 +551,11 @@ void ImportWizard::arriveImportingPage() { //! and KexiMigration::Driver classes bool showOptions = false; if (fileBasedSrcSelected()) { - Kexi::ObjecttqStatus result; + Kexi::ObjectStatus result; KexiMigrate* sourceDriver = prepareImport(result); if (sourceDriver) { showOptions = !result.error() - && sourceDriver->propertyValue( "source_database_has_nontqunicode_encoding" ).toBool(); + && sourceDriver->propertyValue( "source_database_has_nonunicode_encoding" ).toBool(); KexiMigration::Data *data = sourceDriver->data(); sourceDriver->setData( 0 ); delete data; @@ -572,7 +572,7 @@ void ImportWizard::arriveImportingPage() { void ImportWizard::arriveFinishPage() { // backButton()->hide(); // cancelButton()->setEnabled(false); -// m_finishLbl->setText( m_successText.tqarg(m_dstNewDBNameLineEdit->text()) ); +// m_finishLbl->setText( m_successText.arg(m_dstNewDBNameLineEdit->text()) ); } bool ImportWizard::fileBasedSrcSelected() const @@ -650,7 +650,7 @@ void ImportWizard::accept() KWizard::accept(); } -KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result) +KexiMigrate* ImportWizard::prepareImport(Kexi::ObjectStatus& result) { KexiUtils::WaitCursor wait; @@ -667,10 +667,10 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result) ); if (!destDriver || manager.error()) { - result.settqStatus(&manager); + result.setStatus(&manager); kdDebug() << "Manager error..." << endl; manager.debugError(); -// result.settqStatus(&manager); +// result.setStatus(&manager); } // Set up destination connection data @@ -702,7 +702,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result) { //TODO This needs a better message //KMessageBox::error(this, - result.settqStatus(i18n("No connection data is available. You did not select a destination filename."),""); + result.setStatus(i18n("No connection data is available. You did not select a destination filename."),""); //return false; } */ } @@ -713,7 +713,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result) { sourceDriverName = driverNameForSelectedSource(); if (sourceDriverName.isEmpty()) - result.settqStatus(i18n("No appropriate migration driver found."), + result.setStatus(i18n("No appropriate migration driver found."), m_migrateManager.possibleProblemsInfoMsg()); } @@ -724,7 +724,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result) sourceDriver = m_migrateManager.driver( sourceDriverName ); if(!sourceDriver || m_migrateManager.error()) { kdDebug() << "Import migrate driver error..." << endl; - result.settqStatus(&m_migrateManager); + result.setStatus(&m_migrateManager); } } @@ -793,7 +793,7 @@ tristate ImportWizard::import() { m_importExecuted = true; - Kexi::ObjecttqStatus result; + Kexi::ObjectStatus result; KexiMigrate* sourceDriver = prepareImport(result); bool acceptingNeeded = false; @@ -802,7 +802,7 @@ tristate ImportWizard::import() if (sourceDriver && !result.error()) { if (!m_sourceDBEncoding.isEmpty()) { - sourceDriver->setPropertyValue( "source_database_nontqunicode_encoding", + sourceDriver->setPropertyValue( "source_database_nonunicode_encoding", TQVariant(m_sourceDBEncoding.upper().replace(' ',"")) // "CP1250", not "cp 1250" ); } @@ -820,7 +820,7 @@ tristate ImportWizard::import() if (KMessageBox::Yes != KMessageBox::warningYesNo(this, "<qt>"+i18n("Database %1 already exists." "<p>Do you want to replace it with a new one?") - .tqarg(sourceDriver->data()->destination->infoString()), + .arg(sourceDriver->data()->destination->infoString()), 0, KGuiItem(i18n("&Replace")), KGuiItem(i18n("No")))) { return cancelled; @@ -861,7 +861,7 @@ tristate ImportWizard::import() setTitle(m_finishPage, i18n("Failure")); m_finishLbl->setText( i18n("<p>Import failed.</p>%1<p>%2</p><p>You can click \"Back\" button and try again.</p>") - .tqarg(msg).tqarg(details)); + .arg(msg).arg(details)); return false; } // delete kexi_conn; @@ -899,9 +899,9 @@ void ImportWizard::next() dbname = m_srcConn->selectedConnectionData() ? m_srcConn->selectedConnectionData()->serverInfoString() : TQString(); if (!dbname.isEmpty()) - dbname = TQString(" \"%1\"").tqarg(dbname); + dbname = TQString(" \"%1\"").arg(dbname); KMessageBox::error(this, i18n("Could not import database%1. This type is not supported.") - .tqarg(dbname)); + .arg(dbname)); return; } } @@ -922,7 +922,7 @@ void ImportWizard::next() if (true == res) { m_finishLbl->setText( i18n("Database has been imported into Kexi database project \"%1\".") - .tqarg(m_dstNewDBNameLineEdit->text()) ); + .arg(m_dstNewDBNameLineEdit->text()) ); cancelButton()->setEnabled(false); setBackEnabled(m_finishPage, false); setFinishEnabled(m_finishPage, true); diff --git a/kexi/migration/importwizard.h b/kexi/migration/importwizard.h index 8d3a82b0..19a1b844 100644 --- a/kexi/migration/importwizard.h +++ b/kexi/migration/importwizard.h @@ -47,7 +47,7 @@ class KexiPrjTypeSelector; namespace Kexi { - class ObjecttqStatus; + class ObjectStatus; } namespace KexiDB @@ -98,7 +98,7 @@ private: void setupImporting(); bool checkUserInput(); - KexiMigrate* prepareImport(Kexi::ObjecttqStatus& result); + KexiMigrate* prepareImport(Kexi::ObjectStatus& result); /*! Performs import. \return true/false on success/faulure or cancelled when user cancelled importing (mainly diff --git a/kexi/migration/keximigrate.cpp b/kexi/migration/keximigrate.cpp index b225f6ba..1c3295b6 100644 --- a/kexi/migration/keximigrate.cpp +++ b/kexi/migration/keximigrate.cpp @@ -61,20 +61,20 @@ KexiMigrate::~KexiMigrate() delete m_destPrj; } -bool KexiMigrate::checkIfDestinationDatabaseOverwritingNeedsAccepting(Kexi::ObjecttqStatus* result, +bool KexiMigrate::checkIfDestinationDatabaseOverwritingNeedsAccepting(Kexi::ObjectStatus* result, bool& acceptingNeeded) { acceptingNeeded = false; if (result) - result->cleartqStatus(); + result->clearStatus(); KexiDB::DriverManager drvManager; KexiDB::Driver *destDriver = drvManager.driver( m_migrateData->destination->connectionData()->driverName); if (!destDriver) { - result->settqStatus(&drvManager, + result->setStatus(&drvManager, i18n("Could not create database \"%1\".") - .tqarg(m_migrateData->destination->databaseName())); + .arg(m_migrateData->destination->databaseName())); return false; } @@ -113,18 +113,18 @@ bool KexiMigrate::isSourceAndDestinationDataSourceTheSame() const //============================================================================= // Perform Import operation -bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) +bool KexiMigrate::performImport(Kexi::ObjectStatus* result) { if (result) - result->cleartqStatus(); + result->clearStatus(); KexiDB::DriverManager drvManager; KexiDB::Driver *destDriver = drvManager.driver( m_migrateData->destination->connectionData()->driverName); if (!destDriver) { - result->settqStatus(&drvManager, + result->setStatus(&drvManager, i18n("Could not create database \"%1\".") - .tqarg(m_migrateData->destination->databaseName())); + .arg(m_migrateData->destination->databaseName())); return false; } @@ -135,8 +135,8 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) if (!drv_connect()) { kdDebug() << "Couldnt connect to database server" << endl; if (result) - result->settqStatus(i18n("Could not connect to data source \"%1\".") - .tqarg(m_migrateData->source->serverInfoString()), ""); + result->setStatus(i18n("Could not connect to data source \"%1\".") + .arg(m_migrateData->source->serverInfoString()), ""); return false; } @@ -145,9 +145,9 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) if (!tableNames(tables)) { kdDebug() << "Couldnt get list of tables" << endl; if (result) - result->settqStatus( + result->setStatus( i18n("Could not get a list of table names for data source \"%1\".") - .tqarg(m_migrateData->source->serverInfoString()), ""); + .arg(m_migrateData->source->serverInfoString()), ""); return false; } @@ -155,9 +155,9 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) if (tables.isEmpty()) { kdDebug() << "There were no tables to import" << endl; if (result) - result->settqStatus( + result->setStatus( i18n("No tables to import found in data source \"%1\".") - .tqarg(m_migrateData->source->serverInfoString()), ""); + .arg(m_migrateData->source->serverInfoString()), ""); return false; } @@ -165,15 +165,15 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) tables.sort(); m_tableSchemas.clear(); if (!destDriver) { - result->settqStatus(&drvManager); + result->setStatus(&drvManager); return false; } const bool kexi__objects_exists = tables.find("kexi__objects")!=tables.end(); TQStringList kexiDBTables; if (kexi__objects_exists) { tristate res = drv_queryStringListFromSQL( - TQString::tqfromLatin1("SELECT o_name FROM kexi__objects WHERE o_type=%1") - .tqarg((int)KexiDB::TableObjectType), 0, kexiDBTables, -1); + TQString::fromLatin1("SELECT o_name FROM kexi__objects WHERE o_type=%1") + .arg((int)KexiDB::TableObjectType), 0, kexiDBTables, -1); if (res == true) { // prepend KexiDB-compatible tables to 'tables' list, so we'll copy KexiDB-compatible tables first, // to make sure existing IDs will not be in conflict with IDs newly generated for non-KexiDB tables @@ -199,9 +199,9 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) if (!drv_readTableSchema(*it, *tableSchema)) { delete tableSchema; if (result) - result->settqStatus( + result->setStatus( i18n("Could not import project from data source \"%1\". Error reading table \"%2\".") - .tqarg(m_migrateData->source->serverInfoString()).tqarg(tableName), ""); + .arg(m_migrateData->source->serverInfoString()).arg(tableName), ""); return false; } //yeah, got a table @@ -228,9 +228,9 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) if (trans.isNull()) { ok = false; if (result) - result->settqStatus(destConn, + result->setStatus(destConn, i18n("Could not create database \"%1\".") - .tqarg(m_migrateData->destination->databaseName())); + .arg(m_migrateData->destination->databaseName())); //later destConn->dropDatabase(m_migrateData->destination->databaseName()); //don't delete prj, otherwise eror message will be deleted delete prj; //later return m_destPrj; @@ -250,7 +250,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) bool firstRecord = true; if (true == drv_fetchRecordFromSQL( TQString("SELECT o_id, o_type, o_name, o_caption, o_desc FROM kexi__objects " - "WHERE o_name='%1' AND o_type=%1").tqarg(*it).tqarg((int)KexiDB::TableObjectType), + "WHERE o_name='%1' AND o_type=%1").arg(*it).arg((int)KexiDB::TableObjectType), data, firstRecord) && destConn->setupObjectSchemaData( data, *t )) { @@ -258,9 +258,9 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) //load schema for every field and add it firstRecord = true; TQString sql( - TQString::tqfromLatin1("SELECT t_id, f_type, f_name, f_length, f_precision, f_constraints, " + TQString::fromLatin1("SELECT t_id, f_type, f_name, f_length, f_precision, f_constraints, " "f_options, f_default, f_order, f_caption, f_help" - " FROM kexi__fields WHERE t_id=%1 ORDER BY f_order").tqarg(t->id()) ); + " FROM kexi__fields WHERE t_id=%1 ORDER BY f_order").arg(t->id()) ); while (ok) { tristate res = drv_fetchRecordFromSQL(sql, data, firstRecord); if (res != true) { @@ -299,9 +299,9 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) kdDebug() << "Failed to create a table " << ts->name() << endl; destConn->debugError(); if (result) - result->settqStatus(destConn, + result->setStatus(destConn, i18n("Could not create database \"%1\".") - .tqarg(m_migrateData->destination->databaseName())); + .arg(m_migrateData->destination->databaseName())); m_tableSchemas.remove(ts); break; } @@ -329,9 +329,9 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) if (m_destPrj->error()) { ok = false; if (result) - result->settqStatus(m_destPrj, + result->setStatus(m_destPrj, i18n("Could not import project from data source \"%1\".") - .tqarg(m_migrateData->source->serverInfoString())); + .arg(m_migrateData->source->serverInfoString())); } } @@ -380,8 +380,8 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) if (!ok) { kdDebug() << "Failed to copy table " << tname << endl; if (result) - result->settqStatus(destConn, - i18n("Could not copy table \"%1\" to destination database.").tqarg(tname)); + result->setStatus(destConn, + i18n("Could not copy table \"%1\" to destination database.").arg(tname)); break; } }//for @@ -404,9 +404,9 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) // Finally: error handling if (result && result->error()) - result->settqStatus(destConn, + result->setStatus(destConn, i18n("Could not import data from data source \"%1\".") - .tqarg(m_migrateData->source->serverInfoString())); + .arg(m_migrateData->source->serverInfoString())); if (destConn) { destConn->debugError(); destConn->rollbackTransaction(trans); @@ -420,10 +420,10 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) } //============================================================================= -bool KexiMigrate::performExport(Kexi::ObjecttqStatus* result) +bool KexiMigrate::performExport(Kexi::ObjectStatus* result) { if (result) - result->cleartqStatus(); + result->clearStatus(); //! @todo performExport @@ -512,7 +512,7 @@ KexiDB::Field::Type KexiMigrate::userType(const TQString& fname) res = dlg->getItem( i18n("Field Type"), i18n("The data type for %1 could not be determined. " "Please select one of the following data " - "types").tqarg(fname), + "types").arg(fname), types, 0, false); //! @todo use TQMap<TQCString, KexiDB::Field::Type> here! @@ -575,9 +575,9 @@ bool KexiMigrate::isValid() { setError(ERR_INCOMPAT_DRIVER_VERSION, i18n("Incompatible migration driver's \"%1\" version: found version %2, expected version %3.") - .tqarg(name()) - .tqarg(TQString("%1.%2").tqarg(versionMajor()).tqarg(versionMinor())) - .tqarg(TQString("%1.%2").tqarg(KexiMigration::versionMajor()).tqarg(KexiMigration::versionMinor()))); + .arg(name()) + .arg(TQString("%1.%2").arg(versionMajor()).arg(versionMinor())) + .arg(TQString("%1.%2").arg(KexiMigration::versionMajor()).arg(KexiMigration::versionMinor()))); return false; } return true; @@ -588,8 +588,8 @@ bool KexiMigrate::drv_queryMaxNumber(const TQString& tableName, { TQString string; tristate r = drv_querySingleStringFromSQL( - TQString::tqfromLatin1("SELECT MAX(%1) FROM %2").tqarg(drv_escapeIdentifier(columnName)) - .tqarg(drv_escapeIdentifier(tableName)), 0, string); + TQString::fromLatin1("SELECT MAX(%1) FROM %2").arg(drv_escapeIdentifier(columnName)) + .arg(drv_escapeIdentifier(tableName)), 0, string); if (r == false) return false; if (~r) { diff --git a/kexi/migration/keximigrate.h b/kexi/migration/keximigrate.h index ee22ded8..cd2949f9 100644 --- a/kexi/migration/keximigrate.h +++ b/kexi/migration/keximigrate.h @@ -34,7 +34,7 @@ class KexiProject; namespace Kexi { - class ObjecttqStatus; + class ObjectStatus; } /*! KexiMigration implementation version. @@ -99,7 +99,7 @@ class KEXIMIGR_EXPORT KexiMigrate : public TQObject, public KexiDB::Object \a acceptingNeeded is set to true if destination database exists. In this case you should ask about accepting database overwriting. Used in ImportWizard::import(). */ - bool checkIfDestinationDatabaseOverwritingNeedsAccepting(Kexi::ObjecttqStatus* result, + bool checkIfDestinationDatabaseOverwritingNeedsAccepting(Kexi::ObjectStatus* result, bool& acceptingNeeded); /*! Checks if the source- and the destination databases are identical. @@ -107,10 +107,10 @@ class KEXIMIGR_EXPORT KexiMigrate : public TQObject, public KexiDB::Object bool isSourceAndDestinationDataSourceTheSame() const; //! Perform an import operation - bool performImport(Kexi::ObjecttqStatus* result = 0); + bool performImport(Kexi::ObjectStatus* result = 0); //! Perform an export operation - bool performExport(Kexi::ObjecttqStatus* result = 0); + bool performExport(Kexi::ObjectStatus* result = 0); //! Returns true if the migration driver supports progress updates. inline bool progressSupported() { return drv_progressSupported(); } diff --git a/kexi/migration/migratemanager.cpp b/kexi/migration/migratemanager.cpp index 2c0ce6cd..945f084c 100644 --- a/kexi/migration/migratemanager.cpp +++ b/kexi/migration/migratemanager.cpp @@ -131,19 +131,19 @@ bool MigrateManagerInternal::lookupDrivers() << srv_name.lower() << "' driver's version -- skipping it!" << endl; possibleProblems += TQString("\"%1\" migration driver has unrecognized version; " "required driver version is \"%2.%3\"") - .tqarg(srv_name.lower()) - .tqarg(KexiMigration::versionMajor()).tqarg(KexiMigration::versionMinor()); + .arg(srv_name.lower()) + .arg(KexiMigration::versionMajor()).arg(KexiMigration::versionMinor()); continue; } if (major_ver != KexiMigration::versionMajor() || minor_ver != KexiMigration::versionMinor()) { KexiDBWarn << TQString("MigrateManagerInternal::lookupDrivers(): '%1' driver" " has version '%2' but required migration driver version is '%3.%4'\n" - " -- skipping this driver!").tqarg(srv_name.lower()).tqarg(srv_ver_str) - .tqarg(KexiMigration::versionMajor()).tqarg(KexiMigration::versionMinor()) << endl; + " -- skipping this driver!").arg(srv_name.lower()).arg(srv_ver_str) + .arg(KexiMigration::versionMajor()).arg(KexiMigration::versionMinor()) << endl; possibleProblems += TQString("\"%1\" migration driver has version \"%2\" " "but required driver version is \"%3.%4\"") - .tqarg(srv_name.lower()).tqarg(srv_ver_str) - .tqarg(KexiMigration::versionMajor()).tqarg(KexiMigration::versionMinor()); + .arg(srv_name.lower()).arg(srv_ver_str) + .arg(KexiMigration::versionMajor()).arg(KexiMigration::versionMinor()); continue; } //</COPIED> @@ -188,7 +188,7 @@ KexiMigrate* MigrateManagerInternal::driver(const TQString& name) return drv; //cached if (!m_services_lcase.contains(name.lower())) { - setError(ERR_DRIVERMANAGER, i18n("Could not find import/export database driver \"%1\".").tqarg(name) ); + setError(ERR_DRIVERMANAGER, i18n("Could not find import/export database driver \"%1\".").arg(name) ); return 0; } @@ -201,7 +201,7 @@ KexiMigrate* MigrateManagerInternal::driver(const TQString& name) if (!drv) { setError(ERR_DRIVERMANAGER, i18n("Could not load import/export database driver \"%1\".") - .tqarg(name) ); + .arg(name) ); if (m_componentLoadingErrors.isEmpty()) {//fill errtable on demand m_componentLoadingErrors[KParts::ComponentFactory::ErrNoServiceFound]="ErrNoServiceFound"; m_componentLoadingErrors[KParts::ComponentFactory::ErrServiceProvidesNoLibrary]="ErrServiceProvidesNoLibrary"; @@ -314,7 +314,7 @@ TQString MigrateManager::driverForMimeType(const TQString &mimeType) KService::Ptr ptr = d_int->m_services_by_mimetype[mimeType.lower()]; if (!ptr) { - kdDebug() << TQString("MigrateManager::driverForMimeType(%1) No such mimetype").tqarg(mimeType) << endl; + kdDebug() << TQString("MigrateManager::driverForMimeType(%1) No such mimetype").arg(mimeType) << endl; return TQString(); } @@ -325,7 +325,7 @@ KexiMigrate* MigrateManager::driver(const TQString& name) { KexiMigrate *drv = d_int->driver(name); if (d_int->error()) { - kdDebug() << TQString("MigrateManager::driver(%1) Error: %2").tqarg(name).tqarg(d_int->errorMsg()) << endl; + kdDebug() << TQString("MigrateManager::driver(%1) Error: %2").arg(name).arg(d_int->errorMsg()) << endl; setError(d_int); } return drv; @@ -363,7 +363,7 @@ TQString MigrateManager::possibleProblemsInfoMsg() const for (TQStringList::ConstIterator it = d_int->possibleProblems.constBegin(); it!=d_int->possibleProblems.constEnd(); ++it) { - str += (TQString::tqfromLatin1("<li>") + *it + TQString::tqfromLatin1("</li>")); + str += (TQString::fromLatin1("<li>") + *it + TQString::fromLatin1("</li>")); } str += "</ul>"; return str; diff --git a/kexi/migration/mysql/mysqlmigrate.cpp b/kexi/migration/mysql/mysqlmigrate.cpp index 1b125d8d..78671241 100644 --- a/kexi/migration/mysql/mysqlmigrate.cpp +++ b/kexi/migration/mysql/mysqlmigrate.cpp @@ -396,7 +396,7 @@ KexiDB::Field::Type MySQLMigrate::examineBlobField(const TQString& table, TQString mysqlType; KexiDB::Field::Type kexiType; TQString query = "SHOW COLUMNS FROM `" + drv_escapeIdentifier(table) + - "` LIKE '" + TQString::tqfromLatin1(fld->name) + "'"; + "` LIKE '" + TQString::fromLatin1(fld->name) + "'"; if(d->executeSQL(query)) { MYSQL_RES *res = mysql_store_result(d->mysql); @@ -444,7 +444,7 @@ TQStringList MySQLMigrate::examineEnumField(const TQString& table, const MYSQL_FIELD* fld) { TQString vals; TQString query = "SHOW COLUMNS FROM `" + drv_escapeIdentifier(table) + - "` LIKE '" + TQString::tqfromLatin1(fld->name) + "'"; + "` LIKE '" + TQString::fromLatin1(fld->name) + "'"; if(d->executeSQL(query)) { MYSQL_RES *res = mysql_store_result(d->mysql); diff --git a/kexi/migration/pqxx/pqxxmigrate.cpp b/kexi/migration/pqxx/pqxxmigrate.cpp index d6c655f9..904e0c92 100644 --- a/kexi/migration/pqxx/pqxxmigrate.cpp +++ b/kexi/migration/pqxx/pqxxmigrate.cpp @@ -135,7 +135,7 @@ bool PqxxMigrate::drv_tableNames(TQStringList& tableNames) for (pqxx::result::const_iterator c = m_res->begin(); c != m_res->end(); ++c) { // Copy the result into the return list - tableNames << TQString::tqfromLatin1 (c[0].c_str()); + tableNames << TQString::fromLatin1 (c[0].c_str()); } return true; } @@ -217,15 +217,15 @@ bool PqxxMigrate::drv_connect() if (m_migrateData->source->port == 0) m_migrateData->source->port = 5432; - conninfo += TQString::tqfromLatin1(" port='%1'").tqarg(m_migrateData->source->port); + conninfo += TQString::fromLatin1(" port='%1'").arg(m_migrateData->source->port); - conninfo += TQString::tqfromLatin1(" dbname='%1'").tqarg(m_migrateData->sourceName); + conninfo += TQString::fromLatin1(" dbname='%1'").arg(m_migrateData->sourceName); if (!m_migrateData->source->userName.isNull()) - conninfo += TQString::tqfromLatin1(" user='%1'").tqarg(m_migrateData->source->userName); + conninfo += TQString::fromLatin1(" user='%1'").arg(m_migrateData->source->userName); if (!m_migrateData->source->password.isNull()) - conninfo += TQString::tqfromLatin1(" password='%1'").tqarg(m_migrateData->source->password); + conninfo += TQString::fromLatin1(" password='%1'").arg(m_migrateData->source->password); try { @@ -377,7 +377,7 @@ bool PqxxMigrate::primaryKey(pqxx::oid table_uid, int col) const try { - statement = TQString("SELECT indkey FROM pg_index WHERE ((indisprimary = true) AND (indrelid = %1))").tqarg(table_uid); + statement = TQString("SELECT indkey FROM pg_index WHERE ((indisprimary = true) AND (indrelid = %1))").arg(table_uid); tran = new pqxx::nontransaction(*m_conn, "find_pkey"); tmpres = new pqxx::result(tran->exec(statement.latin1())); @@ -480,7 +480,7 @@ tristate PqxxMigrate::drv_queryStringListFromSQL( mysql_free_result(res); return false; } - string = TQString::tqfromLatin1(row[columnNumber], lengths[columnNumber]); + string = TQString::fromLatin1(row[columnNumber], lengths[columnNumber]); mysql_free_result(res); } else { kdDebug() << "PqxxMigrate::drv_querySingleStringFromSQL(): null result" << endl; @@ -569,7 +569,7 @@ bool PqxxMigrate::uniqueKey(pqxx::oid table_uid, int col) const try { - statement = TQString("SELECT indkey FROM pg_index WHERE ((indisunique = true) AND (indrelid = %1))").tqarg(table_uid); + statement = TQString("SELECT indkey FROM pg_index WHERE ((indisunique = true) AND (indrelid = %1))").arg(table_uid); tran = new pqxx::nontransaction(*m_conn, "find_ukey"); tmpres = new pqxx::result(tran->exec(statement.latin1())); @@ -647,7 +647,7 @@ bool PqxxMigrate::notEmpty(pqxx::oid /*table_uid*/, int /*col*/) const // Read value of column 0 into a string N c[0].to(N); // Copy the result into the return list - list << TQString::tqfromLatin1 (N.c_str()); + list << TQString::fromLatin1 (N.c_str()); KexiDBDrvDbg << N.c_str() << endl; } return true; diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp index 61585840..bec4de7d 100644 --- a/kexi/plugins/forms/kexiactionselectiondialog.cpp +++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp @@ -352,12 +352,12 @@ public: msg = TQString(); // hardcoded, but it's not that bad else if (actionType=="macro") - msg = i18n("&Select macro to be executed after clicking \"%1\" button:").tqarg(actionWidgetName); + msg = i18n("&Select macro to be executed after clicking \"%1\" button:").arg(actionWidgetName); else if (actionType=="script") - msg = i18n("&Select script to be executed after clicking \"%1\" button:").tqarg(actionWidgetName); + msg = i18n("&Select script to be executed after clicking \"%1\" button:").arg(actionWidgetName); //default: table/query/form/report... else - msg = i18n("&Select object to be opened after clicking \"%1\" button:").tqarg(actionWidgetName); + msg = i18n("&Select object to be opened after clicking \"%1\" button:").arg(actionWidgetName); selectActionToBeExecutedLbl->setText(msg); } @@ -405,7 +405,7 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ setButtonOK( KGuiItem(i18n("Assign action", "&Assign"), "button_ok", i18n("Assign action")) ); TQWidget *mainWidget = new TQWidget( this ); - mainWidget->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + mainWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); setMainWidget(mainWidget); /* lbl 1 @@ -428,24 +428,24 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ // 1st column: action types d->actionCategoriesListView = new ActionCategoriesListView(mainWidget); - d->actionCategoriesListView->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); + d->actionCategoriesListView->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); d->glyr->addWidget(d->actionCategoriesListView, 1, 0); connect( d->actionCategoriesListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotActionCategorySelected(TQListViewItem*))); TQLabel *lbl = new TQLabel(d->actionCategoriesListView, i18n("Action category:"), mainWidget); lbl->setMinimumHeight(lbl->fontMetrics().height()*2); - lbl->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); - lbl->tqsetAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak); + lbl->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + lbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak); d->glyr->addWidget(lbl, 0, 0, TQt::AlignTop|TQt::AlignLeft); // widget stack for 2nd and 3rd column d->secondAnd3rdColumnStack = new TQWidgetStack(mainWidget); - d->secondAnd3rdColumnStack->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + d->secondAnd3rdColumnStack->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); d->glyr->addMultiCellWidget(d->secondAnd3rdColumnStack, 0, 1, 1, 1);//, TQt::AlignTop|TQt::AlignLeft); d->secondAnd3rdColumnMainWidget = new TQWidget(d->secondAnd3rdColumnStack); - d->secondAnd3rdColumnMainWidget->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + d->secondAnd3rdColumnMainWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); d->secondAnd3rdColumnGrLyr = new TQGridLayout(d->secondAnd3rdColumnMainWidget, 2, 2, 0, KDialog::spacingHint()); d->secondAnd3rdColumnGrLyr->setRowStretch(1, 2); d->secondAnd3rdColumnStack->addWidget(d->secondAnd3rdColumnMainWidget); @@ -457,8 +457,8 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ this, TQT_SLOT(slotItemForOpeningOrExecutingSelected(KexiPart::Item*))); d->selectActionToBeExecutedLbl = new TQLabel(d->secondAnd3rdColumnMainWidget); - d->selectActionToBeExecutedLbl->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); - d->selectActionToBeExecutedLbl->tqsetAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak); + d->selectActionToBeExecutedLbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + d->selectActionToBeExecutedLbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak); d->selectActionToBeExecutedLbl->setMinimumHeight(d->selectActionToBeExecutedLbl->fontMetrics().height()*2); d->secondAnd3rdColumnGrLyr->addWidget(d->selectActionToBeExecutedLbl, 0, 0, TQt::AlignTop|TQt::AlignLeft); @@ -469,7 +469,7 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ d->actionToExecuteListView = new ActionToExecuteListView(d->secondAnd3rdColumnMainWidget); d->actionToExecuteListView->installEventFilter(this); //to be able to disable painting d->actionToExecuteListView->viewport()->installEventFilter(this); //to be able to disable painting - d->actionToExecuteListView->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); + d->actionToExecuteListView->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); connect(d->actionToExecuteListView, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotActionToExecuteItemExecuted(TQListViewItem*))); connect(d->actionToExecuteListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), @@ -479,8 +479,8 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ d->actionToExecuteLbl = new TQLabel(d->actionToExecuteListView, i18n("Action to execute:"), d->secondAnd3rdColumnMainWidget); d->actionToExecuteLbl->installEventFilter(this); //to be able to disable painting - d->actionToExecuteLbl->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); - d->actionToExecuteLbl->tqsetAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak); + d->actionToExecuteLbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + d->actionToExecuteLbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak); d->secondAnd3rdColumnGrLyr->addWidget(d->actionToExecuteLbl, 0, 1, TQt::AlignTop|TQt::AlignLeft); // temporary show all sections to avoid resizing the dialog in the future @@ -538,7 +538,7 @@ void KexiActionSelectionDialog::slotKActionItemExecuted(TQListViewItem*) void KexiActionSelectionDialog::slotKActionItemSelected(TQListViewItem*) { d->setActionToExecuteSectionVisible(false); - updateOKButtontqStatus(); + updateOKButtonStatus(); } void KexiActionSelectionDialog::slotCurrentFormActionItemExecuted(TQListViewItem*) @@ -549,7 +549,7 @@ void KexiActionSelectionDialog::slotCurrentFormActionItemExecuted(TQListViewItem void KexiActionSelectionDialog::slotCurrentFormActionItemSelected(TQListViewItem*) { d->setActionToExecuteSectionVisible(false); - updateOKButtontqStatus(); + updateOKButtonStatus(); } void KexiActionSelectionDialog::slotItemForOpeningOrExecutingSelected(KexiPart::Item* item) @@ -568,7 +568,7 @@ void KexiActionSelectionDialog::slotActionToExecuteItemExecuted(TQListViewItem* void KexiActionSelectionDialog::slotActionToExecuteItemSelected(TQListViewItem*) { - updateOKButtontqStatus(); + updateOKButtonStatus(); } void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item) @@ -581,15 +581,15 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item) i18n("&Select action to be executed after clicking \"%1\" button:")); // msg for a label if (simpleItem->data == "kaction") { if (!d->kactionPageWidget) { - //create lbl+list view with a vtqlayout + //create lbl+list view with a vlayout d->kactionPageWidget = new TQWidget(); - d->kactionPageWidget->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + d->kactionPageWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); TQVBoxLayout *vlyr = new TQVBoxLayout(d->kactionPageWidget, 0, KDialog::spacingHint()); d->kactionListView = new KActionsListView(d->kactionPageWidget, d->mainWin); d->kactionListView->init(); - TQLabel *lbl = new TQLabel(d->kactionListView, selectActionToBeExecutedMsg.tqarg(d->actionWidgetName), + TQLabel *lbl = new TQLabel(d->kactionListView, selectActionToBeExecutedMsg.arg(d->actionWidgetName), d->kactionPageWidget); - lbl->tqsetAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak); + lbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak); lbl->setMinimumHeight(lbl->fontMetrics().height()*2); vlyr->addWidget(lbl); vlyr->addWidget(d->kactionListView); @@ -605,16 +605,16 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item) } else if (simpleItem->data == "currentForm") { if (!d->currentFormActionsPageWidget) { - //create lbl+list view with a vtqlayout + //create lbl+list view with a vlayout d->currentFormActionsPageWidget = new TQWidget(); - d->currentFormActionsPageWidget->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + d->currentFormActionsPageWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); TQVBoxLayout *vlyr = new TQVBoxLayout(d->currentFormActionsPageWidget, 0, KDialog::spacingHint()); d->currentFormActionsListView = new CurrentFormActionsListView( d->currentFormActionsPageWidget, d->mainWin); d->currentFormActionsListView->init(); TQLabel *lbl = new TQLabel(d->currentFormActionsListView, - selectActionToBeExecutedMsg.tqarg(d->actionWidgetName), d->currentFormActionsPageWidget); - lbl->tqsetAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak); + selectActionToBeExecutedMsg.arg(d->actionWidgetName), d->currentFormActionsPageWidget); + lbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak); lbl->setMinimumHeight(lbl->fontMetrics().height()*2); vlyr->addWidget(lbl); vlyr->addWidget(d->currentFormActionsListView); @@ -635,7 +635,7 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item) d->setActionToExecuteSectionVisible(false); } d->actionCategoriesListView->update(); - updateOKButtontqStatus(); + updateOKButtonStatus(); return; } // other case @@ -656,7 +656,7 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item) d->raiseWidget( d->secondAnd3rdColumnMainWidget ); } d->actionCategoriesListView->update(); - updateOKButtontqStatus(); + updateOKButtonStatus(); } KexiMainWindow* KexiActionSelectionDialog::mainWin() const @@ -696,7 +696,7 @@ KexiFormEventAction::ActionData KexiActionSelectionDialog::currentAction() const KexiPart::Info* partInfo = partItem ? Kexi::partManager().infoForMimeType( partItem->mimeType() ) : 0; if (partInfo) { // opening or executing: table:name, query:name, form:name, macro:name, script:name, etc. - data.string = TQString("%1:%2").tqarg(partInfo->objectName()).tqarg(partItem->name()); + data.string = TQString("%1:%2").arg(partInfo->objectName()).arg(partItem->name()); data.option = actionToExecute->data; return data; } @@ -705,7 +705,7 @@ KexiFormEventAction::ActionData KexiActionSelectionDialog::currentAction() const return data; // No Action } -void KexiActionSelectionDialog::updateOKButtontqStatus() +void KexiActionSelectionDialog::updateOKButtonStatus() { TQPushButton *btn = actionButton(Ok); ActionSelectorDialogListItem *simpleItem = dynamic_cast<ActionSelectorDialogListItem*>( diff --git a/kexi/plugins/forms/kexiactionselectiondialog.h b/kexi/plugins/forms/kexiactionselectiondialog.h index a2c4066d..983ea759 100644 --- a/kexi/plugins/forms/kexiactionselectiondialog.h +++ b/kexi/plugins/forms/kexiactionselectiondialog.h @@ -63,7 +63,7 @@ class KEXIFORMUTILS_EXPORT KexiActionSelectionDialog : public KDialogBase void slotItemForOpeningOrExecutingSelected(KexiPart::Item* item); protected: - void updateOKButtontqStatus(); + void updateOKButtonStatus(); class KexiActionSelectionDialogPrivate; KexiActionSelectionDialogPrivate* d; diff --git a/kexi/plugins/forms/kexidataprovider.cpp b/kexi/plugins/forms/kexidataprovider.cpp index e89ba9cb..1a6df899 100644 --- a/kexi/plugins/forms/kexidataprovider.cpp +++ b/kexi/plugins/forms/kexidataprovider.cpp @@ -113,7 +113,7 @@ void KexiFormDataProvider::fillDataItems(KexiTableItem& row, bool cursorAtNewRow kexipluginsdbg << "fill data of '" << itemIface->dataSource() << "' at idx=" << it.data() << " data=" << value << (indexForVisibleLookupValue!=-1 ? TQString(" SPECIAL: indexForVisibleLookupValue=%1 visibleValue=%2") - .tqarg(indexForVisibleLookupValue).tqarg(visibleLookupValue.toString()) + .arg(indexForVisibleLookupValue).arg(visibleLookupValue.toString()) : TQString()) << endl; const bool displayDefaultValue = cursorAtNewRow && (value.isNull() && visibleLookupValue.isNull()) @@ -228,7 +228,7 @@ void KexiFormDataProvider::invalidateDataSources( const TQDict<char>& invalidSou // newIndices[i]=-1; KexiFormDataItemInterface *item = m_dataItems.at( *it ); if (item) - item->setInvalidState( TQString::tqfromLatin1("#") + i18n("NAME") + TQString::tqfromLatin1("?") ); + item->setInvalidState( TQString::fromLatin1("#") + i18n("NAME") + TQString::fromLatin1("?") ); m_dataItems.remove(*it); kexipluginsdbg << "invalidateDataSources(): " << (*it) << " -> " << -1 << endl; // i++; @@ -253,7 +253,7 @@ void KexiFormDataProvider::invalidateDataSources( const TQDict<char>& invalidSou else { kexipluginsdbg << "invalidateDataSources(): removing " << it.key()->dataSource() << endl; m_dataItems.remove(it.key()); - it.key()->setInvalidState( TQString::tqfromLatin1("#") + i18n("NAME") + TQString::tqfromLatin1("?") ); + it.key()->setInvalidState( TQString::fromLatin1("#") + i18n("NAME") + TQString::fromLatin1("?") ); } } #endif @@ -275,7 +275,7 @@ void KexiFormDataProvider::invalidateDataSources( const TQDict<char>& invalidSou for (TQPtrListIterator<KexiFormDataItemInterface> it(m_dataItems); it.current();) { KexiFormDataItemInterface * item = it.current(); if (invalidSources[ item->dataSource().lower() ]) { - item->setInvalidState( TQString::tqfromLatin1("#") + i18n("NAME") + TQString::tqfromLatin1("?") ); + item->setInvalidState( TQString::fromLatin1("#") + i18n("NAME") + TQString::fromLatin1("?") ); m_dataItems.remove(item); continue; } diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp index e9ff4177..018feb8b 100644 --- a/kexi/plugins/forms/kexidatasourcepage.cpp +++ b/kexi/plugins/forms/kexidatasourcepage.cpp @@ -20,7 +20,7 @@ #include "kexidatasourcepage.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqheader.h> @@ -65,9 +65,9 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name) TQVBoxLayout *contentsVlyr = new TQVBoxLayout(contents); m_noDataSourceAvailableLabel = new TQLabel(m_noDataSourceAvailableSingleText, contents); - m_noDataSourceAvailableLabel->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + m_noDataSourceAvailableLabel->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); m_noDataSourceAvailableLabel->setMargin(2); - m_noDataSourceAvailableLabel->tqsetAlignment(TQt::WordBreak | TQt::AlignBottom | TQt::AlignLeft); + m_noDataSourceAvailableLabel->setAlignment(TQt::WordBreak | TQt::AlignBottom | TQt::AlignLeft); contentsVlyr->addWidget(m_noDataSourceAvailableLabel); //-Widget's Data Source @@ -78,10 +78,10 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name) #else m_widgetDSLabel = new TQLabel(i18n("Table Field or Query Field", "Widget's data source:"), contents); #endif - m_widgetDSLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + m_widgetDSLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); m_widgetDSLabel->setMargin(2); m_widgetDSLabel->setMinimumHeight(IconSize(KIcon::Small)+4); - m_widgetDSLabel->tqsetAlignment(AlignLeft|AlignBottom); + m_widgetDSLabel->setAlignment(AlignLeft|AlignBottom); hlyr->addWidget(m_widgetDSLabel); m_clearWidgetDSButton = new KexiSmallToolButton(contents, TQString(), "clear_left", "clearWidgetDSButton"); @@ -104,10 +104,10 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name) //- Form's Data Source hlyr = new TQHBoxLayout(contentsVlyr); m_dataSourceLabel = new TQLabel(i18n("Form's data source:"), contents); - m_dataSourceLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + m_dataSourceLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); m_dataSourceLabel->setMargin(2); m_dataSourceLabel->setMinimumHeight(IconSize(KIcon::Small)+4); - m_dataSourceLabel->tqsetAlignment(AlignLeft|AlignBottom); + m_dataSourceLabel->setAlignment(AlignLeft|AlignBottom); hlyr->addWidget(m_dataSourceLabel); m_gotoButton = new KexiSmallToolButton(contents, TQString(), "goto", "gotoButton"); @@ -160,14 +160,14 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name) m_mousePointerLabel->setFixedWidth( m_mousePointerLabel->pixmap() ? m_mousePointerLabel->pixmap()->width() : 0); m_availableFieldsDescriptionLabel = new TQLabel( i18n("Select fields from the list below and drag them onto a form or click the \"Insert\" button"), contents); - m_availableFieldsDescriptionLabel->tqsetAlignment( TQt::AlignAuto | TQt::WordBreak ); + m_availableFieldsDescriptionLabel->setAlignment( TQt::AlignAuto | TQt::WordBreak ); hlyr->addWidget(m_availableFieldsDescriptionLabel); //Available Fields contentsVlyr->addSpacing(4); hlyr = new TQHBoxLayout(contentsVlyr); m_availableFieldsLabel = new TQLabel(i18n("Available fields:"), contents); - m_availableFieldsLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + m_availableFieldsLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); m_availableFieldsLabel->setMargin(2); m_availableFieldsLabel->setMinimumHeight(IconSize(KIcon::Small)); hlyr->addWidget(m_availableFieldsLabel); @@ -183,7 +183,7 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name) m_fieldListView = new KexiFieldListView(contents, "fieldListView", KexiFieldListView::ShowDataTypes | KexiFieldListView::AllowMultiSelection ); - m_fieldListView->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding)); + m_fieldListView->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding)); m_availableFieldsLabel->setBuddy(m_fieldListView); contentsVlyr->addWidget(m_fieldListView, 1); connect(m_fieldListView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotFieldListViewSelectionChanged())); diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp index 3f47a6ec..d87b31c5 100644 --- a/kexi/plugins/forms/kexidbfactory.cpp +++ b/kexi/plugins/forms/kexidbfactory.cpp @@ -398,9 +398,9 @@ KexiDBFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, /* else if(c == "KexiDBTimeEdit") w = new KexiDBTimeEdit(TQTime::currentTime(), p, n); else if(c == "KexiDBDateEdit") - w = new KexiDBDateEdit(TQDate::tqcurrentDate(), p, n); + w = new KexiDBDateEdit(TQDate::currentDate(), p, n); else if(c == "KexiDBDateTimeEdit") - w = new KexiDBDateTimeEdit(TQDateTime::tqcurrentDateTime(), p, n);*/ + w = new KexiDBDateTimeEdit(TQDateTime::currentDateTime(), p, n);*/ // else if(c == "KexiDBIntSpinBox") // w = new KexiDBIntSpinBox(p, n); // else if(c == "KexiDBDoubleSpinBox") @@ -462,7 +462,7 @@ KexiDBFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDesign //! just inherited StdWidgetFactory::clearWidgetContent() should be called KLineEdit *lineedit = static_cast<KLineEdit*>(w); createEditor(classname, lineedit->text(), lineedit, container, - lineedit->tqgeometry(), lineedit->tqalignment(), true); + lineedit->geometry(), lineedit->alignment(), true); return true; } if(classname == "KexiDBTextEdit") @@ -471,7 +471,7 @@ KexiDBFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDesign //! just inherited StdWidgetFactory::clearWidgetContent() should be called KTextEdit *textedit = static_cast<KTextEdit*>(w); createEditor(classname, textedit->text(), textedit, container, - textedit->tqgeometry(), textedit->tqalignment(), true, true); + textedit->geometry(), textedit->alignment(), true, true); //copy a few properties KTextEdit *ed = dynamic_cast<KTextEdit *>( editor(w) ); ed->setWrapPolicy(textedit->wrapPolicy()); @@ -497,13 +497,13 @@ KexiDBFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDesign } if ( classname == "KexiDBLabel" ) - w->resize(w->tqsizeHint()); + w->resize(w->sizeHint()); } else { createEditor(classname, label->text(), label, container, - label->tqgeometry(), label->tqalignment(), - false, label->tqalignment() & TQt::WordBreak /*multiline*/); + label->geometry(), label->alignment(), + false, label->alignment() & TQt::WordBreak /*multiline*/); } return true; } @@ -529,12 +529,12 @@ KexiDBFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDesign if(static_cast<KexiDBAutoField*>(w)->hasAutoCaption()) return false; // caption is auto, abort editing TQLabel *label = static_cast<KexiDBAutoField*>(w)->label(); - createEditor(classname, label->text(), label, container, label->tqgeometry(), label->tqalignment()); + createEditor(classname, label->text(), label, container, label->geometry(), label->alignment()); return true; } else if (classname == "KexiDBCheckBox") { KexiDBCheckBox *cb = static_cast<KexiDBCheckBox*>(w); - TQRect r( cb->tqgeometry() ); + TQRect r( cb->geometry() ); r.setLeft( r.left() + 2 + cb->tqstyle().subRect( TQStyle::SR_CheckBoxIndicator, cb ).width() ); createEditor(classname, cb->text(), cb, container, r, TQt::AlignAuto); return true; @@ -679,7 +679,7 @@ KexiDBFactory::changeText(const TQString &text) changeProperty("caption", text, form); return true; } - //! \todo check field's tqgeometry + //! \todo check field's geometry return false; } @@ -690,7 +690,7 @@ KexiDBFactory::resizeEditor(TQWidget *editor, TQWidget *w, const TQCString &clas //TQPoint p = widget->pos(); if(classname == "KexiDBAutoField") - editor->setGeometry( static_cast<KexiDBAutoField*>(w)->label()->tqgeometry() ); + editor->setGeometry( static_cast<KexiDBAutoField*>(w)->label()->geometry() ); } void diff --git a/kexi/plugins/forms/kexidbtextwidgetinterface.cpp b/kexi/plugins/forms/kexidbtextwidgetinterface.cpp index 3c20510e..e8da5ad5 100644 --- a/kexi/plugins/forms/kexidbtextwidgetinterface.cpp +++ b/kexi/plugins/forms/kexidbtextwidgetinterface.cpp @@ -43,7 +43,7 @@ void KexiDBTextWidgetInterface::setColumnInfo(KexiDB::QueryColumnInfo* cinfo, TQ } } -void KexiDBTextWidgetInterface::paint( TQFrame *w, TQPainter* p, bool textIsEmpty, int tqalignment, bool hasFocus ) +void KexiDBTextWidgetInterface::paint( TQFrame *w, TQPainter* p, bool textIsEmpty, int alignment, bool hasFocus ) { KexiFormDataItemInterface *dataItemIface = dynamic_cast<KexiFormDataItemInterface*>(w); KexiDB::QueryColumnInfo *columnInfo = dataItemIface ? dataItemIface->columnInfo() : 0; @@ -53,11 +53,11 @@ void KexiDBTextWidgetInterface::paint( TQFrame *w, TQPainter* p, bool textIsEmpt if (w->hasFocus()) { p->setPen( KexiUtils::blendedColors( - m_autonumberDisplayParameters->textColor, w->tqpalette().active().base(), 1, 3)); + m_autonumberDisplayParameters->textColor, w->palette().active().base(), 1, 3)); } KexiDisplayUtils::paintAutonumberSign(*m_autonumberDisplayParameters, p, 2 + margin + w->margin(), margin, w->width() - margin*2 -2-2, - w->height() - margin*2 -2, tqalignment, hasFocus); + w->height() - margin*2 -2, alignment, hasFocus); } } } @@ -66,6 +66,6 @@ void KexiDBTextWidgetInterface::event( TQEvent * e, TQWidget *w, bool textIsEmpt { if (e->type()==TQEvent::FocusIn || e->type()==TQEvent::FocusOut) { if (m_autonumberDisplayParameters && textIsEmpty) - w->tqrepaint(); + w->repaint(); } } diff --git a/kexi/plugins/forms/kexidbtextwidgetinterface.h b/kexi/plugins/forms/kexidbtextwidgetinterface.h index 6e0299c0..17382e31 100644 --- a/kexi/plugins/forms/kexidbtextwidgetinterface.h +++ b/kexi/plugins/forms/kexidbtextwidgetinterface.h @@ -40,7 +40,7 @@ class KEXIFORMUTILS_EXPORT KexiDBTextWidgetInterface void setColumnInfo(KexiDB::QueryColumnInfo* cinfo, TQWidget *w); //! Called from paintEvent( TQPaintEvent *pe ) method of the data aware widget. - void paint( TQFrame *w, TQPainter *p, bool textIsEmpty, int tqalignment, bool hasFocus ); + void paint( TQFrame *w, TQPainter *p, bool textIsEmpty, int alignment, bool hasFocus ); //! Called from event( TQEvent * e ) method of the data aware widget. void event( TQEvent * e, TQWidget *w, bool textIsEmpty ); diff --git a/kexi/plugins/forms/kexiformeventhandler.cpp b/kexi/plugins/forms/kexiformeventhandler.cpp index 4e066bd6..55e999db 100644 --- a/kexi/plugins/forms/kexiformeventhandler.cpp +++ b/kexi/plugins/forms/kexiformeventhandler.cpp @@ -56,7 +56,7 @@ KexiPart::Info* KexiFormEventAction::ActionData::decodeString( return 0; KexiPart::Info *info = 0; if (_actionType!="kaction" && _actionType!="currentForm") { - info = Kexi::partManager().infoForMimeType( TQString("kexi/%1").tqarg(_actionType) ); + info = Kexi::partManager().infoForMimeType( TQString("kexi/%1").arg(_actionType) ); if (!info) return 0; } @@ -85,7 +85,7 @@ void KexiFormEventAction::activate() if (!project) return; KexiPart::Part* part = Kexi::partManager().partForMimeType( - TQString("kexi/%1").tqarg(m_actionName) ); + TQString("kexi/%1").arg(m_actionName) ); if (!part) return; KexiPart::Item* item = project->item( part->info(), m_objectName ); diff --git a/kexi/plugins/forms/kexiformmanager.cpp b/kexi/plugins/forms/kexiformmanager.cpp index 9674f4fe..8c0c66e7 100644 --- a/kexi/plugins/forms/kexiformmanager.cpp +++ b/kexi/plugins/forms/kexiformmanager.cpp @@ -112,7 +112,7 @@ void KexiFormManager::setFormDataSource(const TQCString& mime, const TQCString& propValues.insert("dataSource", name); propValues.insert("dataSourceMimeType", mime); KFormDesigner::CommandGroup *group - = new KFormDesigner::CommandGroup(i18n("Set Form's Data Source to \"%1\"").tqarg(name.data()), propertySet()); + = new KFormDesigner::CommandGroup(i18n("Set Form's Data Source to \"%1\"").arg(name.data()), propertySet()); propertySet()->createPropertyCommandsInDesignMode(formWidget, propValues, group, true /*addToActiveForm*/); } diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp index 9c4e3173..9d8017d8 100644 --- a/kexi/plugins/forms/kexiformpart.cpp +++ b/kexi/plugins/forms/kexiformpart.cpp @@ -277,7 +277,7 @@ KexiFormPart::generateForm(KexiDB::FieldList *list, TQDomDocument &domDoc) TQDomElement lNameProperty = domDoc.createElement("property"); lNameProperty.setAttribute("name", "name"); TQDomElement lType = domDoc.createElement("cstring"); - TQDomText lClassN = domDoc.createTextNode(TQString("l%1").tqarg(list->field(i)->name())); + TQDomText lClassN = domDoc.createTextNode(TQString("l%1").arg(list->field(i)->name())); lType.appendChild(lClassN); lNameProperty.appendChild(lType); lclass.appendChild(lNameProperty); @@ -510,7 +510,7 @@ void KexiFormPart::setupCustomPropertyPanelTabs(KTabWidget *tab, KexiMainWindow* void KexiFormPart::slotWidgetCreatedByFormsLibrary(TQWidget* widget) { - TQStrList signalNames(widget->tqmetaObject()->signalNames()); + TQStrList signalNames(widget->metaObject()->signalNames()); if (!signalNames.isEmpty()) { const char *handleDragMoveEventSignal = "handleDragMoveEvent(TQDragMoveEvent*)"; const char *handleDropEventSignal = "handleDropEvent(TQDropEvent*)"; diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp index df5191ed..b4b58f70 100644 --- a/kexi/plugins/forms/kexiformscrollview.cpp +++ b/kexi/plugins/forms/kexiformscrollview.cpp @@ -150,9 +150,9 @@ void KexiFormScrollView::moveToFirstRecordRequested() selectFirstRow(); } -void KexiFormScrollView::clearColumnsInternal(bool tqrepaint) +void KexiFormScrollView::clearColumnsInternal(bool repaint) { - Q_UNUSED( tqrepaint ); + Q_UNUSED( repaint ); //! @todo } @@ -349,7 +349,7 @@ void KexiFormScrollView::slotRowRepaintRequested(KexiTableItem& item) } /*void KexiFormScrollView::slotAboutToDeleteRow(KexiTableItem& item, - KexiDB::ResultInfo* result, bool tqrepaint) + KexiDB::ResultInfo* result, bool repaint) { //! @todo }*/ @@ -359,18 +359,18 @@ void KexiFormScrollView::slotRowRepaintRequested(KexiTableItem& item) //! @todo }*/ -void KexiFormScrollView::slotRowInserted(KexiTableItem *item, bool tqrepaint) +void KexiFormScrollView::slotRowInserted(KexiTableItem *item, bool repaint) { Q_UNUSED( item ); - Q_UNUSED( tqrepaint ); + Q_UNUSED( repaint ); //! @todo } -void KexiFormScrollView::slotRowInserted(KexiTableItem *item, uint row, bool tqrepaint) +void KexiFormScrollView::slotRowInserted(KexiTableItem *item, uint row, bool repaint) { Q_UNUSED( item ); Q_UNUSED( row ); - Q_UNUSED( tqrepaint ); + Q_UNUSED( repaint ); //! @todo } @@ -551,7 +551,7 @@ void KexiFormScrollView::refreshContentsSize() void KexiFormScrollView::handleDataWidgetAction(const TQString& actionName) { - TQWidget *w = tqfocusWidget(); + TQWidget *w = focusWidget(); KexiFormDataItemInterface *item = 0; while (w) { item = dynamic_cast<KexiFormDataItemInterface*>(w); diff --git a/kexi/plugins/forms/kexiformscrollview.h b/kexi/plugins/forms/kexiformscrollview.h index d8326a57..7d2b9867 100644 --- a/kexi/plugins/forms/kexiformscrollview.h +++ b/kexi/plugins/forms/kexiformscrollview.h @@ -162,17 +162,17 @@ class KEXIFORMUTILS_EXPORT KexiFormScrollView : virtual void slotRowRepaintRequested(KexiTableItem& item); //! Handles KexiTableViewData::aboutToDeleteRow() signal. Prepares info for slotRowDeleted(). - virtual void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool tqrepaint) - { KexiDataAwareObjectInterface::slotAboutToDeleteRow(item, result, tqrepaint); } + virtual void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool repaint) + { KexiDataAwareObjectInterface::slotAboutToDeleteRow(item, result, repaint); } - //! Handles KexiTableViewData::rowDeleted() signal to tqrepaint when needed. + //! Handles KexiTableViewData::rowDeleted() signal to repaint when needed. virtual void slotRowDeleted() { KexiDataAwareObjectInterface::slotRowDeleted(); } - //! Handles KexiTableViewData::rowInserted() signal to tqrepaint when needed. - virtual void slotRowInserted(KexiTableItem *item, bool tqrepaint); + //! Handles KexiTableViewData::rowInserted() signal to repaint when needed. + virtual void slotRowInserted(KexiTableItem *item, bool repaint); //! Like above, not db-aware version - virtual void slotRowInserted(KexiTableItem *item, uint row, bool tqrepaint); + virtual void slotRowInserted(KexiTableItem *item, uint row, bool repaint); virtual void slotRowsDeleted( const TQValueList<int> & ); @@ -193,7 +193,7 @@ class KEXIFORMUTILS_EXPORT KexiFormScrollView : protected: //! Implementation for KexiDataAwareObjectInterface - virtual void clearColumnsInternal(bool tqrepaint); + virtual void clearColumnsInternal(bool repaint); //! Implementation for KexiDataAwareObjectInterface virtual void addHeaderColumn(const TQString& caption, const TQString& description, diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp index 01ec080f..c6d689f7 100644 --- a/kexi/plugins/forms/kexiformview.cpp +++ b/kexi/plugins/forms/kexiformview.cpp @@ -90,7 +90,7 @@ KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *parent, if (viewMode()==Kexi::DataViewMode) { m_scrollView->recordNavigator()->setRecordHandler( m_scrollView ); - m_scrollView->viewport()->setPaletteBackgroundColor(m_dbform->tqpalette().active().background()); + m_scrollView->viewport()->setPaletteBackgroundColor(m_dbform->palette().active().background()); //moved to formmanager connect(formPart()->manager(), TQT_SIGNAL(noFormSelected()), TQT_SLOT(slotNoFormSelected())); } else @@ -345,12 +345,12 @@ void KexiFormView::updateValuesForSubproperties() kexipluginsdbg << "KexiFormView::loadForm(): delayed setting of the subproperty: widget=" << it.current()->widget()->name() << " prop=" << subpropIt.key() << " val=" << subpropIt.data() << endl; - const int count = subwidget->tqmetaObject()->findProperty(subpropIt.key().latin1(), true); - const TQMetaProperty *meta = count!=-1 ? subwidget->tqmetaObject()->property(count, true) : 0; + const int count = subwidget->metaObject()->findProperty(subpropIt.key().latin1(), true); + const TQMetaProperty *meta = count!=-1 ? subwidget->metaObject()->property(count, true) : 0; if (meta) { // Special case: the property value of type enum (set) but is saved as a string list, // not as int, so we need to translate it to int. It's been created as such - // by FormIO::readPropertyValue(). Example: "tqalignment" property. + // by FormIO::readPropertyValue(). Example: "alignment" property. if (meta->isSetType() && subpropIt.data().type()==TQVariant::StringList) { TQStrList keys; const TQStringList list( subpropIt.data().toStringList() ); @@ -371,7 +371,7 @@ void KexiFormView::updateValuesForSubproperties() static void setUnsavedBLOBIdsForDataViewMode( TQWidget* widget, const TQMap<TQCString, KexiBLOBBuffer::Id_t>& unsavedLocalBLOBsByName) { - if (-1 != widget->tqmetaObject()->findProperty("pixmapId")) { + if (-1 != widget->metaObject()->findProperty("pixmapId")) { const KexiBLOBBuffer::Id_t blobID = unsavedLocalBLOBsByName[ widget->name() ]; if (blobID > 0) widget->setProperty("pixmapId", (uint /* KexiBLOBBuffer::Id_t is unsafe and unsupported by TQVariant - will be fixed in TQt4*/)blobID); @@ -525,9 +525,9 @@ KexiFormView::afterSwitchFrom(int mode) //set focus on 1st focusable widget which has valid dataSource property set if (!m_dbform->orderedFocusWidgets()->isEmpty()) { -// TQWidget *www = tqfocusWidget(); - //if (Kexi::hasParent(this, tqApp->tqfocusWidget())) { - KexiUtils::unsetFocusWithReason(tqApp->tqfocusWidget(), TQFocusEvent::Tab); +// TQWidget *www = focusWidget(); + //if (Kexi::hasParent(this, tqApp->focusWidget())) { + KexiUtils::unsetFocusWithReason(tqApp->focusWidget(), TQFocusEvent::Tab); //} TQPtrListIterator<TQWidget> it(*m_dbform->orderedFocusWidgets()); @@ -860,7 +860,7 @@ KexiFormView::slotWidgetSelected(KFormDesigner::Form *f, bool multiple) setAvailable("formpart_format_raise", true); setAvailable("formpart_format_lower", true); - // If the widgets selected is a container, we enable tqlayout actions + // If the widgets selected is a container, we enable layout actions if(!multiple) { KFormDesigner::ObjectTreeItem *item = f->objectTree()->lookup( f->selectedWidgets()->first()->name() ); @@ -999,14 +999,14 @@ void KexiFormView::setFocusInternal() { if (viewMode() == Kexi::DataViewMode) { - if (m_dbform->tqfocusWidget()) { + if (m_dbform->focusWidget()) { //better-looking focus if (m_setFocusInternalOnce) { KexiUtils::setFocusWithReason(m_setFocusInternalOnce, TQFocusEvent::Other);//Tab); m_setFocusInternalOnce = 0; } else { - //ok? SET_FOCUS_USING_REASON(m_dbform->tqfocusWidget(), TQFocusEvent::Other);//Tab); + //ok? SET_FOCUS_USING_REASON(m_dbform->focusWidget(), TQFocusEvent::Other);//Tab); } return; } @@ -1115,7 +1115,7 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s // KFormDesigner::WidgetList* prevSelection = form()->selectedWidgets(); KFormDesigner::WidgetList widgetsToSelect; KFormDesigner::CommandGroup *group = new KFormDesigner::CommandGroup( - fields.count()==1 ? i18n("Insert AutoField widget") : i18n("Insert %1 AutoField widgets").tqarg(fields.count()), + fields.count()==1 ? i18n("Insert AutoField widget") : i18n("Insert %1 AutoField widgets").arg(fields.count()), KFormDesigner::FormManager::self()->propertySet() ); @@ -1173,8 +1173,8 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s // newWidget->setDataSource(column->aliasOrName()); // newWidget->setFieldTypeInternal((int)column->field->type()); // newWidget->setFieldCaptionInternal(column->captionOrAliasOrName()); - //resize again because autofield's type changed what can lead to changed tqsizeHint() -// newWidget->resize(newWidget->tqsizeHint()); + //resize again because autofield's type changed what can lead to changed sizeHint() +// newWidget->resize(newWidget->sizeHint()); KFormDesigner::WidgetList list; list.append(newWidget); KFormDesigner::AdjustSizeCommand *adjustCommand @@ -1191,10 +1191,10 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s } if (widgetsToSelect.last()) { //resize form if needed - TQRect oldFormRect( m_dbform->tqgeometry() ); + TQRect oldFormRect( m_dbform->geometry() ); TQRect newFormRect( oldFormRect ); - newFormRect.setWidth(TQMAX(m_dbform->width(), widgetsToSelect.last()->tqgeometry().right()+1)); - newFormRect.setHeight(TQMAX(m_dbform->height(), widgetsToSelect.last()->tqgeometry().bottom()+1)); + newFormRect.setWidth(TQMAX(m_dbform->width(), widgetsToSelect.last()->geometry().right()+1)); + newFormRect.setHeight(TQMAX(m_dbform->height(), widgetsToSelect.last()->geometry().bottom()+1)); if (newFormRect != oldFormRect) { //1. resize by hand m_dbform->setGeometry( newFormRect ); @@ -1205,8 +1205,8 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s group->addCommand(resizeFormCommand, true/*will be executed on CommandGroup::execute()*/); } - //remember tqgeometry of the last inserted widget - m_widgetGeometryForRecentInsertAutoFields = widgetsToSelect.last()->tqgeometry(); + //remember geometry of the last inserted widget + m_widgetGeometryForRecentInsertAutoFields = widgetsToSelect.last()->geometry(); } //eventually, add entire command group to active form @@ -1217,11 +1217,11 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s //enable proper REDO usage group->resetAllowExecuteFlags(); - m_scrollView->tqrepaint(); - m_scrollView->viewport()->tqrepaint(); + m_scrollView->repaint(); + m_scrollView->viewport()->repaint(); m_scrollView->repaintContents(); m_scrollView->updateContents(); - m_scrollView->clipper()->tqrepaint(); + m_scrollView->clipper()->repaint(); m_scrollView->refreshContentsSize(); //select all inserted widgets, if multiple diff --git a/kexi/plugins/forms/kexiformview.h b/kexi/plugins/forms/kexiformview.h index 8bc1cb79..f269abf7 100644 --- a/kexi/plugins/forms/kexiformview.h +++ b/kexi/plugins/forms/kexiformview.h @@ -218,7 +218,7 @@ class KEXIFORMUTILS_EXPORT KexiFormView : public KexiDataAwareView TQGuardedPtr<TQWidget> m_setFocusInternalOnce; - /*! Stores tqgeometry of widget recently inserted using insertAutoFields() method. + /*! Stores geometry of widget recently inserted using insertAutoFields() method. having this information, we'r eable to compute position for a newly inserted widget in insertAutoFields() is such position has not been specified. (the position is specified when a widget is inserted with mouse drag & dropping diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp index 7ebc522f..be17c159 100644 --- a/kexi/plugins/forms/widgets/kexidbautofield.cpp +++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp @@ -22,7 +22,7 @@ #include "kexidbautofield.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqmetaobject.h> #include <tqapplication.h> @@ -57,7 +57,7 @@ class KexiDBAutoField::Private //!< of widgetTypeForFieldType() if widgetTypeForFieldType is Auto WidgetType widgetType_property; //!< provides widget type or Auto LabelPosition lblPosition; - TQBoxLayout *tqlayout; + TQBoxLayout *layout; TQLabel *label; TQString caption; KexiDB::Field::Type fieldTypeInternal; @@ -104,7 +104,7 @@ void KexiDBAutoField::init(const TQString &text, WidgetType type, LabelPosition pos) { d->fieldTypeInternal = KexiDB::Field::InvalidType; - d->tqlayout = 0; + d->layout = 0; m_subwidget = 0; d->label = new TQLabel(text, this); d->label->installEventFilter( this ); @@ -116,8 +116,8 @@ KexiDBAutoField::init(const TQString &text, WidgetType type, LabelPosition pos) d->widgetType_property = (type==Auto ? Text : type); //to force "differ" to be true in setWidgetType() setLabelPosition(pos); setWidgetType(type); - d->baseColor = tqpalette().active().base(); - d->textColor = tqpalette().active().text(); + d->baseColor = palette().active().base(); + d->textColor = palette().active().text(); } void @@ -222,30 +222,30 @@ void KexiDBAutoField::setLabelPosition(LabelPosition position) { d->lblPosition = position; - if(d->tqlayout) { - TQBoxLayout *lyr = d->tqlayout; - d->tqlayout = 0; + if(d->layout) { + TQBoxLayout *lyr = d->layout; + d->layout = 0; delete lyr; } if(m_subwidget) m_subwidget->show(); - //! \todo support right-to-left tqlayout where positions are inverted + //! \todo support right-to-left layout where positions are inverted if (position==Top || position==Left) { - int align = d->label->tqalignment(); + int align = d->label->alignment(); if(position == Top) { - d->tqlayout = (TQBoxLayout*) new TQVBoxLayout(this); + d->layout = (TQBoxLayout*) new TQVBoxLayout(this); align |= AlignVertical_Mask; align ^= AlignVertical_Mask; align |= AlignTop; } else { - d->tqlayout = (TQBoxLayout*) new TQHBoxLayout(this); + d->layout = (TQBoxLayout*) new TQHBoxLayout(this); align |= AlignVertical_Mask; align ^= AlignVertical_Mask; align |= AlignVCenter; } - d->label->tqsetAlignment(align); + d->label->setAlignment(align); if(d->widgetType == Boolean || (d->widgetType == Auto && fieldTypeInternal() == KexiDB::Field::InvalidType && !d->designMode)) { @@ -254,36 +254,36 @@ KexiDBAutoField::setLabelPosition(LabelPosition position) else { d->label->show(); } - d->tqlayout->addWidget(d->label, 0, position == Top ? int(TQt::AlignLeft) : 0); + d->layout->addWidget(d->label, 0, position == Top ? int(TQt::AlignLeft) : 0); if(position == Left && d->widgetType != Boolean) - d->tqlayout->addSpacing(KexiDBAutoField_SPACING); - d->tqlayout->addWidget(m_subwidget, 1); + d->layout->addSpacing(KexiDBAutoField_SPACING); + d->layout->addWidget(m_subwidget, 1); KexiSubwidgetInterface *subwidgetInterface = dynamic_cast<KexiSubwidgetInterface*>((TQWidget*)m_subwidget); if (subwidgetInterface) { if (subwidgetInterface->appendStretchRequired(this)) - d->tqlayout->addStretch(0); + d->layout->addStretch(0); if (subwidgetInterface->subwidgetStretchRequired(this)) { - TQSizePolicy sizePolicy( m_subwidget->tqsizePolicy() ); + TQSizePolicy sizePolicy( m_subwidget->sizePolicy() ); if(position == Left) { sizePolicy.setHorData( TQSizePolicy::Minimum ); - d->label->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); + d->label->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); } else { sizePolicy.setVerData( TQSizePolicy::Minimum ); - d->label->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + d->label->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); } - m_subwidget->tqsetSizePolicy(sizePolicy); + m_subwidget->setSizePolicy(sizePolicy); } } // if(m_subwidget) - // m_subwidget->tqsetSizePolicy(...); + // m_subwidget->setSizePolicy(...); } else { - d->tqlayout = (TQBoxLayout*) new TQHBoxLayout(this); + d->layout = (TQBoxLayout*) new TQHBoxLayout(this); d->label->hide(); - d->tqlayout->addWidget(m_subwidget); + d->layout->addWidget(m_subwidget); } - //a hack to force tqlayout to be refreshed (any better idea for this?) + //a hack to force layout to be refreshed (any better idea for this?) resize(size()+TQSize(1,0)); resize(size()-TQSize(1,0)); if (dynamic_cast<KexiDBAutoField*>((TQWidget*)m_subwidget)) { @@ -570,7 +570,7 @@ KexiDBAutoField::changeText(const TQString &text, bool beautify) bool unbound = false; if (d->autoCaption && (d->widgetType==Auto || dataSource().isEmpty())) { if (d->designMode) - realText = TQString::tqfromLatin1(name())+" "+i18n("Unbound Auto Field", "(unbound)"); + realText = TQString::fromLatin1(name())+" "+i18n("Unbound Auto Field", "(unbound)"); else realText = TQString(); unbound = true; @@ -584,7 +584,7 @@ KexiDBAutoField::changeText(const TQString &text, bool beautify) realText = text[0].upper() + text.mid(1); if (d->widgetType!=Boolean) { //! @todo ":" suffix looks weird for checkbox; remove this condition when [x] is displayed _after_ label -//! @todo support right-to-left tqlayout where position of ":" is inverted +//! @todo support right-to-left layout where position of ":" is inverted realText += ": "; } } @@ -594,9 +594,9 @@ KexiDBAutoField::changeText(const TQString &text, bool beautify) } if (unbound) - d->label->tqsetAlignment( TQt::AlignCenter | TQt::WordBreak ); + d->label->setAlignment( TQt::AlignCenter | TQt::WordBreak ); else - d->label->tqsetAlignment( TQt::AlignCenter ); + d->label->setAlignment( TQt::AlignCenter ); // TQWidget* widgetToAlterForegroundColor; if(d->widgetType == Boolean) { static_cast<TQCheckBox*>((TQWidget*)m_subwidget)->setText(realText); @@ -650,15 +650,15 @@ KexiDBAutoField::setDataSource( const TQString &ds ) { } TQSize -KexiDBAutoField::tqsizeHint() const +KexiDBAutoField::sizeHint() const { if (d->lblPosition == NoLabel) - return m_subwidget ? m_subwidget->tqsizeHint() : TQWidget::tqsizeHint(); + return m_subwidget ? m_subwidget->sizeHint() : TQWidget::sizeHint(); TQSize s1(0,0); if (m_subwidget) - s1 = m_subwidget->tqsizeHint(); - TQSize s2(d->label->tqsizeHint()); + s1 = m_subwidget->sizeHint(); + TQSize s2(d->label->sizeHint()); if (d->lblPosition == Top) return TQSize(TQMAX(s1.width(), s2.width()), s1.height()+KexiDBAutoField_SPACING+s2.height()); @@ -682,10 +682,10 @@ KexiDBAutoField::updateInformationAboutUnboundField() if ( (d->autoCaption && (dataSource().isEmpty() || dataSourceMimeType().isEmpty())) || (!d->autoCaption && d->caption.isEmpty()) ) { - d->label->setText( TQString::tqfromLatin1(name())+" "+i18n("Unbound Auto Field", " (unbound)") ); + d->label->setText( TQString::fromLatin1(name())+" "+i18n("Unbound Auto Field", " (unbound)") ); } // else -// d->label->setText( TQString::tqfromLatin1(name())+" "+i18n(" (unbound)") ); +// d->label->setText( TQString::fromLatin1(name())+" "+i18n(" (unbound)") ); } /*void @@ -701,7 +701,7 @@ KexiDBAutoField::paintEvent( TQPaintEvent* pe ) p.setClipRect(pe->rect()); p.setFont(d->label->font()); p.drawText(rect(), TQt::AlignLeft | TQt::WordBreak, - TQString::tqfromLatin1(name())+" "+i18n(" (unbound)")); + TQString::fromLatin1(name())+" "+i18n(" (unbound)")); } }*/ diff --git a/kexi/plugins/forms/widgets/kexidbautofield.h b/kexi/plugins/forms/widgets/kexidbautofield.h index 653e4067..809c1186 100644 --- a/kexi/plugins/forms/widgets/kexidbautofield.h +++ b/kexi/plugins/forms/widgets/kexidbautofield.h @@ -132,7 +132,7 @@ class KEXIFORMUTILS_EXPORT KexiDBAutoField : /*! @internal */ TQString fieldCaptionInternal() const; - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual void setFocusPolicy ( TQ_FocusPolicy policy ); //! Reimplemented to return internal editor's color. diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp index 81c66ba6..2a25b905 100644 --- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp @@ -59,10 +59,10 @@ class KexiDBComboBox::Private KexiComboBoxPopup *popup; KComboBox *paintedCombo; //!< fake combo used only to pass it as 'this' for TQStyle (because styles use <static_cast>) - TQSize tqsizeHint; //!< A cache for KexiDBComboBox::tqsizeHint(), + TQSize sizeHint; //!< A cache for KexiDBComboBox::sizeHint(), //!< rebuilt by KexiDBComboBox::fontChange() and KexiDBComboBox::styleChange() KexiDB::QueryColumnInfo* visibleColumnInfo; - TQPtrDict<char> *subWidgetsWithDisabledEvents; //! used to collect subwidget and its tqchildren (if isEditable is false) + TQPtrDict<char> *subWidgetsWithDisabledEvents; //! used to collect subwidget and its children (if isEditable is false) bool isEditable : 1; //!< true is the combo box is editable bool buttonPressed : 1; bool mouseOver : 1; @@ -124,7 +124,7 @@ bool KexiDBComboBox::isEditable() const void KexiDBComboBox::paintEvent( TQPaintEvent * ) { TQPainter p( this ); - TQColorGroup cg( tqpalette().active() ); + TQColorGroup cg( palette().active() ); // if ( hasFocus() ) // cg.setColor(TQColorGroup::Base, cg.highlight()); // else @@ -144,9 +144,9 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * ) return; } -//! @todo support reverse tqlayout +//! @todo support reverse layout //bool reverse = TQApplication::reverseLayout(); - tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, &p, d->paintedCombo /*this*/, rect(), cg, + tqstyle().drawComplexControl( TQStyle::CC_ComboBox, &p, d->paintedCombo /*this*/, rect(), cg, flags, (uint)TQStyle::SC_All, (d->buttonPressed ? TQStyle::SC_ComboBoxArrow : TQStyle::SC_None ) ); @@ -159,7 +159,7 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * ) if ( hasFocus() ) { if (0==qstrcmp(tqstyle().name(), "windows")) //a hack p.fillRect( editorGeometry, cg.brush( TQColorGroup::Highlight ) ); - TQRect r( TQStyle::tqvisualRect( tqstyle().subRect( TQStyle::SR_ComboBoxFocusRect, d->paintedCombo ), this ) ); + TQRect r( TQStyle::visualRect( tqstyle().subRect( TQStyle::SR_ComboBoxFocusRect, d->paintedCombo ), this ) ); r = TQRect(r.left()-1, r.top()-1, r.width()+2, r.height()+2); //enlare by 1 pixel each side to avoid covering by the subwidget tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r, cg, flags | TQStyle::Style_FocusAtBorder, TQStyleOption(cg.highlight())); @@ -170,7 +170,7 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * ) TQRect KexiDBComboBox::editorGeometry() const { - TQRect r( TQStyle::tqvisualRect( + TQRect r( TQStyle::visualRect( tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, d->paintedCombo, TQStyle::SC_ComboBoxEditField), d->paintedCombo ) ); @@ -211,20 +211,20 @@ void KexiDBComboBox::createEditor() void KexiDBComboBox::setLabelPosition(LabelPosition position) { if(m_subwidget) { - if (-1 != m_subwidget->tqmetaObject()->findProperty("frameShape", true)) + if (-1 != m_subwidget->metaObject()->findProperty("frameShape", true)) m_subwidget->setProperty("frameShape", TQVariant((int)TQFrame::NoFrame)); m_subwidget->setGeometry( editorGeometry() ); } // KexiSubwidgetInterface *subwidgetInterface = dynamic_cast<KexiSubwidgetInterface*>((TQWidget*)m_subwidget); // update size policy // if (subwidgetInterface && subwidgetInterface->subwidgetStretchRequired(this)) { - TQSizePolicy sizePolicy( this->tqsizePolicy() ); + TQSizePolicy sizePolicy( this->sizePolicy() ); if(position == Left) sizePolicy.setHorData( TQSizePolicy::Minimum ); else sizePolicy.setVerData( TQSizePolicy::Minimum ); - //m_subwidget->tqsetSizePolicy(sizePolicy); - tqsetSizePolicy(sizePolicy); + //m_subwidget->setSizePolicy(sizePolicy); + setSizePolicy(sizePolicy); //} // } } @@ -233,7 +233,7 @@ TQRect KexiDBComboBox::buttonGeometry() const { TQRect arrowRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, d->paintedCombo, TQStyle::SC_ComboBoxArrow) ); - arrowRect = TQStyle::tqvisualRect(arrowRect, d->paintedCombo); + arrowRect = TQStyle::visualRect(arrowRect, d->paintedCombo); arrowRect.setHeight( TQMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); // a fix for Motif style return arrowRect; } @@ -259,7 +259,7 @@ bool KexiDBComboBox::handleMousePressEvent(TQMouseEvent *e) if ( arrowRect.contains( e->pos() ) ) { d->arrowPressed = TRUE; d->arrowDown = TRUE; - tqrepaint( FALSE ); + repaint( FALSE ); } } else {*/ showPopup(); @@ -490,29 +490,29 @@ int KexiDBComboBox::popupWidthHint() const void KexiDBComboBox::fontChange( const TQFont & oldFont ) { - d->tqsizeHint = TQSize(); //force rebuild the cache + d->sizeHint = TQSize(); //force rebuild the cache KexiDBAutoField::fontChange(oldFont); } void KexiDBComboBox::styleChange( TQStyle& oldStyle ) { KexiDBAutoField::styleChange( oldStyle ); - d->tqsizeHint = TQSize(); //force rebuild the cache + d->sizeHint = TQSize(); //force rebuild the cache if (m_subwidget) m_subwidget->setGeometry( editorGeometry() ); } -TQSize KexiDBComboBox::tqsizeHint() const +TQSize KexiDBComboBox::sizeHint() const { - if ( isVisible() && d->tqsizeHint.isValid() ) - return d->tqsizeHint; + if ( isVisible() && d->sizeHint.isValid() ) + return d->sizeHint; const int maxWidth = 7 * fontMetrics().width(TQChar('x')) + 18; const int maxHeight = TQMAX( fontMetrics().lineSpacing(), 14 ) + 2; - d->tqsizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo, + d->sizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo, TQSize(maxWidth, maxHeight)).expandedTo(TQApplication::globalStrut())); - return d->tqsizeHint; + return d->sizeHint; } void KexiDBComboBox::editRequested() diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.h b/kexi/plugins/forms/widgets/kexidbcombobox.h index 4e780aa3..60ed78d1 100644 --- a/kexi/plugins/forms/widgets/kexidbcombobox.h +++ b/kexi/plugins/forms/widgets/kexidbcombobox.h @@ -68,7 +68,7 @@ class KEXIFORMUTILS_EXPORT KexiDBComboBox : //! Reimpemented because to avoid taking value from the internal editor (index is taken from the popup instead) virtual bool valueChanged(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; //! Reimplemented after KexiDBAutoField: jsut sets \a cinfo without initializing a subwidget. //! Initialization is performed by \ref setVisibleColumnInfo(). @@ -111,7 +111,7 @@ class KEXIFORMUTILS_EXPORT KexiDBComboBox : virtual bool eventFilter( TQObject *o, TQEvent *e ); - //! \return internal editor's tqgeometry + //! \return internal editor's geometry TQRect editorGeometry() const; //! Creates editor. Reimplemented, because if the combo box is not editable, diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.cpp b/kexi/plugins/forms/widgets/kexidbdateedit.cpp index 8394ef58..339ba722 100644 --- a/kexi/plugins/forms/widgets/kexidbdateedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbdateedit.cpp @@ -19,7 +19,7 @@ */ #include "kexidbdateedit.h" -#include <tqlayout.h> +#include <layout.h> #include <tqtoolbutton.h> #include <kpopupmenu.h> #include <kdatepicker.h> @@ -37,7 +37,7 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char m_edit = new TQDateEdit(date, this); m_edit->setAutoAdvance(true); - m_edit->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding); connect( m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(slotValueChanged(const TQDate&)) ); connect( m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SIGNAL(dateChanged(const TQDate&)) ); @@ -54,7 +54,7 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char m_datePickerPopupMenu = new KPopupMenu(0, "date_popup"); connect(m_datePickerPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotShowDatePicker())); - m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::tqcurrentDate(), 0); + m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::currentDate(), 0); KDateTable *dt = KexiUtils::findFirstChild<KDateTable>(m_datePicker, "KDateTable"); if (dt) @@ -64,9 +64,9 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char m_datePickerPopupMenu->insertItem(m_datePicker); btn->setPopup(m_datePickerPopupMenu); - TQHBoxLayout* tqlayout = new TQHBoxLayout(this); - tqlayout->addWidget(m_edit, 1); - tqlayout->addWidget(btn, 0); + TQHBoxLayout* layout = new TQHBoxLayout(this); + layout->addWidget(m_edit, 1); + layout->addWidget(btn, 0); setFocusProxy(m_edit); } diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp index ea9dede7..6f479c69 100644 --- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp @@ -21,7 +21,7 @@ #include "kexidbdatetimeedit.h" #include <tqtoolbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <kpopupmenu.h> #include <kdatepicker.h> #include <kdatetbl.h> @@ -36,7 +36,7 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par m_dateEdit = new TQDateEdit(datetime.date(), this); m_dateEdit->setAutoAdvance(true); - m_dateEdit->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding); + m_dateEdit->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding); // m_dateEdit->setFixedWidth( TQFontMetrics(m_dateEdit->font()).width("8888-88-88___") ); connect(m_dateEdit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(slotValueChanged())); connect(m_dateEdit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SIGNAL(dateTimeChanged())); @@ -48,7 +48,7 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par m_timeEdit = new TQTimeEdit(datetime.time(), this);; m_timeEdit->setAutoAdvance(true); - m_timeEdit->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding); + m_timeEdit->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding); connect(m_timeEdit, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SLOT(slotValueChanged())); connect(m_timeEdit, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SIGNAL(dateTimeChanged())); @@ -61,7 +61,7 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par m_datePickerPopupMenu = new KPopupMenu(0, "date_popup"); connect(m_datePickerPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotShowDatePicker())); - m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::tqcurrentDate(), 0); + m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::currentDate(), 0); KDateTable *dt = KexiUtils::findFirstChild<KDateTable>(m_datePicker, "KDateTable"); if (dt) @@ -71,11 +71,11 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par m_datePickerPopupMenu->insertItem(m_datePicker); btn->setPopup(m_datePickerPopupMenu); - TQHBoxLayout* tqlayout = new TQHBoxLayout(this); - tqlayout->addWidget(m_dateEdit, 0); - tqlayout->addWidget(btn, 0); - tqlayout->addWidget(m_timeEdit, 0); - //tqlayout->addStretch(1); + TQHBoxLayout* layout = new TQHBoxLayout(this); + layout->addWidget(m_dateEdit, 0); + layout->addWidget(btn, 0); + layout->addWidget(m_timeEdit, 0); + //layout->addStretch(1); setFocusProxy(m_dateEdit); } diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp index 88ddf93f..17242953 100644 --- a/kexi/plugins/forms/widgets/kexidbform.cpp +++ b/kexi/plugins/forms/widgets/kexidbform.cpp @@ -125,13 +125,13 @@ KexiDBForm::~KexiDBForm() KexiDataAwareObjectInterface* KexiDBForm::dataAwareObject() const { return d->dataAwareObject; } -//tqrepaint all tqchildren widgets +//repaint all children widgets static void repaintAll(TQWidget *w) { TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING); TQObjectListIt it(*list); for (TQObject *obj; (obj=it.current()); ++it ) { - TQT_TQWIDGET(obj)->tqrepaint(); + TQT_TQWIDGET(obj)->repaint(); } delete list; } @@ -148,7 +148,7 @@ void KexiDBForm::drawRects(const TQValueList<TQRect> &list, int type) { TQPainter p; - p.tqbegin(TQT_TQPAINTDEVICE(this), true); + p.begin(TQT_TQPAINTDEVICE(this), true); bool unclipped = testWFlags( WPaintUnclipped ); setWFlags( WPaintUnclipped ); @@ -192,7 +192,7 @@ void KexiDBForm::clearForm() { TQPainter p; - p.tqbegin(TQT_TQPAINTDEVICE(this), true); + p.begin(TQT_TQPAINTDEVICE(this), true); bool unclipped = testWFlags( WPaintUnclipped ); setWFlags( WPaintUnclipped ); @@ -216,7 +216,7 @@ KexiDBForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &poi toPoint = to->parentWidget()->mapTo(this, to->pos()); TQPainter p; - p.tqbegin(TQT_TQPAINTDEVICE(this), true); + p.begin(TQT_TQPAINTDEVICE(this), true); bool unclipped = testWFlags( WPaintUnclipped ); setWFlags( WPaintUnclipped ); @@ -234,7 +234,7 @@ KexiDBForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &poi TQPixmap pix2 = TQPixmap::grabWidget(to); if((from != this) && (to != this)) - p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) ); + p.drawLine( from->parentWidget()->mapTo(this, from->geometry().center()), to->parentWidget()->mapTo(this, to->geometry().center()) ); p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1); p.drawPixmap(toPoint.x(), toPoint.y(), pix2); @@ -268,7 +268,7 @@ KexiDBForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &poi } TQSize -KexiDBForm::tqsizeHint() const +KexiDBForm::sizeHint() const { //todo: find better size (user configured?) return TQSize(400,300); @@ -304,7 +304,7 @@ TQPtrList<TQWidget>* KexiDBForm::orderedDataAwareWidgets() const void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form) { TQWidget *fromWidget = 0; - //TQWidget *tqtopLevelWidget = form->widget()->tqtopLevelWidget(); + //TQWidget *topLevelWidget = form->widget()->topLevelWidget(); //js form->updateTabStopsOrder(); //certain widgets can have now updated focusPolicy properties, fix this uint numberOfDataAwareWidgets = 0; // if (d->orderedFocusWidgets.isEmpty()) { @@ -313,18 +313,18 @@ void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form) if (it.current()->widget()->focusPolicy() & TQ_TabFocus) { //this widget has tab focus: it.current()->widget()->installEventFilter(this); - //also filter events for data-aware tqchildren of this widget (i.e. KexiDBAutoField's editors) - TQObjectList *tqchildren = it.current()->widget()->queryList(TQWIDGET_OBJECT_NAME_STRING); - for (TQObjectListIt tqchildrenIt(*tqchildren); tqchildrenIt.current(); ++tqchildrenIt) { - // if (dynamic_cast<KexiFormDataItemInterface*>(tqchildrenIt.current())) { + //also filter events for data-aware children of this widget (i.e. KexiDBAutoField's editors) + TQObjectList *children = it.current()->widget()->queryList(TQWIDGET_OBJECT_NAME_STRING); + for (TQObjectListIt childrenIt(*children); childrenIt.current(); ++childrenIt) { + // if (dynamic_cast<KexiFormDataItemInterface*>(childrenIt.current())) { kexipluginsdbg << "KexiDBForm::updateTabStopsOrder(): also adding '" - << tqchildrenIt.current()->className() << " " << tqchildrenIt.current()->name() + << childrenIt.current()->className() << " " << childrenIt.current()->name() << "' child to filtered widgets" << endl; - //it.current()->widget()->installEventFilter(TQT_TQWIDGET(tqchildrenIt.current())); - tqchildrenIt.current()->installEventFilter(this); + //it.current()->widget()->installEventFilter(TQT_TQWIDGET(childrenIt.current())); + childrenIt.current()->installEventFilter(this); // } } - delete tqchildren; + delete children; if (fromWidget) { kexipluginsdbg << "KexiDBForm::updateTabStopsOrder() tab order: " << fromWidget->name() << " -> " << it.current()->widget()->name() << endl; @@ -361,7 +361,7 @@ void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form) } fromWidget = it.current(); } -// SET_FOCUS_USING_REASON(tqfocusWidget(), TQFocusEvent::Tab); +// SET_FOCUS_USING_REASON(focusWidget(), TQFocusEvent::Tab); }*/ } @@ -399,7 +399,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e ) bool tab = ke->state() == Qt::NoButton && key == TQt::Key_Tab; bool backtab = ((ke->state() == Qt::NoButton || ke->state() == TQt::ShiftButton) && key == TQt::Key_Backtab) || (ke->state() == TQt::ShiftButton && key == TQt::Key_Tab); - TQObject *o = watched; //tqfocusWidget(); + TQObject *o = watched; //focusWidget(); TQWidget* realWidget = dynamic_cast<TQWidget*>(o); //will beused below (for tab/backtab handling) if (!tab && !backtab) { diff --git a/kexi/plugins/forms/widgets/kexidbform.h b/kexi/plugins/forms/widgets/kexidbform.h index fc0d25c2..29798947 100644 --- a/kexi/plugins/forms/widgets/kexidbform.h +++ b/kexi/plugins/forms/widgets/kexidbform.h @@ -69,7 +69,7 @@ class KEXIFORMUTILS_EXPORT KexiDBForm : virtual void clearForm(); virtual void highlightWidgets(TQWidget *from, TQWidget *to/*, const TQPoint &p*/); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; bool autoTabStops() const; diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp index 4165c000..23f079ae 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp +++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp @@ -23,7 +23,7 @@ #include <tqapplication.h> #include <tqpixmap.h> #include <tqstyle.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqtooltip.h> #include <tqimage.h> #include <tqbuffer.h> @@ -67,7 +67,7 @@ static TQPixmap* KexiDBImageBox_pmSmall = 0; KexiDBImageBox::KexiDBImageBox( bool designMode, TQWidget *parent, const char *name ) : KexiFrame( parent, name, TQt::WNoAutoErase ) , KexiFormDataItemInterface() - , m_tqalignment(TQt::AlignAuto|TQt::AlignTop) + , m_alignment(TQt::AlignAuto|TQt::AlignTop) , m_designMode(designMode) , m_readOnly(false) , m_scaledContents(false) @@ -80,7 +80,7 @@ KexiDBImageBox::KexiDBImageBox( bool designMode, TQWidget *parent, const char *n , m_insideSetPalette(false) { installEventFilter(this); - tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); //setup popup menu m_popupMenu = new KexiImageContextMenu(this); @@ -176,7 +176,7 @@ void KexiDBImageBox::setValueInternal( const TQVariant& add, bool removeOld, boo m_valueMimeType = TQString(); m_pixmap = TQPixmap(); } - tqrepaint(); + repaint(); } void KexiDBImageBox::setInvalidState( const TQString& displayText ) @@ -242,7 +242,7 @@ void KexiDBImageBox::setPixmapId(uint id) if (m_insideSetData) //avoid recursion return; setData(KexiBLOBBuffer::self()->objectForId( id, /*unstored*/false )); - tqrepaint(); + repaint(); } uint KexiDBImageBox::storedPixmapId() const @@ -257,7 +257,7 @@ uint KexiDBImageBox::storedPixmapId() const void KexiDBImageBox::setStoredPixmapId(uint id) { setData(KexiBLOBBuffer::self()->objectForId( id, /*stored*/true )); - tqrepaint(); + repaint(); } bool KexiDBImageBox::hasScaledContents() const @@ -276,14 +276,14 @@ void KexiDBImageBox::setScaledContents(bool set) { //todo m_pixmapLabel->setScaledContents(set); m_scaledContents = set; - tqrepaint(); + repaint(); } void KexiDBImageBox::setKeepAspectRatio(bool set) { m_keepAspectRatio = set; if (m_scaledContents) - tqrepaint(); + repaint(); } TQWidget* KexiDBImageBox::widget() @@ -331,7 +331,7 @@ void KexiDBImageBox::handleInsertFromFileAction(const KURL& url) if (!h) return; setData(h); - tqrepaint(); + repaint(); } else { //db-aware @@ -401,14 +401,14 @@ void KexiDBImageBox::handleCutAction() void KexiDBImageBox::handleCopyAction() { - tqApp->tqclipboard()->setPixmap(pixmap(), TQClipboard::Clipboard); + tqApp->clipboard()->setPixmap(pixmap(), TQClipboard::Clipboard); } void KexiDBImageBox::handlePasteAction() { if (isReadOnly() || (!m_designMode && !hasFocus())) return; - TQPixmap pm( tqApp->tqclipboard()->pixmap(TQClipboard::Clipboard) ); + TQPixmap pm( tqApp->clipboard()->pixmap(TQClipboard::Clipboard) ); // if (!pm.isNull()) // setValueInternal(pm, true); if (dataSource().isEmpty()) { @@ -429,7 +429,7 @@ void KexiDBImageBox::handlePasteAction() } } - tqrepaint(); + repaint(); if (!dataSource().isEmpty()) { // emit pixmapChanged(); signalValueChanged(); @@ -455,7 +455,7 @@ void KexiDBImageBox::clear() //! @todo emit signal for setting "dirty" flag within the design // m_pixmap = TQPixmap(); //will be loaded on demand - tqrepaint(); + repaint(); if (!dataSource().isEmpty()) { // emit pixmapChanged();//valueChanged(data()); signalValueChanged(); @@ -522,17 +522,17 @@ void KexiDBImageBox::slotToggled(bool on) TQRect screen = tqApp->desktop()->availableGeometry( m_chooser ); TQPoint p; if ( TQApplication::reverseLayout() ) { - if ( (mapToGlobal( m_chooser->rect().bottomLeft() ).y() + m_popupMenu->tqsizeHint().height()) <= screen.height() ) + if ( (mapToGlobal( m_chooser->rect().bottomLeft() ).y() + m_popupMenu->sizeHint().height()) <= screen.height() ) p = m_chooser->mapToGlobal( m_chooser->rect().bottomRight() ); else - p = m_chooser->mapToGlobal( m_chooser->rect().topRight() - TQPoint( 0, m_popupMenu->tqsizeHint().height() ) ); - p.rx() -= m_popupMenu->tqsizeHint().width(); + p = m_chooser->mapToGlobal( m_chooser->rect().topRight() - TQPoint( 0, m_popupMenu->sizeHint().height() ) ); + p.rx() -= m_popupMenu->sizeHint().width(); } else { - if ( (m_chooser->mapToGlobal( m_chooser->rect().bottomLeft() ).y() + m_popupMenu->tqsizeHint().height()) <= screen.height() ) + if ( (m_chooser->mapToGlobal( m_chooser->rect().bottomLeft() ).y() + m_popupMenu->sizeHint().height()) <= screen.height() ) p = m_chooser->mapToGlobal( m_chooser->rect().bottomLeft() ); else - p = m_chooser->mapToGlobal( m_chooser->rect().topLeft() - TQPoint( 0, m_popupMenu->tqsizeHint().height() ) ); + p = m_chooser->mapToGlobal( m_chooser->rect().topLeft() - TQPoint( 0, m_popupMenu->sizeHint().height() ) ); } if (!m_popupMenu->isVisible() && on) { m_popupMenu->exec( p, -1 ); @@ -573,7 +573,7 @@ void KexiDBImageBox::updateActionStrings() (see doc/dev/settings.txt) */ beautifiedImageBoxName = beautifiedImageBoxName[0].upper() + beautifiedImageBoxName.mid(1); } - TQToolTip::add(m_chooser, i18n("Click to show actions for \"%1\" image box").tqarg(beautifiedImageBoxName)); + TQToolTip::add(m_chooser, i18n("Click to show actions for \"%1\" image box").arg(beautifiedImageBoxName)); } } } @@ -610,11 +610,11 @@ void KexiDBImageBox::setDataSource( const TQString &ds ) } if (!m_paletteBackgroundColorChanged && parentWidget()) { KexiFrame::setPaletteBackgroundColor( - dataSource().isEmpty() ? parentWidget()->paletteBackgroundColor() : tqpalette().active().base() ); + dataSource().isEmpty() ? parentWidget()->paletteBackgroundColor() : palette().active().base() ); } } -TQSize KexiDBImageBox::tqsizeHint() const +TQSize KexiDBImageBox::sizeHint() const { if (pixmap().isNull()) return TQSize(80, 80); @@ -640,7 +640,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe ) if (m_designMode && pixmap().isNull()) { TQPixmap pm(size()-TQSize(m, m)); TQPainter p2; - p2.tqbegin(TQT_TQPAINTDEVICE(&pm), this); + p2.begin(TQT_TQPAINTDEVICE(&pm), this); p2.fillRect(0,0,width(),height(), bg); updatePixmap(); @@ -665,7 +665,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe ) p2.setPen( KexiUtils::contrastColor( bg ) ); p2.drawText(pm.rect(), TQt::AlignCenter, dataSource().isEmpty() - ? TQString::tqfromLatin1(name())+"\n"+i18n("Unbound Image Box", "(unbound)") //i18n("No Image") + ? TQString::fromLatin1(name())+"\n"+i18n("Unbound Image Box", "(unbound)") //i18n("No Image") : dataSource()); p2.end(); bitBlt(this, m, m, &pm); @@ -678,7 +678,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe ) //clearing needed here because we may need to draw a pixmap with transparency p.fillRect(0,0,width(),height(), bg); - KexiUtils::drawPixmap( p, m, TQRect(TQPoint(0,0), internalSize), pixmap(), m_tqalignment, + KexiUtils::drawPixmap( p, m, TQRect(TQPoint(0,0), internalSize), pixmap(), m_alignment, m_scaledContents, m_keepAspectRatio ); } KexiFrame::drawFrame( &p ); @@ -687,7 +687,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe ) if (!m_designMode && !dataSource().isEmpty() && hasFocus() && (!m_chooser || !m_chooser->isVisible())) { tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, tqstyle().subRect(TQStyle::SR_PushButtonContents, this), - tqpalette().active() ); + palette().active() ); } } @@ -697,7 +697,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe ) if (oldPalette.active().background()!=palette().active().background()) { delete KexiDBImageBox_pm; KexiDBImageBox_pm = 0; - tqrepaint(); + repaint(); } }*/ @@ -715,11 +715,11 @@ void KexiDBImageBox::updatePixmap() } } -void KexiDBImageBox::tqsetAlignment(int tqalignment) +void KexiDBImageBox::setAlignment(int alignment) { - m_tqalignment = tqalignment; + m_alignment = alignment; if (!m_scaledContents || m_keepAspectRatio) - tqrepaint(); + repaint(); } void KexiDBImageBox::setData(const KexiBLOBBuffer::Handle& handle) @@ -737,7 +737,7 @@ void KexiDBImageBox::resizeEvent( TQResizeEvent * e ) { KexiFrame::resizeEvent(e); if (m_chooser) { - TQSize s( m_chooser->tqsizeHint() ); + TQSize s( m_chooser->sizeHint() ); TQSize margin( realLineWidth(), realLineWidth() ); s.setHeight( height() - 2*margin.height() ); s = s.boundedTo( size()-2*margin ); @@ -839,7 +839,7 @@ bool KexiDBImageBox::eventFilter( TQObject * watched, TQEvent * e ) { if (TQT_BASE_OBJECT(watched)==TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(watched)==TQT_BASE_OBJECT(m_chooser)) { //we're watching chooser as well because it's a focus proxy even if invisible if (e->type()==TQEvent::FocusIn || e->type()==TQEvent::FocusOut || e->type()==TQEvent::MouseButtonPress) { - update(); //to tqrepaint focus rect + update(); //to repaint focus rect } } // hide popup menu as soon as it loses focus diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.h b/kexi/plugins/forms/widgets/kexidbimagebox.h index 32b4e9b1..860ee4c6 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.h +++ b/kexi/plugins/forms/widgets/kexidbimagebox.h @@ -48,7 +48,7 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox : TQ_PROPERTY( uint storedPixmapId READ storedPixmapId WRITE setStoredPixmapId DESIGNABLE false STORED true ) TQ_PROPERTY( bool scaledContents READ hasScaledContents WRITE setScaledContents ) TQ_PROPERTY( bool keepAspectRatio READ keepAspectRatio WRITE setKeepAspectRatio ) - TQ_PROPERTY( int tqalignment READ tqalignment WRITE tqsetAlignment ) + TQ_PROPERTY( int alignment READ alignment WRITE setAlignment ) // TQ_PROPERTY( TQString originalFileName READ originalFileName WRITE setOriginalFileName DESIGNABLE false ) // TQ_OVERRIDE( FocusPolicy focusPolicy READ focusPolicy WRITE setFocusPolicy ) TQ_PROPERTY( bool dropDownButtonVisible READ dropDownButtonVisible WRITE setDropDownButtonVisible ) @@ -95,11 +95,11 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox : // bool designMode() const { return m_designMode; } - int tqalignment() const { return m_tqalignment; } + int alignment() const { return m_alignment; } bool keepAspectRatio() const { return m_keepAspectRatio; } - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; KexiImageContextMenu *contextMenu() const; @@ -158,7 +158,7 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox : void setScaledContents(bool set); - void tqsetAlignment(int tqalignment); + void setAlignment(int alignment); void setKeepAspectRatio(bool set); @@ -258,7 +258,7 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox : //moved KAction *m_insertFromFileAction, *m_saveAsAction, *m_cutAction, *m_copyAction, *m_pasteAction, // *m_deleteAction, *m_propertiesAction; // TQTimer m_clickTimer; - int m_tqalignment; + int m_alignment; TQ_FocusPolicy m_focusPolicyInternal; //!< Used for focusPolicyInternal() bool m_designMode : 1; bool m_readOnly : 1; diff --git a/kexi/plugins/forms/widgets/kexidblabel.cpp b/kexi/plugins/forms/widgets/kexidblabel.cpp index 2d09429e..93f35027 100644 --- a/kexi/plugins/forms/widgets/kexidblabel.cpp +++ b/kexi/plugins/forms/widgets/kexidblabel.cpp @@ -63,10 +63,10 @@ KexiDBInternalLabel::KexiDBInternalLabel( KexiDBLabel* parent ) : TQLabel( parent ) , m_parentLabel(parent) { - int a = tqalignment() | TQt::WordBreak; + int a = alignment() | TQt::WordBreak; a &= (0xffffff ^ TQt::AlignVertical_Mask); a |= TQt::AlignTop; - tqsetAlignment( a ); + setAlignment( a ); updateFrame(); } @@ -132,7 +132,7 @@ TQImage KexiDBInternalLabel::makeShadow( const TQImage& textImage, double realOpacity = SHADOW_OPACITY + TQMIN(50.0/double(256.0-tqGray(bgColor.rgb())), 50.0); //int _h, _s, _v; //.getHsv( &_h, &_s, &_v ); - if (tqcolorGroup().background()==TQt::red)//_s>=250 && _v>=250) //for colors like cyan or red, make the result more white + if (colorGroup().background()==TQt::red)//_s>=250 && _v>=250) //for colors like cyan or red, make the result more white realOpacity += 50.0; result.fill( (int)realOpacity ); result.setAlphaBuffer( true ); @@ -177,7 +177,7 @@ KPixmap KexiDBInternalLabel::getShadowPixmap() { /*! * Backup the default color used to draw text. */ - const TQColor textColor = tqcolorGroup().foreground(); + const TQColor textColor = colorGroup().foreground(); /*! * Temporary storage for the generated shadow @@ -232,7 +232,7 @@ KPixmap KexiDBInternalLabel::getShadowPixmap() { TQMIN( m_shadowRect.y() + ( m_shadowRect.height() * 3 / 2 ), shadowImage.height() ) ) ); shadowImage = makeShadow( shadowImage, - tqGray( tqcolorGroup().background().rgb() ) < 127 ? TQt::white : TQt::black, + tqGray( colorGroup().background().rgb() ) < 127 ? TQt::white : TQt::black, m_shadowRect ); if (shadowImage.isNull()) return KPixmap(); @@ -424,9 +424,9 @@ void KexiDBLabel::init() m_hasFocusableWidget = false; d->internalLabel = new KexiDBInternalLabel( this ); d->internalLabel->hide(); - d->frameColor = tqpalette().active().foreground(); + d->frameColor = palette().active().foreground(); - tqsetAlignment( d->internalLabel->tqalignment() ); + setAlignment( d->internalLabel->alignment() ); } void KexiDBLabel::updatePixmapLater() { @@ -453,7 +453,7 @@ void KexiDBLabel::updatePixmap() { d->internalLabel->setText( text() ); d->internalLabel->setFixedSize( size() ); d->internalLabel->setPalette( palette() ); - d->internalLabel->tqsetAlignment( tqalignment() ); + d->internalLabel->setAlignment( alignment() ); // d->shadowPixmap = KPixmap(); //parallel repaints won't hurt us cause incomplete pixmap KPixmap shadowPixmap = d->internalLabel->getShadowPixmap(); if (shadowPixmap.isNull()) @@ -461,7 +461,7 @@ void KexiDBLabel::updatePixmap() { d->shadowPixmap = shadowPixmap; d->shadowPosition = d->internalLabel->m_shadowRect.topLeft(); d->pixmapDirty = false; - tqrepaint(); + repaint(); } void KexiDBLabel::paintEvent( TQPaintEvent* e ) @@ -491,7 +491,7 @@ void KexiDBLabel::paintEvent( TQPaintEvent* e ) p.drawPixmap( d->internalLabel->m_shadowRect.topLeft(), d->shadowPixmap, clipRect ); } } - KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), tqalignment(), false ); + KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), alignment(), false ); TQLabel::paintEvent( e ); } @@ -577,7 +577,7 @@ void KexiDBLabel::setShadowEnabled( bool state ) { d->pixmapDirty = true; if (state) d->internalLabel->updateFrame(); - tqrepaint(); + repaint(); } void KexiDBLabel::resizeEvent( TQResizeEvent* e ) { @@ -636,7 +636,7 @@ void KexiDBLabel::setText( const TQString& text ) { TQLabel::setText( text ); //This is necessary for KexiFormDataItemInterface valueChanged(); - tqrepaint(); + repaint(); } bool KexiDBLabel::shadowEnabled() const diff --git a/kexi/plugins/forms/widgets/kexidblineedit.cpp b/kexi/plugins/forms/widgets/kexidblineedit.cpp index 5bb74e22..815adca9 100644 --- a/kexi/plugins/forms/widgets/kexidblineedit.cpp +++ b/kexi/plugins/forms/widgets/kexidblineedit.cpp @@ -331,14 +331,14 @@ void KexiDBLineEdit::setColumnInfo(KexiDB::QueryColumnInfo* cinfo) /*todo void KexiDBLineEdit::paint( TQPainter *p ) { - KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), tqalignment(), hasFocus() ); + KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), alignment(), hasFocus() ); }*/ void KexiDBLineEdit::paintEvent ( TQPaintEvent *pe ) { KLineEdit::paintEvent( pe ); TQPainter p(this); - KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), tqalignment(), hasFocus() ); + KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), alignment(), hasFocus() ); } bool KexiDBLineEdit::event( TQEvent * e ) diff --git a/kexi/plugins/forms/widgets/kexidbsubform.cpp b/kexi/plugins/forms/widgets/kexidbsubform.cpp index 9c24df4a..8b4149a9 100644 --- a/kexi/plugins/forms/widgets/kexidbsubform.cpp +++ b/kexi/plugins/forms/widgets/kexidbsubform.cpp @@ -33,7 +33,7 @@ KexiDBSubForm::KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *parent, : TQScrollView(parent, name), m_parentForm(parentForm), m_form(0), m_widget(0) { setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); - viewport()->setPaletteBackgroundColor(tqcolorGroup().mid()); + viewport()->setPaletteBackgroundColor(colorGroup().mid()); } /* void diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp index c4cbe4d0..b6ab6b03 100644 --- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp @@ -145,7 +145,7 @@ void KexiDBTextEdit::paintEvent ( TQPaintEvent *pe ) { KTextEdit::paintEvent( pe ); TQPainter p(this); - KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), tqalignment(), hasFocus() ); + KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), alignment(), hasFocus() ); } TQPopupMenu * KexiDBTextEdit::createPopupMenu(const TQPoint & pos) diff --git a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp index b136fa0d..3afa0e47 100644 --- a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp @@ -21,7 +21,7 @@ #include "kexidbtimeedit.h" #include <tqtoolbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <kpopupmenu.h> diff --git a/kexi/plugins/forms/widgets/kexiframe.cpp b/kexi/plugins/forms/widgets/kexiframe.cpp index 09266ae4..b64d6edf 100644 --- a/kexi/plugins/forms/widgets/kexiframe.cpp +++ b/kexi/plugins/forms/widgets/kexiframe.cpp @@ -48,7 +48,7 @@ KexiFrame::KexiFrame( TQWidget * parent, const char * name, WFlags f ) , d( new Private() ) { //defaults - d->frameColor = tqpalette().active().foreground(); + d->frameColor = palette().active().foreground(); //! @todo obtain these defaults from current template's style... setLineWidth(2); setFrameStyle(TQFrame::StyledPanel|TQFrame::Raised); diff --git a/kexi/plugins/forms/widgets/kexiframe.h b/kexi/plugins/forms/widgets/kexiframe.h index 2f6ca562..ce51766c 100644 --- a/kexi/plugins/forms/widgets/kexiframe.h +++ b/kexi/plugins/forms/widgets/kexiframe.h @@ -53,7 +53,7 @@ class KEXIFORMUTILS_EXPORT KexiFrame : public TQFrame GroupBoxPanel = TQFrame::GroupBoxPanel //!< rectangular group-box-like panel depending on the GUI style }; Shape frameShape() const; - void setFrameShape( KexiFrame::Shape tqshape ); + void setFrameShape( KexiFrame::Shape shape ); Shadow frameShadow() const; void setFrameShadow( KexiFrame::Shadow shadow ); #endif diff --git a/kexi/plugins/forms/widgets/kexiframeutils_p.cpp b/kexi/plugins/forms/widgets/kexiframeutils_p.cpp index 331909ee..22a71001 100644 --- a/kexi/plugins/forms/widgets/kexiframeutils_p.cpp +++ b/kexi/plugins/forms/widgets/kexiframeutils_p.cpp @@ -26,7 +26,7 @@ void ClassName::drawFrame( TQPainter *p ) if ( frameShadow() == Plain ) qDrawPlainRect( p, frameRect(), d->frameColor, lineWidth() ); else - qDrawShadeRect( p, frameRect(), tqcolorGroup(), frameShadow() == TQFrame::Sunken, + qDrawShadeRect( p, frameRect(), colorGroup(), frameShadow() == TQFrame::Sunken, lineWidth(), midLineWidth() ); } else { @@ -69,9 +69,9 @@ ClassName::Shape ClassName::frameShape() const return d->frameShape; } -void ClassName::setFrameShape( ClassName::Shape tqshape ) +void ClassName::setFrameShape( ClassName::Shape shape ) { - d->frameShape = tqshape; + d->frameShape = shape; update(); } @@ -98,7 +98,7 @@ void TQFrame::drawFrame( TQPainter *p ) p->setPen( black ); // #### p->drawRect( r ); //### a bit too simple #else - const TQColorGroup & g = tqcolorGroup(); + const TQColorGroup & g = colorGroup(); #ifndef TQT_NO_STYLE TQStyleOption opt(lineWidth(),midLineWidth()); @@ -162,24 +162,24 @@ void TQFrame::drawFrame( TQPainter *p ) case PopupPanel: #ifndef TQT_NO_STYLE { - int vextra = style().tqpixelMetric(TQStyle::PM_PopupMenuFrameVerticalExtra, this), - hextra = style().tqpixelMetric(TQStyle::PM_PopupMenuFrameHorizontalExtra, this); + int vextra = style().pixelMetric(TQStyle::PM_PopupMenuFrameVerticalExtra, this), + hextra = style().pixelMetric(TQStyle::PM_PopupMenuFrameHorizontalExtra, this); if(vextra > 0 || hextra > 0) { TQRect fr = frameRect(); int fw = frameWidth(); if(vextra > 0) { - style().tqdrawControl(TQStyle::CE_PopupMenuVerticalExtra, p, this, + style().drawControl(TQStyle::CE_PopupMenuVerticalExtra, p, this, TQRect(fr.x() + fw, fr.y() + fw, fr.width() - (fw*2), vextra), g, flags, opt); - style().tqdrawControl(TQStyle::CE_PopupMenuVerticalExtra, p, this, + style().drawControl(TQStyle::CE_PopupMenuVerticalExtra, p, this, TQRect(fr.x() + fw, fr.bottom() - fw - vextra, fr.width() - (fw*2), vextra), g, flags, opt); } if(hextra > 0) { - style().tqdrawControl(TQStyle::CE_PopupMenuHorizontalExtra, p, this, + style().drawControl(TQStyle::CE_PopupMenuHorizontalExtra, p, this, TQRect(fr.x() + fw, fr.y() + fw + vextra, hextra, fr.height() - (fw*2) - vextra), g, flags, opt); - style().tqdrawControl(TQStyle::CE_PopupMenuHorizontalExtra, p, this, + style().drawControl(TQStyle::CE_PopupMenuHorizontalExtra, p, this, TQRect(fr.right() - fw - hextra, fr.y() + fw + vextra, hextra, fr.height() - (fw*2) - vextra), g, flags, opt); } diff --git a/kexi/plugins/importexport/csv/kexicsvexport.cpp b/kexi/plugins/importexport/csv/kexicsvexport.cpp index f3347676..bbd678cc 100644 --- a/kexi/plugins/importexport/csv/kexicsvexport.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexport.cpp @@ -32,7 +32,7 @@ #include <tqcheckbox.h> #include <tqgroupbox.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <kapplication.h> #include <klocale.h> #include <kiconloader.h> @@ -252,7 +252,7 @@ bool KexiCSVExport::exportData(KexiDB::TableOrQuerySchema& tableOrQuery, } if (copyToClipboard) - kapp->tqclipboard()->setText(buffer, TQClipboard::Clipboard); + kapp->clipboard()->setText(buffer, TQClipboard::Clipboard); delete [] isText; delete [] isDateTime; diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp index 6e985901..bd5ad814 100644 --- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp @@ -32,7 +32,7 @@ #include <tqcheckbox.h> #include <tqgroupbox.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <kapplication.h> #include <klocale.h> #include <kiconloader.h> @@ -137,12 +137,12 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options, m_exportOptionsPage); connect(m_showOptionsButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotShowOptionsButtonClicked())); exportOptionsLyr->addMultiCellWidget(m_showOptionsButton, 2, 2, 0, 0); - m_showOptionsButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_showOptionsButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); // -<options section> m_exportOptionsSection = new TQGroupBox(1,Qt::Vertical, i18n("Options"), m_exportOptionsPage, "m_exportOptionsSection"); - m_exportOptionsSection->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_exportOptionsSection->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); exportOptionsLyr->addMultiCellWidget(m_exportOptionsSection, 3, 3, 0, 1); TQWidget *exportOptionsSectionWidget = new TQWidget(m_exportOptionsSection, "exportOptionsSectionWidget"); @@ -170,7 +170,7 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options, // - character encoding m_characterEncodingCombo = new KexiCharacterEncodingComboBox( exportOptionsSectionWidget ); - m_characterEncodingCombo->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_characterEncodingCombo->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); exportOptionsSectionLyr->addWidget( m_characterEncodingCombo, 2, 1 ); TQLabel *characterEncodingLabel = new TQLabel(m_characterEncodingCombo, i18n("Text encoding:"), exportOptionsSectionWidget); @@ -222,8 +222,8 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options, updateGeometry(); // -keep widths equal on page #2: - int width = TQMAX( m_infoLblFrom->leftLabel()->tqsizeHint().width(), - m_infoLblTo->leftLabel()->tqsizeHint().width()); + int width = TQMAX( m_infoLblFrom->leftLabel()->sizeHint().width(), + m_infoLblTo->leftLabel()->sizeHint().width()); m_infoLblFrom->leftLabel()->setFixedWidth(width); m_infoLblTo->leftLabel()->setFixedWidth(width); } @@ -255,9 +255,9 @@ void KexiCSVExportWizard::showPage ( TQWidget * page ) int columns = KexiDB::fieldCount(*m_tableOrQuery); text += "\n"; if (m_rowCount>0) - text += i18n("(rows: %1, columns: %2)").tqarg(m_rowCount).tqarg(columns); + text += i18n("(rows: %1, columns: %2)").arg(m_rowCount).arg(columns); else - text += i18n("(columns: %1)").tqarg(columns); + text += i18n("(columns: %1)").arg(columns); m_infoLblFrom->setLabelText(text); TQFontMetrics fm(m_infoLblFrom->fileNameLabel()->font()); m_infoLblFrom->fileNameLabel()->setFixedHeight( fm.height() * 2 + fm.lineSpacing() ); @@ -346,14 +346,14 @@ void KexiCSVExportWizard::slotShowOptionsButtonClicked() } } -void KexiCSVExportWizard::layOutButtonRow( TQHBoxLayout * tqlayout ) +void KexiCSVExportWizard::layOutButtonRow( TQHBoxLayout * layout ) { - TQWizard::layOutButtonRow( tqlayout ); + TQWizard::layOutButtonRow( layout ); - //find the last subtqlayout + //find the last sublayout TQLayout *l = 0; - for (TQLayoutIterator lit( tqlayout->iterator() ); lit.current(); ++lit) - l = lit.current()->tqlayout(); + for (TQLayoutIterator lit( layout->iterator() ); lit.current(); ++lit) + l = lit.current()->layout(); if (dynamic_cast<TQBoxLayout*>(l)) { if (!m_defaultsBtn) { m_defaultsBtn = new KPushButton(i18n("Defaults"), this); @@ -376,7 +376,7 @@ void KexiCSVExportWizard::slotDefaultsButtonClicked() static TQString convertKey(const char *key, KexiCSVExport::Mode mode) { - TQString _key(TQString::tqfromLatin1(key)); + TQString _key(TQString::fromLatin1(key)); if (mode == KexiCSVExport::Clipboard) { _key.replace("Exporting", "Copying"); _key.replace("Export", "Copy"); diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.h b/kexi/plugins/importexport/csv/kexicsvexportwizard.h index 27213159..7ef7020d 100644 --- a/kexi/plugins/importexport/csv/kexicsvexportwizard.h +++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.h @@ -62,7 +62,7 @@ class KexiCSVExportWizard : public KWizard protected: //! reimplemented to add "Defaults" button on the left hand - virtual void layOutButtonRow( TQHBoxLayout * tqlayout ); + virtual void layOutButtonRow( TQHBoxLayout * layout ); //! \return default delimiter depending on mode. TQString defaultDelimiter() const; diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index 18398d39..54890c0b 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -27,17 +27,17 @@ #include <tqbuttongroup.h> #include <tqcheckbox.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqlabel.h> #include <tqlineedit.h> #include <tqmime.h> #include <tqpushbutton.h> #include <tqradiobutton.h> #include <tqtable.h> -#include <tqlayout.h> +#include <layout.h> #include <tqfiledialog.h> #include <tqpainter.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqtimer.h> #include <tqfontmetrics.h> #include <tqtooltip.h> @@ -192,7 +192,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, setIcon(DesktopIcon(_IMPORT_ICON)); setSizeGripEnabled( TRUE ); -// m_encoding = TQString::tqfromLatin1(KGlobal::locale()->encoding()); +// m_encoding = TQString::fromLatin1(KGlobal::locale()->encoding()); // m_stripWhiteSpaceInTextValuesChecked = true; m_file = 0; m_inputStream = 0; @@ -216,7 +216,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, glyr->addMultiCellWidget( m_delimiterWidget, 1, 2, 0, 0 ); TQLabel *delimiterLabel = new TQLabel(m_delimiterWidget, i18n("Delimiter:"), page); - delimiterLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignBottom); + delimiterLabel->setAlignment(TQt::AlignAuto | TQt::AlignBottom); glyr->addMultiCellWidget( delimiterLabel, 0, 0, 0, 0 ); // Format: number, text, currency, @@ -230,7 +230,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, glyr->addMultiCellWidget( m_formatCombo, 1, 1, 1, 1 ); m_formatLabel = new TQLabel(m_formatCombo, "", page); - m_formatLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignBottom); + m_formatLabel->setAlignment(TQt::AlignAuto | TQt::AlignBottom); glyr->addWidget( m_formatLabel, 0, 1 ); m_primaryKeyField = new TQCheckBox( i18n( "Primary key" ), page, "m_primaryKeyField" ); @@ -241,20 +241,20 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, glyr->addWidget( m_comboQuote, 1, 2 ); TextLabel2 = new TQLabel( m_comboQuote, i18n( "Text quote:" ), page, "TextLabel2" ); - TextLabel2->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred ); - TextLabel2->tqsetAlignment(TQt::AlignAuto | TQt::AlignBottom); + TextLabel2->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred ); + TextLabel2->setAlignment(TQt::AlignAuto | TQt::AlignBottom); glyr->addWidget( TextLabel2, 0, 2 ); m_startAtLineSpinBox = new KIntSpinBox( page, "m_startAtLineSpinBox" ); m_startAtLineSpinBox->setMinValue(1); - m_startAtLineSpinBox->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + m_startAtLineSpinBox->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); m_startAtLineSpinBox->setMinimumWidth(TQFontMetrics(m_startAtLineSpinBox->font()).width("8888888")); glyr->addWidget( m_startAtLineSpinBox, 1, 3 ); m_startAtLineLabel = new TQLabel( m_startAtLineSpinBox, "", page, "TextLabel3" ); - m_startAtLineLabel->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred ); - m_startAtLineLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignBottom); + m_startAtLineLabel->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred ); + m_startAtLineLabel->setAlignment(TQt::AlignAuto | TQt::AlignBottom); glyr->addWidget( m_startAtLineLabel, 0, 3 ); TQSpacerItem* spacer_2 = new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Preferred ); @@ -271,7 +271,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, m_table = new KexiCSVImportDialogTable( plainPage(), "m_table" ); lyr->addWidget( m_table ); - m_table->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding, 1, 1) ); + m_table->setSizePolicy( TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding, 1, 1) ); m_table->setNumRows( 0 ); m_table->setNumCols( 0 ); @@ -280,7 +280,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, if ( m_mode == Clipboard ) { setCaption( i18n( "Inserting From Clipboard" ) ); - TQMimeSource * mime = TQApplication::tqclipboard()->data(); + TQMimeSource * mime = TQApplication::clipboard()->data(); if ( !mime ) { KMessageBox::information( this, i18n("There is no data in the clipboard.") ); @@ -294,7 +294,7 @@ if ( m_mode == Clipboard ) m_cancelled = true; return; } - m_fileArray = TQByteArray(mime->tqencodedData( "text/plain" ) ); + m_fileArray = TQByteArray(mime->encodedData( "text/plain" ) ); } else if ( mode == File ) {*/ @@ -336,11 +336,11 @@ if ( m_mode == Clipboard ) } else if (m_mode == Clipboard) { TQCString subtype("plain"); - m_clipboardData = TQApplication::tqclipboard()->text(subtype, TQClipboard::Clipboard); + m_clipboardData = TQApplication::clipboard()->text(subtype, TQClipboard::Clipboard); /* debug - for (int i=0;TQApplication::tqclipboard()->data(TQClipboard::Clipboard)->format(i);i++) + for (int i=0;TQApplication::clipboard()->data(TQClipboard::Clipboard)->format(i);i++) kdDebug() << i << ": " - << TQApplication::tqclipboard()->data(TQClipboard::Clipboard)->format(i) << endl; + << TQApplication::clipboard()->data(TQClipboard::Clipboard)->format(i) << endl; */ } else { @@ -352,7 +352,7 @@ if ( m_mode == Clipboard ) if (m_mode == File) { m_loadingProgressDlg = new KProgressDialog( this, "m_loadingProgressDlg", i18n("Loading CSV Data"), i18n("Loading CSV Data from \"%1\"...") - .tqarg(TQDir::convertSeparators(m_fname)), true); + .arg(TQDir::convertSeparators(m_fname)), true); m_loadingProgressDlg->progressBar()->setTotalSteps( m_maximumRowsForPreview+1 ); m_loadingProgressDlg->show(); } @@ -440,7 +440,7 @@ bool KexiCSVImportDialog::openData() delete m_file; m_file = 0; KMessageBox::sorry( this, i18n("Cannot open input file <nobr>\"%1\"</nobr>.") - .tqarg(TQDir::convertSeparators(m_fname)) ); + .arg(TQDir::convertSeparators(m_fname)) ); actionButton( Ok )->setEnabled( false ); m_cancelled = true; if (parentWidget()) @@ -458,7 +458,7 @@ bool KexiCSVImportDialog::cancelled() const void KexiCSVImportDialog::fillTable() { KexiUtils::WaitCursor wc(true); - tqrepaint(); + repaint(); m_blockUserEvents = true; TQPushButton *pb = actionButton(KDialogBase::Cancel); if (pb) @@ -530,16 +530,16 @@ void KexiCSVImportDialog::fillTable() m_startAtLineSpinBox->setMaxValue(count); m_startAtLineSpinBox->setValue(m_startline+1); } - m_startAtLineLabel->setText(i18n( "Start at line%1:").tqarg( - m_allRowsLoadedInPreview ? TQString(" (1-%1)").tqarg(count) + m_startAtLineLabel->setText(i18n( "Start at line%1:").arg( + m_allRowsLoadedInPreview ? TQString(" (1-%1)").arg(count) : TQString() //we do not know what's real count )); updateRowCountInfo(); m_blockUserEvents = false; - tqrepaint(); - m_table->verticalScrollBar()->tqrepaint();//avoid missing tqrepaint - m_table->horizontalScrollBar()->tqrepaint();//avoid missing tqrepaint + repaint(); + m_table->verticalScrollBar()->repaint();//avoid missing repaint + m_table->horizontalScrollBar()->repaint();//avoid missing repaint } TQString KexiCSVImportDialog::detectDelimiterByLookingAtFirstBytesOfFile(TQTextStream& inputStream) @@ -548,7 +548,7 @@ TQString KexiCSVImportDialog::detectDelimiterByLookingAtFirstBytesOfFile(TQTextS // try to detect delimiter // \t has priority, then ; then , - const TQIODevice::Offset origOffset = inputStream.tqdevice()->at(); + const TQIODevice::Offset origOffset = inputStream.device()->at(); TQChar c, prevChar=0; int detectedDelimiter = 0; bool insideQuote = false; @@ -601,7 +601,7 @@ TQString KexiCSVImportDialog::detectDelimiterByLookingAtFirstBytesOfFile(TQTextS prevChar = c; } - inputStream.tqdevice()->at(origOffset); //restore orig. offset + inputStream.device()->at(origOffset); //restore orig. offset //now, try to find a delimiter character that exists the same number of times in all the checked lines //this detection method has priority over others @@ -705,9 +705,9 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i if (x == '\r') { continue; // eat '\r', to handle RFC-compliant files } - if (offset==0 && x.tqunicode()==0xfeff) { + if (offset==0 && x.unicode()==0xfeff) { // Ignore BOM, the "Byte Order Mark" - // (http://en.wikipedia.org/wiki/Byte_Order_Mark, // http://www.tqunicode.org/charts/PDF/UFFF0.pdf) + // (http://en.wikipedia.org/wiki/Byte_Order_Mark, // http://www.unicode.org/charts/PDF/UFFF0.pdf) // Probably fixed in TQt4. continue; } @@ -882,7 +882,7 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i m_1stRowForFieldNames->setChecked(true); //this will reload table //slot1stRowForFieldNamesChanged(1); m_blockUserEvents = false; - tqrepaint(); + repaint(); return false; } @@ -926,7 +926,7 @@ void KexiCSVImportDialog::updateColumnText(int col) if (col<(int)m_columnNames.count() && (m_1stRowForFieldNames->isChecked() || m_changedColumnNames[col])) colName = m_columnNames[ col ]; if (colName.isEmpty()) { - colName = i18n("Column %1").tqarg(col+1); //will be changed to a valid identifier on import + colName = i18n("Column %1").arg(col+1); //will be changed to a valid identifier on import m_changedColumnNames[ col ] = false; } int detectedType = m_detectedTypes[col]; @@ -937,7 +937,7 @@ void KexiCSVImportDialog::updateColumnText(int col) detectedType=_TEXT_TYPE; } m_table->horizontalHeader()->setLabel(col, - i18n("Column %1").tqarg(col+1) + " \n(" + m_typeNames[ detectedType ] + ") "); + i18n("Column %1").arg(col+1) + " \n(" + m_typeNames[ detectedType ] + ") "); m_table->setText(0, col, colName); m_table->horizontalHeader()->adjustHeaderSize(); @@ -1108,8 +1108,8 @@ void KexiCSVImportDialog::setText(int row, int col, const TQString& text, bool i TQCString t(text.latin1()); const int textLen = t.length(); for (int i=0; i<textLen; i++) { - if (t.tqat(i)==',') { - t.tqat(i) = '.'; + if (t.at(i)==',') { + t.at(i) = '.'; break; } } @@ -1295,7 +1295,7 @@ void KexiCSVImportDialog::currentCellChanged(int, int col) type=_NUMBER_TYPE; //we're simplifying that for now m_formatCombo->setCurrentItem( type ); - m_formatLabel->setText( m_formatComboText.tqarg(col+1) ); + m_formatLabel->setText( m_formatComboText.arg(col+1) ); m_primaryKeyField->setEnabled( _NUMBER_TYPE == m_detectedTypes[col]); m_primaryKeyField->blockSignals(true); //block to disable executing slotPrimaryKeyFieldToggled() m_primaryKeyField->setChecked( m_primaryKeyColumn == col ); @@ -1522,7 +1522,7 @@ void KexiCSVImportDialog::accept() } m_importingProgressDlg->setLabel( i18n("Importing CSV Data from <nobr>\"%1\"</nobr> into \"%2\" table...") - .tqarg(TQDir::convertSeparators(m_fname)).tqarg(m_destinationTableSchema->name()) ); + .arg(TQDir::convertSeparators(m_fname)).arg(m_destinationTableSchema->name()) ); m_importingProgressDlg->progressBar()->setTotalSteps( TQFileInfo(*m_file).size() ); m_importingProgressDlg->show(); } @@ -1569,7 +1569,7 @@ void KexiCSVImportDialog::accept() TQDialog::accept(); KMessageBox::information(this, i18n("Data has been successfully imported to table \"%1\".") - .tqarg(m_destinationTableSchema->name())); + .arg(m_destinationTableSchema->name())); parentWidget()->raise(); m_conn = 0; } @@ -1651,12 +1651,12 @@ void KexiCSVImportDialog::updateRowCountInfo() m_infoLbl->setFileName( m_fname ); if (m_allRowsLoadedInPreview) { m_infoLbl->setCommentText( - i18n("row count", "(rows: %1)").tqarg( m_table->numRows()-1+m_startline ) ); + i18n("row count", "(rows: %1)").arg( m_table->numRows()-1+m_startline ) ); TQToolTip::remove( m_infoLbl ); } else { m_infoLbl->setCommentText( - i18n("row count", "(rows: more than %1)").tqarg( m_table->numRows()-1+m_startline ) ); + i18n("row count", "(rows: more than %1)").arg( m_table->numRows()-1+m_startline ) ); TQToolTip::add( m_infoLbl->commentLabel(), i18n("Not all rows are visible on this preview") ); } } diff --git a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp index ed1a5b30..bf64aad5 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp @@ -21,8 +21,8 @@ #include <widget/kexicharencodingcombobox.h> #include <tqlabel.h> -#include <tqlayout.h> -#include <tqtextcodec.h> +#include <layout.h> +#include <textcodec.h> #include <tqcheckbox.h> #include <kapplication.h> @@ -37,7 +37,7 @@ KexiCSVImportOptions::KexiCSVImportOptions() kapp->config()->setGroup("ImportExport"); encoding = kapp->config()->readEntry("DefaultEncodingForImportingCSVFiles"); if (encoding.isEmpty()) { - encoding = TQString::tqfromLatin1(KGlobal::locale()->encoding()); + encoding = TQString::fromLatin1(KGlobal::locale()->encoding()); defaultEncodingExplicitySet = false; } else diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp index 48d907b9..53ba28c3 100644 --- a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp +++ b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp @@ -21,7 +21,7 @@ #include <tqdir.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <klineedit.h> @@ -57,7 +57,7 @@ KexiCSVDelimiterWidget::KexiCSVDelimiterWidget( bool lineEditOnBottom, TQWidget setFocusProxy(m_combo); m_delimiterEdit = new KLineEdit( this, "m_delimiterEdit" ); -// m_delimiterEdit->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) ); +// m_delimiterEdit->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) ); m_delimiterEdit->setMaximumSize( TQSize( 30, 32767 ) ); m_delimiterEdit->setMaxLength(1); lyr->addWidget( m_delimiterEdit ); @@ -162,19 +162,19 @@ KexiCSVInfoLabel::KexiCSVInfoLabel( const TQString& labelText, TQWidget* parent vbox->addLayout(hbox); m_leftLabel = new TQLabel(labelText, this); m_leftLabel->setMinimumWidth(130); - m_leftLabel->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); - m_leftLabel->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak); + m_leftLabel->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); + m_leftLabel->setAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak); hbox->addWidget(m_leftLabel); m_iconLbl = new TQLabel(this); - m_iconLbl->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); - m_iconLbl->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft); + m_iconLbl->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); + m_iconLbl->setAlignment(TQt::AlignVCenter | TQt::AlignLeft); m_fnameLbl = new KActiveLabel(this); m_fnameLbl->setFocusPolicy(TQ_NoFocus); m_fnameLbl->setTextFormat(TQt::PlainText); - m_fnameLbl->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding,1,0)); + m_fnameLbl->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding,1,0)); m_fnameLbl->setLineWidth(1); m_fnameLbl->setFrameStyle(TQFrame::Box); - m_fnameLbl->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak); + m_fnameLbl->setAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak); hbox->addSpacing(5); hbox->addWidget(m_iconLbl); hbox->addWidget(m_fnameLbl, 1, TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak); @@ -182,10 +182,10 @@ KexiCSVInfoLabel::KexiCSVInfoLabel( const TQString& labelText, TQWidget* parent m_commentLbl = new KActiveLabel(this); m_commentLbl->setFocusPolicy(TQ_NoFocus); m_commentLbl->setTextFormat(TQt::PlainText); - m_commentLbl->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_commentLbl->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); m_commentLbl->setLineWidth(1); m_commentLbl->setFrameStyle(TQFrame::Box); - m_commentLbl->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak); + m_commentLbl->setAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak); hbox->addWidget(m_commentLbl, 0, TQt::AlignVCenter | TQt::AlignRight | TQt::WordBreak); m_separator = new TQFrame(this); diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.h b/kexi/plugins/importexport/csv/kexicsvwidgets.h index 3c420c7a..76f76d31 100644 --- a/kexi/plugins/importexport/csv/kexicsvwidgets.h +++ b/kexi/plugins/importexport/csv/kexicsvwidgets.h @@ -46,7 +46,7 @@ class KexiCSVInfoLabel : public TQWidget setFileName() can be used to display filename and setCommentAfterFileName() to display additional comment. - The widget's tqlayout can look like this: + The widget's layout can look like this: \pre [icon] [labeltext] [filename] [comment] */ diff --git a/kexi/plugins/macros/kexiactions/datatableaction.cpp b/kexi/plugins/macros/kexiactions/datatableaction.cpp index d2eb1df1..19922122 100644 --- a/kexi/plugins/macros/kexiactions/datatableaction.cpp +++ b/kexi/plugins/macros/kexiactions/datatableaction.cpp @@ -148,10 +148,10 @@ void DataTableAction::activate(KSharedPtr<KoMacro::Context> context) TQString identifier; if(! partitem.isEmpty()) { TQStringList parts = TQStringList::split(".", partitem); - KexiPart::Part* part = Kexi::partManager().partForMimeType( TQString("kexi/%1").tqarg(parts[0]) ); + KexiPart::Part* part = Kexi::partManager().partForMimeType( TQString("kexi/%1").arg(parts[0]) ); KexiPart::Item* item = part ? mainWin()->project()->item(part->info(), parts[1]) : 0; if(! item) - throw KoMacro::Exception(i18n("No such item \"%1\"").tqarg(partitem)); + throw KoMacro::Exception(i18n("No such item \"%1\"").arg(partitem)); identifier = TQString::number(item->identifier()); } @@ -178,7 +178,7 @@ void DataTableAction::activate(KSharedPtr<KoMacro::Context> context) delete dlg; } else { - throw KoMacro::Exception(i18n("No such method \"%1\"").tqarg(method)); + throw KoMacro::Exception(i18n("No such method \"%1\"").arg(method)); } } diff --git a/kexi/plugins/macros/kexiactions/executeaction.cpp b/kexi/plugins/macros/kexiactions/executeaction.cpp index ccad645c..564b03c8 100644 --- a/kexi/plugins/macros/kexiactions/executeaction.cpp +++ b/kexi/plugins/macros/kexiactions/executeaction.cpp @@ -77,17 +77,17 @@ void ExecuteAction::activate(KSharedPtr<KoMacro::Context> context) return; } - const TQString mimetype = TQString("kexi/%1").tqarg( context->variable("object")->variant().toString() ); + const TQString mimetype = TQString("kexi/%1").arg( context->variable("object")->variant().toString() ); const TQString name = context->variable("name")->variant().toString(); KexiPart::Part* part = Kexi::partManager().partForMimeType(mimetype); if(! part) { - throw KoMacro::Exception(i18n("No such mimetype \"%1\"").tqarg(mimetype)); + throw KoMacro::Exception(i18n("No such mimetype \"%1\"").arg(mimetype)); } KexiPart::Item* item = mainWin()->project()->item(part->info(), name); if(! item) { - throw KoMacro::Exception(i18n("Failed to open part \"%1\" for mimetype \"%2\"").tqarg(name).tqarg(mimetype)); + throw KoMacro::Exception(i18n("Failed to open part \"%1\" for mimetype \"%2\"").arg(name).arg(mimetype)); } part->execute(item); diff --git a/kexi/plugins/macros/kexiactions/navigateaction.cpp b/kexi/plugins/macros/kexiactions/navigateaction.cpp index bc573d10..815b8723 100644 --- a/kexi/plugins/macros/kexiactions/navigateaction.cpp +++ b/kexi/plugins/macros/kexiactions/navigateaction.cpp @@ -111,13 +111,13 @@ void NavigateAction::activate(KSharedPtr<KoMacro::Context> context) KexiViewBase* view = dialog->selectedView(); if(! view) { - throw KoMacro::Exception(i18n("No view selected for \"%1\".").tqarg(dialog->caption())); + throw KoMacro::Exception(i18n("No view selected for \"%1\".").arg(dialog->caption())); } KexiDataAwareView* dbview = dynamic_cast<KexiDataAwareView*>( view ); KexiDataAwareObjectInterface* dbobj = dbview ? dbview->dataAwareObject() : 0; if(! dbview) { - throw KoMacro::Exception(i18n("The view for \"%1\" could not handle data.").tqarg(dialog->caption())); + throw KoMacro::Exception(i18n("The view for \"%1\" could not handle data.").arg(dialog->caption())); } const TQString record = context->variable("record")->variant().toString(); @@ -151,7 +151,7 @@ void NavigateAction::activate(KSharedPtr<KoMacro::Context> context) void sortAscending(); void sortDescending(); */ - throw KoMacro::Exception(i18n("Unknown record \"%1\" in view for \"%2\".").tqarg(record).tqarg(dialog->caption())); + throw KoMacro::Exception(i18n("Unknown record \"%1\" in view for \"%2\".").arg(record).arg(dialog->caption())); } } diff --git a/kexi/plugins/macros/kexiactions/objectnamevariable.h b/kexi/plugins/macros/kexiactions/objectnamevariable.h index 419e2b00..1a0aabf8 100644 --- a/kexi/plugins/macros/kexiactions/objectnamevariable.h +++ b/kexi/plugins/macros/kexiactions/objectnamevariable.h @@ -49,7 +49,7 @@ namespace KexiMacro { return; TQStringList namelist; - KexiPart::Info* info = Kexi::partManager().infoForMimeType( TQString("kexi/%1").tqarg(objectname) ); + KexiPart::Info* info = Kexi::partManager().infoForMimeType( TQString("kexi/%1").arg(objectname) ); if(info) { KexiPart::ItemDict* items = actionimpl->mainWin()->project()->items(info); if(items) @@ -65,7 +65,7 @@ namespace KexiMacro { this->setVariant( (name.isNull() || ! namelist.contains(name)) ? namelist[0] : name ); - kdDebug()<<"##################### KexiActions::ObjectNameVariable() objectname="<<objectname<<" name="<<name<<" value="<<this->variant()<<" tqchildren="<<namelist<<endl; + kdDebug()<<"##################### KexiActions::ObjectNameVariable() objectname="<<objectname<<" name="<<name<<" value="<<this->variant()<<" children="<<namelist<<endl; } virtual ~ObjectNameVariable() {} diff --git a/kexi/plugins/macros/kexiactions/objectvariable.h b/kexi/plugins/macros/kexiactions/objectvariable.h index 83a7a471..c27f024b 100644 --- a/kexi/plugins/macros/kexiactions/objectvariable.h +++ b/kexi/plugins/macros/kexiactions/objectvariable.h @@ -72,8 +72,8 @@ namespace KexiMacro { if(! objectname.isNull()) this->setVariant( objectname ); - else if(this->tqchildren().count() > 0) - this->setVariant( this->tqchildren()[0]->variant() ); + else if(this->children().count() > 0) + this->setVariant( this->children()[0]->variant() ); else this->setVariant( TQString() ); diff --git a/kexi/plugins/macros/kexiactions/openaction.cpp b/kexi/plugins/macros/kexiactions/openaction.cpp index 9cd2e664..d7c4e7aa 100644 --- a/kexi/plugins/macros/kexiactions/openaction.cpp +++ b/kexi/plugins/macros/kexiactions/openaction.cpp @@ -53,7 +53,7 @@ namespace KexiMacro { : KexiVariable<ACTIONIMPL>(actionimpl, VIEW, i18n("View")) { TQStringList namelist; - KexiPart::Part* part = Kexi::partManager().partForMimeType( TQString("kexi/%1").tqarg(objectname) ); + KexiPart::Part* part = Kexi::partManager().partForMimeType( TQString("kexi/%1").arg(objectname) ); if(part) { int viewmodes = part->supportedViewModes(); if(viewmodes & Kexi::DataViewMode) @@ -63,7 +63,7 @@ namespace KexiMacro { if(viewmodes & Kexi::TextViewMode) namelist << TEXTVIEW; for(TQStringList::Iterator it = namelist.begin(); it != namelist.end(); ++it) - this->tqchildren().append( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) ); + this->children().append( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) ); } const TQString n = namelist.contains(viewname) @@ -124,9 +124,9 @@ void OpenAction::activate(KSharedPtr<KoMacro::Context> context) const TQString objectname = context->variable(OBJECT)->variant().toString(); const TQString name = context->variable(NAME)->variant().toString(); - KexiPart::Item* item = mainWin()->project()->itemForMimeType( TQString("kexi/%1").tqarg(objectname).latin1(), name ); + KexiPart::Item* item = mainWin()->project()->itemForMimeType( TQString("kexi/%1").arg(objectname).latin1(), name ); if(! item) { - throw KoMacro::Exception(i18n("No such object \"%1.%2\".").tqarg(objectname).tqarg(name)); + throw KoMacro::Exception(i18n("No such object \"%1.%2\".").arg(objectname).arg(name)); } // Determinate the viewmode. @@ -139,14 +139,14 @@ void OpenAction::activate(KSharedPtr<KoMacro::Context> context) else if(view == TEXTVIEW) viewmode = Kexi::TextViewMode; else { - throw KoMacro::Exception(i18n("No such viewmode \"%1\" in object \"%2.%3\".").tqarg(view).tqarg(objectname).tqarg(name)); + throw KoMacro::Exception(i18n("No such viewmode \"%1\" in object \"%2.%3\".").arg(view).arg(objectname).arg(name)); } // Try to open the object now. bool openingCancelled; if(! mainWin()->openObject(item, viewmode, openingCancelled)) { if(! openingCancelled) { - throw KoMacro::Exception(i18n("Failed to open object \"%1.%2\".").tqarg(objectname).tqarg(name)); + throw KoMacro::Exception(i18n("Failed to open object \"%1.%2\".").arg(objectname).arg(name)); } } } diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp index b7e89e9a..5406e8ca 100644 --- a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp +++ b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp @@ -158,9 +158,9 @@ KexiMacroDesignView::KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *pare ) ); // Create the tableview. - TQHBoxLayout* tqlayout = new TQHBoxLayout(this); + TQHBoxLayout* layout = new TQHBoxLayout(this); d->datatable = new KexiDataTable(mainWin(), this, "Macro KexiDataTable", false /*not db aware*/); - tqlayout->addWidget(d->datatable); + layout->addWidget(d->datatable); d->tableview = d->datatable->tableView(); d->tableview->setSpreadSheetMode(); d->tableview->setColumnStretchEnabled( true, COLUMN_ID_COMMENT ); //last column occupies the rest of the area @@ -461,10 +461,10 @@ void KexiMacroDesignView::propertyChanged(KoProperty::Set& set, KoProperty::Prop kdDebug() << "KexiMacroDesignView::propertyChanged() set existing property=" << *it << endl; KoProperty::Property& p = set.property((*it).latin1()); - KoMacro::Variable::List tqchildren = variable->tqchildren(); - if(tqchildren.count() > 0) { + KoMacro::Variable::List children = variable->children(); + if(children.count() > 0) { TQStringList keys, names; - KoMacro::Variable::List::Iterator childit(tqchildren.begin()), childend(tqchildren.end()); + KoMacro::Variable::List::Iterator childit(children.begin()), childend(children.end()); for(; childit != childend; ++childit) { const TQString s = (*childit)->variant().toString(); keys << s; diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.h b/kexi/plugins/macros/kexipart/keximacrodesignview.h index 3529ea0c..520d1799 100644 --- a/kexi/plugins/macros/kexipart/keximacrodesignview.h +++ b/kexi/plugins/macros/kexipart/keximacrodesignview.h @@ -91,7 +91,7 @@ class KexiMacroDesignView : public KexiMacroView /** * Called if a row got inserted. */ - void rowInserted(KexiTableItem* item, uint row, bool tqrepaint); + void rowInserted(KexiTableItem* item, uint row, bool repaint); /** * Called if a property in the \a KoProperty got changed. diff --git a/kexi/plugins/macros/kexipart/keximacroerror.cpp b/kexi/plugins/macros/kexipart/keximacroerror.cpp index f6422be9..25ec569f 100644 --- a/kexi/plugins/macros/kexipart/keximacroerror.cpp +++ b/kexi/plugins/macros/kexipart/keximacroerror.cpp @@ -53,14 +53,14 @@ KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, KSharedPtr<KoMacro::Cont KoMacro::Exception* exception = context->exception(); iconlbl->setPixmap(KGlobal::instance()->iconLoader()->loadIcon("messagebox_critical", KIcon::Small, 32)); - errorlbl->setText(i18n("<qt>Failed to execute the macro \"%1\".<br>%2</qt>").tqarg( context->macro()->name() ).tqarg( exception->errorMessage() )); + errorlbl->setText(i18n("<qt>Failed to execute the macro \"%1\".<br>%2</qt>").arg( context->macro()->name() ).arg( exception->errorMessage() )); int i = 1; KoMacro::MacroItem::List items = context->macro()->items(); for (KoMacro::MacroItem::List::ConstIterator mit = items.begin(); mit != items.end(); mit++) { KListViewItem* listviewitem = new KListViewItem(errorlist); - listviewitem->setText(0,TQString("%1").tqarg(i++)); + listviewitem->setText(0,TQString("%1").arg(i++)); listviewitem->setText(1,i18n("Action")); KSharedPtr<KoMacro::MacroItem> macroitem = *mit; @@ -107,7 +107,7 @@ void KexiMacroError::designbtnClicked() const TQString name = macro->name(); KexiPart::Item* item = d->mainwin->project()->itemForMimeType("kexi/macro", name); if(! item) { - kdWarning() << TQString("KexiMacroError::designbtnClicked(): No such macro \"%1\"").tqarg(name) << endl; + kdWarning() << TQString("KexiMacroError::designbtnClicked(): No such macro \"%1\"").arg(name) << endl; return; } @@ -115,7 +115,7 @@ void KexiMacroError::designbtnClicked() bool openingCancelled; if(! d->mainwin->openObject(item, Kexi::DesignViewMode, openingCancelled)) { if(! openingCancelled) { - kdWarning() << TQString("KexiMacroError::designbtnClicked(): Open macro \"%1\" in designview failed.").tqarg(name) << endl; + kdWarning() << TQString("KexiMacroError::designbtnClicked(): Open macro \"%1\" in designview failed.").arg(name) << endl; return; } } diff --git a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui index d44b8aee..05d7ba72 100644 --- a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui +++ b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui @@ -27,7 +27,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -35,7 +35,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -53,7 +53,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>48</width> <height>48</height> @@ -65,7 +65,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> @@ -87,7 +87,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -154,7 +154,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp index e67794be..73827383 100644 --- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp +++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp @@ -17,7 +17,7 @@ #include "keximacroproperty.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqlistbox.h> #include <tqpainter.h> @@ -86,7 +86,7 @@ void KexiMacroProperty::init() } //TESTCASE!!!!!!!!!!!!!!!!!!!!!! - //if(! variable->isEnabled()) qFatal( TQString("############## VARIABLE=%1").tqarg(variable->name()).latin1() ); + //if(! variable->isEnabled()) qFatal( TQString("############## VARIABLE=%1").arg(variable->name()).latin1() ); Q_ASSERT(! d->name.isNull()); m_property->setName( d->name.latin1() ); @@ -349,9 +349,9 @@ class EditListBoxItem : public ListBoxItem Q_ASSERT( m_widget != 0 ); //m_widget->reparent(listBox()->viewport(), 0, TQPoint(0,0)); m_widget->reparent(listBox(), 0, TQPoint(1,1)); - //tqlayout->addWidget(m_widget, 1); + //layout->addWidget(m_widget, 1); m_widget->setMinimumHeight(5); - m_widget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_widget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); } private: @@ -389,45 +389,45 @@ class ListBox : public TQListBox Q_ASSERT( m_edititem->widget() != 0 ); const TQString name = m_macroproperty->name(); - KoMacro::Variable::List tqchildren; + KoMacro::Variable::List children; { - KoMacro::Variable::List actiontqchildren; + KoMacro::Variable::List actionchildren; KSharedPtr<KoMacro::Variable> itemvar = m_macroproperty->macroItem()->variable(name,false); //kdDebug() << "KexiMacroProperty::ListBox::update() itemvar="<<(itemvar.data() ? "name:"+itemvar->name()+" value:"+itemvar->toString() : "NULL")<<endl; if(itemvar.data()) - actiontqchildren = itemvar->tqchildren(); + actionchildren = itemvar->children(); KSharedPtr<KoMacro::Action> action = m_edititem->action(); KSharedPtr<KoMacro::Variable> actionvar = action.data() ? action->variable(name) : KSharedPtr<KoMacro::Variable>(); //kdDebug() << "KexiMacroProperty::ListBox::update() actionvar="<<(actionvar.data() ? "name:"+actionvar->name()+" value:"+actionvar->toString() : "NULL")<<endl; if(actionvar.data()) - actiontqchildren += actionvar->tqchildren(); + actionchildren += actionvar->children(); - KoMacro::Variable::List::ConstIterator it(actiontqchildren.constBegin()), end(actiontqchildren.constEnd()); + KoMacro::Variable::List::ConstIterator it(actionchildren.constBegin()), end(actionchildren.constEnd()); for(; it != end; ++it) { if(name == (*it)->name()) { - KoMacro::Variable::List list = (*it)->tqchildren(); + KoMacro::Variable::List list = (*it)->children(); KoMacro::Variable::List::ConstIterator listit(list.constBegin()), listend(list.constEnd()); for(; listit != listend; ++listit) - tqchildren.append( *listit ); + children.append( *listit ); } } - if(tqchildren.count() <= 0) - tqchildren = actiontqchildren; + if(children.count() <= 0) + children = actionchildren; } /* - kdDebug() << "KexiMacroProperty::ListBox::update() name="<<name<<" childcount="<<tqchildren.count()<<endl; - KoMacro::Variable::List::ConstIterator listit(tqchildren.constBegin()), listend(tqchildren.constEnd()); + kdDebug() << "KexiMacroProperty::ListBox::update() name="<<name<<" childcount="<<children.count()<<endl; + KoMacro::Variable::List::ConstIterator listit(children.constBegin()), listend(children.constEnd()); for(; listit != listend; ++listit) { - kdDebug()<<" child name="<<(*listit)->name()<<" value="<<(*listit)->toString()<<" childcount="<<(*listit)->tqchildren().count()<<endl; + kdDebug()<<" child name="<<(*listit)->name()<<" value="<<(*listit)->toString()<<" childcount="<<(*listit)->children().count()<<endl; } */ - if(tqchildren.count() > 0) { - KoMacro::Variable::List::Iterator childit(tqchildren.begin()), childend(tqchildren.end()); + if(children.count() > 0) { + KoMacro::Variable::List::Iterator childit(children.begin()), childend(children.end()); for(; childit != childend; ++childit) { const TQString n = (*childit)->name(); //if(! n.startsWith("@")) continue; @@ -507,7 +507,7 @@ KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property, { kdDebug() << "KexiMacroPropertyWidget::KexiMacroPropertyWidget() Ctor" << endl; - TQHBoxLayout* tqlayout = new TQHBoxLayout(this, 0, 0); + TQHBoxLayout* layout = new TQHBoxLayout(this, 0, 0); d->macroproperty = dynamic_cast<KexiMacroProperty*>( property->customProperty() ); if(! d->macroproperty) { @@ -516,11 +516,11 @@ KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property, } d->combobox = new KComboBox(this); - tqlayout->addWidget(d->combobox); + layout->addWidget(d->combobox); d->listbox = new ListBox(d->combobox, d->macroproperty); d->combobox->setEditable(true); d->combobox->setListBox(d->listbox); - d->combobox->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + d->combobox->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); d->combobox->setMinimumHeight(5); d->combobox->setInsertionPolicy(TQComboBox::NoInsertion); d->combobox->setMinimumSize(10, 0); // to allow the combo to be resized to a small size diff --git a/kexi/plugins/macros/kexipart/keximacrotextview.cpp b/kexi/plugins/macros/kexipart/keximacrotextview.cpp index e35ee5b2..540dcc39 100644 --- a/kexi/plugins/macros/kexipart/keximacrotextview.cpp +++ b/kexi/plugins/macros/kexipart/keximacrotextview.cpp @@ -45,11 +45,11 @@ KexiMacroTextView::KexiMacroTextView(KexiMainWindow *mainwin, TQWidget *parent, : KexiMacroView(mainwin, parent, macro, "KexiMacroTextView") , d( new Private() ) { - TQHBoxLayout* tqlayout = new TQHBoxLayout(this); + TQHBoxLayout* layout = new TQHBoxLayout(this); d->editor = new KTextEdit(this); d->editor->setTextFormat(TQt::PlainText); d->editor->setWordWrap(TQTextEdit::NoWrap); - tqlayout->addWidget(d->editor); + layout->addWidget(d->editor); connect(d->editor, TQT_SIGNAL(textChanged()), this, TQT_SLOT(editorChanged())); } @@ -72,7 +72,7 @@ bool KexiMacroTextView::loadData() return false; } - kdDebug() << TQString("KexiMacroTextView::loadData()\n%1").tqarg(data) << endl; + kdDebug() << TQString("KexiMacroTextView::loadData()\n%1").arg(data) << endl; //d->editor->blockSignals(true); d->editor->setText(data); //d->editor->blockSignals(false); @@ -82,7 +82,7 @@ bool KexiMacroTextView::loadData() tristate KexiMacroTextView::storeData(bool /*dontAsk*/) { - kexipluginsdbg << TQString("KexiMacroTextView::storeData() %1 [%2]\n%3").tqarg(parentDialog()->partItem()->name()).tqarg(parentDialog()->id()).tqarg(d->editor->text()) << endl; + kexipluginsdbg << TQString("KexiMacroTextView::storeData() %1 [%2]\n%3").arg(parentDialog()->partItem()->name()).arg(parentDialog()->id()).arg(d->editor->text()) << endl; return storeDataBlock( d->editor->text() ); } diff --git a/kexi/plugins/macros/kexipart/keximacroview.cpp b/kexi/plugins/macros/kexipart/keximacroview.cpp index e9f9cd33..19e789f0 100644 --- a/kexi/plugins/macros/kexipart/keximacroview.cpp +++ b/kexi/plugins/macros/kexipart/keximacroview.cpp @@ -115,7 +115,7 @@ bool KexiMacroView::loadData() return false; } - kexipluginsdbg << TQString("KexiMacroView::loadData()\n%1").tqarg(domdoc.toString()) << endl; + kexipluginsdbg << TQString("KexiMacroView::loadData()\n%1").arg(domdoc.toString()) << endl; TQDomElement macroelem = domdoc.namedItem("macro").toElement(); if(macroelem.isNull()) { kexipluginsdbg << "KexiMacroView::loadData() Macro domelement is null" << endl; @@ -154,8 +154,8 @@ tristate KexiMacroView::storeData(bool /*dontAsk*/) TQDomElement macroelem = d->macro->toXML(); domdoc.appendChild(macroelem); const TQString xml = domdoc.toString(2); - const TQString name = TQString("%1 [%2]").tqarg(parentDialog()->partItem()->name()).tqarg(parentDialog()->id()); - kexipluginsdbg << TQString("KexiMacroView::storeData %1\n%2").tqarg(name).tqarg(xml) << endl; + const TQString name = TQString("%1 [%2]").arg(parentDialog()->partItem()->name()).arg(parentDialog()->id()); + kexipluginsdbg << TQString("KexiMacroView::storeData %1\n%2").arg(name).arg(xml) << endl; return storeDataBlock(xml); } diff --git a/kexi/plugins/macros/lib/action.cpp b/kexi/plugins/macros/lib/action.cpp index 45c03d12..fc729b57 100644 --- a/kexi/plugins/macros/lib/action.cpp +++ b/kexi/plugins/macros/lib/action.cpp @@ -81,7 +81,7 @@ Action::Action(const TQString& name, const TQString& text) Action::~Action() { - //kdDebug() << TQString("Action::~Action() name=\"%1\"").tqarg(name()) << endl; + //kdDebug() << TQString("Action::~Action() name=\"%1\"").arg(name()) << endl; // destroy the private d-pointer instance. delete d; @@ -89,7 +89,7 @@ Action::~Action() const TQString Action::toString() const { - return TQString("Action:%1").tqarg(name()); + return TQString("Action:%1").arg(name()); } const TQString Action::name() const diff --git a/kexi/plugins/macros/lib/context.cpp b/kexi/plugins/macros/lib/context.cpp index 7c0b6ee8..c0eea250 100644 --- a/kexi/plugins/macros/lib/context.cpp +++ b/kexi/plugins/macros/lib/context.cpp @@ -44,7 +44,7 @@ namespace KoMacro { KSharedPtr<Macro> macro; /** - * List of @a Action instances that are tqchildren of the + * List of @a Action instances that are children of the * macro. */ TQValueList<KSharedPtr<MacroItem > > items; @@ -70,7 +70,7 @@ namespace KoMacro { /// Constructor. explicit Private(KSharedPtr<Macro> m) : macro(m) // remember the macro - , items(m->items()) // set d-pointer tqchildren to macro tqchildren + , items(m->items()) // set d-pointer children to macro children , exception(0) // no exception yet. { } @@ -119,7 +119,7 @@ KSharedPtr<Variable> Context::variable(const TQString& name) const } } //none found throw exception - throw Exception(TQString("Variable name='%1' does not exist.").tqarg(name)); + throw Exception(TQString("Variable name='%1' does not exist.").arg(name)); } //return a map of our (d-pointer) variables @@ -132,7 +132,7 @@ Variable::Map Context::variables() const void Context::setVariable(const TQString& name, KSharedPtr<Variable> variable) { //debuging infos - kdDebug() << TQString("KoMacro::Context::setVariable name='%1' variable='%2'").tqarg(name).tqarg(variable->toString()) << endl; + kdDebug() << TQString("KoMacro::Context::setVariable name='%1' variable='%2'").arg(name).arg(variable->toString()) << endl; //Use TQMap?s replace to set/replace the variable named name d->variables.replace(name, variable); } @@ -198,14 +198,14 @@ void Context::activate(TQValueList<KSharedPtr<MacroItem > >::ConstIterator it) d->exception = new Exception(e); //add new tracemessages //the macro name - d->exception->addTraceMessage( TQString("macro=%1").tqarg(d->macro->name()) ); + d->exception->addTraceMessage( TQString("macro=%1").arg(d->macro->name()) ); //the action name - d->exception->addTraceMessage( TQString("action=%1").tqarg(action->name()) ); + d->exception->addTraceMessage( TQString("action=%1").arg(action->name()) ); //and all variables wich belong to the action/macro TQStringList variables = action->variableNames(); for(TQStringList::Iterator vit = variables.begin(); vit != variables.end(); ++vit) { KSharedPtr<Variable> v = d->macroitem->variable(*vit, true); - d->exception->addTraceMessage( TQString("%1=%2").tqarg(*vit).tqarg(v->toString()) ); + d->exception->addTraceMessage( TQString("%1=%2").arg(*vit).arg(v->toString()) ); } return; // abort execution } diff --git a/kexi/plugins/macros/lib/context.h b/kexi/plugins/macros/lib/context.h index 2bb1bef3..a7986167 100644 --- a/kexi/plugins/macros/lib/context.h +++ b/kexi/plugins/macros/lib/context.h @@ -35,7 +35,7 @@ namespace KoMacro { /** * The context of an execution. If a @a Macro got executed it creates - * an instance of this class and passes it around all it's tqchildren + * an instance of this class and passes it around all it's children * as local execution context. */ class KOMACRO_EXPORT Context diff --git a/kexi/plugins/macros/lib/exception.cpp b/kexi/plugins/macros/lib/exception.cpp index 91cfa03c..b435f2f2 100644 --- a/kexi/plugins/macros/lib/exception.cpp +++ b/kexi/plugins/macros/lib/exception.cpp @@ -56,7 +56,7 @@ Exception::Exception(const TQString& errormessage) : d( new Private(errormessage) ) // create the private d-pointer instance. { //debuging infos - kdDebug() << TQString("Exception errormessage=\"%1\"").tqarg(errormessage) << endl; + kdDebug() << TQString("Exception errormessage=\"%1\"").arg(errormessage) << endl; } //copy constructor diff --git a/kexi/plugins/macros/lib/macro.cpp b/kexi/plugins/macros/lib/macro.cpp index 6bcdc21d..808c4043 100644 --- a/kexi/plugins/macros/lib/macro.cpp +++ b/kexi/plugins/macros/lib/macro.cpp @@ -84,7 +84,7 @@ void Macro::setName(const TQString& name) //get an "extended" name const TQString Macro::toString() const { - return TQString("Macro:%1").tqarg(name()); + return TQString("Macro:%1").arg(name()); } //get (d-pointer) itemlist diff --git a/kexi/plugins/macros/lib/macro.h b/kexi/plugins/macros/lib/macro.h index 86e0122a..5e5decf8 100644 --- a/kexi/plugins/macros/lib/macro.h +++ b/kexi/plugins/macros/lib/macro.h @@ -85,7 +85,7 @@ namespace KoMacro { /** * @return a list of @a MacroItem instances which - * are tqchildren of this @a Macro . + * are children of this @a Macro . */ TQValueList< KSharedPtr<MacroItem> >& items() const; diff --git a/kexi/plugins/macros/lib/metamethod.cpp b/kexi/plugins/macros/lib/metamethod.cpp index 16b93803..05bd22c3 100644 --- a/kexi/plugins/macros/lib/metamethod.cpp +++ b/kexi/plugins/macros/lib/metamethod.cpp @@ -92,12 +92,12 @@ MetaMethod::MetaMethod(const TQString& signature, Type type, KSharedPtr<MetaObje int startpos = d->signature.find("("); int endpos = d->signature.findRev(")"); if(startpos < 0 || startpos > endpos) { - throw Exception(TQString("Invalid signature \"%1\"").tqarg(d->signature)); + throw Exception(TQString("Invalid signature \"%1\"").arg(d->signature)); } d->signaturetag = d->signature.left(startpos).stripWhiteSpace(); if(d->signaturetag.isEmpty()) { - throw Exception(TQString("Invalid tagname in signature \"%1\"").tqarg(d->signature)); + throw Exception(TQString("Invalid tagname in signature \"%1\"").arg(d->signature)); } d->signaturearguments = d->signature.mid(startpos + 1, endpos - startpos - 1).stripWhiteSpace(); @@ -108,7 +108,7 @@ MetaMethod::MetaMethod(const TQString& signature, Type type, KSharedPtr<MetaObje if(starttemplatepos >= 0 && (commapos < 0 || starttemplatepos < commapos)) { int endtemplatepos = d->signaturearguments.find(">", starttemplatepos); if(endtemplatepos <= 0) { - throw Exception(TQString("No closing template-definiton in signature \"%1\"").tqarg(d->signature)); + throw Exception(TQString("No closing template-definiton in signature \"%1\"").arg(d->signature)); } commapos = d->signaturearguments.find(",", endtemplatepos); } @@ -170,7 +170,7 @@ TQUObject* MetaMethod::toTQUObject(Variable::List arguments) uint argsize = d->arguments.size(); if(arguments.size() <= argsize) { - throw Exception(TQString("To less arguments for slot with siganture \"%1\"").tqarg(d->signature)); + throw Exception(TQString("To less arguments for slot with siganture \"%1\"").arg(d->signature)); } // The first item in the TQUObject-array is for the returnvalue @@ -188,7 +188,7 @@ TQUObject* MetaMethod::toTQUObject(Variable::List arguments) } if(metaargument->type() != variable->type()) { - throw Exception(TQString("Wrong variable type in method \"%1\". Expected \"%2\" but got \"%3\"").tqarg(d->signature).tqarg(metaargument->type()).tqarg(variable->type())); + throw Exception(TQString("Wrong variable type in method \"%1\". Expected \"%2\" but got \"%3\"").arg(d->signature).arg(metaargument->type()).arg(variable->type())); } switch(metaargument->type()) { @@ -287,7 +287,7 @@ KSharedPtr<Variable> MetaMethod::toVariable(TQUObject* uo) return new Variable(v); } - throw Exception(TQString("Invalid parameter '%1'").tqarg(desc)); + throw Exception(TQString("Invalid parameter '%1'").arg(desc)); } Variable::List MetaMethod::toVariableList(TQUObject* uo) diff --git a/kexi/plugins/macros/lib/metaobject.cpp b/kexi/plugins/macros/lib/metaobject.cpp index e9e56b44..ee865c82 100644 --- a/kexi/plugins/macros/lib/metaobject.cpp +++ b/kexi/plugins/macros/lib/metaobject.cpp @@ -77,31 +77,31 @@ TQObject* const MetaObject::object() const /* TQStrList MetaObject::signalNames() const { - return object()->tqmetaObject()->signalNames(); + return object()->metaObject()->signalNames(); } TQStrList MetaObject::slotNames() const { - return object()->tqmetaObject()->slotNames(); + return object()->metaObject()->slotNames(); } */ int MetaObject::indexOfSignal(const char* signal) const { - TQMetaObject* metaobject = object()->tqmetaObject(); + TQMetaObject* metaobject = object()->metaObject(); int signalid = metaobject->findSignal(signal, false); if(signalid < 0) { - throw Exception(TQString("Invalid signal \"%1\"").tqarg(signal)); + throw Exception(TQString("Invalid signal \"%1\"").arg(signal)); } return signalid; } int MetaObject::indexOfSlot(const char* slot) const { - TQMetaObject* metaobject = object()->tqmetaObject(); + TQMetaObject* metaobject = object()->metaObject(); int slotid = metaobject->findSlot(slot, false); if(slotid < 0) { - throw Exception(TQString("Invalid slot \"%1\"").tqarg(slot)); + throw Exception(TQString("Invalid slot \"%1\"").arg(slot)); } return slotid; } @@ -110,7 +110,7 @@ KSharedPtr<MetaMethod> MetaObject::method(int index) { TQObject* obj = object(); MetaMethod::Type type = MetaMethod::Slot; - TQMetaObject* metaobject = obj->tqmetaObject(); + TQMetaObject* metaobject = obj->metaObject(); const TQMetaData* metadata = metaobject->slot(index, true); if(! metadata) { @@ -119,13 +119,13 @@ KSharedPtr<MetaMethod> MetaObject::method(int index) metadata = metaobject->signal(index, true); if(! metadata) { - throw Exception(TQString("Invalid method index \"%1\" in object \"%2\"").tqarg(index).tqarg(obj->name())); + throw Exception(TQString("Invalid method index \"%1\" in object \"%2\"").arg(index).arg(obj->name())); } type = MetaMethod::Signal; } if(metadata->access != TQMetaData::Public) { - throw Exception(TQString("Not allowed to access method \"%1\" in object \"%2\"").tqarg(metadata->name).tqarg(obj->name())); + throw Exception(TQString("Not allowed to access method \"%1\" in object \"%2\"").arg(metadata->name).arg(obj->name())); } return new MetaMethod(metadata->name, type, this); diff --git a/kexi/plugins/macros/lib/variable.cpp b/kexi/plugins/macros/lib/variable.cpp index f64613b0..3661ef9a 100644 --- a/kexi/plugins/macros/lib/variable.cpp +++ b/kexi/plugins/macros/lib/variable.cpp @@ -58,10 +58,10 @@ namespace KoMacro { const TQObject* object; /** - * Optional list of tqchildren this @a Variable has. + * Optional list of children this @a Variable has. */ // TODO Dow we use this or is it for the future?? - Variable::List tqchildren; + Variable::List children; /** * Defines if the variable is enabled or disabled. @@ -199,7 +199,7 @@ const TQString Variable::toString() const return variant().toString(); } break; case KoMacro::MetaParameter::TypeObject: { - return TQString("[%1]").tqarg( object()->name() ); + return TQString("[%1]").arg( object()->name() ); } break; default: { throw Exception("Type is undefined."); @@ -213,24 +213,24 @@ int Variable::toInt() const return variant().toInt(); } -Variable::List Variable::tqchildren() const +Variable::List Variable::children() const { - return d->tqchildren; + return d->children; } void Variable::appendChild(KSharedPtr<Variable> variable) { - d->tqchildren.append(variable); + d->children.append(variable); } void Variable::clearChildren() { - d->tqchildren.clear(); + d->children.clear(); } -void Variable::setChildren(const Variable::List& tqchildren) +void Variable::setChildren(const Variable::List& children) { - d->tqchildren = tqchildren; + d->children = children; } /* diff --git a/kexi/plugins/macros/lib/variable.h b/kexi/plugins/macros/lib/variable.h index 108a6005..14adf09c 100644 --- a/kexi/plugins/macros/lib/variable.h +++ b/kexi/plugins/macros/lib/variable.h @@ -173,29 +173,29 @@ namespace KoMacro { /** * @return the optional list of @a Variable instances - * that are tqchildren of this @a Variable . + * that are children of this @a Variable . * * @note that the list is returned call-by-reference. The * list is accessed as getter/setter (read/write). So, * don't set this method to const! */ - List tqchildren() const; + List children() const; /** - * Append a @a Variable to the list of tqchildren this + * Append a @a Variable to the list of children this * @a Variable has. */ void appendChild(KSharedPtr<Variable> variable); /** - * Clear the list of tqchildren this @a Variable has. + * Clear the list of children this @a Variable has. */ void clearChildren(); /** - * Set the tqchildren this @a Variable has. + * Set the children this @a Variable has. */ - void setChildren(const List& tqchildren); + void setChildren(const List& children); #if 0 /** diff --git a/kexi/plugins/macros/lib/xmlhandler.cpp b/kexi/plugins/macros/lib/xmlhandler.cpp index 4894c619..5b53d51b 100644 --- a/kexi/plugins/macros/lib/xmlhandler.cpp +++ b/kexi/plugins/macros/lib/xmlhandler.cpp @@ -75,7 +75,7 @@ bool XMLHandler::parseXML(const TQDomElement& element) // We expect a <macro> element. Do we really need to be such strict or // would it be more wise to trust the application in that case? if(element.tagName() != "macro") { - kdDebug() << TQString("XMLHandler::parseXML() Invalid tagname \"%1\"").tqarg(element.tagName()) << endl; + kdDebug() << TQString("XMLHandler::parseXML() Invalid tagname \"%1\"").arg(element.tagName()) << endl; return false; } @@ -83,7 +83,7 @@ bool XMLHandler::parseXML(const TQDomElement& element) // If there is more than one version, parsing should update old macro-data, so that it // could write out in the newer version in toXML(). if( element.attribute("xmlversion") != "1"){ - kdDebug() << TQString("XMLHandler::parseXML() Invalid xml-version \"%1\"").tqarg(element.attribute("xmlversion")) << endl; + kdDebug() << TQString("XMLHandler::parseXML() Invalid xml-version \"%1\"").arg(element.attribute("xmlversion")) << endl; return false; } @@ -115,7 +115,7 @@ bool XMLHandler::parseXML(const TQDomElement& element) // Set the comment item->setComment( itemelem.attribute("comment") ); - // Iterate through the tqchildren this item has and try + // Iterate through the children this item has and try // to fill the list of variables our new MacroItem has. for(TQDomNode childnode = itemnode.firstChild(); ! childnode.isNull(); childnode = childnode.nextSibling()) { // The tagname should be "variable" @@ -156,12 +156,12 @@ TQDomElement XMLHandler::toXML() // redundancy at this point. //macroelem.setAttribute("name",d->macro->name()); - // The list of MacroItem-tqchildren a Macro provides. + // The list of MacroItem-children a Macro provides. TQValueList<KSharedPtr<MacroItem > > items = d->macro->items(); // Create an iterator... TQValueList<KSharedPtr<MacroItem > >::ConstIterator it(items.constBegin()), end(items.constEnd()); - // ...and iterate over the list of tqchildren the Macro provides. + // ...and iterate over the list of children the Macro provides. for(;it != end; ++it) { // We are iterating over MacroItem instances. KSharedPtr<MacroItem> item = *it; diff --git a/kexi/plugins/macros/tests/commontests.cpp b/kexi/plugins/macros/tests/commontests.cpp index 1086a340..bdc2e6ad 100644 --- a/kexi/plugins/macros/tests/commontests.cpp +++ b/kexi/plugins/macros/tests/commontests.cpp @@ -424,7 +424,7 @@ void CommonTests::testFunction() domdocument.setContent(TQString( "<function name=\"" + name + "\" text=\"" + text + "\" comment=\"" + comment + "\" receiver=\"" + receiver + "\" slot=\"myslot(const TQString & , int)\">" "<argument>" + argument1 + "</argument>" - "<argument>" + TQString("%1").tqarg(argument2) + "</argument>" + "<argument>" + TQString("%1").arg(argument2) + "</argument>" "</function>" )); @@ -677,7 +677,7 @@ void CommonTests::testMacro() // KOMACROTEST_ASSERT( actionptr->comment(), TQString("") ); /* //fetch the second one - KSharedPtr<KoMacro::Action> myfuncptr = tqchildren[1]; + KSharedPtr<KoMacro::Action> myfuncptr = children[1]; //cast it to function KoMacro::Function* myfunc = dynamic_cast<KoMacro::Function*>( myfuncptr.data() ); @@ -712,8 +712,8 @@ void CommonTests::testMacro() //KOMACROTEST_XASSERT((int) yanActionptr2.data(), 0); //KOMACROTEST_XASSERT((int) yanActionptr3.data(), 0); - //create a list of the tqchildren from yanMacro - //TQValueList< KSharedPtr<KoMacro::Action> > yanChildren = yanMacro->tqchildren(); + //create a list of the children from yanMacro + //TQValueList< KSharedPtr<KoMacro::Action> > yanChildren = yanMacro->children(); //check that there are two //KOMACROTEST_ASSERT(yanChildren.count(), uint(2)); /* @@ -722,9 +722,9 @@ void CommonTests::testMacro() const int oldsize = yanChildren.count(); //add a new child to the macro yanMacro->addChild(yanActionptr2); - //get the tqchildren - yanChildren = yanMacro->tqchildren(); - //get count of tqchildren + //get the children + yanChildren = yanMacro->children(); + //get count of children const int size = yanChildren.count(); //check count has changed KOMACROTEST_XASSERT(size, oldsize); @@ -735,9 +735,9 @@ void CommonTests::testMacro() const int oldsize = yanChildren.count(); //add a new child to the macro yanMacro->addChild(yanActionptr3); - //get the tqchildren - yanChildren = yanMacro->tqchildren(); - //get count of tqchildren + //get the children + yanChildren = yanMacro->children(); + //get count of children const int size = yanChildren.count(); //check count has changed KOMACROTEST_XASSERT(size, oldsize); @@ -859,12 +859,12 @@ void CommonTests::testVariables() //check that it is not null KOMACROTEST_XASSERT((int) macro, 0); - //create a list of its tqchildren - TQValueList< KSharedPtr<KoMacro::Action> > tqchildren = macro->tqchildren(); - //Check that there are two tqchildren. The first child is always the returnvalue. - KOMACROTEST_ASSERT( tqchildren.count(), uint(2) ); - //fetch the tqchildren - KSharedPtr<KoMacro::Action> func1ptr = tqchildren[1]; + //create a list of its children + TQValueList< KSharedPtr<KoMacro::Action> > children = macro->children(); + //Check that there are two children. The first child is always the returnvalue. + KOMACROTEST_ASSERT( children.count(), uint(2) ); + //fetch the children + KSharedPtr<KoMacro::Action> func1ptr = children[1]; //create new context KSharedPtr<KoMacro::Context> context = new KoMacro::Context(macroptr); diff --git a/kexi/plugins/macros/tests/komacrotestbase.h b/kexi/plugins/macros/tests/komacrotestbase.h index e301730d..ee746991 100644 --- a/kexi/plugins/macros/tests/komacrotestbase.h +++ b/kexi/plugins/macros/tests/komacrotestbase.h @@ -27,7 +27,7 @@ */ #define KOMACROTEST_ASSERT(actual, expected) \ { \ - std::cout << TQString("Testing: %1 == %2").tqarg(#actual).tqarg(#expected).latin1() << std::endl; \ + std::cout << TQString("Testing: %1 == %2").arg(#actual).arg(#expected).latin1() << std::endl; \ check( __FILE__, __LINE__, #actual, actual, expected, false ); \ if(actual != expected) \ { \ @@ -44,7 +44,7 @@ */ #define KOMACROTEST_XASSERT(actual, notexpected) \ { \ - std::cout << TQString("Testing: %1 != %2").tqarg(#actual).tqarg(#notexpected).latin1() << std::endl; \ + std::cout << TQString("Testing: %1 != %2").arg(#actual).arg(#notexpected).latin1() << std::endl; \ check( __FILE__, __LINE__, #actual, actual, notexpected, true ); \ if(actual == notexpected) \ { \ diff --git a/kexi/plugins/macros/tests/testobject.cpp b/kexi/plugins/macros/tests/testobject.cpp index e0db481e..2634d71a 100644 --- a/kexi/plugins/macros/tests/testobject.cpp +++ b/kexi/plugins/macros/tests/testobject.cpp @@ -94,7 +94,7 @@ int TestObject::myslot(const TQString&, int i) //TQString is returnvalue TQString TestObject::myslot(const TQString& s) { - TQString t = TQString("CALLED => TestObject::myslot(const TQString& s) s=%1").tqarg(s); + TQString t = TQString("CALLED => TestObject::myslot(const TQString& s) s=%1").arg(s); //be loud kdDebug() << t << endl; //add some extra Debuginfos to TestResults diff --git a/kexi/plugins/macros/tests/xmlhandlertests.cpp b/kexi/plugins/macros/tests/xmlhandlertests.cpp index 29c53831..90454d35 100644 --- a/kexi/plugins/macros/tests/xmlhandlertests.cpp +++ b/kexi/plugins/macros/tests/xmlhandlertests.cpp @@ -332,7 +332,7 @@ void XMLHandlerTests::testMaxNum() "<variable name=\"testbool\" >true</variable>" "<variable name=\"testdouble\" > %2 </variable>" "</item>" - "</macro>").tqarg(INT_MAX).tqarg(DBL_MAX); + "</macro>").arg(INT_MAX).arg(DBL_MAX); doomdocument.setContent(xml); const TQDomElement elem = doomdocument.documentElement(); KOMACROTEST_ASSERT(macro->parseXML(elem),true); @@ -362,7 +362,7 @@ void XMLHandlerTests::testMaxNum2() "<variable name=\"testbool\" >true</variable>" "<variable name=\"testdouble\" > %2 </variable>" "</item>" - "</macro>").tqarg(INT_MAX+1).tqarg(DBL_MAX+1); + "</macro>").arg(INT_MAX+1).arg(DBL_MAX+1); doomdocument.setContent(xml); const TQDomElement elem = doomdocument.documentElement(); KOMACROTEST_ASSERT(macro->parseXML(elem),true); @@ -392,7 +392,7 @@ void XMLHandlerTests::testMinNum() "<variable name=\"testbool\" >true</variable>" "<variable name=\"testdouble\" > %2 </variable>" "</item>" - "</macro>").tqarg(INT_MIN).tqarg(DBL_MIN); + "</macro>").arg(INT_MIN).arg(DBL_MIN); doomdocument.setContent(xml); const TQDomElement elem = doomdocument.documentElement(); KOMACROTEST_ASSERT(macro->parseXML(elem),true); @@ -422,7 +422,7 @@ void XMLHandlerTests::testMinNum2() "<variable name=\"testbool\" >true</variable>" "<variable name=\"testdouble\" > %2 </variable>" "</item>" - "</macro>").tqarg(INT_MIN-1).tqarg(DBL_MIN-1); + "</macro>").arg(INT_MIN-1).arg(DBL_MIN-1); doomdocument.setContent(xml); const TQDomElement elem = doomdocument.documentElement(); KOMACROTEST_ASSERT(macro->parseXML(elem),true); @@ -452,7 +452,7 @@ void XMLHandlerTests::testBigNumber() "<variable name=\"testbool\" >true</variable>" "<variable name=\"testdouble\" > %1 </variable>" "</item>" - "</macro>").tqarg(DBL_MAX+1); + "</macro>").arg(DBL_MAX+1); doomdocument.setContent(xml); const TQDomElement elem = doomdocument.documentElement(); KOMACROTEST_ASSERT(macro->parseXML(elem),true); diff --git a/kexi/plugins/macros/tests/xmlhandlertests2.cpp b/kexi/plugins/macros/tests/xmlhandlertests2.cpp index ac176f89..f32416c0 100644 --- a/kexi/plugins/macros/tests/xmlhandlertests2.cpp +++ b/kexi/plugins/macros/tests/xmlhandlertests2.cpp @@ -586,7 +586,7 @@ void XMLHandlerTests2::testMaxNum() "<variable name=\"testbool\" >true</variable>" "<variable name=\"testdouble\" > %2 </variable>" "</item>" - "</macro>").tqarg(INT_MAX).tqarg(DBL_MAX); + "</macro>").arg(INT_MAX).arg(DBL_MAX); // Set the XML-document with the above string. TQDomDocument doomdocument; doomdocument.setContent(xml); @@ -674,7 +674,7 @@ void XMLHandlerTests2::testMaxNum2() "<variable name=\"testbool\" >true</variable>" "<variable name=\"testdouble\" > %2 </variable>" "</item>" - "</macro>").tqarg(INT_MAX+1).tqarg(DBL_MAX+1); + "</macro>").arg(INT_MAX+1).arg(DBL_MAX+1); // Set the XML-document with the above string. TQDomDocument doomdocument; doomdocument.setContent(xml); @@ -762,7 +762,7 @@ void XMLHandlerTests2::testMinNum() "<variable name=\"testbool\" >true</variable>" "<variable name=\"testdouble\" > %2 </variable>" "</item>" - "</macro>").tqarg(INT_MIN).tqarg(DBL_MIN); + "</macro>").arg(INT_MIN).arg(DBL_MIN); // Set the XML-document with the above string. TQDomDocument doomdocument; doomdocument.setContent(xml); @@ -850,7 +850,7 @@ void XMLHandlerTests2::testMinNum2() "<variable name=\"testbool\" >true</variable>" "<variable name=\"testdouble\" > %2 </variable>" "</item>" - "</macro>").tqarg(INT_MIN-1).tqarg(DBL_MIN-1); + "</macro>").arg(INT_MIN-1).arg(DBL_MIN-1); // Set the XML-document with the above string. TQDomDocument doomdocument; doomdocument.setContent(xml); diff --git a/kexi/plugins/queries/kexiaddparamwidget.ui b/kexi/plugins/queries/kexiaddparamwidget.ui index a1f28a79..01a3ee3c 100644 --- a/kexi/plugins/queries/kexiaddparamwidget.ui +++ b/kexi/plugins/queries/kexiaddparamwidget.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -37,7 +37,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -50,7 +50,7 @@ <property name="text"> <string>kexi_</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -82,7 +82,7 @@ </spacer> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -105,7 +105,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> diff --git a/kexi/plugins/queries/kexiparameterlisteditor.ui b/kexi/plugins/queries/kexiparameterlisteditor.ui index e7526413..26b7d0f2 100644 --- a/kexi/plugins/queries/kexiparameterlisteditor.ui +++ b/kexi/plugins/queries/kexiparameterlisteditor.ui @@ -53,7 +53,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp index e215ab90..6425d97c 100644 --- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp +++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp @@ -20,7 +20,7 @@ #include "kexiquerydesignerguieditor.h" -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqdom.h> #include <tqregexp.h> @@ -193,8 +193,8 @@ KexiQueryDesignerGuiEditor::KexiQueryDesignerGuiEditor( addChildView(d->relations); addChildView(d->dataTable); setViewWidget(d->dataTable, true); - d->relations->tqsetSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding); - d->head->tqsetSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding); + d->relations->setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding); + d->head->setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding); updateGeometry(); d->spl->setSizes(TQValueList<int>()<< 800<<400); } @@ -388,7 +388,7 @@ KexiQueryDesignerGuiEditor::buildSchema(TQString *errMsg) d->dataTable->dataAwareObject()->setCursorPosition(i,0); if (errMsg) *errMsg = i18n("Select column for table \"%1\"") - .tqarg(it.current()->at(COLUMN_ID_TABLE).toString()); + .arg(it.current()->at(COLUMN_ID_TABLE).toString()); return false; } @@ -410,7 +410,7 @@ KexiQueryDesignerGuiEditor::buildSchema(TQString *errMsg) true/*allowRelationalOperator*/); if (!criteriaExpr) {//for sanity if (errMsg) - *errMsg = i18n("Invalid criteria \"%1\"").tqarg(criteriaStr); + *errMsg = i18n("Invalid criteria \"%1\"").arg(criteriaStr); delete whereExpr; return false; } @@ -431,7 +431,7 @@ KexiQueryDesignerGuiEditor::buildSchema(TQString *errMsg) false/*!allowRelationalOperator*/); if (!columnExpr) { if (errMsg) - *errMsg = i18n("Invalid expression \"%1\"").tqarg(fieldName); + *errMsg = i18n("Invalid expression \"%1\"").arg(fieldName); return false; } temp->query()->addExpression(columnExpr, fieldVisible); @@ -624,7 +624,7 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode) if (!m_dialog->neverSaved()) { if (!loadLayout()) { //err msg - parentDialog()->settqStatus(conn, + parentDialog()->setStatus(conn, i18n("Query definition loading failed."), i18n("Query design may be corrupted so it could not be opened even in text view.\n" "You can delete the query and create it again.")); @@ -639,7 +639,7 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode) KexiDB::ResultInfo result; showFieldsForQuery( q, result ); if (!result.success) { - parentDialog()->settqStatus(&result, i18n("Query definition loading failed.")); + parentDialog()->setStatus(&result, i18n("Query definition loading failed.")); tempData()->proposeOpeningInTextViewModeBecauseOfProblems = true; return false; } @@ -662,7 +662,7 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode) KexiDB::ResultInfo result; showFieldsAndRelationsForQuery( tempData()->query(), result ); if (!result.success) { - parentDialog()->settqStatus(&result, i18n("Query definition loading failed.")); + parentDialog()->setStatus(&result, i18n("Query definition loading failed.")); return false; } } @@ -901,7 +901,7 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal( columnAlias = query->columnAlias(row_num); if (field->isExpression()) { // if (columnAlias.isEmpty()) { -// columnAlias = i18n("expression", "expr%1").tqarg(row_num); //TODO +// columnAlias = i18n("expression", "expr%1").arg(row_num); //TODO // } // if (columnAlias.isEmpty()) //TODO: ok? perhaps do not allow to omit aliases? @@ -1074,7 +1074,7 @@ bool KexiQueryDesignerGuiEditor::loadLayout() // return false; // } if (xml.isEmpty()) { - //in a case when query tqlayout was not saved, build tqlayout by hand + //in a case when query layout was not saved, build layout by hand // -- dynamic cast because of a need for handling invalid queries // (as in KexiQueryDesignerGuiEditor::afterSwitchFrom()): KexiDB::QuerySchema * q = dynamic_cast<KexiDB::QuerySchema *>(parentDialog()->schemaData()); @@ -1083,7 +1083,7 @@ bool KexiQueryDesignerGuiEditor::loadLayout() KexiDB::ResultInfo result; showRelationsForQuery( q, result ); if (!result.success) { - parentDialog()->settqStatus(&result, i18n("Query definition loading failed.")); + parentDialog()->setStatus(&result, i18n("Query definition loading failed.")); return false; } } @@ -1177,10 +1177,10 @@ bool KexiQueryDesignerGuiEditor::storeLayout() return true; } -TQSize KexiQueryDesignerGuiEditor::tqsizeHint() const +TQSize KexiQueryDesignerGuiEditor::sizeHint() const { - TQSize s1 = d->relations->tqsizeHint(); - TQSize s2 = d->head->tqsizeHint(); + TQSize s1 = d->relations->sizeHint(); + TQSize s2 = d->head->sizeHint(); return TQSize(TQMAX(s1.width(),s2.width()), s1.height()+s2.height()); } @@ -1239,7 +1239,7 @@ void KexiQueryDesignerGuiEditor::slotNewItemAppendedForAfterDeletingInSpreadShee item->at(COLUMN_ID_VISIBLE) = TQVariant(false, 0); //the same init as in initTableRows() } -void KexiQueryDesignerGuiEditor::slotRowInserted(KexiTableItem* item, uint row, bool /*tqrepaint*/) +void KexiQueryDesignerGuiEditor::slotRowInserted(KexiTableItem* item, uint row, bool /*repaint*/) { if (d->droppedNewItem && d->droppedNewItem==item) { createPropertySet( row, d->droppedNewTable, d->droppedNewField, true ); @@ -1449,7 +1449,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int result->allowToDiscardChanges = true; result->column = colnum; result->msg = i18n("Entered column alias \"%1\" is not a valid identifier.") - .tqarg(alias.data()); + .arg(alias.data()); result->desc = i18n("Identifiers should start with a letter or '_' character"); return; } @@ -1468,7 +1468,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int result->success = false; result->allowToDiscardChanges = true; result->column = colnum; - result->msg = i18n("Invalid expression \"%1\"").tqarg(fieldName); + result->msg = i18n("Invalid expression \"%1\"").arg(fieldName); return; } } @@ -1590,7 +1590,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int result->allowToDiscardChanges = true; result->column = colnum; result->msg = i18n("Could not set sorting for multiple columns (%1)") - .tqarg(table=="*" ? table : (table+".*")); + .arg(table=="*" ? table : (table+".*")); } } else if (colnum==COLUMN_ID_CRITERIA) { @@ -1612,7 +1612,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int result->column = colnum; if (propertySet()) result->msg = i18n("Could not set criteria for \"%1\"") - .tqarg(table=="*" ? table : field); + .arg(table=="*" ? table : field); else result->msg = i18n("Could not set criteria for empty row"); //moved to result->allowToDiscardChanges handler //d->dataTable->dataAwareObject()->cancelEditor(); //prevents further editing of this cell @@ -1638,7 +1638,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int result->success = false; result->allowToDiscardChanges = true; result->column = colnum; - result->msg = i18n("Invalid criteria \"%1\"").tqarg(newValue.toString()); + result->msg = i18n("Invalid criteria \"%1\"").arg(newValue.toString()); } } } diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.h b/kexi/plugins/queries/kexiquerydesignerguieditor.h index c97c140d..f85125c6 100644 --- a/kexi/plugins/queries/kexiquerydesignerguieditor.h +++ b/kexi/plugins/queries/kexiquerydesignerguieditor.h @@ -69,7 +69,7 @@ class KexiQueryDesignerGuiEditor : public KexiViewBase KexiRelationWidget *relationView() const; - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: virtual void setFocus(); @@ -129,15 +129,15 @@ class KexiQueryDesignerGuiEditor : public KexiViewBase void slotBeforeCellChanged(KexiTableItem *item, int colnum, TQVariant& newValue, KexiDB::ResultInfo* result); - void slotRowInserted(KexiTableItem* item, uint row, bool tqrepaint); + void slotRowInserted(KexiTableItem* item, uint row, bool repaint); void slotTablePositionChanged(KexiRelationViewTableContainer*); void slotAboutConnectionRemove(KexiRelationViewConnection*); void slotTableFieldDoubleClicked( KexiDB::TableSchema* table, const TQString& fieldName ); - /*! Loads tqlayout of relation GUI diagram. */ + /*! Loads layout of relation GUI diagram. */ bool loadLayout(); - /*! Stores tqlayout of relation GUI diagram. */ + /*! Stores layout of relation GUI diagram. */ bool storeLayout(); void showTablesForQuery(KexiDB::QuerySchema *query); diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp index 37fab0e6..022b47a0 100644 --- a/kexi/plugins/queries/kexiquerydesignersql.cpp +++ b/kexi/plugins/queries/kexiquerydesignersql.cpp @@ -19,7 +19,7 @@ */ #include <tqsplitter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqhbox.h> #include <tqvbox.h> #include <tqtimer.h> @@ -73,7 +73,7 @@ class KexiQueryDesignerSQLView::Private } KexiQueryDesignerSQLEditor *editor; KexiQueryDesignerSQLHistory *history; - TQLabel *pixmaptqStatus, *lbltqStatus; + TQLabel *pixmapStatus, *lblStatus; TQHBox *status_hbox; TQVBox *history_section; KexiSectionHeader *head, *historyHead; @@ -120,18 +120,18 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi d->status_hbox->installEventFilter(this); d->splitter->setResizeMode(d->history_section, TQSplitter::KeepSize); d->status_hbox->setSpacing(0); - d->pixmaptqStatus = new TQLabel(d->status_hbox); - d->pixmaptqStatus->setFixedWidth(d->statusPixmapOk.width()*3/2); - d->pixmaptqStatus->tqsetAlignment(AlignHCenter | AlignTop); - d->pixmaptqStatus->setMargin(d->statusPixmapOk.width()/4); - d->pixmaptqStatus->setPaletteBackgroundColor( tqpalette().active().color(TQColorGroup::Base) ); - - d->lbltqStatus = new TQLabel(d->status_hbox); - d->lbltqStatus->tqsetAlignment(AlignLeft | AlignTop | WordBreak); - d->lbltqStatus->setMargin(d->statusPixmapOk.width()/4); - d->lbltqStatus->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ); - d->lbltqStatus->resize(d->lbltqStatus->width(),d->statusPixmapOk.width()*3); - d->lbltqStatus->setPaletteBackgroundColor( tqpalette().active().color(TQColorGroup::Base) ); + d->pixmapStatus = new TQLabel(d->status_hbox); + d->pixmapStatus->setFixedWidth(d->statusPixmapOk.width()*3/2); + d->pixmapStatus->setAlignment(AlignHCenter | AlignTop); + d->pixmapStatus->setMargin(d->statusPixmapOk.width()/4); + d->pixmapStatus->setPaletteBackgroundColor( palette().active().color(TQColorGroup::Base) ); + + d->lblStatus = new TQLabel(d->status_hbox); + d->lblStatus->setAlignment(AlignLeft | AlignTop | WordBreak); + d->lblStatus->setMargin(d->statusPixmapOk.width()/4); + d->lblStatus->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ); + d->lblStatus->resize(d->lblStatus->width(),d->statusPixmapOk.width()*3); + d->lblStatus->setPaletteBackgroundColor( palette().active().color(TQColorGroup::Base) ); TQHBoxLayout *b = new TQHBoxLayout(this); b->addWidget(d->splitter); @@ -171,36 +171,36 @@ KexiQueryDesignerSQLEditor *KexiQueryDesignerSQLView::editor() const void KexiQueryDesignerSQLView::setStatusOk() { - d->pixmaptqStatus->setPixmap(d->statusPixmapOk); + d->pixmapStatus->setPixmap(d->statusPixmapOk); setStatusText("<h2>"+i18n("The query is correct")+"</h2>"); d->history->addEvent(d->editor->text().stripWhiteSpace(), true, TQString()); } void KexiQueryDesignerSQLView::setStatusError(const TQString& msg) { - d->pixmaptqStatus->setPixmap(d->statusPixmapErr); + d->pixmapStatus->setPixmap(d->statusPixmapErr); setStatusText("<h2>"+i18n("The query is incorrect")+"</h2><p>"+msg+"</p>"); d->history->addEvent(d->editor->text().stripWhiteSpace(), false, msg); } void KexiQueryDesignerSQLView::setStatusEmpty() { - d->pixmaptqStatus->setPixmap(d->statusPixmapInfo); + d->pixmapStatus->setPixmap(d->statusPixmapInfo); setStatusText(i18n("Please enter your query and execute \"Check query\" function to verify it.")); } void KexiQueryDesignerSQLView::setStatusText(const TQString& text) { if (!d->action_toggle_history->isChecked()) { - TQSimpleRichText rt(text, d->lbltqStatus->font()); - rt.setWidth(d->lbltqStatus->width()); + TQSimpleRichText rt(text, d->lblStatus->font()); + rt.setWidth(d->lblStatus->width()); TQValueList<int> sz = d->splitter->sizes(); - const int newHeight = rt.height()+d->lbltqStatus->margin()*2; + const int newHeight = rt.height()+d->lblStatus->margin()*2; if (sz[1]<newHeight) { sz[1] = newHeight; d->splitter->setSizes(sz); } - d->lbltqStatus->setText(text); + d->lblStatus->setText(text); } } @@ -449,7 +449,7 @@ KexiQueryDesignerSQLView::storeNewData(const KexiDB::SchemaData& sdata, bool &ca { Q_UNUSED( cancel ); - //here: we won't store query tqlayout: it will be recreated 'by hand' in GUI Query Editor + //here: we won't store query layout: it will be recreated 'by hand' in GUI Query Editor bool queryOK = slotCheckQuery(); bool ok = true; KexiDB::SchemaData* query = 0; diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp index 7cc62620..16bfffce 100644 --- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp +++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp @@ -19,7 +19,7 @@ */ #include <tqpainter.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqregexp.h> #include <kpopupmenu.h> @@ -57,14 +57,14 @@ KexiQueryDesignerSQLHistory::drawContents(TQPainter *p, int cx, int cy, int cw, for(HistoryEntry *it = m_history->first(); it; it = m_history->next()) { // it->drawItem(p, visibleWidth()); - if(clipping.intersects(it->tqgeometry(y, visibleWidth(), fontMetrics()))) + if(clipping.intersects(it->geometry(y, visibleWidth(), fontMetrics()))) { p->saveWorldMatrix(); p->translate(0, y); - it->drawItem(p, visibleWidth(), tqcolorGroup()); + it->drawItem(p, visibleWidth(), colorGroup()); p->restoreWorldMatrix(); } - y += it->tqgeometry(y, visibleWidth(), fontMetrics()).height() + 5; + y += it->geometry(y, visibleWidth(), fontMetrics()).height() + 5; } } @@ -79,27 +79,27 @@ KexiQueryDesignerSQLHistory::contentsMousePressEvent(TQMouseEvent * e) if(it.current()->isSelected()) { //clear - it.current()->setSelected(false, tqcolorGroup()); - updateContents(it.current()->tqgeometry(y, visibleWidth(), fontMetrics())); + it.current()->setSelected(false, colorGroup()); + updateContents(it.current()->geometry(y, visibleWidth(), fontMetrics())); } - if(it.current()->tqgeometry(y, visibleWidth(), fontMetrics()).contains(e->pos())) + if(it.current()->geometry(y, visibleWidth(), fontMetrics()).contains(e->pos())) { popupHistory = it.current(); pos = y; } - y += it.current()->tqgeometry(y, visibleWidth(), fontMetrics()).height() + 5; + y += it.current()->geometry(y, visibleWidth(), fontMetrics()).height() + 5; } //now do update if (popupHistory) { if (m_selected && m_selected != popupHistory) { - m_selected->setSelected(false, tqcolorGroup()); - updateContents(m_selected->tqgeometry(pos, visibleWidth(), fontMetrics())); + m_selected->setSelected(false, colorGroup()); + updateContents(m_selected->geometry(pos, visibleWidth(), fontMetrics())); } m_selected = popupHistory; - m_selected->setSelected(true, tqcolorGroup()); - updateContents(m_selected->tqgeometry(pos, visibleWidth(), fontMetrics())); + m_selected->setSelected(true, colorGroup()); + updateContents(m_selected->geometry(pos, visibleWidth(), fontMetrics())); if(e->button() == Qt::RightButton) { m_popup->exec(e->globalPos()); } @@ -121,7 +121,7 @@ KexiQueryDesignerSQLHistory::addEvent(const TQString& q, bool s, const TQString if (he) { if (he->statement()==q) { he->updateTime(TQTime::currentTime()); - tqrepaint(); + repaint(); return; } } @@ -137,25 +137,25 @@ KexiQueryDesignerSQLHistory::addEntry(HistoryEntry *e) int y = 0; for(HistoryEntry *it = m_history->first(); it; it = m_history->next()) { - y += it->tqgeometry(y, visibleWidth(), fontMetrics()).height() + 5; + y += it->geometry(y, visibleWidth(), fontMetrics()).height() + 5; } resizeContents(visibleWidth() - 1, y); if (m_selected) { - m_selected->setSelected(false, tqcolorGroup()); + m_selected->setSelected(false, colorGroup()); } m_selected = e; - m_selected->setSelected(true, tqcolorGroup()); + m_selected->setSelected(true, colorGroup()); ensureVisible(0,y+5); updateContents(); /* ensureVisible(0, 0); if (m_selected) { - m_selected->setSelected(false, tqcolorGroup()); + m_selected->setSelected(false, colorGroup()); } m_selected = e; - m_selected->setSelected(true, tqcolorGroup()); + m_selected->setSelected(true, colorGroup()); // updateContents(); - updateContents(m_selected->tqgeometry(0, visibleWidth(), fontMetrics()));*/ + updateContents(m_selected->geometry(0, visibleWidth(), fontMetrics()));*/ } /*void @@ -180,7 +180,7 @@ KexiQueryDesignerSQLHistory::slotToClipboard() if(!m_selected) return; - TQApplication::tqclipboard()->setText(m_selected->statement(), TQClipboard::Clipboard); + TQApplication::clipboard()->setText(m_selected->statement(), TQClipboard::Clipboard); } void @@ -326,7 +326,7 @@ HistoryEntry::highlight(const TQColorGroup &cg) } else { - text = TQString("<font color=\"%1\">%2").tqarg(cg.highlightedText().name()).tqarg(statement); + text = TQString("<font color=\"%1\">%2").arg(cg.highlightedText().name()).arg(statement); } TQRegExp keywords("\\b(SELECT|UPDATE|INSERT|DELETE|DROP|FROM|WHERE|AND|OR|NOT|NULL|JOIN|LEFT|RIGHT|ON|INTO|TABLE)\\b"); @@ -334,9 +334,9 @@ HistoryEntry::highlight(const TQColorGroup &cg) text = text.replace(keywords, "<b>\\1</b>"); if(!m_error.isEmpty()) -// text += ("<br>"+i18n("Error: %1").tqarg(m_error)); -// text += TQString("<br><font face=\"") + KGlobalSettings::generalFont().family() + TQString("\" size=\"-1\">") + i18n("Error: %1").tqarg(m_error) + "</font>"; - text += TQString("<br><font face=\"") + KGlobalSettings::generalFont().family() + TQString("\">") + i18n("Error: %1").tqarg(m_error) + "</font>"; +// text += ("<br>"+i18n("Error: %1").arg(m_error)); +// text += TQString("<br><font face=\"") + KGlobalSettings::generalFont().family() + TQString("\" size=\"-1\">") + i18n("Error: %1").arg(m_error) + "</font>"; + text += TQString("<br><font face=\"") + KGlobalSettings::generalFont().family() + TQString("\">") + i18n("Error: %1").arg(m_error) + "</font>"; kdDebug() << "HistoryEntry::highlight() text:" << text << endl; // m_formated = new TQSimpleRichText(text, TQFont("courier", 8)); @@ -352,7 +352,7 @@ HistoryEntry::setSelected(bool selected, const TQColorGroup &cg) } TQRect -HistoryEntry::tqgeometry(int y, int width, TQFontMetrics f) +HistoryEntry::geometry(int y, int width, TQFontMetrics f) { Q_UNUSED( f ); diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.h b/kexi/plugins/queries/kexiquerydesignersqlhistory.h index a6d55285..6c828c39 100644 --- a/kexi/plugins/queries/kexiquerydesignersqlhistory.h +++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.h @@ -36,7 +36,7 @@ class HistoryEntry HistoryEntry(bool success, const TQTime &time, const TQString &statement, /*int y,*/ const TQString &error = TQString()); ~HistoryEntry(); - TQRect tqgeometry(int y, int width, TQFontMetrics f); + TQRect geometry(int y, int width, TQFontMetrics f); void drawItem(TQPainter *p, int width, const TQColorGroup &cg); void setSelected(bool selected, const TQColorGroup &cg); diff --git a/kexi/plugins/queries/kexiqueryview.cpp b/kexi/plugins/queries/kexiqueryview.cpp index c57224ea..1b3c16d7 100644 --- a/kexi/plugins/queries/kexiqueryview.cpp +++ b/kexi/plugins/queries/kexiqueryview.cpp @@ -83,7 +83,7 @@ tristate KexiQueryView::executeQuery(KexiDB::QuerySchema *query) } d->cursor = mainWin()->project()->dbConnection()->executeQuery(*query, params); if (!d->cursor) { - parentDialog()->settqStatus(parentDialog()->mainWin()->project()->dbConnection(), + parentDialog()->setStatus(parentDialog()->mainWin()->project()->dbConnection(), i18n("Query executing failed.")); //todo: also provide server result and sql statement return false; diff --git a/kexi/plugins/relations/kexirelationmaindlg.cpp b/kexi/plugins/relations/kexirelationmaindlg.cpp index 6c5fae1d..0e42ef80 100644 --- a/kexi/plugins/relations/kexirelationmaindlg.cpp +++ b/kexi/plugins/relations/kexirelationmaindlg.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kiconloader.h> -#include <tqlayout.h> +#include <layout.h> #include <kexidb/connection.h> @@ -61,7 +61,7 @@ KexiRelationMainDlg::~KexiRelationMainDlg() { } -TQSize KexiRelationMainDlg::tqsizeHint() const +TQSize KexiRelationMainDlg::sizeHint() const { return TQSize(600,300); } diff --git a/kexi/plugins/relations/kexirelationmaindlg.h b/kexi/plugins/relations/kexirelationmaindlg.h index a2f8ca57..69f43242 100644 --- a/kexi/plugins/relations/kexirelationmaindlg.h +++ b/kexi/plugins/relations/kexirelationmaindlg.h @@ -34,7 +34,7 @@ class KexiRelationMainDlg : public KexiViewBase KexiRelationMainDlg(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0); ~KexiRelationMainDlg(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual TQWidget* mainWidget(); diff --git a/kexi/plugins/reports/kexireportfactory.cpp b/kexi/plugins/reports/kexireportfactory.cpp index f45b30bf..7cf7dae9 100644 --- a/kexi/plugins/reports/kexireportfactory.cpp +++ b/kexi/plugins/reports/kexireportfactory.cpp @@ -139,7 +139,7 @@ KexiReportFactory::startEditing(const TQCString &c, TQWidget *w, KFormDesigner:: editText(); } else - createEditor(c, label->text(), label, container, label->tqgeometry(), label->tqalignment()); + createEditor(c, label->text(), label, container, label->geometry(), label->alignment()); return true; } return false; @@ -153,7 +153,7 @@ KexiReportFactory::isPropertyVisibleInternal(const TQCString &classname, TQWidge return false; } else if(classname == "PicLabel") { - if((property == "text") || (property == "indent") || (property == "textFormat") || (property == "font") || (property == "tqalignment")) + if((property == "text") || (property == "indent") || (property == "textFormat") || (property == "font") || (property == "alignment")) return false; } @@ -180,7 +180,7 @@ KexiReportFactory::changeText(const TQString &text) TQWidget *w = WidgetFactory::m_widget; changeProperty("text", text, m_container); - int width = w->tqsizeHint().width(); + int width = w->sizeHint().width(); if(w->width() < width) w->resize(width, w->height() ); @@ -212,7 +212,7 @@ KexiReportFactory::editText() } if(classname == "Label") - m_widget->resize(m_widget->tqsizeHint()); + m_widget->resize(m_widget->sizeHint()); } bool diff --git a/kexi/plugins/reports/kexireportform.cpp b/kexi/plugins/reports/kexireportform.cpp index 89423b03..cacf40b7 100644 --- a/kexi/plugins/reports/kexireportform.cpp +++ b/kexi/plugins/reports/kexireportform.cpp @@ -40,13 +40,13 @@ KexiReportForm::~KexiReportForm() kexipluginsdbg << "KexiReportForm::~KexiReportForm(): close" << endl; } -//tqrepaint all tqchildren widgets +//repaint all children widgets static void repaintAll(TQWidget *w) { TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING); TQObjectListIt it(*list); for (TQObject *obj; (obj=it.current()); ++it ) { - static_cast<TQWidget*>(obj)->tqrepaint(); + static_cast<TQWidget*>(obj)->repaint(); } delete list; } @@ -144,7 +144,7 @@ KexiReportForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint TQPixmap pix2 = TQPixmap::grabWidget(to); if((from != this) && (to != this)) - p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) ); + p.drawLine( from->parentWidget()->mapTo(this, from->geometry().center()), to->parentWidget()->mapTo(this, to->geometry().center()) ); p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1); p.drawPixmap(toPoint.x(), toPoint.y(), pix2); @@ -178,7 +178,7 @@ KexiReportForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint } TQSize -KexiReportForm::tqsizeHint() const +KexiReportForm::sizeHint() const { //todo: find better size (user configured?) return TQSize(400,300); diff --git a/kexi/plugins/reports/kexireportform.h b/kexi/plugins/reports/kexireportform.h index 8813a2c3..7898ec98 100644 --- a/kexi/plugins/reports/kexireportform.h +++ b/kexi/plugins/reports/kexireportform.h @@ -47,7 +47,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportForm : public TQWidget, public KFormDesig virtual void clearForm(); virtual void highlightWidgets(TQWidget *from, TQWidget *to/*, const TQPoint &p*/); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; private: /*TQString m_ds; diff --git a/kexi/plugins/scripting/kexidb/kexidbconnection.cpp b/kexi/plugins/scripting/kexidb/kexidbconnection.cpp index f64a089f..9d577ec1 100644 --- a/kexi/plugins/scripting/kexidb/kexidbconnection.cpp +++ b/kexi/plugins/scripting/kexidb/kexidbconnection.cpp @@ -102,7 +102,7 @@ const TQString KexiDBConnection::getClassName() const { if(! m_connection) throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("KexiDB::Connection is NULL.")) ); //if(m_connection->error()) - // throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("KexiDB::Connection error: %1").tqarg(m_connection->errorMsg())) ); + // throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("KexiDB::Connection error: %1").arg(m_connection->errorMsg())) ); return m_connection; } @@ -140,9 +140,9 @@ KexiDBCursor* KexiDBConnection::executeQueryString(const TQString& sqlquery) { // or e.g. a DROP TABLE operation. So, let's check for such dangerous operations right now. ::KexiDB::Parser parser( connection() ); if(! parser.parse(sqlquery)) - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to parse query: %1 %2").tqarg(parser.error().type()).tqarg(parser.error().error())) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to parse query: %1 %2").arg(parser.error().type()).arg(parser.error().error())) ); if( parser.query() == 0 || parser.operation() != ::KexiDB::Parser::OP_Select ) - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Invalid query operation \"%1\"").tqarg(parser.operationString()) ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Invalid query operation \"%1\"").arg(parser.operationString()) ) ); ::KexiDB::Cursor* cursor = connection()->executeQuery(sqlquery); return cursor ? new KexiDBCursor(cursor) : 0; } diff --git a/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp b/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp index c2475276..00b5a21d 100644 --- a/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp +++ b/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp @@ -66,7 +66,7 @@ const TQString KexiDBDriverManager::getClassName() const { KexiDB::DriverManager& KexiDBDriverManager::driverManager() { if(m_drivermanager.error()) - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("KexiDB::DriverManager error: %1").tqarg(m_drivermanager.errorMsg())) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("KexiDB::DriverManager error: %1").arg(m_drivermanager.errorMsg())) ); return m_drivermanager; } @@ -77,7 +77,7 @@ const TQStringList KexiDBDriverManager::driverNames() { KexiDBDriver* KexiDBDriverManager::driver(const TQString& drivername) { TQGuardedPtr< ::KexiDB::Driver > driver = driverManager().driver(drivername); // caching is done by the DriverManager if(! driver) return 0; - if(driver->error()) throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("KexiDB::Driver error for drivername '%1': %2").tqarg(drivername).tqarg(driver->errorMsg())) ); + if(driver->error()) throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("KexiDB::Driver error for drivername '%1': %2").arg(drivername).arg(driver->errorMsg())) ); return new KexiDBDriver(driver); } @@ -139,7 +139,7 @@ KexiDBConnectionData* KexiDBDriverManager::createConnectionDataByFile(const TQSt data->password = config.readEntry("encryptedPassword"); uint len = data->password.length(); for (uint i=0; i<len; i++) - data->password[i] = TQChar( data->password[i].tqunicode() - 47 - i ); + data->password[i] = TQChar( data->password[i].unicode() - 47 - i ); } if(data->password.isEmpty()) data->password = config.readEntry("password"); diff --git a/kexi/plugins/scripting/kexidb/kexidbschema.cpp b/kexi/plugins/scripting/kexidb/kexidbschema.cpp index 2ac40342..c45eedfc 100644 --- a/kexi/plugins/scripting/kexidb/kexidbschema.cpp +++ b/kexi/plugins/scripting/kexidb/kexidbschema.cpp @@ -179,11 +179,11 @@ bool KexiDBQuerySchema::setWhereExpression(const TQString& whereexpression) { ::KexiDB::Field* field = static_cast< ::KexiDB::QuerySchema* >(m_schema)->field(key); if(! field) - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Invalid WHERE-expression: Field \"%1\" does not exists in tableschema \"%2\".").tqarg(key).tqarg(m_schema->name())) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Invalid WHERE-expression: Field \"%1\" does not exists in tableschema \"%2\".").arg(key).arg(m_schema->name())) ); TQVariant v(value); if(! v.cast(field->variantType())) - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Invalid WHERE-expression: The for Field \"%1\" defined value is of type \"%2\" rather then the expected type \"%3\"").tqarg(key).tqarg(v.typeName()).tqarg(field->variantType())) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Invalid WHERE-expression: The for Field \"%1\" defined value is of type \"%2\" rather then the expected type \"%3\"").arg(key).arg(v.typeName()).arg(field->variantType())) ); static_cast< ::KexiDB::QuerySchema* >(m_schema)->addToWhereExpression(field,v); } diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp index 421bc31f..e9de3f46 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp @@ -28,12 +28,12 @@ #include <kross/main/scriptaction.h> #include <kross/api/interpreter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqsplitter.h> #include <tqtimer.h> #include <tqdatetime.h> #include <tqdom.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <ktextbrowser.h> #include <kdebug.h> @@ -73,8 +73,8 @@ KexiScriptDesignView::KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *pa TQSplitter* splitter = new TQSplitter(this); splitter->setOrientation(Qt::Vertical); - TQHBoxLayout* tqlayout = new TQHBoxLayout(this); - tqlayout->addWidget(splitter); + TQHBoxLayout* layout = new TQHBoxLayout(this); + layout->addWidget(splitter); d->editor = new KexiScriptEditor(mainWin, splitter, "ScriptEditor"); splitter->setFocusProxy(d->editor); @@ -191,7 +191,7 @@ void KexiScriptDesignView::slotPropertyChanged(KoProperty::Set& /*set*/, KoPrope if(property.name() == "language") { TQString language = property.value().toString(); - kdDebug() << TQString("KexiScriptDesignView::slotPropertyChanged() language=%1").tqarg(language) << endl; + kdDebug() << TQString("KexiScriptDesignView::slotPropertyChanged() language=%1").arg(language) << endl; d->scriptaction->setInterpreterName( language ); // We assume Kross and the HighlightingInterface are using same // names for the support languages... @@ -201,7 +201,7 @@ void KexiScriptDesignView::slotPropertyChanged(KoProperty::Set& /*set*/, KoPrope else { bool ok = d->scriptaction->setOption( property.name(), property.value() ); if(! ok) { - kdWarning() << TQString("KexiScriptDesignView::slotPropertyChanged() unknown property '%1'.").tqarg(TQString(property.name())) << endl; + kdWarning() << TQString("KexiScriptDesignView::slotPropertyChanged() unknown property '%1'.").arg(TQString(property.name())) << endl; return; } } @@ -214,12 +214,12 @@ void KexiScriptDesignView::execute() d->statusbrowser->clear(); TQTime time; time.start(); - d->statusbrowser->append( i18n("Execution of the script \"%1\" started.").tqarg(d->scriptaction->name()) ); + d->statusbrowser->append( i18n("Execution of the script \"%1\" started.").arg(d->scriptaction->name()) ); d->scriptaction->activate(); if( d->scriptaction->hadException() ) { TQString errormessage = d->scriptaction->getException()->getError(); - d->statusbrowser->append(TQString("<b>%2</b><br>").tqarg(TQStyleSheet::escape(errormessage)) ); + d->statusbrowser->append(TQString("<b>%2</b><br>").arg(TQStyleSheet::escape(errormessage)) ); TQString tracedetails = d->scriptaction->getException()->getTrace(); d->statusbrowser->append( TQStyleSheet::escape(tracedetails) ); @@ -229,7 +229,7 @@ void KexiScriptDesignView::execute() d->editor->setLineNo(lineno); } else { - d->statusbrowser->append( i18n("Successfully executed. Time elapsed: %1ms").tqarg(time.elapsed()) ); + d->statusbrowser->append( i18n("Successfully executed. Time elapsed: %1ms").arg(time.elapsed()) ); } } diff --git a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp index 8aec288b..08820522 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp @@ -76,7 +76,7 @@ void KexiScriptEditor::initialize(Kross::Api::ScriptAction* scriptaction) "support in Kexi. The scripting API may change in details\n" "in the next Kexi version.\n" "For more information and documentation see\n%1" - ).tqarg("http://www.kexi-project.org/scripting/"), true).join("\n# ") + "\n"; + ).arg("http://www.kexi-project.org/scripting/"), true).join("\n# ") + "\n"; } KexiEditor::setText(code); // We assume Kross and the HighlightingInterface are using same diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp index cb66734d..84fbe4ec 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp @@ -95,7 +95,7 @@ bool KexiScriptPart::execute(KexiPart::Item* item, TQObject* sender) bool exec = (dontask == "yes"); if( !exec && dontask != "no" ) { exec = KMessageBox::warningContinueCancel(0, - i18n("Do you want to execute the script \"%1\"?\n\nScripts obtained from unknown sources can contain dangerous code.").tqarg(scriptaction->text()), + i18n("Do you want to execute the script \"%1\"?\n\nScripts obtained from unknown sources can contain dangerous code.").arg(scriptaction->text()), i18n("Execute Script?"), KGuiItem(i18n("Execute"), "exec"), dontAskAgainName, KMessageBox::Notify | KMessageBox::Dangerous ) == KMessageBox::Continue; diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py index 6f75bdea..f244ae39 100644 --- a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py +++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py @@ -93,10 +93,10 @@ def runGuiApp(copycenter, name): qt.QDialog.__init__(self, parent, "ProgressDialog", 1) self.parent = parent self.setCaption(caption) - tqlayout = qt.QVBoxLayout(self) + layout = qt.QVBoxLayout(self) box = qt.QVBox(self) box.setMargin(2) - tqlayout.addWidget(box) + layout.addWidget(box) self.listview = qt.QListView(box) self.listview.setAllColumnsShowFocus(True) self.listview.header().setStretchEnabled(True,0) @@ -216,7 +216,7 @@ def runGuiApp(copycenter, name): print "CopyJobWidget.writeOptions" writer.write("<%s plugin=\"%s\">\n" % (plugininst.plugintype, pluginname)) for optionname in plugininst.options: - value = self.escape( tqunicode(plugininst.options[optionname]).encode("utf-8") ) + value = self.escape( unicode(plugininst.options[optionname]).encode("utf-8") ) writer.write("\t<%s value=\"%s\" />\n" % (optionname,value)) writer.write("</%s>\n" % plugininst.plugintype) @@ -309,31 +309,31 @@ def runGuiApp(copycenter, name): self.starttime = None qt.QDialog.__init__(self, dialog, "ProgressDialog", 1) self.setCaption("Copying...") - tqlayout = qt.QVBoxLayout(self) + layout = qt.QVBoxLayout(self) box = qt.QVBox(self) box.setSpacing(6) box.setMargin(6) - tqlayout.addWidget(box) + layout.addWidget(box) self.textbrowser = qt.QTextBrowser(box) self.textbrowser.setWordWrap(qt.QTextEdit.WidgetWidth) self.textbrowser.setTextFormat(qt.Qt.RichText) statusbox = qt.QFrame(box) - tqlayout = qt.QGridLayout(statusbox,4,2,0,2) - tqlayout.addWidget(qt.QLabel("Number of records done:",statusbox),0,0) + layout = qt.QGridLayout(statusbox,4,2,0,2) + layout.addWidget(qt.QLabel("Number of records done:",statusbox),0,0) self.donecounter = 0 self.donelabel = qt.QLabel("-",statusbox) - tqlayout.addWidget(self.donelabel,0,1) - tqlayout.addWidget(qt.QLabel("Successfully copied records:",statusbox),1,0) + layout.addWidget(self.donelabel,0,1) + layout.addWidget(qt.QLabel("Successfully copied records:",statusbox),1,0) self.successcounter = 0 self.successlabel = qt.QLabel("-",statusbox) - tqlayout.addWidget(self.successlabel,1,1) - tqlayout.addWidget(qt.QLabel("Failed to copy records:",statusbox),2,0) + layout.addWidget(self.successlabel,1,1) + layout.addWidget(qt.QLabel("Failed to copy records:",statusbox),2,0) self.failedcounter = 0 self.failedlabel = qt.QLabel("-",statusbox) - tqlayout.addWidget(self.failedlabel,2,1) - tqlayout.addWidget(qt.QLabel("Elapsed time in seconds:",statusbox),3,0) + layout.addWidget(self.failedlabel,2,1) + layout.addWidget(qt.QLabel("Elapsed time in seconds:",statusbox),3,0) self.elapsedlabel = qt.QLabel("-",statusbox) - tqlayout.addWidget(self.elapsedlabel,3,1) + layout.addWidget(self.elapsedlabel,3,1) btnbox = qt.QHBox(box) btnbox.setSpacing(6) self.donebtn = qt.QPushButton(btnbox) @@ -530,11 +530,11 @@ def runGuiApp(copycenter, name): self.ListViewDialog = ListViewDialog qt.QDialog.__init__(self, parent, "Dialog", 1, qt.Qt.WDestructiveClose) self.setCaption("Copy Center") - tqlayout = qt.QVBoxLayout(self) + layout = qt.QVBoxLayout(self) box = qt.QVBox(self) box.setMargin(6) box.setSpacing(6) - tqlayout.addWidget(box) + layout.addWidget(box) self.tab = qt.QTabWidget(box) self.tab.setMargin(6) box.setStretchFactor(self.tab,1) diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py index 678cf40b..985d757d 100644 --- a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py +++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py @@ -84,7 +84,7 @@ class CopyCenterPlugin: return None record = [] for fieldname in self.fieldlist: - record.append( tqunicode(self.cursor.value(fieldname).toString()).encode("latin-1") ) + record.append( unicode(self.cursor.value(fieldname).toString()).encode("latin-1") ) #print "read record: %s" % record return record @@ -145,8 +145,8 @@ class CopyCenterPlugin: cursorrecord.setValue(self.fieldlist[i], v) rowcount = self.cursor.insert() if rowcount < 1: - drv = tqunicode(self.cursor.lastError().driverText()).encode("latin-1") - db = tqunicode(self.cursor.lastError().databaseText()).encode("latin-1") + drv = unicode(self.cursor.lastError().driverText()).encode("latin-1") + db = unicode(self.cursor.lastError().databaseText()).encode("latin-1") print "failed: %s %s" % (drv,db) self.copierer.writeFailed(record) else: diff --git a/kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py b/kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py index d0d1f0cc..cace0340 100644 --- a/kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py +++ b/kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py @@ -131,7 +131,7 @@ class HtmlExporter: if items == None: break output.write("<tr>") for item in items: - u = tqunicode(str(self.htmlescape(item)),"latin-1") + u = unicode(str(self.htmlescape(item)),"latin-1") output.write("<td>%s</td>" % u.encode("utf-8")) output.write("</tr>\n") output.write("</table>\n") diff --git a/kexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py b/kexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py index 6ca94f9a..200b3dee 100755 --- a/kexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py +++ b/kexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py @@ -124,9 +124,9 @@ class SaxInput: was parsed. """ if self.field != None: - # the xml-data is tqunicode and we need to encode it + # the xml-data is unicode and we need to encode it # to latin-1 cause KexiDB deals only with latin-1. - u = tqunicode(chars[offset:offset+length]) + u = unicode(chars[offset:offset+length]) self.field.append(u.encode("latin-1")) # start the job diff --git a/kexi/plugins/tables/kexilookupcolumnpage.cpp b/kexi/plugins/tables/kexilookupcolumnpage.cpp index 443f26d4..d47f0226 100644 --- a/kexi/plugins/tables/kexilookupcolumnpage.cpp +++ b/kexi/plugins/tables/kexilookupcolumnpage.cpp @@ -20,7 +20,7 @@ #include "kexilookupcolumnpage.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqheader.h> @@ -142,10 +142,10 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent) TQHBoxLayout *hlyr = new TQHBoxLayout(contentsVlyr); d->rowSourceLabel = new TQLabel(i18n("Row source:"), contents); - d->rowSourceLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + d->rowSourceLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); d->rowSourceLabel->setMargin(2); d->rowSourceLabel->setMinimumHeight(IconSize(KIcon::Small)+4); - d->rowSourceLabel->tqsetAlignment(TQt::AlignLeft|TQt::AlignBottom); + d->rowSourceLabel->setAlignment(TQt::AlignLeft|TQt::AlignBottom); hlyr->addWidget(d->rowSourceLabel); d->gotoRowSourceButton = new KexiSmallToolButton(contents, TQString(), "goto", "gotoRowSourceButton"); @@ -170,10 +170,10 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent) //- Bound Column hlyr = new TQHBoxLayout(contentsVlyr); d->boundColumnLabel = new TQLabel(i18n("Bound column:"), contents); - d->boundColumnLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + d->boundColumnLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); d->boundColumnLabel->setMargin(2); d->boundColumnLabel->setMinimumHeight(IconSize(KIcon::Small)+4); - d->boundColumnLabel->tqsetAlignment(TQt::AlignLeft|TQt::AlignBottom); + d->boundColumnLabel->setAlignment(TQt::AlignLeft|TQt::AlignBottom); hlyr->addWidget(d->boundColumnLabel); d->clearBoundColumnButton = new KexiSmallToolButton(contents, TQString(), @@ -192,10 +192,10 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent) //- Visible Column hlyr = new TQHBoxLayout(contentsVlyr); d->visibleColumnLabel = new TQLabel(i18n("Visible column:"), contents); - d->visibleColumnLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + d->visibleColumnLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); d->visibleColumnLabel->setMargin(2); d->visibleColumnLabel->setMinimumHeight(IconSize(KIcon::Small)+4); - d->visibleColumnLabel->tqsetAlignment(TQt::AlignLeft|TQt::AlignBottom); + d->visibleColumnLabel->setAlignment(TQt::AlignLeft|TQt::AlignBottom); hlyr->addWidget(d->visibleColumnLabel); d->clearVisibleColumnButton = new KexiSmallToolButton(contents, TQString(), diff --git a/kexi/plugins/tables/kexitabledesignercommands.cpp b/kexi/plugins/tables/kexitabledesignercommands.cpp index 298363c4..a019eac2 100644 --- a/kexi/plugins/tables/kexitabledesignercommands.cpp +++ b/kexi/plugins/tables/kexitabledesignercommands.cpp @@ -18,7 +18,7 @@ */ #include <tqdom.h> #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqsplitter.h> #include <tqmetaobject.h> @@ -72,8 +72,8 @@ ChangeFieldPropertyCommand::~ChangeFieldPropertyCommand() TQString ChangeFieldPropertyCommand::name() const { return i18n("Change \"%1\" property for table field from \"%2\" to \"%3\"") - .tqarg(m_alterTableAction.propertyName()).tqarg(m_oldValue.toString()) - .tqarg(m_alterTableAction.newValue().toString()); + .arg(m_alterTableAction.propertyName()).arg(m_oldValue.toString()) + .arg(m_alterTableAction.newValue().toString()); } TQString ChangeFieldPropertyCommand::debugString() @@ -81,15 +81,15 @@ TQString ChangeFieldPropertyCommand::debugString() TQString s( name() ); if (m_oldListData || m_listData) s += TQString("\nAnd list data from [%1]\n to [%2]") - .tqarg( m_oldListData ? + .arg( m_oldListData ? TQString("%1 -> %2") - .tqarg(m_oldListData->keysAsStringList().join(",")).tqarg(m_oldListData->names.join(",")) + .arg(m_oldListData->keysAsStringList().join(",")).arg(m_oldListData->names.join(",")) : TQString("<NONE>")) - .tqarg( m_listData ? + .arg( m_listData ? TQString("%1 -> %2") - .tqarg(m_listData->keysAsStringList().join(",")).tqarg(m_listData->names.join(",")) + .arg(m_listData->keysAsStringList().join(",")).arg(m_listData->names.join(",")) : TQString("<NONE>")); - return s + TQString(" (UID=%1)").tqarg(m_alterTableAction.uid()); + return s + TQString(" (UID=%1)").arg(m_alterTableAction.uid()); } void ChangeFieldPropertyCommand::execute() @@ -136,9 +136,9 @@ RemoveFieldCommand::~RemoveFieldCommand() TQString RemoveFieldCommand::name() const { if (m_set) - return i18n("Remove table field \"%1\"").tqarg(m_alterTableAction.fieldName()); + return i18n("Remove table field \"%1\"").arg(m_alterTableAction.fieldName()); - return TQString("Remove empty row at position %1").tqarg(m_fieldIndex); + return TQString("Remove empty row at position %1").arg(m_fieldIndex); } void RemoveFieldCommand::execute() @@ -161,7 +161,7 @@ TQString RemoveFieldCommand::debugString() return name() + "\nAT ROW " + TQString::number(m_fieldIndex) + ", FIELD: " + (*m_set)["caption"].value().toString() - + TQString(" (UID=%1)").tqarg(m_alterTableAction.uid()); + + TQString(" (UID=%1)").arg(m_alterTableAction.uid()); } KexiDB::AlterTableHandler::ActionBase* RemoveFieldCommand::createAction() @@ -192,7 +192,7 @@ InsertFieldCommand::~InsertFieldCommand() TQString InsertFieldCommand::name() const { - return i18n("Insert table field \"%1\"").tqarg(m_set["caption"].value().toString()); + return i18n("Insert table field \"%1\"").arg(m_set["caption"].value().toString()); } void InsertFieldCommand::execute() @@ -229,9 +229,9 @@ ChangePropertyVisibilityCommand::~ChangePropertyVisibilityCommand() TQString ChangePropertyVisibilityCommand::name() const { return TQString("[internal] Change \"%1\" visibility from \"%2\" to \"%3\"") - .tqarg(m_alterTableAction.propertyName()) - .tqarg(m_oldVisibility ? "true" : "false") - .tqarg(m_alterTableAction.newValue().toBool() ? "true" : "false"); + .arg(m_alterTableAction.propertyName()) + .arg(m_oldVisibility ? "true" : "false") + .arg(m_alterTableAction.newValue().toBool() ? "true" : "false"); } void ChangePropertyVisibilityCommand::execute() @@ -265,7 +265,7 @@ InsertEmptyRowCommand::~InsertEmptyRowCommand() TQString InsertEmptyRowCommand::name() const { - return TQString("Insert empty row at position %1").tqarg(m_row); + return TQString("Insert empty row at position %1").arg(m_row); } void InsertEmptyRowCommand::execute() diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp index 84ea686c..0563cde3 100644 --- a/kexi/plugins/tables/kexitabledesignerview.cpp +++ b/kexi/plugins/tables/kexitabledesignerview.cpp @@ -22,7 +22,7 @@ #include "kexilookupcolumnpage.h" #include "kexitabledesignercommands.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqsplitter.h> @@ -168,7 +168,7 @@ KexiTableDesignerView::KexiTableDesignerView(KexiMainWindow *win, TQWidget *pare connect(d->data, TQT_SIGNAL(aboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)), TQT_TQOBJECT(this), TQT_SLOT(slotAboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool))); - setMinimumSize(d->view->tqminimumSizeHint().width(), d->view->tqminimumSizeHint().height()); + setMinimumSize(d->view->minimumSizeHint().width(), d->view->minimumSizeHint().height()); d->view->setFocus(); d->sets = new KexiDataAwarePropertySet( this, d->view ); @@ -495,11 +495,11 @@ void KexiTableDesignerView::slotTogglePrimaryKey() /* CommandGroup *setPrimaryKeyCommand; if (isSet) { setPrimaryKeyCommand = new CommandGroup(i18n("Set primary key for field \"%1\"") - .tqarg(set["name"].value().toString()) ); + .arg(set["name"].value().toString()) ); } else { setPrimaryKeyCommand = new CommandGroup(i18n("Unset primary key for field \"%1\"") - .tqarg(set["name"].value().toString()) ); + .arg(set["name"].value().toString()) ); } switchPrimaryKey(set, isSet, false, setPrimaryKeyCommand);*/ //addHistoryCommand( setPrimaryKeyCommand, false /* !execute */ ); @@ -687,8 +687,8 @@ void KexiTableDesignerView::slotBeforeCellChanged( //remember this action containing 2 subactions CommandGroup *changeCaptionAndNameCommand = new CommandGroup( i18n("Change \"%1\" field's name to \"%2\" and caption from \"%3\" to \"%4\"") - .tqarg(oldName).tqarg(propertySetForItem->property("name").value().toString()) - .tqarg(oldCaption).tqarg(newValue.toString() )); + .arg(oldName).arg(propertySetForItem->property("name").value().toString()) + .arg(oldCaption).arg(newValue.toString() )); changeCaptionAndNameCommand->addCommand( changeCaptionCommand ); // new ChangeFieldPropertyCommand( this, *propertySetForItem, // "caption", oldCaption, newValue) @@ -759,7 +759,7 @@ void KexiTableDesignerView::slotBeforeCellChanged( // *** this action contains subactions *** CommandGroup *changeDataTypeCommand = new CommandGroup( i18n("Change data type for field \"%1\" to \"%2\"") - .tqarg(set["name"].value().toString()).tqarg( KexiDB::Field::typeName( fieldType ) ) ); + .arg(set["name"].value().toString()).arg( KexiDB::Field::typeName( fieldType ) ) ); //kexipluginsdbg << "++++++++++" << slist << nlist << endl; @@ -968,13 +968,13 @@ void KexiTableDesignerView::slotPropertyChanged(KoProperty::Set& set, KoProperty //switchPrimaryKey(set, true); // this will be toplevel command setAutonumberCommand = new CommandGroup( - i18n("Assign autonumber for field \"%1\"").tqarg(set["name"].value().toString()) ); + i18n("Assign autonumber for field \"%1\"").arg(set["name"].value().toString()) ); toplevelCommand = setAutonumberCommand; d->setPropertyValueIfNeeded( set, "autoIncrement", TQVariant(true,1), setAutonumberCommand ); } else { setAutonumberCommand = new CommandGroup( - i18n("Remove autonumber from field \"%1\"").tqarg(set["name"].value().toString()) ); + i18n("Remove autonumber from field \"%1\"").arg(set["name"].value().toString()) ); //d->slotPropertyChanged_enabled = false; // set["autoIncrement"].setValue( TQVariant(false,1), false/*don't save old*/); // d->slotPropertyChanged_enabled = true; @@ -995,7 +995,7 @@ void KexiTableDesignerView::slotPropertyChanged(KoProperty::Set& set, KoProperty setPrimaryKey = false; // this will be toplevel command CommandGroup *unsetIndexedOrUniquOrNotNullCommand = new CommandGroup( - i18n("Set \"%1\" property for field \"%2\"").tqarg(property.caption()).tqarg(set["name"].value().toString()) ); + i18n("Set \"%1\" property for field \"%2\"").arg(property.caption()).arg(set["name"].value().toString()) ); toplevelCommand = unsetIndexedOrUniquOrNotNullCommand; d->setPropertyValueIfNeeded( set, pname, TQVariant(false,1), unsetIndexedOrUniquOrNotNullCommand ); if (pname=="notNull") { @@ -1040,8 +1040,8 @@ void KexiTableDesignerView::slotPropertyChanged(KoProperty::Set& set, KoProperty // kdDebug() << set["type"].value() << endl; // if (KexiDB::Field::typeGroup( set["type"].value().toInt() ) == (int)KexiDB::Field::TextGroup) { CommandGroup* changeFieldTypeCommand = new CommandGroup( - i18n("Change type for field \"%1\" to \"%2\"").tqarg(set["name"].value().toString()) - .tqarg(typeName) ); + i18n("Change type for field \"%1\" to \"%2\"").arg(set["name"].value().toString()) + .arg(typeName) ); d->setPropertyValueIfNeeded( set, "subType", property.value(), property.oldValue(), changeFieldTypeCommand ); @@ -1085,7 +1085,7 @@ void KexiTableDesignerView::slotPropertyChanged(KoProperty::Set& set, KoProperty //this action contains subactions CommandGroup *setPrimaryKeyCommand = new CommandGroup( i18n("Set primary key for field \"%1\"") - .tqarg(set["name"].value().toString()) ); + .arg(set["name"].value().toString()) ); if (toplevelCommand) toplevelCommand->addCommand( setPrimaryKeyCommand ); else @@ -1111,7 +1111,7 @@ void KexiTableDesignerView::slotPropertyChanged(KoProperty::Set& set, KoProperty //remember this action containing 2 subactions CommandGroup *setPrimaryKeyCommand = new CommandGroup( i18n("Unset primary key for field \"%1\"") - .tqarg(set["name"].value().toString()) ); + .arg(set["name"].value().toString()) ); if (toplevelCommand) toplevelCommand->addCommand( setPrimaryKeyCommand ); else @@ -1147,10 +1147,10 @@ void KexiTableDesignerView::slotRowInserted() } void KexiTableDesignerView::slotAboutToDeleteRow( - KexiTableItem& item, KexiDB::ResultInfo* result, bool tqrepaint) + KexiTableItem& item, KexiDB::ResultInfo* result, bool repaint) { Q_UNUSED(result) - Q_UNUSED(tqrepaint) + Q_UNUSED(repaint) if (item[COLUMN_ID_ICON].toString()=="key") d->primaryKeyExists = false; @@ -1213,7 +1213,7 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be "for creating relations between database tables. " "Do you want to add primary key automatically now?</p>" "<p>If you want to add a primary key by hand, press \"Cancel\" " - "to cancel saving table design.</p>").tqarg(schema.name()), + "to cancel saving table design.</p>").arg(schema.name()), TQString(), KGuiItem(i18n("&Add Primary Key"), "key"), KStdGuiItem::no(), "autogeneratePrimaryKeysOnTableDesignSaving"); if (questionRes==KMessageBox::Cancel) { @@ -1229,9 +1229,9 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be KoProperty::Set *set = d->sets->at(i); if (set) { if ((*set)["name"].value().toString() - == pkFieldName.tqarg(idIndex==1?TQString() : TQString::number(idIndex)) + == pkFieldName.arg(idIndex==1?TQString() : TQString::number(idIndex)) || (*set)["caption"].value().toString() - == pkFieldCaption.tqarg(idIndex==1?TQString() : TQString::number(idIndex))) + == pkFieldCaption.arg(idIndex==1?TQString() : TQString::number(idIndex))) { //try next id index i = 0; @@ -1241,8 +1241,8 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be } i++; } - pkFieldName = pkFieldName.tqarg(idIndex==1?TQString() : TQString::number(idIndex)); - pkFieldCaption = pkFieldCaption.tqarg(idIndex==1?TQString() : TQString::number(idIndex)); + pkFieldName = pkFieldName.arg(idIndex==1?TQString() : TQString::number(idIndex)); + pkFieldCaption = pkFieldCaption.arg(idIndex==1?TQString() : TQString::number(idIndex)); //ok, add PK with such unique name d->view->insertEmptyRow(0); d->view->setCursorPosition(0, COLUMN_ID_CAPTION); @@ -1273,7 +1273,7 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be if (beSilent) { kexipluginswarn << TQString("KexiTableDesignerView::buildSchema(): no field caption entered at row %1...") - .tqarg(i+1) << endl; + .arg(i+1) << endl; } else { d->view->setCursorPosition(i, COLUMN_ID_CAPTION); @@ -1304,7 +1304,7 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be if (beSilent) { kexipluginswarn << TQString("KexiTableDesignerView::buildSchema(): duplicated field name '%1'") - .tqarg((*b)["name"].value().toString()) << endl; + .arg((*b)["name"].value().toString()) << endl; } else { d->view->setCursorPosition(i, COLUMN_ID_CAPTION); @@ -1313,7 +1313,7 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be KMessageBox::sorry(this, i18n("You have added \"%1\" field name twice.\nField names cannot be repeated. " "Correct name of the field.") - .tqarg((*b)["name"].value().toString()) ); + .arg((*b)["name"].value().toString()) ); } res = cancelled; } @@ -1406,7 +1406,7 @@ KexiDB::SchemaData* KexiTableDesignerView::storeNewData(const KexiDB::SchemaData KexiDB::Connection *conn = mainWin()->project()->dbConnection(); res = conn->createTable(tempData()->table); if (res!=true) - parentDialog()->settqStatus(conn, ""); + parentDialog()->setStatus(conn, ""); } if (res == true) { @@ -1457,7 +1457,7 @@ tristate KexiTableDesignerView::storeData(bool dontAsk) this, *conn, *tempData()->table, i18n("You are about to change the design of table \"%1\" " "but following objects using this table are opened:") - .tqarg(tempData()->table->name())); + .arg(tempData()->table->name())); } if (res == true) { @@ -1489,7 +1489,7 @@ tristate KexiTableDesignerView::storeData(bool dontAsk) res = conn->alterTable(*tempData()->table, *newTable); if (res != true) - parentDialog()->settqStatus(conn, ""); + parentDialog()->setStatus(conn, ""); } else { KexiDB::AlterTableHandler::ExecutionArguments args; @@ -1499,7 +1499,7 @@ tristate KexiTableDesignerView::storeData(bool dontAsk) << res.toString() << endl; if (true != res) { alterTableHandler->debugError(); - parentDialog()->settqStatus(alterTableHandler, ""); + parentDialog()->setStatus(alterTableHandler, ""); } } } @@ -1659,7 +1659,7 @@ void KexiTableDesignerView::slotAboutToShowContextMenu() if (captionOrName.isEmpty()) captionOrName = set["name"].value().toString(); //! @todo show "field" icon - d->contextMenuTitle->setTitle( i18n("Table field \"%1\"").tqarg(captionOrName) ); + d->contextMenuTitle->setTitle( i18n("Table field \"%1\"").arg(captionOrName) ); } else { d->contextMenuTitle->setTitle( i18n("Empty table row", "Empty Row") ); diff --git a/kexi/plugins/tables/kexitabledesignerview.h b/kexi/plugins/tables/kexitabledesignerview.h index 13ce495d..5b9d0215 100644 --- a/kexi/plugins/tables/kexitabledesignerview.h +++ b/kexi/plugins/tables/kexitabledesignerview.h @@ -146,10 +146,10 @@ class KexiTableDesignerView : public KexiDataTable, public KexiTableDesignerInte //! Called before row inserting in tableview. void slotRowInserted(); -// void slotAboutToInsertRow(KexiTableItem* item, KexiDB::ResultInfo* result, bool tqrepaint); +// void slotAboutToInsertRow(KexiTableItem* item, KexiDB::ResultInfo* result, bool repaint); //! Called before row deleting in tableview. - void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool tqrepaint); + void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool repaint); /*! Called after any property has been changed in the current property set, to perform some actions (like updating other dependent properties) */ diff --git a/kexi/plugins/tables/kexitabledesignerview_p.cpp b/kexi/plugins/tables/kexitabledesignerview_p.cpp index c546327b..30bdb557 100644 --- a/kexi/plugins/tables/kexitabledesignerview_p.cpp +++ b/kexi/plugins/tables/kexitabledesignerview_p.cpp @@ -20,7 +20,7 @@ #include "kexitabledesignerview_p.h" #include "kexitabledesignerview.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqsplitter.h> diff --git a/kexi/plugins/tables/kexitablepart.cpp b/kexi/plugins/tables/kexitablepart.cpp index 4efd237a..55c8be5d 100644 --- a/kexi/plugins/tables/kexitablepart.cpp +++ b/kexi/plugins/tables/kexitablepart.cpp @@ -137,7 +137,7 @@ bool KexiTablePart::remove(KexiMainWindow *win, KexiPart::Item &item) tristate res = KexiTablePart::askForClosingObjectsUsingTableSchema( win, *conn, *sch, i18n("You are about to remove table \"%1\" but following objects using this table are opened:") - .tqarg(sch->name())); + .arg(sch->name())); return true == conn->dropTable( sch ); } //last chance: just remove item @@ -182,7 +182,7 @@ tristate KexiTablePart::askForClosingObjectsUsingTableSchema(TQWidget *parent, K TQString openedObjectsStr = "<ul>"; for (TQPtrListIterator<KexiDB::Connection::TableSchemaChangeListenerInterface> it(*listeners); it.current(); ++it) { - openedObjectsStr += TQString("<li>%1</li>").tqarg(it.current()->listenerInfoString); + openedObjectsStr += TQString("<li>%1</li>").arg(it.current()->listenerInfoString); } openedObjectsStr += "</ul>"; int r = KMessageBox::questionYesNo(parent, diff --git a/kexi/tests/altertable/1.kexi b/kexi/tests/altertable/1.kexi Binary files differindex 8c13ad39..5a1b4ebd 100644 --- a/kexi/tests/altertable/1.kexi +++ b/kexi/tests/altertable/1.kexi diff --git a/kexi/tests/altertable/altertable.cpp b/kexi/tests/altertable/altertable.cpp index 6155eb63..765457af 100644 --- a/kexi/tests/altertable/altertable.cpp +++ b/kexi/tests/altertable/altertable.cpp @@ -25,7 +25,7 @@ #include <tqfile.h> #include <tqdir.h> #include <tqregexp.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <kdebug.h> @@ -56,7 +56,7 @@ KexiProject* prj = 0; void showError(const TQString& msg) { TQString msg_(msg); - msg_.prepend(TQString("Error at line %1: ").tqarg(testLineNumber)); + msg_.prepend(TQString("Error at line %1: ").arg(testLineNumber)); kdDebug() << msg_ << endl; } @@ -119,7 +119,7 @@ tristate readLineFromTestFile(const TQString& expectedCommandName = TQString()) } if (!expectedCommandName.isEmpty() && testFileLine[0]!=expectedCommandName) { showError( TQString("Invalid command '%1', expected '%2'") - .tqarg(testFileLine[0]).tqarg(expectedCommandName)); + .arg(testFileLine[0]).arg(expectedCommandName)); return false; } if (quoted) { @@ -136,9 +136,9 @@ bool checkItemsNumber(int expectedNumberOfItems, int optionalNumberOfItems = -1) ok = ok || optionalNumberOfItems==(int)testFileLine.count(); if (!ok) { TQString msg = TQString("Invalid number of args (%1) for command '%2', expected: %3") - .tqarg(testFileLine.count()).tqarg(testFileLine[0]).tqarg(expectedNumberOfItems); + .arg(testFileLine.count()).arg(testFileLine[0]).arg(expectedNumberOfItems); if (optionalNumberOfItems>0) - msg.append( TQString(" or %1").tqarg(optionalNumberOfItems) ); + msg.append( TQString(" or %1").arg(optionalNumberOfItems) ); showError( msg ); return false; } @@ -167,7 +167,7 @@ TQVariant::Type typeNameToTQVariantType(const TQCString& name_) if (name=="longlong") return TQVariant::LongLong; //todo more types - showError(TQString("Invalid type '%1'").tqarg(name_)); + showError(TQString("Invalid type '%1'").arg(name_)); return TQVariant::Invalid; } @@ -202,7 +202,7 @@ static int getNumber(const TQString& argument, bool& ok) else { result = argument.toInt(&ok); if (!ok) { - showError(TQString("Invalid value '%1'").tqarg(argument)); + showError(TQString("Invalid value '%1'").arg(argument)); return -1; } } @@ -248,7 +248,7 @@ bool AlterTableTester::changeFieldProperty(KexiTableDesignerInterface* designerI else { if (!castStringToTQVariant(propertyValueString, propertyType, newValue)) { showError( TQString("Could not set property '%1' value '%2' of type '%3'") - .tqarg(propertyName).tqarg(propertyValueString).tqarg(propertyType) ); + .arg(propertyName).arg(propertyValueString).arg(propertyType) ); return false; } } @@ -283,7 +283,7 @@ bool AlterTableTester::getSchemaDump(KexiDialogBase* dlg, TQString& schemaDebugS schemaDebugString = designerIface->debugStringForCurrentTableSchema(result); if (true!=result) { showError( TQString("Loading modified schema failed. Result: %1") - .tqarg(~result ? "cancelled" : "false") ); + .arg(~result ? "cancelled" : "false") ); return false; } schemaDebugString.remove(TQRegExp(",$")); //no need to have "," at the end of lines @@ -296,9 +296,9 @@ bool AlterTableTester::showSchema(KexiDialogBase* dlg, bool copyToClipboard) if (!getSchemaDump(dlg, schemaDebugString)) return false; if (copyToClipboard) - TQApplication::tqclipboard()->setText( schemaDebugString ); + TQApplication::clipboard()->setText( schemaDebugString ); else - kdDebug() << TQString("Schema for '%1' table:\n").tqarg(dlg->partItem()->name()) + kdDebug() << TQString("Schema for '%1' table:\n").arg(dlg->partItem()->name()) + schemaDebugString + "\nendSchema" << endl; return true; } @@ -354,8 +354,8 @@ bool AlterTableTester::checkSchema(KexiDialogBase* dlg) if (!getSchemaDump(dlg, schemaDebugString)) return false; bool result = checkInternal(dlg, schemaDebugString, "endSchema", true /*skipColonsAndStripWhiteSpace*/); - kdDebug() << TQString("Schema check for table '%1': %2").tqarg(dlg->partItem()->name()) - .tqarg(result ? "OK" : "Failed") << endl; + kdDebug() << TQString("Schema check for table '%1': %2").arg(dlg->partItem()->name()) + .arg(result ? "OK" : "Failed") << endl; return result; } @@ -367,7 +367,7 @@ bool AlterTableTester::getActionsDump(KexiDialogBase* dlg, TQString& actionsDebu return false; tristate result = designerIface->simulateAlterTableExecution(&actionsDebugString); if (true!=result) { - showError( TQString("Computing simplified actions for table '%1' failed.").tqarg(dlg->partItem()->name()) ); + showError( TQString("Computing simplified actions for table '%1' failed.").arg(dlg->partItem()->name()) ); return false; } return true; @@ -379,9 +379,9 @@ bool AlterTableTester::showActions(KexiDialogBase* dlg, bool copyToClipboard) if (!getActionsDump(dlg, actionsDebugString)) return false; if (copyToClipboard) - TQApplication::tqclipboard()->setText( actionsDebugString ); + TQApplication::clipboard()->setText( actionsDebugString ); else - kdDebug() << TQString("Simplified actions for altering table '%1':\n").tqarg(dlg->partItem()->name()) + kdDebug() << TQString("Simplified actions for altering table '%1':\n").arg(dlg->partItem()->name()) + actionsDebugString+"\n" << endl; return true; } @@ -392,8 +392,8 @@ bool AlterTableTester::checkActions(KexiDialogBase* dlg) if (!getActionsDump(dlg, actionsDebugString)) return false; bool result = checkInternal(dlg, actionsDebugString, "endActions", true /*skipColonsAndStripWhiteSpace*/); - kdDebug() << TQString("Actions check for table '%1': %2").tqarg(dlg->partItem()->name()) - .tqarg(result ? "OK" : "Failed") << endl; + kdDebug() << TQString("Actions check for table '%1': %2").arg(dlg->partItem()->name()) + .arg(result ? "OK" : "Failed") << endl; return result; } @@ -405,7 +405,7 @@ bool AlterTableTester::saveTableDesign(KexiDialogBase* dlg) return false; tristate result = designerIface->executeRealAlterTable(); if (true!=result) { - showError( TQString("Saving design of table '%1' failed.").tqarg(dlg->partItem()->name()) ); + showError( TQString("Saving design of table '%1' failed.").arg(dlg->partItem()->name()) ); return false; } return true; @@ -439,9 +439,9 @@ bool AlterTableTester::showTableData(KexiDialogBase* dlg, bool copyToClipboard) if (!getTableDataDump(dlg, dataString)) return false; if (copyToClipboard) - TQApplication::tqclipboard()->setText( dataString ); + TQApplication::clipboard()->setText( dataString ); else - kdDebug() << TQString("Contents of table '%1':\n").tqarg(dlg->partItem()->name())+dataString+"\n" << endl; + kdDebug() << TQString("Contents of table '%1':\n").arg(dlg->partItem()->name())+dataString+"\n" << endl; return true; } @@ -451,8 +451,8 @@ bool AlterTableTester::checkTableData(KexiDialogBase* dlg) if (!getTableDataDump(dlg, dataString)) return false; bool result = checkInternal(dlg, dataString, "endTableData", false /*!skipColonsAndStripWhiteSpace*/); - kdDebug() << TQString("Table '%1' contents: %2").tqarg(dlg->partItem()->name()) - .tqarg(result ? "OK" : "Failed") << endl; + kdDebug() << TQString("Table '%1' contents: %2").arg(dlg->partItem()->name()) + .arg(result ? "OK" : "Failed") << endl; return result; } @@ -462,8 +462,8 @@ bool AlterTableTester::closeWindow(KexiDialogBase* dlg) return true; TQString name = dlg->partItem()->name(); tristate result = true == win->closeDialog(dlg, true/*layoutTaskBar*/, true/*doNotSaveChanges*/); - kdDebug() << TQString("Closing window for table '%1': %2").tqarg(name) - .tqarg(result==true ? "OK" : (result==false ? "Failed" : "Cancelled")) << endl; + kdDebug() << TQString("Closing window for table '%1': %2").arg(name) + .arg(result==true ? "OK" : (result==false ? "Failed" : "Cancelled")) << endl; return result == true; } @@ -492,13 +492,13 @@ tristate AlterTableTester::run(bool &closeAppRequested) TQString tableName(testFileLine[1]); KexiPart::Item *item = prj->itemForMimeType("kexi/table", tableName); if (!item) { - showError(TQString("No such table '%1'").tqarg(tableName)); + showError(TQString("No such table '%1'").arg(tableName)); return false; } bool openingCancelled; KexiDialogBase* dlg = win->openObject(item, Kexi::DesignViewMode, openingCancelled); if (!dlg) { - showError(TQString("Could not open table '%1'").tqarg(item->name())); + showError(TQString("Could not open table '%1'").arg(item->name())); return false; } KexiTableDesignerInterface* designerIface @@ -570,7 +570,7 @@ tristate AlterTableTester::run(bool &closeAppRequested) bool ok; variableI = command.mid(2).toInt(&ok); if (!ok) { - showError(TQString("Invalid variable initialization '%1'").tqarg(command)); + showError(TQString("Invalid variable initialization '%1'").arg(command)); return false; } continue; @@ -622,7 +622,7 @@ tristate AlterTableTester::run(bool &closeAppRequested) if (command=="stop") { if (!checkItemsNumber(1)) return false; - kdDebug() << TQString("Test STOPPED at line %1.").tqarg(testLineNumber) << endl; + kdDebug() << TQString("Test STOPPED at line %1.").arg(testLineNumber) << endl; break; } else if (command=="closeWindow") { @@ -640,7 +640,7 @@ tristate AlterTableTester::run(bool &closeAppRequested) break; } else { - showError( TQString("No such command '%1'").tqarg(command) ); + showError( TQString("No such command '%1'").arg(command) ); return false; } } @@ -674,7 +674,7 @@ int main(int argc, char *argv[]) testFilename = argv[argc-1]; testFile.setName(testFilename); if (!testFile.open(IO_ReadOnly)) { - kdWarning() << TQString("Opening test file %1 failed.").tqarg(testFilename) << endl; + kdWarning() << TQString("Opening test file %1 failed.").arg(testFilename) << endl; return quit(1); } //load db name @@ -704,10 +704,10 @@ int main(int argc, char *argv[]) res = tester.run(closeAppRequested); if (true != res) { if (false == res) - kdWarning() << TQString("Running test for file '%1' failed.").tqarg(testFilename) << endl; + kdWarning() << TQString("Running test for file '%1' failed.").arg(testFilename) << endl; return quit(res==false ? 1 : 0); } - kdDebug() << TQString("Tests from file '%1': OK").tqarg(testFilename) << endl; + kdDebug() << TQString("Tests from file '%1': OK").arg(testFilename) << endl; result = (closeOnFinish || closeAppRequested) ? 0 : tqApp->exec(); quit(result); return result; diff --git a/kexi/tests/gui/finddialog/kexifinddialogbase.ui b/kexi/tests/gui/finddialog/kexifinddialogbase.ui index 0f2248e6..bf5fcd32 100644 --- a/kexi/tests/gui/finddialog/kexifinddialogbase.ui +++ b/kexi/tests/gui/finddialog/kexifinddialogbase.ui @@ -180,7 +180,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -222,7 +222,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -231,7 +231,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="4" rowspan="8" colspan="1"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <vbox> <property name="name"> @@ -279,7 +279,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kexi/tests/newapi/dr_prop_test.h b/kexi/tests/newapi/dr_prop_test.h index d7bfd5b3..2cbee8b2 100644 --- a/kexi/tests/newapi/dr_prop_test.h +++ b/kexi/tests/newapi/dr_prop_test.h @@ -23,7 +23,7 @@ int drPropTest() { TQValueList<TQCString> names = driver->propertyNames(); - kdDebug() << TQString("%1 properties found:").tqarg(names.count()) << endl; + kdDebug() << TQString("%1 properties found:").arg(names.count()) << endl; for (TQValueList<TQCString>::ConstIterator it = names.constBegin(); it!=names.constEnd(); ++it) { kdDebug() << " - " << (*it) << ":" << " caption=\"" << driver->propertyCaption(*it) << "\"" diff --git a/kexi/tests/newapi/main.cpp b/kexi/tests/newapi/main.cpp index d02dbc9b..9eaff2ab 100644 --- a/kexi/tests/newapi/main.cpp +++ b/kexi/tests/newapi/main.cpp @@ -137,7 +137,7 @@ int main(int argc, char** argv) } test_name = args->getOption("test"); if (!tests.contains(test_name)) { - kdDebug() << TQString("No such test \"%1\". Use --help.").tqarg(test_name.data()) << endl; + kdDebug() << TQString("No such test \"%1\". Use --help.").arg(test_name.data()) << endl; RETURN(1); } @@ -152,7 +152,7 @@ int main(int argc, char** argv) db_name_required = false; } if ((int)args->count()<minargs) { - kdDebug() << TQString("Not enough args (%1 required). Use --help.").tqarg(minargs) << endl; + kdDebug() << TQString("Not enough args (%1 required). Use --help.").arg(minargs) << endl; RETURN(1); } diff --git a/kexi/tests/newapi/parser_test.h b/kexi/tests/newapi/parser_test.h index 90c25d7c..d02017ec 100644 --- a/kexi/tests/newapi/parser_test.h +++ b/kexi/tests/newapi/parser_test.h @@ -42,8 +42,8 @@ int parserTest(const char *st, const TQStringList& params) } else { KexiDB::ParserError err = parser.error(); - kdDebug() << TQString("Error = %1\ntype = %2\nat = %3").tqarg(err.error()) - .tqarg(err.type()).tqarg(err.at()) << endl; + kdDebug() << TQString("Error = %1\ntype = %2\nat = %3").arg(err.error()) + .arg(err.type()).arg(err.at()) << endl; r = 1; } delete q; diff --git a/kexi/tests/widgets/kexidbdrivercombotest.cpp b/kexi/tests/widgets/kexidbdrivercombotest.cpp index 1ada79b1..c497903e 100644 --- a/kexi/tests/widgets/kexidbdrivercombotest.cpp +++ b/kexi/tests/widgets/kexidbdrivercombotest.cpp @@ -22,7 +22,7 @@ * OTHER DEALINGS IN THE SOFTWARE. * ***************************************************************************/ -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <kdebug.h> #include <kcmdlineargs.h> diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp index 4c279382..af893ddf 100644 --- a/kexi/widget/kexibrowser.cpp +++ b/kexi/widget/kexibrowser.cpp @@ -435,7 +435,7 @@ KexiBrowser::slotContextMenu(KListView* /*list*/, TQListViewItem *item, const TQ pm->changeTitle(m_partPopupTitle_id, *bit->pixmap(0), title_text); /* KexiPart::Part* part = Kexi::partManager().part(bit->info()); if (part) - m_newObjectAction->setText(i18n("&Create Object: %1...").tqarg( part->instanceName() )); + m_newObjectAction->setText(i18n("&Create Object: %1...").arg( part->instanceName() )); else m_newObjectAction->setText(i18n("&Create Object...")); m_newObjectAction->setIconSet( SmallIconSet(bit->info()->itemIcon()) );*/ @@ -523,14 +523,14 @@ KexiBrowser::slotSelectionChanged(TQListViewItem* i) m_prevSelectedPart = part; if (part) { if (m_newObjectAction) { - m_newObjectAction->setText(i18n("&Create Object: %1...").tqarg( part->instanceCaption() )); + m_newObjectAction->setText(i18n("&Create Object: %1...").arg( part->instanceCaption() )); m_newObjectAction->setIcon( part->info()->createItemIcon() ); if (m_features & Toolbar) { m_newObjectToolButton->setIconSet( part->info()->createItemIcon() ); TQToolTip::add(m_newObjectToolButton, - i18n("Create object: %1").tqarg( part->instanceCaption().lower() )); + i18n("Create object: %1").arg( part->instanceCaption().lower() )); TQWhatsThis::add(m_newObjectToolButton, - i18n("Creates a new object: %1").tqarg( part->instanceCaption().lower() )); + i18n("Creates a new object: %1").arg( part->instanceCaption().lower() )); } } } else { diff --git a/kexi/widget/kexicharencodingcombobox.cpp b/kexi/widget/kexicharencodingcombobox.cpp index ff277e7d..28c4521a 100644 --- a/kexi/widget/kexicharencodingcombobox.cpp +++ b/kexi/widget/kexicharencodingcombobox.cpp @@ -19,7 +19,7 @@ #include "kexicharencodingcombobox.h" -#include <tqtextcodec.h> +#include <textcodec.h> #include <kdebug.h> #include <klocale.h> @@ -31,12 +31,12 @@ KexiCharacterEncodingComboBox::KexiCharacterEncodingComboBox( : KComboBox( parent, "KexiCharacterEncodingComboBox" ) , m_defaultEncodingAdded(false) { - TQString defaultEncoding(TQString::tqfromLatin1(KGlobal::locale()->encoding())); + TQString defaultEncoding(TQString::fromLatin1(KGlobal::locale()->encoding())); TQString defaultEncodingDescriptiveName; TQString _selectedEncoding = selectedEncoding; if (_selectedEncoding.isEmpty()) - _selectedEncoding = TQString::tqfromLatin1(KGlobal::locale()->encoding()); + _selectedEncoding = TQString::fromLatin1(KGlobal::locale()->encoding()); TQStringList descEncodings(KGlobal::charsets()->descriptiveEncodingNames()); TQStringList::ConstIterator it = descEncodings.constBegin(); @@ -66,7 +66,7 @@ KexiCharacterEncodingComboBox::KexiCharacterEncodingComboBox( if (!defaultEncodingDescriptiveName.isEmpty()) { m_defaultEncodingAdded = true; TQString desc = i18n("Text encoding: Default", "Default: %1") - .tqarg(defaultEncodingDescriptiveName); + .arg(defaultEncodingDescriptiveName); insertItem( desc, 0 ); if (_selectedEncoding==defaultEncoding) { setCurrentItem(0); @@ -84,7 +84,7 @@ KexiCharacterEncodingComboBox::~KexiCharacterEncodingComboBox() TQString KexiCharacterEncodingComboBox::selectedEncoding() const { if (defaultEncodingSelected()) { - return TQString::tqfromLatin1(KGlobal::locale()->encoding()); + return TQString::fromLatin1(KGlobal::locale()->encoding()); } else { return KGlobal::charsets()->encodingForName( currentText() ); diff --git a/kexi/widget/kexicustompropertyfactory_p.cpp b/kexi/widget/kexicustompropertyfactory_p.cpp index 20e85b04..2cdd0bfc 100644 --- a/kexi/widget/kexicustompropertyfactory_p.cpp +++ b/kexi/widget/kexicustompropertyfactory_p.cpp @@ -50,7 +50,7 @@ void KexiImagePropertyEdit::selectPixmap() ObjectTreeItem *item = m_manager->activeForm()->objectTree()->lookup(m_manager->activeForm()->selectedWidget()->name()); TQString name = item ? item->pixmapName(property()->name()) : ""; - PixmapCollectionChooser dialog( m_manager->activeForm()->pixmapCollection(), name, tqtopLevelWidget() ); + PixmapCollectionChooser dialog( m_manager->activeForm()->pixmapCollection(), name, topLevelWidget() ); if(dialog.exec() == TQDialog::Accepted) { setValue(dialog.pixmap(), true); item->setPixmapName(property()->name(), dialog.pixmapName()); @@ -101,7 +101,7 @@ void KexiIdentifierPropertyEdit::setValue(const TQVariant &value, bool emitChang TQString identifier( KexiUtils::string2Identifier(string) ); if (identifier!=string) kdDebug() << TQString("KexiIdentifierPropertyEdit::setValue(): " - "String \"%1\" converted to identifier \"%2\".").tqarg(string).tqarg(identifier) << endl; + "String \"%1\" converted to identifier \"%2\".").arg(string).arg(identifier) << endl; StringEdit::setValue( identifier, emitChange ); } diff --git a/kexi/widget/kexidataawareview.cpp b/kexi/widget/kexidataawareview.cpp index 113f8be4..f73b059e 100644 --- a/kexi/widget/kexidataawareview.cpp +++ b/kexi/widget/kexidataawareview.cpp @@ -23,7 +23,7 @@ #include <utils/kexisharedactionclient.h> #include <core/keximainwindow.h> -#include <tqlayout.h> +#include <layout.h> #include <kpopupmenu.h> @@ -59,9 +59,9 @@ void KexiDataAwareView::init( TQWidget* viewWidget, KexiSharedActionClient* acti TQVBoxLayout *box = new TQVBoxLayout(this); box->addWidget(m_internalView); - setMinimumSize(m_internalView->tqminimumSizeHint().width(), - m_internalView->tqminimumSizeHint().height()); - resize( preferredSizeHint( m_internalView->tqsizeHint() ) ); + setMinimumSize(m_internalView->minimumSizeHint().width(), + m_internalView->minimumSizeHint().height()); + resize( preferredSizeHint( m_internalView->sizeHint() ) ); setFocusProxy(m_internalView); if (!noDataAware) { @@ -165,14 +165,14 @@ TQWidget* KexiDataAwareView::mainWidget() return m_internalView; } -TQSize KexiDataAwareView::tqminimumSizeHint() const +TQSize KexiDataAwareView::minimumSizeHint() const { - return m_internalView ? m_internalView->tqminimumSizeHint() : TQSize(0,0);//KexiViewBase::tqminimumSizeHint(); + return m_internalView ? m_internalView->minimumSizeHint() : TQSize(0,0);//KexiViewBase::minimumSizeHint(); } -TQSize KexiDataAwareView::tqsizeHint() const +TQSize KexiDataAwareView::sizeHint() const { - return m_internalView ? m_internalView->tqsizeHint() : TQSize(0,0);//KexiViewBase::tqsizeHint(); + return m_internalView ? m_internalView->sizeHint() : TQSize(0,0);//KexiViewBase::sizeHint(); } void KexiDataAwareView::updateActions(bool activated) @@ -241,7 +241,7 @@ void KexiDataAwareView::slotCellSelected(int /*col*/, int row) void KexiDataAwareView::deleteAllRows() { - m_dataAwareObject->deleteAllRows(true/*ask*/, true/*tqrepaint*/); + m_dataAwareObject->deleteAllRows(true/*ask*/, true/*repaint*/); } void KexiDataAwareView::deleteCurrentRow() diff --git a/kexi/widget/kexidataawareview.h b/kexi/widget/kexidataawareview.h index 5cc76e97..8a787bd7 100644 --- a/kexi/widget/kexidataawareview.h +++ b/kexi/widget/kexidataawareview.h @@ -49,9 +49,9 @@ class KEXIEXTWIDGETS_EXPORT KexiDataAwareView : public KexiViewBase, TQWidget* mainWidget(); - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; KexiDataAwareObjectInterface* dataAwareObject() const { return m_dataAwareObject; } diff --git a/kexi/widget/kexidatatable.cpp b/kexi/widget/kexidatatable.cpp index 09680b14..db75e010 100644 --- a/kexi/widget/kexidatatable.cpp +++ b/kexi/widget/kexidatatable.cpp @@ -20,7 +20,7 @@ */ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <kiconloader.h> @@ -42,10 +42,10 @@ KexiDataTable::KexiDataTable(KexiMainWindow *mainWin, TQWidget *parent, KexiTableView *view; if (dbAware) view = new KexiDataTableView(this, - TQString("%1_datatableview").tqarg(name ? name : "KexiDataTableView").latin1()); + TQString("%1_datatableview").arg(name ? name : "KexiDataTableView").latin1()); else view = new KexiTableView(0, this, - TQString("%1_tableview").tqarg(name ? name : "KexiTableView").latin1()); + TQString("%1_tableview").arg(name ? name : "KexiTableView").latin1()); KexiDataAwareView::init( view, view, view ); } diff --git a/kexi/widget/kexidbconnectionwidget.cpp b/kexi/widget/kexidbconnectionwidget.cpp index 78b67c8d..00918d5b 100644 --- a/kexi/widget/kexidbconnectionwidget.cpp +++ b/kexi/widget/kexidbconnectionwidget.cpp @@ -39,7 +39,7 @@ #include <tqcheckbox.h> #include <tqbuttongroup.h> #include <tqwidgetstack.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -95,7 +95,7 @@ KexiDBConnectionWidget::KexiDBConnectionWidget( TQWidget* parent, const char* n hbox->addWidget( d->btnSaveChanges ); hbox->addSpacing( KDialogBase::spacingHint() ); TQWidget::setTabOrder(titleEdit, d->btnSaveChanges); - d->btnSaveChanges->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + d->btnSaveChanges->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); d->btnTestConnection = new KPushButton(KGuiItem(i18n("&Test Connection"), "", i18n("Test database connection"), @@ -103,7 +103,7 @@ KexiDBConnectionWidget::KexiDBConnectionWidget( TQWidget* parent, const char* n frmBottom, "testConnection"); hbox->addWidget( d->btnTestConnection ); TQWidget::setTabOrder(d->btnSaveChanges, d->btnTestConnection); - d->btnTestConnection->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + d->btnTestConnection->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); connect( locationBGrp, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotLocationBGrpClicked(int)) ); connect( chkPortDefault, TQT_SIGNAL(toggled(bool)), this , TQT_SLOT(slotCBToggled(bool)) ); @@ -225,7 +225,7 @@ KexiDBConnectionTabWidget::KexiDBConnectionTabWidget( TQWidget* parent, const ch : KTabWidget( parent, name ) { mainWidget = new KexiDBConnectionWidget( this, "mainWidget" ); - mainWidget->tqlayout()->setMargin(KDialog::marginHint()); + mainWidget->layout()->setMargin(KDialog::marginHint()); addTab( mainWidget, i18n("Parameters") ); // TQVBox *page2 = new TQVBox(this); diff --git a/kexi/widget/kexidbconnectionwidgetbase.ui b/kexi/widget/kexidbconnectionwidgetbase.ui index 6dd4fbf8..d121f1b7 100644 --- a/kexi/widget/kexidbconnectionwidgetbase.ui +++ b/kexi/widget/kexidbconnectionwidgetbase.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0" rowspan="3" colspan="1"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> @@ -39,7 +39,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>48</width> <height>48</height> @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>331</height> @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>4</height> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>20</height> @@ -337,7 +337,7 @@ <property name="text"> <string>&Title (optional):</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> <property name="buddy" stdset="0"> @@ -356,7 +356,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32767</height> @@ -395,7 +395,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -411,7 +411,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>20</height> diff --git a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui index f1f161de..46d2dfac 100644 --- a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui +++ b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <grid> <property name="name"> @@ -40,7 +40,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -62,7 +62,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>129</width> <height>20</height> @@ -125,7 +125,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> diff --git a/kexi/widget/kexidswelcome.cpp b/kexi/widget/kexidswelcome.cpp index 88b72596..d8cead89 100644 --- a/kexi/widget/kexidswelcome.cpp +++ b/kexi/widget/kexidswelcome.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqpushbutton.h> @@ -37,7 +37,7 @@ KexiDSWelcome::KexiDSWelcome(KexiDataSourceWizard *parent) KexiDSPixmap *pic = new KexiDSPixmap(this); TQLabel *lText = new TQLabel(i18n("Kexi can help you with creation of %2 using data sources in almost no time with the \"%1 Wizard\""), this); - lText->tqsetAlignment(AlignTop | AlignLeft | WordBreak); + lText->setAlignment(AlignTop | AlignLeft | WordBreak); TQCheckBox *useWizard = new TQCheckBox(i18n("Create %1 using the \"%1 Wizard\""), this); connect(useWizard, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setUseWizard(bool))); useWizard->setChecked(true); diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp index 07627f32..6d3848ce 100644 --- a/kexi/widget/kexieditor.cpp +++ b/kexi/widget/kexieditor.cpp @@ -23,7 +23,7 @@ #include <keximainwindow.h> -#include <tqlayout.h> +#include <layout.h> #include <tqframe.h> #include <klocale.h> #include <kdebug.h> @@ -85,7 +85,7 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na : KexiViewBase(mainWin, parent, name) , d(new KexiEditorPrivate()) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); #ifdef KTEXTEDIT_BASED_SQL_EDITOR d->view = new KTextEdit( "", TQString(), this, "kexi_editor" ); //adjust font @@ -98,9 +98,9 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na #else TQFrame *fr = new TQFrame(this); fr->setFrameStyle(TQFrame::Sunken|TQFrame::WinPanel); - tqlayout->addWidget(fr); - tqlayout = new TQVBoxLayout(fr); - tqlayout->setMargin( 2 ); + layout->addWidget(fr); + layout = new TQVBoxLayout(fr); + layout->setMargin( 2 ); d->doc = KTextEditor::EditorChooser::createDocument(TQT_TQOBJECT(fr)); if (!d->doc) @@ -121,7 +121,7 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na KexiEditorSharedActionConnector c(this, TQT_TQOBJECT(d->view)); d->view->installEventFilter(this); - tqlayout->addWidget(d->view); + layout->addWidget(d->view); setViewWidget(d->view, true/*focus*/); d->view->show(); } diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp index 31795049..cc1845ab 100644 --- a/kexi/widget/kexifieldcombobox.cpp +++ b/kexi/widget/kexifieldcombobox.cpp @@ -20,7 +20,7 @@ #include "kexifieldcombobox.h" #include <tqheader.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqpushbutton.h> #include <tqcursor.h> @@ -182,7 +182,7 @@ void KexiFieldComboBox::setFieldOrExpression(int index) index++; //skip 1st empty item if (index>=count()) { kexiwarn << TQString("KexiFieldComboBox::setFieldOrExpression(int index): index %1 " - "out of range (0..%2)").tqarg(index).tqarg(count()-1) << endl; + "out of range (0..%2)").arg(index).arg(count()-1) << endl; index = -1; } if (index<=0) { @@ -243,7 +243,7 @@ void KexiFieldComboBox::focusOutEvent( TQFocusEvent *e ) { KComboBox::focusOutEvent( e ); // accept changes if the focus is moved - if (!KexiUtils::hasParent(TQT_TQOBJECT(this), TQT_TQOBJECT(tqfocusWidget()))) //(a check needed because drop-down listbox also causes a focusout) + if (!KexiUtils::hasParent(TQT_TQOBJECT(this), TQT_TQOBJECT(focusWidget()))) //(a check needed because drop-down listbox also causes a focusout) slotReturnPressed(currentText()); } diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp index 532ec057..406bcb8a 100644 --- a/kexi/widget/kexifieldlistview.cpp +++ b/kexi/widget/kexifieldlistview.cpp @@ -20,7 +20,7 @@ #include "kexifieldlistview.h" #include <tqheader.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqpushbutton.h> #include <tqcursor.h> @@ -117,7 +117,7 @@ void KexiFieldListView::setSchema(KexiDB::TableOrQuerySchema* schema) } #if 0 -TQSize KexiFieldListView::tqsizeHint() +TQSize KexiFieldListView::sizeHint() { TQFontMetrics fm(font()); diff --git a/kexi/widget/kexifieldlistview.h b/kexi/widget/kexifieldlistview.h index 50d94dba..53682436 100644 --- a/kexi/widget/kexifieldlistview.h +++ b/kexi/widget/kexifieldlistview.h @@ -60,7 +60,7 @@ class KEXIEXTWIDGETS_EXPORT KexiFieldListView : public KListView TQStringList selectedFieldNames() const; // void setReadOnly(bool); -// virtual TQSize tqsizeHint(); +// virtual TQSize sizeHint(); signals: /*! Emitted when a field is double clicked */ diff --git a/kexi/widget/kexifilterdlg.cpp b/kexi/widget/kexifilterdlg.cpp index e41681ab..89225823 100644 --- a/kexi/widget/kexifilterdlg.cpp +++ b/kexi/widget/kexifilterdlg.cpp @@ -19,7 +19,7 @@ #include <tqlistview.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqheader.h> #include <tqstringlist.h> diff --git a/kexi/widget/kexiprjtypeselectorbase.ui b/kexi/widget/kexiprjtypeselectorbase.ui index 059bf080..c6ff117a 100644 --- a/kexi/widget/kexiprjtypeselectorbase.ui +++ b/kexi/widget/kexiprjtypeselectorbase.ui @@ -88,7 +88,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> @@ -110,7 +110,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> diff --git a/kexi/widget/kexipropertyeditorview.cpp b/kexi/widget/kexipropertyeditorview.cpp index 02b050b8..e3576a17 100644 --- a/kexi/widget/kexipropertyeditorview.cpp +++ b/kexi/widget/kexipropertyeditorview.cpp @@ -27,7 +27,7 @@ #include <klocale.h> #include <kiconloader.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> KexiObjectInfoLabel::KexiObjectInfoLabel(TQWidget* parent, const char* name) @@ -40,7 +40,7 @@ KexiObjectInfoLabel::KexiObjectInfoLabel(TQWidget* parent, const char* name) hlyr->addWidget(m_objectIconLabel); m_objectNameLabel = new TQLabel(this); m_objectNameLabel->setMargin(2); - m_objectNameLabel->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred); + m_objectNameLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred); hlyr->addWidget(m_objectNameLabel); } @@ -76,7 +76,7 @@ void KexiObjectInfoLabel::updateName() if (txt.isEmpty()) txt = m_objectName; else if (!m_objectName.isEmpty()) - txt += TQString(" \"%1\"").tqarg(m_objectName); + txt += TQString(" \"%1\"").arg(m_objectName); m_objectNameLabel->setText(txt); } @@ -125,7 +125,7 @@ KexiPropertyEditorView::KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget vlyr->addWidget(d->objectIcon); d->objectClassName = new TQLabel(this); d->objectClassName->setMargin(2); - d->objectClassName->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred); + d->objectClassName->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred); vlyr->addWidget(d->objectClassName);*/ d->editor = new KoProperty::Editor(this, true /*AutoSync*/, "propeditor"); @@ -146,14 +146,14 @@ KexiPropertyEditorView::~KexiPropertyEditorView() delete d; } -TQSize KexiPropertyEditorView::tqsizeHint() const +TQSize KexiPropertyEditorView::sizeHint() const { - return TQSize(200,200);//m_editor->tqsizeHint(); + return TQSize(200,200);//m_editor->sizeHint(); } -TQSize KexiPropertyEditorView::tqminimumSizeHint() const +TQSize KexiPropertyEditorView::minimumSizeHint() const { - return TQSize(200,200);//m_editor->tqsizeHint(); + return TQSize(200,200);//m_editor->sizeHint(); } /*void KexiPropertyEditorView::setGeometry ( const TQRect &r ) diff --git a/kexi/widget/kexipropertyeditorview.h b/kexi/widget/kexipropertyeditorview.h index 66cc0ac7..008e6759 100644 --- a/kexi/widget/kexipropertyeditorview.h +++ b/kexi/widget/kexipropertyeditorview.h @@ -99,8 +99,8 @@ class KEXIEXTWIDGETS_EXPORT KexiPropertyEditorView : public TQWidget KexiObjectInfoLabel *infoLabel, KoProperty::Set* set, const TQString& textToDisplayForNullSet = TQString()); - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; KoProperty::Editor *editor() const; // public slots: diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp index db9dbb14..ba4c8f9e 100644 --- a/kexi/widget/kexiscrollview.cpp +++ b/kexi/widget/kexiscrollview.cpp @@ -52,8 +52,8 @@ KexiScrollView::KexiScrollView(TQWidget *parent, bool preview) , m_scrollViewNavPanel(0) { setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); - viewport()->setPaletteBackgroundColor(tqcolorGroup().mid()); - TQColor fc = tqpalette().active().foreground(), + viewport()->setPaletteBackgroundColor(colorGroup().mid()); + TQColor fc = palette().active().foreground(), bc = viewport()->paletteBackgroundColor(); m_helpColor = KexiUtils::blendedColors(fc, bc, 1, 2); // m_helpColor = TQColor((fc.red()+bc.red()*2)/3, (fc.green()+bc.green()*2)/3, @@ -80,7 +80,7 @@ KexiScrollView::KexiScrollView(TQWidget *parent, bool preview) //! @todo allow to hide navigator updateScrollBars(); m_scrollViewNavPanel = new KexiRecordNavigator(this, leftMargin(), "nav"); - m_scrollViewNavPanel->tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred); + m_scrollViewNavPanel->setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred); } } @@ -173,11 +173,11 @@ KexiScrollView::refreshContentsSize() change = true; } if (change) { - tqrepaint(); - viewport()->tqrepaint(); + repaint(); + viewport()->repaint(); repaintContents(); updateContents(0, 0, 2000,2000); - clipper()->tqrepaint(); + clipper()->repaint(); resizeContents(w, h); } @@ -257,8 +257,8 @@ KexiScrollView::contentsMouseMoveEvent(TQMouseEvent *ev) for(TQObject *o = list->first(); o; o = list->next()) { TQWidget *w = (TQWidget*)o; - tmpx = TQMAX(tmpx, (w->tqgeometry().right() + 10)); - tmpy = TQMAX(tmpy, (w->tqgeometry().bottom() + 10)); + tmpx = TQMAX(tmpx, (w->geometry().right() + 10)); + tmpy = TQMAX(tmpy, (w->geometry().bottom() + 10)); } delete list; @@ -345,7 +345,7 @@ KexiScrollView::drawContents( TQPainter * p, int clipx, int clipy, int clipw, in //draw right and bottom borders const int wx = childX(m_widget); const int wy = childY(m_widget); - p->setPen(tqpalette().active().foreground()); + p->setPen(palette().active().foreground()); p->drawLine(wx+m_widget->width(), wy, wx+m_widget->width(), wy+m_widget->height()); p->drawLine(wx, wy+m_widget->height(), wx+m_widget->width(), wy+m_widget->height()); //kdDebug() << "KexiScrollView::drawContents() " << wy+m_widget->height() << endl; diff --git a/kexi/widget/kexisectionheader.cpp b/kexi/widget/kexisectionheader.cpp index 7e6989f3..0c1b9f76 100644 --- a/kexi/widget/kexisectionheader.cpp +++ b/kexi/widget/kexisectionheader.cpp @@ -22,7 +22,7 @@ #include <kexiutils/utils.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqhbox.h> #include <tqtooltip.h> @@ -65,7 +65,7 @@ KexiSectionHeader::KexiSectionHeader(const TQString &caption, Qt::Orientation o, d->lyr->setAutoAdd(true); d->lbl_b = new TQHBox(this); d->lbl = new TQLabel(TQString(" ")+caption, d->lbl_b); - d->lbl->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred); + d->lbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred); d->lbl->setFocusPolicy(TQ_StrongFocus); d->lbl->installEventFilter(this); installEventFilter(this); @@ -83,7 +83,7 @@ void KexiSectionHeader::addButton(const TQString& icon, const TQString& toolTip, KPushButton *btn = new KPushButton(d->lbl_b); btn->setFlat(true); btn->setFocusPolicy(TQ_NoFocus); - btn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); + btn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); if (receiver && member) { connect(btn, TQT_SIGNAL(clicked()), receiver, member); } @@ -113,19 +113,19 @@ bool KexiSectionHeader::eventFilter( TQObject *o, TQEvent *e ) void KexiSectionHeader::slotFocus(bool in) { - in = in || tqfocusWidget()==this; + in = in || focusWidget()==this; d->lbl->setPaletteBackgroundColor( - in ? tqpalette().active().color(TQColorGroup::Highlight) : tqpalette().active().color(TQColorGroup::Background) ); + in ? palette().active().color(TQColorGroup::Highlight) : palette().active().color(TQColorGroup::Background) ); d->lbl->setPaletteForegroundColor( - in ? tqpalette().active().color(TQColorGroup::HighlightedText) : tqpalette().active().color(TQColorGroup::Foreground) ); + in ? palette().active().color(TQColorGroup::HighlightedText) : palette().active().color(TQColorGroup::Foreground) ); } -TQSize KexiSectionHeader::tqsizeHint() const +TQSize KexiSectionHeader::sizeHint() const { if (!d->lyr->view) - return TQWidget::tqsizeHint(); - TQSize s = d->lyr->view->tqsizeHint(); - return TQSize(s.width(), d->lbl->tqsizeHint().height() + s.height()); + return TQWidget::sizeHint(); + TQSize s = d->lyr->view->sizeHint(); + return TQSize(s.width(), d->lbl->sizeHint().height() + s.height()); } /*void KexiSectionHeader::setFocus() diff --git a/kexi/widget/kexisectionheader.h b/kexi/widget/kexisectionheader.h index 9ed31a35..a8d08a45 100644 --- a/kexi/widget/kexisectionheader.h +++ b/kexi/widget/kexisectionheader.h @@ -41,7 +41,7 @@ class KEXIEXTWIDGETS_EXPORT KexiSectionHeader : public TQWidget virtual bool eventFilter( TQObject *o, TQEvent *e ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: void slotFocus(bool in); diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp index 81bab0c6..a2ccf318 100644 --- a/kexi/widget/kexismalltoolbutton.cpp +++ b/kexi/widget/kexismalltoolbutton.cpp @@ -70,8 +70,8 @@ void KexiSmallToolButton::updateAction() void KexiSmallToolButton::init() { - setPaletteBackgroundColor(tqpalette().active().background()); - tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); + setPaletteBackgroundColor(palette().active().background()); + setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); TQFont f(KGlobalSettings::toolBarFont()); f.setPixelSize(Kexi::smallFont().pixelSize()); setFont(f); @@ -125,7 +125,7 @@ void KexiSmallToolButton::drawButton( TQPainter *_painter ) if (isEnabled()) arrowFlags |= TQStyle::Style_Enabled; tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter, - TQRect(width()-7, height()-7, 5, 5), tqcolorGroup(), + TQRect(width()-7, height()-7, 5, 5), colorGroup(), arrowFlags, TQStyleOption() ); } } diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp index 0aeddca4..eade3cdd 100644 --- a/kexi/widget/pixmapcollection.cpp +++ b/kexi/widget/pixmapcollection.cpp @@ -18,7 +18,7 @@ */ #include <tqpixmap.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqstringlist.h> #include <tqtoolbutton.h> @@ -159,7 +159,7 @@ LoadIconDialog::LoadIconDialog(TQWidget *parent) // Name input TQLabel *name = new TQLabel(i18n("&Name:"), frame); l->addWidget(name, 0, 0); - name->tqsetAlignment(TQt::AlignRight|TQt::AlignVCenter); + name->setAlignment(TQt::AlignRight|TQt::AlignVCenter); m_nameInput = new KLineEdit("kexi", frame); l->addWidget(m_nameInput, 0, 1); name->setBuddy(m_nameInput); @@ -167,7 +167,7 @@ LoadIconDialog::LoadIconDialog(TQWidget *parent) // Choose size TQLabel *size = new TQLabel(i18n("&Size:"), frame); l->addWidget(size, 1, 0); - size->tqsetAlignment(TQt::AlignRight|TQt::AlignVCenter); + size->setAlignment(TQt::AlignRight|TQt::AlignVCenter); KComboBox *combo = new KComboBox(frame); l->addWidget(combo, 1, 1); @@ -232,7 +232,7 @@ TQString LoadIconDialog::iconName() /// Pixmap Collection Editor Dialog PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQWidget *parent) : KDialogBase(parent, "pixcollection_dialog", true, - i18n("Edit Pixmap Collection: %1").tqarg(collection->collectionName()), Close, Close, false) + i18n("Edit Pixmap Collection: %1").arg(collection->collectionName()), Close, Close, false) { m_collection = collection; TQFrame *frame = makeMainWidget(); @@ -240,28 +240,28 @@ PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQW setInitialSize(TQSize(400, 200), true); //// Setup the icon toolbar ///////////////// - TQVBoxLayout *vtqlayout = new TQVBoxLayout(l, 3); + TQVBoxLayout *vlayout = new TQVBoxLayout(l, 3); TQToolButton *newItemPath = new TQToolButton(frame); newItemPath->setIconSet(BarIconSet("fileopen")); newItemPath->setTextLabel(i18n("&Add File"), true); - vtqlayout->addWidget(newItemPath); + vlayout->addWidget(newItemPath); m_buttons.insert(BNewItemPath, newItemPath); connect(newItemPath, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItemByPath())); TQToolButton *newItemName = new TQToolButton(frame); newItemName->setIconSet(BarIconSet("icons")); newItemName->setTextLabel(i18n("&Add an Icon"), true); - vtqlayout->addWidget(newItemName); + vlayout->addWidget(newItemName); m_buttons.insert(BNewItemName, newItemName); connect(newItemName, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItemByName())); TQToolButton *delItem = new TQToolButton(frame); delItem->setIconSet(BarIconSet("edit_remove")); delItem->setTextLabel(i18n("&Remove Selected Item"), true); - vtqlayout->addWidget(delItem); + vlayout->addWidget(delItem); m_buttons.insert(BDelItem, delItem); connect(delItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeItem())); - vtqlayout->addStretch(); + vlayout->addStretch(); // Setup the iconView m_iconView = new KIconView(frame, "pixcollection_iconView"); @@ -312,7 +312,7 @@ PixmapCollectionEditor::removeItem() int confirm = KMessageBox::questionYesNo(parentWidget(), TQString("<qt>")+ i18n("Do you want to remove item \"%1\" from collection \"%2\"?") - .tqarg(item->text()).tqarg(m_collection->collectionName()) + "</qt>"); + .arg(item->text()).arg(m_collection->collectionName()) + "</qt>"); if(confirm == KMessageBox::No) return; @@ -373,7 +373,7 @@ PixmapCollectionEditor::displayMenu(TQIconViewItem *it, const TQPoint &p) //// A Dialog to choose a pixmap from the PixmapCollection PixmapCollectionChooser::PixmapCollectionChooser(PixmapCollection *collection, const TQString &selectedItem, TQWidget *parent) -: KDialogBase(parent, "pixchoose_dialog", true, i18n("Select Pixmap From %1").tqarg(collection->collectionName()), +: KDialogBase(parent, "pixchoose_dialog", true, i18n("Select Pixmap From %1").arg(collection->collectionName()), User1|Ok|Cancel, Ok, false, KGuiItem(i18n("Edit Collection..."))) { m_collection = collection; diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp index 18c19ef9..e3537aa5 100644 --- a/kexi/widget/relations/kexirelationview.cpp +++ b/kexi/widget/relations/kexirelationview.cpp @@ -21,7 +21,7 @@ #include <kdebug.h> #include <tqstringlist.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqheader.h> #include <tqevent.h> @@ -57,7 +57,7 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name) // connect(relation, TQT_SIGNAL(relationListUpdated(TQObject *)), this, TQT_SLOT(slotListUpdate(TQObject *))); - viewport()->setPaletteBackgroundColor(tqcolorGroup().mid()); + viewport()->setPaletteBackgroundColor(colorGroup().mid()); setFocusPolicy(TQ_WheelFocus); setResizePolicy(Manual); /*MOVED TO KexiRelationDialog @@ -94,7 +94,7 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name) invalidateActions(); #endif - tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, true); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, true); } KexiRelationView::~KexiRelationView() @@ -146,13 +146,13 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const TQRect &rect) addChild(c, 100,100); if (rect.isValid()) {//predefined size - TQSize finalSize = c->size().expandedTo( c->tqsizeHint() ); + TQSize finalSize = c->size().expandedTo( c->sizeHint() ); TQRect r = rect; r.setSize( finalSize + TQSize(0,10) ); moveChild( c, rect.left(), rect.top() ); //we're doing this instead of setGeometry(rect) //because the geomenty might be saved on other system with bigger fonts :) - c->resize(c->tqsizeHint()); + c->resize(c->sizeHint()); // c->setGeometry(r); //TODO @@ -164,7 +164,7 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const TQRect &rect) updateGeometry(); if (!rect.isValid()) { c->updateGeometry(); - c->resize(c->tqsizeHint()); + c->resize(c->sizeHint()); } int x, y; @@ -584,9 +584,9 @@ void KexiRelationView::slotTableViewGotFocus() emit tableViewGotFocus(); } -TQSize KexiRelationView::tqsizeHint() const +TQSize KexiRelationView::sizeHint() const { - return TQSize(TQScrollView::tqsizeHint());//.width(), 600); + return TQSize(TQScrollView::sizeHint());//.width(), 600); } void KexiRelationView::clear() diff --git a/kexi/widget/relations/kexirelationview.h b/kexi/widget/relations/kexirelationview.h index 6bc31b31..33d988b9 100644 --- a/kexi/widget/relations/kexirelationview.h +++ b/kexi/widget/relations/kexirelationview.h @@ -78,7 +78,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public TQScrollView TablesDict* tables() { return &m_tables; } /*! Adds a table \a t to the area. This changes only visual representation. - If \a rect is valid, table widget tqgeometry will be initialized. + If \a rect is valid, table widget geometry will be initialized. \return added table container or 0 on failure. */ KexiRelationViewTableContainer* addTableContainer(KexiDB::TableSchema *t, @@ -96,7 +96,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public TQScrollView inline KexiRelationViewTableContainer* focusedTableView() const { return m_focusedTableView; } - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; const ConnectionList* connections() const { return &m_connectionViews; } diff --git a/kexi/widget/relations/kexirelationviewconnection.cpp b/kexi/widget/relations/kexirelationviewconnection.cpp index c0635c1b..fe3b5a53 100644 --- a/kexi/widget/relations/kexirelationviewconnection.cpp +++ b/kexi/widget/relations/kexirelationviewconnection.cpp @@ -67,7 +67,7 @@ KexiRelationViewConnection::~KexiRelationViewConnection() void KexiRelationViewConnection::drawConnection(TQPainter *p) { - p->setPen(m_parent->tqpalette().active().foreground()); + p->setPen(m_parent->palette().active().foreground()); int sx = m_masterTable->x() + m_masterTable->width() + m_parent->contentsX(); int sy = m_masterTable->globalY(m_masterField); int rx = m_detailsTable->x() + m_parent->contentsX(); @@ -92,7 +92,7 @@ KexiRelationViewConnection::drawConnection(TQPainter *p) pa.setPoint(0, rx - 4, ry - 3); pa.setPoint(1, rx - 4, ry + 3); pa.setPoint(2, rx - 1, ry); - p->tqdrawPolygon(pa, true); + p->drawPolygon(pa, true); //master side p->drawLine(sx, sy - 1, sx + side1CharWidth -1, sy - 1); @@ -134,7 +134,7 @@ KexiRelationViewConnection::drawConnection(TQPainter *p) pa.setPoint(0, lx + 3, ry - 3); pa.setPoint(1, lx + 3, ry + 3); pa.setPoint(2, lx, ry); - p->tqdrawPolygon(pa, true); + p->drawPolygon(pa, true); // p->drawLine(lx, ry, lx + 8, ry); // p->drawPoint(lx + 1, ry - 1); diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp index 55440da4..5de32b91 100644 --- a/kexi/widget/relations/kexirelationviewtable.cpp +++ b/kexi/widget/relations/kexirelationviewtable.cpp @@ -21,7 +21,7 @@ #include <stdlib.h> #include <tqheader.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqpushbutton.h> #include <tqcursor.h> @@ -61,18 +61,18 @@ KexiRelationViewTableContainer::KexiRelationViewTableContainer( m_tableHeader = new KexiRelationViewTableContainerHeader(schema->name(), this); m_tableHeader->unsetFocus(); - m_tableHeader->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); + m_tableHeader->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); lyr->addWidget(m_tableHeader); connect(m_tableHeader,TQT_SIGNAL(moved()),this,TQT_SLOT(moved())); connect(m_tableHeader, TQT_SIGNAL(endDrag()), this, TQT_SIGNAL(endDrag())); m_tableView = new KexiRelationViewTable(schema, parent, this, "KexiRelationViewTable"); //m_tableHeader->setFocusProxy( m_tableView ); - m_tableView->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); + m_tableView->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); - m_tableView->setMaximumSize( m_tableView->tqsizeHint() ); + m_tableView->setMaximumSize( m_tableView->sizeHint() ); -// m_tableView->resize( m_tableView->tqsizeHint() ); +// m_tableView->resize( m_tableView->sizeHint() ); lyr->addWidget(m_tableView, 0); connect(m_tableView, TQT_SIGNAL(tableScrolling()), this, TQT_SLOT(moved())); connect(m_tableView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), @@ -110,13 +110,13 @@ int KexiRelationViewTableContainer::globalY(const TQString &field) } #if 0//js -TQSize KexiRelationViewTableContainer::tqsizeHint() +TQSize KexiRelationViewTableContainer::sizeHint() { #ifdef TQ_WS_WIN - TQSize s = m_tableView->tqsizeHint() + TQSize s = m_tableView->sizeHint() + TQSize( 2 * 5 , m_tableHeader->height() + 2 * 5 ); #else - TQSize s = m_tableView->tqsizeHint(); + TQSize s = m_tableView->sizeHint(); s.setWidth(s.width() + 4); s.setHeight(m_tableHeader->height() + s.height()); #endif @@ -140,7 +140,7 @@ void KexiRelationViewTableContainer::setFocus() m_tableView->setPalette(p);*/ raise(); - tqrepaint(); + repaint(); emit gotFocus(); } @@ -166,7 +166,7 @@ void KexiRelationViewTableContainer::unsetFocus() m_tableView->setPalette(p);*/ clearFocus(); - tqrepaint(); + repaint(); } @@ -307,7 +307,7 @@ KexiRelationViewTable::~KexiRelationViewTable() { } -TQSize KexiRelationViewTable::tqsizeHint() const +TQSize KexiRelationViewTable::sizeHint() const { TQFontMetrics fm(fontMetrics()); @@ -341,7 +341,7 @@ KexiRelationViewTable::globalY(const TQString &item) TQListViewItem *i = findItem(item, 0); if (!i) return -1; - int y = tqitemRect(i).y() + (tqitemRect(i).height() / 2); + int y = itemRect(i).y() + (itemRect(i).height() / 2); if (contentsY() > itemPos(i)) y = 0; else if (y == 0) @@ -420,10 +420,10 @@ void KexiRelationViewTable::contentsMousePressEvent(TQMouseEvent *ev) TQRect KexiRelationViewTable::drawItemHighlighter(TQPainter *painter, TQListViewItem *item) { if (painter) { - tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, tqitemRect(item), tqcolorGroup(), + tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, itemRect(item), colorGroup(), TQStyle::Style_FocusAtBorder); } - return tqitemRect(item); + return itemRect(item); } #include "kexirelationviewtable.moc" diff --git a/kexi/widget/relations/kexirelationviewtable.h b/kexi/widget/relations/kexirelationviewtable.h index 5c622dad..6578cdd5 100644 --- a/kexi/widget/relations/kexirelationviewtable.h +++ b/kexi/widget/relations/kexirelationviewtable.h @@ -105,7 +105,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTable : public KexiFieldListView // KexiDB::TableSchema *table() const { return m_table; }; int globalY(const TQString &item); // void setReadOnly(bool); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; signals: void tableScrolling(); diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp index 4b952163..0ff65f38 100644 --- a/kexi/widget/relations/kexirelationwidget.cpp +++ b/kexi/widget/relations/kexirelationwidget.cpp @@ -21,7 +21,7 @@ #include "kexirelationwidget.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <tqpushbutton.h> #include <tqtimer.h> @@ -59,7 +59,7 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent, m_tableCombo->setInsertionPolicy(TQComboBox::NoInsertion); hlyr->addWidget(lbl); hlyr->addWidget(m_tableCombo); - m_tableCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred)); + m_tableCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred)); fillTablesCombo(); m_btnAdd = new KPushButton(i18n("&Add"), this); @@ -302,9 +302,9 @@ void KexiRelationWidget::designSelectedTable() Kexi::DesignViewMode, openingCancelled); } -TQSize KexiRelationWidget::tqsizeHint() const +TQSize KexiRelationWidget::sizeHint() const { - return m_relationView->tqsizeHint(); + return m_relationView->sizeHint(); } void KexiRelationWidget::slotTableHidden(KexiDB::TableSchema &table) diff --git a/kexi/widget/relations/kexirelationwidget.h b/kexi/widget/relations/kexirelationwidget.h index 39ac549a..6899a434 100644 --- a/kexi/widget/relations/kexirelationwidget.h +++ b/kexi/widget/relations/kexirelationwidget.h @@ -60,7 +60,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase // void openTable(KexiDB::TableSchema* table, bool designMode); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /*! Used to add newly created object information to the combo box. */ void objectCreated(const TQCString &mime, const TQCString& name); @@ -76,7 +76,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase public slots: /*! Adds a table \a t to the area. This changes only visual representation. - If \a rect is valid, table widget rtqgeometry will be initialized. + If \a rect is valid, table widget rgeometry will be initialized. */ void addTable(KexiDB::TableSchema *t, const TQRect &rect = TQRect()); diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp index 7ad76c34..2700477a 100644 --- a/kexi/widget/tableview/kexiblobtableedit.cpp +++ b/kexi/widget/tableview/kexiblobtableedit.cpp @@ -25,8 +25,8 @@ #include <tqdatastream.h> #include <tqfile.h> #include <tqpopupmenu.h> -#include <tqtextedit.h> -#include <tqlayout.h> +#include <textedit.h> +#include <layout.h> #include <tqstatusbar.h> #include <tqlabel.h> #include <tqpixmap.h> @@ -34,7 +34,7 @@ #include <tqpainter.h> #include <tqtooltip.h> #include <tqapplication.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqbuffer.h> #include <kdebug.h> @@ -309,14 +309,14 @@ void KexiBlobTableEdit::executeCopyAction(const TQByteArray& data) TQPixmap pixmap; if (!pixmap.loadFromData(data)) return; - tqApp->tqclipboard()->setPixmap(pixmap, TQClipboard::Clipboard); + tqApp->clipboard()->setPixmap(pixmap, TQClipboard::Clipboard); } void KexiBlobTableEdit::handlePasteAction() { if (isReadOnly()) return; - TQPixmap pm( tqApp->tqclipboard()->pixmap(TQClipboard::Clipboard) ); + TQPixmap pm( tqApp->clipboard()->pixmap(TQClipboard::Clipboard) ); TQByteArray ba; TQBuffer buffer( ba ); buffer.open( IO_WriteOnly ); @@ -559,7 +559,7 @@ void KexiKIconTableEdit::setupContents( TQPainter *p, bool /*focused*/, const TQ s = TQMIN( h-3, s ); s = TQMIN( w-3, s );//avoid too large box TQRect r( TQMAX( w/2 - s/2, 0 ) , h/2 - s/2 /*- 1*/, s, s); - p->setPen(TQPen(tqcolorGroup().text(), 1)); + p->setPen(TQPen(colorGroup().text(), 1)); p->drawRect(r); if (val.asBool()) { p->drawLine(r.x(), r.y(), r.right(), r.bottom()); diff --git a/kexi/widget/tableview/kexibooltableedit.cpp b/kexi/widget/tableview/kexibooltableedit.cpp index 8f199b5d..950d19b7 100644 --- a/kexi/widget/tableview/kexibooltableedit.cpp +++ b/kexi/widget/tableview/kexibooltableedit.cpp @@ -23,7 +23,7 @@ #include <tqpainter.h> #include <tqapplication.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <kglobal.h> #include <klocale.h> @@ -105,7 +105,7 @@ void KexiBoolTableEdit::setupContents( TQPainter *p, bool focused, const TQVaria s = TQMIN( h-3, s ); s = TQMIN( w-3, s );//avoid too large box TQRect r( TQMAX( w/2 - s/2, 0 ) , h/2 - s/2 /*- 1*/, s, s); -//already set ouotside: p->setPen(TQPen(tqcolorGroup().text(), 1)); +//already set ouotside: p->setPen(TQPen(colorGroup().text(), 1)); p->drawRect(r); if (val.isNull()) { // && !field()->isNotNull()) { p->drawText( r, TQt::AlignCenter, "?" ); @@ -135,7 +135,7 @@ void KexiBoolTableEdit::handleAction(const TQString& actionName) if (actionName=="edit_paste") { emit editRequested(); bool ok; - const int value = tqApp->tqclipboard()->text( TQClipboard::Clipboard ).toInt(&ok); + const int value = tqApp->clipboard()->text( TQClipboard::Clipboard ).toInt(&ok); if (ok) { m_currentValue = (value==0) ? TQVariant(false, 0) : TQVariant(true, 1); } diff --git a/kexi/widget/tableview/kexicomboboxbase.cpp b/kexi/widget/tableview/kexicomboboxbase.cpp index 89ba63cf..be2f81be 100644 --- a/kexi/widget/tableview/kexicomboboxbase.cpp +++ b/kexi/widget/tableview/kexicomboboxbase.cpp @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <tqstyle.h> #include <tqwindowsstyle.h> #include <tqpainter.h> diff --git a/kexi/widget/tableview/kexicomboboxpopup.cpp b/kexi/widget/tableview/kexicomboboxpopup.cpp index 6a2feec8..5e74a20e 100644 --- a/kexi/widget/tableview/kexicomboboxpopup.cpp +++ b/kexi/widget/tableview/kexicomboboxpopup.cpp @@ -30,7 +30,7 @@ #include <kdebug.h> -#include <tqlayout.h> +#include <layout.h> #include <tqevent.h> /*! @internal @@ -56,8 +56,8 @@ class KexiComboBoxPopup_KexiTableView : public KexiDataTableView a.rowHighlightingEnabled = true; a.rowMouseOverHighlightingEnabled = true; a.persistentSelections = false; - a.rowMouseOverHighlightingColor = tqcolorGroup().highlight(); - a.rowMouseOverHighlightingTextColor = tqcolorGroup().highlightedText(); + a.rowMouseOverHighlightingColor = colorGroup().highlight(); + a.rowMouseOverHighlightingTextColor = colorGroup().highlightedText(); a.rowHighlightingTextColor = a.rowMouseOverHighlightingTextColor; a.gridEnabled = false; setAppearance(a); @@ -68,7 +68,7 @@ class KexiComboBoxPopup_KexiTableView : public KexiDataTableView setContextMenuEnabled( false ); setScrollbarToolTipsEnabled( false ); installEventFilter(this); - setBottomMarginInternal( - horizontalScrollBar()->tqsizeHint().height() ); + setBottomMarginInternal( - horizontalScrollBar()->sizeHint().height() ); } virtual void setData( KexiTableViewData *data, bool owner = true ) { KexiTableView::setData( data, owner ); } diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp index 3ae97974..24c4c38f 100644 --- a/kexi/widget/tableview/kexicomboboxtableedit.cpp +++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp @@ -18,12 +18,12 @@ * Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <tqstyle.h> #include <tqwindowsstyle.h> #include <tqpainter.h> #include <tqapplication.h> -#include <tqclipboard.h> +#include <clipboard.h> #include "kexicomboboxtableedit.h" #include <widget/utils/kexicomboboxdropdownbutton.h> @@ -80,11 +80,11 @@ KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidg // m_lineedit->setFrameStyle( TQFrame::Plain | TQFrame::Box ); // m_lineedit->setLineWidth( 1 ); // if (f.isNumericType()) { -// m_lineedit->tqsetAlignment(AlignRight); +// m_lineedit->setAlignment(AlignRight); // } // setView( m_lineedit ); -// tqlayout->addWidget(m_view); +// layout->addWidget(m_view); // m_combo->setEditable( true ); // m_combo->clear(); // m_combo->insertStringList(f.enumHints()); @@ -350,8 +350,8 @@ bool KexiComboBoxTableEdit::eventFilter( TQObject *o, TQEvent *e ) if (!column()->isReadOnly() && e->type()==TQEvent::MouseButtonPress && m_scrollView) { TQPoint gp = TQT_TQMOUSEEVENT(e)->globalPos() + TQPoint(m_scrollView->childX(d->button), m_scrollView->childY(d->button)); - TQRect r(d->button->mapToGlobal(d->button->tqgeometry().topLeft()), - d->button->mapToGlobal(d->button->tqgeometry().bottomRight())); + TQRect r(d->button->mapToGlobal(d->button->geometry().topLeft()), + d->button->mapToGlobal(d->button->geometry().bottomRight())); if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(popup()) && popup()->isVisible() && r.contains( gp )) { m_mouseBtnPressedWhenPopupVisible = true; } @@ -434,7 +434,7 @@ void KexiComboBoxTableEdit::handleAction(const TQString& actionName) m_lineedit->clear(); } //! @todo does not work with BLOBs! - setValueInInternalEditor( tqApp->tqclipboard()->text() ); + setValueInInternalEditor( tqApp->clipboard()->text() ); } else KexiInputTableEdit::handleAction(actionName); diff --git a/kexi/widget/tableview/kexidataawareobjectiface.cpp b/kexi/widget/tableview/kexidataawareobjectiface.cpp index 79613d9d..ce0b7695 100644 --- a/kexi/widget/tableview/kexidataawareobjectiface.cpp +++ b/kexi/widget/tableview/kexidataawareobjectiface.cpp @@ -84,7 +84,7 @@ KexiDataAwareObjectInterface::KexiDataAwareObjectInterface() m_scrollBarTip->setPalette(TQToolTip::palette()); m_scrollBarTip->setMargin(2); m_scrollBarTip->setIndent(0); - m_scrollBarTip->tqsetAlignment(TQt::AlignCenter); + m_scrollBarTip->setAlignment(TQt::AlignCenter); m_scrollBarTip->setFrameStyle( TQFrame::Plain | TQFrame::Box ); m_scrollBarTip->setLineWidth(1); @@ -539,8 +539,8 @@ void KexiDataAwareObjectInterface::setCursorPosition(int row, int col/*=-1*/, bo if ( forceSet || m_curRow != newrow || m_curCol != newcol ) { - kexidbg << "setCursorPosition(): " <<TQString("old:%1,%2 new:%3,%4").tqarg(m_curCol) - .tqarg(m_curRow).tqarg(newcol).tqarg(newrow) << endl; + kexidbg << "setCursorPosition(): " <<TQString("old:%1,%2 new:%3,%4").arg(m_curCol) + .arg(m_curRow).arg(newcol).arg(newrow) << endl; // cursor moved: get rid of editor if (m_editor) { @@ -645,7 +645,7 @@ void KexiDataAwareObjectInterface::setCursorPosition(int row, int col/*=-1*/, bo } else { kdDebug(44021) << TQString("NOW item at %1 (%2) is current") - .tqarg(m_curRow).tqarg((ulong)itemAt(m_curRow)) << endl; + .arg(m_curRow).arg((ulong)itemAt(m_curRow)) << endl; //NOT EFFECTIVE!!!!!!!!!!! //set item iterator if (!newRowInserted && isInsertingEnabled() && m_currentItem == m_insertItem && m_curRow == (rows()-1)) { @@ -838,7 +838,7 @@ bool KexiDataAwareObjectInterface::cancelRowEdit() // viewport()->width(), d->rowHeight*3 + (m_navPanel ? m_navPanel->height() : 0)*3 ); // updateContents(); //js: above did not work well so we do that dirty updateWidgetContents(); -//TODO: still doesn't tqrepaint properly!! +//TODO: still doesn't repaint properly!! // TQSize s(tableSize()); // resizeContents(s.width(), s.height()); updateWidgetContentsSize(); @@ -940,7 +940,7 @@ bool KexiDataAwareObjectInterface::acceptEditor() if (!m_errorMessagePopup) { // m_errorMessagePopup->close(); m_errorMessagePopup = new KexiArrowTip( - i18n("Error: %1").tqarg(m_editor->columnInfo()->field->typeName())+"?", + i18n("Error: %1").arg(m_editor->columnInfo()->field->typeName())+"?", dynamic_cast<TQWidget*>(this)); m_errorMessagePopup->move( par->mapToGlobal(edit->pos()) + TQPoint(6, edit->height() + 0) ); @@ -954,8 +954,8 @@ bool KexiDataAwareObjectInterface::acceptEditor() if (m_editor->field()->isNotNull() && !autoIncColumnCanBeOmitted) { kdDebug() << "KexiDataAwareObjectInterface::acceptEditor(): NULL NOT ALLOWED!" << endl; res = Validator::Error; -// msg = Validator::msgColumnNotEmpty().tqarg(m_editor->columnInfo()->field->captionOrName()) - msg = Validator::msgColumnNotEmpty().tqarg(m_editor->field()->captionOrName()) +// msg = Validator::msgColumnNotEmpty().arg(m_editor->columnInfo()->field->captionOrName()) + msg = Validator::msgColumnNotEmpty().arg(m_editor->field()->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData(); desc = i18n("The column's constraint is declared as NOT NULL."); editCurrentCellAgain = true; @@ -976,8 +976,8 @@ bool KexiDataAwareObjectInterface::acceptEditor() if (m_editor->field()->isNotEmpty() && !autoIncColumnCanBeOmitted) { kdDebug() << "KexiDataAwareObjectInterface::acceptEditor(): EMPTY NOT ALLOWED!" << endl; res = Validator::Error; -// msg = Validator::msgColumnNotEmpty().tqarg(m_editor->columnInfo()->field->captionOrName()) - msg = Validator::msgColumnNotEmpty().tqarg(m_editor->field()->captionOrName()) +// msg = Validator::msgColumnNotEmpty().arg(m_editor->columnInfo()->field->captionOrName()) + msg = Validator::msgColumnNotEmpty().arg(m_editor->field()->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData(); desc = i18n("The column's constraint is declared as NOT EMPTY."); editCurrentCellAgain = true; @@ -994,8 +994,8 @@ bool KexiDataAwareObjectInterface::acceptEditor() if (m_editor->field()->isNotNull() && !autoIncColumnCanBeOmitted) { kdDebug() << "KexiDataAwareObjectInterface::acceptEditor(): NEITHER NULL NOR EMPTY VALUE CAN BE SET!" << endl; res = Validator::Error; -// msg = Validator::msgColumnNotEmpty().tqarg(m_editor->columnInfo()->field->captionOrName()) - msg = Validator::msgColumnNotEmpty().tqarg(m_editor->field()->captionOrName()) +// msg = Validator::msgColumnNotEmpty().arg(m_editor->columnInfo()->field->captionOrName()) + msg = Validator::msgColumnNotEmpty().arg(m_editor->field()->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData(); desc = i18n("The column's constraint is declared as NOT EMPTY and NOT NULL."); editCurrentCellAgain = true; @@ -1251,7 +1251,7 @@ void KexiDataAwareObjectInterface::insertItem(KexiTableItem *newItem, int row) m_curRow++; } - m_data->insertRow(*newItem, row, true /*tqrepaint*/); + m_data->insertRow(*newItem, row, true /*repaint*/); if (changeCurrentRow) { //update iter... @@ -1281,15 +1281,15 @@ void KexiDataAwareObjectInterface::insertItem(KexiTableItem *newItem, int row) */ } -void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem *item, bool tqrepaint) +void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem *item, bool repaint) { int row = m_data->findRef(item); - slotRowInserted( item, row, tqrepaint ); + slotRowInserted( item, row, repaint ); } -void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem * /*item*/, uint row, bool tqrepaint) +void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem * /*item*/, uint row, bool repaint) { - if (tqrepaint && (int)row<rows()) { + if (repaint && (int)row<rows()) { updateWidgetContentsSize(); /* updateAllVisibleRowsBelow() used instead @@ -1317,7 +1317,7 @@ void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem * /*item*/, uin } } -tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool tqrepaint) +tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool repaint) { if (!hasData()) return true; @@ -1331,7 +1331,7 @@ tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool tqrepaint) tableName.append("\""); } if (KMessageBox::Cancel == KMessageBox::warningContinueCancel(dynamic_cast<TQWidget*>(this), - i18n("Do you want to clear the contents of table %1?").tqarg(tableName), + i18n("Do you want to clear the contents of table %1?").arg(tableName), 0, KGuiItem(i18n("&Clear Contents")) )) return cancelled; } @@ -1339,10 +1339,10 @@ tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool tqrepaint) cancelRowEdit(); // acceptRowEdit(); // m_verticalHeader->clear(); - const bool repaintLater = tqrepaint && m_spreadSheetMode; + const bool repaintLater = repaint && m_spreadSheetMode; const int oldRows = rows(); - bool res = m_data->deleteAllRows(tqrepaint && !repaintLater); + bool res = m_data->deleteAllRows(repaint && !repaintLater); if (res) { if (m_spreadSheetMode) { @@ -1359,21 +1359,21 @@ tristate KexiDataAwareObjectInterface::deleteAllRows(bool ask, bool tqrepaint) // m_verticalHeader->setCurrentRow(-1); // d->pUpdateTimer->start(1,true); -// if (tqrepaint) -// viewport()->tqrepaint(); +// if (repaint) +// viewport()->repaint(); return res; } -void KexiDataAwareObjectInterface::clearColumns(bool tqrepaint) +void KexiDataAwareObjectInterface::clearColumns(bool repaint) { cancelRowEdit(); m_data->clearInternal(); - clearColumnsInternal(tqrepaint); + clearColumnsInternal(repaint); updateIndicesForVisibleValues(); - if (tqrepaint) -// viewport()->tqrepaint(); + if (repaint) +// viewport()->repaint(); //OK? updateWidgetContents(); @@ -1393,7 +1393,7 @@ void KexiDataAwareObjectInterface::clearColumns(bool tqrepaint) m_verticalHeader->setCurrentRow(-1); - viewport()->tqrepaint(); + viewport()->repaint(); // d->pColumnTypes.resize(0); // d->pColumnModes.resize(0); @@ -1490,9 +1490,9 @@ void KexiDataAwareObjectInterface::setEmptyRowInsertingEnabled(bool set) } void KexiDataAwareObjectInterface::slotAboutToDeleteRow(KexiTableItem& item, - KexiDB::ResultInfo* /*result*/, bool tqrepaint) + KexiDB::ResultInfo* /*result*/, bool repaint) { - if (tqrepaint) { + if (repaint) { m_rowWillBeDeleted = m_data->findRef(&item); } } @@ -1534,7 +1534,7 @@ bool KexiDataAwareObjectInterface::deleteItem(KexiTableItem *item)/*, bool moveC const bool lastRowDeleted = m_spreadSheetMode && m_data->last() == item; //we need to know this so we //can return to the last row //after reinserting it - if (!m_data->deleteRow(*item, true /*tqrepaint*/)) { + if (!m_data->deleteRow(*item, true /*repaint*/)) { /*const int button =*/ showErrorMessageForResult( m_data->result() ); // if (KMessageBox::No == button) { @@ -1950,7 +1950,7 @@ static inline bool findInString(const TQString& stringValue, int stringLength, c if (firstCharacter != -1 && firstCharacter != 0) { //we're not at 0-th char firstCharacter = -1; } - else if (where.tqstartsWith(stringValue, caseSensitive)) { + else if (where.startsWith(stringValue, caseSensitive)) { if (wholeWordsOnly) { // If where.length() < stringValue.length(), true will be returned too - fine. return !where.at( stringValue.length() ).isLetterOrNumber(); diff --git a/kexi/widget/tableview/kexidataawareobjectiface.h b/kexi/widget/tableview/kexidataawareobjectiface.h index 389c1c74..0fed82b6 100644 --- a/kexi/widget/tableview/kexidataawareobjectiface.h +++ b/kexi/widget/tableview/kexidataawareobjectiface.h @@ -267,14 +267,14 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface Does not clear columns information. Does not destroy KexiTableViewData object (if present) but only clears its contents. Displays confirmation dialog if \a ask is true (the default is false). - Repaints widget if \a tqrepaint is true (the default). + Repaints widget if \a repaint is true (the default). For empty tables, true is returned immediately. If isDeleteEnabled() is false, false is returned. For spreadsheet mode all current rows are just replaced by empty rows. \return true on success, false on failure, and cancelled if user cancelled deletion (only possible if \a ask is true). */ - tristate deleteAllRows(bool ask = false, bool tqrepaint = true); + tristate deleteAllRows(bool ask = false, bool repaint = true); /*! \return maximum number of rows that can be displayed per one "page" for current view's size. */ @@ -537,12 +537,12 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface virtual void initDataContents(); /*! Clears columns information and thus all internal table data - and its visible representation. Repaints widget if \a tqrepaint is true. */ - virtual void clearColumns(bool tqrepaint = true); + and its visible representation. Repaints widget if \a repaint is true. */ + virtual void clearColumns(bool repaint = true); /*! Called by clearColumns() to clear internals of the object. For example, KexiTableView removes contents of it's horizontal header. */ - virtual void clearColumnsInternal(bool tqrepaint) = 0; + virtual void clearColumnsInternal(bool repaint) = 0; /*! @internal for implementation This should append another section within horizontal header or any sort of caption @@ -654,16 +654,16 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface //! Handles KexiTableViewData::aboutToDeleteRow() signal. Prepares info for slotRowDeleted(). virtual void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, - bool tqrepaint); + bool repaint); - //! Handles KexiTableViewData::rowDeleted() signal to tqrepaint when needed. + //! Handles KexiTableViewData::rowDeleted() signal to repaint when needed. virtual void slotRowDeleted(); - //! Handles KexiTableViewData::rowInserted() signal to tqrepaint when needed. - virtual void slotRowInserted(KexiTableItem *item, bool tqrepaint); + //! Handles KexiTableViewData::rowInserted() signal to repaint when needed. + virtual void slotRowInserted(KexiTableItem *item, bool repaint); //! Like above, not db-aware version - virtual void slotRowInserted(KexiTableItem *item, uint row, bool tqrepaint); + virtual void slotRowInserted(KexiTableItem *item, uint row, bool repaint); virtual void slotRowsDeleted( const TQValueList<int> & ) {} @@ -675,7 +675,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface virtual void selectCellInternal() {} /*! Used in KexiDataAwareObjectInterface::slotRowDeleted() - to tqrepaint tow \a row and all visible below. + to repaint tow \a row and all visible below. Implemented if there is more than one row displayed, i.e. currently for KexiTableView. */ virtual void updateAllVisibleRowsBelow(int row) { Q_UNUSED( row ); } diff --git a/kexi/widget/tableview/kexidataawarepropertyset.cpp b/kexi/widget/tableview/kexidataawarepropertyset.cpp index 257cf0aa..3b9fe3af 100644 --- a/kexi/widget/tableview/kexidataawarepropertyset.cpp +++ b/kexi/widget/tableview/kexidataawarepropertyset.cpp @@ -92,10 +92,10 @@ uint KexiDataAwarePropertySet::size() const return m_sets.size(); } -void KexiDataAwarePropertySet::clear(uint tqminimumSize) +void KexiDataAwarePropertySet::clear(uint minimumSize) { m_sets.clear(); - m_sets.resize(TQMAX(tqminimumSize, MAX_FIELDS)); + m_sets.resize(TQMAX(minimumSize, MAX_FIELDS)); m_view->setDirty(true); m_view->propertySetSwitched(); } @@ -206,7 +206,7 @@ void KexiDataAwarePropertySet::slotRowsDeleted( const TQValueList<int> &rows ) } //void KexiDataAwarePropertySet::slotEmptyRowInserted(KexiTableItem*, uint /*index*/) -void KexiDataAwarePropertySet::slotRowInserted(KexiTableItem*, uint row, bool /*tqrepaint*/) +void KexiDataAwarePropertySet::slotRowInserted(KexiTableItem*, uint row, bool /*repaint*/) { m_view->setDirty(); diff --git a/kexi/widget/tableview/kexidataawarepropertyset.h b/kexi/widget/tableview/kexidataawarepropertyset.h index e24fbd8a..8db82ba2 100644 --- a/kexi/widget/tableview/kexidataawarepropertyset.h +++ b/kexi/widget/tableview/kexidataawarepropertyset.h @@ -97,7 +97,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwarePropertySet : public TQObject public slots: void removeCurrentPropertySet(); - void clear(uint tqminimumSize = 0); + void clear(uint minimumSize = 0); /*! Inserts \a set property set at \a row position. If there was a buffer at this position before, it will be destroyed. @@ -127,7 +127,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwarePropertySet : public TQObject void slotRowsDeleted( const TQValueList<int> &rows ); //! Called on \a row insertion in a tableview. - void slotRowInserted(KexiTableItem* item, uint row, bool tqrepaint); + void slotRowInserted(KexiTableItem* item, uint row, bool repaint); //! Called on selecting another cell in a tableview. void slotCellSelected(int, int row); diff --git a/kexi/widget/tableview/kexidatetableedit.cpp b/kexi/widget/tableview/kexidatetableedit.cpp index b68b4787..5a8cf297 100644 --- a/kexi/widget/tableview/kexidatetableedit.cpp +++ b/kexi/widget/tableview/kexidatetableedit.cpp @@ -25,16 +25,16 @@ #include <tqpainter.h> #include <tqvariant.h> #include <tqrect.h> -#include <tqpalette.h> +#include <palette.h> #include <tqcolor.h> #include <tqfontmetrics.h> #include <tqdatetime.h> #include <tqcursor.h> #include <tqpoint.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtoolbutton.h> #include <tqdatetimeedit.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <kdebug.h> #include <klocale.h> @@ -163,7 +163,7 @@ void KexiDateTableEdit::slotDateChanged(TQDate date) { m_edit->setDate(date); - tqrepaint(); + repaint(); } void diff --git a/kexi/widget/tableview/kexidatetimetableedit.cpp b/kexi/widget/tableview/kexidatetimetableedit.cpp index 35c599cc..7d33b354 100644 --- a/kexi/widget/tableview/kexidatetimetableedit.cpp +++ b/kexi/widget/tableview/kexidatetimetableedit.cpp @@ -25,16 +25,16 @@ #include <tqpainter.h> #include <tqvariant.h> #include <tqrect.h> -#include <tqpalette.h> +#include <palette.h> #include <tqcolor.h> #include <tqfontmetrics.h> #include <tqdatetime.h> #include <tqcursor.h> #include <tqpoint.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtoolbutton.h> #include <tqdatetimeedit.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <kdebug.h> #include <klocale.h> diff --git a/kexi/widget/tableview/kexiinputtableedit.cpp b/kexi/widget/tableview/kexiinputtableedit.cpp index 1b834fe9..d057f517 100644 --- a/kexi/widget/tableview/kexiinputtableedit.cpp +++ b/kexi/widget/tableview/kexiinputtableedit.cpp @@ -22,11 +22,11 @@ #include <tqregexp.h> #include <tqevent.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <tqpainter.h> #include <tqapplication.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqtooltip.h> #include <kglobal.h> @@ -47,7 +47,7 @@ class MyLineEdit : public KLineEdit {} protected: virtual void drawFrame ( TQPainter * p ) { - p->setPen( TQPen( tqcolorGroup().text() ) ); + p->setPen( TQPen( colorGroup().text() ) ); TQRect r = rect(); p->moveTo( r.topLeft() ); p->lineTo( r.topRight() ); @@ -100,7 +100,7 @@ void KexiInputTableEdit::init() m_lineedit = new MyLineEdit(this, "KexiInputTableEdit-KLineEdit"); setViewWidget(m_lineedit); if (align_right) - m_lineedit->tqsetAlignment(AlignRight); + m_lineedit->setAlignment(AlignRight); // m_cview->setFrame(false); // m_cview->setFrameStyle( TQFrame::Plain | TQFrame::Box ); // m_cview->setLineWidth( 1 ); @@ -222,7 +222,7 @@ TQString KexiInputTableEdit::valueToText(KexiDB::Field* field, const TQVariant& void KexiInputTableEdit::paintEvent ( TQPaintEvent * /*e*/ ) { TQPainter p(this); - p.setPen( TQPen( tqcolorGroup().text() ) ); + p.setPen( TQPen( colorGroup().text() ) ); p.drawRect( rect() ); } diff --git a/kexi/widget/tableview/kexitableedit.cpp b/kexi/widget/tableview/kexitableedit.cpp index e531b814..68991f49 100644 --- a/kexi/widget/tableview/kexitableedit.cpp +++ b/kexi/widget/tableview/kexitableedit.cpp @@ -23,7 +23,7 @@ #include <kexidb/field.h> #include <kexidb/utils.h> -#include <tqpalette.h> +#include <palette.h> #include <tqpainter.h> #include <kglobal.h> @@ -101,7 +101,7 @@ void KexiTableEdit::resize(int w, int h) { TQWidget::resize(w, h); if (m_view) { - if (!tqlayout()) { //if there is tqlayout (eg. KexiInputTableEdit), resize is automatic + if (!layout()) { //if there is layout (eg. KexiInputTableEdit), resize is automatic m_view->move(0,0); m_view->resize(w, h); } diff --git a/kexi/widget/tableview/kexitableitem.cpp b/kexi/widget/tableview/kexitableitem.cpp index 659e341e..d398dabb 100644 --- a/kexi/widget/tableview/kexitableitem.cpp +++ b/kexi/widget/tableview/kexitableitem.cpp @@ -55,7 +55,7 @@ KexiTableItem::clearValues() void KexiTableItem::debug() const { - TQString s = TQString("KexiTableItem (%1 items)").tqarg(size()); + TQString s = TQString("KexiTableItem (%1 items)").arg(size()); for (uint i = 0; i < size(); i++) s.append( TQString::number(i)+":"+at(i).toString()+" " ); kexidbg << s << endl; diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp index 4ed993cd..eeb4e378 100644 --- a/kexi/widget/tableview/kexitableview.cpp +++ b/kexi/widget/tableview/kexitableview.cpp @@ -33,7 +33,7 @@ #include <tqpopupmenu.h> #include <tqcursor.h> #include <tqstyle.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqwhatsthis.h> @@ -102,10 +102,10 @@ class KexiTableView::WhatsThis : public TQWhatsThis const int leftMargin = m_tv->verticalHeaderVisible() ? m_tv->verticalHeader()->width() : 0; //const int topMargin = m_tv->horizontalHeaderVisible() ? m_tv->d->pTopHeader->height() : 0; //const int bottomMargin = m_tv->d->appearance.navigatorEnabled ? m_tv->m_navPanel->height() : 0; - if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->verticalHeader()), TQT_TQOBJECT(m_tv->tqchildAt(pos)))) { + if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->verticalHeader()), TQT_TQOBJECT(m_tv->childAt(pos)))) { return i18n("Contains a pointer to the currently selected row"); } - else if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->m_navPanel), TQT_TQOBJECT(m_tv->tqchildAt(pos)))) { + else if (KexiUtils::hasParent(TQT_TQOBJECT(m_tv->m_navPanel), TQT_TQOBJECT(m_tv->childAt(pos)))) { return i18n("Row navigator"); // return TQWhatsThis::textFor(m_tv->m_navPanel, TQPoint( pos.x(), pos.y() - m_tv->height() + bottomMargin )); } @@ -204,8 +204,8 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch setBackgroundMode(TQt::PaletteBackground); // setEmptyAreaColor(d->appearance.baseColor);//palette().active().color(TQColorGroup::Base)); -// d->baseColor = tqcolorGroup().base(); -// d->textColor = tqcolorGroup().text(); +// d->baseColor = colorGroup().base(); +// d->textColor = colorGroup().text(); // d->altColor = KGlobalSettings::alternateBackgroundColor(); // d->grayColor = TQColor(200,200,200); @@ -240,21 +240,21 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch // Create headers m_horizontalHeader = new KexiTableViewHeader(this, "topHeader"); - m_horizontalHeader->setSelectionBackgroundColor( tqpalette().active().highlight() ); + m_horizontalHeader->setSelectionBackgroundColor( palette().active().highlight() ); m_horizontalHeader->setOrientation(Qt::Horizontal); m_horizontalHeader->setTracking(false); m_horizontalHeader->setMovingEnabled(false); connect(m_horizontalHeader, TQT_SIGNAL(sizeChange(int,int,int)), this, TQT_SLOT(slotTopHeaderSizeChange(int,int,int))); m_verticalHeader = new KexiRecordMarker(this, "rm"); - m_verticalHeader->setSelectionBackgroundColor( tqpalette().active().highlight() ); + m_verticalHeader->setSelectionBackgroundColor( palette().active().highlight() ); m_verticalHeader->setCellHeight(d->rowHeight); // m_verticalHeader->setFixedWidth(d->rowHeight); m_verticalHeader->setCurrentRow(-1); setMargins( - TQMIN(m_horizontalHeader->tqsizeHint().height(), d->rowHeight), - m_horizontalHeader->tqsizeHint().height(), 0, 0); + TQMIN(m_horizontalHeader->sizeHint().height(), d->rowHeight), + m_horizontalHeader->sizeHint().height(), 0, 0); setupNavigator(); @@ -288,7 +288,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch // horizontalScrollBar()->show(); updateScrollBars(); -// resize(tqsizeHint()); +// resize(sizeHint()); // updateContents(); // setMinimumHeight(horizontalScrollBar()->height() + d->rowHeight + topMargin()); @@ -333,7 +333,7 @@ void KexiTableView::setupNavigator() m_navPanel = new KexiRecordNavigator(this, leftMargin(), "navPanel"); m_navPanel->setRecordHandler(this); - m_navPanel->tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred); + m_navPanel->setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred); } void KexiTableView::initDataContents() @@ -366,7 +366,7 @@ void KexiTableView::updateWidgetContentsSize() void KexiTableView::slotRowsDeleted( const TQValueList<int> &rows ) { - viewport()->tqrepaint(); + viewport()->repaint(); updateWidgetContentsSize(); setCursorPosition(TQMAX(0, (int)m_curRow - (int)rows.count()), -1, true); } @@ -384,7 +384,7 @@ void KexiTableView::setFont( const TQFont &font ) updateFonts(true); } -void KexiTableView::updateFonts(bool tqrepaint) +void KexiTableView::updateFonts(bool repaint) { #ifdef TQ_WS_WIN d->rowHeight = fontMetrics().lineSpacing() + 4; @@ -399,15 +399,15 @@ void KexiTableView::updateFonts(bool tqrepaint) // if(d->rowHeight < 22) // d->rowHeight = 22; setMargins( - TQMIN(m_horizontalHeader->tqsizeHint().height(), d->rowHeight), - m_horizontalHeader->tqsizeHint().height(), 0, 0); + TQMIN(m_horizontalHeader->sizeHint().height(), d->rowHeight), + m_horizontalHeader->sizeHint().height(), 0, 0); // setMargins(14, d->rowHeight, 0, 0); m_verticalHeader->setCellHeight(d->rowHeight); KexiDisplayUtils::initDisplayForAutonumberSign(d->autonumberSignDisplayParameters, this); KexiDisplayUtils::initDisplayForDefaultValue(d->defaultValueDisplayParameters, this); - if (tqrepaint) + if (repaint) updateContents(); } @@ -425,7 +425,7 @@ void KexiTableView::updateAllVisibleRowsBelow(int row) clipper()->width(), clipper()->height() - (rowPos(row) - contentsY()) ); } -void KexiTableView::clearColumnsInternal(bool /*tqrepaint*/) +void KexiTableView::clearColumnsInternal(bool /*repaint*/) { while(m_horizontalHeader->count()>0) m_horizontalHeader->removeLabel(0); @@ -494,29 +494,29 @@ TQSizePolicy KexiTableView::sizePolicy() const return TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); } -TQSize KexiTableView::tqsizeHint() const +TQSize KexiTableView::sizeHint() const { const TQSize &ts = tableSize(); - int w = TQMAX( ts.width() + leftMargin()+ verticalScrollBar()->tqsizeHint().width() + 2*2, + int w = TQMAX( ts.width() + leftMargin()+ verticalScrollBar()->sizeHint().width() + 2*2, (m_navPanel->isVisible() ? m_navPanel->width() : 0) ); - int h = TQMAX( ts.height()+topMargin()+horizontalScrollBar()->tqsizeHint().height(), - tqminimumSizeHint().height() ); + int h = TQMAX( ts.height()+topMargin()+horizontalScrollBar()->sizeHint().height(), + minimumSizeHint().height() ); w = TQMIN( w, tqApp->desktop()->width()*3/4 ); //stretch h = TQMIN( h, tqApp->desktop()->height()*3/4 ); //stretch -// kexidbg << "KexiTableView::tqsizeHint()= " <<w <<", " <<h << endl; +// kexidbg << "KexiTableView::sizeHint()= " <<w <<", " <<h << endl; return TQSize(w, h); /*TQSize( TQMAX( ts.width() + leftMargin() + 2*2, (m_navPanel ? m_navPanel->width() : 0) ), //+ TQMIN(m_verticalHeader->width(),d->rowHeight) + margin()*2, - TQMAX( ts.height()+topMargin()+horizontalScrollBar()->tqsizeHint().height(), - tqminimumSizeHint().height() ) + TQMAX( ts.height()+topMargin()+horizontalScrollBar()->sizeHint().height(), + minimumSizeHint().height() ) );*/ -// TQMAX(ts.height() + topMargin(), tqminimumSizeHint().height()) ); +// TQMAX(ts.height() + topMargin(), minimumSizeHint().height()) ); } -TQSize KexiTableView::tqminimumSizeHint() const +TQSize KexiTableView::minimumSizeHint() const { return TQSize( leftMargin() + ((columns()>0)?columnWidth(0):KEXI_DEFAULT_DATA_COLUMN_WIDTH) + 2*2, @@ -614,7 +614,7 @@ void KexiTableView::drawContents( TQPainter *p, int cx, int cy, int cw, int ch) bool paintOnlyInsertRow = false; /* kdDebug(44021) << TQString(" KexiTableView::drawContents(cx:%1 cy:%2 cw:%3 ch:%4)") - .tqarg(cx).tqarg(cy).tqarg(cw).tqarg(ch) << endl;*/ + .arg(cx).arg(cy).arg(cw).arg(ch) << endl;*/ if (rowlast == -1) { rowlast = rows() - 1; @@ -658,7 +658,7 @@ void KexiTableView::drawContents( TQPainter *p, int cx, int cy, int cw, int ch) if(d->pBufferPm->isNull()) return; TQPainter *pb = new TQPainter(d->pBufferPm, this); -// pb->fillRect(0, 0, cw, ch, tqcolorGroup().base()); +// pb->fillRect(0, 0, cw, ch, colorGroup().base()); // int maxwc = TQMIN(cw, (columnPos(d->numCols - 1) + columnWidth(d->numCols - 1))); int maxwc = columnPos(columns() - 1) + columnWidth(columns() - 1); @@ -812,7 +812,7 @@ void KexiTableView::paintCell(TQPainter* p, KexiTableItem *item, int col, int ro && !dontPaintNonpersistentSelectionBecauseDifferentRowHasBeenHighlighted && usesSelectedTextColor) { - defaultPen = TQPen(tqcolorGroup().highlightedText()); //selected text + defaultPen = TQPen(colorGroup().highlightedText()); //selected text } else if (d->appearance.rowHighlightingEnabled && row == m_curRow && !dontPaintNonpersistentSelectionBecauseDifferentRowHasBeenHighlighted @@ -849,7 +849,7 @@ void KexiTableView::paintCell(TQPainter* p, KexiTableItem *item, int col, int ro if (m_currentItem == item && (col == m_curCol || d->appearance.fullRowSelection)) { if (edit && ((d->appearance.rowHighlightingEnabled && !d->appearance.fullRowSelection) || (row == m_curRow && d->highlightedRow==-1 && d->appearance.fullRowSelection))) //!dontPaintNonpersistentSelectionBecauseDifferentRowHasBeenHighlighted) edit->paintSelectionBackground( p, isEnabled(), txt, align, x, y_offset, w, h, - isEnabled() ? tqcolorGroup().highlight() : TQColor(200,200,200),//d->grayColor, + isEnabled() ? colorGroup().highlight() : TQColor(200,200,200),//d->grayColor, p->fontMetrics(), columnReadOnly, d->appearance.fullRowSelection ); } @@ -931,9 +931,9 @@ void KexiTableView::paintEmptyArea( TQPainter *p, int cx, int cy, int cw, int ch // ts.setWidth( TQMIN( ts.width(), visibleWidth() ) ); // ts.setHeight( TQMIN( ts.height() - (m_navPanel ? m_navPanel->height() : 0), visibleHeight()) ); /* kdDebug(44021) << TQString(" (cx:%1 cy:%2 cw:%3 ch:%4)") - .tqarg(cx).tqarg(cy).tqarg(cw).tqarg(ch) << endl; + .arg(cx).arg(cy).arg(cw).arg(ch) << endl; kdDebug(44021) << TQString(" (w:%3 h:%4)") - .tqarg(ts.width()).tqarg(ts.height()) << endl;*/ + .arg(ts.width()).arg(ts.height()) << endl;*/ // Region of the rect we should draw, calculated in viewport // coordinates, as a region can't handle bigger coordinates @@ -945,26 +945,26 @@ void KexiTableView::paintEmptyArea( TQPainter *p, int cx, int cy, int cw, int ch // Subtract the table from it // reg = reg.subtract( TQRect( TQPoint( 0, 0 ), ts-TQSize(0,m_navPanel->isVisible() ? m_navPanel->height() : 0) ) ); reg = reg.subtract( TQRect( TQPoint( 0, 0 ), ts - -TQSize(0,TQMAX((m_navPanel ? m_navPanel->height() : 0), horizontalScrollBar()->tqsizeHint().height()) - - (horizontalScrollBar()->isVisible() ? horizontalScrollBar()->tqsizeHint().height()/2 : 0) + -TQSize(0,TQMAX((m_navPanel ? m_navPanel->height() : 0), horizontalScrollBar()->sizeHint().height()) + - (horizontalScrollBar()->isVisible() ? horizontalScrollBar()->sizeHint().height()/2 : 0) + (horizontalScrollBar()->isVisible() ? 0 : d->internal_bottomMargin -// horizontalScrollBar()->tqsizeHint().height()/2 +// horizontalScrollBar()->sizeHint().height()/2 ) -//- /*d->bottomMargin */ horizontalScrollBar()->tqsizeHint().height()*3/2 +//- /*d->bottomMargin */ horizontalScrollBar()->sizeHint().height()*3/2 + contentsY() -// - (verticalScrollBar()->isVisible() ? horizontalScrollBar()->tqsizeHint().height()/2 : 0) +// - (verticalScrollBar()->isVisible() ? horizontalScrollBar()->sizeHint().height()/2 : 0) ) ) ); // reg = reg.subtract( TQRect( TQPoint( 0, 0 ), ts ) ); // And draw the rectangles (transformed inc contents coordinates as needed) - TQMemArray<TQRect> r = reg.tqrects(); + TQMemArray<TQRect> r = reg.rects(); for ( int i = 0; i < (int)r.count(); i++ ) { TQRect rect( viewportToContents2(r[i].topLeft()), r[i].size() ); /* kdDebug(44021) << TQString("- pEA: p->fillRect(x:%1 y:%2 w:%3 h:%4)") - .tqarg(rect.x()).tqarg(rect.y()) - .tqarg(rect.width()).tqarg(rect.height()) << endl;*/ + .arg(rect.x()).arg(rect.y()) + .arg(rect.width()).arg(rect.height()) << endl;*/ // p->fillRect( TQRect(viewportToContents2(r[i].topLeft()),r[i].size()), d->emptyAreaColor ); p->fillRect( rect, d->appearance.emptyAreaColor ); // p->fillRect( TQRect(viewportToContents2(r[i].topLeft()),r[i].size()), viewport()->backgroundBrush() ); @@ -1261,7 +1261,7 @@ void KexiTableView::keyPressEvent(TQKeyEvent* e) const int k = e->key(); const bool ro = isReadOnly(); - TQWidget *w = tqfocusWidget(); + TQWidget *w = focusWidget(); // if (!w || w!=viewport() && w!=this && (!m_editor || w!=m_editor->view() && w!=m_editor)) { // if (!w || w!=viewport() && w!=this && (!m_editor || w!=m_editor->view())) { if (!w || TQT_BASE_OBJECT(w)!=TQT_BASE_OBJECT(viewport()) && TQT_TQOBJECT(w)!=TQT_TQOBJECT(this) && (!m_editor || !KexiUtils::hasParent(TQT_TQOBJECT(dynamic_cast<TQT_BASE_OBJECT_NAME*>(m_editor)), TQT_TQOBJECT(w)))) { @@ -1425,7 +1425,7 @@ void KexiTableView::keyPressEvent(TQKeyEvent* e) else { kexidbg << "KexiTableView::KeyPressEvent(): default" << endl; if (e->text().isEmpty() || !e->text().isEmpty() && !e->text()[0].isPrint() ) { - kdDebug(44021) << "NOT PRINTABLE: 0x0" << TQString("%1").tqarg(k,0,16) <<endl; + kdDebug(44021) << "NOT PRINTABLE: 0x0" << TQString("%1").arg(k,0,16) <<endl; // e->ignore(); TQScrollView::keyPressEvent(e); return; @@ -1450,7 +1450,7 @@ void KexiTableView::keyPressEvent(TQKeyEvent* e) m_vScrollBarValueChanged_enabled=false; - // if focus cell changes, tqrepaint + // if focus cell changes, repaint setCursorPosition(curRow, curCol); m_vScrollBarValueChanged_enabled=true; @@ -1630,29 +1630,29 @@ void KexiTableView::resizeEvent(TQResizeEvent *e) slotUpdate(); triggerUpdate(); } -// d->pTopHeader->tqrepaint(); +// d->pTopHeader->repaint(); /* m_navPanel->setGeometry( frameWidth(), viewport()->height() +d->pTopHeader->height() - -(horizontalScrollBar()->isVisible() ? 0 : horizontalScrollBar()->tqsizeHint().height()) + -(horizontalScrollBar()->isVisible() ? 0 : horizontalScrollBar()->sizeHint().height()) +frameWidth(), - m_navPanel->tqsizeHint().width(), // - verticalScrollBar()->tqsizeHint().width() - horizontalScrollBar()->tqsizeHint().width(), - horizontalScrollBar()->tqsizeHint().height() + m_navPanel->sizeHint().width(), // - verticalScrollBar()->sizeHint().width() - horizontalScrollBar()->sizeHint().width(), + horizontalScrollBar()->sizeHint().height() );*/ // updateContents(); // m_navPanel->setGeometry(1,horizontalScrollBar()->pos().y(), // m_navPanel->width(), horizontalScrollBar()->height()); // updateContents(0,0,2000,2000);//js -// erase(); tqrepaint(); +// erase(); repaint(); } void KexiTableView::viewportResizeEvent( TQResizeEvent *e ) { TQScrollView::viewportResizeEvent( e ); updateGeometries(); -// erase(); tqrepaint(); +// erase(); repaint(); } void KexiTableView::showEvent(TQShowEvent *e) @@ -1818,7 +1818,7 @@ void KexiTableView::slotColumnWidthChanged( int, int, int ) else { // updateContents( columnPos(col), 0, contentsWidth(), contentsHeight() ); updateContents(contentsX(), 0, viewport()->width(), contentsHeight()); - // viewport()->tqrepaint(); + // viewport()->repaint(); } // updateContents(0, 0, d->pBufferPm->width(), d->pBufferPm->height()); @@ -1923,42 +1923,42 @@ TQSize KexiTableView::tableSize() const if ((rows()+ (isInsertingEnabled()?1:0) ) > 0 && columns() > 0) { /* kexidbg << "tableSize()= " << columnPos( columns() - 1 ) + columnWidth( columns() - 1 ) << ", " << rowPos( rows()-1+(isInsertingEnabled()?1:0)) + d->rowHeight -// + TQMAX(m_navPanel ? m_navPanel->height() : 0, horizontalScrollBar()->tqsizeHint().height()) - + (m_navPanel->isVisible() ? TQMAX( m_navPanel->height(), horizontalScrollBar()->tqsizeHint().height() ) :0 ) +// + TQMAX(m_navPanel ? m_navPanel->height() : 0, horizontalScrollBar()->sizeHint().height()) + + (m_navPanel->isVisible() ? TQMAX( m_navPanel->height(), horizontalScrollBar()->sizeHint().height() ) :0 ) + margin() << endl; */ // kexidbg<< m_navPanel->isVisible() <<" "<<m_navPanel->height()<<" " -// <<horizontalScrollBar()->tqsizeHint().height()<<" "<<rowPos( rows()-1+(isInsertingEnabled()?1:0))<<endl; +// <<horizontalScrollBar()->sizeHint().height()<<" "<<rowPos( rows()-1+(isInsertingEnabled()?1:0))<<endl; - //int xx = horizontalScrollBar()->tqsizeHint().height()/2; + //int xx = horizontalScrollBar()->sizeHint().height()/2; TQSize s( columnPos( columns() - 1 ) + columnWidth( columns() - 1 ), -// + verticalScrollBar()->tqsizeHint().width(), +// + verticalScrollBar()->sizeHint().width(), rowPos( rows()-1+(isInsertingEnabled()?1:0) ) + d->rowHeight - + (horizontalScrollBar()->isVisible() ? 0 : horizontalScrollBar()->tqsizeHint().height()) + + (horizontalScrollBar()->isVisible() ? 0 : horizontalScrollBar()->sizeHint().height()) + d->internal_bottomMargin -// horizontalScrollBar()->tqsizeHint().height()/2 -// - /*d->bottomMargin */ horizontalScrollBar()->tqsizeHint().height()*3/2 +// horizontalScrollBar()->sizeHint().height()/2 +// - /*d->bottomMargin */ horizontalScrollBar()->sizeHint().height()*3/2 // + ( (m_navPanel && m_navPanel->isVisible() && verticalScrollBar()->isVisible() // && !horizontalScrollBar()->isVisible()) - // ? horizontalScrollBar()->tqsizeHint().height() : 0) + // ? horizontalScrollBar()->sizeHint().height() : 0) // + TQMAX( (m_navPanel && m_navPanel->isVisible()) ? m_navPanel->height() : 0, -// horizontalScrollBar()->isVisible() ? horizontalScrollBar()->tqsizeHint().height() : 0) +// horizontalScrollBar()->isVisible() ? horizontalScrollBar()->sizeHint().height() : 0) // + (m_navPanel->isVisible() -// ? TQMAX( m_navPanel->height(), horizontalScrollBar()->tqsizeHint().height() ) :0 ) +// ? TQMAX( m_navPanel->height(), horizontalScrollBar()->sizeHint().height() ) :0 ) -// - (horizontalScrollBar()->isVisible() ? horizontalScrollBar()->tqsizeHint().height() :0 ) +// - (horizontalScrollBar()->isVisible() ? horizontalScrollBar()->sizeHint().height() :0 ) + margin() //-2*d->rowHeight ); // kexidbg << rows()-1 <<" "<< (isInsertingEnabled()?1:0) <<" "<< (m_rowEditing?1:0) << " " << s << endl; return s; -// +horizontalScrollBar()->tqsizeHint().height() + margin() ); +// +horizontalScrollBar()->sizeHint().height() + margin() ); } return TQSize(0,0); } @@ -2271,13 +2271,13 @@ void KexiTableView::setVerticalHeaderVisible(bool set) int left_width; if (set) { m_verticalHeader->show(); - left_width = TQMIN(m_horizontalHeader->tqsizeHint().height(), d->rowHeight); + left_width = TQMIN(m_horizontalHeader->sizeHint().height(), d->rowHeight); } else { m_verticalHeader->hide(); left_width = 0; } - setMargins( left_width, horizontalHeaderVisible() ? m_horizontalHeader->tqsizeHint().height() : 0, 0, 0); + setMargins( left_width, horizontalHeaderVisible() ? m_horizontalHeader->sizeHint().height() : 0, 0, 0); } bool KexiTableView::horizontalHeaderVisible() const @@ -2291,7 +2291,7 @@ void KexiTableView::setHorizontalHeaderVisible(bool set) d->horizontalHeaderVisible = set; //needed because isVisible() is not always accurate if (set) { m_horizontalHeader->show(); - top_height = m_horizontalHeader->tqsizeHint().height(); + top_height = m_horizontalHeader->sizeHint().height(); } else { m_horizontalHeader->hide(); @@ -2478,10 +2478,10 @@ bool KexiTableView::eventFilter( TQObject *o, TQEvent *e ) } /* else if (e->type()==TQEvent::FocusOut && o->inherits(TQWIDGET_OBJECT_NAME_STRING)) { //hp==true if currently focused widget is a child of this table view - const bool hp = KexiUtils::hasParent( static_cast<TQWidget*>(o), tqfocusWidget()); + const bool hp = KexiUtils::hasParent( static_cast<TQWidget*>(o), focusWidget()); if (!hp && KexiUtils::hasParent( this, static_cast<TQWidget*>(o))) { //accept row editing if focus is moved to foreign widget - //(not a child, like eg. editor) from one of our table view's tqchildren + //(not a child, like eg. editor) from one of our table view's children //or from table view itself if (!acceptRowEdit()) { static_cast<TQWidget*>(o)->setFocus(); @@ -2508,9 +2508,9 @@ void KexiTableView::paletteChange( const TQPalette &oldPalette ) Q_UNUSED(oldPalette); //update: if (m_verticalHeader) - m_verticalHeader->setSelectionBackgroundColor( tqpalette().active().highlight() ); + m_verticalHeader->setSelectionBackgroundColor( palette().active().highlight() ); if (m_horizontalHeader) - m_horizontalHeader->setSelectionBackgroundColor( tqpalette().active().highlight() ); + m_horizontalHeader->setSelectionBackgroundColor( palette().active().highlight() ); } const KexiTableView::Appearance& KexiTableView::appearance() const @@ -2531,8 +2531,8 @@ void KexiTableView::setAppearance(const Appearance& a) m_verticalHeader->setCellHeight(d->rowHeight); if (m_horizontalHeader) { setMargins( - TQMIN(m_horizontalHeader->tqsizeHint().height(), d->rowHeight), - m_horizontalHeader->tqsizeHint().height(), 0, 0); + TQMIN(m_horizontalHeader->sizeHint().height(), d->rowHeight), + m_horizontalHeader->sizeHint().height(), 0, 0); } // } if (a.rowHighlightingEnabled) diff --git a/kexi/widget/tableview/kexitableview.h b/kexi/widget/tableview/kexitableview.h index 9cfcf47e..b602168a 100644 --- a/kexi/widget/tableview/kexitableview.h +++ b/kexi/widget/tableview/kexitableview.h @@ -223,8 +223,8 @@ public: // reimplemented for internal reasons virtual TQSizePolicy sizePolicy() const; - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; /*! Reimplemented to update cached fonts and row sizes for the painter. */ void setFont(const TQFont &f); @@ -263,7 +263,7 @@ public slots: virtual void setData( KexiTableViewData *data, bool owner = true ) { KexiDataAwareObjectInterface::setData( data, owner ); } - virtual void clearColumnsInternal(bool tqrepaint); + virtual void clearColumnsInternal(bool repaint); /*! Adjusts \a colNum column's width to its (current) contents. If \a colNum == -1, all columns' width is adjusted. */ @@ -432,19 +432,19 @@ protected slots: virtual void slotRowRepaintRequested(KexiTableItem& item); //! Handles KexiTableViewData::aboutToDeleteRow() signal. Prepares info for slotRowDeleted(). - virtual void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool tqrepaint) - { KexiDataAwareObjectInterface::slotAboutToDeleteRow(item, result, tqrepaint); } + virtual void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool repaint) + { KexiDataAwareObjectInterface::slotAboutToDeleteRow(item, result, repaint); } - //! Handles KexiTableViewData::rowDeleted() signal to tqrepaint when needed. + //! Handles KexiTableViewData::rowDeleted() signal to repaint when needed. virtual void slotRowDeleted() { KexiDataAwareObjectInterface::slotRowDeleted(); } - //! Handles KexiTableViewData::rowInserted() signal to tqrepaint when needed. - virtual void slotRowInserted(KexiTableItem *item, bool tqrepaint) - { KexiDataAwareObjectInterface::slotRowInserted(item, tqrepaint); } + //! Handles KexiTableViewData::rowInserted() signal to repaint when needed. + virtual void slotRowInserted(KexiTableItem *item, bool repaint) + { KexiDataAwareObjectInterface::slotRowInserted(item, repaint); } //! Like above, not db-aware version - virtual void slotRowInserted(KexiTableItem *item, uint row, bool tqrepaint) - { KexiDataAwareObjectInterface::slotRowInserted(item, row, tqrepaint); } + virtual void slotRowInserted(KexiTableItem *item, uint row, bool repaint) + { KexiDataAwareObjectInterface::slotRowInserted(item, row, repaint); } /*! Handles verticalScrollBar()'s valueChanged(int) signal. Called when vscrollbar's value has been changed. */ @@ -504,7 +504,7 @@ protected: *value is set to the default value. */ bool isDefaultValueDisplayed(KexiTableItem *item, int col, TQVariant* value = 0); - //! painting and tqlayout + //! painting and layout void drawContents(TQPainter *p, int cx, int cy, int cw, int ch); void createBuffer(int width, int height); void paintCell(TQPainter* p, KexiTableItem *item, int col, int row, const TQRect &cr, bool print=false); @@ -588,7 +588,7 @@ protected: virtual void removeEditor(); //! Internal: updated sched fonts for painting. - void updateFonts(bool tqrepaint = false); + void updateFonts(bool repaint = false); /*! @internal Changes bottom margin settings, in pixels. At this time, it's used by KexiComboBoxPopup to decrease margin for popup's table. */ @@ -614,7 +614,7 @@ protected: virtual void paste(); /*! Used in KexiDataAwareObjectInterface::slotRowDeleted() - to tqrepaint tow \a row and all visible below. */ + to repaint tow \a row and all visible below. */ virtual void updateAllVisibleRowsBelow(int row); void updateAfterCancelRowEdit(); @@ -626,7 +626,7 @@ protected: bool getVisibleLookupValue(TQVariant& cellValue, KexiTableEdit *edit, KexiTableItem *item, KexiTableViewColumn *tvcol) const; -// //! Called to tqrepaint contents after a row is deleted. +// //! Called to repaint contents after a row is deleted. // void repaintAfterDelete(); KexiTableViewPrivate *d; diff --git a/kexi/widget/tableview/kexitableview_p.cpp b/kexi/widget/tableview/kexitableview_p.cpp index d5e1641a..983378cb 100644 --- a/kexi/widget/tableview/kexitableview_p.cpp +++ b/kexi/widget/tableview/kexitableview_p.cpp @@ -48,7 +48,7 @@ KexiTableViewPrivate::KexiTableViewPrivate(KexiTableView* t) //moved scrollBarTipTimerCnt = 0; //moved scrollBarTip = 0; ensureCellVisibleOnShow = TQPoint(-1,-1); - internal_bottomMargin = tv->horizontalScrollBar()->tqsizeHint().height()/2; + internal_bottomMargin = tv->horizontalScrollBar()->sizeHint().height()/2; highlightedRow = -1; moveCursorOnMouseRelease = false; horizontalHeaderVisible = true; diff --git a/kexi/widget/tableview/kexitableviewdata.cpp b/kexi/widget/tableview/kexitableviewdata.cpp index 5905706b..a4e45daf 100644 --- a/kexi/widget/tableview/kexitableviewdata.cpp +++ b/kexi/widget/tableview/kexitableviewdata.cpp @@ -509,8 +509,8 @@ int KexiTableViewData::cmpStr(Item item1, Item item2) const TQString &as = m_leftTmp.toString(); const TQString &bs = m_rightTmp.toString(); - const TQChar *a = as.tqunicode(); - const TQChar *b = bs.tqunicode(); + const TQChar *a = as.unicode(); + const TQChar *b = bs.unicode(); if ( a == b ) return 0; @@ -524,16 +524,16 @@ int KexiTableViewData::cmpStr(Item item1, Item item2) int l=TQMIN(as.length(),bs.length()); - au = a->tqunicode(); - bu = b->tqunicode(); + au = a->unicode(); + bu = b->unicode(); au = (au <= 0x17e ? charTable[au] : 0xffff); bu = (bu <= 0x17e ? charTable[bu] : 0xffff); while (l-- && au == bu) { a++,b++; - au = a->tqunicode(); - bu = b->tqunicode(); + au = a->unicode(); + bu = b->unicode(); au = (au <= 0x17e ? charTable[au] : 0xffff); bu = (bu <= 0x17e ? charTable[bu] : 0xffff); } @@ -635,7 +635,7 @@ bool KexiTableViewData::updateRowEditBufferRef(KexiTableItem *item, } //! @todo if there're multiple views for this data, we need multiple buffers! -bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool tqrepaint) +bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool repaint) { if (!m_pRowEditBuffer) return true; //nothing to do @@ -655,7 +655,7 @@ bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool tqrepaint if (val->isNull() && !f->isAutoIncrement()) { //NOT NULL violated m_result.msg = i18n("\"%1\" column requires a value to be entered.") - .tqarg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData(); + .arg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData(); m_result.desc = i18n("The column's constraint is declared as NOT NULL."); m_result.column = col; return false; @@ -666,7 +666,7 @@ bool KexiTableViewData::saveRow(KexiTableItem& item, bool insert, bool tqrepaint if (!f->isAutoIncrement() && (val->isNull() || KexiDB::isEmptyValue( f, *val ))) { //NOT EMPTY violated m_result.msg = i18n("\"%1\" column requires a value to be entered.") - .tqarg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData(); + .arg(f->captionOrName()) + "\n\n" + Kexi::msgYouCanImproveData(); m_result.desc = i18n("The column's constraint is declared as NOT EMPTY."); m_result.column = col; return false; @@ -721,12 +721,12 @@ js: TODO: use KexiMainWindowImpl::showErrorMessage(const TQString &title, KexiDB m_pRowEditBuffer->clear(); - if (tqrepaint) + if (repaint) emit rowRepaintRequested(item); return true; } -bool KexiTableViewData::saveRowChanges(KexiTableItem& item, bool tqrepaint) +bool KexiTableViewData::saveRowChanges(KexiTableItem& item, bool repaint) { kdDebug() << "KexiTableViewData::saveRowChanges()..." << endl; m_result.clear(); @@ -734,32 +734,32 @@ bool KexiTableViewData::saveRowChanges(KexiTableItem& item, bool tqrepaint) if (!m_result.success) return false; - if (saveRow(item, false /*update*/, tqrepaint)) { + if (saveRow(item, false /*update*/, repaint)) { emit rowUpdated(&item); return true; } return false; } -bool KexiTableViewData::saveNewRow(KexiTableItem& item, bool tqrepaint) +bool KexiTableViewData::saveNewRow(KexiTableItem& item, bool repaint) { kdDebug() << "KexiTableViewData::saveNewRow()..." << endl; m_result.clear(); - emit aboutToInsertRow(&item, &m_result, tqrepaint); + emit aboutToInsertRow(&item, &m_result, repaint); if (!m_result.success) return false; - if (saveRow(item, true /*insert*/, tqrepaint)) { - emit rowInserted(&item, tqrepaint); + if (saveRow(item, true /*insert*/, repaint)) { + emit rowInserted(&item, repaint); return true; } return false; } -bool KexiTableViewData::deleteRow(KexiTableItem& item, bool tqrepaint) +bool KexiTableViewData::deleteRow(KexiTableItem& item, bool repaint) { m_result.clear(); - emit aboutToDeleteRow(item, &m_result, tqrepaint); + emit aboutToDeleteRow(item, &m_result, repaint); if (!m_result.success) return false; @@ -784,9 +784,9 @@ bool KexiTableViewData::deleteRow(KexiTableItem& item, bool tqrepaint) return true; } -void KexiTableViewData::deleteRows( const TQValueList<int> &rowsToDelete, bool tqrepaint ) +void KexiTableViewData::deleteRows( const TQValueList<int> &rowsToDelete, bool repaint ) { - Q_UNUSED( tqrepaint ); + Q_UNUSED( repaint ); if (rowsToDelete.isEmpty()) return; @@ -804,11 +804,11 @@ void KexiTableViewData::deleteRows( const TQValueList<int> &rowsToDelete, bool t emit rowsDeleted( rowsToDelete ); } -void KexiTableViewData::insertRow(KexiTableItem& item, uint index, bool tqrepaint) +void KexiTableViewData::insertRow(KexiTableItem& item, uint index, bool repaint) { if (!insert( index = TQMIN(index, count()), &item )) return; - emit rowInserted(&item, index, tqrepaint); + emit rowInserted(&item, index, repaint); } void KexiTableViewData::clearInternal() @@ -822,12 +822,12 @@ void KexiTableViewData::clearInternal() removeLast(); #ifndef KEXI_NO_PROCESS_EVENTS if (i % 1000 == 0) - tqApp->tqprocessEvents( 1 ); + tqApp->processEvents( 1 ); #endif } } -bool KexiTableViewData::deleteAllRows(bool tqrepaint) +bool KexiTableViewData::deleteAllRows(bool repaint) { clearInternal(); @@ -837,7 +837,7 @@ bool KexiTableViewData::deleteAllRows(bool tqrepaint) res = m_cursor->deleteAllRows(); } - if (tqrepaint) + if (repaint) emit reloadRequested(); return res; } @@ -873,7 +873,7 @@ void KexiTableViewData::preloadAllRows() m_cursor->moveNext(); #ifndef KEXI_NO_PROCESS_EVENTS if ((i % 1000) == 0) - tqApp->tqprocessEvents( 1 ); + tqApp->processEvents( 1 ); #endif } } diff --git a/kexi/widget/tableview/kexitableviewdata.h b/kexi/widget/tableview/kexitableviewdata.h index 7263f3fe..eb3d20df 100644 --- a/kexi/widget/tableview/kexitableviewdata.h +++ b/kexi/widget/tableview/kexitableviewdata.h @@ -359,27 +359,27 @@ public: /*! \return last operation's result information (always not null). */ inline KexiDB::ResultInfo* result() { return &m_result; } - bool saveRowChanges(KexiTableItem& item, bool tqrepaint = false); + bool saveRowChanges(KexiTableItem& item, bool repaint = false); - bool saveNewRow(KexiTableItem& item, bool tqrepaint = false); + bool saveNewRow(KexiTableItem& item, bool repaint = false); - bool deleteRow(KexiTableItem& item, bool tqrepaint = false); + bool deleteRow(KexiTableItem& item, bool repaint = false); /*! Deletes rows (by number) passed with \a rowsToDelete. Currently, this method is only for non data-aware tables. */ - void deleteRows( const TQValueList<int> &rowsToDelete, bool tqrepaint = false ); + void deleteRows( const TQValueList<int> &rowsToDelete, bool repaint = false ); /*! Deletes all rows. Works either for db-aware and non db-aware tables. Column's definition is not changed. For db-aware version, all rows are removed from a database. Row-edit buffer is cleared. - If \a tqrepaint is true, reloadRequested() signal + If \a repaint is true, reloadRequested() signal is emitted after deleting (if at least one row was deleted), - so presenters can tqrepaint their contents. + so presenters can repaint their contents. \return true on success. */ - virtual bool deleteAllRows(bool tqrepaint = false); + virtual bool deleteAllRows(bool repaint = false); /*! @internal method, used mostly by specialized classes like KexiTableView. Clears internal row structures. Row-edit buffer is cleared. @@ -390,7 +390,7 @@ public: /*! Inserts new \a item at index \a index. \a item will be owned by this data object. Note: Reasonable only for not not-db-aware version. */ - void insertRow(KexiTableItem& item, uint index, bool tqrepaint = false); + void insertRow(KexiTableItem& item, uint index, bool repaint = false); /*TODO: add this as well? void insertRow(KexiTableItem& item, KexiTableItem& aboveItem); */ @@ -445,7 +445,7 @@ signals: /*! Emited before inserting of a new, current row. Connect this signal to your slot and set \a result->success to false to disallow this inserting. You can also change columns in \a item row. */ - void aboutToInsertRow(KexiTableItem *item, KexiDB::ResultInfo* result, bool tqrepaint); + void aboutToInsertRow(KexiTableItem *item, KexiDB::ResultInfo* result, bool repaint); /*! Emited before changing of an edited, current row. Connect this signal to your slot and set \a result->success to false @@ -455,15 +455,15 @@ signals: void rowUpdated(KexiTableItem*); //!< Current row has been updated - void rowInserted(KexiTableItem*, bool tqrepaint); //!< A row has been inserted + void rowInserted(KexiTableItem*, bool repaint); //!< A row has been inserted //! A row has been inserted at \a index position (not db-aware data only) - void rowInserted(KexiTableItem*, uint index, bool tqrepaint); + void rowInserted(KexiTableItem*, uint index, bool repaint); /*! Emited before deleting of a current row. Connect this signal to your slot and set \a result->success to false to disallow this deleting. */ - void aboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool tqrepaint); + void aboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool repaint); //! Current row has been deleted void rowDeleted(); @@ -497,7 +497,7 @@ protected: int cmpBLOB(Item item1, Item item2); //! internal: for saveRowChanges() and saveNewRow() - bool saveRow(KexiTableItem& item, bool insert, bool tqrepaint); + bool saveRow(KexiTableItem& item, bool insert, bool repaint); //! (logical) sorted column number, set by setSorting() //! can differ from m_realSortedColumn if there's lookup column used diff --git a/kexi/widget/tableview/kexitableviewheader.cpp b/kexi/widget/tableview/kexitableviewheader.cpp index 4a00be38..ef4c83da 100644 --- a/kexi/widget/tableview/kexitableviewheader.cpp +++ b/kexi/widget/tableview/kexitableviewheader.cpp @@ -34,7 +34,7 @@ class KexiTableViewHeaderStyle : public KexiUtils::StyleProxy KexiTableViewHeaderStyle(TQStyle *parentStyle, TQWidget *widget) : KexiUtils::StyleProxy(parentStyle) { - setBackgroundColor( widget->tqpalette().active().background() ); + setBackgroundColor( widget->palette().active().background() ); } ~KexiTableViewHeaderStyle() {} @@ -61,7 +61,7 @@ class KexiTableViewHeaderStyle : public KexiUtils::StyleProxy KexiTableViewHeader::KexiTableViewHeader(TQWidget * parent, const char * name) : TQHeader(parent, name) , m_lastToolTipSection(-1) - , m_selectionBackgroundColor(tqApp->tqpalette().active().highlight()) + , m_selectionBackgroundColor(tqApp->palette().active().highlight()) , m_selectedSection(-1) , m_styleChangeEnabled(true) { @@ -126,7 +126,7 @@ bool KexiTableViewHeader::eventFilter(TQObject * watched, TQEvent * e) TQString tip = m_toolTips[ section ]; if (tip.isEmpty()) { //try label TQFontMetrics fm(font()); - int minWidth = fm.width( label( section ) ) + tqstyle().tqpixelMetric( TQStyle::PM_HeaderMargin ); + int minWidth = fm.width( label( section ) ) + tqstyle().pixelMetric( TQStyle::PM_HeaderMargin ); TQIconSet *iset = iconSet( section ); if (iset) minWidth += (2+iset->pixmap( TQIconSet::Small, TQIconSet::Normal ).width()); //taken from TQHeader::sectionSizeHint() @@ -188,14 +188,14 @@ void KexiTableViewHeader::paintSection( TQPainter * p, int index, const TQRect & if (paintSelection) { static_cast<KexiTableViewHeaderStyle&>(tqstyle()).setBackgroundColor( KexiUtils::blendedColors( - tqpalette().active().background(), m_selectionBackgroundColor, 2, 1) ); + palette().active().background(), m_selectionBackgroundColor, 2, 1) ); } TQHeader::paintSection( p, index, fr ); if (paintSelection) { //revert the color for subsequent paints static_cast<KexiTableViewHeaderStyle&>(tqstyle()).setBackgroundColor( - tqpalette().active().background()); + palette().active().background()); } } diff --git a/kexi/widget/tableview/kexitimetableedit.cpp b/kexi/widget/tableview/kexitimetableedit.cpp index 8110716b..6035aed5 100644 --- a/kexi/widget/tableview/kexitimetableedit.cpp +++ b/kexi/widget/tableview/kexitimetableedit.cpp @@ -23,16 +23,16 @@ #include <tqpainter.h> #include <tqvariant.h> #include <tqrect.h> -#include <tqpalette.h> +#include <palette.h> #include <tqcolor.h> #include <tqfontmetrics.h> #include <tqdatetime.h> #include <tqcursor.h> #include <tqpoint.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtoolbutton.h> #include <tqdatetimeedit.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <kdebug.h> #include <klocale.h> diff --git a/kexi/widget/utils/kexiarrowtip.cpp b/kexi/widget/utils/kexiarrowtip.cpp index fa5c35ab..6279aa04 100644 --- a/kexi/widget/utils/kexiarrowtip.cpp +++ b/kexi/widget/utils/kexiarrowtip.cpp @@ -117,14 +117,14 @@ bool KexiArrowTip::close ( bool alsoDelete ) void KexiArrowTip::drawContents(TQPainter& p) { - p.setPen( TQPen(tqpalette().active().foreground(), 1) ); + p.setPen( TQPen(palette().active().foreground(), 1) ); p.drawText(TQRect(0,m_arrowHeight,width(),height()-m_arrowHeight), TQt::AlignCenter, m_value.toString()); } void KexiArrowTip::drawFrame(TQPainter& p) { - TQPen pen(tqpalette().active().foreground(), 1, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin); + TQPen pen(palette().active().foreground(), 1, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin); p.setPen( pen ); /* /\ diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp index 777fea1b..60f99f85 100644 --- a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp +++ b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp @@ -53,18 +53,18 @@ void KexiComboBoxDropDownButton::drawButton(TQPainter *p) TQRect r = rect(); r.setHeight(r.height()+m_fixForHeight); - if (m_tqdrawComplexControl) { + if (m_drawComplexControl) { if (m_fixForHeight>0 && m_paintedCombo->size()!=size()) { m_paintedCombo->move(0,0); m_paintedCombo->setFixedSize(size()+TQSize(0, m_fixForHeight)); //last chance to fix size } - tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, p, - m_fixForHeight>0 ? (const TQWidget*)m_paintedCombo : this, r, tqcolorGroup(), + tqstyle().drawComplexControl( TQStyle::CC_ComboBox, p, + m_fixForHeight>0 ? (const TQWidget*)m_paintedCombo : this, r, colorGroup(), flags, (uint)(TQStyle::SC_ComboBoxArrow), TQStyle::SC_None ); } else { r.setWidth(r.width()+2); - tqstyle().tqdrawPrimitive( TQStyle::PE_ArrowDown, p, r, tqcolorGroup(), flags); + tqstyle().tqdrawPrimitive( TQStyle::PE_ArrowDown, p, r, colorGroup(), flags); } } @@ -77,7 +77,7 @@ void KexiComboBoxDropDownButton::styleChange( TQStyle & oldStyle ) else m_fixForHeight = 0; //</hack> - m_tqdrawComplexControl = + m_drawComplexControl = (tqstyle().inherits("KStyle") && qstricmp(tqstyle().name(),"qtcurve")!=0) || qstricmp(tqstyle().name(),"platinum")==0; if (m_fixForHeight==0) diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.h b/kexi/widget/utils/kexicomboboxdropdownbutton.h index f480de74..94c26484 100644 --- a/kexi/widget/utils/kexicomboboxdropdownbutton.h +++ b/kexi/widget/utils/kexicomboboxdropdownbutton.h @@ -41,7 +41,7 @@ class KEXIGUIUTILS_EXPORT KexiComboBoxDropDownButton : public KPushButton virtual void styleChange( TQStyle & oldStyle ); int m_fixForHeight; - bool m_tqdrawComplexControl : 1; + bool m_drawComplexControl : 1; KComboBox *m_paintedCombo; //!< fake combo used only to pass it as 'this' for TQStyle //!< (because styles use \<static_cast\>) }; diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp index 3c6b22f0..aeeec86d 100644 --- a/kexi/widget/utils/kexicontextmenuutils.cpp +++ b/kexi/widget/utils/kexicontextmenuutils.cpp @@ -96,7 +96,7 @@ KexiImageContextMenu::~KexiImageContextMenu() void KexiImageContextMenu::insertFromFile() { -// TQWidget *tqfocusWidget = tqApp->tqfocusWidget(); +// TQWidget *focusWidget = tqApp->focusWidget(); #ifdef TQ_WS_WIN TQString recentDir; TQString fileName = TQFileDialog::getOpenFileName( @@ -116,8 +116,8 @@ void KexiImageContextMenu::insertFromFile() if (!url.isValid()) { //focus the app again because to avoid annoying the user with unfocused main window if (tqApp->mainWidget()) { - //tqfocusWidget->raise(); - //tqfocusWidget->setFocus(); + //focusWidget->raise(); + //focusWidget->setFocus(); tqApp->mainWidget()->raise(); } return; @@ -133,8 +133,8 @@ void KexiImageContextMenu::insertFromFile() emit insertFromFileRequested(url); if (tqApp->mainWidget()) { -// tqfocusWidget->raise(); -// tqfocusWidget->setFocus(); +// focusWidget->raise(); +// focusWidget->setFocus(); tqApp->mainWidget()->raise(); } } @@ -187,7 +187,7 @@ void KexiImageContextMenu::saveAs() if (f.exists() && KMessageBox::Yes != KMessageBox::warningYesNo(this, "<qt>"+i18n("File \"%1\" already exists." "<p>Do you want to replace it with a new one?") - .tqarg(TQDir::convertSeparators(fileName))+"</qt>",0, + .arg(TQDir::convertSeparators(fileName))+"</qt>",0, KGuiItem(i18n("&Replace")), KGuiItem(i18n("&Don't Replace")))) { return; @@ -268,8 +268,8 @@ bool KexiContextMenuUtils::updateTitle(TQPopupMenu *menu, const TQString& object /*! @todo look at makeFirstCharacterUpperCaseInCaptions setting [bool] (see doc/dev/settings.txt) */ TQString realTitle( i18n("Object name : Object type", "%1 : %2") - .tqarg( objectName[0].upper() + objectName.mid(1) ) - .tqarg( objectTypeName )); + .arg( objectName[0].upper() + objectName.mid(1) ) + .arg( objectTypeName )); if (iconName.isEmpty()) title->setTitle(realTitle); diff --git a/kexi/widget/utils/kexidatetimeformatter.cpp b/kexi/widget/utils/kexidatetimeformatter.cpp index 718fcbf6..298eda48 100644 --- a/kexi/widget/utils/kexidatetimeformatter.cpp +++ b/kexi/widget/utils/kexidatetimeformatter.cpp @@ -78,7 +78,7 @@ KexiDateFormatter::KexiDateFormatter() m_order = TQDateEdit::YDM; //! @todo use TQRegExp (to replace %Y by %1, etc.) instead of hardcoded "%1%299%399" //! because df may contain also other characters - m_inputMask = TQString("%1%299%399").tqarg(yearMask).tqarg(m_separator).tqarg(m_separator); + m_inputMask = TQString("%1%299%399").arg(yearMask).arg(m_separator).arg(m_separator); m_qtFormat = yearDateFormat+m_separator+dayDateFormat+m_separator+monthDateFormat; m_yearpos = 0; m_daypos = yearMask.length()+separatorLen; @@ -86,7 +86,7 @@ KexiDateFormatter::KexiDateFormatter() } else if (daypos<monthpos && monthpos<yearpos) { m_order = TQDateEdit::DMY; - m_inputMask = TQString("99%199%2%3").tqarg(m_separator).tqarg(m_separator).tqarg(yearMask); + m_inputMask = TQString("99%199%2%3").arg(m_separator).arg(m_separator).arg(yearMask); m_qtFormat = dayDateFormat+m_separator+monthDateFormat+m_separator+yearDateFormat; m_daypos = 0; m_monthpos = 2+separatorLen; @@ -94,7 +94,7 @@ KexiDateFormatter::KexiDateFormatter() } else if (monthpos<daypos && daypos<yearpos) { m_order = TQDateEdit::MDY; - m_inputMask = TQString("99%199%2%3").tqarg(m_separator).tqarg(m_separator).tqarg(yearMask); + m_inputMask = TQString("99%199%2%3").arg(m_separator).arg(m_separator).arg(yearMask); m_qtFormat = monthDateFormat+m_separator+dayDateFormat+m_separator+yearDateFormat; m_monthpos = 0; m_daypos = 2+separatorLen; @@ -104,7 +104,7 @@ KexiDateFormatter::KexiDateFormatter() ok = false; } if (!ok || m_order == TQDateEdit::YMD) {//default: YMD - m_inputMask = TQString("%1%299%399").tqarg(yearMask).tqarg(m_separator).tqarg(m_separator); + m_inputMask = TQString("%1%299%399").arg(yearMask).arg(m_separator).arg(m_separator); m_qtFormat = yearDateFormat+m_separator+monthDateFormat+m_separator+dayDateFormat; m_yearpos = 0; m_monthpos = yearMask.length()+separatorLen; @@ -294,20 +294,20 @@ TQString KexiTimeFormatter::timeToString( const TQTime& time ) const TQString s(m_outputFormat); if (m_24h) { if (m_hoursWithLeadingZero) - s.replace( "%H", TQString::tqfromLatin1(time.hour()<10 ? "0" : "") + TQString::number(time.hour()) ); + s.replace( "%H", TQString::fromLatin1(time.hour()<10 ? "0" : "") + TQString::number(time.hour()) ); else s.replace( "%k", TQString::number(time.hour()) ); } else { int time12 = (time.hour()>12) ? (time.hour()-12) : time.hour(); if (m_hoursWithLeadingZero) - s.replace( "%I", TQString::tqfromLatin1(time12<10 ? "0" : "") + TQString::number(time12) ); + s.replace( "%I", TQString::fromLatin1(time12<10 ? "0" : "") + TQString::number(time12) ); else s.replace( "%l", TQString::number(time12) ); } - s.replace( "%M", TQString::tqfromLatin1(time.minute()<10 ? "0" : "") + TQString::number(time.minute()) ); + s.replace( "%M", TQString::fromLatin1(time.minute()<10 ? "0" : "") + TQString::number(time.minute()) ); if (m_secpos>=0) - s.replace( "%S", TQString::tqfromLatin1(time.second()<10 ? "0" : "") + TQString::number(time.second()) ); + s.replace( "%S", TQString::fromLatin1(time.second()<10 ? "0" : "") + TQString::number(time.second()) ); if (m_ampmpos>=0) s.replace( "%p", KGlobal::locale()->translate( time.hour()>=12 ? "pm" : "am") ); return s; diff --git a/kexi/widget/utils/kexidisplayutils.cpp b/kexi/widget/utils/kexidisplayutils.cpp index 1943b086..11b1d742 100644 --- a/kexi/widget/utils/kexidisplayutils.cpp +++ b/kexi/widget/utils/kexidisplayutils.cpp @@ -92,8 +92,8 @@ KexiDisplayUtils::DisplayParameters::DisplayParameters() KexiDisplayUtils::DisplayParameters::DisplayParameters(TQWidget *w) { - textColor = w->tqpalette().active().foreground(); - selectedTextColor = w->tqpalette().active().highlightedText(); + textColor = w->palette().active().foreground(); + selectedTextColor = w->palette().active().highlightedText(); font = w->font(); } @@ -113,7 +113,7 @@ void KexiDisplayUtils::initDisplayForAutonumberSign(DisplayParameters& par, TQWi void KexiDisplayUtils::initDisplayForDefaultValue(DisplayParameters& par, TQWidget *widget) { par.textColor = SPECIAL_TEXT_COLOR; - par.selectedTextColor = widget->tqpalette().active().highlightedText(); + par.selectedTextColor = widget->palette().active().highlightedText(); par.font = widget->font(); par.font.setItalic(true); } diff --git a/kexi/widget/utils/kexidropdownbutton.cpp b/kexi/widget/utils/kexidropdownbutton.cpp index 909d507c..054192ce 100644 --- a/kexi/widget/utils/kexidropdownbutton.cpp +++ b/kexi/widget/utils/kexidropdownbutton.cpp @@ -28,7 +28,7 @@ KexiDropDownButton::KexiDropDownButton(TQWidget *parent) : TQToolButton(parent, "KexiDBImageBox::Button") { - tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); + setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); //! @todo get this from a KStyle // setFixedWidth(TQMAX(18, tqApp->globalStrut().width())); int fixedWidth; @@ -55,11 +55,11 @@ void KexiDropDownButton::drawButton( TQPainter *p ) if (isEnabled()) arrowFlags |= TQStyle::Style_Enabled; tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, p, - TQRect((width()-7)/2, height()-9, 7, 7), tqcolorGroup(), + TQRect((width()-7)/2, height()-9, 7, 7), colorGroup(), arrowFlags, TQStyleOption() ); } -TQSize KexiDropDownButton::tqsizeHint () const +TQSize KexiDropDownButton::sizeHint () const { return TQSize( fontMetrics().maxWidth() + 2*2, fontMetrics().height()*2 + 2*2 ); } diff --git a/kexi/widget/utils/kexidropdownbutton.h b/kexi/widget/utils/kexidropdownbutton.h index e61ab9f5..178f17a7 100644 --- a/kexi/widget/utils/kexidropdownbutton.h +++ b/kexi/widget/utils/kexidropdownbutton.h @@ -38,7 +38,7 @@ class KEXIGUIUTILS_EXPORT KexiDropDownButton : public TQToolButton virtual void drawButton( TQPainter *p ); - virtual TQSize tqsizeHint () const; + virtual TQSize sizeHint () const; virtual void keyPressEvent ( TQKeyEvent * e ); }; diff --git a/kexi/widget/utils/kexiflowlayout.cpp b/kexi/widget/utils/kexiflowlayout.cpp index e4bc4207..e2397ede 100644 --- a/kexi/widget/utils/kexiflowlayout.cpp +++ b/kexi/widget/utils/kexiflowlayout.cpp @@ -64,7 +64,7 @@ KexiFlowLayoutIterator::takeCurrent() return (m_idx < (int)count()) ? m_list->take(m_idx) : 0; } -//// The tqlayout itself +//// The layout itself KexiFlowLayout::KexiFlowLayout(TQWidget *parent, int border, int space, const char *name) : TQLayout(parent, border, space, name) @@ -134,10 +134,10 @@ KexiFlowLayout::widgetList() const } void -KexiFlowLayout::tqinvalidate() +KexiFlowLayout::invalidate() { - TQLayout::tqinvalidate(); - m_cached_tqsizeHint = TQSize(); + TQLayout::invalidate(); + m_cached_sizeHint = TQSize(); m_cached_minSize = TQSize(); m_cached_width = 0; } @@ -169,22 +169,22 @@ KexiFlowLayout::heightForWidth(int w) const } TQSize -KexiFlowLayout::tqsizeHint() const +KexiFlowLayout::sizeHint() const { - if(m_cached_tqsizeHint.isEmpty()) { + if(m_cached_sizeHint.isEmpty()) { KexiFlowLayout *mthis = (KexiFlowLayout*)this; TQRect r = TQRect(0, 0, 2000, 2000); mthis->simulateLayout(r); } - return m_cached_tqsizeHint; + return m_cached_sizeHint; } TQSize -KexiFlowLayout::tqminimumSize() const +KexiFlowLayout::minimumSize() const { -//js: do we really need to simulate tqlayout here? -// I commented this out because it was impossible to stretch tqlayout conveniently. -// Now, minimum size is computed automatically based on item's tqminimumSize... +//js: do we really need to simulate layout here? +// I commented this out because it was impossible to stretch layout conveniently. +// Now, minimum size is computed automatically based on item's minimumSize... #if 0 if(m_cached_minSize.isEmpty()) { KexiFlowLayout *mthis = (KexiFlowLayout*)this; @@ -234,7 +234,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly) TQPtrListIterator<TQLayoutItem> it(m_list); TQPtrList<TQLayoutItem> currentLine; TQLayoutItem *o; - TQSize minSize, tqsizeHint(20, 20); + TQSize minSize, sizeHint(20, 20); int minSizeHeight = 0 - spacing(); while ( (o = it.current()) != 0 ) { @@ -244,20 +244,20 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly) } // kdDebug() << "- doHorizontalLayout(): " << o->widget()->className() << " " << o->widget()->name() << endl; - TQSize oSizeHint = o->tqsizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts) + TQSize oSizeHint = o->sizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts) if ((x + oSizeHint.width()) > r.right() && h > 0) { - // do the tqlayout of current line + // do the layout of current line TQPtrListIterator<TQLayoutItem> it2(currentLine); TQLayoutItem *item; int wx = r.x(); int sizeHintWidth = 0 -spacing(), minSizeWidth=0 - spacing(), lineMinHeight=0; while( (item = it2.current()) != 0 ) { - TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take - TQSize itemMinSize = item->tqminimumSize(); // a while to get them + TQSize itemSizeHint = item->sizeHint(); // we cache these ones because it can take + TQSize itemMinSize = item->minimumSize(); // a while to get them TQSize s; if(m_justify) { if(expandingWidgets != 0) { - if(item->expandingDirections() == TQSizePolicy::Horizontally || item->expandingDirections() == TQSizePolicy::BothDirections) + if(item->expanding() == TQSizePolicy::Horizontally || item->expanding() == TQSizePolicy::BothDirections) s = TQSize( TQMIN(itemSizeHint.width() + availableSpace / expandingWidgets , r.width()), itemSizeHint.height() ); else @@ -277,7 +277,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly) lineMinHeight = TQMAX( lineMinHeight, itemMinSize.height() ); ++it2; } - tqsizeHint = tqsizeHint.expandedTo( TQSize(sizeHintWidth, 0) ); + sizeHint = sizeHint.expandedTo( TQSize(sizeHintWidth, 0) ); minSize = minSize.expandedTo( TQSize(minSizeWidth, 0) ); minSizeHeight = minSizeHeight + spacing() + lineMinHeight; // start a new line @@ -292,24 +292,24 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly) x = x + spacing() + oSizeHint.width(); h = TQMAX( h, oSizeHint.height() ); currentLine.append(o); - if(o->expandingDirections() == TQSizePolicy::Horizontally || o->expandingDirections() == TQSizePolicy::BothDirections) + if(o->expanding() == TQSizePolicy::Horizontally || o->expanding() == TQSizePolicy::BothDirections) ++expandingWidgets; availableSpace = TQMAX(0, availableSpace - spacing() - oSizeHint.width()); ++it; } - // don't forget to tqlayout the last line + // don't forget to layout the last line TQPtrListIterator<TQLayoutItem> it2(currentLine); TQLayoutItem *item; int wx = r.x(); int sizeHintWidth = 0 -spacing(), minSizeWidth=0 - spacing(), lineMinHeight=0; while( (item = it2.current()) != 0 ) { - TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take - TQSize itemMinSize = item->tqminimumSize(); // a while to get them + TQSize itemSizeHint = item->sizeHint(); // we cache these ones because it can take + TQSize itemMinSize = item->minimumSize(); // a while to get them TQSize s; if(m_justify) { if(expandingWidgets != 0) { - if(item->expandingDirections() == TQSizePolicy::Horizontally || item->expandingDirections() == TQSizePolicy::BothDirections) + if(item->expanding() == TQSizePolicy::Horizontally || item->expanding() == TQSizePolicy::BothDirections) s = TQSize( TQMIN(itemSizeHint.width() + availableSpace / expandingWidgets , r.width()), itemSizeHint.height() ); else @@ -329,12 +329,12 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly) lineMinHeight = TQMAX( lineMinHeight, itemMinSize.height() ); ++it2; } - tqsizeHint = tqsizeHint.expandedTo( TQSize(sizeHintWidth, y + spacing() + h) ); + sizeHint = sizeHint.expandedTo( TQSize(sizeHintWidth, y + spacing() + h) ); minSizeHeight = minSizeHeight + spacing() + lineMinHeight; minSize = minSize.expandedTo( TQSize(minSizeWidth, minSizeHeight) ); - // store tqsizeHint() and tqminimumSize() - m_cached_tqsizeHint = tqsizeHint + TQSize(2* margin(), 2*margin()); + // store sizeHint() and minimumSize() + m_cached_sizeHint = sizeHint + TQSize(2* margin(), 2*margin()); m_cached_minSize = minSize + TQSize(2* margin() , 2*margin()); // return our height return y + h - r.y(); @@ -351,7 +351,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly) TQPtrListIterator<TQLayoutItem> it(m_list); TQPtrList<TQLayoutItem> currentLine; TQLayoutItem *o; - TQSize minSize, tqsizeHint(20, 20); + TQSize minSize, sizeHint(20, 20); int minSizeWidth = 0 - spacing(); while ( (o = it.current()) != 0 ) { @@ -360,20 +360,20 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly) continue; } - TQSize oSizeHint = o->tqsizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts) + TQSize oSizeHint = o->sizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts) if (y + oSizeHint.height() > r.bottom() && w > 0) { - // do the tqlayout of current line + // do the layout of current line TQPtrListIterator<TQLayoutItem> it2(currentLine); TQLayoutItem *item; int wy = r.y(); int sizeHintHeight = 0 - spacing(), minSizeHeight = 0 - spacing(), colMinWidth=0; while( (item = it2.current()) != 0 ) { - TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take - TQSize itemMinSize = item->tqminimumSize(); // a while to get them + TQSize itemSizeHint = item->sizeHint(); // we cache these ones because it can take + TQSize itemMinSize = item->minimumSize(); // a while to get them TQSize s; if(m_justify) { if(expandingWidgets != 0) { - if(item->expandingDirections() == TQSizePolicy::Vertically || item->expandingDirections() == TQSizePolicy::BothDirections) + if(item->expanding() == TQSizePolicy::Vertically || item->expanding() == TQSizePolicy::BothDirections) s = TQSize( itemSizeHint.width(), TQMIN(itemSizeHint.height() + availableSpace / expandingWidgets , r.height()) ); else @@ -393,7 +393,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly) colMinWidth = TQMAX( colMinWidth, itemMinSize.width() ); ++it2; } - tqsizeHint = tqsizeHint.expandedTo( TQSize(0, sizeHintHeight) ); + sizeHint = sizeHint.expandedTo( TQSize(0, sizeHintHeight) ); minSize = minSize.expandedTo( TQSize(0, minSizeHeight) ); minSizeWidth = minSizeWidth + spacing() + colMinWidth; // start a new column @@ -408,24 +408,24 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly) y = y + spacing() + oSizeHint.height(); w = TQMAX( w, oSizeHint.width() ); currentLine.append(o); - if(o->expandingDirections() == TQSizePolicy::Vertically || o->expandingDirections() == TQSizePolicy::BothDirections) + if(o->expanding() == TQSizePolicy::Vertically || o->expanding() == TQSizePolicy::BothDirections) ++expandingWidgets; availableSpace = TQMAX(0, availableSpace - spacing() - oSizeHint.height()); ++it; } - // don't forget to tqlayout the last line + // don't forget to layout the last line TQPtrListIterator<TQLayoutItem> it2(currentLine); TQLayoutItem *item; int wy = r.y(); int sizeHintHeight = 0 - spacing(), minSizeHeight = 0 - spacing(), colMinWidth=0; while( (item = it2.current()) != 0 ) { - TQSize itemSizeHint = item->tqsizeHint(); // we cache these ones because it can take - TQSize itemMinSize = item->tqminimumSize(); // a while to get them + TQSize itemSizeHint = item->sizeHint(); // we cache these ones because it can take + TQSize itemMinSize = item->minimumSize(); // a while to get them TQSize s; if(m_justify) { if(expandingWidgets != 0) { - if(item->expandingDirections() == TQSizePolicy::Vertically || item->expandingDirections() == TQSizePolicy::BothDirections) + if(item->expanding() == TQSizePolicy::Vertically || item->expanding() == TQSizePolicy::BothDirections) s = TQSize( itemSizeHint.width(), TQMIN(itemSizeHint.height() + availableSpace / expandingWidgets , r.height()) ); else @@ -445,12 +445,12 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly) colMinWidth = TQMAX( colMinWidth, itemMinSize.width() ); ++it2; } - tqsizeHint = tqsizeHint.expandedTo( TQSize( x + spacing() + w, sizeHintHeight) ); + sizeHint = sizeHint.expandedTo( TQSize( x + spacing() + w, sizeHintHeight) ); minSizeWidth = minSizeWidth + spacing() + colMinWidth; minSize = minSize.expandedTo( TQSize(minSizeWidth, minSizeHeight) ); - // store tqsizeHint() and tqminimumSize() - m_cached_tqsizeHint = tqsizeHint + TQSize(2* margin(), 2*margin()); + // store sizeHint() and minimumSize() + m_cached_sizeHint = sizeHint + TQSize(2* margin(), 2*margin()); m_cached_minSize = minSize + TQSize(2* margin(), 2*margin()); // return our width return x + w - r.x(); @@ -468,7 +468,7 @@ int KexiFlowLayout::count() const { \reimp */ TQLayoutItem* KexiFlowLayout::itemAt(int index) const { - return index >= 0 && index < m_list.count() ? (const_cast<TQPtrList<TQLayoutItem>&>(m_list).tqat(index)) : 0; + return index >= 0 && index < m_list.count() ? (const_cast<TQPtrList<TQLayoutItem>&>(m_list).at(index)) : 0; } /*! @@ -477,8 +477,8 @@ TQLayoutItem* KexiFlowLayout::itemAt(int index) const { TQLayoutItem* KexiFlowLayout::takeAt(int index) { if (index < 0 || index >= m_list.count()) return 0; - TQLayoutItem *item = m_list.tqat(index); - m_list.remove(m_list.tqat(index)); + TQLayoutItem *item = m_list.at(index); + m_list.remove(m_list.at(index)); delete item; invalidate(); diff --git a/kexi/widget/utils/kexiflowlayout.h b/kexi/widget/utils/kexiflowlayout.h index 0f6d8384..f48ed140 100644 --- a/kexi/widget/utils/kexiflowlayout.h +++ b/kexi/widget/utils/kexiflowlayout.h @@ -20,10 +20,10 @@ #ifndef KEXIFLOWLAYOUT_H #define KEXIFLOWLAYOUT_H -#include <tqlayout.h> +#include <layout.h> #include <tqptrlist.h> -//! @short a special "flow" tqlayout +//! @short a special "flow" layout class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout { public: @@ -33,14 +33,14 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout ~KexiFlowLayout(); - /*! \return the widgets in the order of the tqlayout, + /*! \return the widgets in the order of the layout, ie as it is stored in m_list. You must delete the list after using it. */ TQPtrList<TQWidget>* widgetList() const; - /*! Sets tqlayout's orientation to \a orientation. Default orientation isQt::Vertical. */ + /*! Sets layout's orientation to \a orientation. Default orientation isQt::Vertical. */ void setOrientation(Qt::Orientation orientation) { m_orientation = orientation; } - /*! \return tqlayout's orientation. */ + /*! \return layout's orientation. */ Qt::Orientation orientation() const { return m_orientation; } void setJustified(bool justify) { m_justify = justify; } @@ -49,12 +49,12 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout virtual void addItem(TQLayoutItem *item); virtual void addSpacing(int size); virtual TQLayoutIterator iterator(); - virtual void tqinvalidate(); + virtual void invalidate(); virtual bool hasHeightForWidth() const; virtual int heightForWidth(int width) const; - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSize() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSize() const; virtual TQSizePolicy::ExpandData expanding() const; virtual bool isEmpty(); @@ -75,7 +75,7 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout int m_cached_hfw; bool m_justify; Qt::Orientation m_orientation; - TQSize m_cached_tqsizeHint; + TQSize m_cached_sizeHint; TQSize m_cached_minSize; }; diff --git a/kexi/widget/utils/kexigradientwidget.cpp b/kexi/widget/utils/kexigradientwidget.cpp index 18d34447..d93b13ff 100644 --- a/kexi/widget/utils/kexigradientwidget.cpp +++ b/kexi/widget/utils/kexigradientwidget.cpp @@ -155,7 +155,7 @@ void KexiGradientWidget::rebuildCache( void ) { } /** - All tqchildren need to have our background set. + All children need to have our background set. */ KPixmap partPixmap; TQRect area; @@ -180,7 +180,7 @@ void KexiGradientWidget::rebuildCache( void ) { under the current child-widget. */ if ( TQT_BASE_OBJECT(childWidget->parent()) == TQT_BASE_OBJECT(this) ) { - area = childWidget->tqgeometry(); + area = childWidget->geometry(); } else { area.setTopLeft( childWidget->mapTo( this, childWidget->clipRegion().boundingRect().topLeft() ) ); @@ -311,7 +311,7 @@ void KexiGradientWidget::updateChildBackground( TQWidget* childWidget ) /** Exclude widgtes that don't have a parent. - This happens when tqchildren are removed + This happens when children are removed which are in the knownWidgets-list. */ if ( childWidget->parent() == 0L ) @@ -330,7 +330,7 @@ void KexiGradientWidget::updateChildBackground( TQWidget* childWidget ) under the current child-widget. */ if ( TQT_BASE_OBJECT(childWidget->parent()) == TQT_BASE_OBJECT(this) ) { - area = childWidget->tqgeometry(); + area = childWidget->geometry(); } else { area.setTopLeft( childWidget->mapTo( this, childWidget->clipRegion().boundingRect().topLeft() ) ); diff --git a/kexi/widget/utils/kexigradientwidget.h b/kexi/widget/utils/kexigradientwidget.h index 3f9b894d..d11c4f04 100644 --- a/kexi/widget/utils/kexigradientwidget.h +++ b/kexi/widget/utils/kexigradientwidget.h @@ -184,11 +184,11 @@ class KEXIGUIUTILS_EXPORT KexiGradientWidget : public TQWidget { private: /*! - Builds a list of tqchildren of \a p. + Builds a list of children of \a p. Only widgets that work correctly with KexiGradientWidget will be in this list. The results will be stored in \a list. - The method recursively calls itself until all tqchildren of \a p + The method recursively calls itself until all children of \a p have been found and stored in the list. */ static void buildChildrenList( WidgetList& list, TQWidget* p ); diff --git a/kexi/widget/utils/kexirecordmarker.cpp b/kexi/widget/utils/kexirecordmarker.cpp index b22e0500..55a7c47a 100644 --- a/kexi/widget/utils/kexirecordmarker.cpp +++ b/kexi/widget/utils/kexirecordmarker.cpp @@ -100,7 +100,7 @@ public: , highlightedRow(-1) , editRow(-1) , rows(0) - , selectionBackgroundColor(tqApp->tqpalette().active().highlight()) + , selectionBackgroundColor(tqApp->palette().active().highlight()) , showInsertRow(true) { } @@ -188,13 +188,13 @@ void KexiRecordMarker::paintEvent(TQPaintEvent *e) if(last > (d->rows-1+(d->showInsertRow?1:0))) last = d->rows-1+(d->showInsertRow?1:0); - TQColorGroup selectedColorGroup(tqcolorGroup()); + TQColorGroup selectedColorGroup(colorGroup()); selectedColorGroup.setColor( TQColorGroup::Button, KexiUtils::blendedColors( selectedColorGroup.color(TQColorGroup::Background), d->selectionBackgroundColor, 2, 1) ); selectedColorGroup.setColor( TQColorGroup::Background, selectedColorGroup.color(TQColorGroup::Button) ); //set background color as well (e.g. for thinkeramik) - TQColorGroup highlightedColorGroup(tqcolorGroup()); + TQColorGroup highlightedColorGroup(colorGroup()); highlightedColorGroup.setColor( TQColorGroup::Button, KexiUtils::blendedColors( highlightedColorGroup.color(TQColorGroup::Background), d->selectionBackgroundColor, 4, 1) ); @@ -206,7 +206,7 @@ void KexiRecordMarker::paintEvent(TQPaintEvent *e) TQRect r(0, y, width(), d->rowHeight); p.drawRect(r); tqstyle().tqdrawPrimitive( TQStyle::PE_HeaderSection, &p, r, - (d->currentRow == i) ? selectedColorGroup : (d->highlightedRow == i ? highlightedColorGroup : tqcolorGroup()), + (d->currentRow == i) ? selectedColorGroup : (d->highlightedRow == i ? highlightedColorGroup : colorGroup()), TQStyle::Style_Raised | (isEnabled() ? TQStyle::Style_Enabled : 0)); } if (d->editRow!=-1 && d->editRow >= first && d->editRow <= (last/*+1 for insert row*/)) { @@ -220,7 +220,7 @@ void KexiRecordMarker::paintEvent(TQPaintEvent *e) && (!d->showInsertRow || (d->showInsertRow && d->currentRow < last)))/*don't display marker for 'insert' row*/ { //show marker - p.setBrush(tqcolorGroup().foreground()); + p.setBrush(colorGroup().foreground()); p.setPen(TQPen(TQt::NoPen)); TQPointArray points(3); int ofs = d->rowHeight / 4; diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp index 4c1dd02b..f4c96b58 100644 --- a/kexi/widget/utils/kexirecordnavigator.cpp +++ b/kexi/widget/utils/kexirecordnavigator.cpp @@ -19,7 +19,7 @@ */ #include <tqtoolbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqvalidator.h> #include <tqtooltip.h> @@ -102,7 +102,7 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const d->lyr->addSpacing( 6 ); d->lyr->addWidget( m_navRecordNumber = new KLineEdit(this) ); - m_navRecordNumber->tqsetAlignment(AlignRight | AlignVCenter); + m_navRecordNumber->setAlignment(AlignRight | AlignVCenter); m_navRecordNumber->setFocusPolicy(TQ_ClickFocus); m_navRecordNumber->installEventFilter(this); // m_navRowNumber->setFixedWidth(fw); @@ -112,20 +112,20 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const TQToolTip::add(m_navRecordNumber, i18n("Current row number")); KLineEdit *lbl_of = new KLineEdit(i18n("of"), this); - lbl_of->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Preferred); + lbl_of->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Preferred); lbl_of->setMaximumWidth(fm.width(lbl_of->text())+8); lbl_of->setReadOnly(true); lbl_of->setLineWidth(0); lbl_of->setFocusPolicy(TQ_NoFocus); - lbl_of->tqsetAlignment(AlignCenter); + lbl_of->setAlignment(AlignCenter); d->lyr->addWidget( lbl_of ); d->lyr->addWidget( m_navRecordCount = new KLineEdit(this) ); - m_navRecordCount->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Preferred); + m_navRecordCount->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Preferred); m_navRecordCount->setReadOnly(true); m_navRecordCount->setLineWidth(0); m_navRecordCount->setFocusPolicy(TQ_NoFocus); - m_navRecordCount->tqsetAlignment(AlignLeft | AlignVCenter); + m_navRecordCount->setAlignment(AlignLeft | AlignVCenter); TQToolTip::add(m_navRecordCount, i18n("Number of rows")); lbl_of->setFont(f); @@ -337,7 +337,7 @@ void KexiRecordNavigator::updateGeometry(int leftMargin) if (m_view) { int navWidth; if (m_view->horizontalScrollBar()->isVisible()) { - navWidth = tqsizeHint().width(); + navWidth = sizeHint().width(); } else { navWidth = leftMargin + m_view->clipper()->width(); @@ -345,9 +345,9 @@ void KexiRecordNavigator::updateGeometry(int leftMargin) setGeometry( m_view->frameWidth(), - m_view->height() - m_view->horizontalScrollBar()->tqsizeHint().height()-m_view->frameWidth(), + m_view->height() - m_view->horizontalScrollBar()->sizeHint().height()-m_view->frameWidth(), navWidth, - m_view->horizontalScrollBar()->tqsizeHint().height() + m_view->horizontalScrollBar()->sizeHint().height() ); m_view->updateScrollBars(); @@ -361,7 +361,7 @@ void KexiRecordNavigator::setHBarGeometry( TQScrollBar & hbar, int x, int y, int void KexiRecordNavigator::setLabelText(const TQString& text) { - m_textLabel->setText(text.isEmpty() ? TQString() : (TQString::tqfromLatin1(" ")+text+" ")); + m_textLabel->setText(text.isEmpty() ? TQString() : (TQString::fromLatin1(" ")+text+" ")); } void KexiRecordNavigator::setInsertingButtonVisible(bool set) @@ -429,7 +429,7 @@ void KexiRecordNavigator::setEditingIndicatorEnabled(bool set) if (d->editingIndicatorEnabled) { if (!d->editingIndicatorLabel) { d->editingIndicatorLabel = new TQLabel(this); - d->editingIndicatorLabel->tqsetAlignment(TQt::AlignCenter); + d->editingIndicatorLabel->setAlignment(TQt::AlignCenter); TQPixmap pix; pix.convertFromImage( *KexiRecordMarker::penImage() ); d->editingIndicatorLabel->setFixedWidth( pix.width() + 2*2 ); diff --git a/kexi/widget/utils/kexirecordnavigator.h b/kexi/widget/utils/kexirecordnavigator.h index 9eae328b..6c666e78 100644 --- a/kexi/widget/utils/kexirecordnavigator.h +++ b/kexi/widget/utils/kexirecordnavigator.h @@ -87,7 +87,7 @@ class KEXIGUIUTILS_EXPORT KexiRecordNavigator : public TQFrame /*! \return record count displayed for this navigator. */ uint recordCount() const; - /*! Sets horizontal bar's \a hbar (at the bottom) tqgeometry so this record navigator + /*! Sets horizontal bar's \a hbar (at the bottom) geometry so this record navigator is properly positioned together with horizontal scroll bar. This method is used in TQScrollView::setHBarGeometry() implementations: see KexiTableView::setHBarGeometry() and KexiFormScrollView::setHBarGeometry() diff --git a/kexi/widget/utils/kexitooltip.cpp b/kexi/widget/utils/kexitooltip.cpp index 7d71752c..2a36ef09 100644 --- a/kexi/widget/utils/kexitooltip.cpp +++ b/kexi/widget/utils/kexitooltip.cpp @@ -42,7 +42,7 @@ KexiToolTip::~KexiToolTip() { } -TQSize KexiToolTip::tqsizeHint() const +TQSize KexiToolTip::sizeHint() const { TQSize sz(fontMetrics().boundingRect(m_value.toString()).size()); return sz; @@ -64,7 +64,7 @@ void KexiToolTip::paintEvent( TQPaintEvent *pev ) void KexiToolTip::drawFrame(TQPainter& p) { - p.setPen( TQPen(tqpalette().active().foreground(), 1) ); + p.setPen( TQPen(palette().active().foreground(), 1) ); p.drawRect(rect()); } diff --git a/kexi/widget/utils/kexitooltip.h b/kexi/widget/utils/kexitooltip.h index cfa1b483..83d0d7e0 100644 --- a/kexi/widget/utils/kexitooltip.h +++ b/kexi/widget/utils/kexitooltip.h @@ -32,7 +32,7 @@ class KEXIGUIUTILS_EXPORT KexiToolTip : public TQWidget KexiToolTip(const TQVariant& value, TQWidget* parent); virtual ~KexiToolTip(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: virtual void show(); diff --git a/kformula/DESIGN b/kformula/DESIGN index 0e828043..eec70869 100644 --- a/kformula/DESIGN +++ b/kformula/DESIGN @@ -19,22 +19,22 @@ objects from it. Responsebilities (This goes for every derived element and therefore for each one.) -- knows its tqchildren. Actually BasicElement doesn't have any. But it - already defines that tqchildren must be known by their parent. -- knows its bounding rectangle (its size.) The tqchildren are included +- knows its children. Actually BasicElement doesn't have any. But it + already defines that children must be known by their parent. +- knows its bounding rectangle (its size.) The children are included in this rect. (Only width and height are needed. Positions are handled by the parent) -//- knows its middle line. (for tqalignment) -- knows it's zero point for midline (vertical tqalignment) and +//- knows its middle line. (for alignment) +- knows it's zero point for midline (vertical alignment) and keep open the possibility of negative positions (out of bounding rect) -- draws itself (given a painter); tqchildren are drawn, too +- draws itself (given a painter); children are drawn, too - knows all positions where the cursor is allowed to be. (see below) - knows its parent; The topmost element has no parent; there is a implicit garantie that the topmost element is always a SequenceElement. - can save and load itself. different formates. (see below) -- all tqchildren must be a SequenceElement. Except for SequenceElement's - tqchildren that might be of any type. +- all children must be a SequenceElement. Except for SequenceElement's + children that might be of any type. - might have its own color. - might have its own font size (see below). @@ -42,14 +42,14 @@ Responsebilities SequenceElement from BasicElement --------------- -Manages a list of tqchildren. The tqchildren are aligned horizontally at +Manages a list of children. The children are aligned horizontally at one middle line. No gaps, no overlaps. -Has no own look. It just draws all its tqchildren and is done. Except if +Has no own look. It just draws all its children and is done. Except if its empty. It looks like an empty space then (i.e. a little square) Has n+1 valid cursor positions where n is the number of -tqchildren. These are before, between and after the tqchildren. +children. These are before, between and after the children. May contain any (type of) element as child @@ -74,20 +74,20 @@ FormulaElement we get a chance to pass messages to the outside world. RootElement from BasicElement ----------- -contains two tqchildren. content and index. index is optional. +contains two children. content and index. index is optional. IndexElement from BasicElement ------------ -contains five tqchildren. content and four indexes. all indexes are +contains five children. content and four indexes. all indexes are optional. If there is no index the element might be replaced by its content. TextElement from BasicElement ----------- -contains one char and no tqchildren at all. +contains one char and no children at all. Might have its own font and size. But preferes to use a reasonalbe @@ -105,7 +105,7 @@ choose with. FractionElement from BasicElement --------------- -2 tqchildren: numerator, denominator +2 children: numerator, denominator DecorationElement from BasicElement @@ -122,7 +122,7 @@ the other side of the decoration. SumIntegralElement from BasicElement //PrefixedElement ------------------ -draws all sorts of mathematical symbols with three tqchildren. Above, +draws all sorts of mathematical symbols with three children. Above, below (or whereever the indices and limits go)and to the right. @@ -143,7 +143,7 @@ typical of a math formula. MatrixElement from BasicElement ------------- -A matrix of tqchildren. +A matrix of children. With all align stuff, internal borders etc, matrix dots handling (i.e. those dots or lines that complete the matrix, not well handled in TeX), etc.. @@ -151,7 +151,7 @@ etc.. SpaceElement from BasicElement ------------ -No tqchildren at all. Provides the facility to insert horizontal spaces +No children at all. Provides the facility to insert horizontal spaces in the formula. (therefore it is similar to TextElement.) @@ -183,14 +183,14 @@ If the cursor points into an element this element is said to own the cursor. There are a few rules that describe how new cursor positions are calculated given the current key: -- An elements cursor positions are its tqchildren. The element might not -own the cursor except when it is owned by one of its tqchildren. The +- An elements cursor positions are its children. The element might not +own the cursor except when it is owned by one of its children. The only exception is SequenceElement which has valid cursor positions -before, between and after its tqchildren, too. +before, between and after its children, too. (Therefore the cursor is always owned by a SequenceElement.) -- Each element's tqchildren are ordered. If the cursor leaves one child +- Each element's children are ordered. If the cursor leaves one child the next child it. The direction depends on the key that moved the cursor. If there is child left the cursor is passed to the parent. @@ -261,7 +261,7 @@ We want a formula to look different according to its surroundings. (Most obviosly according to the available height and/or width.) It would be great to get something like automatic operator -tqalignment. So if you type some formulas each on its own line the +alignment. So if you type some formulas each on its own line the assigment operators should be automatically in a column. (If the user turns this on.) @@ -272,7 +272,7 @@ Fonts and font size (2 ideas) 1) Each element know its font family (also if it is not a text element) so that it -can give this font to its tqchildren. +can give this font to its children. The font size is calculated starting from a global scale factor and appling to it a local size modifier (like HTML -2, -1,+3,etc..), this also calculate the diff --git a/kformula/formulastring.cc b/kformula/formulastring.cc index b22c8576..d58faa5d 100644 --- a/kformula/formulastring.cc +++ b/kformula/formulastring.cc @@ -18,9 +18,9 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqstringlist.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqtooltip.h> #include <tqvariant.h> #include <tqwhatsthis.h> @@ -112,7 +112,7 @@ void FormulaString::helpButtonClicked() void FormulaString::cursorPositionChanged( int para, int pos ) { - position->setText( TQString( "%1:%2" ).tqarg( para+1 ).tqarg( pos+1 ) ); + position->setText( TQString( "%1:%2" ).arg( para+1 ).arg( pos+1 ) ); } #include "formulastring.moc" diff --git a/kformula/fsparser.cc b/kformula/fsparser.cc index 3d425a16..863cc9eb 100644 --- a/kformula/fsparser.cc +++ b/kformula/fsparser.cc @@ -50,20 +50,20 @@ public: //virtual void output( ostream& stream ) { stream << "PrimaryNode {" << m_primary << "}" << endl; } virtual void buildXML( TQDomDocument& doc, TQDomElement element ); virtual bool isSimple() { return true; } - void setUnicode( TQChar tqunicode ) { m_tqunicode = tqunicode; } + void setUnicode( TQChar unicode ) { m_unicode = unicode; } void setFunctionName( bool functionName ) { m_functionName = functionName; } TQString primary() const { return m_primary; } private: TQString m_primary; - TQChar m_tqunicode; + TQChar m_unicode; bool m_functionName; }; void PrimaryNode::buildXML( TQDomDocument& doc, TQDomElement element ) { - if ( m_tqunicode != TQChar::null ) { + if ( m_unicode != TQChar::null ) { TQDomElement de = doc.createElement( "TEXT" ); - de.setAttribute( "CHAR", TQString( m_tqunicode ) ); + de.setAttribute( "CHAR", TQString( m_unicode ) ); de.setAttribute( "SYMBOL", "3" ); element.appendChild( de ); } @@ -447,7 +447,7 @@ TQDomDocument FormulaStringParser::parse() head = parseAssign(); //head->output( cout ); if ( !eol() ) { - error( TQString( i18n( "Aborted parsing at %1:%2" ) ).tqarg( line ).tqarg( column ) ); + error( TQString( i18n( "Aborted parsing at %1:%2" ) ).arg( line ).arg( column ) ); } TQDomDocument doc = KFormula::Document::createDomDocument(); @@ -543,7 +543,7 @@ ParserNode* FormulaStringParser::parsePrimary() } case NAME: { PrimaryNode* node = new PrimaryNode( current ); - node->setUnicode( m_symbolTable.tqunicode( current ) ); + node->setUnicode( m_symbolTable.unicode( current ) ); nextToken(); if ( currentType == LP ) { nextToken(); @@ -556,7 +556,7 @@ ParserNode* FormulaStringParser::parsePrimary() nextToken(); } } - expect( RP, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( ")" ) ); + expect( RP, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( ")" ) ); node->setFunctionName( true ); return new FunctionNode( node, args ); } @@ -571,7 +571,7 @@ ParserNode* FormulaStringParser::parsePrimary() case LP: { nextToken(); ParserNode* node = parseExpr(); - expect( RP, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( ")" ) ); + expect( RP, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( ")" ) ); return node; } case LB: { @@ -582,7 +582,7 @@ ParserNode* FormulaStringParser::parsePrimary() m_newlineIsSpace = innerBrackets; while ( ( currentType != EOL ) && ( currentType != RB ) ) { if ( innerBrackets ) { - expect( LB, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( "[" ) ); + expect( LB, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( "[" ) ); } TQPtrList<ParserNode> row; row.setAutoDelete( false ); @@ -594,7 +594,7 @@ ParserNode* FormulaStringParser::parsePrimary() } } if ( innerBrackets ) { - expect( RB, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( "]" ) ); + expect( RB, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( "]" ) ); if ( currentType == COMMA ) { nextToken(); } @@ -605,20 +605,20 @@ ParserNode* FormulaStringParser::parsePrimary() nextToken(); } else { - expect( SEMIC, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( ";" ) ); + expect( SEMIC, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( ";" ) ); } } } rows.append( new RowNode( row ) ); } m_newlineIsSpace = true; - expect( RB, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( "]" ) ); + expect( RB, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( "]" ) ); MatrixNode* node = new MatrixNode( rows ); if ( node->columns() == 0 ) { - error( TQString( i18n( "Null columns in Matrix at %1:%2" ) ).tqarg( line ).tqarg( column ) ); + error( TQString( i18n( "Null columns in Matrix at %1:%2" ) ).arg( line ).arg( column ) ); } if ( node->rows() == 0 ) { - error( TQString( i18n( "Null rows in Matrix at %1:%2" ) ).tqarg( line ).tqarg( column ) ); + error( TQString( i18n( "Null rows in Matrix at %1:%2" ) ).arg( line ).arg( column ) ); } return node; } @@ -628,7 +628,7 @@ ParserNode* FormulaStringParser::parsePrimary() return node; } default: - error( TQString( i18n( "Unexpected token at %1:%2" ) ).tqarg( line ).tqarg( column ) ); + error( TQString( i18n( "Unexpected token at %1:%2" ) ).arg( line ).arg( column ) ); return new PrimaryNode( "?" ); } } @@ -773,7 +773,7 @@ void FormulaStringParser::readNumber() readDigits(); } else if ( !digitsBeforeDot ) { - error( TQString( i18n( "A single '.' is not a number at %1:%2" ) ).tqarg( line ).tqarg( column ) ); + error( TQString( i18n( "A single '.' is not a number at %1:%2" ) ).arg( line ).arg( column ) ); return; } } diff --git a/kformula/kformula_view.cc b/kformula/kformula_view.cc index 7dbabc00..ae0b59ba 100644 --- a/kformula/kformula_view.cc +++ b/kformula/kformula_view.cc @@ -22,7 +22,7 @@ class KPrinter; #include <tqpainter.h> #include <tqpopupmenu.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqtimer.h> #include <kaction.h> diff --git a/kformula/kformulawidget.cc b/kformula/kformulawidget.cc index dc259320..c8d4a284 100644 --- a/kformula/kformulawidget.cc +++ b/kformula/kformulawidget.cc @@ -68,11 +68,11 @@ void KFormulaWidget::setReadOnly(bool ro) void KFormulaWidget::paintEvent(TQPaintEvent* event) { - // Always tqrepaint the buffer. This is not so much more work - // than it seems to be as each cursor movement requires a tqrepaint. + // Always repaint the buffer. This is not so much more work + // than it seems to be as each cursor movement requires a repaint. TQPainter p( &buffer ); //p.translate( -fr.x(), -fr.y() ); - formulaView.draw( p, event->rect(), tqcolorGroup() ); + formulaView.draw( p, event->rect(), colorGroup() ); TQPainter painter; painter.begin(this); diff --git a/kivio/kiviopart/config/kivio_config.cpp b/kivio/kiviopart/config/kivio_config.cpp index 6428c1fd..74e8572b 100644 --- a/kivio/kiviopart/config/kivio_config.cpp +++ b/kivio/kiviopart/config/kivio_config.cpp @@ -28,30 +28,30 @@ namespace Kivio { KoPageLayout Config::defaultPageLayout() { - KoPageLayout tqlayout; + KoPageLayout layout; - tqlayout.format = KoPageFormat::formatFromString(Settings::format()); - tqlayout.orientation = Kivio::orientationFromString(Settings::orientation()); - tqlayout.ptTop = Settings::borderTop(); - tqlayout.ptBottom = Settings::borderBottom(); - tqlayout.ptLeft = Settings::borderLeft(); - tqlayout.ptRight = Settings::borderRight(); - tqlayout.ptWidth = Settings::width(); - tqlayout.ptHeight = Settings::height(); + layout.format = KoPageFormat::formatFromString(Settings::format()); + layout.orientation = Kivio::orientationFromString(Settings::orientation()); + layout.ptTop = Settings::borderTop(); + layout.ptBottom = Settings::borderBottom(); + layout.ptLeft = Settings::borderLeft(); + layout.ptRight = Settings::borderRight(); + layout.ptWidth = Settings::width(); + layout.ptHeight = Settings::height(); - return tqlayout; + return layout; } - void Config::setDefaultPageLayout(const KoPageLayout& tqlayout) + void Config::setDefaultPageLayout(const KoPageLayout& layout) { - Settings::setFormat(KoPageFormat::formatString(tqlayout.format)); - Settings::setOrientation(Kivio::orientationString(tqlayout.orientation)); - Settings::setBorderTop(tqlayout.ptTop); - Settings::setBorderBottom(tqlayout.ptBottom); - Settings::setBorderLeft(tqlayout.ptLeft); - Settings::setBorderRight(tqlayout.ptRight); - Settings::setWidth(tqlayout.ptWidth); - Settings::setHeight(tqlayout.ptHeight); + Settings::setFormat(KoPageFormat::formatString(layout.format)); + Settings::setOrientation(Kivio::orientationString(layout.orientation)); + Settings::setBorderTop(layout.ptTop); + Settings::setBorderBottom(layout.ptBottom); + Settings::setBorderLeft(layout.ptLeft); + Settings::setBorderRight(layout.ptRight); + Settings::setWidth(layout.ptWidth); + Settings::setHeight(layout.ptHeight); } void Config::setGrid(const KivioGridData& /*grid*/) diff --git a/kivio/kiviopart/config/kivio_config.h b/kivio/kiviopart/config/kivio_config.h index b4df785a..651ec121 100644 --- a/kivio/kiviopart/config/kivio_config.h +++ b/kivio/kiviopart/config/kivio_config.h @@ -34,12 +34,12 @@ namespace Kivio { { public: /** - * Set the default page tqlayout + * Set the default page layout */ - static void setDefaultPageLayout(const KoPageLayout& tqlayout); + static void setDefaultPageLayout(const KoPageLayout& layout); /** - * Get the default page tqlayout + * Get the default page layout */ static KoPageLayout defaultPageLayout(); diff --git a/kivio/kiviopart/kivio_canvas.cpp b/kivio/kiviopart/kivio_canvas.cpp index 96fee8cb..e2125cbb 100644 --- a/kivio/kiviopart/kivio_canvas.cpp +++ b/kivio/kiviopart/kivio_canvas.cpp @@ -275,7 +275,7 @@ void KivioCanvas::paintEvent( TQPaintEvent* ev ) painter.save(); painter.setClipRegion(grayRegion, TQPainter::CoordPainter); painter.setPen(TQt::NoPen); - painter.fillRect(grayRegion.boundingRect(), KApplication::tqpalette().active().brush(TQColorGroup::Mid)); + painter.fillRect(grayRegion.boundingRect(), KApplication::palette().active().brush(TQColorGroup::Mid)); painter.restore(); // end of copy... @@ -1006,7 +1006,7 @@ KoPoint KivioCanvas::snapToGuides(const KoPoint& point, bool &snappedX, bool &sn if (m_pView->isSnapGuides()) { - KoGuides::SnaptqStatus status = KoGuides::SNAP_NONE; + KoGuides::SnapStatus status = KoGuides::SNAP_NONE; KoPoint diff; m_guides.snapToGuideLines(p, 4, status, diff); p += diff; @@ -1115,7 +1115,7 @@ void KivioCanvas::startPasteMoving() beginUnclippedSpawnerPainter(); drawSelectedStencilsXOR(); - // Build the list of old tqgeometry + // Build the list of old geometry KoRect *pData; m_lstOldGeometry.clear(); KivioStencil* pStencil = activePage()->selectedStencils()->first(); @@ -1245,7 +1245,7 @@ void KivioCanvas::endPasteMoving() endUnclippedSpawnerPainter(); - // Clear the list of old tqgeometry + // Clear the list of old geometry m_lstOldGeometry.clear(); m_pasteMoving = false; } diff --git a/kivio/kiviopart/kivio_dlg_pageshow.cpp b/kivio/kiviopart/kivio_dlg_pageshow.cpp index 6381d76b..7989a4c6 100644 --- a/kivio/kiviopart/kivio_dlg_pageshow.cpp +++ b/kivio/kiviopart/kivio_dlg_pageshow.cpp @@ -26,7 +26,7 @@ #include <kapplication.h> #include <klocale.h> #include <tqstringlist.h> -#include <tqlayout.h> +#include <layout.h> #include <kbuttonbox.h> #include <tqstrlist.h> #include <tqptrlist.h> diff --git a/kivio/kiviopart/kivio_doc.cpp b/kivio/kiviopart/kivio_doc.cpp index a7dee3d4..d25bcfa0 100644 --- a/kivio/kiviopart/kivio_doc.cpp +++ b/kivio/kiviopart/kivio_doc.cpp @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include <tqdom.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqbuffer.h> #include <tqtabwidget.h> #include <tqpaintdevicemetrics.h> @@ -119,7 +119,7 @@ KivioDoc::KivioDoc( TQWidget *parentWidget, const char* widgetName, TQObject* pa if ( !name ) { TQString tmp( "Document%1" ); //lukas: FIXME - tmp = tmp.tqarg( s_docId++ ); + tmp = tmp.arg( s_docId++ ); setName( tmp.latin1() ); } @@ -307,7 +307,7 @@ bool KivioDoc::saveOasis(KoStore* store, KoXmlWriter* manifestWriter) KoGenStyle pageLayout = Kivio::Config::defaultPageLayout().saveOasis(); TQString layoutName = styles.lookup(pageLayout, "PL"); KoGenStyle masterPage(KoGenStyle::STYLE_MASTER); - masterPage.addAttribute("style:page-tqlayout-name", layoutName); + masterPage.addAttribute("style:page-layout-name", layoutName); styles.lookup(masterPage, "Standard", false); if(!store->open("content.xml")) { @@ -345,7 +345,7 @@ bool KivioDoc::saveOasis(KoStore* store, KoXmlWriter* manifestWriter) TQValueList<KoGenStyles::NamedStyle>::const_iterator it = styleList.begin(); for ( ; it != styleList.end(); ++it) { - (*it).style->writeStyle(styleWriter, styles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties"); + (*it).style->writeStyle(styleWriter, styles, "style:page-layout", (*it).name, "style:page-layout-properties"); } styleList = styles.styles(Kivio::STYLE_PAGE); @@ -627,7 +627,7 @@ bool KivioDoc::completeLoading( KoStore* ) KivioPage* KivioDoc::createPage() { TQString s( i18n("Page%1") ); - s = s.tqarg( m_iPageId++ ); + s = s.arg( m_iPageId++ ); KivioPage* t = new KivioPage(m_pMap, s); t->setPageName(s,true); diff --git a/kivio/kiviopart/kivio_icon_view.cpp b/kivio/kiviopart/kivio_icon_view.cpp index 179b6a49..94463366 100644 --- a/kivio/kiviopart/kivio_icon_view.cpp +++ b/kivio/kiviopart/kivio_icon_view.cpp @@ -26,9 +26,9 @@ #include "kivioglobal.h" #include "kivio_stencil.h" -#include <tqbrush.h> +#include <brush.h> #include <tqcursor.h> -#include <tqpalette.h> +#include <palette.h> #include <klocale.h> #include <kdebug.h> #include <kglobalsettings.h> diff --git a/kivio/kiviopart/kivio_icon_view.h b/kivio/kiviopart/kivio_icon_view.h index ec6fa163..8ceede64 100644 --- a/kivio/kiviopart/kivio_icon_view.h +++ b/kivio/kiviopart/kivio_icon_view.h @@ -23,7 +23,7 @@ #include <tqiconview.h> #include <tqptrlist.h> #include <tqpainter.h> -#include <tqpalette.h> +#include <palette.h> #include <tqpixmap.h> #include <tqdragobject.h> diff --git a/kivio/kiviopart/kivio_page.cpp b/kivio/kiviopart/kivio_page.cpp index 0b60344b..41fe984b 100644 --- a/kivio/kiviopart/kivio_page.cpp +++ b/kivio/kiviopart/kivio_page.cpp @@ -30,10 +30,10 @@ #include <tqptrstack.h> #include <tqbuffer.h> #include <tqmessagebox.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqpicture.h> #include <tqdom.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdragobject.h> #include <tqmime.h> #include <tqsortedlist.h> @@ -153,7 +153,7 @@ TQDomElement KivioPage::save( TQDomDocument& doc ) page.setAttribute( "name", m_strName ); page.setAttribute( "hide", (int)m_bPageHide ); - // Create a child element for the page tqlayout + // Create a child element for the page layout TQDomElement layoutE = saveLayout( doc ); page.appendChild( layoutE ); @@ -194,7 +194,7 @@ void KivioPage::saveOasis(KoStore* /*store*/, KoXmlWriter* docWriter, KoGenStyle TQString layoutName = styles->lookup(pageLayout, "PL"); KoGenStyle masterPage(KoGenStyle::STYLE_MASTER); - masterPage.addAttribute("style:page-tqlayout-name", layoutName); + masterPage.addAttribute("style:page-layout-name", layoutName); TQString masterName = styles->lookup(masterPage, "MP"); docWriter->addAttribute("draw:master-page-name", masterName); @@ -324,17 +324,17 @@ bool KivioPage::loadOasis(const TQDomElement& page, KoOasisStyles& oasisStyles) return false; } - const TQDomElement *pageLayout = oasisStyles.findStyle(masterPage->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() ) ); + const TQDomElement *pageLayout = oasisStyles.findStyle(masterPage->attributeNS( KoXmlNS::style, "page-layout-name", TQString() ) ); if(!pageLayout) { - kdDebug(430000) << "Couldn't find the pagetqlayout!" << endl; + kdDebug(430000) << "Couldn't find the pagelayout!" << endl; return false; } m_pPageLayout.loadOasis(*pageLayout); if(m_pPageLayout.ptWidth <= 1e-13 || m_pPageLayout.ptHeight <= 1e-13) { - kdDebug(430000) << "Non valid pagetqlayout!" << endl; + kdDebug(430000) << "Non valid pagelayout!" << endl; return false; } @@ -941,7 +941,7 @@ void KivioPage::copy() KivioDragObject* kdo = new KivioDragObject(); kdo->setStencilList(m_lstSelection); kdo->setStencilRect(getRectForAllSelectedStencils()); - TQApplication::tqclipboard()->setData(kdo, TQClipboard::Clipboard); + TQApplication::clipboard()->setData(kdo, TQClipboard::Clipboard); } void KivioPage::cut() @@ -987,7 +987,7 @@ void KivioPage::paste(KivioView* view) list.setAutoDelete(false); KivioDragObject kdo; - if(kdo.decode(TQApplication::tqclipboard()->data(TQClipboard::Clipboard), list, this)) { + if(kdo.decode(TQApplication::clipboard()->data(TQClipboard::Clipboard), list, this)) { unselectAllStencils(); KivioStencil* stencil = list.first(); diff --git a/kivio/kiviopart/kivio_page.h b/kivio/kiviopart/kivio_page.h index 16d9db48..bc7daeca 100644 --- a/kivio/kiviopart/kivio_page.h +++ b/kivio/kiviopart/kivio_page.h @@ -41,7 +41,7 @@ class DCOPObject; #include <tqintdict.h> #include <tqmemarray.h> #include <tqrect.h> -#include <tqpalette.h> +#include <palette.h> #include <tqwidget.h> #include <KoPoint.h> diff --git a/kivio/kiviopart/kivio_spawner_drag.cpp b/kivio/kiviopart/kivio_spawner_drag.cpp index 7f1ba985..249138b0 100644 --- a/kivio/kiviopart/kivio_spawner_drag.cpp +++ b/kivio/kiviopart/kivio_spawner_drag.cpp @@ -47,13 +47,13 @@ const char *KivioSpawnerDrag::format( int i ) const return 0L; } -TQByteArray KivioSpawnerDrag::tqencodedData( const char *mime ) const +TQByteArray KivioSpawnerDrag::encodedData( const char *mime ) const { TQByteArray a; if( TQString(mime) == "application/x-qiconlist" ) { - a = TQIconDrag::tqencodedData(mime); + a = TQIconDrag::encodedData(mime); } else if( TQString(mime) == "kivio/stencilSpawner" ) { diff --git a/kivio/kiviopart/kivio_spawner_drag.h b/kivio/kiviopart/kivio_spawner_drag.h index 9bd68dfe..cb494221 100644 --- a/kivio/kiviopart/kivio_spawner_drag.h +++ b/kivio/kiviopart/kivio_spawner_drag.h @@ -33,7 +33,7 @@ public: virtual ~KivioSpawnerDrag(); const char *format(int i) const; - TQByteArray tqencodedData( const char *mime ) const; + TQByteArray encodedData( const char *mime ) const; static bool canDecode( TQMimeSource* e ); void append( const TQIconDragItem &item, const TQRect &pr, const TQRect &tr, KivioStencilSpawner &spawner ); diff --git a/kivio/kiviopart/kivio_stackbar.cpp b/kivio/kiviopart/kivio_stackbar.cpp index 4b42fa09..25ea7af2 100644 --- a/kivio/kiviopart/kivio_stackbar.cpp +++ b/kivio/kiviopart/kivio_stackbar.cpp @@ -19,7 +19,7 @@ #include "kivio_stackbar.h" #include "stencilbarbutton.h" -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqapplication.h> @@ -52,8 +52,8 @@ void KivioStackBar::insertPage( TQWidget* w, const TQString& title ) w->hide(); w->setFocusPolicy(TQ_NoFocus); - setMinimumWidth( TQMAX(tqminimumSize().width(),w->tqminimumSize().width() ) ); - setMaximumWidth( TQMAX(tqmaximumSize().width(),w->tqmaximumSize().width() ) ); + setMinimumWidth( TQMAX(minimumSize().width(),w->minimumSize().width() ) ); + setMaximumWidth( TQMAX(maximumSize().width(),w->maximumSize().width() ) ); DragBarButton* b = new DragBarButton( title, this ); b->setOrientation(orientation()); diff --git a/kivio/kiviopart/kivio_stencil_geometry_panel.cpp b/kivio/kiviopart/kivio_stencil_geometry_panel.cpp index f7ea9121..064c8b50 100644 --- a/kivio/kiviopart/kivio_stencil_geometry_panel.cpp +++ b/kivio/kiviopart/kivio_stencil_geometry_panel.cpp @@ -1,6 +1,6 @@ #include "kivio_stencil_geometry_panel.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqpixmap.h> diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp index 8d529449..282312a0 100644 --- a/kivio/kiviopart/kivio_view.cpp +++ b/kivio/kiviopart/kivio_view.cpp @@ -24,7 +24,7 @@ #include <time.h> #include <assert.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwidgetstack.h> #include <tqsplitter.h> #include <tqpushbutton.h> @@ -37,7 +37,7 @@ #include <tqtoolbutton.h> #include <tqtimer.h> #include <tqbutton.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqprogressbar.h> #include <tqstringlist.h> @@ -153,7 +153,7 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc ) if(KStatusBar* sb = statusBar()) { // No statusbar in e.g. konqueror m_pageCountSLbl = new KStatusBarLabel(i18n("%1 current page, %2 total number of pages", - "Page %1/%2").tqarg(0).tqarg(0), PAGECOUNT_TEXT, sb); + "Page %1/%2").arg(0).arg(0), PAGECOUNT_TEXT, sb); addStatusBarItem(m_pageCountSLbl, 0, false); m_infoSLbl = new KStatusBarLabel("", INFO_TEXT, sb); @@ -163,8 +163,8 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc ) TQString unit = KoUnit::unitName(m_pDoc->unit()); KoPoint xy(0, 0); TQString text = i18n("%1 x coord, %2 y coord, %3 and %4 the unit", - "X: %1 %3 Y: %2 %4").tqarg(KGlobal::_locale->formatNumber(xy.x(), 2)) - .tqarg(KGlobal::_locale->formatNumber(xy.y(), 2)).tqarg(unit).tqarg(unit); + "X: %1 %3 Y: %2 %4").arg(KGlobal::_locale->formatNumber(xy.x(), 2)) + .arg(KGlobal::_locale->formatNumber(xy.y(), 2)).arg(unit).arg(unit); m_coordSLbl = new KStatusBarLabel(text, MOUSEPOS_TEXT, sb); addStatusBarItem(m_coordSLbl, 0, true); } @@ -245,20 +245,20 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc ) &(m_pCanvas->guideLines()), TQT_SLOT(moveGuide(const TQPoint&, bool, int))); connect(&(m_pCanvas->guideLines()), TQT_SIGNAL(guideLinesChanged(KoView*)), m_pDoc, TQT_SLOT(updateGuideLines(KoView*))); - TQGridLayout* tqlayout = new TQGridLayout(pRightSide); - tqlayout->addWidget(hRuler, 0, 1); - tqlayout->addWidget(vRuler, 1, 0); - tqlayout->addWidget(canvasBase, 1, 1); - tqlayout->addMultiCellLayout(tabLayout, 2, 2, 0, 1); - tqlayout->addMultiCellWidget(m_vertScrollBar, 0, 1, 2, 2); - tqlayout->setRowStretch(1, 10); - tqlayout->setColStretch(1, 10); + TQGridLayout* layout = new TQGridLayout(pRightSide); + layout->addWidget(hRuler, 0, 1); + layout->addWidget(vRuler, 1, 0); + layout->addWidget(canvasBase, 1, 1); + layout->addMultiCellLayout(tabLayout, 2, 2, 0, 1); + layout->addMultiCellWidget(m_vertScrollBar, 0, 1, 2, 2); + layout->setRowStretch(1, 10); + layout->setColStretch(1, 10); TQWidget::setFocusPolicy( TQ_StrongFocus ); setFocusProxy( m_pCanvas ); connect( TQT_TQOBJECT(this), TQT_SIGNAL( invalidated() ), m_pCanvas, TQT_SLOT( update() ) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL( regionInvalidated( const TQRegion&, bool ) ), m_pCanvas, TQT_SLOT( tqrepaint( const TQRegion&, bool ) ) ); + connect( TQT_TQOBJECT(this), TQT_SIGNAL( regionInvalidated( const TQRegion&, bool ) ), m_pCanvas, TQT_SLOT( repaint( const TQRegion&, bool ) ) ); setInstance(KivioFactory::global()); if ( !m_pDoc->isReadWrite() ) @@ -390,7 +390,7 @@ void KivioView::setupActions() m_editCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(cutStencil()), actionCollection(), "cutStencil" ); m_editCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(copyStencil()), actionCollection(), "copyStencil" ); m_editPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(pasteStencil()), actionCollection(), "pasteStencil" ); - connect(TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), TQT_TQOBJECT(this), TQT_SLOT(clipboardDataChanged())); + connect(TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), TQT_TQOBJECT(this), TQT_SLOT(clipboardDataChanged())); m_selectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(selectAllStencils()), actionCollection(), "selectAllStencils"); m_selectNone = KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(unselectAllStencils()), actionCollection(), "unselectAllStencils"); @@ -1134,13 +1134,13 @@ void KivioView::ungroupStencils() void KivioView::selectAllStencils() { m_pActivePage->selectAllStencils(); - m_pCanvas->tqrepaint(); + m_pCanvas->repaint(); } void KivioView::unselectAllStencils() { m_pActivePage->unselectAllStencils(); - m_pCanvas->tqrepaint(); + m_pCanvas->repaint(); } TQColor KivioView::fgColor() const @@ -1733,7 +1733,7 @@ void KivioView::addStencilFromSpawner( KivioStencilSpawner *pSpawner, double x, m_pActivePage->addStencil( pStencil ); m_pActivePage->selectStencil( pStencil ); - // Mark the page as modified and tqrepaint + // Mark the page as modified and repaint m_pDoc->updateView(m_pActivePage); pluginManager()->activateDefaultTool(); m_pCanvas->updateAutoGuideLines(); @@ -1748,7 +1748,7 @@ void KivioView::alignStencilsDlg() m_pActivePage->alignStencils(dlg->align()); m_pActivePage->distributeStencils(dlg->distribute()); - m_pCanvas->tqrepaint(); + m_pCanvas->repaint(); } delete dlg; @@ -1842,8 +1842,8 @@ void KivioView::setMousePos( int mx, int my ) KoPoint xy = m_pCanvas->mapFromScreen(TQPoint(mx, my)); xy.setX(KoUnit::toUserValue(xy.x(), m_pDoc->unit())); xy.setY(KoUnit::toUserValue(xy.y(), m_pDoc->unit())); - TQString text = i18n("X: %1 %3 Y: %2 %4").tqarg(KGlobal::_locale->formatNumber(xy.x(), 2)) - .tqarg(KGlobal::_locale->formatNumber(xy.y(), 2)).tqarg(unit).tqarg(unit); + TQString text = i18n("X: %1 %3 Y: %2 %4").arg(KGlobal::_locale->formatNumber(xy.x(), 2)) + .arg(KGlobal::_locale->formatNumber(xy.y(), 2)).arg(unit).arg(unit); m_coordSLbl->setText(text); } } @@ -2113,7 +2113,7 @@ Kivio::PluginManager* KivioView::pluginManager() void KivioView::clipboardDataChanged() { - TQMimeSource* data = TQApplication::tqclipboard()->data(); + TQMimeSource* data = TQApplication::clipboard()->data(); KivioDragObject decoder(this); bool paste = decoder.canDecode(data); m_editPaste->setEnabled(paste); @@ -2191,7 +2191,7 @@ int KivioView::vTextAlign() void KivioView::updatePageStatusLabel() { - TQString text = i18n("Page %1/%2").tqarg(m_pDoc->map()->pageList().find(activePage()) + 1).tqarg(m_pDoc->map()->count()); + TQString text = i18n("Page %1/%2").arg(m_pDoc->map()->pageList().find(activePage()) + 1).arg(m_pDoc->map()->count()); m_pageCountSLbl->setText(text); } diff --git a/kivio/kiviopart/kivio_zoomaction.cpp b/kivio/kiviopart/kivio_zoomaction.cpp index c500f34a..dde3103a 100644 --- a/kivio/kiviopart/kivio_zoomaction.cpp +++ b/kivio/kiviopart/kivio_zoomaction.cpp @@ -29,18 +29,18 @@ ZoomAction::ZoomAction(TQObject* parent, const char* name) { setEditable(true); TQStringList lst; - lst << i18n("%1%").tqarg("33"); - lst << i18n("%1%").tqarg("50"); - lst << i18n("%1%").tqarg("75"); - lst << i18n("%1%").tqarg("100"); - lst << i18n("%1%").tqarg("125"); - lst << i18n("%1%").tqarg("150"); - lst << i18n("%1%").tqarg("200"); - lst << i18n("%1%").tqarg("250"); - lst << i18n("%1%").tqarg("350"); - lst << i18n("%1%").tqarg("400"); - lst << i18n("%1%").tqarg("450"); - lst << i18n("%1%").tqarg("500"); + lst << i18n("%1%").arg("33"); + lst << i18n("%1%").arg("50"); + lst << i18n("%1%").arg("75"); + lst << i18n("%1%").arg("100"); + lst << i18n("%1%").arg("125"); + lst << i18n("%1%").arg("150"); + lst << i18n("%1%").arg("200"); + lst << i18n("%1%").arg("250"); + lst << i18n("%1%").arg("350"); + lst << i18n("%1%").arg("400"); + lst << i18n("%1%").arg("450"); + lst << i18n("%1%").arg("500"); setItems(lst); } @@ -84,14 +84,14 @@ void ZoomAction::insertItem( int zoom ) TQStringList lst; for (TQValueList<int>::Iterator it = list.begin() ; it != list.end() ; ++it) - lst.append( i18n("%1%").tqarg(*it) ); + lst.append( i18n("%1%").arg(*it) ); setItems(lst); - setCurrentItem(lst.findIndex(i18n("%1%").tqarg(zoom))); + setCurrentItem(lst.findIndex(i18n("%1%").arg(zoom))); } void ZoomAction::setEditZoom( int zoom ) { - const TQString zt(i18n("%1%").tqarg(zoom)); + const TQString zt(i18n("%1%").arg(zoom)); setEditText(zt); } #include "kivio_zoomaction.moc" diff --git a/kivio/kiviopart/kiviodragobject.cpp b/kivio/kiviopart/kiviodragobject.cpp index 35a6d7ff..574afddc 100644 --- a/kivio/kiviopart/kiviodragobject.cpp +++ b/kivio/kiviopart/kiviodragobject.cpp @@ -22,7 +22,7 @@ #include <tqcstring.h> #include <tqstringlist.h> #include <tqdom.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqpixmap.h> #include <tqimage.h> @@ -56,7 +56,7 @@ const char* KivioDragObject::format(int i) const return id.format(i - NumEncodeFormats); } -TQByteArray KivioDragObject::tqencodedData(const char* mimetype) const +TQByteArray KivioDragObject::encodedData(const char* mimetype) const { if((m_encodeMimeList[0] == mimetype) || (m_encodeMimeList[1] == mimetype)) @@ -90,7 +90,7 @@ bool KivioDragObject::decode(TQMimeSource* e, TQPtrList<KivioStencil>& sl, Kivio if(e->provides("application/vnd.kde.kivio")) { TQDomDocument doc("KivioSelection"); - TQByteArray data = e->tqencodedData("application/vnd.kde.kivio"); + TQByteArray data = e->encodedData("application/vnd.kde.kivio"); doc.setContent( TQCString( data, data.size()+1 ) ); KivioLayer l(page); ok = l.loadXML(doc.documentElement()); @@ -178,7 +178,7 @@ TQByteArray KivioDragObject::imageEncoded(const char* mimetype) const TQImageDrag id; id.setImage(buffer.convertToImage()); - return id.tqencodedData(mimetype); + return id.encodedData(mimetype); } #include "kiviodragobject.moc" diff --git a/kivio/kiviopart/kiviodragobject.h b/kivio/kiviopart/kiviodragobject.h index 99d632f7..d441af19 100644 --- a/kivio/kiviopart/kiviodragobject.h +++ b/kivio/kiviopart/kiviodragobject.h @@ -36,7 +36,7 @@ class KivioDragObject : public TQDragObject KivioDragObject(TQWidget* dragSource = 0, const char* name = 0); const char* format(int i) const; - TQByteArray tqencodedData(const char* mimetype) const; + TQByteArray encodedData(const char* mimetype) const; bool canDecode(TQMimeSource*); bool decode(TQMimeSource* e, TQPtrList<KivioStencil>& sl, KivioPage* page); void setStencilList(TQPtrList<KivioStencil> l); diff --git a/kivio/kiviopart/kivioglobal.cpp b/kivio/kiviopart/kivioglobal.cpp index 7479af08..201eea08 100644 --- a/kivio/kiviopart/kivioglobal.cpp +++ b/kivio/kiviopart/kivioglobal.cpp @@ -44,52 +44,52 @@ struct PaperSizeDef { int unit; }; -void Kivio::savePageLayout(TQDomElement& e, const KoPageLayout& tqlayout) +void Kivio::savePageLayout(TQDomElement& e, const KoPageLayout& layout) { - XmlWriteFloat(e, "width", tqlayout.ptWidth); - XmlWriteFloat(e, "height", tqlayout.ptHeight); - XmlWriteFloat(e, "marginLeft", tqlayout.ptLeft); - XmlWriteFloat(e, "marginRight", tqlayout.ptRight); - XmlWriteFloat(e, "marginTop", tqlayout.ptTop); - XmlWriteFloat(e, "marginBottom", tqlayout.ptBottom); - XmlWriteString(e, "format", KoPageFormat::formatString(tqlayout.format)); - XmlWriteString(e, "orientation", Kivio::orientationString(tqlayout.orientation)); + XmlWriteFloat(e, "width", layout.ptWidth); + XmlWriteFloat(e, "height", layout.ptHeight); + XmlWriteFloat(e, "marginLeft", layout.ptLeft); + XmlWriteFloat(e, "marginRight", layout.ptRight); + XmlWriteFloat(e, "marginTop", layout.ptTop); + XmlWriteFloat(e, "marginBottom", layout.ptBottom); + XmlWriteString(e, "format", KoPageFormat::formatString(layout.format)); + XmlWriteString(e, "orientation", Kivio::orientationString(layout.orientation)); } -// ## TODO: remove this method, now that tqlayout.saveOasis() does it all -KoGenStyle Kivio::savePageLayout(const KoPageLayout& tqlayout) +// ## TODO: remove this method, now that layout.saveOasis() does it all +KoGenStyle Kivio::savePageLayout(const KoPageLayout& layout) { - return tqlayout.saveOasis(); + return layout.saveOasis(); } KoPageLayout Kivio::loadPageLayout(const TQDomElement& e) { - KoPageLayout tqlayout; + KoPageLayout layout; if(e.hasAttribute("unit")) { // Compatibility with Kivio <= 1.2.x kdDebug(43000) << "Compatibility mode..." << endl; KoUnit::Unit unit = Kivio::convToKoUnit(XmlReadInt(e, "unit", 0)); - tqlayout.ptWidth = KoUnit::fromUserValue(XmlReadFloat(e, "width", 0.0), unit); - tqlayout.ptHeight = KoUnit::fromUserValue(XmlReadFloat(e, "height", 0.0), unit); - tqlayout.ptLeft = KoUnit::fromUserValue(XmlReadFloat(e, "marginLeft", 0.0), unit); - tqlayout.ptRight = KoUnit::fromUserValue(XmlReadFloat(e, "marginRight", 0.0), unit); - tqlayout.ptTop = KoUnit::fromUserValue(XmlReadFloat(e, "marginTop", 0.0), unit); - tqlayout.ptBottom = KoUnit::fromUserValue(XmlReadFloat(e, "marginBottom", 0.0), unit); - Kivio::setFormatOrientation(tqlayout); + layout.ptWidth = KoUnit::fromUserValue(XmlReadFloat(e, "width", 0.0), unit); + layout.ptHeight = KoUnit::fromUserValue(XmlReadFloat(e, "height", 0.0), unit); + layout.ptLeft = KoUnit::fromUserValue(XmlReadFloat(e, "marginLeft", 0.0), unit); + layout.ptRight = KoUnit::fromUserValue(XmlReadFloat(e, "marginRight", 0.0), unit); + layout.ptTop = KoUnit::fromUserValue(XmlReadFloat(e, "marginTop", 0.0), unit); + layout.ptBottom = KoUnit::fromUserValue(XmlReadFloat(e, "marginBottom", 0.0), unit); + Kivio::setFormatOrientation(layout); kdDebug(43000) << "Ready." << endl; } else { - tqlayout.ptWidth = XmlReadFloat(e, "width", 0.0); - tqlayout.ptHeight = XmlReadFloat(e, "height", 0.0); - tqlayout.ptLeft = XmlReadFloat(e, "marginLeft", 0.0); - tqlayout.ptRight = XmlReadFloat(e, "marginRight", 0.0); - tqlayout.ptTop = XmlReadFloat(e, "marginTop", 0.0); - tqlayout.ptBottom = XmlReadFloat(e, "marginBottom", 0.0); - tqlayout.format = KoPageFormat::formatFromString(XmlReadString(e, "format", pageSizeString(KGlobal::locale()->pageSize()))); - tqlayout.orientation = Kivio::orientationFromString(XmlReadString(e, "orientation", "Portrait")); + layout.ptWidth = XmlReadFloat(e, "width", 0.0); + layout.ptHeight = XmlReadFloat(e, "height", 0.0); + layout.ptLeft = XmlReadFloat(e, "marginLeft", 0.0); + layout.ptRight = XmlReadFloat(e, "marginRight", 0.0); + layout.ptTop = XmlReadFloat(e, "marginTop", 0.0); + layout.ptBottom = XmlReadFloat(e, "marginBottom", 0.0); + layout.format = KoPageFormat::formatFromString(XmlReadString(e, "format", pageSizeString(KGlobal::locale()->pageSize()))); + layout.orientation = Kivio::orientationFromString(XmlReadString(e, "orientation", "Portrait")); } - return tqlayout; + return layout; } KoUnit::Unit Kivio::convToKoUnit(int tkUnit) @@ -132,7 +132,7 @@ KoOrientation Kivio::orientationFromString(const TQString& s) return PG_PORTRAIT; } -void Kivio::setFormatOrientation(KoPageLayout& tqlayout) +void Kivio::setFormatOrientation(KoPageLayout& layout) { const PaperSizeDef PapersTable[] = { {"A0",841,1189,KoUnit::U_MM}, @@ -166,20 +166,20 @@ void Kivio::setFormatOrientation(KoPageLayout& tqlayout) PaperSizeDef sizeDef = PapersTable[0]; bool found = false; float width, height; - tqlayout.format = PG_CUSTOM; - tqlayout.orientation = PG_PORTRAIT; + layout.format = PG_CUSTOM; + layout.orientation = PG_PORTRAIT; while((sizeDef.unit != -2) && !found) { width = KoUnit::fromUserValue(sizeDef.width, static_cast<KoUnit::Unit>(sizeDef.unit)); height = KoUnit::fromUserValue(sizeDef.height, static_cast<KoUnit::Unit>(sizeDef.unit)); - if((tqlayout.ptWidth == width) && (tqlayout.ptHeight == height)) { - tqlayout.format = KoPageFormat::formatFromString(sizeDef.title); - tqlayout.orientation = PG_PORTRAIT; + if((layout.ptWidth == width) && (layout.ptHeight == height)) { + layout.format = KoPageFormat::formatFromString(sizeDef.title); + layout.orientation = PG_PORTRAIT; found = true; - } else if((tqlayout.ptWidth == height) && (tqlayout.ptHeight == width)) { - tqlayout.format = KoPageFormat::formatFromString(sizeDef.title); - tqlayout.orientation = PG_LANDSCAPE; + } else if((layout.ptWidth == height) && (layout.ptHeight == width)) { + layout.format = KoPageFormat::formatFromString(sizeDef.title); + layout.orientation = PG_LANDSCAPE; found = true; } diff --git a/kivio/kiviopart/kivioglobal.h b/kivio/kiviopart/kivioglobal.h index 1e94f79b..cd0fe3d6 100644 --- a/kivio/kiviopart/kivioglobal.h +++ b/kivio/kiviopart/kivioglobal.h @@ -37,12 +37,12 @@ namespace Kivio }; /** - * Save a page tqlayout to a TQDomElement + * Save a page layout to a TQDomElement */ - void savePageLayout(TQDomElement& e, const KoPageLayout& tqlayout); - KoGenStyle savePageLayout(const KoPageLayout& tqlayout); + void savePageLayout(TQDomElement& e, const KoPageLayout& layout); + KoGenStyle savePageLayout(const KoPageLayout& layout); /** - * Load a page tqlayout from a TQDomElement + * Load a page layout from a TQDomElement */ KoPageLayout loadPageLayout(const TQDomElement& e); /** @@ -57,7 +57,7 @@ namespace Kivio * Return the orientation based on the string */ KoOrientation orientationFromString(const TQString& s); - void setFormatOrientation(KoPageLayout& tqlayout); + void setFormatOrientation(KoPageLayout& layout); /** * Load a KoSize from a TQDomElement diff --git a/kivio/kiviopart/kiviosdk/diapathparser.cpp b/kivio/kiviopart/kiviosdk/diapathparser.cpp index 1af85056..e071a8e6 100644 --- a/kivio/kiviopart/kiviosdk/diapathparser.cpp +++ b/kivio/kiviopart/kiviosdk/diapathparser.cpp @@ -48,8 +48,8 @@ void DiaPointFinder::svgClosePath() { } -DiaPathParser::DiaPathParser(TQDomDocument *doc, TQDomElement *tqshape, float xscale, float yscale, float lowestx, float lowesty) : - SVGPathParser(), m_doc(doc), m_tqshape(tqshape), +DiaPathParser::DiaPathParser(TQDomDocument *doc, TQDomElement *shape, float xscale, float yscale, float lowestx, float lowesty) : + SVGPathParser(), m_doc(doc), m_shape(shape), m_xscale(xscale), m_yscale(yscale), m_lowestx(lowestx), m_lowesty(lowesty) { @@ -72,12 +72,12 @@ void DiaPathParser::svgLineTo( double x1, double y1, bool ) TQDomElement kivioPointElement = m_doc->createElement("KivioPoint"); kivioPointElement.setAttribute("x", TQString::number(diaPointToKivio(lastX,true) * m_xscale)); kivioPointElement.setAttribute("y", TQString::number(diaPointToKivio(lastY, false) * m_yscale)); - m_tqshape->appendChild(kivioPointElement); + m_shape->appendChild(kivioPointElement); kivioPointElement = m_doc->createElement("KivioPoint"); kivioPointElement.setAttribute("x", TQString::number(diaPointToKivio(currentX,true) * m_xscale)); kivioPointElement.setAttribute("y", TQString::number(diaPointToKivio(currentY, false) * m_yscale)); - m_tqshape->appendChild(kivioPointElement); + m_shape->appendChild(kivioPointElement); lastX = currentX; lastY = currentY; } @@ -99,7 +99,7 @@ void DiaPathParser::svgCurveToCubic( double x1, double y1, double x2, double y2, kivioPointElement.setAttribute("y", TQString::number(diaPointToKivio(lastY, false) * m_yscale)); kivioPointElement.setAttribute("type", "bezier"); - m_tqshape->appendChild(kivioPointElement); + m_shape->appendChild(kivioPointElement); kivioPointElement = m_doc->createElement("KivioPoint"); kivioPointElement.setAttribute("x", @@ -107,7 +107,7 @@ void DiaPathParser::svgCurveToCubic( double x1, double y1, double x2, double y2, kivioPointElement.setAttribute("y", TQString::number(diaPointToKivio(lastControlY, false) * m_yscale)); kivioPointElement.setAttribute("type", "bezier"); - m_tqshape->appendChild(kivioPointElement); + m_shape->appendChild(kivioPointElement); kivioPointElement = m_doc->createElement("KivioPoint"); kivioPointElement.setAttribute("x", @@ -115,7 +115,7 @@ void DiaPathParser::svgCurveToCubic( double x1, double y1, double x2, double y2, kivioPointElement.setAttribute("y", TQString::number(diaPointToKivio(currentControlY, false) * m_yscale)); kivioPointElement.setAttribute("type", "bezier"); - m_tqshape->appendChild(kivioPointElement); + m_shape->appendChild(kivioPointElement); kivioPointElement = m_doc->createElement("KivioPoint"); kivioPointElement.setAttribute("x", @@ -123,7 +123,7 @@ void DiaPathParser::svgCurveToCubic( double x1, double y1, double x2, double y2, kivioPointElement.setAttribute("y", TQString::number(diaPointToKivio(currentY, false) * m_yscale)); kivioPointElement.setAttribute("type", "bezier"); - m_tqshape->appendChild(kivioPointElement); + m_shape->appendChild(kivioPointElement); lastX = currentX; lastY = currentY; } diff --git a/kivio/kiviopart/kiviosdk/diapathparser.h b/kivio/kiviopart/kiviosdk/diapathparser.h index 0a9439f6..5308c468 100644 --- a/kivio/kiviopart/kiviosdk/diapathparser.h +++ b/kivio/kiviopart/kiviosdk/diapathparser.h @@ -41,7 +41,7 @@ class DiaPointFinder : public SVGPathParser class DiaPathParser : public SVGPathParser { public: - DiaPathParser(TQDomDocument *doc, TQDomElement *tqshape, float xscale, float yscale, float lowestx, float lowesty); + DiaPathParser(TQDomDocument *doc, TQDomElement *shape, float xscale, float yscale, float lowestx, float lowesty); void svgMoveTo( double x1, double y1, bool abs = true ); void svgLineTo( double x1, double y1, bool abs = true ); @@ -52,7 +52,7 @@ class DiaPathParser : public SVGPathParser float diaPointToKivio(float point, bool xpoint); TQDomDocument *m_doc; - TQDomElement *m_tqshape; + TQDomElement *m_shape; float lastX; float lastY; float m_xscale; diff --git a/kivio/kiviopart/kiviosdk/kivio_1d_stencil.h b/kivio/kiviopart/kiviosdk/kivio_1d_stencil.h index b42d650b..8162bcd2 100644 --- a/kivio/kiviopart/kiviosdk/kivio_1d_stencil.h +++ b/kivio/kiviopart/kiviosdk/kivio_1d_stencil.h @@ -124,7 +124,7 @@ public: virtual void customDrag( KivioCustomDragData * ); - // tqgeometry management + // geometry management virtual void updateGeometry(); virtual void updateConnectorPoints( KivioConnectorPoint *, double, double ); diff --git a/kivio/kiviopart/kiviosdk/kivio_base_connector_stencil.h b/kivio/kiviopart/kiviosdk/kivio_base_connector_stencil.h index f7e2dddb..1e0a76de 100644 --- a/kivio/kiviopart/kiviosdk/kivio_base_connector_stencil.h +++ b/kivio/kiviopart/kiviosdk/kivio_base_connector_stencil.h @@ -100,7 +100,7 @@ public: virtual void customDrag( KivioCustomDragData * ); - // tqgeometry management + // geometry management virtual void updateGeometry(); diff --git a/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.cpp index e41f5788..b290fb62 100644 --- a/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_base_target_stencil.cpp @@ -501,7 +501,7 @@ void KivioBaseTargetStencil::copyBasicInto( KivioBaseTargetStencil *pStencil ) pTgTarget = pStencil->m_pTargets->next(); } - // Copy the tqgeometry + // Copy the geometry pStencil->m_x = m_x; pStencil->m_y = m_y; pStencil->m_w = m_w; diff --git a/kivio/kiviopart/kiviosdk/kivio_common.cpp b/kivio/kiviopart/kiviosdk/kivio_common.cpp index b67efc23..3dd8b428 100644 --- a/kivio/kiviopart/kiviosdk/kivio_common.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_common.cpp @@ -330,7 +330,7 @@ void XmlWriteDouble( TQDomElement &e, const TQString &att, const double &val ) * across two quadrants, you need to determine which side of the test point it crossed, and then * either add or subtract 2. * - * Quad tqlayout: + * Quad layout: * 1 2 * 4 3 */ @@ -423,7 +423,7 @@ KoRect XmlReadRect( const TQDomElement &e, const TQString &att, const KoRect &de void XmlWriteRect( TQDomElement &e, const TQString &att, const KoRect &val ) { - e.setAttribute( att, TQString("[%1,%2,%3,%4]").tqarg(val.x()).tqarg(val.y()).tqarg(val.width()).tqarg(val.height()) ); + e.setAttribute( att, TQString("[%1,%2,%3,%4]").arg(val.x()).arg(val.y()).arg(val.width()).arg(val.height()) ); } diff --git a/kivio/kiviopart/kiviosdk/kivio_connector_point.cpp b/kivio/kiviopart/kiviosdk/kivio_connector_point.cpp index 0208f932..d408bee6 100644 --- a/kivio/kiviopart/kiviosdk/kivio_connector_point.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_connector_point.cpp @@ -83,10 +83,10 @@ void KivioConnectorPoint::setTarget( KivioConnectorTarget *pTarget ) * Sets the x coordinate. * * @param newX The new value - * @param updateStencil Whether or not the stencil's tqgeometry should be updated (def=true) + * @param updateStencil Whether or not the stencil's geometry should be updated (def=true) * * Sets the X coordinate to a new value, and optionally - * updates the stencil's tqgeometry if updateStencil is true. + * updates the stencil's geometry if updateStencil is true. */ void KivioConnectorPoint::setX( double newX, bool updateStencil ) { @@ -102,10 +102,10 @@ void KivioConnectorPoint::setX( double newX, bool updateStencil ) * Sets the y coordinate. * * @param newY The new value - * @param updateStencil Whether or not the stencil's tqgeometry should be updated (def=true) + * @param updateStencil Whether or not the stencil's geometry should be updated (def=true) * * Sets the Y coordinate to a new value, and optionally - * updates the stencil's tqgeometry if updateStencil is true. + * updates the stencil's geometry if updateStencil is true. */ void KivioConnectorPoint::setY( double newY, bool updateStencil ) { @@ -122,10 +122,10 @@ void KivioConnectorPoint::setY( double newY, bool updateStencil ) * * @param newX The new x value * @param newY The new y value - * @param updateStencil Whether or not the stencil's tqgeometry should be updated (def=true) + * @param updateStencil Whether or not the stencil's geometry should be updated (def=true) * * Sets the X & Y coordinates to new values, and optionally - * updates the stencil's tqgeometry if updateStencil is true. + * updates the stencil's geometry if updateStencil is true. */ void KivioConnectorPoint::setPosition( double newX, double newY, bool updateStencil ) { diff --git a/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp b/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp index 4407d2d0..ada33c4c 100644 --- a/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp @@ -83,7 +83,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file) return false; } dia.setContent(&f); - TQDomNode diaMain = dia.namedItem("tqshape"); + TQDomNode diaMain = dia.namedItem("shape"); // Set "creator" attribute TQDomElement firstElement = kivio.createElement("KivioShapeStencil"); @@ -250,7 +250,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file) //} //else { - // scale the tqshape to be close to 30 by 30 + // scale the shape to be close to 30 by 30 m_yscale = 30.0/(m_highesty - m_lowesty); m_xscale = 30.0/(m_highestx - m_lowestx); } @@ -294,7 +294,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file) { TQDomElement kivioShape = kivio.createElement("KivioShape"); kivioShape.setAttribute("type", "Rectangle"); - kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs)); + kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs)); kivioShape.setAttribute("x", TQString::number(diaPointToKivio(svgChild.attribute("x").toFloat(),true) * m_xscale)); kivioShape.setAttribute("y", TQString::number(diaPointToKivio(svgChild.attribute("y").toFloat(), false) * m_yscale)); kivioShape.setAttribute("w", TQString::number(svgChild.attribute("width").toFloat() * m_xscale)); @@ -309,7 +309,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file) { TQDomElement kivioShape = kivio.createElement("KivioShape"); kivioShape.setAttribute("type", "Ellipse"); - kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs)); + kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs)); kivioShape.setAttribute("x", TQString::number((diaPointToKivio(svgChild.attribute("cx").toFloat() - svgChild.attribute("r").toFloat(),true) * m_xscale))); kivioShape.setAttribute("y", TQString::number((diaPointToKivio(svgChild.attribute("cy").toFloat() - svgChild.attribute("r").toFloat(), false) * m_yscale))); kivioShape.setAttribute("w", TQString::number(svgChild.attribute("r").toFloat() * m_xscale * 2)); @@ -324,7 +324,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file) { TQDomElement kivioShape = kivio.createElement("KivioShape"); kivioShape.setAttribute("type", "Ellipse"); - kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs)); + kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs)); kivioShape.setAttribute("x", TQString::number((diaPointToKivio(svgChild.attribute("cx").toFloat() - svgChild.attribute("rx").toFloat(),true) * m_xscale))); kivioShape.setAttribute("y", TQString::number((diaPointToKivio(svgChild.attribute("cy").toFloat() - svgChild.attribute("ry").toFloat(), false) * m_yscale))); kivioShape.setAttribute("w", TQString::number(svgChild.attribute("rx").toFloat() * m_xscale * 2)); @@ -339,7 +339,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file) { TQDomElement kivioShape = kivio.createElement("KivioShape"); kivioShape.setAttribute("type", "LineArray"); - kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs)); + kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs)); TQDomElement lineArrayElement = kivio.createElement("Line"); lineArrayElement.setAttribute("x1", TQString::number(diaPointToKivio(svgChild.attribute("x1").toFloat(),true) * m_xscale)); @@ -358,7 +358,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file) { TQDomElement kivioShape = kivio.createElement("KivioShape"); kivioShape.setAttribute("type", "Polyline"); - kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs)); + kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs)); TQStringList points = TQStringList::split(" ", svgChild.attribute("points")); for(TQStringList::Iterator it = points.begin(); it != points.end(); ++it) @@ -387,7 +387,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file) { TQDomElement kivioShape = kivio.createElement("KivioShape"); kivioShape.setAttribute("type", "Polygon"); - kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs)); + kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs)); TQStringList points = TQStringList::split(" ", svgChild.attribute("points")); for(TQStringList::Iterator it = points.begin(); it != points.end(); ++it) @@ -428,7 +428,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file) kivioShape.setAttribute("type", "OpenPath"); } - kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs)); + kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs)); DiaPathParser *dpp = new DiaPathParser(&kivio, &kivioShape, m_xscale, m_yscale, diff --git a/kivio/kiviopart/kiviosdk/kivio_fill_style.h b/kivio/kiviopart/kiviosdk/kivio_fill_style.h index 4be7303b..ea776f20 100644 --- a/kivio/kiviopart/kiviosdk/kivio_fill_style.h +++ b/kivio/kiviopart/kiviosdk/kivio_fill_style.h @@ -19,7 +19,7 @@ #ifndef KIVIO_FILL_STYLE_H #define KIVIO_FILL_STYLE_H -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> #include <tqdom.h> diff --git a/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp index cc8eb0e3..f966dc07 100644 --- a/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_py_stencil.cpp @@ -25,7 +25,7 @@ KivioView *view; #include "kivio_page.h" #include <tqpainter.h> -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> #include <kdebug.h> #include <math.h> @@ -63,7 +63,7 @@ KivioPyStencil::KivioPyStencil() vars = Py_BuildValue( "{s:d,s:d,s:d,s:d,s:d,s:d,s:{},s:[],s:[],s:{}}", - "x", m_x, "y", m_y, "w", m_w, "h", m_h, "x2", x2, "y2", y2 , "style","connectors","connector_targets","tqshapes"); + "x", m_x, "y", m_y, "w", m_w, "h", m_h, "x2", x2, "y2", y2 , "style","connectors","connector_targets","shapes"); resizeCode = ""; } @@ -406,45 +406,45 @@ void KivioPyStencil::paint( KivioIntraStencilData *d, bool outlined ) { KoZoomHandler* zoomHandler = d->zoomHandler; - PyObject *tqshapes = PyDict_Values( PyDict_GetItemString( vars, "tqshapes" ) ); + PyObject *shapes = PyDict_Values( PyDict_GetItemString( vars, "shapes" ) ); - if ( !tqshapes ) { + if ( !shapes ) { return; } - int size = PyList_Size( tqshapes ); + int size = PyList_Size( shapes ); for ( int i=0; i<size; i++ ) { - PyObject *tqshape = PyList_GetItem( tqshapes, i ); - if ( !PyDict_Check(tqshape) ) + PyObject *shape = PyList_GetItem( shapes, i ); + if ( !PyDict_Check(shape) ) continue; int fill = KivioFillStyle::kcsNone; - // if style dosn't defined for tqshape, applay default for stencil + // if style dosn't defined for shape, applay default for stencil setStyle( d, PyDict_GetItemString( vars, "style" ) , fill ); - setStyle( d, tqshape, fill ); + setStyle( d, shape, fill ); if ( isSelected() ) - setStyle( d, PyDict_GetItemString( tqshape, "selected" ) , fill ); + setStyle( d, PyDict_GetItemString( shape, "selected" ) , fill ); if ( outlined ) fill = KivioFillStyle::kcsNone; - TQString stype = getStringFromDict( tqshape, "type" ); + TQString stype = getStringFromDict( shape, "type" ); stype = stype.lower(); - double x = zoomHandler->zoomItX(getDoubleFromDict(tqshape,"x")); - double y = zoomHandler->zoomItY(getDoubleFromDict(tqshape,"y")); - double w = zoomHandler->zoomItX(getDoubleFromDict(tqshape,"w")); - double h = zoomHandler->zoomItY(getDoubleFromDict(tqshape,"h")); - //double x2 = zoomHandler->zoomItX(getDoubleFromDict(tqshape,"x2")); - //double y2 = zoomHandler->zoomItY(getDoubleFromDict(tqshape,"y2")); + double x = zoomHandler->zoomItX(getDoubleFromDict(shape,"x")); + double y = zoomHandler->zoomItY(getDoubleFromDict(shape,"y")); + double w = zoomHandler->zoomItX(getDoubleFromDict(shape,"w")); + double h = zoomHandler->zoomItY(getDoubleFromDict(shape,"h")); + //double x2 = zoomHandler->zoomItX(getDoubleFromDict(shape,"x2")); + //double y2 = zoomHandler->zoomItY(getDoubleFromDict(shape,"y2")); // get points list TQPtrList<KivioPoint> points; points.setAutoDelete(true); - PyObject *pyPoints = PyDict_GetItemString( tqshape, "points" ); + PyObject *pyPoints = PyDict_GetItemString( shape, "points" ); if ( pyPoints && PyList_Check(pyPoints) ) { int size = PyList_Size(pyPoints); for ( int i=0; i<size; i++ ) { @@ -470,7 +470,7 @@ void KivioPyStencil::paint( KivioIntraStencilData *d, bool outlined ) f.setPointSizeFloat(f.pointSizeFloat() * (((float)zoomHandler->zoom()) / 100.0)); d->painter->setFont( f ); - TQString text = getStringFromDict(tqshape,"text"); + TQString text = getStringFromDict(shape,"text"); if ( !text.isEmpty() ) { d->painter->drawText( int( x ), int( y ), int( w ), int( h ), tf | TQt::WordBreak, text ); @@ -478,14 +478,14 @@ void KivioPyStencil::paint( KivioIntraStencilData *d, bool outlined ) } if ( stype == "arc" ) { - double a1 = getDoubleFromDict(tqshape,"a1"); - double a2 = getDoubleFromDict(tqshape,"a2"); + double a1 = getDoubleFromDict(shape,"a1"); + double a2 = getDoubleFromDict(shape,"a2"); d->painter->drawArc(x,y,w,h,a1,a2); } if ( stype == "roundrect" ) { - double rx = zoomHandler->zoomItX(getDoubleFromDict(tqshape,"rx")); - double ry = zoomHandler->zoomItY(getDoubleFromDict(tqshape,"ry")); + double rx = zoomHandler->zoomItX(getDoubleFromDict(shape,"rx")); + double ry = zoomHandler->zoomItY(getDoubleFromDict(shape,"ry")); if (fill) { d->painter->fillRoundRect( x, y, w, h, rx, ry ); @@ -924,7 +924,7 @@ void KivioPyStencil::setLineWidth( double w ) void KivioPyStencil::setText( const TQString &s ) { - PyObject *to = PyDict_GetItemString( PyDict_GetItemString(vars,"tqshapes"), "text" ); + PyObject *to = PyDict_GetItemString( PyDict_GetItemString(vars,"shapes"), "text" ); if ( to ) PyDict_SetItemString(to, "text", Py_BuildValue("s", s.latin1() )); } @@ -932,7 +932,7 @@ void KivioPyStencil::setText( const TQString &s ) TQString KivioPyStencil::text() { - PyObject *to = PyDict_GetItemString( PyDict_GetItemString(vars,"tqshapes"), "text" ); + PyObject *to = PyDict_GetItemString( PyDict_GetItemString(vars,"shapes"), "text" ); if ( to ) { return getStringFromDict(to, "text"); } diff --git a/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp b/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp index 07f005fa..307a86e3 100644 --- a/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp @@ -23,9 +23,9 @@ #include <tqimage.h> #include <tqpen.h> -#include <tqbrush.h> +#include <brush.h> #include <tqsimplerichtext.h> -#include <tqpalette.h> +#include <palette.h> #include <kdebug.h> @@ -549,7 +549,7 @@ void KivioScreenPainter::drawPolyline( TQPointArray &pArray ) m_pPainter->setPen(m_pLineStyle->pen(1.0f)); m_pPainter->setBrush( TQBrush::NoBrush ); - m_pPainter->tqdrawPolyline( pArray, 0, pArray.size() ); + m_pPainter->drawPolyline( pArray, 0, pArray.size() ); } void KivioScreenPainter::drawPolygon( TQPointArray &pArray ) @@ -586,7 +586,7 @@ void KivioScreenPainter::drawPolygon( TQPointArray &pArray ) m_pPainter->setPen(m_pLineStyle->pen(1.0f)); m_pPainter->setBrush(b); - m_pPainter->tqdrawPolygon( pArray, true ); + m_pPainter->drawPolygon( pArray, true ); m_pPainter->setBrushOrigin(0, 0); } diff --git a/kivio/kiviopart/kiviosdk/kivio_shape.cpp b/kivio/kiviopart/kiviosdk/kivio_shape.cpp index dad8459a..302c6547 100644 --- a/kivio/kiviopart/kiviosdk/kivio_shape.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_shape.cpp @@ -44,7 +44,7 @@ KivioShape::KivioShape() */ KivioShape::KivioShape( const KivioShape &source ) { - source.m_tqshapeData.copyInto( &m_tqshapeData ); + source.m_shapeData.copyInto( &m_shapeData ); } @@ -68,7 +68,7 @@ void KivioShape::copyInto( KivioShape *pTarget ) const if( !pTarget ) return; - m_tqshapeData.copyInto( &(pTarget->m_tqshapeData) ); + m_shapeData.copyInto( &(pTarget->m_shapeData) ); } @@ -84,13 +84,13 @@ bool KivioShape::loadXML( const TQDomElement &e ) TQDomNode node = e.firstChild(); TQString name = XmlReadString( e, "name", "" ); - m_tqshapeData.setName( name ); - m_tqshapeData.setShapeType( (KivioShapeData::KivioShapeType)XmlReadInt( e, "tqshapeType", -1 )); + m_shapeData.setName( name ); + m_shapeData.setShapeType( (KivioShapeData::KivioShapeType)XmlReadInt( e, "shapeType", -1 )); - if( m_tqshapeData.name().isEmpty() || - m_tqshapeData.tqshapeType() == -1 ) + if( m_shapeData.name().isEmpty() || + m_shapeData.shapeType() == -1 ) { - kdWarning(43000) << "-LOAD KivioShape::loadXML() - Unknown tqshape or bad name read. Shape load aborted." << endl; + kdWarning(43000) << "-LOAD KivioShape::loadXML() - Unknown shape or bad name read. Shape load aborted." << endl; return false; } @@ -101,7 +101,7 @@ bool KivioShape::loadXML( const TQDomElement &e ) if( nodeName == "KivioShapeData" ) { - m_tqshapeData.loadXML( ele ); + m_shapeData.loadXML( ele ); } node = node.nextSibling(); @@ -120,17 +120,17 @@ TQDomElement KivioShape::saveXML( TQDomDocument &doc ) { TQDomElement e = doc.createElement("KivioShape"); - XmlWriteString( e, "name", m_tqshapeData.m_name ); - XmlWriteInt( e, "tqshapeType", m_tqshapeData.m_tqshapeType ); + XmlWriteString( e, "name", m_shapeData.m_name ); + XmlWriteInt( e, "shapeType", m_shapeData.m_shapeType ); - e.appendChild( m_tqshapeData.saveXML( doc ) ); + e.appendChild( m_shapeData.saveXML( doc ) ); return e; } /** - * Loads a tqshape of type arc + * Loads a shape of type arc * * @param e The element to load from * @returns A newly allocated KivioShape, or NULL on error. @@ -144,7 +144,7 @@ KivioShape *KivioShape::loadShapeArc( const TQDomElement & ) /** - * Loads a tqshape of type closed-path. + * Loads a shape of type closed-path. * * @param e The element to load from. * @returns A newly allocated KivioShape, or NULL on error. @@ -157,12 +157,12 @@ KivioShape *KivioShape::loadShapeClosedPath( const TQDomElement &e ) TQString nodeName; - // Create the new tqshape to load into + // Create the new shape to load into pShape = new KivioShape(); // Load the type, name, and lineWidth properties - pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstClosedPath; - pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" ); + pShape->m_shapeData.m_shapeType = KivioShapeData::kstClosedPath; + pShape->m_shapeData.m_name = XmlReadString( e, "name", "" ); // Iterate through the nodes loading the various items node = e.firstChild(); @@ -176,16 +176,16 @@ KivioShape *KivioShape::loadShapeClosedPath( const TQDomElement &e ) // Allocate a new point, load it, and store it in the list pPoint = new KivioPoint(0.0f, 0.0f, KivioPoint::kptBezier); pPoint->loadXML( node.toElement() ); - pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint ); + pShape->m_shapeData.m_pOriginalPointList->append( pPoint ); pPoint = NULL; } else if( nodeName == "KivioFillStyle" ) { - pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pFillStyle->loadXML( node.toElement() ); } else if( nodeName == "KivioLineStyle" ) { - pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() ); } node = node.nextSibling(); @@ -196,7 +196,7 @@ KivioShape *KivioShape::loadShapeClosedPath( const TQDomElement &e ) /** - * Loads a tqshape of type bezier + * Loads a shape of type bezier * * @param e The element to load from. * @returns A newly allocated KivioShape, or NULL on error. @@ -209,12 +209,12 @@ KivioShape *KivioShape::loadShapeBezier( const TQDomElement &e ) TQString nodeName; - // Create the new tqshape to load into + // Create the new shape to load into pShape = new KivioShape(); // Load the type, name, and lineWidth properties - pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstBezier; - pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" ); + pShape->m_shapeData.m_shapeType = KivioShapeData::kstBezier; + pShape->m_shapeData.m_name = XmlReadString( e, "name", "" ); // Iterate through the nodes loading the various items node = e.firstChild(); @@ -230,25 +230,25 @@ KivioShape *KivioShape::loadShapeBezier( const TQDomElement &e ) pPoint->loadXML( node.toElement() ); if( pPoint->pointType() != KivioPoint::kptBezier ) { - kdDebug(43000) << "KivioShape::loadShapeBezier() - Non-bezier point found. Aborting tqshape." << endl; + kdDebug(43000) << "KivioShape::loadShapeBezier() - Non-bezier point found. Aborting shape." << endl; delete pPoint; delete pShape; return NULL; } - pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint ); + pShape->m_shapeData.m_pOriginalPointList->append( pPoint ); pPoint = NULL; } else if( nodeName == "KivioLineStyle" ) { - pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() ); } node = node.nextSibling(); } - if( pShape->m_tqshapeData.m_pOriginalPointList->count() != 4 ) + if( pShape->m_shapeData.m_pOriginalPointList->count() != 4 ) { - kdDebug(43000) << "KivioShape::loadShapeBezier() - Wrong number of points loaded, should be 4, tqshape aborted" << endl; + kdDebug(43000) << "KivioShape::loadShapeBezier() - Wrong number of points loaded, should be 4, shape aborted" << endl; delete pShape; return NULL; } @@ -258,7 +258,7 @@ KivioShape *KivioShape::loadShapeBezier( const TQDomElement &e ) /** - * Loads a tqshape of type ellipse. + * Loads a shape of type ellipse. * * @param e The element to load from. * @returns A newly allocated KivioShape, or NULL on error. @@ -270,15 +270,15 @@ KivioShape *KivioShape::loadShapeEllipse( const TQDomElement &e ) TQString nodeName; - // Create the new tqshape to load into + // Create the new shape to load into pShape = new KivioShape(); // Load the type, name, and lineWidth properties - pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstEllipse; - pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" ); + pShape->m_shapeData.m_shapeType = KivioShapeData::kstEllipse; + pShape->m_shapeData.m_name = XmlReadString( e, "name", "" ); - pShape->m_tqshapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) ); - pShape->m_tqshapeData.m_dimensions.set( XmlReadFloat( e, "w", 0.0f ), XmlReadFloat( e, "h", 0.0f ) ); + pShape->m_shapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) ); + pShape->m_shapeData.m_dimensions.set( XmlReadFloat( e, "w", 0.0f ), XmlReadFloat( e, "h", 0.0f ) ); // Iterate through the nodes loading the various items node = e.firstChild(); @@ -288,11 +288,11 @@ KivioShape *KivioShape::loadShapeEllipse( const TQDomElement &e ) if( nodeName == "KivioFillStyle" ) { - pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pFillStyle->loadXML( node.toElement() ); } else if( nodeName == "KivioLineStyle" ) { - pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() ); } node = node.nextSibling(); @@ -303,7 +303,7 @@ KivioShape *KivioShape::loadShapeEllipse( const TQDomElement &e ) /** - * Loads a tqshape of type line-array. + * Loads a shape of type line-array. * * @param e The element to load from. * @returns A newly allocated KivioShape, or NULL on error. @@ -317,12 +317,12 @@ KivioShape *KivioShape::loadShapeLineArray( const TQDomElement &e ) TQDomElement lineElement; - // Create the new tqshape to load into + // Create the new shape to load into pShape = new KivioShape(); // Load the type, name, and lineWidth properties - pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstLineArray; - pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" ); + pShape->m_shapeData.m_shapeType = KivioShapeData::kstLineArray; + pShape->m_shapeData.m_name = XmlReadString( e, "name", "" ); // Iterate through the nodes loading the various items node = e.firstChild(); @@ -337,14 +337,14 @@ KivioShape *KivioShape::loadShapeLineArray( const TQDomElement &e ) // Allocate a new point, load it, and store it in the list pPoint = new KivioPoint( XmlReadFloat( lineElement, "x1", 0.0f ), XmlReadFloat( lineElement, "y1", 0.0f ) ); - pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint ); + pShape->m_shapeData.m_pOriginalPointList->append( pPoint ); pPoint = new KivioPoint( XmlReadFloat( lineElement, "x2", 0.0f ), XmlReadFloat( lineElement, "y2", 0.0f ) ); - pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint ); + pShape->m_shapeData.m_pOriginalPointList->append( pPoint ); pPoint = NULL; } else if( nodeName == "KivioLineStyle" ) { - pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() ); } node = node.nextSibling(); @@ -355,7 +355,7 @@ KivioShape *KivioShape::loadShapeLineArray( const TQDomElement &e ) /** - * Loads a tqshape of type open-path. + * Loads a shape of type open-path. * * @param e The element to load from. * @returns A newly allocated KivioShape, or NULL on error. @@ -368,12 +368,12 @@ KivioShape *KivioShape::loadShapeOpenPath( const TQDomElement &e ) TQString nodeName; - // Create the new tqshape to load into + // Create the new shape to load into pShape = new KivioShape(); // Load the type, name, and lineWidth properties - pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstOpenPath; - pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" ); + pShape->m_shapeData.m_shapeType = KivioShapeData::kstOpenPath; + pShape->m_shapeData.m_name = XmlReadString( e, "name", "" ); // Iterate through the nodes loading the various items node = e.firstChild(); @@ -387,12 +387,12 @@ KivioShape *KivioShape::loadShapeOpenPath( const TQDomElement &e ) // Allocate a new point, load it, and store it in the list pPoint = new KivioPoint(0.0f, 0.0f, KivioPoint::kptBezier); pPoint->loadXML( node.toElement() ); - pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint ); + pShape->m_shapeData.m_pOriginalPointList->append( pPoint ); pPoint = NULL; } else if( nodeName == "KivioLineStyle" ) { - pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() ); } node = node.nextSibling(); @@ -403,7 +403,7 @@ KivioShape *KivioShape::loadShapeOpenPath( const TQDomElement &e ) /** - * Loads a tqshape of type pie. + * Loads a shape of type pie. * * @param e The element to load from. * @returns A newly allocated KivioShape, or NULL on error. @@ -417,7 +417,7 @@ KivioShape *KivioShape::loadShapePie( const TQDomElement & ) /** - * Loads a tqshape of type polygon. + * Loads a shape of type polygon. * * @param e The element to load from. * @returns A newly allocated KivioShape, or NULL on error. @@ -430,12 +430,12 @@ KivioShape *KivioShape::loadShapePolygon( const TQDomElement &e ) TQString nodeName; - // Create the new tqshape to load into + // Create the new shape to load into pShape = new KivioShape(); // Load the type, name, and lineWidth properties - pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstPolygon; - pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" ); + pShape->m_shapeData.m_shapeType = KivioShapeData::kstPolygon; + pShape->m_shapeData.m_name = XmlReadString( e, "name", "" ); // Iterate through the nodes loading the various items node = e.firstChild(); @@ -449,16 +449,16 @@ KivioShape *KivioShape::loadShapePolygon( const TQDomElement &e ) // Allocate a new point, load it, and store it in the list pPoint = new KivioPoint(); pPoint->loadXML( node.toElement() ); - pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint ); + pShape->m_shapeData.m_pOriginalPointList->append( pPoint ); pPoint = NULL; } else if( nodeName == "KivioFillStyle" ) { - pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pFillStyle->loadXML( node.toElement() ); } else if( nodeName == "KivioLineStyle" ) { - pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() ); } node = node.nextSibling(); @@ -469,7 +469,7 @@ KivioShape *KivioShape::loadShapePolygon( const TQDomElement &e ) /** - * Loads a tqshape of type polyline. + * Loads a shape of type polyline. * * @param e The element to load from. * @returns A newly allocated KivioShape, or NULL on error. @@ -482,12 +482,12 @@ KivioShape *KivioShape::loadShapePolyline( const TQDomElement &e ) TQString nodeName; - // Create the new tqshape to load into + // Create the new shape to load into pShape = new KivioShape(); // Load the type, name, and lineWidth properties - pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstPolyline; - pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" ); + pShape->m_shapeData.m_shapeType = KivioShapeData::kstPolyline; + pShape->m_shapeData.m_name = XmlReadString( e, "name", "" ); // Iterate through the nodes loading the various items node = e.firstChild(); @@ -501,12 +501,12 @@ KivioShape *KivioShape::loadShapePolyline( const TQDomElement &e ) // Allocate a new point, load it, and store it in the list pPoint = new KivioPoint(); pPoint->loadXML( node.toElement() ); - pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint ); + pShape->m_shapeData.m_pOriginalPointList->append( pPoint ); pPoint = NULL; } else if( nodeName == "KivioLineStyle" ) { - pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() ); } node = node.nextSibling(); @@ -517,7 +517,7 @@ KivioShape *KivioShape::loadShapePolyline( const TQDomElement &e ) /** - * Loads a tqshape of type rectangle. + * Loads a shape of type rectangle. * * @param e The element to load from. * @returns A newly allocated KivioShape, or NULL on error. @@ -529,15 +529,15 @@ KivioShape *KivioShape::loadShapeRectangle( const TQDomElement &e ) TQString nodeName; - // Create the new tqshape to load into + // Create the new shape to load into pShape = new KivioShape(); // Load the type, name, and lineWidth properties - pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstRectangle; - pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" ); + pShape->m_shapeData.m_shapeType = KivioShapeData::kstRectangle; + pShape->m_shapeData.m_name = XmlReadString( e, "name", "" ); - pShape->m_tqshapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) ); - pShape->m_tqshapeData.m_dimensions.set( XmlReadFloat( e, "w", 72.0f ), XmlReadFloat( e, "h", 72.0f ) ); + pShape->m_shapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) ); + pShape->m_shapeData.m_dimensions.set( XmlReadFloat( e, "w", 72.0f ), XmlReadFloat( e, "h", 72.0f ) ); // Iterate through the nodes loading the various items node = e.firstChild(); @@ -548,11 +548,11 @@ KivioShape *KivioShape::loadShapeRectangle( const TQDomElement &e ) // Read the fill style if( nodeName == "KivioFillStyle" ) { - pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pFillStyle->loadXML( node.toElement() ); } else if( nodeName == "KivioLineStyle" ) { - pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() ); } node = node.nextSibling(); @@ -564,7 +564,7 @@ KivioShape *KivioShape::loadShapeRectangle( const TQDomElement &e ) /** - * Loads a tqshape of type round rectangle. + * Loads a shape of type round rectangle. * * @param e The element to load from. * @returns A newly allocated KivioShape, or NULL on error. @@ -577,20 +577,20 @@ KivioShape *KivioShape::loadShapeRoundRectangle( const TQDomElement &e ) TQString nodeName; - // Create the new tqshape to load into + // Create the new shape to load into pShape = new KivioShape(); // Load the type, name, and lineWidth properties - pShape->m_tqshapeData.m_tqshapeType = KivioShapeData::kstRoundRectangle; - pShape->m_tqshapeData.m_name = XmlReadString( e, "name", "" ); + pShape->m_shapeData.m_shapeType = KivioShapeData::kstRoundRectangle; + pShape->m_shapeData.m_name = XmlReadString( e, "name", "" ); - pShape->m_tqshapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) ); - pShape->m_tqshapeData.m_dimensions.set( XmlReadFloat( e, "w", 72.0f ), XmlReadFloat( e, "h", 72.0f ) ); + pShape->m_shapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) ); + pShape->m_shapeData.m_dimensions.set( XmlReadFloat( e, "w", 72.0f ), XmlReadFloat( e, "h", 72.0f ) ); // Read and store the radii of the curves pPoint = new KivioPoint(0.0f, 0.0f); pPoint->set( XmlReadFloat( e, "r1", 1.0f ), XmlReadFloat( e, "r2", 1.0f ) ); - pShape->m_tqshapeData.m_pOriginalPointList->append( pPoint ); + pShape->m_shapeData.m_pOriginalPointList->append( pPoint ); // Iterate through the nodes loading the various items node = e.firstChild(); @@ -601,11 +601,11 @@ KivioShape *KivioShape::loadShapeRoundRectangle( const TQDomElement &e ) // Read the fill style if( nodeName == "KivioFillStyle" ) { - pShape->m_tqshapeData.m_pFillStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pFillStyle->loadXML( node.toElement() ); } else if( nodeName == "KivioLineStyle" ) { - pShape->m_tqshapeData.m_pLineStyle->loadXML( node.toElement() ); + pShape->m_shapeData.m_pLineStyle->loadXML( node.toElement() ); } node = node.nextSibling(); @@ -616,7 +616,7 @@ KivioShape *KivioShape::loadShapeRoundRectangle( const TQDomElement &e ) /** - * Loads a tqshape of type textbox. + * Loads a shape of type textbox. * * @param e The element to load from. * @returns A newly allocated KivioShape, or NULL on error. @@ -630,17 +630,17 @@ KivioShape *KivioShape::loadShapeTextBox( const TQDomElement &e ) TQString name; - // Create the new tqshape to load into + // Create the new shape to load into pShape = new KivioShape(); // Load the type and name - pShape->m_tqshapeData.setShapeType(KivioShapeData::kstTextBox); - pShape->m_tqshapeData.setName( XmlReadString( e, "name", "" ) ); - pShape->m_tqshapeData.setTextColor(XmlReadColor(e,"color",TQColor(0,0,0))); + pShape->m_shapeData.setShapeType(KivioShapeData::kstTextBox); + pShape->m_shapeData.setName( XmlReadString( e, "name", "" ) ); + pShape->m_shapeData.setTextColor(XmlReadColor(e,"color",TQColor(0,0,0))); - pShape->m_tqshapeData.m_position.set( + pShape->m_shapeData.m_position.set( XmlReadFloat( e, "x", 0.0f ), XmlReadFloat( e, "y", 0.0f ) ); - pShape->m_tqshapeData.m_dimensions.set( + pShape->m_shapeData.m_dimensions.set( XmlReadFloat( e, "w", 72.0f ), XmlReadFloat( e, "h", 72.0f ) ); // Now look for the KivioTextStyle @@ -651,13 +651,13 @@ KivioShape *KivioShape::loadShapeTextBox( const TQDomElement &e ) if( nodeName == "KivioTextStyle" ) { ts.loadXML( node.toElement() ); - pShape->m_tqshapeData.setTextStyle( &ts ); + pShape->m_shapeData.setTextStyle( &ts ); } node = node.nextSibling(); } // TQString text = XmlReadString( e, "text", "" ); -// pShape->m_tqshapeData.setText( text ); +// pShape->m_shapeData.setText( text ); return pShape; diff --git a/kivio/kiviopart/kiviosdk/kivio_shape.h b/kivio/kiviopart/kiviosdk/kivio_shape.h index c83607d7..42adfed6 100644 --- a/kivio/kiviopart/kiviosdk/kivio_shape.h +++ b/kivio/kiviopart/kiviosdk/kivio_shape.h @@ -26,7 +26,7 @@ class KivioShape { protected: - KivioShapeData m_tqshapeData; // The data inside this tqshape + KivioShapeData m_shapeData; // The data inside this shape public: KivioShape(); @@ -39,9 +39,9 @@ public: bool loadXML( const TQDomElement & ); TQDomElement saveXML( TQDomDocument & ); - KivioShapeData::KivioShapeType tqshapeType() { return m_tqshapeData.tqshapeType(); } + KivioShapeData::KivioShapeType shapeType() { return m_shapeData.shapeType(); } - KivioShapeData *tqshapeData() { return &m_tqshapeData; } + KivioShapeData *shapeData() { return &m_shapeData; } static KivioShape *loadShapeArc( const TQDomElement & ); static KivioShape *loadShapeClosedPath( const TQDomElement & ); diff --git a/kivio/kiviopart/kiviosdk/kivio_shape_data.cpp b/kivio/kiviopart/kiviosdk/kivio_shape_data.cpp index 5305fe13..431d7987 100644 --- a/kivio/kiviopart/kiviosdk/kivio_shape_data.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_shape_data.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> /* - * Struct for holding information about a tqshape type + * Struct for holding information about a shape type */ struct KivioShapeTypeInfo { @@ -36,10 +36,10 @@ struct KivioShapeTypeInfo }; /* - * Array of tqshape info used for loading/saving. + * Array of shape info used for loading/saving. */ static const int numShapeInfo = 12; -static struct KivioShapeTypeInfo tqshapeInfo[] = { +static struct KivioShapeTypeInfo shapeInfo[] = { { "Arc", KivioShapeData::kstArc }, { "Pie", KivioShapeData::kstPie }, { "LineArray", KivioShapeData::kstLineArray }, @@ -84,7 +84,7 @@ KivioShapeData::KivioShapeData() m_pLineStyle = new KivioLineStyle(); // m_fgColor = TQColor( 0, 0, 0 ); - m_tqshapeType = kstNone; + m_shapeType = kstNone; m_name = ""; // m_lineWidth = 1.0f; @@ -119,7 +119,7 @@ KivioShapeData::KivioShapeData( const KivioShapeData &source ) //m_fgColor = source.m_fgColor; // Copy the rest - m_tqshapeType = source.m_tqshapeType; + m_shapeType = source.m_shapeType; m_name = TQString(source.m_name); //m_lineWidth = source.m_lineWidth; @@ -127,8 +127,8 @@ KivioShapeData::KivioShapeData( const KivioShapeData &source ) source.m_position.copyInto( &m_position ); source.m_dimensions.copyInto( &m_dimensions ); - // If this is a text tqshape, allocate a text data struct and copy the info - if( m_tqshapeType == kstTextBox ) + // If this is a text shape, allocate a text data struct and copy the info + if( m_shapeType == kstTextBox ) { m_pTextData = new KivioTextStyle(); @@ -208,7 +208,7 @@ void KivioShapeData::copyInto( KivioShapeData *pTarget ) const //pTarget->m_fgColor = m_fgColor; // Copy the rest - pTarget->m_tqshapeType = m_tqshapeType; + pTarget->m_shapeType = m_shapeType; pTarget->m_name = TQString(m_name); //pTarget->m_lineWidth = m_lineWidth; @@ -217,7 +217,7 @@ void KivioShapeData::copyInto( KivioShapeData *pTarget ) const // If this is a textbox, allocate & copy - if( m_tqshapeType == kstTextBox ) + if( m_shapeType == kstTextBox ) { if( !pTarget->m_pTextData ) { @@ -283,7 +283,7 @@ bool KivioShapeData::loadXML( const TQDomElement &e ) { // First make sure we are a text box - if( m_tqshapeType == kstTextBox ) + if( m_shapeType == kstTextBox ) { // If we don't have text data, allocate it if( !m_pTextData ) @@ -291,12 +291,12 @@ bool KivioShapeData::loadXML( const TQDomElement &e ) m_pTextData->loadXML( ele ); - } // end if m_tqshapeType==kstTextBox + } // end if m_shapeType==kstTextBox } else if( nodeName == "KivioText" ) { // First make sure we are a text box - if( m_tqshapeType == kstTextBox ) + if( m_shapeType == kstTextBox ) { KivioTextShapeData *pData = new KivioTextShapeData; @@ -338,7 +338,7 @@ bool KivioShapeData::loadXML( const TQDomElement &e ) m_pTextData->setFont( pData->m_textFont ); m_pTextData->setColor( pData->m_textColor ); - } // end if m_tqshapeType==kstTextBox + } // end if m_shapeType==kstTextBox else { kdDebug(43000) << "KivioShapeData::loadXML() - Loading KivioText, but this is not a textbox!" << endl; @@ -385,7 +385,7 @@ TQDomElement KivioShapeData::saveXML( TQDomDocument &doc ) // Save if we are a text box etc... - if( m_tqshapeType == kstTextBox ) + if( m_shapeType == kstTextBox ) { if( m_pTextData ) { @@ -420,21 +420,21 @@ TQDomElement KivioShapeData::saveXML( TQDomDocument &doc ) // The BGFillStyle e.appendChild( m_pFillStyle->saveXML( doc ) ); - // Shape type & name are stored in the tqshape node - //XmlWriteInt( e, "tqshapeType", m_tqshapeType ); + // Shape type & name are stored in the shape node + //XmlWriteInt( e, "shapeType", m_shapeType ); //XmlWriteString( e, "name", m_name ); return e; } -KivioShapeData::KivioShapeType KivioShapeData::tqshapeTypeFromString( const TQString &str ) +KivioShapeData::KivioShapeType KivioShapeData::shapeTypeFromString( const TQString &str ) { for( int i=0; i<numShapeInfo; i++ ) { - if( str.compare( tqshapeInfo[i].name )==0 ) - return tqshapeInfo[i].type; + if( str.compare( shapeInfo[i].name )==0 ) + return shapeInfo[i].type; } return kstNone; @@ -442,7 +442,7 @@ KivioShapeData::KivioShapeType KivioShapeData::tqshapeTypeFromString( const TQSt void KivioShapeData::setShapeType( KivioShapeType st ) { - m_tqshapeType = st; + m_shapeType = st; // If it is a text box, make sure we have text data if( st == kstTextBox ) diff --git a/kivio/kiviopart/kiviosdk/kivio_shape_data.h b/kivio/kiviopart/kiviosdk/kivio_shape_data.h index f97e5ec9..bd89dcc8 100644 --- a/kivio/kiviopart/kiviosdk/kivio_shape_data.h +++ b/kivio/kiviopart/kiviosdk/kivio_shape_data.h @@ -36,11 +36,11 @@ class KivioTextShapeData public: KivioTextShapeData(); - TQString m_text; // The text inside this tqshape + TQString m_text; // The text inside this shape TQColor m_textColor; // The text color TQFont m_textFont; // The text font bool m_isHtml; // Is the text HTML formatted? - int m_hTextAlign, m_vTextAlign; //Qt::Horizontal and vertical text tqalignment flags + int m_hTextAlign, m_vTextAlign; //Qt::Horizontal and vertical text alignment flags }; /** @@ -52,7 +52,7 @@ class KivioShapeData { public: /** - * The possible tqshape types. + * The possible shape types. */ typedef enum { kstNone = 0, @@ -75,7 +75,7 @@ protected: TQPtrList <KivioPoint> *m_pOriginalPointList; // Original point list loaded from an SML file - KivioShapeType m_tqshapeType; // The tqshape type + KivioShapeType m_shapeType; // The shape type KivioPoint m_position, m_dimensions; // The position and dimensions KivioFillStyle *m_pFillStyle; // The fill style @@ -83,7 +83,7 @@ protected: // float m_lineWidth; // The line width KivioLineStyle *m_pLineStyle; - TQString m_name; // The name of this tqshape + TQString m_name; // The name of this shape KivioTextStyle *m_pTextData; // A pointer to text data (if applicable, e.g. TextBox) @@ -98,10 +98,10 @@ public: virtual TQDomElement saveXML( TQDomDocument & ); - KivioShapeType tqshapeType() const { return m_tqshapeType; } + KivioShapeType shapeType() const { return m_shapeType; } void setShapeType( KivioShapeType st ); - static KivioShapeType tqshapeTypeFromString( const TQString & ); + static KivioShapeType shapeTypeFromString( const TQString & ); TQPtrList<KivioPoint> *pointList() { return m_pOriginalPointList; } diff --git a/kivio/kiviopart/kiviosdk/kivio_shape_painter.cpp b/kivio/kiviopart/kiviosdk/kivio_shape_painter.cpp index fbdad979..f1ca2c8f 100644 --- a/kivio/kiviopart/kiviosdk/kivio_shape_painter.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_shape_painter.cpp @@ -37,9 +37,9 @@ void KivioShapePainter::drawShape( KivioShape *pShape, float x, float y, float w m_pShape = pShape; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); - switch( pShapeData->tqshapeType() ) + switch( pShapeData->shapeType() ) { case KivioShapeData::kstArc: drawArc(); diff --git a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp index 6f00df1a..035ede78 100644 --- a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp @@ -37,9 +37,9 @@ #include <tqdom.h> #include <tqpainter.h> -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> -#include <tqpalette.h> +#include <palette.h> #include <tqrect.h> #include <tqbitmap.h> #include <kdebug.h> @@ -50,7 +50,7 @@ /** * Default constructor * - * Allocates a new tqshape list, connector targets, and original connector targets. + * Allocates a new shape list, connector targets, and original connector targets. */ KivioSMLStencil::KivioSMLStencil() : KivioStencil(), @@ -111,7 +111,7 @@ bool KivioSMLStencil::loadXML( const TQDomElement &e ) } else if( nodeName == "KivioShape" ) { - // Locate the tqshape we are supposed to load into + // Locate the shape we are supposed to load into KivioShape *pShape = locateShape( XmlReadString( ele, "name", "" ) ); if(pShape) { @@ -173,7 +173,7 @@ void KivioSMLStencil::loadConnectorTargetListXML( const TQDomElement &e ) /** - * Locates a tqshape in the tqshape list by name. + * Locates a shape in the shape list by name. */ KivioShape *KivioSMLStencil::locateShape( const TQString &name ) { @@ -185,7 +185,7 @@ KivioShape *KivioSMLStencil::locateShape( const TQString &name ) pShape = m_pShapeList->first(); while( pShape ) { - if( pShape->tqshapeData()->name() == name ) + if( pShape->shapeData()->name() == name ) { return pShape; } @@ -233,7 +233,7 @@ TQDomElement KivioSMLStencil::saveXML( TQDomDocument &doc ) } e.appendChild( clE ); - // The tqshape list + // The shape list KivioShape *pShape = m_pShapeList->first(); while( pShape ) { @@ -268,7 +268,7 @@ KivioStencil *KivioSMLStencil::duplicate() pNewStencil->m_pSpawner = m_pSpawner; - // Copy the tqshape list + // Copy the shape list pShape = m_pShapeList->first(); while( pShape ) { @@ -313,9 +313,9 @@ void KivioSMLStencil::paintOutline( KivioIntraStencilData *pData ) pShape = m_pShapeList->first(); while( pShape ) { - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); - switch( pShapeData->tqshapeType() ) + switch( pShapeData->shapeType() ) { case KivioShapeData::kstArc: drawOutlineArc( pShape, pData ); @@ -396,7 +396,7 @@ void KivioSMLStencil::drawOutlineArc( KivioShape *pShape, KivioIntraStencilData KivioPoint *pPosition, *pDimensions; KivioPoint *pPoint; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); pPosition = pShapeData->position(); pDimensions = pShapeData->dimensions(); @@ -420,14 +420,14 @@ void KivioSMLStencil::drawOutlineArc( KivioShape *pShape, KivioIntraStencilData void KivioSMLStencil::drawOutlineBezier( KivioShape *pShape, KivioIntraStencilData *pData ) { KivioPainter *painter; - KivioShapeData *pShapeData = pShape->tqshapeData(); + KivioShapeData *pShapeData = pShape->shapeData(); double defWidth = m_pSpawner->defWidth(); double defHeight = m_pSpawner->defHeight(); painter = pData->painter; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); KivioPoint *pPoint, *pPoint2, *pPoint3, *pPoint4; TQPtrList <KivioPoint> *pPointList = pShapeData->pointList(); @@ -456,7 +456,7 @@ void KivioSMLStencil::drawOutlineBezier( KivioShape *pShape, KivioIntraStencilDa void KivioSMLStencil::drawOutlineOpenPath( KivioShape *pShape, KivioIntraStencilData *pData ) { KivioPainter *painter; - KivioShapeData *pShapeData = pShape->tqshapeData(); + KivioShapeData *pShapeData = pShape->shapeData(); KivioPoint *pPoint, *pNewPoint; double defWidth = m_pSpawner->defWidth(); @@ -487,7 +487,7 @@ void KivioSMLStencil::drawOutlineOpenPath( KivioShape *pShape, KivioIntraStencil void KivioSMLStencil::drawOutlineClosedPath( KivioShape *pShape, KivioIntraStencilData *pData ) { KivioPainter *painter; - KivioShapeData *pShapeData = pShape->tqshapeData(); + KivioShapeData *pShapeData = pShape->shapeData(); KivioPoint *pPoint, *pNewPoint; double defWidth = m_pSpawner->defWidth(); @@ -521,7 +521,7 @@ void KivioSMLStencil::drawOutlineEllipse( KivioShape *pShape, KivioIntraStencilD KivioShapeData *pShapeData; KivioPoint *pPosition, *pDimensions; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); pPosition = pShapeData->position(); pDimensions = pShapeData->dimensions(); @@ -546,7 +546,7 @@ void KivioSMLStencil::drawOutlineLineArray( KivioShape *pShape, KivioIntraStenci KivioShapeData *pShapeData; TQPtrList <KivioPoint> *pList; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); defWidth = m_pSpawner->defWidth(); defHeight = m_pSpawner->defHeight(); @@ -582,7 +582,7 @@ void KivioSMLStencil::drawOutlineRectangle( KivioShape *pShape, KivioIntraStenci KivioShapeData *pShapeData; KivioPoint *pPosition, *pDimensions; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); pPosition = pShapeData->position(); pDimensions = pShapeData->dimensions(); @@ -606,7 +606,7 @@ void KivioSMLStencil::drawOutlineRoundRectangle( KivioShape *pShape, KivioIntraS KivioShapeData *pShapeData; KivioPoint *pPosition, *pDimensions; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); pPosition = pShapeData->position(); pDimensions = pShapeData->dimensions(); @@ -643,7 +643,7 @@ void KivioSMLStencil::drawOutlinePolygon( KivioShape *pShape, KivioIntraStencilD KivioShapeData *pShapeData; TQPtrList <KivioPoint> *pList; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); defWidth = m_pSpawner->defWidth(); defHeight = m_pSpawner->defHeight(); @@ -679,7 +679,7 @@ void KivioSMLStencil::drawOutlinePolyline( KivioShape *pShape, KivioIntraStencil KivioShapeData *pShapeData; TQPtrList <KivioPoint> *pList; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); defWidth = m_pSpawner->defWidth(); defHeight = m_pSpawner->defHeight(); @@ -714,7 +714,7 @@ void KivioSMLStencil::drawOutlineTextBox( KivioShape *pShape, KivioIntraStencilD double defWidth = m_pSpawner->defWidth(); double defHeight = m_pSpawner->defHeight(); int _x, _y, _w, _h; - KivioShapeData *pShapeData = pShape->tqshapeData(); + KivioShapeData *pShapeData = pShape->shapeData(); KivioPoint *pPosition = pShapeData->position(); KivioPoint *pDimensions = pShapeData->dimensions(); KivioPainter *painter = pData->painter; @@ -765,9 +765,9 @@ void KivioSMLStencil::paint( KivioIntraStencilData *pData ) pShape = m_pShapeList->first(); while( pShape ) { - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); - switch( pShapeData->tqshapeType() ) + switch( pShapeData->shapeType() ) { case KivioShapeData::kstArc: drawArc( pShape, pData ); @@ -873,7 +873,7 @@ void KivioSMLStencil::drawArc( KivioShape *pShape, KivioIntraStencilData *pData KivioPoint *pPosition, *pDimensions; KivioPoint *pPoint; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); pPosition = pShapeData->position(); pDimensions = pShapeData->dimensions(); @@ -915,14 +915,14 @@ void KivioSMLStencil::drawArc( KivioShape *pShape, KivioIntraStencilData *pData void KivioSMLStencil::drawBezier( KivioShape *pShape, KivioIntraStencilData *pData ) { KivioPainter *painter; - KivioShapeData *pShapeData = pShape->tqshapeData(); + KivioShapeData *pShapeData = pShape->shapeData(); double defWidth = m_pSpawner->defWidth(); double defHeight = m_pSpawner->defHeight(); painter = pData->painter; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); KivioPoint *pPoint, *pPoint2, *pPoint3, *pPoint4; TQPtrList <KivioPoint> *pPointList = pShapeData->pointList(); @@ -954,7 +954,7 @@ void KivioSMLStencil::drawBezier( KivioShape *pShape, KivioIntraStencilData *pDa void KivioSMLStencil::drawOpenPath( KivioShape *pShape, KivioIntraStencilData *pData ) { KivioPainter *painter; - KivioShapeData *pShapeData = pShape->tqshapeData(); + KivioShapeData *pShapeData = pShape->shapeData(); KivioPoint *pPoint, *pNewPoint; double defWidth = m_pSpawner->defWidth(); @@ -988,7 +988,7 @@ void KivioSMLStencil::drawOpenPath( KivioShape *pShape, KivioIntraStencilData *p void KivioSMLStencil::drawClosedPath( KivioShape *pShape, KivioIntraStencilData *pData ) { KivioPainter *painter; - KivioShapeData *pShapeData = pShape->tqshapeData(); + KivioShapeData *pShapeData = pShape->shapeData(); KivioPoint *pPoint, *pNewPoint; double defWidth = m_pSpawner->defWidth(); @@ -1046,7 +1046,7 @@ void KivioSMLStencil::drawEllipse( KivioShape *pShape, KivioIntraStencilData *pD KivioShapeData *pShapeData; KivioPoint *pPosition, *pDimensions; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); pPosition = pShapeData->position(); pDimensions = pShapeData->dimensions(); @@ -1089,7 +1089,7 @@ void KivioSMLStencil::drawLineArray( KivioShape *pShape, KivioIntraStencilData * KivioShapeData *pShapeData; TQPtrList <KivioPoint> *pList; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); defWidth = m_pSpawner->defWidth(); defHeight = m_pSpawner->defHeight(); @@ -1130,7 +1130,7 @@ void KivioSMLStencil::drawRectangle( KivioShape *pShape, KivioIntraStencilData * KivioShapeData *pShapeData; KivioPoint *pPosition, *pDimensions; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); pPosition = pShapeData->position(); pDimensions = pShapeData->dimensions(); @@ -1174,7 +1174,7 @@ void KivioSMLStencil::drawRoundRectangle( KivioShape *pShape, KivioIntraStencilD KivioPoint *pPosition, *pDimensions; KivioPoint *pPoint; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); pPosition = pShapeData->position(); pDimensions = pShapeData->dimensions(); @@ -1221,7 +1221,7 @@ void KivioSMLStencil::drawPolygon( KivioShape *pShape, KivioIntraStencilData *pD KivioShapeData *pShapeData; TQPtrList <KivioPoint> *pList; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); defWidth = m_pSpawner->defWidth(); defHeight = m_pSpawner->defHeight(); @@ -1280,7 +1280,7 @@ void KivioSMLStencil::drawPolyline( KivioShape *pShape, KivioIntraStencilData *p KivioShapeData *pShapeData; TQPtrList <KivioPoint> *pList; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); defWidth = m_pSpawner->defWidth(); defHeight = m_pSpawner->defHeight(); @@ -1317,7 +1317,7 @@ void KivioSMLStencil::drawTextBox( KivioShape *pShape, KivioIntraStencilData *pD { double defWidth = m_pSpawner->defWidth(); double defHeight = m_pSpawner->defHeight(); - KivioShapeData *pShapeData = pShape->tqshapeData(); + KivioShapeData *pShapeData = pShape->shapeData(); KivioPoint *pPosition = pShapeData->position(); KivioPoint *pDimensions = pShapeData->dimensions(); KivioPainter *painter = pData->painter; @@ -1358,7 +1358,7 @@ void KivioSMLStencil::setFGColor( TQColor c ) pShape = m_pShapeList->first(); while( pShape ) { - pShape->tqshapeData()->lineStyle()->setColor( c ); + pShape->shapeData()->lineStyle()->setColor( c ); pShape = m_pShapeList->next(); } @@ -1375,7 +1375,7 @@ void KivioSMLStencil::setBGColor( TQColor c ) pShape = m_pShapeList->first(); while( pShape ) { - pShape->tqshapeData()->fillStyle()->setColor( c ); + pShape->shapeData()->fillStyle()->setColor( c ); pShape = m_pShapeList->next(); } @@ -1388,7 +1388,7 @@ void KivioSMLStencil::setFillPattern(int p) pShape = m_pShapeList->first(); while( pShape ) { - pShape->tqshapeData()->fillStyle()->setBrushStyle( static_cast<Qt::BrushStyle>(p) ); + pShape->shapeData()->fillStyle()->setBrushStyle( static_cast<Qt::BrushStyle>(p) ); pShape = m_pShapeList->next(); } @@ -1405,7 +1405,7 @@ void KivioSMLStencil::setTextColor( TQColor c ) pShape = m_pShapeList->first(); while( pShape ) { - pShape->tqshapeData()->setTextColor( c ); + pShape->shapeData()->setTextColor( c ); pShape = m_pShapeList->next(); } @@ -1422,7 +1422,7 @@ void KivioSMLStencil::setTextFont( const TQFont &f ) pShape = m_pShapeList->first(); while( pShape ) { - pShape->tqshapeData()->setTextFont( f ); + pShape->shapeData()->setTextFont( f ); pShape = m_pShapeList->next(); } @@ -1439,7 +1439,7 @@ void KivioSMLStencil::setLineWidth( double f ) pShape = m_pShapeList->first(); while( pShape ) { - pShape->tqshapeData()->lineStyle()->setWidth( f ); + pShape->shapeData()->lineStyle()->setWidth( f ); pShape = m_pShapeList->next(); } @@ -1451,7 +1451,7 @@ void KivioSMLStencil::setLinePattern(int p) while( pShape ) { - pShape->tqshapeData()->lineStyle()->setStyle( p ); + pShape->shapeData()->lineStyle()->setStyle( p ); pShape = m_pShapeList->next(); } } @@ -1550,7 +1550,7 @@ KivioConnectorTarget *KivioSMLStencil::connectToTarget( KivioConnectorPoint *p, /** - * Updates the tqgeometry of this stencil. + * Updates the geometry of this stencil. * * This function rearranges the KivioConnectorTargets to reflect * that of the width/height/position. @@ -1590,9 +1590,9 @@ TQFont KivioSMLStencil::textFont() pShape = m_pShapeList->first(); while( pShape ) { - if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox ) + if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox ) { - return pShape->tqshapeData()->textFont(); + return pShape->shapeData()->textFont(); } pShape = m_pShapeList->next(); @@ -1609,9 +1609,9 @@ TQColor KivioSMLStencil::textColor() pShape = m_pShapeList->first(); while( pShape ) { - if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox ) + if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox ) { - return pShape->tqshapeData()->textColor(); + return pShape->shapeData()->textColor(); } pShape = m_pShapeList->next(); @@ -1631,8 +1631,8 @@ void KivioSMLStencil::setHTextAlign(int i) pShape = m_pShapeList->first(); while( pShape ) { - if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox ) - pShape->tqshapeData()->setHTextAlign( i ); + if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox ) + pShape->shapeData()->setHTextAlign( i ); pShape = m_pShapeList->next(); } @@ -1640,7 +1640,7 @@ void KivioSMLStencil::setHTextAlign(int i) /** - * Set the vertical tqalignment of this stencil + * Set the vertical alignment of this stencil */ void KivioSMLStencil::setVTextAlign(int i) { @@ -1650,8 +1650,8 @@ void KivioSMLStencil::setVTextAlign(int i) pShape = m_pShapeList->first(); while( pShape ) { - if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox ) - pShape->tqshapeData()->setVTextAlign( i ); + if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox ) + pShape->shapeData()->setVTextAlign( i ); pShape = m_pShapeList->next(); } @@ -1659,7 +1659,7 @@ void KivioSMLStencil::setVTextAlign(int i) /** - * Get the horizontal tqalignment of this stencil. + * Get the horizontal alignment of this stencil. */ int KivioSMLStencil::hTextAlign() { @@ -1668,9 +1668,9 @@ int KivioSMLStencil::hTextAlign() pShape = m_pShapeList->first(); while( pShape ) { - if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox ) + if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox ) { - return pShape->tqshapeData()->hTextAlign(); + return pShape->shapeData()->hTextAlign(); } pShape = m_pShapeList->next(); @@ -1681,7 +1681,7 @@ int KivioSMLStencil::hTextAlign() /** - * Get the vertical text tqalignment of this stencil. + * Get the vertical text alignment of this stencil. */ int KivioSMLStencil::vTextAlign() { @@ -1690,9 +1690,9 @@ int KivioSMLStencil::vTextAlign() pShape = m_pShapeList->first(); while( pShape ) { - if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox ) + if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox ) { - return pShape->tqshapeData()->vTextAlign(); + return pShape->shapeData()->vTextAlign(); } pShape = m_pShapeList->next(); @@ -1712,9 +1712,9 @@ TQString KivioSMLStencil::text() pShape = m_pShapeList->first(); while( pShape ) { - if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox ) + if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox ) { - return pShape->tqshapeData()->text(); + return pShape->shapeData()->text(); } pShape = m_pShapeList->next(); @@ -1734,9 +1734,9 @@ void KivioSMLStencil::setText( const TQString &t ) pShape = m_pShapeList->first(); while( pShape ) { - if( pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox ) + if( pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox ) { - pShape->tqshapeData()->setText(t); + pShape->shapeData()->setText(t); } pShape = m_pShapeList->next(); @@ -1753,7 +1753,7 @@ double KivioSMLStencil::lineWidth() pShape = m_pShapeList->first(); if( pShape ) - return pShape->tqshapeData()->lineStyle()->width(); + return pShape->shapeData()->lineStyle()->width(); return 1.0f; } @@ -1763,7 +1763,7 @@ int KivioSMLStencil::linePattern() KivioShape *pShape = m_pShapeList->first(); if( pShape ) - return pShape->tqshapeData()->lineStyle()->style(); + return pShape->shapeData()->lineStyle()->style(); return 1; } @@ -1777,7 +1777,7 @@ TQColor KivioSMLStencil::fgColor() pShape = m_pShapeList->first(); if( pShape ) - return pShape->tqshapeData()->lineStyle()->color(); + return pShape->shapeData()->lineStyle()->color(); return TQColor(0,0,0); } @@ -1792,7 +1792,7 @@ TQColor KivioSMLStencil::bgColor() pShape = m_pShapeList->first(); if( pShape ) - return pShape->tqshapeData()->fillStyle()->color(); + return pShape->shapeData()->fillStyle()->color(); return TQColor(0,0,0); } @@ -1803,7 +1803,7 @@ int KivioSMLStencil::fillPattern() pShape = m_pShapeList->first(); if( pShape ) - return pShape->tqshapeData()->fillStyle()->brushStyle(); + return pShape->shapeData()->fillStyle()->brushStyle(); return 1; } @@ -1923,7 +1923,7 @@ bool KivioSMLStencil::checkCollisionPolygon( KivioShape *pShape, KoPoint *pCheck TQPtrList<KivioPoint> *pList; KoPoint *pPoints; - pShapeData = pShape->tqshapeData(); + pShapeData = pShape->shapeData(); defWidth = m_pSpawner->defWidth(); defHeight = m_pSpawner->defHeight(); @@ -2001,7 +2001,7 @@ KivioLineStyle KivioSMLStencil::lineStyle() KivioShape *pShape = m_pShapeList->first(); if( pShape ) - return *(pShape->tqshapeData()->lineStyle()); + return *(pShape->shapeData()->lineStyle()); return KivioLineStyle(); } @@ -2012,7 +2012,7 @@ void KivioSMLStencil::setLineStyle(KivioLineStyle ls) while( pShape ) { - pShape->tqshapeData()->setLineStyle(ls);; + pShape->shapeData()->setLineStyle(ls);; pShape = m_pShapeList->next(); } } @@ -2032,12 +2032,12 @@ TQString KivioSMLStencil::getTextBoxName(const KoPoint& p) while(pShape) { - if(pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox) + if(pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox) { - double x = pShape->tqshapeData()->x(); - double y = pShape->tqshapeData()->y(); - double x2 = pShape->tqshapeData()->w() + x; - double y2 = pShape->tqshapeData()->h() + y; + double x = pShape->shapeData()->x(); + double y = pShape->shapeData()->y(); + double x2 = pShape->shapeData()->w() + x; + double y2 = pShape->shapeData()->h() + y; // Create the rotated rectangle KoPoint pPoints[4]; @@ -2051,7 +2051,7 @@ TQString KivioSMLStencil::getTextBoxName(const KoPoint& p) pPoints[3].setY(x * m.m12() + y2 * m.m22() + m.dy()); if(PointInPoly(pPoints, 4, &pos)) { - return pShape->tqshapeData()->name(); + return pShape->shapeData()->name(); } if(!first) { @@ -2063,7 +2063,7 @@ TQString KivioSMLStencil::getTextBoxName(const KoPoint& p) } if(first) { - return first->tqshapeData()->name(); + return first->shapeData()->name(); } return TQString(); @@ -2075,9 +2075,9 @@ void KivioSMLStencil::setText(const TQString& text, const TQString& name) while(pShape) { - if(pShape->tqshapeData()->name() == name) + if(pShape->shapeData()->name() == name) { - pShape->tqshapeData()->setText(text); + pShape->shapeData()->setText(text); return; } @@ -2091,9 +2091,9 @@ TQString KivioSMLStencil::text(const TQString& name) while(pShape) { - if(pShape->tqshapeData()->name() == name) + if(pShape->shapeData()->name() == name) { - return pShape->tqshapeData()->text(); + return pShape->shapeData()->text(); } pShape = m_pShapeList->next(); @@ -2128,7 +2128,7 @@ bool KivioSMLStencil::hasTextBox() const { KivioShape* pShape = m_pShapeList->first(); while(pShape) { - if(pShape->tqshapeData()->tqshapeType() == KivioShapeData::kstTextBox) { + if(pShape->shapeData()->shapeType() == KivioShapeData::kstTextBox) { return true; } @@ -2140,89 +2140,89 @@ bool KivioSMLStencil::hasTextBox() const TQColor KivioSMLStencil::textColor(const TQString& textBoxName) { - KivioShape* tqshape = locateShape(textBoxName); + KivioShape* shape = locateShape(textBoxName); - if(!tqshape) + if(!shape) return textColor(); - return tqshape->tqshapeData()->textColor(); + return shape->shapeData()->textColor(); } void KivioSMLStencil::setTextColor(const TQString& textBoxName, const TQColor& color) { - KivioShape* tqshape = locateShape(textBoxName); + KivioShape* shape = locateShape(textBoxName); - // If we didn't find the tqshape set the color stencil wide - if(!tqshape) { + // If we didn't find the shape set the color stencil wide + if(!shape) { setTextColor(color); return; } - tqshape->tqshapeData()->setTextColor(color); + shape->shapeData()->setTextColor(color); } TQFont KivioSMLStencil::textFont(const TQString& textBoxName) { - KivioShape* tqshape = locateShape(textBoxName); + KivioShape* shape = locateShape(textBoxName); - if(!tqshape) + if(!shape) return textFont(); - return tqshape->tqshapeData()->textFont(); + return shape->shapeData()->textFont(); } void KivioSMLStencil::setTextFont(const TQString& textBoxName, const TQFont& font) { - KivioShape* tqshape = locateShape(textBoxName); + KivioShape* shape = locateShape(textBoxName); - if(!tqshape) { + if(!shape) { setTextFont(font); return; } - tqshape->tqshapeData()->setTextFont(font); + shape->shapeData()->setTextFont(font); } int KivioSMLStencil::hTextAlign(const TQString& textBoxName) { - KivioShape* tqshape = locateShape(textBoxName); + KivioShape* shape = locateShape(textBoxName); - if(!tqshape) + if(!shape) return hTextAlign(); - return tqshape->tqshapeData()->hTextAlign(); + return shape->shapeData()->hTextAlign(); } int KivioSMLStencil::vTextAlign(const TQString& textBoxName) { - KivioShape* tqshape = locateShape(textBoxName); + KivioShape* shape = locateShape(textBoxName); - if(!tqshape) + if(!shape) return vTextAlign(); - return tqshape->tqshapeData()->vTextAlign(); + return shape->shapeData()->vTextAlign(); } void KivioSMLStencil::setHTextAlign(const TQString& textBoxName, int align) { - KivioShape* tqshape = locateShape(textBoxName); + KivioShape* shape = locateShape(textBoxName); - if(!tqshape) { + if(!shape) { setHTextAlign(align); return; } - tqshape->tqshapeData()->setHTextAlign(align); + shape->shapeData()->setHTextAlign(align); } void KivioSMLStencil::setVTextAlign(const TQString& textBoxName, int align) { - KivioShape* tqshape = locateShape(textBoxName); + KivioShape* shape = locateShape(textBoxName); - if(!tqshape) { + if(!shape) { setVTextAlign(align); return; } - tqshape->tqshapeData()->setVTextAlign(align); + shape->shapeData()->setVTextAlign(align); } diff --git a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.h b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.h index 30e53e93..c9ebcc6c 100644 --- a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.h +++ b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.h @@ -101,7 +101,7 @@ public: virtual bool loadXML( const TQDomElement & ); virtual TQDomElement saveXML( TQDomDocument & ); - virtual TQPtrList<KivioShape> *tqshapeList() { return m_pShapeList; } + virtual TQPtrList<KivioShape> *shapeList() { return m_pShapeList; } virtual KivioShape *subSelection() { return m_pSubSelection; } virtual void paintOutline( KivioIntraStencilData * ); diff --git a/kivio/kiviopart/kiviosdk/kivio_sml_stencil_spawner.cpp b/kivio/kiviopart/kiviosdk/kivio_sml_stencil_spawner.cpp index 588a468e..d18caae8 100644 --- a/kivio/kiviopart/kiviosdk/kivio_sml_stencil_spawner.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_sml_stencil_spawner.cpp @@ -164,15 +164,15 @@ bool KivioSMLStencilSpawner::loadXML( const TQString &file, TQDomDocument &d ) /** - * Loads a tqshape from an XML node. + * Loads a shape from an XML node. */ -void KivioSMLStencilSpawner::loadShape( TQDomNode &tqshapeNode ) +void KivioSMLStencilSpawner::loadShape( TQDomNode &shapeNode ) { KivioShapeData::KivioShapeType t; KivioShape *pShape = NULL; - TQDomElement tqshapeElement = tqshapeNode.toElement(); + TQDomElement shapeElement = shapeNode.toElement(); - t = KivioShapeData::tqshapeTypeFromString( XmlReadString( tqshapeElement, "type", "None" ) ); + t = KivioShapeData::shapeTypeFromString( XmlReadString( shapeElement, "type", "None" ) ); switch( t ) { @@ -180,51 +180,51 @@ void KivioSMLStencilSpawner::loadShape( TQDomNode &tqshapeNode ) break; case KivioShapeData::kstArc: - pShape = KivioShape::loadShapeArc( tqshapeElement ); + pShape = KivioShape::loadShapeArc( shapeElement ); break; case KivioShapeData::kstPie: - pShape = KivioShape::loadShapePie( tqshapeElement ); + pShape = KivioShape::loadShapePie( shapeElement ); break; case KivioShapeData::kstLineArray: - pShape = KivioShape::loadShapeLineArray( tqshapeElement ); + pShape = KivioShape::loadShapeLineArray( shapeElement ); break; case KivioShapeData::kstPolyline: - pShape = KivioShape::loadShapePolyline( tqshapeElement ); + pShape = KivioShape::loadShapePolyline( shapeElement ); break; case KivioShapeData::kstPolygon: - pShape = KivioShape::loadShapePolygon( tqshapeElement ); + pShape = KivioShape::loadShapePolygon( shapeElement ); break; case KivioShapeData::kstBezier: - pShape = KivioShape::loadShapeBezier( tqshapeElement ); + pShape = KivioShape::loadShapeBezier( shapeElement ); break; case KivioShapeData::kstRectangle: - pShape = KivioShape::loadShapeRectangle( tqshapeElement ); + pShape = KivioShape::loadShapeRectangle( shapeElement ); break; case KivioShapeData::kstRoundRectangle: - pShape = KivioShape::loadShapeRoundRectangle( tqshapeElement ); + pShape = KivioShape::loadShapeRoundRectangle( shapeElement ); break; case KivioShapeData::kstEllipse: - pShape = KivioShape::loadShapeEllipse( tqshapeElement ); + pShape = KivioShape::loadShapeEllipse( shapeElement ); break; case KivioShapeData::kstOpenPath: - pShape = KivioShape::loadShapeOpenPath( tqshapeElement ); + pShape = KivioShape::loadShapeOpenPath( shapeElement ); break; case KivioShapeData::kstClosedPath: - pShape = KivioShape::loadShapeClosedPath( tqshapeElement ); + pShape = KivioShape::loadShapeClosedPath( shapeElement ); break; case KivioShapeData::kstTextBox: - pShape = KivioShape::loadShapeTextBox( tqshapeElement ); + pShape = KivioShape::loadShapeTextBox( shapeElement ); break; default: diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp index c2e54a58..0fdd2ac1 100644 --- a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp @@ -104,7 +104,7 @@ bool KivioStencilSpawnerSet::loadDir( const TQString &dirName ) m_name = readTitle( dirName ); m_id = readId( dirName ); - d.setNameFilter("*.so *.sml *.ksp *.spy *.tqshape"); + d.setNameFilter("*.so *.sml *.ksp *.spy *.shape"); m_files = d.entryList(); return true; @@ -134,7 +134,7 @@ KivioStencilSpawner* KivioStencilSpawnerSet::loadFile( const TQString &fileName { pSpawner = new KivioPyStencilSpawner(this); } - else if( fileName.contains( ".tqshape", false ) ) + else if( fileName.contains( ".shape", false ) ) { pSpawner = new KivioDiaStencilSpawner(this); } diff --git a/kivio/kiviopart/kiviosdk/kivio_text_style.h b/kivio/kiviopart/kiviosdk/kivio_text_style.h index 2a8ecd62..73c13e0e 100644 --- a/kivio/kiviopart/kiviosdk/kivio_text_style.h +++ b/kivio/kiviopart/kiviosdk/kivio_text_style.h @@ -14,11 +14,11 @@ class TQPainter; class KivioTextStyle { protected: - TQString m_text; // The text inside this tqshape + TQString m_text; // The text inside this shape TQColor m_color; // The text color TQFont m_font; // The text font bool m_isHtml; // Is the text HTML formatted? - int m_hTextAlign, m_vTextAlign; //Qt::Horizontal and vertical text tqalignment flags + int m_hTextAlign, m_vTextAlign; //Qt::Horizontal and vertical text alignment flags public: KivioTextStyle(); diff --git a/kivio/kiviopart/kiviostencilsetinstaller.cpp b/kivio/kiviopart/kiviostencilsetinstaller.cpp index e0d2b363..67cb4d87 100644 --- a/kivio/kiviopart/kiviostencilsetinstaller.cpp +++ b/kivio/kiviopart/kiviostencilsetinstaller.cpp @@ -24,7 +24,7 @@ #include "kiviostencilsetinstaller.h" #include <tqframe.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqstringlist.h> @@ -74,7 +74,7 @@ namespace Kivio { TQString tmpFile; if(!KIO::NetAccess::download(url, tmpFile, this)) { - KMessageBox::error(this, i18n("Could not find the stencil set archive %1.").tqarg(url.prettyURL())); + KMessageBox::error(this, i18n("Could not find the stencil set archive %1.").arg(url.prettyURL())); return; } diff --git a/kivio/kiviopart/stencilbarbutton.cpp b/kivio/kiviopart/stencilbarbutton.cpp index d3d30dae..39fb22ef 100644 --- a/kivio/kiviopart/stencilbarbutton.cpp +++ b/kivio/kiviopart/stencilbarbutton.cpp @@ -74,7 +74,7 @@ DragBarButton::DragBarButton( const TQString& text, TQWidget* parent, const char setPixmap(stencil_xpm); - const TQColorGroup& g = tqcolorGroup(); + const TQColorGroup& g = colorGroup(); TQColor c = g.buttonText(); int cr, cg, cb; @@ -121,8 +121,8 @@ void DragBarButton::drawButton( TQPainter* paint ) pix.fill(eraseColor()); TQPainter pixPainter(&pix); - const TQColorGroup& g = tqcolorGroup(); - tqstyle().tqdrawControl( TQStyle::CE_PushButton, &pixPainter, this, TQRect(0, 0, pixSize.width(), pixSize.height()), tqcolorGroup() ); + const TQColorGroup& g = colorGroup(); + tqstyle().drawControl( TQStyle::CE_PushButton, &pixPainter, this, TQRect(0, 0, pixSize.width(), pixSize.height()), colorGroup() ); int m = 3; int tw = 0; @@ -132,7 +132,7 @@ void DragBarButton::drawButton( TQPainter* paint ) pw = m_pIcon->width(); tqstyle().drawItem( &pixPainter, TQRect( m, 0, pw, pixSize.height() ), AlignLeft | AlignVCenter, - tqcolorGroup(), isEnabled(), + colorGroup(), isEnabled(), m_pIcon, TQString(), -1, &g.buttonText()); } @@ -146,7 +146,7 @@ void DragBarButton::drawButton( TQPainter* paint ) tqstyle().drawItem( &pixPainter, TQRect( x, 0, tw, pixSize.height() ), AlignLeft | AlignVCenter|ShowPrefix, - tqcolorGroup(), isEnabled(), + colorGroup(), isEnabled(), 0L, t, -1, &g.buttonText()); } @@ -183,7 +183,7 @@ void DragBarButton::setPixmap( const TQPixmap& pixmap ) m_pIcon = new TQPixmap(pixmap); } -TQSize DragBarButton::tqsizeHint() const +TQSize DragBarButton::sizeHint() const { constPolish(); int m = 3; @@ -231,7 +231,7 @@ void DragBarButton::mousePressEvent( TQMouseEvent* ev ) if ( closeRect.contains(ev->pos())) { m_bClose = true; - tqrepaint(); + repaint(); return; } @@ -243,7 +243,7 @@ void DragBarButton::mouseReleaseEvent( TQMouseEvent* ev ) { if ( m_bClose ) { m_bClose = false; - tqrepaint(); + repaint(); TQRect closeRect; if(m_orientation == Qt::Vertical) { @@ -285,14 +285,14 @@ void DragBarButton::enterEvent( TQEvent* ev ) { TQPushButton::enterEvent(ev); m_bMouseOn = true; - tqrepaint(false); + repaint(false); } void DragBarButton::leaveEvent( TQEvent* ev ) { TQPushButton::leaveEvent(ev); m_bMouseOn = false; - tqrepaint(); + repaint(); } void DragBarButton::setOrientation(Qt::Orientation orientation) @@ -300,9 +300,9 @@ void DragBarButton::setOrientation(Qt::Orientation orientation) m_orientation = orientation; if(m_orientation == Qt::Vertical) { - tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); } else { - tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); + setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); } } diff --git a/kivio/kiviopart/stencilbarbutton.h b/kivio/kiviopart/stencilbarbutton.h index 6f207a7f..67595db9 100644 --- a/kivio/kiviopart/stencilbarbutton.h +++ b/kivio/kiviopart/stencilbarbutton.h @@ -35,7 +35,7 @@ class DragBarButton : public TQPushButton void setIcon( const TQString& ); void setPixmap( const TQPixmap& ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; Qt::Orientation orientation() const { return m_orientation; } diff --git a/kivio/kiviopart/stencilbardockmanager.cpp b/kivio/kiviopart/stencilbardockmanager.cpp index ecf923f9..aa5c30c4 100644 --- a/kivio/kiviopart/stencilbardockmanager.cpp +++ b/kivio/kiviopart/stencilbardockmanager.cpp @@ -179,7 +179,7 @@ void StencilBarDockManager::slotFinishDragPage( DragBarButton* ) KivioStackBar* bar = (KivioStackBar*)sender(); bar->removePage(dragWidget); - insertStencilSet(dragWidget,caption,dragPos,moveManager->tqgeometry(),m_destinationBar); + insertStencilSet(dragWidget,caption,dragPos,moveManager->geometry(),m_destinationBar); // remove KivioStackBar if no more pages if (!bar->visiblePage()) { @@ -205,13 +205,13 @@ void StencilBarDockManager::slotMoving() // check existing bars for ( KivioStackBar* bar = m_pBars.first(); bar; bar = m_pBars.next() ) { - if ( bar->tqgeometry().contains(p) ) { + if ( bar->geometry().contains(p) ) { if(bar->place() == TQDockWindow::OutsideDock) { dragPos = OnTopLevelBar; - globalPos = bar->tqgeometry().topLeft(); + globalPos = bar->geometry().topLeft(); } else { dragPos = AutoSelect; - globalPos = bar->mapToGlobal(bar->tqgeometry().topLeft()); + globalPos = bar->mapToGlobal(bar->geometry().topLeft()); } m_destinationBar = bar; @@ -219,7 +219,7 @@ void StencilBarDockManager::slotMoving() moveManager->setGeometry(globalPos.x(), moveManager->y(), bar->width(), - moveManager->getWidget()->tqsizeHint().height()); + moveManager->getWidget()->sizeHint().height()); return; } } @@ -556,8 +556,8 @@ void KoToolDockMoveManager::doResizeInternal() void KoToolDockMoveManager::setWidget( TQWidget* _w ) { widget = _w; - minSize = widget->tqminimumSize(); - maxSize = widget->tqmaximumSize(); + minSize = widget->minimumSize(); + maxSize = widget->maximumSize(); rr = TQRect(widget->mapToGlobal(TQPoint(0,0)),widget->size()); p = rr.topLeft(); @@ -631,7 +631,7 @@ bool KoToolDockMoveManager::check(int& x, int& y, int& w, int& h, bool change) return f1&&f2; } -TQRect KoToolDockMoveManager::tqgeometry() +TQRect KoToolDockMoveManager::geometry() { int x0 = xp; int y0 = yp; diff --git a/kivio/kiviopart/stencilbardockmanager.h b/kivio/kiviopart/stencilbardockmanager.h index 8406e5f0..73d48301 100644 --- a/kivio/kiviopart/stencilbardockmanager.h +++ b/kivio/kiviopart/stencilbardockmanager.h @@ -114,7 +114,7 @@ class KoToolDockMoveManager: public TQObject void setGeometry( const TQRect& r ); void setGeometry(int x, int y, int w, int h); - TQRect tqgeometry(); + TQRect geometry(); void resize( const TQSize& s ) { setGeometry(xp, yp, s.width(), s.height()); } void resize(int rw, int rh) { setGeometry(xp, yp, rw, rh); } diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-chevron.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-chevron.shape index 7d7cb3cb..8ff02c32 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-chevron.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-chevron.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Block Arrow - Chevron</name><!-- Block Arrow - Chevron, as seen in PowerPoint 97 --> <icon>arrow-chevron.png</icon> @@ -32,4 +32,4 @@ <svg:polygon style="fill: default" points="0,0 2,0 3,1 2,2 0,2 1,1 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,0 2,0 3,1 2,2 0,2 1,1 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape index b0e44553..6e1388fe 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-down.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Down Arrow</name> <icon>arrow-down.png</icon> @@ -36,4 +36,4 @@ <svg:polygon style="fill: default" points="1,0 1,2 0,2 2,4 4,2 3,2 3,0 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 1,2 0,2 2,4 4,2 3,2 3,0 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape index d536a6b6..a4f20839 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-notched.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Notched Left Arrow</name> <icon>arrow-left-notched.png</icon> @@ -40,4 +40,4 @@ <svg:polygon style="fill: default" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 3,2 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 3,2 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right-up.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right-up.shape index d2579d6d..54babdd8 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right-up.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right-up.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Left-Right-Up Arrow</name> <icon>arrow-left-right-up.png</icon> @@ -76,4 +76,4 @@ <svg:polygon style="fill: default" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 8,6 8,7 10,5 8,3 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 8,6 8,7 10,5 8,3 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape index b2e85882..03b7787c 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-right.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Left-Right Arrow</name> <icon>arrow-left-right.png</icon> @@ -48,4 +48,4 @@ <svg:polygon style="fill: default" points="6,1 2,1 2,0 0,2 2,4 2,3 6,3 6,4 8,2 6,0 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="6,1 2,1 2,0 0,2 2,4 2,3 6,3 6,4 8,2 6,0 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape index e70c0d2a..e3c0c008 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left-up.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Assorted - Left-Up Arrow</name> <icon>arrow-left-up.png</icon> @@ -56,4 +56,4 @@ <svg:polygon style="fill: #ffffff" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 6,6 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 6,6 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape index e2e513af..8eb15cd4 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-left.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Left Arrow</name> <icon>arrow-left.png</icon> @@ -36,4 +36,4 @@ <svg:polygon style="fill: default" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape index b99c3461..ef0f7f47 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-pentagon.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Block Arrow - Pentagon</name><!-- Arrow Pentagon as seen in Powerpoint 97 --> <icon>arrow-pentagon.png</icon> @@ -28,4 +28,4 @@ <svg:polygon style="fill: default" points="0,0 2,0 3,1 2,2 0,2 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,0 2,0 3,1 2,2 0,2 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape index 1886293b..6351e8dd 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-quad.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Quad Arrow</name> <icon>arrow-quad.png</icon> @@ -57,4 +57,4 @@ <svg:polygon style="fill: default" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 6,6 8,6 8,7 10,5 8,3 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 6,6 8,6 8,7 10,5 8,3 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape index 8738ffea..17d670fc 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right-notched.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Notched Right Arrow</name> <icon>arrow-right-notched.png</icon> @@ -40,4 +40,4 @@ <svg:polygon style="fill: default" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 1,2 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 1,2 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape index be5bf79c..8e9fea1d 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-right.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Right Arrow</name> <icon>arrow-right.png</icon> @@ -36,4 +36,4 @@ <svg:polygon style="fill: default" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down-left.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down-left.shape index 0549dbe8..8d418022 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down-left.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down-left.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Up-Down-Left Arrow</name> <icon>arrow-up-down-left.png</icon> @@ -76,4 +76,4 @@ <svg:polygon style="fill: default" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape index f0f8623e..e94d2d17 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up-down.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Up-Down Arrow</name> <icon>arrow-up-down.png</icon> @@ -48,4 +48,4 @@ <svg:polygon style="fill: default" points="1,6 1,2 0,2 2,0 4,2 3,2 3,6 4,6 2,8 0,6 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,6 1,2 0,2 2,0 4,2 3,2 3,6 4,6 2,8 0,6 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape index 83222aa8..791f8a78 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/arrow-up.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Up Arrow</name> <icon>arrow-up.png</icon> @@ -36,4 +36,4 @@ <svg:polygon style="fill: default" points="1,4 1,2 0,2 2,0 4,2 3,2 3,4 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,4 1,2 0,2 2,0 4,2 3,2 3,4 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/circle.shape b/kivio/kiviopart/stencils/Dia/Assorted/circle.shape index ae10097e..26647def 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/circle.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/circle.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Perfect Circle</name> <icon>circle.png</icon> @@ -18,4 +18,4 @@ <svg:ellipse style="fill: default" cx="1.5" cy="2" rx="1" ry="1"/> <svg:ellipse style="stroke-width: 0.1; stroke: #000000" cx="1.5" cy="2" rx="1" ry="1"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape b/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape index 2b6a598c..2bc02249 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/cross-maltese.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Maltese Cross</name><!-- St. John's Ambulance --> <icon>cross-maltese.png</icon> @@ -41,4 +41,4 @@ <svg:polygon style="fill: default" points="7,6 7.5,5 7,4 9,5 8,3 9,3.5 10,3 9,5 11,4 10.5,5 11,6 9,5 10,7 9,6.5 8,7 9,5 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="7,6 7.5,5 7,4 9,5 8,3 9,3.5 10,3 9,5 11,4 10.5,5 11,6 9,5 10,7 9,6.5 8,7 9,5 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape b/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape index 88d86baa..2aeef611 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/cross-swiss.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Swiss Cross</name> <!-- Swiss flag has a white cross on red --> @@ -59,4 +59,4 @@ <svg:polygon style="fill: default" points="2.55,3.05 2.55,2.55 3.05,2.55 3.05,2.05 3.55,2.05 3.55,2.55 4.05,2.55 4.05,3.05 3.55,3.05 3.55,3.55 3.05,3.55 3.05,3.05 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="2.55,3.05 2.55,2.55 3.05,2.55 3.05,2.05 3.55,2.05 3.55,2.55 4.05,2.55 4.05,3.05 3.55,3.05 3.55,3.55 3.05,3.55 3.05,3.05 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape b/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape index a031d369..88948942 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/diamond.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Diamond</name> <icon>diamond.png</icon> @@ -18,4 +18,4 @@ <svg:polygon style="fill: default" points="1,0 2,1 1,2 0,1 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 2,1 1,2 0,1 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape index ecfac8e2..ea2c2400 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/heptagon.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Heptagon</name> <icon>heptagon.png</icon> @@ -36,4 +36,4 @@ <svg:polygon style="fill: #ffffff" points="0,6 0.5,2 5,0 9.5,2 10,6 7.5,9.5 2.5,9.5 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,6 0.5,2 5,0 9.5,2 10,6 7.5,9.5 2.5,9.5 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape index 71bedc8d..a21aa220 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/hexagon.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Hexagon</name> <icon>hexagon.png</icon> @@ -32,4 +32,4 @@ <svg:polygon style="fill: default" points="1.5,1 3,1 4,2.5 3,4 1.5,4 0.5,2.5 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1.5,1 3,1 4,2.5 3,4 1.5,4 0.5,2.5 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape index 794cd4b8..c0dceb97 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/octagon.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Octagon</name> <icon>octagon.png</icon> @@ -25,4 +25,4 @@ <svg:polygon style="fill: default" points="3.55,2.05 5.05,2.05 6.05,3.05 6.05,4.55 5.05,5.55 3.55,5.55 2.55,4.55 2.55,3.05 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="3.55,2.05 5.05,2.05 6.05,3.05 6.05,4.55 5.05,5.55 3.55,5.55 2.55,4.55 2.55,3.05 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape index b85fa737..1c37662b 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-horizontal.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric -Qt::Horizontal Parallelogram</name> <icon>parallelogram-horizontal.png</icon> @@ -24,4 +24,4 @@ <svg:polygon style="fill: default" points="1,0 2,0 1,1 0,1 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 2,0 1,1 0,1 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape index d5794080..0f344091 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/parallelogram-vertical.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric -Qt::Vertical Parallelogram</name> <icon>parallelogram-vertical.png</icon> @@ -24,4 +24,4 @@ <svg:polygon style="fill: default" points="0,1 1,0 1,1 0,2 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 1,0 1,1 0,2 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape b/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape index a3941127..89db85e7 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/pentagon.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Pentagon</name> <icon>pentagon.png</icon> @@ -28,4 +28,4 @@ <svg:polygon style="fill: default" points="0,1.5 2,0 4,1.5 3,3.5 1,3.5 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1.5 2,0 4,1.5 3,3.5 1,3.5 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/square.shape b/kivio/kiviopart/stencils/Dia/Assorted/square.shape index e7be1a89..67d58bf4 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/square.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/square.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Perfect Square</name> <icon>square.png</icon> @@ -26,4 +26,4 @@ <svg:rect style="fill: default" x="4.5" y="2.45" width="1.5" height="1.55"/> <svg:rect style="stroke-width: 0.1; stroke: #000000" x="4.5" y="2.45" width="1.5" height="1.55"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star4.shape b/kivio/kiviopart/stencils/Dia/Assorted/star4.shape index 5d66851c..d57432a9 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/star4.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/star4.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Four Point Star</name> <icon>star4.png</icon> @@ -25,4 +25,4 @@ <svg:polygon style="fill: default" points="0,2.5 1.5,2 2,0.5 2.5,2 4,2.5 2.5,3 2,4.5 1.5,3 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,2.5 1.5,2 2,0.5 2.5,2 4,2.5 2.5,3 2,4.5 1.5,3 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star5.shape b/kivio/kiviopart/stencils/Dia/Assorted/star5.shape index 379b74c6..20d55b99 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/star5.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/star5.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Five Point Star</name> <!-- Eventually decided that it was better to get these done than worry about them being perfect --> @@ -50,5 +50,5 @@ <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,4.5 5,4.5 7,0 9,4.5 14,4.5 10,7.5 12,12.5 7,9 2,12.5 4,7.5 "/> </svg:svg> <!-- Alan Horkan was here 2002 --> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star6.shape b/kivio/kiviopart/stencils/Dia/Assorted/star6.shape index 2c2f5cac..bbaf2853 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/star6.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/star6.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Six Point Star</name><!-- aka Star of David --> <icon>star6.png</icon> @@ -56,4 +56,4 @@ <svg:polygon style="fill: default" points="0,1 1,1 1.5,0 2,1 3,1 2.5,2 3,3 2,3 1.5,4 1,3 0,3 0.5,2 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 1,1 1.5,0 2,1 3,1 2.5,2 3,3 2,3 1.5,4 1,3 0,3 0.5,2 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star7.shape b/kivio/kiviopart/stencils/Dia/Assorted/star7.shape index adef753f..cb008f12 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/star7.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/star7.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Seven Point Star</name> <!-- It may not be a perfect Heptagon, but it looks good and it is at least Symmetrical. --> @@ -65,4 +65,4 @@ <svg:polygon style="fill: default" points="5,0 6.5,2 9,2 8.5,4.5 10,6.5 8,7 7.5,9.5 5,8 2.5,9.5 2,7 0,6.5 1.5,4.5 1,2 3.5,2 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="5,0 6.5,2 9,2 8.5,4.5 10,6.5 8,7 7.5,9.5 5,8 2.5,9.5 2,7 0,6.5 1.5,4.5 1,2 3.5,2 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star8.shape b/kivio/kiviopart/stencils/Dia/Assorted/star8.shape index 80664b5f..b67bdb42 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/star8.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/star8.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Eight Point Star</name> <!-- The points all have Nintey Degree Angles --> @@ -74,4 +74,4 @@ <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,3.5 1,2.5 1,1 2.5,1 3.5,0 4.5,1 6,1 6,2.5 7,3.5 6,4.5 6,6 4.5,6 3.5,7 2.5,6 1,6 1,4.5 "/> </svg:svg> <!-- Alan Horkan, 2002, horkana@tcd.ie --> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape b/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape index 1e97b53b..c68e257c 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/star8sharp.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Sharp Eight Point Star</name> <!-- Angles in this Star are much sharper, about Thirty degrees --> @@ -73,5 +73,5 @@ <svg:polygon style="fill: default" points="0,7.5 5,6.5 2.5,2.5 6.5,5 7.5,0 8.5,5 12.5,2.5 10,6.5 15,7.5 10,8.5 12.5,12.5 8.5,10 7.5,15 6.5,10 2.5,12.5 5,8.5 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,7.5 5,6.5 2.5,2.5 6.5,5 7.5,0 8.5,5 12.5,2.5 10,6.5 15,7.5 10,8.5 12.5,12.5 8.5,10 7.5,15 6.5,10 2.5,12.5 5,8.5 "/> </svg:svg> -</tqshape> +</shape> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/sun.shape b/kivio/kiviopart/stencils/Dia/Assorted/sun.shape index b638e315..48ae7b4e 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/sun.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/sun.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Assorted - Sun</name> <icon>sun.png</icon> @@ -94,7 +94,7 @@ <point x="1.25" y="5.5"/> </connections> <aspectratio type="fixed"/> - <!-- I orignally used a nice warm gold colour #ffcc00, but tqshape files + <!-- I orignally used a nice warm gold colour #ffcc00, but shape files have to use default if you want to allow the user to change the fill colour --> <svg:svg> <svg:polygon style="fill: default" points="3.5,0 4,1 3,1 "/> @@ -116,5 +116,5 @@ have to use default if you want to allow the user to change the fill colour --> <svg:polygon style="fill: default" points="2,5.5 1.5,5 1,6 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="2,5.5 1.5,5 1,6 "/> </svg:svg> -</tqshape> +</shape> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/trapezoid.shape b/kivio/kiviopart/stencils/Dia/Assorted/trapezoid.shape index 474317f5..fb971a58 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/trapezoid.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/trapezoid.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Trapezoid</name> <icon>trapezoid.png</icon> @@ -18,4 +18,4 @@ <svg:polygon style="fill: #ffffff" points="1,0 3,0 4,2 0,2 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 3,0 4,2 0,2 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape b/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape index 74245a0c..2708c5c0 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/triangle-isoceles.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Isosceles Triangle</name><!-- Triangle with two sides of equal length --> <icon>triangle-isoceles.png</icon> @@ -20,4 +20,4 @@ <svg:polygon style="fill: default" points="5.5,4 6.5,6 4.5,6 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="5.5,4 6.5,6 4.5,6 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape b/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape index 5d38874a..3d7097ac 100644 --- a/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape +++ b/kivio/kiviopart/stencils/Dia/Assorted/triangle-rightangle.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie --> <name>Geometric - Right Angle Triangle</name> <icon>triangle-rightangle.png</icon> @@ -18,5 +18,5 @@ <svg:polygon style="fill: #ffffff" points="0,2 2,2 0,0 "/> <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,2 2,2 0,0 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Circuit/npn.shape b/kivio/kiviopart/stencils/Dia/Circuit/npn.shape index d57fe166..d0636820 100644 --- a/kivio/kiviopart/stencils/Dia/Circuit/npn.shape +++ b/kivio/kiviopart/stencils/Dia/Circuit/npn.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Circuit - NPN Transistor</name> <!-- @@ -24,5 +24,5 @@ <svg:polyline points="5,4 6,4 5.6154,3.0769" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Circuit/opamp.shape b/kivio/kiviopart/stencils/Dia/Circuit/opamp.shape index 756cf865..f6e83ce1 100644 --- a/kivio/kiviopart/stencils/Dia/Circuit/opamp.shape +++ b/kivio/kiviopart/stencils/Dia/Circuit/opamp.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Circuit - Op Amp</name> <description>An operational amplifier</description> @@ -22,5 +22,5 @@ <svg:line x1="1.2" y1="1" x2="2" y2="1" /> <svg:line x1="4.5" y1="0" x2="5.5" y2="0" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Circuit/pnp.shape b/kivio/kiviopart/stencils/Dia/Circuit/pnp.shape index c89b7832..3e0e59ef 100644 --- a/kivio/kiviopart/stencils/Dia/Circuit/pnp.shape +++ b/kivio/kiviopart/stencils/Dia/Circuit/pnp.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Circuit - PNP Transistor</name> <!-- @@ -24,5 +24,5 @@ <svg:polyline points="4,2 3,2 3.3846,2.9231" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_right.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_right.shape index 66f3b1ba..9032094b 100644 --- a/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_right.shape +++ b/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_right.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Civil - Right Arrow</name> @@ -78,5 +78,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> <svg:polygon style="stroke-width: 1; stroke: foreground" points="0,0.5 1.5,0.5 2,0.5 2,0 3,1 2,2 2,1.5 0,1.5 " /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_up.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_up.shape index 2053db21..b1a15619 100644 --- a/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_up.shape +++ b/kivio/kiviopart/stencils/Dia/Civil/civil_arrow_up.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Civil - Up Arrow</name> @@ -76,5 +76,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> <svg:polygon style="stroke-width: 1; stroke: foreground" points="0.5,3 0.5,1 0,1 1,0 1,0 2,1 1.5,1 1.5,3 " /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_backflow_preventer.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_backflow_preventer.shape index 5abe7185..9168966d 100644 --- a/kivio/kiviopart/stencils/Dia/Civil/civil_backflow_preventer.shape +++ b/kivio/kiviopart/stencils/Dia/Civil/civil_backflow_preventer.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Civil - Backflow Preventer</name> @@ -55,5 +55,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> <svg:line style="stroke-width: 1; stroke: #000000" x1="0.2" y1="0.8" x2="0.8" y2="0.2" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_basin.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_basin.shape index 0d7c4231..ea4d47a9 100644 --- a/kivio/kiviopart/stencils/Dia/Civil/civil_basin.shape +++ b/kivio/kiviopart/stencils/Dia/Civil/civil_basin.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Civil - Basin</name> @@ -74,5 +74,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> <svg:polygon style="stroke-width: 1; stroke: #000000" points="0,0 0.2,0 0.2,2.8 4.8,2.8 4.8,0 5,0 5,3 0,3 " /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_final-settling_basin.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_final-settling_basin.shape index 5add8f35..84a2002f 100644 --- a/kivio/kiviopart/stencils/Dia/Civil/civil_final-settling_basin.shape +++ b/kivio/kiviopart/stencils/Dia/Civil/civil_final-settling_basin.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Civil - Final-Settling Basin</name> @@ -106,5 +106,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> style="stroke-width: 1; stroke: foreground; fill: background" points="0,0 0.3,0 0.3,1.9 1.4,3.7 1.6,3.7 2.7,1.9 2.7,0 3,0 3,2 1.8,4 1.2,4 0,2 " /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_frequency_converter.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_frequency_converter.shape index bdfcb107..ac143720 100644 --- a/kivio/kiviopart/stencils/Dia/Civil/civil_frequency_converter.shape +++ b/kivio/kiviopart/stencils/Dia/Civil/civil_frequency_converter.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Civil - Frequency Converter</name> @@ -57,5 +57,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> <svg:line style="stroke-width: 1; stroke: #000000" x1="0" y1="2" x2="3" y2="0" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_horizontal_valve.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_horizontal_valve.shape index bbe4d3dc..83d94349 100644 --- a/kivio/kiviopart/stencils/Dia/Civil/civil_horizontal_valve.shape +++ b/kivio/kiviopart/stencils/Dia/Civil/civil_horizontal_valve.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Civil -Qt::Horizontal Valve</name> @@ -62,5 +62,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> <svg:polygon style="stroke-width: 1; stroke: foreground" points="0,1 0,0 0.5,0.5 1,0 1,1 0.5,0.5 " /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_motor.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_motor.shape index beec8aa1..270628be 100644 --- a/kivio/kiviopart/stencils/Dia/Civil/civil_motor.shape +++ b/kivio/kiviopart/stencils/Dia/Civil/civil_motor.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Civil - Motor</name> @@ -53,5 +53,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> <svg:polyline style="stroke-width: 1; stroke: #000000" points="0.3,0.7 0.3,0.3 0.5,0.5 0.7,0.3 0.7,0.7 " /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_preliminary_clarification_tank.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_preliminary_clarification_tank.shape index c78f62f0..36c4f89b 100644 --- a/kivio/kiviopart/stencils/Dia/Civil/civil_preliminary_clarification_tank.shape +++ b/kivio/kiviopart/stencils/Dia/Civil/civil_preliminary_clarification_tank.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Civil - Preliminary Clarification Tank</name> @@ -257,5 +257,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> <svg:line style="stroke-width: 0.5; stroke: #000000" x1="3.4" y1="0.4" x2="5.8" y2="0.4" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_rotor.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_rotor.shape index a721ed0e..4f0f98df 100644 --- a/kivio/kiviopart/stencils/Dia/Civil/civil_rotor.shape +++ b/kivio/kiviopart/stencils/Dia/Civil/civil_rotor.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Civil - Rotor</name> @@ -104,5 +104,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> <svg:line style="stroke-width: 1; stroke: #000000" x1="2.20711" y1="0.792893" x2="2.56066" y2="0.43934" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Civil/civil_soil.shape b/kivio/kiviopart/stencils/Dia/Civil/civil_soil.shape index 03f859e5..a658df14 100644 --- a/kivio/kiviopart/stencils/Dia/Civil/civil_soil.shape +++ b/kivio/kiviopart/stencils/Dia/Civil/civil_soil.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Civil - Soil</name> @@ -71,5 +71,5 @@ xmlns:svg="http://www.w3.org/2000/svg"> <svg:line style="stroke-width: 0.8; stroke: foreground" x1="2.36192" y1="0" x2="1.75837" y2="1" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/c_if.shape b/kivio/kiviopart/stencils/Dia/Contact/c_if.shape index 43b9495f..57cdbdb7 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/c_if.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/c_if.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Contact - if</name> <!-- XXX - OBSOLETE --> <description>if</description> @@ -18,6 +18,6 @@ <svg:polyline points="-2,0 -.75,0" /> <svg:polyline points="-1,1 1,0 2,0 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/c_ifnot.shape b/kivio/kiviopart/stencils/Dia/Contact/c_ifnot.shape index 667e75f6..d8ae4d62 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/c_ifnot.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/c_ifnot.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Contact - ifnot</name> <!-- XXX - OBSOLETE --> <description>if not</description> @@ -20,6 +20,6 @@ <svg:line x1="-.5" y1="-2.2" x2=".5" y2="-2.2" svg:style="stroke-width:.05"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/c_lamp.shape b/kivio/kiviopart/stencils/Dia/Contact/c_lamp.shape index 1e3d1042..15cc5257 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/c_lamp.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/c_lamp.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Contact - lamp</name> <!-- XXX OBSOLETE --> <description>lamp</description> @@ -20,6 +20,6 @@ <svg:polyline points="-.707,-.707 .707,.707"/> <svg:polyline points="-.707,.707 .707,-.707"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/c_relay.shape b/kivio/kiviopart/stencils/Dia/Contact/c_relay.shape index 4016df10..f933cf5b 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/c_relay.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/c_relay.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Contact - relay</name> <!-- XXX OBSOLETE --> <description>relay</description> @@ -21,6 +21,6 @@ <svg:rect x="-1" y="-1" width="2" height="2"/> <svg:polyline points="-1,.5 1,-.5"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_ifnot.shape b/kivio/kiviopart/stencils/Dia/Contact/l_ifnot.shape index 1a7fd4e7..a58db432 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/l_ifnot.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/l_ifnot.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>LADDER - ifnot</name> <description>if not</description> @@ -23,4 +23,4 @@ <svg:line x1="-.5" y1="-2.2" x2=".5" y2="-2.2" svg:style="stroke-width:.05"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_out.shape b/kivio/kiviopart/stencils/Dia/Contact/l_out.shape index 124c3069..f595cb6a 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/l_out.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/l_out.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>LADDER - out</name> <description>out</description> @@ -22,6 +22,6 @@ <svg:path d="M .5,.75 C .75,.5 .75,.25 .75,0 C .75,-.25 .75,-.5 .5,-.75" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_outj.shape b/kivio/kiviopart/stencils/Dia/Contact/l_outj.shape index 49060cdf..427fd724 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/l_outj.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/l_outj.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>LADDER - outj</name> <description>out jump</description> @@ -25,6 +25,6 @@ C .25,.5 .5,.5 .5,.25 L .5,-.5"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_outnot.shape b/kivio/kiviopart/stencils/Dia/Contact/l_outnot.shape index 5a360fc5..15c078bd 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/l_outnot.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/l_outnot.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>LADDER - outnot</name> <description>outnot</description> @@ -23,6 +23,6 @@ C .75,-.25 .75,-.5 .5,-.75" /> <svg:polyline points="-.5,.5 .5,-.5"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_outr.shape b/kivio/kiviopart/stencils/Dia/Contact/l_outr.shape index 94761257..830eaae1 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/l_outr.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/l_outr.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>LADDER - outr</name> <description>out reset</description> @@ -28,6 +28,6 @@ <svg:polyline points="-.5,0 0,0" /> <svg:path d="M -.25,0 C 0,.25 0,.25 .5,.5"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_outs.shape b/kivio/kiviopart/stencils/Dia/Contact/l_outs.shape index 2ef92bd0..03cf0f4f 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/l_outs.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/l_outs.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>LADDER - outs</name> <description>out set</description> @@ -28,6 +28,6 @@ C .5,.5 .25,.5 0,.5 C -.25,.5 -.5,.5 -.5,.25"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_sout.shape b/kivio/kiviopart/stencils/Dia/Contact/l_sout.shape index db9a6228..6635c317 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/l_sout.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/l_sout.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>LADDER - sout</name> <description>ps out</description> @@ -28,7 +28,7 @@ <svg:path d="M 1.25,-1.125 C 1.375,-1 1.625,-1 1.75,-1.125"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_soutnot.shape b/kivio/kiviopart/stencils/Dia/Contact/l_soutnot.shape index 5a2f6f18..45fc49a4 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/l_soutnot.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/l_soutnot.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>LADDER - soutnot</name> <description>ps outnot</description> @@ -29,6 +29,6 @@ <svg:path d="M 1.25,-1.125 C 1.375,-1 1.625,-1 1.75,-1.125"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_soutr.shape b/kivio/kiviopart/stencils/Dia/Contact/l_soutr.shape index 8d54e7be..f2c48f8f 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/l_soutr.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/l_soutr.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>LADDER - soutr</name> <description>ps out reset</description> @@ -34,7 +34,7 @@ <svg:path d="M 1.25,-1.125 C 1.375,-1 1.625,-1 1.75,-1.125"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Contact/l_souts.shape b/kivio/kiviopart/stencils/Dia/Contact/l_souts.shape index 0cd35bbb..32520cae 100644 --- a/kivio/kiviopart/stencils/Dia/Contact/l_souts.shape +++ b/kivio/kiviopart/stencils/Dia/Contact/l_souts.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>LADDER - souts</name> <description>ps out set</description> @@ -34,6 +34,6 @@ <svg:path d="M 1.25,-1.125 C 1.375,-1 1.625,-1 1.75,-1.125"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Electric/command.shape b/kivio/kiviopart/stencils/Dia/Electric/command.shape index 7ea6d2b8..b76f2aa9 100644 --- a/kivio/kiviopart/stencils/Dia/Electric/command.shape +++ b/kivio/kiviopart/stencils/Dia/Electric/command.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Electric - command</name> <description>command</description> @@ -18,7 +18,7 @@ <svg:line x1="0" y1=".5" x2="1" y2=".5"/> <svg:rect x=".3" y=".2" width=".4" height=".6" svg:style="fill:background"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Electric/contact_f.shape b/kivio/kiviopart/stencils/Dia/Electric/contact_f.shape index 31057db1..43208f14 100644 --- a/kivio/kiviopart/stencils/Dia/Electric/contact_f.shape +++ b/kivio/kiviopart/stencils/Dia/Electric/contact_f.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Electric - contact_f</name> <description>contact_f</description> @@ -18,6 +18,6 @@ <svg:polyline points="0,.5 .3,.5 .3,.3"/> <svg:polyline points="1,.5 .7,.5 .25,.275"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Electric/contact_o.shape b/kivio/kiviopart/stencils/Dia/Electric/contact_o.shape index ee1b2787..d2bea36d 100644 --- a/kivio/kiviopart/stencils/Dia/Electric/contact_o.shape +++ b/kivio/kiviopart/stencils/Dia/Electric/contact_o.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Electric - contact_o</name> <description>contact_o</description> @@ -17,6 +17,6 @@ <svg:line x1="0" y1=".5" x2=".3" y2=".5"/> <svg:polyline points="1,.5 .7,.5 .3,.7"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Electric/intpos_f.shape b/kivio/kiviopart/stencils/Dia/Electric/intpos_f.shape index 081ae768..87aa6861 100644 --- a/kivio/kiviopart/stencils/Dia/Electric/intpos_f.shape +++ b/kivio/kiviopart/stencils/Dia/Electric/intpos_f.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Electric - intpos_f</name> <description>intpos_f</description> @@ -20,6 +20,6 @@ <svg:polyline points="1,.5 .7,.5 .25,.275"/> <svg:polyline points=".6,.45 .35,.45 .4,.35"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Electric/intpos_o.shape b/kivio/kiviopart/stencils/Dia/Electric/intpos_o.shape index 086de61b..ceb72cb5 100644 --- a/kivio/kiviopart/stencils/Dia/Electric/intpos_o.shape +++ b/kivio/kiviopart/stencils/Dia/Electric/intpos_o.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Electric - intpos_o</name> <description>intpos_o</description> @@ -19,6 +19,6 @@ <svg:polyline points="1,.5 .7,.5 .3,.7"/> <svg:polyline points=".6,.55 .45,.75 .4,.65"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Electric/relay.shape b/kivio/kiviopart/stencils/Dia/Electric/relay.shape index 0a9461fb..0d506ff9 100644 --- a/kivio/kiviopart/stencils/Dia/Electric/relay.shape +++ b/kivio/kiviopart/stencils/Dia/Electric/relay.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Electric - relay</name> <description>relay</description> @@ -19,7 +19,7 @@ <svg:rect x=".3" y=".2" width=".4" height=".6" svg:style="fill:background"/> <svg:line x1=".3" y1=".6" x2=".7" y2=".4"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/MSE/demultiplexer.shape b/kivio/kiviopart/stencils/Dia/MSE/demultiplexer.shape index 4f8d788c..ea8ee9bf 100644 --- a/kivio/kiviopart/stencils/Dia/MSE/demultiplexer.shape +++ b/kivio/kiviopart/stencils/Dia/MSE/demultiplexer.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Demultiplexer</name> <description>Demultiplexer</description> @@ -24,4 +24,4 @@ <svg:line x1="10" y1="5" x2="0" y2="10"/> <svg:line x1="0" y1="0" x2="0" y2="10"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/MSE/large_extension_node.shape b/kivio/kiviopart/stencils/Dia/MSE/large_extension_node.shape index 96f90015..364565ff 100644 --- a/kivio/kiviopart/stencils/Dia/MSE/large_extension_node.shape +++ b/kivio/kiviopart/stencils/Dia/MSE/large_extension_node.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Large Extension Node</name> <description>Large Extension Node</description> @@ -26,5 +26,5 @@ <svg:line x1="1" y1="1" x2="1" y2="5"/> <svg:line x1="7" y1="1" x2="7" y2="5"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/MSE/multiplexer.shape b/kivio/kiviopart/stencils/Dia/MSE/multiplexer.shape index 9483a7df..371eef0d 100644 --- a/kivio/kiviopart/stencils/Dia/MSE/multiplexer.shape +++ b/kivio/kiviopart/stencils/Dia/MSE/multiplexer.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Multiplexer</name> <description>Multiplexer</description> @@ -24,4 +24,4 @@ <svg:line x1="0" y1="5" x2="10" y2="10"/> <svg:line x1="10" y1="0" x2="10" y2="10"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/MSE/node_center.shape b/kivio/kiviopart/stencils/Dia/MSE/node_center.shape index 3f59d4ca..31a84511 100644 --- a/kivio/kiviopart/stencils/Dia/MSE/node_center.shape +++ b/kivio/kiviopart/stencils/Dia/MSE/node_center.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Node Center</name> <description>Node Center</description> @@ -22,4 +22,4 @@ <svg:line x1="5" y1="10" x2="9.330126" y2="2.5"/> <svg:line x1="0.669874" y1="2.5" x2="9.330126" y2="2.5"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/MSE/small_extension_node.shape b/kivio/kiviopart/stencils/Dia/MSE/small_extension_node.shape index 1513e25b..19a8b68e 100644 --- a/kivio/kiviopart/stencils/Dia/MSE/small_extension_node.shape +++ b/kivio/kiviopart/stencils/Dia/MSE/small_extension_node.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Small Extension Node</name> <description>Small Extension Node</description> @@ -21,5 +21,5 @@ <svg:line x1="0" y1="0" x2="0" y2="6"/> <svg:line x1="8" y1="0" x2="8" y2="6"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/MSE/tacsat.shape b/kivio/kiviopart/stencils/Dia/MSE/tacsat.shape index 411bd80a..2964a28b 100644 --- a/kivio/kiviopart/stencils/Dia/MSE/tacsat.shape +++ b/kivio/kiviopart/stencils/Dia/MSE/tacsat.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Tactical Satellite Communications Terminal</name> <description>Tactical Satellite Communications Terminal</description> @@ -24,4 +24,4 @@ <svg:path d="M 3,0 C 0.5,2.5 8.5,10.5 11,8"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/dat_external.shape b/kivio/kiviopart/stencils/Dia/Network/dat_external.shape index c768f038..39d6a058 100644 --- a/kivio/kiviopart/stencils/Dia/Network/dat_external.shape +++ b/kivio/kiviopart/stencils/Dia/Network/dat_external.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - An external DAT drive</name> <icon>dat_external.xpm</icon> @@ -33,4 +33,4 @@ <svg:line style="stroke-width: 0.1; stroke: #000000" x1="13.5" y1="6" x2="1.5" y2="6"/> <svg:line style="stroke-width: 0.1; stroke: #000000" x1="1.5" y1="6.5" x2="13.5" y2="6.5"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/digitizing_board.shape b/kivio/kiviopart/stencils/Dia/Network/digitizing_board.shape index 7b2b8e22..0b7f7ded 100644 --- a/kivio/kiviopart/stencils/Dia/Network/digitizing_board.shape +++ b/kivio/kiviopart/stencils/Dia/Network/digitizing_board.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - Digitizing Board</name> <icon>digitizing_board.png</icon> <connections> @@ -30,4 +30,4 @@ <svg:rect style="fill: #4c4c4c" x="10" y="9" width="3" height="0.5"/> <svg:rect style="stroke-width: 0.1; stroke: foreground" x="10" y="9" width="3" height="0.5"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/diskette.shape b/kivio/kiviopart/stencils/Dia/Network/diskette.shape index 280da134..904760e0 100644 --- a/kivio/kiviopart/stencils/Dia/Network/diskette.shape +++ b/kivio/kiviopart/stencils/Dia/Network/diskette.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - A Diskette</name> <icon>diskette.xpm</icon> @@ -35,4 +35,4 @@ <svg:line style="stroke-width: 0.1; stroke: #000000" x1="3" y1="6" x2="13" y2="6"/> <svg:line style="stroke-width: 0.1; stroke: #000000" x1="13" y1="8" x2="3" y2="8"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/firewall.shape b/kivio/kiviopart/stencils/Dia/Network/firewall.shape index 53734fbc..ea128a59 100644 --- a/kivio/kiviopart/stencils/Dia/Network/firewall.shape +++ b/kivio/kiviopart/stencils/Dia/Network/firewall.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - Firewall</name> <icon>firewall.xpm</icon> @@ -78,4 +78,4 @@ <svg:polyline style="stroke:foreground; stroke-width:.5" points="0,0 .125,-.125 1.125,-.125,1.125,1.875 1,2 0,2 0,0"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/hub.shape b/kivio/kiviopart/stencils/Dia/Network/hub.shape index b2faadbb..62c624f1 100644 --- a/kivio/kiviopart/stencils/Dia/Network/hub.shape +++ b/kivio/kiviopart/stencils/Dia/Network/hub.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - Hub</name> <icon>hub.xpm</icon> @@ -37,5 +37,5 @@ <svg:rect style="stroke:none; fill:foreground" x="4" y=".75" width=".25" height=".24"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/mobile_phone.shape b/kivio/kiviopart/stencils/Dia/Network/mobile_phone.shape index 431c5efd..ba006a8f 100644 --- a/kivio/kiviopart/stencils/Dia/Network/mobile_phone.shape +++ b/kivio/kiviopart/stencils/Dia/Network/mobile_phone.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - A Mobile Phone</name> <icon>mobile_phone.xpm</icon> @@ -59,4 +59,4 @@ <svg:rect style="fill: #d0f4e5" x="5.5" y="11.5" width="2" height="2"/> <svg:rect style="stroke-width: 0.1; stroke: #000000" x="5.5" y="11.5" width="2" height="2"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/monitor.shape b/kivio/kiviopart/stencils/Dia/Network/monitor.shape index fcc21c3a..66fc1734 100644 --- a/kivio/kiviopart/stencils/Dia/Network/monitor.shape +++ b/kivio/kiviopart/stencils/Dia/Network/monitor.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - A Workstation Monitor</name> <icon>monitor.xpm</icon> @@ -28,4 +28,4 @@ <svg:rect style="fill: #d9d9cd" x="3" y="17" width="12" height="1"/> <svg:rect style="stroke-width: 0.1; stroke: #000000" x="3" y="17" width="12" height="1"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/pc_bigtower.shape b/kivio/kiviopart/stencils/Dia/Network/pc_bigtower.shape index 2b2025ea..639f4b7a 100644 --- a/kivio/kiviopart/stencils/Dia/Network/pc_bigtower.shape +++ b/kivio/kiviopart/stencils/Dia/Network/pc_bigtower.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - A Bigtower PC</name> <icon>pc_bigtower.xpm</icon> @@ -63,4 +63,4 @@ <svg:line style="stroke-width: 0.1; stroke: #000000" x1="2.5" y1="23.5" x2="11.5" y2="23.5"/> <svg:line style="stroke-width: 0.1; stroke: #000000" x1="11.5" y1="23" x2="2.5" y2="23"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/pc_desktop.shape b/kivio/kiviopart/stencils/Dia/Network/pc_desktop.shape index 7a3c7455..5847b063 100644 --- a/kivio/kiviopart/stencils/Dia/Network/pc_desktop.shape +++ b/kivio/kiviopart/stencils/Dia/Network/pc_desktop.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - A Desktop PC</name> <icon>pc_desktop.xpm</icon> @@ -49,4 +49,4 @@ <svg:line style="stroke-width: 0.1; stroke: #000000" x1="11.5" y1="5.5" x2="11.5" y2="5"/> <svg:line style="stroke-width: 0.1; stroke: #000000" x1="11.5" y1="1.5" x2="11.5" y2="1"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/pc_miditower.shape b/kivio/kiviopart/stencils/Dia/Network/pc_miditower.shape index 409c6e12..daed926e 100644 --- a/kivio/kiviopart/stencils/Dia/Network/pc_miditower.shape +++ b/kivio/kiviopart/stencils/Dia/Network/pc_miditower.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - A Midi-tower PC</name> <icon>pc_miditower.xpm</icon> @@ -54,4 +54,4 @@ <svg:line style="stroke-width: 0.1; stroke: #000000" x1="2.5" y1="17" x2="11.5" y2="17"/> <svg:line style="stroke-width: 0.1; stroke: #000000" x1="11.5" y1="16.5" x2="2.5" y2="16.5"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/pc_minitower.shape b/kivio/kiviopart/stencils/Dia/Network/pc_minitower.shape index 6b33ec5f..683e4ee1 100644 --- a/kivio/kiviopart/stencils/Dia/Network/pc_minitower.shape +++ b/kivio/kiviopart/stencils/Dia/Network/pc_minitower.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - A Minitower PC</name> <icon>pc_minitower.xpm</icon> @@ -52,4 +52,4 @@ <svg:line style="stroke-width: 0.1; stroke: #000000" x1="2" y1="8" x2="2.5" y2="8"/> <svg:line style="stroke-width: 0.1; stroke: #000000" x1="6" y1="8" x2="6.5" y2="8"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/plotter.shape b/kivio/kiviopart/stencils/Dia/Network/plotter.shape index 3c0cc737..ed64d2eb 100644 --- a/kivio/kiviopart/stencils/Dia/Network/plotter.shape +++ b/kivio/kiviopart/stencils/Dia/Network/plotter.shape @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" xmlns:svg="http://www.w3.org/2000/svg"> +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - Plotter</name> <icon>plotter.png</icon> <connections> @@ -41,4 +41,4 @@ <svg:polyline style="stroke-width: 0.1; stroke: foreground" points="12.5,10.5 12.5,7.5 13.5,7.5 13.5,10.5 "/> <svg:polyline style="stroke-width: 0.1; stroke: foreground" points="14,10.5 14,7.5 15,7.5 15,10.5 "/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/workstation.shape b/kivio/kiviopart/stencils/Dia/Network/workstation.shape index 19003b8e..109a0651 100644 --- a/kivio/kiviopart/stencils/Dia/Network/workstation.shape +++ b/kivio/kiviopart/stencils/Dia/Network/workstation.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - A Workstation</name> <icon>workstation.xpm</icon> @@ -56,4 +56,4 @@ <svg:rect style="fill: #cdcdcd" x="5" y="2" width="9" height="1"/> <svg:rect style="stroke-width: 0.1; stroke: #000000" x="5" y="2" width="9" height="1"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Network/zip-disk.shape b/kivio/kiviopart/stencils/Dia/Network/zip-disk.shape index e317f3e1..c071d1ca 100644 --- a/kivio/kiviopart/stencils/Dia/Network/zip-disk.shape +++ b/kivio/kiviopart/stencils/Dia/Network/zip-disk.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Network - A ZIP Disk</name> <icon>zip-disk.xpm</icon> @@ -46,4 +46,4 @@ <svg:line style="stroke-width: 0.1; stroke: #000000" x1="2" y1="4.375" x2="2" y2="9.875"/> <svg:line style="stroke-width: 0.1; stroke: #000000" x1="7.75" y1="4.375" x2="7.75" y2="9.85"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Pneumatic/dejack.shape b/kivio/kiviopart/stencils/Dia/Pneumatic/dejack.shape index fe6bc807..25a05e72 100644 --- a/kivio/kiviopart/stencils/Dia/Pneumatic/dejack.shape +++ b/kivio/kiviopart/stencils/Dia/Pneumatic/dejack.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Pneum - DEJack</name> <description>dejack</description> @@ -25,6 +25,6 @@ <svg:rect x=".4" y=".2" width="2.6" height=".8" svg:style="stroke-width: 1.0"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Pneumatic/dist32.shape b/kivio/kiviopart/stencils/Dia/Pneumatic/dist32.shape index 0f484add..f0fd67e2 100644 --- a/kivio/kiviopart/stencils/Dia/Pneumatic/dist32.shape +++ b/kivio/kiviopart/stencils/Dia/Pneumatic/dist32.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Pneum - dist32</name> <description>dist32</description> @@ -34,6 +34,6 @@ <svg:polygon points="1.8,.8 1.8,1 1.6,.9" svg:style="stroke:none; fill:foreground"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Pneumatic/dist42.shape b/kivio/kiviopart/stencils/Dia/Pneumatic/dist42.shape index 04e644eb..b2f38fc7 100644 --- a/kivio/kiviopart/stencils/Dia/Pneumatic/dist42.shape +++ b/kivio/kiviopart/stencils/Dia/Pneumatic/dist42.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Pneum - dist42</name> <description>dist42</description> @@ -35,6 +35,6 @@ <svg:polygon points="1.8,0 1.8,.2 1.6,.1" svg:style="stroke:none; fill:foreground"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Pneumatic/dist52.shape b/kivio/kiviopart/stencils/Dia/Pneumatic/dist52.shape index 021db07e..c1902669 100644 --- a/kivio/kiviopart/stencils/Dia/Pneumatic/dist52.shape +++ b/kivio/kiviopart/stencils/Dia/Pneumatic/dist52.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- -*- xml -*- --> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Pneum - dist52</name> <description>dist52</description> @@ -44,6 +44,6 @@ <svg:polygon points=".750,1 .830,.80 .650,.84" svg:style="stroke:none; fill:foreground"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/SDL/block.shape b/kivio/kiviopart/stencils/Dia/SDL/block.shape index c697400d..4e18f2f5 100644 --- a/kivio/kiviopart/stencils/Dia/SDL/block.shape +++ b/kivio/kiviopart/stencils/Dia/SDL/block.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>SDL - Block</name> <description>Block Type Reference</description> @@ -16,4 +16,4 @@ <svg:polygon points="0,0 2.5,0 2.5,2 0,2" style="fill: default" /> <svg:polygon points="0.15,0.15 2.35,0.15 2.35,1.85 0.15,1.85" style="fill: default" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/SDL/decision.shape b/kivio/kiviopart/stencils/Dia/SDL/decision.shape index 6cb1fba7..2c2ce44f 100644 --- a/kivio/kiviopart/stencils/Dia/SDL/decision.shape +++ b/kivio/kiviopart/stencils/Dia/SDL/decision.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>SDL - Decision</name> <description>Decision</description> @@ -15,4 +15,4 @@ <svg:svg width="2.5" height="2.5"> <svg:polygon points="1.25,0 2.5,1.25 1.25,2.5 0,1.25" style="fill: default" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/SDL/process.shape b/kivio/kiviopart/stencils/Dia/SDL/process.shape index 95028b58..0a8512f5 100644 --- a/kivio/kiviopart/stencils/Dia/SDL/process.shape +++ b/kivio/kiviopart/stencils/Dia/SDL/process.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>SDL - Process</name> <description>Process Type Reference</description> @@ -16,4 +16,4 @@ <svg:polygon points="0.3,0 2.2,0 2.5,0.3 2.5,1.7 2.2,2 0.3,2 0,1.7 0,0.3" style="fill: default" /> <svg:polygon points="0.3,0.15 2.2,0.15 2.35,0.3 2.35,1.7 2.2,1.85 0.3,1.85 0.15,1.7 0.15,0.3" style="fill: default" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/SDL/service.shape b/kivio/kiviopart/stencils/Dia/SDL/service.shape index fd4936e7..3223741f 100644 --- a/kivio/kiviopart/stencils/Dia/SDL/service.shape +++ b/kivio/kiviopart/stencils/Dia/SDL/service.shape @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>SDL - Service</name> <description>Service Type Reference</description> @@ -17,4 +17,4 @@ h -0.25 c -0.75,-0.4 -1.125,-0.6 -1.125,-1 c 0,-0.4 0.25,-0.6 1.125,-1 z" style="fill: default"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Sybase/client.shape b/kivio/kiviopart/stencils/Dia/Sybase/client.shape index 81ff9f03..4d3f913f 100644 --- a/kivio/kiviopart/stencils/Dia/Sybase/client.shape +++ b/kivio/kiviopart/stencils/Dia/Sybase/client.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Sybase - Client Application</name> <icon>client.xpm</icon> @@ -21,5 +21,5 @@ <svg:path style="stroke:foreground; stroke-width: 0.5" d="M1.2,.8 L1.2,1.2 L1.6,1 L1.2,.8"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Sybase/dataserver.shape b/kivio/kiviopart/stencils/Dia/Sybase/dataserver.shape index 85340990..49cce15d 100644 --- a/kivio/kiviopart/stencils/Dia/Sybase/dataserver.shape +++ b/kivio/kiviopart/stencils/Dia/Sybase/dataserver.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Sybase - Dataserver</name> <icon>dataserver.xpm</icon> @@ -19,7 +19,7 @@ M 0.0706,0.66667 L 1.5,0.66667 M 0,1 L 1.5,1 M 0.0706,1.33333 L 1.5,1.33333 M 0.24,1.66667 L 1.5,1.66667" /> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Sybase/ltm.shape b/kivio/kiviopart/stencils/Dia/Sybase/ltm.shape index 508b64bf..1df9b7fc 100644 --- a/kivio/kiviopart/stencils/Dia/Sybase/ltm.shape +++ b/kivio/kiviopart/stencils/Dia/Sybase/ltm.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Sybase - Log Transfer Manager/Rep Agent</name> <icon>ltm.xpm</icon> @@ -28,4 +28,4 @@ d="M 1.4,1 L 1.8,1"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Dia/Sybase/repserver.shape b/kivio/kiviopart/stencils/Dia/Sybase/repserver.shape index bef14946..946603b1 100644 --- a/kivio/kiviopart/stencils/Dia/Sybase/repserver.shape +++ b/kivio/kiviopart/stencils/Dia/Sybase/repserver.shape @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<tqshape xmlns="http://www.daa.com.au/~james/dia-tqshape-ns" +<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg"> <name>Sybase - Replication Server</name> <icon>repserver.xpm</icon> @@ -26,6 +26,6 @@ points="1,1 .7,.85 .7,1.15"/> <svg:circle style="stroke:none; fill:foreground" cx="1" cy="1" r=".5"/> </svg:svg> -</tqshape> +</shape> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Card.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Card.sml index 707882e9..704e66b0 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Card.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Card.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Card"/> <Id data="Card"/> - <Description data="Basic flowcharting card tqshape"/> + <Description data="Basic flowcharting card shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Data.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Data.sml index a052fc1c..2fa28f24 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Data.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Data.sml @@ -4,7 +4,7 @@ <Author data="Dave Marotti"/> <Title data="Data"/> <Id data="Data"/> - <Description data="Data tqshape for flowcharting"/> + <Description data="Data shape for flowcharting"/> <Version data="1.0"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Decision.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Decision.sml index 2e83ee8e..e069d4ac 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Decision.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Decision.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Decision"/> <Id data="Decision"/> - <Description data="Basic flowcharting decision tqshape"/> + <Description data="Basic flowcharting decision shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/DirectData.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/DirectData.sml index df9d3a5f..21661b74 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/DirectData.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/DirectData.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Direct Data"/> <Id data="Direct Data"/> - <Description data="Basic flowcharting direct data tqshape"/> + <Description data="Basic flowcharting direct data shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Display.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Display.sml index 9634593e..f07580d2 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Display.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Display.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Display"/> <Id data="Display"/> - <Description data="Basic flowcharting display tqshape"/> + <Description data="Basic flowcharting display shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/InternalStorage.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/InternalStorage.sml index d4051189..3a7a50ae 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/InternalStorage.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/InternalStorage.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Internal Storage"/> <Id data="Internal Storage"/> - <Description data="Internal storage tqshape"/> + <Description data="Internal storage shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/LoopLimit.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/LoopLimit.sml index b409c57a..199072a6 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/LoopLimit.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/LoopLimit.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Loop Limit"/> <Id data="Loop Limit"/> - <Description data="Basic flowcharting loop limit tqshape"/> + <Description data="Basic flowcharting loop limit shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualInput.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualInput.sml index 17691486..d6104506 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualInput.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualInput.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Manual Input"/> <Id data="Manual Input"/> - <Description data="Basic flowcharting manual input tqshape"/> + <Description data="Basic flowcharting manual input shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualOperation.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualOperation.sml index 2536f822..bc452400 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualOperation.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/ManualOperation.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Manual Operation"/> <Id data="Manual Operation"/> - <Description data="Basic flowcharting manual operation tqshape"/> + <Description data="Basic flowcharting manual operation shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PredefinedProcess.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PredefinedProcess.sml index e1f80367..452e048a 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PredefinedProcess.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PredefinedProcess.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Predefined Process"/> <Id data="Predefined Process"/> - <Description data="Predefined process tqshape"/> + <Description data="Predefined process shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Preperation.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Preperation.sml index b935d273..f79d2a51 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Preperation.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Preperation.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Preparation"/> <Id data="Preperation"/> - <Description data="Basic flowcharting preparation tqshape"/> + <Description data="Basic flowcharting preparation shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Process.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Process.sml index 60a00732..94d129ac 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Process.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Process.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Process"/> <Id data="Process"/> - <Description data="Basic flowcharting process tqshape"/> + <Description data="Basic flowcharting process shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PyStencil.spy b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PyStencil.spy index aa11f970..fc01b542 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PyStencil.spy +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/PyStencil.spy @@ -4,7 +4,7 @@ <Author data="Dmitry Poplavsky"/> <Title data="Python"/> <Id data="Python"/> - <Description data="Basic flowcharting card tqshape"/> + <Description data="Basic flowcharting card shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="dima@kde.org"/> @@ -40,7 +40,7 @@ connector_targets = [ { "x":x+2, "y":y-2 }, ] -tqshapes = { +shapes = { "rect" :{ "type" : "Rectangle", "fillstyle" : "solid", @@ -96,12 +96,12 @@ connector_targets = [ { "x":x+2, "y":y-2 }, { "x":(x+x2)/2, "y":y } ] -tqshapes["rect2"]["x"] = x+w-35 -tqshapes["rect2"]["y"] = y+h-35 -tqshapes["rect2"]["w"] = 20 -tqshapes["rect2"]["h"] = 20 +shapes["rect2"]["x"] = x+w-35 +shapes["rect2"]["y"] = y+h-35 +shapes["rect2"]["w"] = 20 +shapes["rect2"]["h"] = 20 -if ( tqshapes["text"]["text"] == "1" ): +if ( shapes["text"]["text"] == "1" ): stencil = curLayer().firstStencil() stencil.setText( "x:"+str(x)+" y:"+str(y) ) diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/StoredData.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/StoredData.sml index 98ba2016..6a727990 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/StoredData.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/StoredData.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Stored Data"/> <Id data="Stored Data"/> - <Description data="Basic flowcharting stored data tqshape"/> + <Description data="Basic flowcharting stored data shape"/> <Version data="0.1"/> <Web data="www.thekompany.com"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Terminator.sml b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Terminator.sml index a998b6ca..769d1f5d 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Terminator.sml +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Terminator.sml @@ -4,7 +4,7 @@ <Author data="Landshark"/> <Title data="Terminator"/> <Id data="Terminator"/> - <Description data="Terminator tqshape"/> + <Description data="Terminator shape"/> <Version data="0.1"/> <Web data="kivio.sourceforge.net"/> <Email data="lndshark@speakeasy.net"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/Extended/Data_Store.sml b/kivio/kiviopart/stencils/Flowcharting/Extended/Data_Store.sml index 445fef79..c96361ce 100644 --- a/kivio/kiviopart/stencils/Flowcharting/Extended/Data_Store.sml +++ b/kivio/kiviopart/stencils/Flowcharting/Extended/Data_Store.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Data Store"/> <Id data="Data Store"/> - <Description data="Data Store tqshape"/> + <Description data="Data Store shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/Extended/Database.sml b/kivio/kiviopart/stencils/Flowcharting/Extended/Database.sml index 622b0205..b1d1a835 100644 --- a/kivio/kiviopart/stencils/Flowcharting/Extended/Database.sml +++ b/kivio/kiviopart/stencils/Flowcharting/Extended/Database.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Database"/> <Id data="database"/> - <Description data="Database tqshape"/> + <Description data="Database shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/Extended/Process.sml b/kivio/kiviopart/stencils/Flowcharting/Extended/Process.sml index fa1824de..57229b1a 100644 --- a/kivio/kiviopart/stencils/Flowcharting/Extended/Process.sml +++ b/kivio/kiviopart/stencils/Flowcharting/Extended/Process.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Process"/> <Id data="Process"/> - <Description data="Process tqshape"/> + <Description data="Process shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Flowcharting/Extended/Source_or_Sink.sml b/kivio/kiviopart/stencils/Flowcharting/Extended/Source_or_Sink.sml index e3f53b8f..c68f8a79 100644 --- a/kivio/kiviopart/stencils/Flowcharting/Extended/Source_or_Sink.sml +++ b/kivio/kiviopart/stencils/Flowcharting/Extended/Source_or_Sink.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Source or Sink"/> <Id data="Source or Sink"/> - <Description data="Source or Sink tqshape"/> + <Description data="Source or Sink shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Hardware/Computer/3FloppyDisk.sml b/kivio/kiviopart/stencils/Hardware/Computer/3FloppyDisk.sml index b3ecbefc..34c0b640 100644 --- a/kivio/kiviopart/stencils/Hardware/Computer/3FloppyDisk.sml +++ b/kivio/kiviopart/stencils/Hardware/Computer/3FloppyDisk.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Floppy Disk"/> <Id data="Floppy Disk"/> - <Description data="Floppy Disk tqshape"/> + <Description data="Floppy Disk shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Hardware/Miscellaneous/key.sml b/kivio/kiviopart/stencils/Hardware/Miscellaneous/key.sml index aa34fe08..a03ce9cb 100644 --- a/kivio/kiviopart/stencils/Hardware/Miscellaneous/key.sml +++ b/kivio/kiviopart/stencils/Hardware/Miscellaneous/key.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Key"/> <Id data="Key"/> - <Description data="Key tqshape"/> + <Description data="Key shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Arrow.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Arrow.sml index a9013398..6470beb0 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Arrow.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Arrow.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Arrow"/> <Id data="Arrow"/> - <Description data="Arrow tqshape"/> + <Description data="Arrow shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_1.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_1.sml index 72a5cfd3..909e814c 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_1.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_1.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Multiple Arrow 1"/> <Id data="Multiple arrow 1"/> - <Description data="Multiple Arrow tqshape 1"/> + <Description data="Multiple Arrow shape 1"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_2.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_2.sml index 296f55fb..16599b33 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_2.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_2.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Multiple Arrow 2"/> <Id data="Multiple arrow 2"/> - <Description data="Multiple Arrow tqshape 2"/> + <Description data="Multiple Arrow shape 2"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_3.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_3.sml index 13fe1905..b0243201 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_3.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Multiple_Arrow_3.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Multiple Arrow 3"/> <Id data="Multiple arrow 3"/> - <Description data="Multiple Arrow tqshape 3"/> + <Description data="Multiple Arrow shape 3"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Sun_Arrow.sml b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Sun_Arrow.sml index 07bdf483..7cfdc307 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/Arrows/Sun_Arrow.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/Arrows/Sun_Arrow.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Sun Arrow"/> <Id data="Sun arrow"/> - <Description data="Sun Arrow tqshape"/> + <Description data="Sun Arrow shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/Buildings/Factory.sml b/kivio/kiviopart/stencils/Miscellaneous/Buildings/Factory.sml index 7d8390db..8ff9b029 100755 --- a/kivio/kiviopart/stencils/Miscellaneous/Buildings/Factory.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/Buildings/Factory.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Factory"/> <Id data="Factory"/> - <Description data="Factory tqshape"/> + <Description data="Factory shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/Buildings/House.sml b/kivio/kiviopart/stencils/Miscellaneous/Buildings/House.sml index 9e1193cf..95075972 100755 --- a/kivio/kiviopart/stencils/Miscellaneous/Buildings/House.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/Buildings/House.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="House"/> <Id data="House"/> - <Description data="House tqshape"/> + <Description data="House shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/attribute.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/attribute.sml index af310f33..88e06fdb 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/ER/attribute.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/ER/attribute.sml @@ -3,7 +3,7 @@ <Title data="Attribute"/> <Id data="ER-Attribute"/> <Version data="1.0"/> - <Description data="Attribute tqshape used in ER diagrams"/> + <Description data="Attribute shape used in ER diagrams"/> <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/> <Author data="Peter Simonsson"/> <Email data="psn@linux.se"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/derivedattribute.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/derivedattribute.sml index 5c2e4f74..8c325c32 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/ER/derivedattribute.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/ER/derivedattribute.sml @@ -3,7 +3,7 @@ <Title data="Derived Attribute"/> <Id data="ER-DerivedAttribute"/> <Version data="1.0"/> - <Description data="Derived Attribute tqshape used in ER diagrams"/> + <Description data="Derived Attribute shape used in ER diagrams"/> <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/> <Author data="Peter Simonsson"/> <Email data="psn@linux.se"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/entity.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/entity.sml index 2b22e32a..6eaed85a 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/ER/entity.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/ER/entity.sml @@ -4,7 +4,7 @@ <Title data="Entity"/> <Id data="ER-Entity"/> <Version data="1.0"/> - <Description data="Entity tqshape used in ER diagrams"/> + <Description data="Entity shape used in ER diagrams"/> <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/> <Author data="Peter Simonsson"/> <Email data="psn@linux.se"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/multivaluedattribute.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/multivaluedattribute.sml index 56329cf1..baef5b76 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/ER/multivaluedattribute.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/ER/multivaluedattribute.sml @@ -3,7 +3,7 @@ <Title data="Multivalued Attribute"/> <Id data="ER-MultivaluedAttribute"/> <Version data="1.0"/> - <Description data="Multivalued Attribute tqshape used in ER diagrams"/> + <Description data="Multivalued Attribute shape used in ER diagrams"/> <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/> <Author data="Peter Simonsson"/> <Email data="psn@linux.se"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/relationship.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/relationship.sml index dbcad720..bd6c93ea 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/ER/relationship.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/ER/relationship.sml @@ -4,7 +4,7 @@ <Title data="Relationship"/> <Id data="ER-Relationship"/> <Version data="1.0"/> - <Description data="Relationship tqshape used in ER diagrams"/> + <Description data="Relationship shape used in ER diagrams"/> <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/> <Author data="Peter Simonsson"/> <Email data="psn@linux.se"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/weakentity.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/weakentity.sml index 02547ca0..b81da1e9 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/ER/weakentity.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/ER/weakentity.sml @@ -4,7 +4,7 @@ <Title data="Weak Entity"/> <Id data="ER-WeakEntity"/> <Version data="1.0"/> - <Description data="Weak Entity tqshape used in ER diagrams"/> + <Description data="Weak Entity shape used in ER diagrams"/> <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/> <Author data="Peter Simonsson"/> <Email data="psn@linux.se"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/ER/weakrelationship.sml b/kivio/kiviopart/stencils/Miscellaneous/ER/weakrelationship.sml index 1e30e26d..ac102000 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/ER/weakrelationship.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/ER/weakrelationship.sml @@ -4,7 +4,7 @@ <Title data="Relationship"/> <Id data="ER-Relationship"/> <Version data="1.0"/> - <Description data="Relationship tqshape used in ER diagrams"/> + <Description data="Relationship shape used in ER diagrams"/> <Copyright data="Copyright (C) 2005 Peter Simonsson. Distributed under the BSD license."/> <Author data="Peter Simonsson"/> <Email data="psn@linux.se"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Bad.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Bad.sml index 27c487ea..eb1650e7 100755 --- a/kivio/kiviopart/stencils/Miscellaneous/People/Bad.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/People/Bad.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Bad"/> <Id data="Bad"/> - <Description data="Bad tqshape"/> + <Description data="Bad shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Good.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Good.sml index 88ff54e8..8cb5b46d 100755 --- a/kivio/kiviopart/stencils/Miscellaneous/People/Good.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/People/Good.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Good"/> <Id data="Good"/> - <Description data="Good tqshape"/> + <Description data="Good shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Man.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Man.sml index 0656c2a7..13c5b46c 100755 --- a/kivio/kiviopart/stencils/Miscellaneous/People/Man.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/People/Man.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Man"/> <Id data="Man"/> - <Description data="Man tqshape"/> + <Description data="Man shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Woman.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Woman.sml index 9f903a1f..e1c4aabc 100755 --- a/kivio/kiviopart/stencils/Miscellaneous/People/Woman.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/People/Woman.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Woman"/> <Id data="Woman"/> - <Description data="Woman tqshape"/> + <Description data="Woman shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/People/Woman_Shape.sml b/kivio/kiviopart/stencils/Miscellaneous/People/Woman_Shape.sml index 6bd7f849..36e87464 100755 --- a/kivio/kiviopart/stencils/Miscellaneous/People/Woman_Shape.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/People/Woman_Shape.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Woman Shape"/> <Id data="Woman Shape"/> - <Description data="Woman tqshape"/> + <Description data="Woman shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/stencils/Miscellaneous/Transport/Truck.sml b/kivio/kiviopart/stencils/Miscellaneous/Transport/Truck.sml index d8e01658..f7f6d666 100644 --- a/kivio/kiviopart/stencils/Miscellaneous/Transport/Truck.sml +++ b/kivio/kiviopart/stencils/Miscellaneous/Transport/Truck.sml @@ -4,7 +4,7 @@ <Author data="Kristof Borrey"/> <Title data="Truck"/> <Id data="Truck"/> - <Description data="Truck tqshape"/> + <Description data="Truck shape"/> <Version data="0.1"/> <Web data="www.koffice.org"/> <Email data="borrey@kde.org"/> diff --git a/kivio/kiviopart/ui/aligndialog.ui b/kivio/kiviopart/ui/aligndialog.ui index 27f8c3b3..1b1b607d 100644 --- a/kivio/kiviopart/ui/aligndialog.ui +++ b/kivio/kiviopart/ui/aligndialog.ui @@ -97,7 +97,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -158,7 +158,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -175,7 +175,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -200,7 +200,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -243,7 +243,7 @@ <property name="pixmap"> <pixmap>image3</pixmap> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -280,7 +280,7 @@ <property name="pixmap"> <pixmap>image5</pixmap> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignBottom|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -317,7 +317,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp index 8969ea82..30cf7f1f 100644 --- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp +++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp @@ -151,7 +151,7 @@ void KivioBirdEyePanel::updateView() KivioScreenPainter kpainter; kpainter.start(TQT_TQPAINTDEVICE(m_buffer)); - kpainter.painter()->fillRect(rect, KApplication::tqpalette().active().brush(TQColorGroup::Mid)); + kpainter.painter()->fillRect(rect, KApplication::palette().active().brush(TQColorGroup::Mid)); kpainter.painter()->fillRect(px0, py0, pw, ph, white); diff --git a/kivio/kiviopart/ui/kivio_layer_panel.cpp b/kivio/kiviopart/ui/kivio_layer_panel.cpp index fadba0e3..8070cca5 100644 --- a/kivio/kiviopart/ui/kivio_layer_panel.cpp +++ b/kivio/kiviopart/ui/kivio_layer_panel.cpp @@ -27,7 +27,7 @@ #include "layerlisttooltip.h" #include <tqheader.h> -#include <tqlayout.h> +#include <layout.h> #include <ktoolbar.h> #include <klocale.h> @@ -118,7 +118,7 @@ void KivioLayerPanel::addItem() // Set the layer name to something a bit different. This isn't // guaranteed to be unique, but it's better than "Untitled" - layer->setName(i18n("Layer %1").tqarg(id)); + layer->setName(i18n("Layer %1").arg(id)); page->addLayer(layer); page->setCurLayer(layer); diff --git a/kivio/kiviopart/ui/kivio_protection_panel_base.ui b/kivio/kiviopart/ui/kivio_protection_panel_base.ui index 55fe9888..e1774900 100644 --- a/kivio/kiviopart/ui/kivio_protection_panel_base.ui +++ b/kivio/kiviopart/ui/kivio_protection_panel_base.ui @@ -12,13 +12,13 @@ <height>147</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -107,7 +107,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>281</height> diff --git a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp index 11c2cc28..d6ef9318 100644 --- a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp +++ b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp @@ -24,7 +24,7 @@ #include <tqiconview.h> #include <tqgroupbox.h> #include <tqpushbutton.h> -#include <tqtextbrowser.h> +#include <textbrowser.h> #include <tqsplitter.h> #include <kstandarddirs.h> diff --git a/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp b/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp index 9237333e..d3a9a8d6 100644 --- a/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp +++ b/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp @@ -21,7 +21,7 @@ #include <tqlabel.h> #include <tqgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqbitmap.h> #include <tqpixmap.h> #include <tqpainter.h> diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp index 23900894..4bd6fd62 100644 --- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp +++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp @@ -45,7 +45,7 @@ #include <tqcombobox.h> #include <tqcheckbox.h> #include <tqradiobutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtabwidget.h> // GuidesListViewItem::GuidesListViewItem(TQListView* parent, KivioGuideLineData *gd, KoUnit::Unit u) @@ -111,23 +111,23 @@ void KivioOptionsDialog::initPage() m_unitCombo->insertStringList(KoUnit::listOfUnitName()); m_unitCombo->setCurrentItem(unit); unitLbl->setBuddy(m_unitCombo); - TQLabel* layoutLbl = new TQLabel(i18n("Default tqlayout:"), page); + TQLabel* layoutLbl = new TQLabel(i18n("Default layout:"), page); m_layoutTxtLbl = new TQLabel(page); m_layoutTxtLbl->setFrameStyle(TQFrame::LineEditPanel | TQFrame::Sunken); - m_layoutTxtLbl->tqsetSizePolicy(TQSizePolicy( + m_layoutTxtLbl->setSizePolicy(TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed)); setLayoutText(m_layout); KPushButton* layoutBtn = new KPushButton(i18n("Change..."), page); - layoutBtn->tqsetSizePolicy(TQSizePolicy( + layoutBtn->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed)); TQLabel* fontLbl = new TQLabel(i18n("Default font:"), page); m_fontTxtLbl = new TQLabel(page); m_fontTxtLbl->setFrameStyle(TQFrame::LineEditPanel | TQFrame::Sunken); - m_fontTxtLbl->tqsetSizePolicy(TQSizePolicy( + m_fontTxtLbl->setSizePolicy(TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed)); setFontText(m_font); KPushButton* fontBtn = new KPushButton(i18n("Change..."), page); - layoutBtn->tqsetSizePolicy(TQSizePolicy( + layoutBtn->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_marginsChBox = new TQCheckBox(i18n("Show page &margins"), page); m_marginsChBox->setChecked(view->isShowPageMargins()); @@ -260,9 +260,9 @@ void KivioOptionsDialog::defaultGrid() void KivioOptionsDialog::setLayoutText(const KoPageLayout& l) { KoUnit::Unit unit = static_cast<KoUnit::Unit>(m_unitCombo->currentItem()); - TQString txt = i18n("Format: %1, Width: %2 %4, Height: %3 %5").tqarg( - KoPageFormat::formatString(l.format)).tqarg(KoUnit::toUserValue(l.ptWidth, unit)) - .tqarg(KoUnit::toUserValue(l.ptHeight, unit)).tqarg(KoUnit::unitName(unit)).tqarg( + TQString txt = i18n("Format: %1, Width: %2 %4, Height: %3 %5").arg( + KoPageFormat::formatString(l.format)).arg(KoUnit::toUserValue(l.ptWidth, unit)) + .arg(KoUnit::toUserValue(l.ptHeight, unit)).arg(KoUnit::unitName(unit)).arg( KoUnit::unitName(unit)); m_layoutTxtLbl->setText(txt); } diff --git a/kivio/kiviopart/ui/kiviostencilformatdlg.cpp b/kivio/kiviopart/ui/kiviostencilformatdlg.cpp index 3361ad23..e682b7fd 100644 --- a/kivio/kiviopart/ui/kiviostencilformatdlg.cpp +++ b/kivio/kiviopart/ui/kiviostencilformatdlg.cpp @@ -20,7 +20,7 @@ #include "kiviostencilformatdlg.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqbitmap.h> #include <tqpixmap.h> #include <tqpainter.h> diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.cpp b/kivio/kiviopart/ui/kiviotextformatdlg.cpp index 94dd995d..051bb90d 100644 --- a/kivio/kiviopart/ui/kiviotextformatdlg.cpp +++ b/kivio/kiviopart/ui/kiviotextformatdlg.cpp @@ -20,7 +20,7 @@ #include "kiviotextformatdlg.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqbuttongroup.h> #include <tqradiobutton.h> @@ -68,7 +68,7 @@ void KivioTextFormatDlg::initPositionTab() m_halignBGrp->setButton(1); m_preview = new TQLabel(i18n("Preview"), tab); m_preview->setFrameStyle(TQFrame::Box | TQFrame::Sunken); - m_preview->tqsetAlignment(m_valign | m_halign); + m_preview->setAlignment(m_valign | m_halign); TQGridLayout* gl = new TQGridLayout(tab); gl->setSpacing(KDialog::spacingHint()); gl->setRowStretch(0, 10); @@ -95,7 +95,7 @@ void KivioTextFormatDlg::updateVAlign(int i) break; } - m_preview->tqsetAlignment(m_valign | m_halign); + m_preview->setAlignment(m_valign | m_halign); } void KivioTextFormatDlg::updateHAlign(int i) @@ -112,7 +112,7 @@ void KivioTextFormatDlg::updateHAlign(int i) break; } - m_preview->tqsetAlignment(m_valign | m_halign); + m_preview->setAlignment(m_valign | m_halign); } int KivioTextFormatDlg::valign() @@ -150,7 +150,7 @@ void KivioTextFormatDlg::setVAlign(int i) } m_valign = static_cast<TQt::AlignmentFlags>(i); - m_preview->tqsetAlignment(m_valign | m_halign); + m_preview->setAlignment(m_valign | m_halign); } void KivioTextFormatDlg::setHAlign(int i) @@ -168,7 +168,7 @@ void KivioTextFormatDlg::setHAlign(int i) } m_halign = static_cast<TQt::AlignmentFlags>(i); - m_preview->tqsetAlignment(m_valign | m_halign); + m_preview->setAlignment(m_valign | m_halign); } void KivioTextFormatDlg::setFont(TQFont f) diff --git a/kivio/kiviopart/ui/layerlisttooltip.cpp b/kivio/kiviopart/ui/layerlisttooltip.cpp index ed32c284..4a2d1fb5 100644 --- a/kivio/kiviopart/ui/layerlisttooltip.cpp +++ b/kivio/kiviopart/ui/layerlisttooltip.cpp @@ -49,13 +49,13 @@ void LayerListToolTip::maybeTip(const TQPoint& pos) return; } - TQRect tqitemRect = m_listView->tqitemRect(item); + TQRect itemRect = m_listView->itemRect(item); TQString toolTip = "<b>" + item->layer()->name() + "</b><br>"; toolTip += i18n("Visible: ") + (item->layer()->visible() ? i18n("Yes") : i18n("No")) + "<br>"; toolTip += i18n("Printable: ") + (item->layer()->printable() ? i18n("Yes") : i18n("No")) + "<br>"; toolTip += i18n("Editable: ") + (item->layer()->editable() ? i18n("Yes") : i18n("No")) + "<br>"; toolTip += i18n("Connectable: ") + (item->layer()->connectable() ? i18n("Yes") : i18n("No")); - tip(tqitemRect, toolTip); + tip(itemRect, toolTip); } } diff --git a/kivio/kiviopart/ui/objectlistpalette.cpp b/kivio/kiviopart/ui/objectlistpalette.cpp index 7483e98d..bd2d4392 100644 --- a/kivio/kiviopart/ui/objectlistpalette.cpp +++ b/kivio/kiviopart/ui/objectlistpalette.cpp @@ -18,7 +18,7 @@ */ #include "objectlistpalette.h" -#include <tqlayout.h> +#include <layout.h> #include <tqheader.h> #include <tqptrlist.h> @@ -85,7 +85,7 @@ ObjectListPalette::ObjectListPalette(KivioView* parent, const char* name) { m_blockUpdate = false; - TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 0, 2); + TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 2); m_objectList = new KListView(this); m_objectList->setFullWidth(true); @@ -95,7 +95,7 @@ ObjectListPalette::ObjectListPalette(KivioView* parent, const char* name) m_objectList->addColumn(i18n("Name")); m_objectList->addColumn(i18n("Type")); - tqlayout->addWidget(m_objectList); + layout->addWidget(m_objectList); connect(m_objectList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(updateSelection())); } diff --git a/kivio/plugins/kivioconnectortool/tool_connector.cpp b/kivio/plugins/kivioconnectortool/tool_connector.cpp index ca3ff402..26b8feb8 100644 --- a/kivio/plugins/kivioconnectortool/tool_connector.cpp +++ b/kivio/plugins/kivioconnectortool/tool_connector.cpp @@ -122,7 +122,7 @@ void ConnectorTool::setActivated(bool a) m_pStencil = 0; m_pDragData = 0; view()->canvasWidget()->setShowConnectorTargets(true); - view()->canvasWidget()->tqrepaint(); + view()->canvasWidget()->repaint(); emit activated(this); } else { if(m_pStencil && (m_mode == stmDrawRubber) && (m_type == PolyLineConnector)) { @@ -150,7 +150,7 @@ void ConnectorTool::setActivated(bool a) m_permanent = false; view()->setStatusBarInfo(""); view()->canvasWidget()->setShowConnectorTargets(false); - view()->canvasWidget()->tqrepaint(); + view()->canvasWidget()->repaint(); } } @@ -278,7 +278,7 @@ bool ConnectorTool::startRubberBanding( TQMouseEvent *e ) m_pStencil->customDrag(m_pDragData); - canvas->tqrepaint(); + canvas->repaint(); canvas->setCursor(*m_pConnectorCursor2); return true; } @@ -322,7 +322,7 @@ void ConnectorTool::continueRubberBanding( TQMouseEvent *e ) m_pStencil->customDrag(m_pDragData); m_pStencil->updateGeometry(); - canvas->tqrepaint(); + canvas->repaint(); } void ConnectorTool::mouseRelease( TQMouseEvent *e ) diff --git a/kivio/plugins/kivioselecttool/tool_select.cpp b/kivio/plugins/kivioselecttool/tool_select.cpp index b6c24c57..6117cf61 100644 --- a/kivio/plugins/kivioselecttool/tool_select.cpp +++ b/kivio/plugins/kivioselecttool/tool_select.cpp @@ -247,7 +247,7 @@ bool SelectTool::startRubberBanding(const TQPoint &pos) canvas->activePage()->unselectAllStencils(); canvas->startRectDraw( pos, KivioCanvas::Rubber ); - canvas->tqrepaint(); + canvas->repaint(); return true; } @@ -299,7 +299,7 @@ bool SelectTool::startDragging(const TQPoint &pos, bool onlySelected) // Create a new painter object canvas->beginUnclippedSpawnerPainter(); - // Build the list of old tqgeometry + // Build the list of old geometry KivioSelectDragData *pData; m_lstOldGeometry.clear(); pStencil = canvas->activePage()->selectedStencils()->first(); @@ -365,7 +365,7 @@ bool SelectTool::startCustomDragging(const TQPoint &pos, bool selectedOnly ) m_customDragOrigPoint = pStencil->customIDPoint(m_customDragID); view()->canvasWidget()->setShowConnectorTargets(true); - view()->canvasWidget()->tqrepaint(); + view()->canvasWidget()->repaint(); // Create a new painter object canvas->beginUnclippedSpawnerPainter(); @@ -491,7 +491,7 @@ void SelectTool::continueRubberBanding(const TQPoint &pos) * Continues the dragging process of a stencil (moving) * * How does this work? Initially we create a list of all the original - * tqgeometry of all the selected stencils. We use that to calculate delta + * geometry of all the selected stencils. We use that to calculate delta * movements and snap them to the grid. */ void SelectTool::continueDragging(const TQPoint &pos, bool ignoreGridGuides) @@ -512,7 +512,7 @@ void SelectTool::continueDragging(const TQPoint &pos, bool ignoreGridGuides) canvas->drawSelectedStencilsXOR(); } else { canvas->activePage()->setPaintSelected(false); - canvas->tqrepaint(); + canvas->repaint(); m_firstTime = false; } @@ -628,7 +628,7 @@ void SelectTool::continueCustomDragging(const TQPoint &pos) canvas->drawStencilXOR(m_pCustomDraggingStencil); } else { m_pCustomDraggingStencil->setHidden(true); - canvas->tqrepaint(); + canvas->repaint(); m_firstTime = false; } } @@ -641,7 +641,7 @@ void SelectTool::continueCustomDragging(const TQPoint &pos) if(m_pCustomDraggingStencil->type() != kstConnector){ canvas->drawStencilXOR(m_pCustomDraggingStencil); } else { - view()->canvasWidget()->tqrepaint(); + view()->canvasWidget()->repaint(); } view()->updateToolBars(); @@ -674,7 +674,7 @@ void SelectTool::continueResizing(const TQPoint &pos, bool ignoreGridGuides) if( !pData ) { - kdDebug(43000) << "SelectTool::continueResizing() - Original tqgeometry not found" << endl; + kdDebug(43000) << "SelectTool::continueResizing() - Original geometry not found" << endl; return; } @@ -687,7 +687,7 @@ void SelectTool::continueResizing(const TQPoint &pos, bool ignoreGridGuides) canvas->drawStencilXOR( m_pResizingStencil ); } else { m_pResizingStencil->setHidden(true); - canvas->tqrepaint(); + canvas->repaint(); m_firstTime = false; } @@ -1050,7 +1050,7 @@ void SelectTool::endDragging(const TQPoint&) canvas->drawSelectedStencilsXOR(); canvas->endUnclippedSpawnerPainter(); - // Clear the list of old tqgeometry + // Clear the list of old geometry m_lstOldGeometry.clear(); } @@ -1077,7 +1077,7 @@ void SelectTool::endCustomDragging(const TQPoint&) canvas->endUnclippedSpawnerPainter(); canvas->setShowConnectorTargets(false); - canvas->tqrepaint(); + canvas->repaint(); } void SelectTool::endResizing(const TQPoint&) @@ -1200,7 +1200,7 @@ void SelectTool::keyPress(TQKeyEvent* e) // Create a new painter object canvas->beginUnclippedSpawnerPainter(); - // Build the list of old tqgeometry + // Build the list of old geometry KivioSelectDragData *pData; m_lstOldGeometry.clear(); KivioStencil* pStencil = canvas->activePage()->selectedStencils()->first(); diff --git a/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.cpp b/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.cpp index 3745820c..8617eb98 100644 --- a/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.cpp +++ b/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.cpp @@ -32,7 +32,7 @@ #include "kivio_stencil_spawner_set.h" #include "kivio_text_style.h" #include "kivio_shape.h" -#include "kivio_tqshape_data.h" +#include "kivio_shape_data.h" #include "kivio_point.h" #include "tkmath.h" @@ -96,9 +96,9 @@ KivioSMLConnector::KivioSMLConnector( const TQString &name ) // This is a stencil of type connector setType( kstConnector ); - // We only have one tqshape, an open path. - //m_tqshape = new KivioShape(); - //m_tqshape->tqshapeData() ->setShapeType( KivioShapeData::kstOpenPath ); + // We only have one shape, an open path. + //m_shape = new KivioShape(); + //m_shape->shapeData() ->setShapeType( KivioShapeData::kstOpenPath ); loadPath( name ); } @@ -196,7 +196,7 @@ KivioStencil *KivioSMLConnector::duplicate() void KivioSMLConnector::drawOpenPath( KivioShape *pShape, KivioIntraStencilData *pData ) { KivioPainter * painter; - KivioShapeData *pShapeData = pShape->tqshapeData(); + KivioShapeData *pShapeData = pShape->shapeData(); KivioPoint *pPoint, *pNewPoint; TQPtrList <KivioPoint> *pPointList = pShapeData->pointList(); @@ -262,7 +262,7 @@ void KivioSMLConnector::paint( KivioIntraStencilData *pData ) } - // Build tqshape up from m_pConnectorPoints + // Build shape up from m_pConnectorPoints TQPtrList <KivioPoint> *pNewPoints = new TQPtrList<KivioPoint>; @@ -314,7 +314,7 @@ bool KivioSMLConnector::saveCustom( TQDomElement &e, TQDomDocument &doc ) kdDebug(43000) << "Save custom " << endl; e.appendChild( saveArrowHeads( doc ) ); - //TQDomElement type = m_tqshape->saveXML(doc); + //TQDomElement type = m_shape->saveXML(doc); KivioConnectorPoint *p = m_PointList.first(); while ( p ) { @@ -341,7 +341,7 @@ bool KivioSMLConnector::loadCustom( const TQDomElement &e ) } else if ( name == "KivioShape" ) { - //m_tqshape->loadXML(node.toElement()); + //m_shape->loadXML(node.toElement()); TQDomNode pts = node.firstChild(); while ( !pts.isNull() ) { diff --git a/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.h b/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.h index a50ec750..b631f84b 100644 --- a/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.h +++ b/kivio/plugins/kiviosmlconnector/sml_connector/sml_connector.h @@ -43,7 +43,7 @@ class KivioSMLConnector : public Kivio1DStencil private: bool loadPath(const TQString &file); //void drawOpenPath( KivioShape *, KivioIntraStencilData * ); - KivioShape *m_tqshape; + KivioShape *m_shape; TQPtrList<KivioConnectorPoint> m_PointList; TQString m_name; diff --git a/kivio/plugins/kiviosmlconnector/tool_connector.cpp b/kivio/plugins/kiviosmlconnector/tool_connector.cpp index 4578f0a7..5cef094e 100644 --- a/kivio/plugins/kiviosmlconnector/tool_connector.cpp +++ b/kivio/plugins/kiviosmlconnector/tool_connector.cpp @@ -190,7 +190,7 @@ bool SMLConnector::startRubberBanding( TQMouseEvent *e ) m_pStencil->customDrag(m_pDragData); - canvas->tqrepaint(); + canvas->repaint(); canvas->setCursor(*m_pConnectorCursor2); return true; } @@ -223,7 +223,7 @@ void SMLConnector::continueRubberBanding( TQMouseEvent *e ) m_pStencil->customDrag(m_pDragData); m_pStencil->updateGeometry(); - canvas->tqrepaint(); + canvas->repaint(); } void SMLConnector::mouseRelease( TQMouseEvent *e ) diff --git a/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui b/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui index cfa2f317..0e8aac77 100644 --- a/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui +++ b/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui @@ -185,7 +185,7 @@ You should have received a copy of the GNU General Public License along with thi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>110</width> <height>20</height> diff --git a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp index 49a42589..062e329e 100644 --- a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp +++ b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp @@ -108,7 +108,7 @@ void StencilTextEditor::setHorizontalAlign(int flag) m_mainWidget->m_hAlignButton->popup()->setItemChecked(flag, true); m_mainWidget->m_hAlignButton->setIconSet(*(m_mainWidget->m_hAlignButton->popup()->iconSet(flag))); - m_mainWidget->m_textArea->tqsetAlignment(flag|verticalAlignment()); + m_mainWidget->m_textArea->setAlignment(flag|verticalAlignment()); m_hAlign = flag; } @@ -120,7 +120,7 @@ void StencilTextEditor::setVerticalAlign(int flag) m_mainWidget->m_vAlignButton->popup()->setItemChecked(flag, true); m_mainWidget->m_vAlignButton->setIconSet(*(m_mainWidget->m_vAlignButton->popup()->iconSet(flag))); - m_mainWidget->m_textArea->tqsetAlignment(flag|horizontalAlignment()); + m_mainWidget->m_textArea->setAlignment(flag|horizontalAlignment()); m_vAlign = flag; } @@ -169,7 +169,7 @@ void StencilTextEditor::updateFormating() m_mainWidget->m_textArea->selectAll(true); - m_mainWidget->m_textArea->tqsetAlignment(horizontalAlignment()|verticalAlignment()); + m_mainWidget->m_textArea->setAlignment(horizontalAlignment()|verticalAlignment()); m_mainWidget->m_textArea->selectAll(false); m_mainWidget->m_textArea->setFocus(); diff --git a/kivio/plugins/kiviotexttool/tool_text.cpp b/kivio/plugins/kiviotexttool/tool_text.cpp index 7d449ae0..5b1ee4fc 100644 --- a/kivio/plugins/kiviotexttool/tool_text.cpp +++ b/kivio/plugins/kiviotexttool/tool_text.cpp @@ -185,7 +185,7 @@ void TextTool::mousePress( TQMouseEvent *e ) bool TextTool::startRubberBanding( TQMouseEvent *e ) { view()->canvasWidget()->startRectDraw( e->pos(), KivioCanvas::Rubber ); - view()->canvasWidget()->tqrepaint(); + view()->canvasWidget()->repaint(); m_startPoint = e->pos(); return true; @@ -222,7 +222,7 @@ void TextTool::mouseRelease( TQMouseEvent *e ) m_mode = stmNone; - view()->canvasWidget()->tqrepaint(); + view()->canvasWidget()->repaint(); } void TextTool::endRubberBanding(TQMouseEvent */*e*/) @@ -282,12 +282,12 @@ void TextTool::applyToolAction(TQPtrList<KivioStencil>* stencils) TQString text = editor.text(); TQFont font = editor.font(); TQColor textColor = editor.fontColor(); - int htqalignment = editor.horizontalAlignment(); - int vtqalignment = editor.verticalAlignment(); + int halignment = editor.horizontalAlignment(); + int valignment = editor.verticalAlignment(); bool changeFont = (stencil->textFont() != font); bool changeTextColor = (stencil->textColor() != textColor); - bool changeHAlignment = (stencil->hTextAlign() != htqalignment); - bool changeVAlignment = (stencil->vTextAlign() != vtqalignment); + bool changeHAlignment = (stencil->hTextAlign() != halignment); + bool changeVAlignment = (stencil->vTextAlign() != valignment); while( stencil ) @@ -317,18 +317,18 @@ void TextTool::applyToolAction(TQPtrList<KivioStencil>* stencils) changed = true; } - if(changeHAlignment && (stencil->hTextAlign() != htqalignment)) { + if(changeHAlignment && (stencil->hTextAlign() != halignment)) { KivioChangeStencilHAlignmentCommand* cmd = new KivioChangeStencilHAlignmentCommand( - i18n("Change StencilQt::Horizontal Alignment"), view()->activePage(), stencil, stencil->hTextAlign(), htqalignment); - stencil->setHTextAlign(htqalignment); + i18n("Change StencilQt::Horizontal Alignment"), view()->activePage(), stencil, stencil->hTextAlign(), halignment); + stencil->setHTextAlign(halignment); macroCmd->addCommand(cmd); changed = true; } - if(changeVAlignment && (stencil->vTextAlign() != vtqalignment)) { + if(changeVAlignment && (stencil->vTextAlign() != valignment)) { KivioChangeStencilVAlignmentCommand* cmd = new KivioChangeStencilVAlignmentCommand( - i18n("Change StencilQt::Vertical Alignment"), view()->activePage(), stencil, stencil->vTextAlign(), vtqalignment); - stencil->setVTextAlign(vtqalignment); + i18n("Change StencilQt::Vertical Alignment"), view()->activePage(), stencil, stencil->vTextAlign(), valignment); + stencil->setVTextAlign(valignment); macroCmd->addCommand(cmd); changed = true; } @@ -400,24 +400,24 @@ void TextTool::applyToolAction(KivioStencil* stencil, const KoPoint& pos) changed = true; } - int htqalignment = editor.horizontalAlignment(); + int halignment = editor.horizontalAlignment(); - if(stencil->hTextAlign(name) != htqalignment) { + if(stencil->hTextAlign(name) != halignment) { KivioChangeStencilHAlignmentCommand* cmd = new KivioChangeStencilHAlignmentCommand( i18n("Change StencilQt::Horizontal Alignment"), view()->activePage(), stencil, - stencil->hTextAlign(name), htqalignment, name); - stencil->setHTextAlign(name, htqalignment); + stencil->hTextAlign(name), halignment, name); + stencil->setHTextAlign(name, halignment); macroCmd->addCommand(cmd); changed = true; } - int vtqalignment = editor.verticalAlignment(); + int valignment = editor.verticalAlignment(); - if(stencil->vTextAlign(name) != vtqalignment) { + if(stencil->vTextAlign(name) != valignment) { KivioChangeStencilVAlignmentCommand* cmd = new KivioChangeStencilVAlignmentCommand( i18n("Change StencilQt::Vertical Alignment"), view()->activePage(), stencil, - stencil->vTextAlign(name), vtqalignment, name); - stencil->setVTextAlign(name, vtqalignment); + stencil->vTextAlign(name), valignment, name); + stencil->setVTextAlign(name, valignment); macroCmd->addCommand(cmd); changed = true; } diff --git a/koshell/iconsidepane.cpp b/koshell/iconsidepane.cpp index 93bbb6c4..7f3371e4 100644 --- a/koshell/iconsidepane.cpp +++ b/koshell/iconsidepane.cpp @@ -126,13 +126,13 @@ void EntryItem::paint( TQPainter *p ) TQBrush brush; if ( isCurrent() || isSelected() || mPaintActive ) - brush = box->tqcolorGroup().brush( TQColorGroup::Highlight ); + brush = box->colorGroup().brush( TQColorGroup::Highlight ); else - brush = TQBrush(box->tqcolorGroup().highlight().light( 115 )); + brush = TQBrush(box->colorGroup().highlight().light( 115 )); p->fillRect( 1, 0, w - 2, h - 1, brush ); TQPen pen = p->pen(); TQPen oldPen = pen; - pen.setColor( box->tqcolorGroup().mid() ); + pen.setColor( box->colorGroup().mid() ); p->setPen( pen ); p->drawPoint( 1, 0 ); @@ -149,9 +149,9 @@ void EntryItem::paint( TQPainter *p ) p->drawPixmap( x, y, mPixmap ); } - TQColor shadowColor = listBox()->tqcolorGroup().background().dark(115); + TQColor shadowColor = listBox()->colorGroup().background().dark(115); if ( isCurrent() || isSelected() ) { - p->setPen( box->tqcolorGroup().highlightedText() ); + p->setPen( box->colorGroup().highlightedText() ); } if ( !text().isEmpty() && navigator()->showText() ) { @@ -176,13 +176,13 @@ void EntryItem::paint( TQPainter *p ) } if ( isCurrent() || isSelected() || mHasHover ) { - p->setPen( box->tqcolorGroup().highlight().dark(115) ); + p->setPen( box->colorGroup().highlight().dark(115) ); p->drawText( x + ( TQApplication::reverseLayout() ? -1 : 1), y + 1, text() ); - p->setPen( box->tqcolorGroup().highlightedText() ); + p->setPen( box->colorGroup().highlightedText() ); } else - p->setPen( box->tqcolorGroup().text() ); + p->setPen( box->colorGroup().text() ); p->drawText( x, y, text() ); } @@ -283,7 +283,7 @@ void Navigator::slotExecuted( TQListBoxItem *item ) executedItem = item; } -TQSize Navigator::tqsizeHint() const +TQSize Navigator::sizeHint() const { return TQSize( mMinWidth, 100 ); } @@ -409,7 +409,7 @@ IconSidePane::IconSidePane(TQWidget *parent, const char *name ) m_buttongroup->setExclusive(true); m_buttongroup->hide(); mWidgetstack = new TQWidgetStack(this); - mWidgetstack->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); + mWidgetstack->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); // setup the popup menu mShowIcons = KoShellSettings::sidePaneShowIcons(); diff --git a/koshell/iconsidepane.h b/koshell/iconsidepane.h index e0c4f7f0..34678919 100644 --- a/koshell/iconsidepane.h +++ b/koshell/iconsidepane.h @@ -26,7 +26,7 @@ #include <klistbox.h> #include <tqbuttongroup.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqvbox.h> #include <tqwidgetstack.h> @@ -100,12 +100,12 @@ class EntryItemToolTip : public TQToolTip if ( !mListBox ) return; TQListBoxItem* item = mListBox->itemAt( p ); if ( !item ) return; - const TQRect tqitemRect = mListBox->tqitemRect( item ); - if ( !tqitemRect.isValid() ) return; + const TQRect itemRect = mListBox->itemRect( item ); + if ( !itemRect.isValid() ) return; const EntryItem *entryItem = static_cast<EntryItem*>( item ); TQString tipStr = entryItem->text(); - tip( tqitemRect, tipStr ); + tip( itemRect, tipStr ); } private: TQListBox* mListBox; @@ -123,7 +123,7 @@ class Navigator : public KListBox int insertItem(const TQString &_text, const TQString &_pix); - TQSize tqsizeHint() const; + TQSize sizeHint() const; IconViewMode viewMode(); bool showText(); bool showIcons(); diff --git a/koshell/koshell_shell.cc b/koshell/koshell_shell.cc index 9639ae71..27bec9d6 100644 --- a/koshell/koshell_shell.cc +++ b/koshell/koshell_shell.cc @@ -66,7 +66,7 @@ KoShellWindow::KoShellWindow() // Setup the sidebar m_pSidebar = new IconSidePane( m_pLayout ); - m_pSidebar->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, + m_pSidebar->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) ); m_pSidebar->setActionCollection( actionCollection() ); m_grpFile = m_pSidebar->insertGroup(i18n("Components"), false, TQT_TQOBJECT(this), TQT_SLOT( slotSidebar_Part(int ))); @@ -75,7 +75,7 @@ KoShellWindow::KoShellWindow() // Setup the tabbar m_pFrame = new KTabWidget( m_pLayout ); - m_pFrame->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, + m_pFrame->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ) ); m_pFrame->setTabPosition( KTabWidget::Bottom ); @@ -158,7 +158,7 @@ bool KoShellWindow::openDocumentInternal( const KURL &url, KoDocument* ) /*if (!KIO::NetAccess::exists(url,true,0) ) { - KMessageBox::error(0L, i18n("The file %1 doesn't exist.").tqarg(url.url()) ); + KMessageBox::error(0L, i18n("The file %1 doesn't exist.").arg(url.url()) ); recentAction()->removeURL(url); //remove the file from the recent-opened-file-list saveRecentFiles(); return false; @@ -175,7 +175,7 @@ bool KoShellWindow::openDocumentInternal( const KURL &url, KoDocument* ) KoFilterManager *manager = new KoFilterManager( url.path() ); TQCString mimetype; // an empty mimetype means, that the "nearest" - KoFilter::ConversiontqStatus status = manager->exp0rt( tmpFile->name(), mimetype ); // KOffice part will be chosen + KoFilter::ConversionStatus status = manager->exp0rt( tmpFile->name(), mimetype ); // KOffice part will be chosen delete manager; if ( status != KoFilter::OK || mimetype.isEmpty() ) { @@ -503,7 +503,7 @@ void KoShellWindow::switchToPage( TQValueList<Page>::Iterator it ) v->setFocus(); partSpecificHelpAction->setEnabled(true); - partSpecificHelpAction->setText(i18n("%1 Handbook").tqarg((*m_activePage).m_pDoc->instance()->aboutData()->programName())); + partSpecificHelpAction->setText(i18n("%1 Handbook").arg((*m_activePage).m_pDoc->instance()->aboutData()->programName())); } void KoShellWindow::slotFileNew() diff --git a/kplato/intervalitem.h b/kplato/intervalitem.h index 4e0cb704..3dceb1c1 100644 --- a/kplato/intervalitem.h +++ b/kplato/intervalitem.h @@ -31,7 +31,7 @@ class IntervalItem : public TQListViewItem { public: IntervalItem(TQListView * parent, TQTime start, TQTime end) - : TQListViewItem(parent, TQString("%1 - %2").tqarg(start.toString(), end.toString())), + : TQListViewItem(parent, TQString("%1 - %2").arg(start.toString(), end.toString())), m_start(start), m_end(end) {} diff --git a/kplato/kptaccountspanelbase.ui b/kplato/kptaccountspanelbase.ui index e76a6129..42b35ba9 100644 --- a/kplato/kptaccountspanelbase.ui +++ b/kplato/kptaccountspanelbase.ui @@ -13,7 +13,7 @@ <height>234</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>350</width> <height>220</height> @@ -37,7 +37,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -87,7 +87,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> diff --git a/kplato/kptaccountsview.cc b/kplato/kptaccountsview.cc index 9825d9c2..5e2443db 100644 --- a/kplato/kptaccountsview.cc +++ b/kplato/kptaccountsview.cc @@ -32,9 +32,9 @@ #include <tqdatetimeedit.h> #include <tqheader.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> -#include <tqpalette.h> +#include <palette.h> #include <tqpushbutton.h> #include <tqvaluelist.h> #include <tqpopupmenu.h> @@ -99,7 +99,7 @@ AccountsView::AccountsView(Project &project, View *view, TQWidget *parent) m_project(project), m_accounts(project.accounts()) { - m_date = TQDate::tqcurrentDate(); + m_date = TQDate::currentDate(); m_period = 0; m_periodTexts<<i18n("Day")<<i18n("Week")<<i18n("Month"); m_cumulative = false; @@ -110,10 +110,10 @@ AccountsView::AccountsView(Project &project, View *view, TQWidget *parent) m_label = new Label(this); m_label->setFrameShape(TQLabel::StyledPanel); m_label->setFrameShadow(TQLabel::Sunken); - m_label->tqsetAlignment(int(TQLabel::WordBreak | TQLabel::AlignVCenter)); + m_label->setAlignment(int(TQLabel::WordBreak | TQLabel::AlignVCenter)); lay2->addWidget(m_label); m_changeBtn = new TQPushButton(i18n("Configure..."), this); - m_changeBtn->tqsetSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_changeBtn->sizePolicy().hasHeightForWidth())); + m_changeBtn->setSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_changeBtn->sizePolicy().hasHeightForWidth())); lay2->addWidget(m_changeBtn); lay1->addLayout(lay2); @@ -139,7 +139,7 @@ void AccountsView::zoom(double zoom) { } void AccountsView::init() { - m_date = TQDate::tqcurrentDate(); + m_date = TQDate::currentDate(); m_period = 0; initAccList(m_accounts.accountList()); } @@ -216,8 +216,8 @@ void AccountsView::slotUpdate() { if (m_cumulative) { t += " <b>" + i18n("Cumulative") + "</b> "; } - t += i18n("Cut-off date:%1").tqarg("<b>" + locale->formatDate(m_date, true) + "</b>"); - t += " " + i18n("Periodicity:%1").tqarg("<b>" + periodText(m_period) + "</b>"); + t += i18n("Cut-off date:%1").arg("<b>" + locale->formatDate(m_date, true) + "</b>"); + t += " " + i18n("Periodicity:%1").arg("<b>" + periodText(m_period) + "</b>"); m_label->setText(t); // Add columns for selected period/periods @@ -260,7 +260,7 @@ void AccountsView::slotUpdate() { //kdDebug()<<k_funcinfo<<c<<": "<<dt<<"-"<<pend<<" : "<<end<<endl; int y; int w = cal->weekNumber(dt, &y); - TQString t = i18n("<week>-<year>", "%1-%2").tqarg(w).tqarg(y); + TQString t = i18n("<week>-<year>", "%1-%2").arg(w).arg(y); m_dlv->addSlaveColumn(t); dt = pend.addDays(1); pend = cal->addDays(pend, 7); @@ -305,7 +305,7 @@ void AccountsView::slotUpdate() { cal->setYMD(pend, dt.year(), dt.month(), dt.daysInMonth()); for (; pend <= end; ++c) { //kdDebug()<<k_funcinfo<<c<<": "<<dt<<"-"<<pend<<" : "<<end<<endl; - TQString m = cal->monthName(dt, true) + TQString(" %1").tqarg( dt.year()); + TQString m = cal->monthName(dt, true) + TQString(" %1").arg( dt.year()); m_dlv->addSlaveColumn(m); dt = pend.addDays(1); // 1. next month @@ -378,7 +378,7 @@ bool AccountsView::setContext(Context::Accountsview &context) { //m_dlv->setSizes(list); //NOTE: This doesn't always work! m_date = context.date; if (!m_date.isValid()) - m_date = TQDate::tqcurrentDate(); + m_date = TQDate::currentDate(); m_period = context.period; m_cumulative = context.cumulative; setContextClosedItems(context); diff --git a/kplato/kptcalendar.cc b/kplato/kptcalendar.cc index 486c3dac..56ba7380 100644 --- a/kplato/kptcalendar.cc +++ b/kplato/kptcalendar.cc @@ -225,11 +225,11 @@ Duration CalendarDay::effort(const TQTime &start, const TQTime &end) { for (; it.current(); ++it) { //kdDebug()<<k_funcinfo<<"Interval: "<<it.current()->first.toString()<<" - "<<it.current()->second.toString()<<endl; if (end > it.current()->first && start < it.current()->second) { - DateTime dtStart(TQDate::tqcurrentDate(), start); + DateTime dtStart(TQDate::currentDate(), start); if (start < it.current()->first) { dtStart.setTime(it.current()->first); } - DateTime dtEnd(TQDate::tqcurrentDate(), end); + DateTime dtEnd(TQDate::currentDate(), end); if (end > it.current()->second) { dtEnd.setTime(it.current()->second); } @@ -282,8 +282,8 @@ Duration CalendarDay::duration() const { Duration dur; TQPtrListIterator<TQPair<TQTime, TQTime> > it = m_workingIntervals; for (; it.current(); ++it) { - DateTime start(TQDate::tqcurrentDate(), it.current()->first); - DateTime end(TQDate::tqcurrentDate(), it.current()->second); + DateTime start(TQDate::currentDate(), it.current()->first); + DateTime end(TQDate::currentDate(), it.current()->second); dur += end - start; } return dur; diff --git a/kplato/kptcalendaredit.cc b/kplato/kptcalendaredit.cc index ab2df8bd..85dee06f 100644 --- a/kplato/kptcalendaredit.cc +++ b/kplato/kptcalendaredit.cc @@ -30,12 +30,12 @@ #include <tqradiobutton.h> #include <tqcombobox.h> #include <tqlabel.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqlineedit.h> #include <tqdatetimeedit.h> #include <tqdatetime.h> #include <tqtabwidget.h> -#include <tqtextbrowser.h> +#include <textbrowser.h> #include <klocale.h> diff --git a/kplato/kptcalendareditbase.cc b/kplato/kptcalendareditbase.cc index aaa6fab0..df46d3af 100644 --- a/kplato/kptcalendareditbase.cc +++ b/kplato/kptcalendareditbase.cc @@ -31,7 +31,7 @@ #include <tqheader.h> #include <tqlistview.h> #include <tqdatetimeedit.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -51,10 +51,10 @@ CalendarEditBase::CalendarEditBase( TQWidget* parent, const char* name, WFlags f groupBox2 = new TQGroupBox( this, "groupBox2" ); groupBox2->setColumnLayout(0, Qt::Vertical ); - groupBox2->tqlayout()->setSpacing( 6 ); - groupBox2->tqlayout()->setMargin( 6 ); - groupBox2Layout = new TQGridLayout( groupBox2->tqlayout() ); - groupBox2Layout->tqsetAlignment( TQt::AlignTop ); + groupBox2->layout()->setSpacing( 6 ); + groupBox2->layout()->setMargin( 6 ); + groupBox2Layout = new TQGridLayout( groupBox2->layout() ); + groupBox2Layout->setAlignment( TQt::AlignTop ); calendarPanel = new CalendarPanel( groupBox2, "calendarPanel" ); @@ -62,54 +62,54 @@ CalendarEditBase::CalendarEditBase( TQWidget* parent, const char* name, WFlags f day = new TQButtonGroup( groupBox2, "day" ); day->setColumnLayout(0, Qt::Vertical ); - day->tqlayout()->setSpacing( 6 ); - day->tqlayout()->setMargin( 6 ); - dayLayout = new TQVBoxLayout( day->tqlayout() ); - dayLayout->tqsetAlignment( TQt::AlignTop ); + day->layout()->setSpacing( 6 ); + day->layout()->setMargin( 6 ); + dayLayout = new TQVBoxLayout( day->layout() ); + dayLayout->setAlignment( TQt::AlignTop ); - tqlayout8 = new TQHBoxLayout( 0, 0, 6, "tqlayout8"); + layout8 = new TQHBoxLayout( 0, 0, 6, "layout8"); state = new TQComboBox( FALSE, day, "state" ); - tqlayout8->addWidget( state ); + layout8->addWidget( state ); bApply = new TQPushButton( day, "bApply" ); - tqlayout8->addWidget( bApply ); - dayLayout->addLayout( tqlayout8 ); + layout8->addWidget( bApply ); + dayLayout->addLayout( layout8 ); groupBox4 = new TQGroupBox( day, "groupBox4" ); groupBox4->setColumnLayout(0, Qt::Vertical ); - groupBox4->tqlayout()->setSpacing( 6 ); - groupBox4->tqlayout()->setMargin( 6 ); - groupBox4Layout = new TQVBoxLayout( groupBox4->tqlayout() ); - groupBox4Layout->tqsetAlignment( TQt::AlignTop ); + groupBox4->layout()->setSpacing( 6 ); + groupBox4->layout()->setMargin( 6 ); + groupBox4Layout = new TQVBoxLayout( groupBox4->layout() ); + groupBox4Layout->setAlignment( TQt::AlignTop ); intervalList = new TQListView( groupBox4, "intervalList" ); intervalList->addColumn( tr2i18n( "Work Interval" ) ); groupBox4Layout->addWidget( intervalList ); - tqlayout6 = new TQHBoxLayout( 0, 0, 6, "tqlayout6"); + layout6 = new TQHBoxLayout( 0, 0, 6, "layout6"); startTime = new TQTimeEdit( groupBox4, "startTime" ); - tqlayout6->addWidget( startTime ); + layout6->addWidget( startTime ); endTime = new TQTimeEdit( groupBox4, "endTime" ); - tqlayout6->addWidget( endTime ); - groupBox4Layout->addLayout( tqlayout6 ); + layout6->addWidget( endTime ); + groupBox4Layout->addLayout( layout6 ); - tqlayout5 = new TQHBoxLayout( 0, 0, 6, "tqlayout5"); + layout5 = new TQHBoxLayout( 0, 0, 6, "layout5"); bClear = new TQPushButton( groupBox4, "bClear" ); - tqlayout5->addWidget( bClear ); + layout5->addWidget( bClear ); bAddInterval = new TQPushButton( groupBox4, "bAddInterval" ); - tqlayout5->addWidget( bAddInterval ); - groupBox4Layout->addLayout( tqlayout5 ); + layout5->addWidget( bAddInterval ); + groupBox4Layout->addLayout( layout5 ); dayLayout->addWidget( groupBox4 ); groupBox2Layout->addWidget( day, 1, 1 ); CalendarEditBaseLayout->addWidget( groupBox2 ); languageChange(); - resize( TQSize(540, 340).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(540, 340).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/kplato/kptcalendareditbase.h b/kplato/kptcalendareditbase.h index df2f9c0c..b6a22064 100644 --- a/kplato/kptcalendareditbase.h +++ b/kplato/kptcalendareditbase.h @@ -64,12 +64,12 @@ public: protected: TQHBoxLayout* CalendarEditBaseLayout; TQGridLayout* groupBox2Layout; - TQHBoxLayout* tqlayout10; + TQHBoxLayout* layout10; TQVBoxLayout* dayLayout; - TQHBoxLayout* tqlayout8; + TQHBoxLayout* layout8; TQVBoxLayout* groupBox4Layout; - TQHBoxLayout* tqlayout6; - TQHBoxLayout* tqlayout5; + TQHBoxLayout* layout6; + TQHBoxLayout* layout5; protected slots: virtual void languageChange(); diff --git a/kplato/kptcalendarlistdialog.cc b/kplato/kptcalendarlistdialog.cc index b5a2d59c..67d36fd4 100644 --- a/kplato/kptcalendarlistdialog.cc +++ b/kplato/kptcalendarlistdialog.cc @@ -27,12 +27,12 @@ #include <tqcombobox.h> #include <tqheader.h> #include <tqlabel.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqlineedit.h> #include <tqdatetimeedit.h> #include <tqdatetime.h> #include <tqtabwidget.h> -#include <tqtextbrowser.h> +#include <textbrowser.h> #include <klocale.h> @@ -182,8 +182,8 @@ CalendarListDialog::CalendarListDialog(Project &p, TQWidget *parent, const char if (f) { dia->calendarList->setSelected(f, true); } - //kdDebug()<<"size="<<size().width()<<"x"<<size().height()<<" hint="<<tqsizeHint().width()<<"x"<<tqsizeHint().height()<<endl; - resize(TQSize(725, 388).expandedTo(tqminimumSizeHint())); + //kdDebug()<<"size="<<size().width()<<"x"<<size().height()<<" hint="<<sizeHint().width()<<"x"<<sizeHint().height()<<endl; + resize(TQSize(725, 388).expandedTo(minimumSizeHint())); setMainWidget(dia); enableButtonOK(false); diff --git a/kplato/kptcalendarlistdialogbase.cc b/kplato/kptcalendarlistdialogbase.cc index 764c7e98..7f144704 100644 --- a/kplato/kptcalendarlistdialogbase.cc +++ b/kplato/kptcalendarlistdialogbase.cc @@ -28,7 +28,7 @@ #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqtable.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqlabel.h> diff --git a/kplato/kptcalendarlistpanel.ui b/kplato/kptcalendarlistpanel.ui index 04f86757..29f4a4fd 100644 --- a/kplato/kptcalendarlistpanel.ui +++ b/kplato/kptcalendarlistpanel.ui @@ -25,7 +25,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <grid> <property name="name"> @@ -67,7 +67,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -75,7 +75,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> diff --git a/kplato/kptcalendarpanel.cc b/kplato/kptcalendarpanel.cc index e6322944..59ab2f01 100644 --- a/kplato/kptcalendarpanel.cc +++ b/kplato/kptcalendarpanel.cc @@ -65,7 +65,7 @@ CalendarPanel::CalendarPanel(TQWidget *parent, TQDate dt, const char *name, WFla CalendarPanel::CalendarPanel( TQWidget *parent, const char *name ) : TQFrame(parent,name) { - init( TQDate::tqcurrentDate() ); + init( TQDate::currentDate() ); } void CalendarPanel::init( const TQDate &dt ) @@ -96,10 +96,10 @@ void CalendarPanel::init( const TQDate &dt ) setFontSize(10); line->setValidator(val); line->installEventFilter( this ); - yearForward->setPixmap(BarIcon(TQString::tqfromLatin1("2rightarrow"))); - yearBackward->setPixmap(BarIcon(TQString::tqfromLatin1("2leftarrow"))); - monthForward->setPixmap(BarIcon(TQString::tqfromLatin1("1rightarrow"))); - monthBackward->setPixmap(BarIcon(TQString::tqfromLatin1("1leftarrow"))); + yearForward->setPixmap(BarIcon(TQString::fromLatin1("2rightarrow"))); + yearBackward->setPixmap(BarIcon(TQString::fromLatin1("2leftarrow"))); + monthForward->setPixmap(BarIcon(TQString::fromLatin1("1rightarrow"))); + monthBackward->setPixmap(BarIcon(TQString::fromLatin1("1leftarrow"))); setDate(dt); // set button texts connect(table, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(dateChangedSlot(TQDate))); connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot())); @@ -164,7 +164,7 @@ CalendarPanel::resizeEvent(TQResizeEvent*) // ----- calculate button row height: for(count=0; count<NoOfButtons; ++count) { if ( buttons[count] ) { // closeButton may be 0L - sizes[count]=buttons[count]->tqsizeHint(); + sizes[count]=buttons[count]->sizeHint(); buttonHeight=TQMAX(buttonHeight, sizes[count].height()); } else @@ -175,7 +175,7 @@ CalendarPanel::resizeEvent(TQResizeEvent*) for(count=0; count<NoOfButtons; ++count) { if(buttons[count]==selectMonth) { TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); - sizes[count].setWidth(TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin))); + sizes[count].setWidth(TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().pixelMetric(TQStyle::PM_ButtonMargin))); } } // ----- center buttons @@ -195,7 +195,7 @@ CalendarPanel::resizeEvent(TQResizeEvent*) x+=w; } // ----- place the line edit for direct input: - sizes[0]=line->tqsizeHint(); + sizes[0]=line->sizeHint(); int week_width=d->selectWeek->fontMetrics().width(i18n("Week XX"))+((d->closeButton != 0L) ? 50 : 20); line->setGeometry(0, height()-sizes[0].height(), width()-week_width, sizes[0].height()); d->selectWeek->setGeometry(width()-week_width, height()-sizes[0].height(), week_width, sizes[0].height()); @@ -209,7 +209,7 @@ CalendarPanel::dateChangedSlot(TQDate date) { //kdDebug() << "CalendarPanel::dateChangedSlot: date changed (" << date.year() << "/" << date.month() << "/" << date.day() << ")." << endl; line->setText(KGlobal::locale()->formatDate(date, true)); - d->selectWeek->setText(i18n("Week %1").tqarg(weekOfYear(date))); + d->selectWeek->setText(i18n("Week %1").arg(weekOfYear(date))); selectMonth->setText(KGlobal::locale()->calendar()->monthName(date.month(), false)); selectYear->setText(date.toString("yyyy")); emit(dateChanged(date)); @@ -242,7 +242,7 @@ CalendarPanel::setDate(const TQDate& date) TQString temp; // ----- table->setDate(date); - d->selectWeek->setText(i18n("Week %1").tqarg(weekOfYear(date))); + d->selectWeek->setText(i18n("Week %1").arg(weekOfYear(date))); selectMonth->setText(KGlobal::locale()->calendar()->monthName(date.month(), false)); temp.setNum(date.year()); selectYear->setText(temp); @@ -285,7 +285,7 @@ CalendarPanel::selectWeekClicked() PopupFrame* popup = new PopupFrame(this); DateInternalWeekSelector* picker = new DateInternalWeekSelector(fontsize, popup); // ----- - picker->resize(picker->tqsizeHint()); + picker->resize(picker->sizeHint()); popup->setMainWidget(picker); connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); picker->setFocus(); @@ -322,7 +322,7 @@ CalendarPanel::selectMonthClicked() PopupFrame* popup = new PopupFrame(this); DateInternalMonthPicker* picker = new DateInternalMonthPicker(fontsize, popup); // ----- - picker->resize(picker->tqsizeHint()); + picker->resize(picker->sizeHint()); popup->setMainWidget(picker); picker->setFocus(); connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); @@ -352,7 +352,7 @@ CalendarPanel::selectYearClicked() PopupFrame* popup = new PopupFrame(this); DateInternalYearSelector* picker = new DateInternalYearSelector(fontsize, popup); // ----- - picker->resize(picker->tqsizeHint()); + picker->resize(picker->sizeHint()); popup->setMainWidget(picker); connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); picker->setFocus(); @@ -409,9 +409,9 @@ CalendarPanel::lineEnterPressed() } TQSize -CalendarPanel::tqsizeHint() const +CalendarPanel::sizeHint() const { - TQSize tableSize=table->tqsizeHint(); + TQSize tableSize=table->sizeHint(); TQWidget *buttons[]={ yearBackward, monthBackward, @@ -427,13 +427,13 @@ CalendarPanel::tqsizeHint() const // ----- store the size hints: for(count=0; count<NoOfButtons; ++count) { if ( buttons[count] ) - sizes[count]=buttons[count]->tqsizeHint(); + sizes[count]=buttons[count]->sizeHint(); else sizes[count] = TQSize(0,0); if(buttons[count]==selectMonth) { TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); - cx+=TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin)); + cx+=TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().pixelMetric(TQStyle::PM_ButtonMargin)); } else { cx+=sizes[count].width(); } @@ -442,7 +442,7 @@ CalendarPanel::tqsizeHint() const // ----- calculate width hint: cx=TQMAX(cx, tableSize.width()); // line edit ignored // ----- calculate height hint: - cy+=tableSize.height()+line->tqsizeHint().height(); + cy+=tableSize.height()+line->sizeHint().height(); return TQSize(cx, cy); } @@ -471,7 +471,7 @@ CalendarPanel::setFontSize(int s) } TQFontMetrics metrics(selectMonth->fontMetrics()); for(int i=1; i <= 12; ++i) - { // maxMonthRect is used by tqsizeHint() + { // maxMonthRect is used by sizeHint() r=metrics.boundingRect(KGlobal::locale()->calendar()->monthName(i, false)); maxMonthRect.setWidth(TQMAX(r.width(), maxMonthRect.width())); maxMonthRect.setHeight(TQMAX(r.height(), maxMonthRect.height())); @@ -490,7 +490,7 @@ CalendarPanel::setCloseButton( bool enable ) TQToolTip::add(d->closeButton, i18n("Close")); d->closeButton->setPixmap( SmallIcon("remove") ); connect( d->closeButton, TQT_SIGNAL( clicked() ), - tqtopLevelWidget(), TQT_SLOT( close() ) ); + topLevelWidget(), TQT_SLOT( close() ) ); } else { delete d->closeButton; diff --git a/kplato/kptcalendarpanel.h b/kplato/kptcalendarpanel.h index 9cf6c4f8..0c72d763 100644 --- a/kplato/kptcalendarpanel.h +++ b/kplato/kptcalendarpanel.h @@ -54,7 +54,7 @@ public: /** The usual constructor. The given date will be displayed * initially. **/ - CalendarPanel(TQWidget *parent=0, TQDate=TQDate::tqcurrentDate(), const char *name=0, WFlags f=0); + CalendarPanel(TQWidget *parent=0, TQDate=TQDate::currentDate(), const char *name=0, WFlags f=0); /** * Standard qt widget constructor. The initial date will be the @@ -73,9 +73,9 @@ public: * size hint, try adding 28 to each of the reported numbers of * pixels. **/ - TQSize tqsizeHint() const; + TQSize sizeHint() const; - TQSize tqminimumSizeHint() const { return tqsizeHint(); } + TQSize minimumSizeHint() const { return sizeHint(); } /** * Sets the date. * @@ -113,7 +113,7 @@ public: /** * By calling this method with @p enable = true, CalendarPanel will show * a little close-button in the upper button-row. Clicking the - * close-button will cause the CalendarPanel's tqtopLevelWidget()'s close() + * close-button will cause the CalendarPanel's topLevelWidget()'s close() * method being called. This is mostly useful for toplevel datepickers * without a window manager decoration. * @see #hasCloseButton diff --git a/kplato/kptcanvasitem.cc b/kplato/kptcanvasitem.cc index 59690e3a..837fb48a 100644 --- a/kplato/kptcanvasitem.cc +++ b/kplato/kptcanvasitem.cc @@ -70,15 +70,15 @@ int PertNodeItem::RTTI = 2000; void PertNodeItem::setVisible(bool yes) { //kdDebug()<<k_funcinfo<<m_node.name()<<endl; - TQCanvasPolygon::tqsetVisible(yes); + TQCanvasPolygon::setVisible(yes); TQCanvasItemList list = canvas()->allItems(); TQCanvasItemList::Iterator it = list.begin(); for (; it != list.end(); ++it) { if ( *it == m_name ) - m_name->tqsetVisible(yes); + m_name->setVisible(yes); if ( *it == m_leader ) - m_leader->tqsetVisible(yes); + m_leader->setVisible(yes); } } @@ -88,7 +88,7 @@ void PertNodeItem::move(PertCanvas *view, int row, int col) m_row = row; m_col = col; view->mapNode(this); - // Now map my tqchildren + // Now map my children TQPtrListIterator<PertNodeRelation> it(m_childRelations); for (; it.current(); ++it) { @@ -274,7 +274,7 @@ PertRelationItem::PertRelationItem( PertCanvas *view, PertNodeItem *parent, Pert { //kdDebug()<<k_funcinfo<<"Parent="<<parent->node().name()<<" Child="<<child->node().name()<<endl; draw(); - tqsetVisible(true); + setVisible(true); } PertRelationItem::~PertRelationItem() @@ -708,10 +708,10 @@ void GanttViewSummaryItem::insertRelations(GanttView *view) { KDGanttViewTaskLink *link = new KDGanttViewTaskLink(this, child, kdLinkType(it.current()->type())); //TODO i18n - TQString t = i18n("From: %1").tqarg(this->listViewText(0)); - t += "\n" + i18n("To: %1").tqarg(child->listViewText(0)); + TQString t = i18n("From: %1").arg(this->listViewText(0)); + t += "\n" + i18n("To: %1").arg(child->listViewText(0)); if (it.current()->lag() > Duration::zeroDuration) { - t += "\n" + i18n("Lag: %1").tqarg(it.current()->lag().toString(Duration::Format_i18nDayTime)); + t += "\n" + i18n("Lag: %1").arg(it.current()->lag().toString(Duration::Format_i18nDayTime)); } link->setTooltipText(t); view->addTaskLink(link); @@ -789,10 +789,10 @@ void GanttViewTaskItem::insertRelations(GanttView *view) { KDGanttViewTaskLink *link = new KDGanttViewTaskLink(this, child, kdLinkType(it.current()->type())); //TODO i18n - TQString t = i18n("From: %1").tqarg(this->listViewText(0)); - t += "\n" + i18n("To: %1").tqarg(child->listViewText(0)); + TQString t = i18n("From: %1").arg(this->listViewText(0)); + t += "\n" + i18n("To: %1").arg(child->listViewText(0)); if (it.current()->lag() > Duration::zeroDuration) { - t += "\n" + i18n("Lag: %1").tqarg(it.current()->lag().toString(Duration::Format_i18nDayTime)); + t += "\n" + i18n("Lag: %1").arg(it.current()->lag().toString(Duration::Format_i18nDayTime)); } link->setTooltipText(t); view->addTaskLink(link); @@ -871,10 +871,10 @@ void GanttViewEventItem::insertRelations(GanttView *view) { KDGanttViewTaskLink *link = new KDGanttViewTaskLink(this, child, kdLinkType(it.current()->type())); - TQString t = i18n("From: %1").tqarg(this->listViewText(0)); - t += "\n" + i18n("To: %1").tqarg(child->listViewText(0)); + TQString t = i18n("From: %1").arg(this->listViewText(0)); + t += "\n" + i18n("To: %1").arg(child->listViewText(0)); if (it.current()->lag() > Duration::zeroDuration) { - t += "\n" + i18n("Lag: %1").tqarg(it.current()->lag().toString(Duration::Format_i18nDayTime)); + t += "\n" + i18n("Lag: %1").arg(it.current()->lag().toString(Duration::Format_i18nDayTime)); } link->setTooltipText(t); view->addTaskLink(link); diff --git a/kplato/kptcommand.cc b/kplato/kptcommand.cc index 662c0dd0..992bfb5c 100644 --- a/kplato/kptcommand.cc +++ b/kplato/kptcommand.cc @@ -347,7 +347,7 @@ NodeDeleteCmd::NodeDeleteCmd(Part *part, Node *node, TQString name) for (; it.current(); ++it) { Schedule *s = node->findSchedule(it.current()->id()); if (s && s->isScheduled()) { - // Only tqinvalidate schedules this node is part of + // Only invalidate schedules this node is part of addSchScheduled(it.current()); } } diff --git a/kplato/kptconfigbehaviorpanel.cc b/kplato/kptconfigbehaviorpanel.cc index 45cbf64a..9c74302b 100644 --- a/kplato/kptconfigbehaviorpanel.cc +++ b/kplato/kptconfigbehaviorpanel.cc @@ -33,7 +33,7 @@ #include <kstandarddirs.h> #include <kdebug.h> -#include <tqlayout.h> +#include <layout.h> #include <tqdatetime.h> #include <tqbuttongroup.h> #include <tqcheckbox.h> diff --git a/kplato/kptconfigdialog.cc b/kplato/kptconfigdialog.cc index 729d6443..2186d400 100644 --- a/kplato/kptconfigdialog.cc +++ b/kplato/kptconfigdialog.cc @@ -41,7 +41,7 @@ namespace KPlato // little helper stolen from kmail/kword static inline TQPixmap loadIcon( const char * name ) { return KGlobal::instance()->iconLoader() - ->loadIcon( TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); + ->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); } diff --git a/kplato/kptconfigtaskpanelbase.ui b/kplato/kptconfigtaskpanelbase.ui index 31e07542..178d1f08 100644 --- a/kplato/kptconfigtaskpanelbase.ui +++ b/kplato/kptconfigtaskpanelbase.ui @@ -25,7 +25,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -231,7 +231,7 @@ The estimation can be either effort based or duration based. If it is effort bas </widget> <widget class="TQLayoutWidget" row="3" column="2" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout41</cstring> + <cstring>layout41</cstring> </property> <hbox> <property name="name"> diff --git a/kplato/kptdatetable.cc b/kplato/kptdatetable.cc index afa06591..c4d8022d 100644 --- a/kplato/kptdatetable.cc +++ b/kplato/kptdatetable.cc @@ -32,7 +32,7 @@ #include <tqpainter.h> #include <tqdialog.h> #include <assert.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvaluelist.h> #include <kglobalsettings.h> @@ -88,7 +88,7 @@ DateTable::DateTable(TQWidget *parent, TQDate date_, const char* name, WFlags f) setFontSize(10); if(!date_.isValid()) { kdError() <<k_funcinfo<<"Given date is invalid, using current date." << endl; - date_=TQDate::tqcurrentDate(); + date_=TQDate::currentDate(); } setFocusPolicy( TQ_StrongFocus ); setNumCols(7+m_dateStartCol); // 7 days a week + maybe 1 for weeknumbers @@ -175,7 +175,7 @@ void DateTable::paintWeekNumber(TQPainter *painter, int row) { painter->drawRect(0, 0, w, h); painter->setPen(KGlobalSettings::textColor()); - painter->drawText(0, 0, w, h-1, AlignCenter, TQString("%1").tqarg(m_weeks[row].first), -1, &rect); + painter->drawText(0, 0, w, h-1, AlignCenter, TQString("%1").arg(m_weeks[row].first), -1, &rect); painter->setPen(colorLine); painter->moveTo(w-1, 0); painter->lineTo(w-1, h-1); @@ -232,7 +232,7 @@ void DateTable::paintDay(TQPainter *painter, int row, int col) { painter->lineTo(w-1, h-1); } // then paint square if current date - if (d == TQDate::tqcurrentDate()) { + if (d == TQDate::currentDate()) { painter->setPen(colorLine); painter->drawRect(1, 1, w-2, h-2); } @@ -317,7 +317,7 @@ void DateTable::keyPressEvent( TQKeyEvent *e ) { return; } if ( e->key() == TQt::Key_N ) { - setDate(TQDate::tqcurrentDate()); + setDate(TQDate::currentDate()); return; } if ( e->key() == TQt::Key_Control ) { @@ -353,7 +353,7 @@ void DateTable::setFontSize(int size) { maxCell.setHeight(TQMAX(maxCell.height(), rect.height())); } // ----- compare with a real wide number and add some space: - rect=metrics.boundingRect(TQString::tqfromLatin1("88")); + rect=metrics.boundingRect(TQString::fromLatin1("88")); maxCell.setWidth(TQMAX(maxCell.width()+2, rect.width())); maxCell.setHeight(TQMAX(maxCell.height()+4, rect.height())); } @@ -527,7 +527,7 @@ bool DateTable::selectDate(const TQDate& date_) { return true; } -bool DateTable::setDate(const TQDate& date_, bool tqrepaint) { +bool DateTable::setDate(const TQDate& date_, bool repaint) { //kdDebug()<<k_funcinfo<<"date="<<date_.toString()<<endl; bool changed=false; TQDate temp; @@ -562,7 +562,7 @@ bool DateTable::setDate(const TQDate& date_, bool tqrepaint) { m_selectedDates.insert(date); }*/ numDaysPrevMonth=temp.daysInMonth(); - if(changed && tqrepaint) { + if(changed && repaint) { repaintContents(false); } if (m_enabled) @@ -582,12 +582,12 @@ void DateTable::focusOutEvent( TQFocusEvent *e ) { TQGridView::focusOutEvent( e ); } -TQSize DateTable::tqsizeHint() const { +TQSize DateTable::sizeHint() const { if(maxCell.height()>0 && maxCell.width()>0) { return TQSize(maxCell.width()*numCols()+2*frameWidth(), (maxCell.height()+2)*numRows()+2*frameWidth()); } else { - //kdDebug() << "DateTable::tqsizeHint: obscure failure - " << endl; + //kdDebug() << "DateTable::sizeHint: obscure failure - " << endl; return TQSize(-1, -1); } } @@ -794,7 +794,7 @@ DateInternalMonthPicker::DateInternalMonthPicker } TQSize -DateInternalMonthPicker::tqsizeHint() const +DateInternalMonthPicker::sizeHint() const { return TQSize((max.width()+6)*numCols()+2*frameWidth(), (max.height()+6)*numRows()+2*frameWidth()); @@ -894,7 +894,7 @@ DateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e) updateCell( row, col /*, false */ ); // mark the new active cell } } - if ( tmpRow > -1 ) // tqrepaint the former active cell + if ( tmpRow > -1 ) // repaint the former active cell updateCell( tmpRow, tmpCol /*, true */ ); } } @@ -1053,7 +1053,7 @@ int PopupFrame::exec(TQPoint pos) { popup(pos); - tqrepaint(); + repaint(); tqApp->enter_loop(); hide(); return result; diff --git a/kplato/kptdatetable.h b/kplato/kptdatetable.h index 815a86e9..b75f98db 100644 --- a/kplato/kptdatetable.h +++ b/kplato/kptdatetable.h @@ -104,11 +104,11 @@ public: /** * The size hint. */ - TQSize tqsizeHint() const; + TQSize sizeHint() const; /** * The minimum size hint. */ - TQSize tqminimumSizeHint() const { return tqsizeHint(); } + TQSize minimumSizeHint() const { return sizeHint(); } /** * Return the result. 0 means no selection (reject()), 1..12 are the * months. @@ -260,7 +260,7 @@ public: /** * The constructor. */ - DateTable(TQWidget *parent=0, TQDate date=TQDate::tqcurrentDate(), + DateTable(TQWidget *parent=0, TQDate date=TQDate::currentDate(), const char* name="DateTable", WFlags f=0); /** @@ -268,9 +268,9 @@ public: * To save some time, the size of the largest used cell content is * calculated in each paintCell() call, since all calculations have * to be done there anyway. The size is stored in maxCell. The - * tqsizeHint() simply returns a multiple of maxCell. + * sizeHint() simply returns a multiple of maxCell. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** * Set the font size of the date table. */ @@ -278,7 +278,7 @@ public: /** * Select and display this date. */ - bool setDate(const TQDate&, bool tqrepaint=true); + bool setDate(const TQDate&, bool repaint=true); const TQDate& getDate() const; bool selectDate(const TQDate& date_); diff --git a/kplato/kptdoublelistviewbase.cc b/kplato/kptdoublelistviewbase.cc index 2780d166..f855509c 100644 --- a/kplato/kptdoublelistviewbase.cc +++ b/kplato/kptdoublelistviewbase.cc @@ -23,10 +23,10 @@ #include "kptview.h" #include <tqheader.h> -#include <tqlayout.h> +#include <layout.h> #include <tqmap.h> #include <tqpainter.h> -#include <tqpalette.h> +#include <palette.h> #include <tqptrvector.h> #include <tqsplitter.h> #include <tqstring.h> @@ -128,7 +128,7 @@ void DoubleListViewBase::SlaveListItem::clearColumn(int col) { } void DoubleListViewBase::SlaveListItem::setColumn(int col, double value) { if (col < listView()->columns()) { - //setText(col, TQString("%1").tqarg(value, m_fieldwidth, m_fmt, m_prec)); + //setText(col, TQString("%1").arg(value, m_fieldwidth, m_fmt, m_prec)); setText(col, KGlobal::locale()->formatNumber(value, m_prec)); m_valueMap.replace(col, value); //kdDebug()<<k_funcinfo<<m_masterItem->text(0)<<": column["<<col<<"]="<<value<<endl; @@ -240,14 +240,14 @@ void DoubleListViewBase::MasterListItem::slaveItemDeleted() { void DoubleListViewBase::MasterListItem::setTotal(double tot) { m_value = tot; - //setText(1, TQString("%1").tqarg(tot, m_fieldwidth, m_fmt, m_prec)); + //setText(1, TQString("%1").arg(tot, m_fieldwidth, m_fmt, m_prec)); setText(1, KGlobal::locale()->formatNumber(tot, m_prec)); //kdDebug()<<k_funcinfo<<text(0)<<"="<<tot<<endl; } void DoubleListViewBase::MasterListItem::addToTotal(double v) { m_value += v; - //setText(1, TQString("%1").tqarg(m_value, m_fieldwidth, m_fmt, m_prec)); + //setText(1, TQString("%1").arg(m_value, m_fieldwidth, m_fmt, m_prec)); setText(1, KGlobal::locale()->formatNumber(m_value, m_prec)); } @@ -388,9 +388,9 @@ DoubleListViewBase::DoubleListViewBase(TQWidget *parent, bool description) } -TQSize DoubleListViewBase::tqsizeHint() const { - //kdDebug()<<k_funcinfo<<tqminimumSizeHint()<<endl; - return tqminimumSizeHint(); //HACK: koshell splitter problem +TQSize DoubleListViewBase::sizeHint() const { + //kdDebug()<<k_funcinfo<<minimumSizeHint()<<endl; + return minimumSizeHint(); //HACK: koshell splitter problem } void DoubleListViewBase::clearSlaveList() { diff --git a/kplato/kptdoublelistviewbase.h b/kplato/kptdoublelistviewbase.h index aaaaf305..6b610475 100644 --- a/kplato/kptdoublelistviewbase.h +++ b/kplato/kptdoublelistviewbase.h @@ -83,7 +83,7 @@ public: void setFormat(int fieldwidth=0, char fmt='f', int prec=0); void setMasterFormat(int fieldwidth=0, char fmt='f', int prec=0); void setSlaveFormat(int fieldwidth=0, char fmt='f', int prec=0); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; class MasterListItem; class SlaveListItem : public KListViewItem { @@ -125,7 +125,7 @@ public: MasterListItem(TQListViewItem *parent, TQString text, bool highlight=false); ~MasterListItem(); - /// Creates slaveitems for myself and my tqchildren + /// Creates slaveitems for myself and my children void createSlaveItems(TQListView *lv, TQListViewItem *after=0); void slaveItemDeleted(); void setSlaveOpen(bool on); diff --git a/kplato/kptduration.cc b/kplato/kptduration.cc index 5e9d6b44..0a2296b0 100644 --- a/kplato/kptduration.cc +++ b/kplato/kptduration.cc @@ -129,11 +129,11 @@ TQString Duration::toString(Format format) const { hours = ms / (1000 * 60 * 60); ms -= (TQ_INT64)hours * (1000 * 60 * 60); minutes = ms / (1000 * 60); - result = TQString("%1h%2m").tqarg(hours).tqarg(minutes); + result = TQString("%1h%2m").arg(hours).arg(minutes); break; case Format_Day: days = m_ms / (1000 * 60 * 60 * 24.0); - result = TQString("%1d").tqarg(TQString::number(days, 'f', 4)); + result = TQString("%1d").arg(TQString::number(days, 'f', 4)); break; case Format_DayTime: ms = m_ms; @@ -156,7 +156,7 @@ TQString Duration::toString(Format format) const { hours = ms / (1000 * 60 * 60); ms -= (TQ_INT64)hours * (1000 * 60 * 60); minutes = ms / (1000 * 60); - result = i18n("<hours>h:<minutes>m", "%1h:%2m").tqarg(hours).tqarg(minutes); + result = i18n("<hours>h:<minutes>m", "%1h:%2m").arg(hours).arg(minutes); break; case Format_i18nDay: result = KGlobal::locale()->formatNumber(toDouble(Unit_d), 2); @@ -174,7 +174,7 @@ TQString Duration::toString(Format format) const { if (days == 0) { result = toString(Format_i18nHour); } else { - result = i18n("<days>d <hours>h:<minutes>m", "%1d %2h:%3m").tqarg(days).tqarg(hours).tqarg(minutes); + result = i18n("<days>d <hours>h:<minutes>m", "%1d %2h:%3m").arg(days).arg(hours).arg(minutes); } break; case Format_i18nHourFraction: diff --git a/kplato/kptdurationwidget.ui b/kplato/kptdurationwidget.ui index a923dab4..74018692 100644 --- a/kplato/kptdurationwidget.ui +++ b/kplato/kptdurationwidget.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -48,13 +48,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32676</width> <height>20</height> @@ -106,13 +106,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>70</width> <height>32767</height> @@ -125,7 +125,7 @@ <property name="frame"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignRight</set> </property> </widget> @@ -163,7 +163,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -175,7 +175,7 @@ <property name="frame"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignRight</set> </property> </widget> @@ -202,7 +202,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -214,7 +214,7 @@ <property name="frame"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignRight</set> </property> </widget> @@ -252,7 +252,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -264,7 +264,7 @@ <property name="frame"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignRight</set> </property> </widget> @@ -302,13 +302,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -320,7 +320,7 @@ <property name="frame"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignRight</set> </property> </widget> diff --git a/kplato/kptganttview.cc b/kplato/kptganttview.cc index 925598f9..fa5bca1e 100644 --- a/kplato/kptganttview.cc +++ b/kplato/kptganttview.cc @@ -45,7 +45,7 @@ #include <tqsplitter.h> #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqheader.h> #include <tqpopupmenu.h> @@ -73,8 +73,8 @@ public: MyKDGanttView(TQWidget *parent, const char *name) : KDGanttView(parent, name) { } - virtual TQSize tqsizeHint() const { - return tqminimumSizeHint(); //HACK: koshell splitter tqminimumSize problem + virtual TQSize sizeHint() const { + return minimumSizeHint(); //HACK: koshell splitter minimumSize problem } }; @@ -322,7 +322,7 @@ void GanttView::resetDrawn(KDGanttViewItem *_item) for (; item; item = nextItem) { nextItem = item->nextSibling(); setDrawn(item, false); - resetDrawn(item->firstChild()); // then my tqchildren + resetDrawn(item->firstChild()); // then my children } } @@ -336,7 +336,7 @@ void GanttView::removeNotDrawn(KDGanttViewItem *_item) m_currentItem = 0; deleteItem(item); } else { - removeNotDrawn(item->firstChild()); // then my tqchildren + removeNotDrawn(item->firstChild()); // then my children } } } @@ -502,10 +502,10 @@ void GanttView::modifySummaryTask(KDGanttViewItem *item, Task *task) } else { item->setText(TQString()); } - TQString w = i18n("Name: %1").tqarg(task->name()); + TQString w = i18n("Name: %1").arg(task->name()); if (!task->notScheduled()) { - w += "\n" + i18n("Start: %1").tqarg(locale->formatDateTime(task->startTime())); - w += "\n" + i18n("End: %1").tqarg(locale->formatDateTime(task->endTime())); + w += "\n" + i18n("Start: %1").arg(locale->formatDateTime(task->startTime())); + w += "\n" + i18n("End: %1").arg(locale->formatDateTime(task->endTime())); } bool ok = true; if (task->notScheduled()) { @@ -582,15 +582,15 @@ void GanttView::modifyTask(KDGanttViewItem *item, Task *task) item->setFloatStartTime(TQDateTime()); item->setFloatEndTime(TQDateTime()); } - TQString w = i18n("Name: %1").tqarg(task->name()); + TQString w = i18n("Name: %1").arg(task->name()); if (!task->notScheduled()) { - w += "\n"; w += i18n("Start: %1").tqarg(locale->formatDateTime(task->startTime())); - w += "\n"; w += i18n("End: %1").tqarg(locale->formatDateTime(task->endTime())); + w += "\n"; w += i18n("Start: %1").arg(locale->formatDateTime(task->startTime())); + w += "\n"; w += i18n("End: %1").arg(locale->formatDateTime(task->endTime())); if (m_showProgress) { - w += "\n"; w += i18n("Completion: %1%").tqarg(task->progress().percentFinished); + w += "\n"; w += i18n("Completion: %1%").arg(task->progress().percentFinished); } if (task->positiveFloat() > Duration::zeroDuration) { - w += "\n" + i18n("Float: %1").tqarg(task->positiveFloat().toString(Duration::Format_i18nDayTime)); + w += "\n" + i18n("Float: %1").arg(task->positiveFloat().toString(Duration::Format_i18nDayTime)); } if (task->inCriticalPath()) { w += "\n" + i18n("Critical path"); @@ -623,7 +623,7 @@ void GanttView::modifyTask(KDGanttViewItem *item, Task *task) if (task->resourceOverbooked()) { ok = false; TQStringList rl = task->overbookedResources(); - sts += "\n" + i18n("arg: list of resources", "Resource overbooked: %1").tqarg(rl.join(",")); + sts += "\n" + i18n("arg: list of resources", "Resource overbooked: %1").arg(rl.join(",")); } if (!m_showNoInformation && m_project && m_project->notScheduled()) { @@ -684,12 +684,12 @@ void GanttView::modifyMilestone(KDGanttViewItem *item, Task *task) } //TODO: Show progress - TQString w = i18n("Name: %1").tqarg(task->name()); + TQString w = i18n("Name: %1").arg(task->name()); if (!task->notScheduled()) { - w += "\n" + i18n("Time: %1").tqarg(locale->formatDateTime(task->startTime())); + w += "\n" + i18n("Time: %1").arg(locale->formatDateTime(task->startTime())); if (task->positiveFloat() > Duration::zeroDuration) { - w += "\n" + i18n("Float: %1").tqarg(task->positiveFloat().toString(Duration::Format_i18nDayTime)); + w += "\n" + i18n("Float: %1").arg(task->positiveFloat().toString(Duration::Format_i18nDayTime)); } if (task->inCriticalPath()) { w += "\n" + i18n("Critical path"); @@ -1048,7 +1048,7 @@ void GanttView::print(KPrinter &prt) { p.drawRect(0,0,metrics.width(),metrics.height()); TQString text; int hei = 0; - text = KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()); + text = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); TQRect r = p.boundingRect(metrics.width()-1,0,0,0, TQt::AlignRight, text ); p.drawText( r, TQt::AlignRight, text ); hei = r.height(); diff --git a/kplato/kptintervaleditbase.ui b/kplato/kptintervaleditbase.ui index 76b00dc4..4967bd4a 100644 --- a/kplato/kptintervaleditbase.ui +++ b/kplato/kptintervaleditbase.ui @@ -50,7 +50,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -70,7 +70,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> diff --git a/kplato/kptmainprojectdialog.cc b/kplato/kptmainprojectdialog.cc index a9f40ae0..ee8ed8fc 100644 --- a/kplato/kptmainprojectdialog.cc +++ b/kplato/kptmainprojectdialog.cc @@ -39,7 +39,7 @@ MainProjectDialog::MainProjectDialog(Project &p, TQWidget *parent, const char *n setMainWidget(panel); enableButtonOK(false); - resize( TQSize(500, 410).expandedTo(tqminimumSizeHint())); + resize( TQSize(500, 410).expandedTo(minimumSizeHint())); connect(panel, TQT_SIGNAL(obligatedFieldsFilled(bool)), TQT_SLOT(enableButtonOK(bool))); } diff --git a/kplato/kptmainprojectpanel.cc b/kplato/kptmainprojectpanel.cc index 222ca0a9..29f2195e 100644 --- a/kplato/kptmainprojectpanel.cc +++ b/kplato/kptmainprojectpanel.cc @@ -62,7 +62,7 @@ MainProjectPanel::MainProjectPanel(Project &p, TQWidget *parent, const char *nam TQString s = i18n("Scheduling"); Schedule *sch = project.currentSchedule(); if (sch) { - s = i18n("Scheduling (%1)").tqarg(sch->typeToString(true)); + s = i18n("Scheduling (%1)").arg(sch->typeToString(true)); } schedulingGroup->setTitle(s); if (project.constraint() == Node::MustStartOn) { diff --git a/kplato/kptmainprojectpanelbase.ui b/kplato/kptmainprojectpanelbase.ui index f6622781..5a0ccb9a 100644 --- a/kplato/kptmainprojectpanelbase.ui +++ b/kplato/kptmainprojectpanelbase.ui @@ -25,7 +25,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <grid> <property name="name"> @@ -46,7 +46,7 @@ <property name="text"> <string>&Leader:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> <property name="buddy" stdset="0"> @@ -88,7 +88,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>270</width> <height>20</height> @@ -99,7 +99,7 @@ <property name="name"> <cstring>wbs</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> diff --git a/kplato/kptmilestoneprogresspanel.cc b/kplato/kptmilestoneprogresspanel.cc index b5c1af0a..67b88443 100644 --- a/kplato/kptmilestoneprogresspanel.cc +++ b/kplato/kptmilestoneprogresspanel.cc @@ -85,7 +85,7 @@ void MilestoneProgressPanelImpl::slotChanged() { void MilestoneProgressPanelImpl::slotFinishedChanged(bool state) { if (state) { if (!finishTime->dateTime().isValid()) { - finishTime->setDateTime(TQDateTime::tqcurrentDateTime()); + finishTime->setDateTime(TQDateTime::currentDateTime()); } } enableWidgets(); diff --git a/kplato/kptmilestoneprogresspanelbase.ui b/kplato/kptmilestoneprogresspanelbase.ui index 97a06f4d..9856eca5 100644 --- a/kplato/kptmilestoneprogresspanelbase.ui +++ b/kplato/kptmilestoneprogresspanelbase.ui @@ -43,7 +43,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kplato/kptnode.cc b/kplato/kptnode.cc index 1da218e6..c95a1c9b 100644 --- a/kplato/kptnode.cc +++ b/kplato/kptnode.cc @@ -96,7 +96,7 @@ void Node::init() { m_visitedForward = false; m_visitedBackward = false; - m_dateOnlyStartDate = m_dateOnlyEndDate = TQDate::tqcurrentDate(); + m_dateOnlyStartDate = m_dateOnlyEndDate = TQDate::currentDate(); m_dateOnlyDuration.addDays(1); m_runningAccount = 0; @@ -942,7 +942,7 @@ int Effort::pessimisticRatio() const { // Debugging #ifndef NDEBUG -void Node::printDebug(bool tqchildren, TQCString indent) { +void Node::printDebug(bool children, TQCString indent) { kdDebug()<<indent<<" Unique node identity="<<m_id<<endl; if (m_effort) m_effort->printDebug(indent); TQString s = " Constraint: " + constraintToString(); @@ -972,7 +972,7 @@ void Node::printDebug(bool tqchildren, TQCString indent) { } kdDebug()<<indent<<" No of successors: "<<m_dependChildNodes.count()<<endl; TQPtrListIterator<Relation> cit(m_dependChildNodes); - //kdDebug()<<indent<<" Dependant tqchildren="<<cit.count()<<endl; + //kdDebug()<<indent<<" Dependant children="<<cit.count()<<endl; if (cit.count() > 0) { for ( ; cit.current(); ++cit ) { cit.current()->printDebug(indent); @@ -981,7 +981,7 @@ void Node::printDebug(bool tqchildren, TQCString indent) { //kdDebug()<<indent<<endl; indent += " "; - if (tqchildren) { + if (children) { TQPtrListIterator<Node> it(m_nodes); for ( ; it.current(); ++it ) { it.current()->printDebug(true,indent); diff --git a/kplato/kptnode.h b/kplato/kptnode.h index 95d7c24b..10c5613f 100644 --- a/kplato/kptnode.h +++ b/kplato/kptnode.h @@ -91,7 +91,7 @@ public: virtual bool load(TQDomElement &) { return true; } virtual bool load(TQDomElement &, Project &) { return true; } virtual void save(TQDomElement &element) const = 0; - /// Save my and my tqchildrens relations. + /// Save my and my childrens relations. virtual void saveRelations(TQDomElement &element) const; // simple child node management @@ -458,7 +458,7 @@ public: void setRunningAccount(Account *acc) { m_runningAccount = acc; } Schedule *currentSchedule() const { return m_currentSchedule; } - /// Set current schedule to schedule with identity id, for me and my tqchildren + /// Set current schedule to schedule with identity id, for me and my children virtual void setCurrentSchedule(long id); // NOTE: Cannot use setCurrentSchedule() due to overload/casting problems void setCurrentSchedulePtr(Schedule *schedule) { m_currentSchedule = schedule; } @@ -541,7 +541,7 @@ private: #ifndef NDEBUG public: - virtual void printDebug(bool tqchildren, TQCString indent); + virtual void printDebug(bool children, TQCString indent); #endif }; diff --git a/kplato/kptpart.cc b/kplato/kptpart.cc index e442c048..7ff06084 100644 --- a/kplato/kptpart.cc +++ b/kplato/kptpart.cc @@ -198,14 +198,14 @@ bool Part::loadXML(TQIODevice *, const TQDomDocument &document) { } else if (value != "application/x-vnd.kde.kplato") { kdError() << "Unknown mime type " << value << endl; - setErrorMessage(i18n("Invalid document. Expected mimetype application/x-vnd.kde.kplato, got %1").tqarg(value)); + setErrorMessage(i18n("Invalid document. Expected mimetype application/x-vnd.kde.kplato, got %1").arg(value)); return false; } TQString m_syntaxVersion = plan.attribute("version", CURRENT_SYNTAX_VERSION); if (m_syntaxVersion > CURRENT_SYNTAX_VERSION) { int ret = KMessageBox::warningContinueCancel( 0, i18n("This document was created with a newer version of KPlato (syntax version: %1)\n" - "Opening it in this version of KPlato will lose some information.").tqarg(m_syntaxVersion), + "Opening it in this version of KPlato will lose some information.").arg(m_syntaxVersion), i18n("File-Format Mismatch"), i18n("Continue") ); if (ret == KMessageBox::Cancel) { diff --git a/kplato/kptpertcanvas.cc b/kplato/kptpertcanvas.cc index b1f49afb..09a3e744 100644 --- a/kplato/kptpertcanvas.cc +++ b/kplato/kptpertcanvas.cc @@ -25,7 +25,7 @@ #include <tqbuffer.h> #include <tqtimer.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqprogressdialog.h> #include <tqobjectlist.h> #include <tqpainter.h> @@ -83,7 +83,7 @@ void PertCanvas::draw(Project& project) if (!(it.current()->hasParent()) && it.current()->hasChild()) { m_rows.append(new TQMemArray<bool>(1)); // New node always goes into new row, first column - it.current()->move(this, m_rows.count()-1, 0); // item also moves it's tqchildren + it.current()->move(this, m_rows.count()-1, 0); // item also moves it's children } } // now items without relations @@ -140,7 +140,7 @@ void PertCanvas::createChildItems(PertNodeItem *parentItem) m_relations.append(it.current()); } - // Now my tqchildren + // Now my children TQPtrListIterator<Node> nit(parentItem->node().childNodeIterator()); for ( ; nit.current(); ++nit ) { createChildItems(createNodeItem(nit.current())); diff --git a/kplato/kptpertview.cc b/kplato/kptpertview.cc index 02830d37..f573e310 100644 --- a/kplato/kptpertview.cc +++ b/kplato/kptpertview.cc @@ -30,7 +30,7 @@ #include <tqsplitter.h> #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqheader.h> #include <tqpopupmenu.h> @@ -40,19 +40,19 @@ namespace KPlato { -PertView::PertView( View *view, TQWidget *parent, TQLayout *tqlayout ) +PertView::PertView( View *view, TQWidget *parent, TQLayout *layout ) : TQWidget( parent, "Pert view" ), m_mainview( view ), m_node( 0 ) { - init(tqlayout); + init(layout); } PertView::~PertView() { } -void PertView::init(TQLayout */*tqlayout*/) +void PertView::init(TQLayout */*layout*/) { //kdDebug()<<k_funcinfo<<endl; TQGridLayout *gl = new TQGridLayout(this, 1, 1, -1, -1, "Pert TQGridLayout"); diff --git a/kplato/kptpertview.h b/kplato/kptpertview.h index b98b2cae..4937a421 100644 --- a/kplato/kptpertview.h +++ b/kplato/kptpertview.h @@ -44,7 +44,7 @@ class PertView : public TQWidget public: - PertView( View *view, TQWidget *parent, TQLayout *tqlayout ); + PertView( View *view, TQWidget *parent, TQLayout *layout ); ~PertView(); @@ -70,7 +70,7 @@ signals: void modifyRelation(Relation *rel); private: - void init(TQLayout *tqlayout); + void init(TQLayout *layout); View *m_mainview; PertCanvas *m_canvasview; Node *m_node; diff --git a/kplato/kptproject.cc b/kplato/kptproject.cc index 9379de4a..4b91916d 100644 --- a/kplato/kptproject.cc +++ b/kplato/kptproject.cc @@ -31,7 +31,7 @@ #include <tqdom.h> #include <tqstring.h> #include <tqdatetime.h> -#include <tqbrush.h> +#include <brush.h> #include <tqcanvas.h> #include <tqptrlist.h> @@ -56,7 +56,7 @@ Project::Project(Node *parent) void Project::init() { if (m_parent == 0) { // set sensible defaults for a project wo parent - m_constraintStartTime = TQDateTime(TQDate::tqcurrentDate(), TQTime()); + m_constraintStartTime = TQDateTime(TQDate::currentDate(), TQTime()); m_constraintEndTime = TQDateTime(m_constraintStartTime.addDays(1)); } m_calendars.setAutoDelete(true); @@ -308,7 +308,7 @@ bool Project::load(TQDomElement &element) { if (!s.isEmpty()) m_constraintEndTime = DateTime::fromString(s); - // Load the project tqchildren + // Load the project children // Must do these first TQDomNodeList list = element.childNodes(); for (unsigned int i=0; i<list.count(); ++i) { @@ -498,7 +498,7 @@ void Project::save(TQDomElement &element) const { } for (int i=0; i<numChildren(); i++) - // Save all tqchildren + // Save all children getChildNode(i)->save(me); // Now we can save relations assuming no tasks have relations outside the project @@ -568,7 +568,7 @@ bool Project::addTask( Node* task, Node* position ) return addSubTask(task, position); } // find the position - // we have to tell the parent that we want to delete one of its tqchildren + // we have to tell the parent that we want to delete one of its children Node* parentNode = position->getParent(); if ( !parentNode ) { kdDebug()<<k_funcinfo<<"parent node not found???"<<endl; @@ -636,7 +636,7 @@ bool Project::canIndentTask(Node* node) //kdDebug()<<k_funcinfo<<"The root node cannot be indented"<<endl; return false; } - // we have to find the parent of task to manipulate its list of tqchildren + // we have to find the parent of task to manipulate its list of children Node* parentNode = node->getParent(); if ( !parentNode ) { return false; @@ -679,7 +679,7 @@ bool Project::canUnindentTask( Node* node ) //kdDebug()<<k_funcinfo<<"The root node cannot be unindented"<<endl; return false; } - // we have to find the parent of task to manipulate its list of tqchildren + // we have to find the parent of task to manipulate its list of children // and we need the parent's parent too Node* parentNode = node->getParent(); if ( !parentNode ) { @@ -714,7 +714,7 @@ bool Project::canMoveTaskUp( Node* node ) { if (node == 0) return false; // safety - // we have to find the parent of task to manipulate its list of tqchildren + // we have to find the parent of task to manipulate its list of children Node* parentNode = node->getParent(); if (!parentNode) { //kdDebug()<<k_funcinfo<<"No parent found"<<endl; @@ -742,7 +742,7 @@ bool Project::canMoveTaskDown( Node* node ) { if (node == 0) return false; // safety - // we have to find the parent of task to manipulate its list of tqchildren + // we have to find the parent of task to manipulate its list of children Node* parentNode = node->getParent(); if (!parentNode) { return false; @@ -779,10 +779,10 @@ Task *Project::createTask(Task &def, Node* parent) { TQString Project::uniqueNodeId(int seed) { int i = seed; - while (findNode(TQString("%1").tqarg(i))) { + while (findNode(TQString("%1").arg(i))) { ++i; } - return TQString("%1").tqarg(i); + return TQString("%1").arg(i); } bool Project::removeId(const TQString &id) { @@ -987,7 +987,7 @@ void Project::setStandardWorktime(StandardWorktime * worktime) { } bool Project::legalToLink(Node *par, Node *child) { - //kdDebug()<<k_funcinfo<<par.name()<<" ("<<par.numDependParentNodes()<<" parents) "<<child.name()<<" ("<<child.numDependChildNodes()<<" tqchildren)"<<endl; + //kdDebug()<<k_funcinfo<<par.name()<<" ("<<par.numDependParentNodes()<<" parents) "<<child.name()<<" ("<<child.numDependChildNodes()<<" children)"<<endl; if (!child || par->isDependChildOf(child)) { return false; @@ -1007,7 +1007,7 @@ bool Project::legalToLink(Node *par, Node *child) { bool Project::legalParents(Node *par, Node *child) { bool legal = true; - //kdDebug()<<k_funcinfo<<par->name()<<" ("<<par->numDependParentNodes()<<" parents) "<<child->name()<<" ("<<child->numDependChildNodes()<<" tqchildren)"<<endl; + //kdDebug()<<k_funcinfo<<par->name()<<" ("<<par->numDependParentNodes()<<" parents) "<<child->name()<<" ("<<child->numDependChildNodes()<<" children)"<<endl; for (int i=0; i < par->numDependParentNodes() && legal; ++i) { Node *pNode = par->getDependParentNode(i)->parent(); if (child->isParentOf(pNode) || pNode->isParentOf(child)) { @@ -1024,7 +1024,7 @@ bool Project::legalParents(Node *par, Node *child) { bool Project::legalChildren(Node *par, Node *child) { bool legal = true; - //kdDebug()<<k_funcinfo<<par->name()<<" ("<<par->numDependParentNodes()<<" parents) "<<child->name()<<" ("<<child->numDependChildNodes()<<" tqchildren)"<<endl; + //kdDebug()<<k_funcinfo<<par->name()<<" ("<<par->numDependParentNodes()<<" parents) "<<child->name()<<" ("<<child->numDependChildNodes()<<" children)"<<endl; for (int j=0; j < child->numDependChildNodes() && legal; ++j) { Node *cNode = child->getDependChildNode(j)->child(); if (par->isParentOf(cNode) || cNode->isParentOf(par)) { @@ -1079,7 +1079,7 @@ void Project::insertCalendarId(const TQString &id, const Calendar *calendar) { } #ifndef NDEBUG -void Project::printDebug(bool tqchildren, TQCString indent) { +void Project::printDebug(bool children, TQCString indent) { kdDebug()<<indent<<"+ Project node: "<<name()<<endl; indent += "!"; @@ -1087,7 +1087,7 @@ void Project::printDebug(bool tqchildren, TQCString indent) { for ( ; it.current(); ++it) it.current()->printDebug(indent); - Node::printDebug(tqchildren, indent); + Node::printDebug(children, indent); } void Project::printCalendarDebug(TQCString indent) { kdDebug()<<indent<<"-------- Calendars debug printout --------"<<endl; diff --git a/kplato/kptproject.h b/kplato/kptproject.h index 14f03384..d0dd1eb9 100644 --- a/kplato/kptproject.h +++ b/kplato/kptproject.h @@ -223,11 +223,11 @@ public: Accounts &accounts() { return m_accounts; } - /// Set current schedule to schedule with identity id, for me and my tqchildren + /// Set current schedule to schedule with identity id, for me and my children virtual void setCurrentSchedule(long id); /// Create new schedule with unique id. MainSchedule *createSchedule(TQString name, Schedule::Type type); - /// Set parent schedule for my tqchildren + /// Set parent schedule for my children virtual void setParentSchedule(Schedule *sch); protected: @@ -267,7 +267,7 @@ private: #ifndef NDEBUG #include <tqcstring.h> public: - void printDebug(bool tqchildren, TQCString indent); + void printDebug(bool children, TQCString indent); void printCalendarDebug(TQCString indent=""); #ifdef DEBUGPERT static void pert_test(); diff --git a/kplato/kptprojectdialog.cc b/kplato/kptprojectdialog.cc index a45bddf2..4b9b8139 100644 --- a/kplato/kptprojectdialog.cc +++ b/kplato/kptprojectdialog.cc @@ -20,12 +20,12 @@ #include <tqpushbutton.h> #include <tqcombobox.h> #include <tqlabel.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqlineedit.h> #include <tqdatetimeedit.h> #include <tqdatetime.h> #include <tqtabwidget.h> -#include <tqtextbrowser.h> +#include <textbrowser.h> #include <kdatepicker.h> #include <klocale.h> @@ -91,24 +91,24 @@ void ProjectDialog::slotSchedulingChanged(int activated) { switch(activated) { // TODO please provide nice explenations on this. case 0: // ASAP - label = label.tqarg(i18n("As Soon as Possible")); - label = label.tqarg(i18n("Place all events at the earliest possible moment permitted in the schedule")); + label = label.arg(i18n("As Soon as Possible")); + label = label.arg(i18n("Place all events at the earliest possible moment permitted in the schedule")); break; case 1: // ALAP - label = label.tqarg(i18n("As Late as Possible")); - label = label.tqarg(i18n("Place all events at the last possible moment permitted in the schedule")); + label = label.arg(i18n("As Late as Possible")); + label = label.arg(i18n("Place all events at the last possible moment permitted in the schedule")); break; case 2: // Start not earlier then - label = label.tqarg(i18n("Start not Earlier then")); - label = label.tqarg(i18n("")); + label = label.arg(i18n("Start not Earlier then")); + label = label.arg(i18n("")); break; case 3: // Finish not later then - label = label.tqarg(i18n("Finish not Later then")); - label = label.tqarg(i18n("")); + label = label.arg(i18n("Finish not Later then")); + label = label.arg(i18n("")); break; case 4: // Must start on - label = label.tqarg(i18n("Must Start on")); - label = label.tqarg(i18n("")); + label = label.arg(i18n("Must Start on")); + label = label.arg(i18n("")); break; default: // error ... dia->lSchedulingExplain->setText(""); diff --git a/kplato/kptprojectdialogbase.ui b/kplato/kptprojectdialogbase.ui index 2dab71fe..8eb79e69 100644 --- a/kplato/kptprojectdialogbase.ui +++ b/kplato/kptprojectdialogbase.ui @@ -33,7 +33,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -153,7 +153,7 @@ <property name="name"> <cstring>schedulerDate</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>200</height> @@ -201,7 +201,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>20</height> diff --git a/kplato/kptrelationdialog.cc b/kplato/kptrelationdialog.cc index c79adb6f..f10a5022 100644 --- a/kplato/kptrelationdialog.cc +++ b/kplato/kptrelationdialog.cc @@ -25,7 +25,7 @@ #include "kptdurationwidget.h" #include "relationpanel.h" -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <tqlabel.h> #include <tqbuttongroup.h> diff --git a/kplato/kptreportview.cc b/kplato/kptreportview.cc index 655d1907..a79f34e9 100644 --- a/kplato/kptreportview.cc +++ b/kplato/kptreportview.cc @@ -45,7 +45,7 @@ #include <tqfileinfo.h> #include <tqheader.h> #include <tqpopupmenu.h> -#include <tqlayout.h> +#include <layout.h> #include <tqdom.h> #include <tqstringlist.h> @@ -83,7 +83,7 @@ public: if (!tag.contains('.')) { // global tags if (tag == "currentdate") { - return l->formatDate(TQDate::tqcurrentDate(), true); + return l->formatDate(TQDate::currentDate(), true); } return TQString(); } @@ -127,7 +127,7 @@ public: if (tag.section(".", 1, 1) == "availableuntil") return (m_resource ? l->formatDate(m_resource->availableUntil().date(), true) : TQString()); if (tag.section(".", 1, 1) == "units") - return (m_resource ? TQString("%1%").tqarg(m_resource->units()) : TQString()); + return (m_resource ? TQString("%1%").arg(m_resource->units()) : TQString()); if (tag.section(".", 1, 1) == "normalrate") return (m_resource ? l->formatMoney(m_resource->normalRate()) : TQString()); if (tag.section(".", 1, 1) == "overtimerate") @@ -494,11 +494,11 @@ void ReportView::loadTemplate(TQDomDocument &doc) { m_reportTags->m_project = &(mainView()->getPart()->getProject()); // Get all the child report elements - TQDomNodeList tqchildren = tpl.childNodes(); - int childCount = tqchildren.length(); + TQDomNodeList children = tpl.childNodes(); + int childCount = children.length(); for(int j = 0; j < childCount; j++){ - child = tqchildren.item(j); + child = children.item(j); if(child.nodeType() == TQDomNode::ElementNode) { TQDomElement e = child.toElement(); //kdDebug()<<child.nodeName()<<endl; @@ -526,10 +526,10 @@ void ReportView::loadTemplate(TQDomDocument &doc) { void ReportView::handleHeader(TQDomNode &node) { TQDomNode child; - TQDomNodeList tqchildren = node.childNodes(); - int childCount = tqchildren.length(); + TQDomNodeList children = node.childNodes(); + int childCount = children.length(); for (int j = 0; j < childCount; j++) { - child = tqchildren.item(j); + child = children.item(j); if (child.nodeName() == "Label") { TQDomNode n = child.attributes().namedItem("Text"); TQString s = n.nodeValue(); @@ -658,14 +658,14 @@ void ReportView::getTemplateFile(const TQString &tpl) { if (!url.isValid()) { - KMessageBox::sorry(this,i18n("Malformed template filename: %1").tqarg(url.prettyURL())); + KMessageBox::sorry(this,i18n("Malformed template filename: %1").arg(url.prettyURL())); } else { if (KIO::NetAccess::download(url,localtpl,this)) isTemp = true; else - KMessageBox::sorry(this,i18n("Unable to download template file: %1").tqarg(url.prettyURL())); + KMessageBox::sorry(this,i18n("Unable to download template file: %1").arg(url.prettyURL())); } if (!localtpl.isNull()) diff --git a/kplato/kptrequestresourcespanel.cc b/kplato/kptrequestresourcespanel.cc index d65f86e7..bca9a208 100644 --- a/kplato/kptrequestresourcespanel.cc +++ b/kplato/kptrequestresourcespanel.cc @@ -72,7 +72,7 @@ void ResourceTableItem::insert(TQTable *table, int row) { } GroupLVItem::GroupLVItem(TQListView *parent, ResourceGroup *group, Task &task) - : TQListViewItem(parent, group->name(), TQString("%1").tqarg(group->units())), + : TQListViewItem(parent, group->name(), TQString("%1").arg(group->units())), m_group(group), m_units(0) { diff --git a/kplato/kptresource.cc b/kplato/kptresource.cc index 448074ae..2c218fe9 100644 --- a/kplato/kptresource.cc +++ b/kplato/kptresource.cc @@ -203,7 +203,7 @@ Resource::Resource(Project *project) : m_project(project), m_schedules(), m_work m_type = Type_Work; m_units = 100; // % - m_availableFrom = DateTime(TQDate::tqcurrentDate()); + m_availableFrom = DateTime(TQDate::currentDate()); m_availableUntil = TQDateTime(m_availableFrom.addYears(2)); cost.normalRate = 100; diff --git a/kplato/kptresourceappointmentsview.cc b/kplato/kptresourceappointmentsview.cc index 4b6d7a44..5531156f 100644 --- a/kplato/kptresourceappointmentsview.cc +++ b/kplato/kptresourceappointmentsview.cc @@ -200,7 +200,7 @@ void ResourceAppointmentsView::print(KPrinter &/*printer*/) { // m_dlv->setSizes(list); // m_date = context.date; // if (!m_date.isValid()) -// m_date = TQDate::tqcurrentDate(); +// m_date = TQDate::currentDate(); // m_period = context.period; // m_cumulative = context.cumulative; // diff --git a/kplato/kptresourceview.cc b/kplato/kptresourceview.cc index d596ff44..58ea413e 100644 --- a/kplato/kptresourceview.cc +++ b/kplato/kptresourceview.cc @@ -203,7 +203,7 @@ protected: c = fc; // draw to last interesting column - const TQColorGroup &cg = ( tqpalette().inactive() ); + const TQColorGroup &cg = ( palette().inactive() ); while ( c < lc && !drawables.isEmpty() ) { int i = header()->mapToLogical( c ); @@ -240,7 +240,7 @@ protected: if ( tx < 0 ) tx = header()->cellPos( cell ); - // do any tqchildren of current need to be painted? + // do any children of current need to be painted? /* FIXME: painting branches doesn't work for some reason... if ( ih != ith && rootIsDecorated() && @@ -268,7 +268,7 @@ protected: p->translate( rleft, crtop ); //kdDebug()<<k_funcinfo<<"paintBranches: "<<current->i->text(0)<<endl; - current->i->paintBranches( p, tqcolorGroup(), treeStepSize(), + current->i->paintBranches( p, colorGroup(), treeStepSize(), rtop - crtop, r.height() ); p->restore(); } @@ -362,8 +362,8 @@ public: TQDate date; }; -TQSize ResourceView::tqsizeHint() const { - return tqminimumSizeHint(); // HACK: koshell splitter tqminimumSize problem +TQSize ResourceView::sizeHint() const { + return minimumSizeHint(); // HACK: koshell splitter minimumSize problem } ResourceView::ResourceView(View *view, TQWidget *parent) diff --git a/kplato/kptresourceview.h b/kplato/kptresourceview.h index b3049ed3..7154af8f 100644 --- a/kplato/kptresourceview.h +++ b/kplato/kptresourceview.h @@ -71,7 +71,7 @@ class ResourceItemPrivate; virtual bool setContext(Context::Resourceview &context); virtual void getContext(Context::Resourceview &context) const; - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: void setShowAppointments(bool on) { m_showAppointments = on; } diff --git a/kplato/kptstandardworktimedialog.cc b/kplato/kptstandardworktimedialog.cc index fb5a9c0e..c244a57e 100644 --- a/kplato/kptstandardworktimedialog.cc +++ b/kplato/kptstandardworktimedialog.cc @@ -31,7 +31,7 @@ #include <tqspinbox.h> #include <tqcombobox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqdatetimeedit.h> #include <tqdatetime.h> diff --git a/kplato/kptsummarytaskgeneralpanel.cc b/kplato/kptsummarytaskgeneralpanel.cc index 73ba4f95..97cc47e0 100644 --- a/kplato/kptsummarytaskgeneralpanel.cc +++ b/kplato/kptsummarytaskgeneralpanel.cc @@ -35,7 +35,7 @@ #include <kabc/addresseedialog.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqdatetime.h> #include <tqdatetimeedit.h> diff --git a/kplato/kptsummarytaskgeneralpanelbase.ui b/kplato/kptsummarytaskgeneralpanelbase.ui index 57dd2654..afef245e 100644 --- a/kplato/kptsummarytaskgeneralpanelbase.ui +++ b/kplato/kptsummarytaskgeneralpanelbase.ui @@ -13,7 +13,7 @@ <height>250</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>400</width> <height>0</height> @@ -31,7 +31,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -39,7 +39,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -95,7 +95,7 @@ This is not limited to persons available in a resource group but can be anyone. </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -103,7 +103,7 @@ This is not limited to persons available in a resource group but can be anyone. </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -127,7 +127,7 @@ This is not limited to persons available in a resource group but can be anyone. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -171,7 +171,7 @@ This is not limited to persons available in a resource group but can be anyone. </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> diff --git a/kplato/kpttask.cc b/kplato/kpttask.cc index 964b8e4e..43ccb1bb 100644 --- a/kplato/kpttask.cc +++ b/kplato/kpttask.cc @@ -29,7 +29,7 @@ #include "kptschedule.h" #include <tqdom.h> -#include <tqbrush.h> +#include <brush.h> #include <kdebug.h> namespace KPlato @@ -198,7 +198,7 @@ bool Task::load(TQDomElement &element, Project &project) { m_wbs = element.attribute("wbs", ""); - // Load the project tqchildren + // Load the project children TQDomNodeList list = element.childNodes(); for (unsigned int i=0; i<list.count(); ++i) { if (list.item(i).isElement()) { @@ -570,7 +570,7 @@ void Task::initiateCalculationLists(TQPtrList<Node> &startnodes, TQPtrList<Node> //kdDebug()<<k_funcinfo<<m_name<<endl; if (type() == Node::Type_Summarytask) { summarytasks.append(this); - // propagate my relations to my tqchildren and dependent nodes + // propagate my relations to my children and dependent nodes TQPtrListIterator<Node> nodes = m_nodes; for (; nodes.current(); ++nodes) { @@ -1293,7 +1293,7 @@ void Task::clearProxyRelations() { void Task::addParentProxyRelations(TQPtrList<Relation> &list) { //kdDebug()<<k_funcinfo<<m_name<<endl; if (type() == Type_Summarytask) { - // propagate to my tqchildren + // propagate to my children //kdDebug()<<k_funcinfo<<m_name<<" is summary task"<<endl; TQPtrListIterator<Node> nodes = m_nodes; for (; nodes.current(); ++nodes) { @@ -1315,7 +1315,7 @@ void Task::addParentProxyRelations(TQPtrList<Relation> &list) { void Task::addChildProxyRelations(TQPtrList<Relation> &list) { //kdDebug()<<k_funcinfo<<m_name<<endl; if (type() == Type_Summarytask) { - // propagate to my tqchildren + // propagate to my children //kdDebug()<<k_funcinfo<<m_name<<" is summary task"<<endl; TQPtrListIterator<Node> nodes = m_nodes; for (; nodes.current(); ++nodes) { @@ -1337,7 +1337,7 @@ void Task::addChildProxyRelations(TQPtrList<Relation> &list) { void Task::addParentProxyRelation(Node *node, const Relation *rel) { if (node->type() != Type_Summarytask) { if (type() == Type_Summarytask) { - //kdDebug()<<"Add parent proxy from my tqchildren "<<m_name<<" to "<<node->name()<<endl; + //kdDebug()<<"Add parent proxy from my children "<<m_name<<" to "<<node->name()<<endl; TQPtrListIterator<Node> nodes = m_nodes; for (; nodes.current(); ++nodes) { nodes.current()->addParentProxyRelation(node, rel); @@ -1352,7 +1352,7 @@ void Task::addParentProxyRelation(Node *node, const Relation *rel) { void Task::addChildProxyRelation(Node *node, const Relation *rel) { if (node->type() != Type_Summarytask) { if (type() == Type_Summarytask) { - //kdDebug()<<"Add child proxy from my tqchildren "<<m_name<<" to "<<node->name()<<endl; + //kdDebug()<<"Add child proxy from my children "<<m_name<<" to "<<node->name()<<endl; TQPtrListIterator<Node> nodes = m_nodes; for (; nodes.current(); ++nodes) { nodes.current()->addChildProxyRelation(node, rel); @@ -1525,7 +1525,7 @@ bool Task::effortMetError() const { } #ifndef NDEBUG -void Task::printDebug(bool tqchildren, TQCString indent) { +void Task::printDebug(bool children, TQCString indent) { kdDebug()<<indent<<"+ Task node: "<<name()<<" type="<<type()<<endl; indent += "! "; kdDebug()<<indent<<"Requested resources (total): "<<units()<<"%"<<endl; @@ -1533,7 +1533,7 @@ void Task::printDebug(bool tqchildren, TQCString indent) { if (m_requests) m_requests->printDebug(indent); - Node::printDebug(tqchildren, indent); + Node::printDebug(children, indent); } diff --git a/kplato/kpttask.h b/kplato/kpttask.h index 2d3776db..55abd23f 100644 --- a/kplato/kpttask.h +++ b/kplato/kpttask.h @@ -244,7 +244,7 @@ public: /// Calculate critical path virtual bool calcCriticalPath(bool fromEnd); - /// Set current schedule to schedule with identity id, for me nd my tqchildren + /// Set current schedule to schedule with identity id, for me nd my children virtual void setCurrentSchedule(long id); virtual bool effortMetError() const; @@ -296,7 +296,7 @@ private: #ifndef NDEBUG public: - void printDebug(bool tqchildren, TQCString indent); + void printDebug(bool children, TQCString indent); #endif }; diff --git a/kplato/kpttaskappointmentsview.cc b/kplato/kpttaskappointmentsview.cc index 5e96030e..387e75e5 100644 --- a/kplato/kpttaskappointmentsview.cc +++ b/kplato/kpttaskappointmentsview.cc @@ -151,7 +151,7 @@ void TaskAppointmentsView::print(KPrinter &/*printer*/) { // m_dlv->setSizes(list); // m_date = context.date; // if (!m_date.isValid()) -// m_date = TQDate::tqcurrentDate(); +// m_date = TQDate::currentDate(); // m_period = context.period; // m_cumulative = context.cumulative; // diff --git a/kplato/kpttaskappointmentsview.ui.h b/kplato/kpttaskappointmentsview.ui.h index 7e090fb7..b06fb4be 100644 --- a/kplato/kpttaskappointmentsview.ui.h +++ b/kplato/kpttaskappointmentsview.ui.h @@ -90,7 +90,7 @@ void TaskAppointmentsView::init() m_appList->setColumnAlignment(6, AlignRight); m_task = 0; - m_date->setDate(TQDate::tqcurrentDate()); + m_date->setDate(TQDate::currentDate()); } @@ -106,8 +106,8 @@ void TaskAppointmentsView::drawCostEffort() m_plannedEffort->setText(m_task->plannedEffortTo(m_date->date()).toString(Duration::Format_HourFraction)); m_plannedEffortTotal->setText(m_task->plannedEffort().toString(Duration::Format_HourFraction)); - m_epi->setText(TQString("%1").tqarg(m_task->effortPerformanceIndex(m_date->date()),3,'f',2)); - m_cpi->setText(TQString("%1").tqarg(m_task->costPerformanceIndex(m_date->date()),3,'f',2)); + m_epi->setText(TQString("%1").arg(m_task->effortPerformanceIndex(m_date->date()),3,'f',2)); + m_cpi->setText(TQString("%1").arg(m_task->costPerformanceIndex(m_date->date()),3,'f',2)); } diff --git a/kplato/kpttaskcostpanelbase.ui b/kplato/kpttaskcostpanelbase.ui index 38250f2b..9907a26a 100644 --- a/kplato/kpttaskcostpanelbase.ui +++ b/kplato/kpttaskcostpanelbase.ui @@ -65,7 +65,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -193,7 +193,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -212,7 +212,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kplato/kpttaskdefaultpanel.cc b/kplato/kpttaskdefaultpanel.cc index 3fd5472b..5d5c779a 100644 --- a/kplato/kpttaskdefaultpanel.cc +++ b/kplato/kpttaskdefaultpanel.cc @@ -38,7 +38,7 @@ #include <kabc/addresseedialog.h> #include <kdatewidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqdatetime.h> #include <tqdatetimeedit.h> @@ -81,7 +81,7 @@ void TaskDefaultPanel::setStartValues(Task &task, StandardWorktime *workTime) { if (task.constraintStartTime().isValid()) { setStartDateTime(task.constraintStartTime()); } else { - TQDate date = TQDate::tqcurrentDate(); + TQDate date = TQDate::currentDate(); setStartDateTime(TQDateTime(date, TQTime())); } if (task.constraintEndTime().isValid()) { diff --git a/kplato/kpttaskgeneralpanel.cc b/kplato/kpttaskgeneralpanel.cc index 6dd1dad2..c40554de 100644 --- a/kplato/kpttaskgeneralpanel.cc +++ b/kplato/kpttaskgeneralpanel.cc @@ -39,7 +39,7 @@ #include <kabc/addresseedialog.h> #include <kdatewidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqdatetime.h> #include <tqdatetimeedit.h> @@ -93,7 +93,7 @@ void TaskGeneralPanel::setStartValues(Task &task, StandardWorktime *workTime) { if (task.constraintStartTime().isValid()) { setStartDateTime(task.constraintStartTime()); } else { - TQDate date = TQDate::tqcurrentDate(); + TQDate date = TQDate::currentDate(); setStartDateTime(TQDateTime(date, TQTime())); } if (task.constraintEndTime().isValid()) { diff --git a/kplato/kpttaskgeneralpanelbase.ui b/kplato/kpttaskgeneralpanelbase.ui index 1d153a02..5d950f6b 100644 --- a/kplato/kpttaskgeneralpanelbase.ui +++ b/kplato/kpttaskgeneralpanelbase.ui @@ -25,7 +25,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -33,7 +33,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -89,7 +89,7 @@ This is not limited to persons available in a resource group but can be anyone. </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -97,7 +97,7 @@ This is not limited to persons available in a resource group but can be anyone. </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -121,7 +121,7 @@ This is not limited to persons available in a resource group but can be anyone. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -159,7 +159,7 @@ This is not limited to persons available in a resource group but can be anyone. </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -316,7 +316,7 @@ The estimation can be either effort based or duration based. If it is effort bas </widget> <widget class="TQLayoutWidget" row="3" column="2" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout41</cstring> + <cstring>layout41</cstring> </property> <hbox> <property name="name"> diff --git a/kplato/kpttasknotespanelbase.ui b/kplato/kpttasknotespanelbase.ui index 90f413ff..f3f52ab9 100644 --- a/kplato/kpttasknotespanelbase.ui +++ b/kplato/kpttasknotespanelbase.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <vbox> <property name="name"> diff --git a/kplato/kpttaskprogresspanel.cc b/kplato/kpttaskprogresspanel.cc index e8cfb570..bed7a3c2 100644 --- a/kplato/kpttaskprogresspanel.cc +++ b/kplato/kpttaskprogresspanel.cc @@ -147,7 +147,7 @@ void TaskProgressPanelImpl::slotChanged() { void TaskProgressPanelImpl::slotStartedChanged(bool state) { if (state) { - startTime->setDateTime(TQDateTime::tqcurrentDateTime()); + startTime->setDateTime(TQDateTime::currentDateTime()); percentFinished->setValue(0); } enableWidgets(); @@ -158,7 +158,7 @@ void TaskProgressPanelImpl::slotFinishedChanged(bool state) { if (state) { percentFinished->setValue(100); if (!finishTime->dateTime().isValid()) { - finishTime->setDateTime(TQDateTime::tqcurrentDateTime()); + finishTime->setDateTime(TQDateTime::currentDateTime()); } } enableWidgets(); diff --git a/kplato/kpttaskprogresspanelbase.ui b/kplato/kpttaskprogresspanelbase.ui index 00d23dda..b4c5b24f 100644 --- a/kplato/kpttaskprogresspanelbase.ui +++ b/kplato/kpttaskprogresspanelbase.ui @@ -85,7 +85,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>41</height> @@ -187,7 +187,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>200</width> <height>20</height> @@ -204,7 +204,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>70</height> @@ -226,7 +226,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -247,7 +247,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -258,7 +258,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -279,7 +279,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -290,7 +290,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -303,7 +303,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>320</width> <height>0</height> @@ -320,7 +320,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>59</width> <height>20</height> @@ -365,7 +365,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kplato/kpttaskresourcespanelbase.ui b/kplato/kpttaskresourcespanelbase.ui index dfa3b818..93444894 100644 --- a/kplato/kpttaskresourcespanelbase.ui +++ b/kplato/kpttaskresourcespanelbase.ui @@ -49,7 +49,7 @@ <property name="name"> <cstring>groupList</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -58,7 +58,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <vbox> <property name="name"> diff --git a/kplato/kptview.cc b/kplato/kptview.cc index e986ea99..5e99a9da 100644 --- a/kplato/kptview.cc +++ b/kplato/kptview.cc @@ -26,7 +26,7 @@ #include <tqapplication.h> #include <tqpainter.h> #include <tqiconset.h> -#include <tqlayout.h> +#include <layout.h> #include <tqsplitter.h> #include <tqcanvas.h> #include <tqscrollview.h> @@ -102,9 +102,9 @@ namespace KPlato View::View(Part* part, TQWidget* parent, const char* /*name*/) : KoView(part, parent, "Main View"), m_ganttview(0), - m_gantttqlayout(0), + m_ganttlayout(0), m_pertview(0), - m_perttqlayout(0), + m_pertlayout(0), // m_reportview(0), m_baselineMode(false), m_currentEstimateType(Effort::Use_Expected) @@ -122,15 +122,15 @@ View::View(Part* part, TQWidget* parent, const char* /*name*/) dcopObject(); m_tab = new TQWidgetStack(this); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); - tqlayout->add(m_tab); + TQVBoxLayout *layout = new TQVBoxLayout(this); + layout->add(m_tab); m_ganttview = new GanttView(m_tab, part->isReadWrite()); m_tab->addWidget(m_ganttview); m_updateGanttview = false; m_ganttview->draw(getPart()->getProject()); - m_pertview = new PertView( this, m_tab, tqlayout ); + m_pertview = new PertView( this, m_tab, layout ); m_tab->addWidget(m_pertview); m_resourceview = new ResourceView( this, m_tab ); diff --git a/kplato/kptview.h b/kplato/kptview.h index 38d93501..b2c85346 100644 --- a/kplato/kptview.h +++ b/kplato/kptview.h @@ -176,9 +176,9 @@ protected: private: GanttView *m_ganttview; - TQHBoxLayout *m_gantttqlayout; + TQHBoxLayout *m_ganttlayout; PertView *m_pertview; - TQHBoxLayout *m_perttqlayout; + TQHBoxLayout *m_pertlayout; TQWidgetStack *m_tab; ResourceView *m_resourceview; AccountsView *m_accountsview; diff --git a/kplato/kptwbsdefinition.cc b/kplato/kptwbsdefinition.cc index fd6b48aa..e25f9fe6 100644 --- a/kplato/kptwbsdefinition.cc +++ b/kplato/kptwbsdefinition.cc @@ -108,25 +108,25 @@ const TQChar Letters[] = { '?','a','b','c','d','e','f','g','h','i','j','k','l',' TQString WBSDefinition::code(CodeDef &def, uint index) { if (def.code == "Number") { - return TQString("%1").tqarg(index); + return TQString("%1").arg(index); } if (def.code == "Roman, lower case") { - return TQString("%1").tqarg(toRoman(index)); + return TQString("%1").arg(toRoman(index)); } if (def.code == "Roman, upper case") { - return TQString("%1").tqarg(toRoman(index, true)); + return TQString("%1").arg(toRoman(index, true)); } if (def.code == "Letter, lower case") { if (index > 26) { index = 0; } - return TQString("%1").tqarg(Letters[index]); + return TQString("%1").arg(Letters[index]); } if (def.code == "Letter, upper case") { if (index > 26) { index = 0; } - return TQString("%1").tqarg(Letters[index].upper()); + return TQString("%1").arg(Letters[index].upper()); } return TQString(); } @@ -140,7 +140,7 @@ const TQCString RNThousands[] = {"", "m", "mm", "mmm"}; TQString WBSDefinition::toRoman( int n, bool upper ) { if ( n >= 0 ) { - TQString s = TQString::tqfromLatin1( RNThousands[ ( n / 1000 ) ] + + TQString s = TQString::fromLatin1( RNThousands[ ( n / 1000 ) ] + RNHundreds[ ( n / 100 ) % 10 ] + RNTens[ ( n / 10 ) % 10 ] + RNUnits[ ( n ) % 10 ] ); diff --git a/kplato/kptwbsdefinitionpanel.cc b/kplato/kptwbsdefinitionpanel.cc index 8dcfe891..083c9216 100644 --- a/kplato/kptwbsdefinitionpanel.cc +++ b/kplato/kptwbsdefinitionpanel.cc @@ -57,7 +57,7 @@ WBSDefinitionPanel::WBSDefinitionPanel(WBSDefinition &def, TQWidget *p, const ch kdDebug()<<"Map size="<<lev.count()<<endl; TQMap<int, WBSDefinition::CodeDef>::const_iterator it; for (it = lev.begin(); it != lev.end(); ++it) { - levelsTable->verticalHeader()->setLabel(i, TQString("%1").tqarg(it.key())); + levelsTable->verticalHeader()->setLabel(i, TQString("%1").arg(it.key())); TQComboTableItem *item = new TQComboTableItem(levelsTable, codeList, true); item->setCurrentItem(it.data().code); levelsTable->setItem(i, 0, item); @@ -108,7 +108,7 @@ void WBSDefinitionPanel::slotSelectionChanged() { bool rowSelected = false; for (int i=0; i < levelsTable->numRows(); ++i) { if (levelsTable->isRowSelected(i, true)) { - s += TQString("Row[%1]=selected ").tqarg(i); + s += TQString("Row[%1]=selected ").arg(i); rowSelected = true; } } @@ -141,7 +141,7 @@ void WBSDefinitionPanel::slotAddBtnClicked() { } i++; levelsTable->insertRows(i); - levelsTable->verticalHeader()->setLabel(i, TQString("%1").tqarg(level->value())); + levelsTable->verticalHeader()->setLabel(i, TQString("%1").arg(level->value())); TQComboTableItem *item = new TQComboTableItem(levelsTable, m_def.codeList(), true); levelsTable->setItem(i, 0, item); levelsTable->clearSelection(); diff --git a/kplato/kptwbsdefinitionpanelbase.ui b/kplato/kptwbsdefinitionpanelbase.ui index 4656ce4e..5f76c4f4 100644 --- a/kplato/kptwbsdefinitionpanelbase.ui +++ b/kplato/kptwbsdefinitionpanelbase.ui @@ -39,7 +39,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -121,7 +121,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -145,7 +145,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>140</width> <height>20</height> @@ -154,7 +154,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> diff --git a/kplato/kptxmlloaderobject.h b/kplato/kptxmlloaderobject.h index 814af40b..272c3599 100644 --- a/kplato/kptxmlloaderobject.h +++ b/kplato/kptxmlloaderobject.h @@ -46,18 +46,18 @@ public: void startLoad() { m_timer.start(); - m_starttime = TQDateTime::tqcurrentDateTime(); + m_starttime = TQDateTime::currentDateTime(); m_errors = m_warnings = 0; m_log.clear(); - addMsg(TQString("Loading started at %1").tqarg(m_starttime.toString())); + addMsg(TQString("Loading started at %1").arg(m_starttime.toString())); } void stopLoad() { m_elapsed = m_timer.elapsed(); - addMsg(TQString("Loading finished at %1, took %2").tqarg(TQDateTime::tqcurrentDateTime().toString()).tqarg(formatElapsed())); + addMsg(TQString("Loading finished at %1, took %2").arg(TQDateTime::currentDateTime().toString()).arg(formatElapsed())); } TQDateTime lastLoaded() const { return m_starttime; } int elapsed() const { return m_elapsed; } - TQString formatElapsed() { return TQString("%1 seconds").tqarg((double)m_elapsed/1000); } + TQString formatElapsed() { return TQString("%1 seconds").arg((double)m_elapsed/1000); } void setLogLevel(Severity sev) { m_logLevel = sev; } const TQStringList &log() const { return m_log; } @@ -70,7 +70,7 @@ public: else if (sev == Diagnostics) s = "Diagnostic"; else if (sev == Debug) s = "Debug"; else s = "Message"; - m_log<<TQString("%1: %2").tqarg(s, 13).tqarg(msg); + m_log<<TQString("%1: %2").arg(s, 13).arg(msg); } void addMsg(TQString msg) { m_log<<msg; } void increment(int sev) { diff --git a/kplato/relationpanel.ui b/kplato/relationpanel.ui index 409a52f9..2f7b904e 100644 --- a/kplato/relationpanel.ui +++ b/kplato/relationpanel.ui @@ -24,7 +24,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -47,7 +47,7 @@ <property name="name"> <cstring>groupBox1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>0</height> @@ -121,7 +121,7 @@ <property name="text"> <string>From:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -140,7 +140,7 @@ <property name="text"> <string>To:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -151,7 +151,7 @@ <property name="text"> <string>Task 1</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -162,7 +162,7 @@ <property name="text"> <string>Task 2</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -207,7 +207,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -220,7 +220,7 @@ <property name="text"> <string>Lag:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignBottom</set> </property> </widget> @@ -236,7 +236,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> diff --git a/kplato/resourcedialogbase.ui b/kplato/resourcedialogbase.ui index 8107e9ac..f7b75137 100644 --- a/kplato/resourcedialogbase.ui +++ b/kplato/resourcedialogbase.ui @@ -61,7 +61,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -79,7 +79,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>100</width> <height>32767</height> @@ -112,7 +112,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -146,7 +146,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -198,7 +198,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <grid> <property name="name"> @@ -261,7 +261,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -359,7 +359,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kplato/resourcespanelbase.ui b/kplato/resourcespanelbase.ui index 8428e29c..cc47ad3f 100644 --- a/kplato/resourcespanelbase.ui +++ b/kplato/resourcespanelbase.ui @@ -13,7 +13,7 @@ <height>227</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>500</width> <height>200</height> @@ -28,7 +28,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -99,7 +99,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout51</cstring> + <cstring>layout51</cstring> </property> <vbox> <property name="name"> @@ -127,7 +127,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -173,7 +173,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>220</height> diff --git a/kplato/standardworktimedialogbase.ui b/kplato/standardworktimedialogbase.ui index 61f4fddb..eafdca61 100644 --- a/kplato/standardworktimedialogbase.ui +++ b/kplato/standardworktimedialogbase.ui @@ -28,7 +28,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <grid> <property name="name"> @@ -200,7 +200,7 @@ when there is no calendar defined for a resource.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>160</width> <height>210</height> diff --git a/kpresenter/KPrAutoformObject.cpp b/kpresenter/KPrAutoformObject.cpp index 88245f6d..90a1eeba 100644 --- a/kpresenter/KPrAutoformObject.cpp +++ b/kpresenter/KPrAutoformObject.cpp @@ -80,8 +80,8 @@ bool KPrAutoformObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) cons kdDebug(33001) << "bool KPrAutoformObject::saveOasisObjectAttributes()" << endl; TQSize size( int( ext.width() * 100 ), int( ext.height() * 100 ) ); - sc.xmlWriter.addAttribute( "svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( size.width() ) - .tqarg( size.height() ) ); + sc.xmlWriter.addAttribute( "svg:viewBox", TQString( "0 0 %1 %2" ).arg( size.width() ) + .arg( size.height() ) ); TQPointArray points = const_cast<ATFInterpreter &>( atfInterp ).getPointArray( size.width(), size.height() ); @@ -93,14 +93,14 @@ bool KPrAutoformObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) cons --pointCount; TQString d; - d += TQString( "M%1 %2" ).tqarg( points.at(pos).x() ) - .tqarg( points.at(pos).y() ); + d += TQString( "M%1 %2" ).arg( points.at(pos).x() ) + .arg( points.at(pos).y() ); ++pos; while ( pos < pointCount ) { - d += TQString( "L%1 %2" ).tqarg( points.at( pos ).x() ) - .tqarg( points.at( pos ).y() ); + d += TQString( "L%1 %2" ).arg( points.at( pos ).x() ) + .arg( points.at( pos ).y() ); ++pos; } @@ -237,8 +237,8 @@ void KPrAutoformObject::paint( TQPainter* _painter, KoTextZoomHandler *_zoomHand { if ( angle == 0 || angle==360 ) { - //int ox = _painter->viewport().x() + static_cast<int>( _painter->tqworldMatrix().dx() ); - //int oy = _painter->viewport().y() + static_cast<int>( _painter->tqworldMatrix().dy() ); + //int ox = _painter->viewport().x() + static_cast<int>( _painter->worldMatrix().dx() ); + //int oy = _painter->viewport().y() + static_cast<int>( _painter->worldMatrix().dy() ); TQPointArray pntArray3 = pntArray2.copy(); _painter->save(); diff --git a/kpresenter/KPrBackDia.cpp b/kpresenter/KPrBackDia.cpp index b616f802..0be957f0 100644 --- a/kpresenter/KPrBackDia.cpp +++ b/kpresenter/KPrBackDia.cpp @@ -28,7 +28,7 @@ #include <tqpainter.h> #include <tqcombobox.h> #include <tqslider.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtabwidget.h> #include <tqvbox.h> #include <tqcheckbox.h> @@ -89,10 +89,10 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name, TQWidget *page = new TQWidget( this ); setMainWidget(page); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( page, 0, spacingHint() ); - TQHBoxLayout *hbox = new TQHBoxLayout( tqlayout ); + TQHBoxLayout *hbox = new TQHBoxLayout( layout ); hbox->setSpacing( KDialog::spacingHint() ); TQVBoxLayout *vbox = new TQVBoxLayout( hbox ); vbox->setSpacing( KDialog::spacingHint() ); @@ -175,7 +175,7 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name, picTab->setMargin( 5 ); TQLabel *l = new TQLabel( i18n( "View mode:" ), picTab ); - l->setFixedHeight( l->tqsizeHint().height() ); + l->setFixedHeight( l->sizeHint().height() ); picView = new TQComboBox( false, picTab ); picView->insertItem( i18n( "Scaled" ) ); @@ -186,10 +186,10 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name, this, TQT_SLOT( updateConfiguration() ) ); picChooseLabel = new TQLabel( i18n("&Location:"), picTab ); - picChooseLabel->setFixedHeight( picChooseLabel->tqsizeHint().height() ); + picChooseLabel->setFixedHeight( picChooseLabel->sizeHint().height() ); picChoose = new KURLRequester( picTab, "picChoose" ); - picChoose->setFixedHeight( picChoose->tqsizeHint().height() ); + picChoose->setFixedHeight( picChoose->sizeHint().height() ); picChoose->setMode( KFile::ExistingOnly ); connect( picChoose, TQT_SIGNAL( openFileDialog( KURLRequester * ) ), TQT_SLOT( aboutToSelectPic() ) ); @@ -313,7 +313,7 @@ void KPrBackDialog::updateConfiguration() { kdDebug(33001) << "set backgound to master" << endl; preview->backGround()->setBackGround( m_page->masterPage()->background()->getBackGround() ); - preview->tqrepaint( true ); + preview->repaint( true ); } else { @@ -331,7 +331,7 @@ void KPrBackDialog::updateConfiguration() preview->backGround()->setBackType( getBackType() ); if ( preview->isVisible() && isVisible() ) { preview->backGround()->reload(); // ### TODO: instead of reloading, load or remove the picture correctly. - preview->tqrepaint( true ); + preview->repaint( true ); } picChanged = false; diff --git a/kpresenter/KPrBackground.cpp b/kpresenter/KPrBackground.cpp index 66102045..e8dcdc39 100644 --- a/kpresenter/KPrBackground.cpp +++ b/kpresenter/KPrBackground.cpp @@ -282,7 +282,7 @@ void KPrBackGround::loadOasis(KoOasisContext & context ) strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. } TQString filename(href); - const KoPictureKey key(filename, TQDateTime::tqcurrentDateTime(Qt::UTC)); + const KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC)); backPicture.setKey(key); KoStore* store = context.store(); @@ -589,7 +589,7 @@ void KPrBackGround::drawBackPix( TQPainter *_painter, const TQSize& ext, const T void KPrBackGround::drawBorders( TQPainter *_painter, const TQSize& /*ext*/, const TQRect& /*crect*/ ) { - _painter->setPen( TQApplication::tqpalette().active().color( TQColorGroup::Dark ) ); + _painter->setPen( TQApplication::palette().active().color( TQColorGroup::Dark ) ); _painter->setBrush( TQt::NoBrush ); TQRect rect = m_page->getZoomPageRect(); diff --git a/kpresenter/KPrBezierCurveObject.cpp b/kpresenter/KPrBezierCurveObject.cpp index 0b12115e..a2e71ea0 100644 --- a/kpresenter/KPrBezierCurveObject.cpp +++ b/kpresenter/KPrBezierCurveObject.cpp @@ -60,31 +60,31 @@ KPrBezierCurveObject &KPrBezierCurveObject::operator=( const KPrBezierCurveObjec bool KPrBezierCurveObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) const { KoRect rect( getRect() ); - sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( int( rect.width() * 100 ) ) - .tqarg( int( rect.height() * 100 ) ) ); + sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).arg( int( rect.width() * 100 ) ) + .arg( int( rect.height() * 100 ) ) ); unsigned int pointCount = points.count(); unsigned int pos = 0; TQString d; - d += TQString( "M%1 %2" ).tqarg( int( points.at(pos).x() * 100 ) ) - .tqarg( int( points.at(pos).y() * 100 ) ); + d += TQString( "M%1 %2" ).arg( int( points.at(pos).x() * 100 ) ) + .arg( int( points.at(pos).y() * 100 ) ); while ( pos + 4 <= pointCount ) { - d += TQString( "C%1 %2 %3 %4 %5 %6" ).tqarg( int( points.at( pos + 2 ).x() * 100 ) ) - .tqarg( int( points.at( pos + 2 ).y() * 100 ) ) - .tqarg( int( points.at( pos + 3 ).x() * 100 ) ) - .tqarg( int( points.at( pos + 3 ).y() * 100 ) ) - .tqarg( int( points.at( pos + 1 ).x() * 100 ) ) - .tqarg( int( points.at( pos + 1 ).y() * 100 ) ); + d += TQString( "C%1 %2 %3 %4 %5 %6" ).arg( int( points.at( pos + 2 ).x() * 100 ) ) + .arg( int( points.at( pos + 2 ).y() * 100 ) ) + .arg( int( points.at( pos + 3 ).x() * 100 ) ) + .arg( int( points.at( pos + 3 ).y() * 100 ) ) + .arg( int( points.at( pos + 1 ).x() * 100 ) ) + .arg( int( points.at( pos + 1 ).y() * 100 ) ); pos += 4; } if ( pos < pointCount ) { - d += TQString( "L%1 %2" ).tqarg( int( points.at( pos + 1 ).x() * 100 ) ) - .tqarg( int( points.at( pos + 1 ).y() * 100 ) ); + d += TQString( "L%1 %2" ).arg( int( points.at( pos + 1 ).x() * 100 ) ) + .arg( int( points.at( pos + 1 ).y() * 100 ) ); } sc.xmlWriter.addAttribute( "svg:d", d ); diff --git a/kpresenter/KPrBrush.cpp b/kpresenter/KPrBrush.cpp index 06954f7c..71ea95fd 100644 --- a/kpresenter/KPrBrush.cpp +++ b/kpresenter/KPrBrush.cpp @@ -73,8 +73,8 @@ TQString KPrBrush::saveOasisGradientStyle( KoGenStyles& mainStyles ) const if ( getGUnbalanced() ) { - unbalancedx = TQString( "%1%" ).tqarg( getGXFactor() / 4 + 50 ); - unbalancedy = TQString( "%1%" ).tqarg( getGYFactor() / 4 + 50 ); + unbalancedx = TQString( "%1%" ).arg( getGXFactor() / 4 + 50 ); + unbalancedy = TQString( "%1%" ).arg( getGYFactor() / 4 + 50 ); } gradientStyle.addAttribute( "draw:cx", unbalancedx ); gradientStyle.addAttribute( "draw:cy", unbalancedy ); diff --git a/kpresenter/KPrBrush.h b/kpresenter/KPrBrush.h index e59f838a..b7b55b16 100644 --- a/kpresenter/KPrBrush.h +++ b/kpresenter/KPrBrush.h @@ -21,7 +21,7 @@ #ifndef KPRBRUSH_H #define KPRBRUSH_H -#include <tqbrush.h> +#include <brush.h> #include <KoBrush.h> #include "global.h" diff --git a/kpresenter/KPrBrushProperty.cpp b/kpresenter/KPrBrushProperty.cpp index 6e550fe0..4dbd9f3f 100644 --- a/kpresenter/KPrBrushProperty.cpp +++ b/kpresenter/KPrBrushProperty.cpp @@ -24,7 +24,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqslider.h> #include <tqwhatsthis.h> #include <tqwidgetstack.h> @@ -37,34 +37,34 @@ KPrBrushProperty::KPrBrushProperty( TQWidget *parent, const char *name, const KP : TQWidget( parent, name ) , m_brush( brush ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); m_typeCombo = new KComboBox( this ); - tqlayout->addWidget( m_typeCombo, 0, 1 ); + layout->addWidget( m_typeCombo, 0, 1 ); m_typeCombo->insertItem( i18n( "Single Color" ) ); m_typeCombo->insertItem( i18n( "Gradient" ) ); m_typeCombo->insertItem( i18n( "Transparent" ) ); TQWhatsThis::add(m_typeCombo, i18n( "You can choose between Single Color, Gradient or Transparent as the type." ) ); TQLabel *typeLabel = new TQLabel( i18n( "&Type:" ), this ); - tqlayout->addWidget( typeLabel, 0, 0 ); + layout->addWidget( typeLabel, 0, 0 ); typeLabel->setBuddy( m_typeCombo ); m_stack = new TQWidgetStack( this ); - tqlayout->addMultiCellWidget( m_stack, 1, 1, 0, 1 ); + layout->addMultiCellWidget( m_stack, 1, 1, 0, 1 ); connect( m_typeCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotTypeChanged( int ) ) ); m_brushUI = new BrushPropertyUI( m_stack ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 100 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 94 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 88 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 63 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 50 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 37 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 12 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 6 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 100 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 94 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 88 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 63 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 50 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 37 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 12 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 6 ) ); m_brushUI->styleCombo->insertItem( i18n( "Horizontal Lines" ) ); m_brushUI->styleCombo->insertItem( i18n( "Vertical Lines" ) ); m_brushUI->styleCombo->insertItem( i18n( "Crossing Lines" ) ); diff --git a/kpresenter/KPrBrushProperty.h b/kpresenter/KPrBrushProperty.h index ed9ca272..be0de908 100644 --- a/kpresenter/KPrBrushProperty.h +++ b/kpresenter/KPrBrushProperty.h @@ -19,7 +19,7 @@ #ifndef BRUSHSTYLEWIDGET_H #define BRUSHSTYLEWIDGET_H -#include <tqbrush.h> +#include <brush.h> #include <tqwidget.h> #include "KPrCommand.h" diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp index c43faed3..66bc841a 100644 --- a/kpresenter/KPrCanvas.cpp +++ b/kpresenter/KPrCanvas.cpp @@ -24,7 +24,7 @@ #include <tqprogressdialog.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqpainter.h> #include <tqpaintdevicemetrics.h> #include <tqwmatrix.h> @@ -36,7 +36,7 @@ #include <tqrect.h> #include <tqsize.h> #include <tqpoint.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <kapplication.h> #include <kmimemagic.h> @@ -291,7 +291,7 @@ void KPrCanvas::paintEvent( TQPaintEvent* paintEvent ) { //kdDebug(33001) << "KPrCanvas::paintEvent" << endl; TQPainter bufPainter; - bufPainter.tqbegin( TQT_TQPAINTDEVICE(&buffer), this ); // double-buffering - (the buffer is as big as the widget) + bufPainter.begin( TQT_TQPAINTDEVICE(&buffer), this ); // double-buffering - (the buffer is as big as the widget) bufPainter.translate( -diffx(), -diffy() ); bufPainter.setBrushOrigin( -diffx(), -diffy() ); @@ -481,7 +481,7 @@ void KPrCanvas::drawBackground( TQPainter *painter, const TQRect& rect, KPrPage // In edit mode we also want to draw the gray area out of the pages if ( !grayRegion.isEmpty() ) - eraseEmptySpace( painter, grayRegion, TQApplication::tqpalette().active().brush( TQColorGroup::Mid ) ); + eraseEmptySpace( painter, grayRegion, TQApplication::palette().active().brush( TQColorGroup::Mid ) ); } else { @@ -706,9 +706,9 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e ) } else if( e->button() == Qt::MidButton ) { - TQApplication::tqclipboard()->setSelectionMode( true ); + TQApplication::clipboard()->setSelectionMode( true ); m_currentTextObjectView->paste(); - TQApplication::tqclipboard()->setSelectionMode( false ); + TQApplication::clipboard()->setSelectionMode( false ); } return; } @@ -1202,7 +1202,7 @@ void KPrCanvas::mouseReleaseEvent( TQMouseEvent *e ) } if ( mouseSelectedObject ) - _tqrepaint( false ); + _repaint( false ); emit objectSelectedChanged(); } } break; @@ -1379,7 +1379,7 @@ void KPrCanvas::mouseReleaseEvent( TQMouseEvent *e ) emit objectSelectedChanged(); if ( toolEditMode != TEM_MOUSE && editMode ) - tqrepaint( false ); + repaint( false ); m_view->disableAutoScroll(); mousePressed = false; @@ -1542,7 +1542,7 @@ void KPrCanvas::mouseMoveEvent( TQMouseEvent *e ) angle -= 360; m_rotateObject->rotate( angle ); - _tqrepaint( m_rotateObject ); + _repaint( m_rotateObject ); } }break; case INS_AUTOFORM: @@ -2072,8 +2072,8 @@ void KPrCanvas::keyPressEvent( TQKeyEvent *e ) m_resizeObject->setOrig( m_rectBeforeResize.topLeft() ); m_resizeObject->setSize( m_rectBeforeResize.size() ); drawContour = false; - m_view->kPresenterDoc()->tqrepaint( oldBoundingRect ); - m_view->kPresenterDoc()->tqrepaint( m_resizeObject ); + m_view->kPresenterDoc()->repaint( oldBoundingRect ); + m_view->kPresenterDoc()->repaint( m_resizeObject ); m_ratio = 0.0; m_resizeObject = 0; m_isResizing = false; @@ -2243,7 +2243,7 @@ KPrObject * KPrCanvas::getObjectAt( const KoPoint &pos, bool withoutProtected ) void KPrCanvas::selectObj( KPrObject *kpobject ) { kpobject->setSelected( true ); - _tqrepaint( kpobject ); + _repaint( kpobject ); emit objectSelectedChanged(); mouseSelectedObject = true; @@ -2252,7 +2252,7 @@ void KPrCanvas::selectObj( KPrObject *kpobject ) void KPrCanvas::deSelectObj( KPrObject *kpobject ) { kpobject->setSelected( false ); - _tqrepaint( kpobject ); + _repaint( kpobject ); if ( !m_activePage->isOneObjectSelected() ) { @@ -2271,7 +2271,7 @@ void KPrCanvas::selectAllObj() } mouseSelectedObject = true; - _tqrepaint( false ); + _repaint( false ); emit objectSelectedChanged(); } @@ -2723,9 +2723,9 @@ void KPrCanvas::setTextDepthPlus() m_view->kPresenterDoc()->addCommand( macroCmd ); if(!lst.isEmpty()) { - const KoParagLayout *tqlayout=lst.first()->currentParagLayoutFormat(); - m_view->showRulerIndent( tqlayout->margins[TQStyleSheetItem::MarginLeft], tqlayout->margins[TQStyleSheetItem::MarginFirstLine], - tqlayout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl()); + const KoParagLayout *layout=lst.first()->currentParagLayoutFormat(); + m_view->showRulerIndent( layout->margins[TQStyleSheetItem::MarginLeft], layout->margins[TQStyleSheetItem::MarginFirstLine], + layout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl()); } } @@ -2753,9 +2753,9 @@ void KPrCanvas::setTextDepthMinus() m_view->kPresenterDoc()->addCommand( macroCmd ); if(!lst.isEmpty()) { - const KoParagLayout *tqlayout=lst.first()->currentParagLayoutFormat(); - m_view->showRulerIndent( tqlayout->margins[TQStyleSheetItem::MarginLeft], tqlayout->margins[TQStyleSheetItem::MarginFirstLine], - tqlayout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl()); + const KoParagLayout *layout=lst.first()->currentParagLayoutFormat(); + m_view->showRulerIndent( layout->margins[TQStyleSheetItem::MarginLeft], layout->margins[TQStyleSheetItem::MarginFirstLine], + layout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl()); } } @@ -2989,7 +2989,7 @@ void KPrCanvas::stopScreenPresentation() m_step.m_pageNumber = 0; editMode = true; m_drawMode = false; - tqrepaint( false ); + repaint( false ); setToolEditMode( toolEditMode ); setWFlags( WResizeNoErase ); } @@ -3173,7 +3173,7 @@ bool KPrCanvas::pPrev( bool gotoPreviousPage ) m_step.m_step = *( --it ); //hopefully there are never more than 1000 sub steps :-) m_step.m_subStep = 1000; - tqrepaint( false ); + repaint( false ); return false; } else { // when we go back on the first slide, thats like starting the presentation again @@ -3201,7 +3201,7 @@ bool KPrCanvas::pPrev( bool gotoPreviousPage ) else { m_step.m_step = *( --m_pageEffectSteps.end() ); - tqrepaint( false ); + repaint( false ); } return true; @@ -3544,7 +3544,7 @@ void KPrCanvas::print( TQPainter *painter, KPrinter *printer, float /*left_margi //deSelectAllObj(); // already done in KPrView::setupPrinter int i = 0; - tqrepaint( false ); + repaint( false ); kapp->processEvents(); editMode = false; @@ -3633,7 +3633,7 @@ void KPrCanvas::print( TQPainter *painter, KPrinter *printer, float /*left_margi fillBlack = true; editMode = true; - tqrepaint( false ); + repaint( false ); } @@ -3872,7 +3872,7 @@ void KPrCanvas::endDrawPolyline() emit objectSelectedChanged(); if ( toolEditMode != TEM_MOUSE && editMode ) - tqrepaint( false ); + repaint( false ); m_view->disableAutoScroll(); mousePressed = false; modType = MT_NONE; @@ -3885,7 +3885,7 @@ void KPrCanvas::endDrawCubicBezierCurve() insertCubicBezierCurve( m_pointArray ); emit objectSelectedChanged(); if ( toolEditMode != TEM_MOUSE && editMode ) - tqrepaint( false ); + repaint( false ); m_view->disableAutoScroll(); mousePressed = false; modType = MT_NONE; @@ -3908,7 +3908,7 @@ void KPrCanvas::selectNext() } } m_view->showObjectRect( m_activePage->getSelectedObj() ); - _tqrepaint( false ); + _repaint( false ); } void KPrCanvas::selectPrev() @@ -3927,7 +3927,7 @@ void KPrCanvas::selectPrev() } } m_view->showObjectRect( m_activePage->getSelectedObj() ); - _tqrepaint( false ); + _repaint( false ); } void KPrCanvas::dragEnterEvent( TQDragEnterEvent *e ) @@ -4145,7 +4145,7 @@ void KPrCanvas::copyOasisObjs() delete store; kd->setEncodedData( arr ); - TQApplication::tqclipboard()->setData( dragObject, TQClipboard::Clipboard ); + TQApplication::clipboard()->setData( dragObject, TQClipboard::Clipboard ); } void KPrCanvas::copyObjs() @@ -4214,7 +4214,7 @@ void KPrCanvas::copyObjs() delete store; kd->setEncodedData( arr ); - TQApplication::tqclipboard()->setData( dragObject, TQClipboard::Clipboard ); + TQApplication::clipboard()->setData( dragObject, TQClipboard::Clipboard ); } void KPrCanvas::deleteObjs() @@ -4285,19 +4285,19 @@ unsigned int KPrCanvas::pageNums() const return m_view->kPresenterDoc()->getPageNums(); } -void KPrCanvas::_tqrepaint( bool /*erase*/ ) +void KPrCanvas::_repaint( bool /*erase*/ ) { - m_view->kPresenterDoc()->tqrepaint( false ); + m_view->kPresenterDoc()->repaint( false ); } -void KPrCanvas::_tqrepaint( const TQRect &r ) +void KPrCanvas::_repaint( const TQRect &r ) { - m_view->kPresenterDoc()->tqrepaint( r ); + m_view->kPresenterDoc()->repaint( r ); } -void KPrCanvas::_tqrepaint( KPrObject *o ) +void KPrCanvas::_repaint( KPrObject *o ) { - m_view->kPresenterDoc()->tqrepaint( o ); + m_view->kPresenterDoc()->repaint( o ); } void KPrCanvas::slotExitPres() @@ -4327,7 +4327,7 @@ void KPrCanvas::setSwitchingMode( bool continueTimer ) m_view->continueAutoPresTimer(); } -void KPrCanvas::exitEditMode( bool tqrepaint ) +void KPrCanvas::exitEditMode( bool repaint ) { if ( m_editObject ) { @@ -4337,7 +4337,7 @@ void KPrCanvas::exitEditMode( bool tqrepaint ) { m_currentTextObjectView->clearSelection(); //hide cursor when we desactivate textObjectView - if ( tqrepaint ) + if ( repaint ) { m_currentTextObjectView->drawCursor( false ); m_currentTextObjectView->terminate(); @@ -4347,8 +4347,8 @@ void KPrCanvas::exitEditMode( bool tqrepaint ) delete m_currentTextObjectView; m_currentTextObjectView = 0; - if ( tqrepaint ) - _tqrepaint( static_cast<KPrObject*>( kpTextObj ) ); + if ( repaint ) + _repaint( static_cast<KPrObject*>( kpTextObj ) ); } // Title of slide may have changed m_view->kPresenterDoc()->updateSideBarItem( m_activePage ); @@ -4358,7 +4358,7 @@ void KPrCanvas::exitEditMode( bool tqrepaint ) else if (m_editObject->getType() == OT_PART ) { static_cast<KPrPartObject *>(m_editObject)->deactivate(); - _tqrepaint( m_editObject ); + _repaint( m_editObject ); m_editObject = 0; return; } @@ -4602,8 +4602,8 @@ void KPrCanvas::moveObjectsByKey( int x, int y ) m_moveSnapDiff = KoPoint( 0, 0 ); - KoGuides::SnaptqStatus snaptqStatus = KoGuides::SNAP_NONE; - m_gl.snapToGuideLines( movedRect, KEY_SNAP_DISTANCE, snaptqStatus, m_moveSnapDiff ); + KoGuides::SnapStatus snapStatus = KoGuides::SNAP_NONE; + m_gl.snapToGuideLines( movedRect, KEY_SNAP_DISTANCE, snapStatus, m_moveSnapDiff ); move += m_moveSnapDiff; } @@ -4632,7 +4632,7 @@ void KPrCanvas::moveObjectsByKey( int x, int y ) move.setY( pageRect.bottom() - rect.bottom() ); } - // we only want a tqrepaint if we have guide lines + // we only want a repaint if we have guide lines if ( snapToGuideLines ) { // redraw guidelines (intentionally always) @@ -4672,7 +4672,7 @@ void KPrCanvas::moveObjectsByMouse( KoPoint &pos, bool keepXorYunchanged ) move -= m_moveSnapDiff; m_moveSnapDiff = KoPoint( 0, 0 ); // needed if all snapping is off - KoGuides::SnaptqStatus snaptqStatus = KoGuides::SNAP_NONE; + KoGuides::SnapStatus snapStatus = KoGuides::SNAP_NONE; if ( snapToGrid ) { @@ -4680,12 +4680,12 @@ void KPrCanvas::moveObjectsByMouse( KoPoint &pos, bool keepXorYunchanged ) - movedRect.topLeft().x() ); m_moveSnapDiff.setY( tqRound( movedRect.topLeft().y() / doc->getGridY()) * doc->getGridY() - movedRect.topLeft().y() ); - snaptqStatus = KoGuides::SNAP_BOTH; + snapStatus = KoGuides::SNAP_BOTH; } if ( snapToGuideLines ) { - m_gl.snapToGuideLines( movedRect, MOUSE_SNAP_DISTANCE, snaptqStatus, m_moveSnapDiff ); + m_gl.snapToGuideLines( movedRect, MOUSE_SNAP_DISTANCE, snapStatus, m_moveSnapDiff ); } move += m_moveSnapDiff; @@ -4745,7 +4745,7 @@ void KPrCanvas::resizeObject( ModifyType _modType, const KoPoint & point, bool k TQRect oldBoundingRect( m_view->zoomHandler()->zoomRect( kpobject->getRepaintRect() ) ); KoRect objRect = kpobject->getRealRect(); - KoGuides::SnaptqStatus snaptqStatus( KoGuides::SNAP_NONE ); + KoGuides::SnapStatus snapStatus( KoGuides::SNAP_NONE ); bool left = false; bool right = false; @@ -4754,22 +4754,22 @@ void KPrCanvas::resizeObject( ModifyType _modType, const KoPoint & point, bool k if ( _modType == MT_RESIZE_UP || _modType == MT_RESIZE_LU || _modType == MT_RESIZE_RU ) { top = true; - snaptqStatus |= KoGuides::SNAP_HORIZ; + snapStatus |= KoGuides::SNAP_HORIZ; } if ( _modType == MT_RESIZE_DN || _modType == MT_RESIZE_LD || _modType == MT_RESIZE_RD ) { bottom = true; - snaptqStatus |= KoGuides::SNAP_HORIZ; + snapStatus |= KoGuides::SNAP_HORIZ; } if ( _modType == MT_RESIZE_LF || _modType == MT_RESIZE_LU || _modType == MT_RESIZE_LD ) { left = true; - snaptqStatus |= KoGuides::SNAP_VERT; + snapStatus |= KoGuides::SNAP_VERT; } if ( _modType == MT_RESIZE_RT || _modType == MT_RESIZE_RU || _modType == MT_RESIZE_RD ) { right = true; - snaptqStatus |= KoGuides::SNAP_VERT; + snapStatus |= KoGuides::SNAP_VERT; } double newLeft = objRect.left(); @@ -4931,17 +4931,17 @@ void KPrCanvas::resizeObject( ModifyType _modType, const KoPoint & point, bool k { sp.setY( rect.bottom() ); } - m_gl.repaintSnapping( sp, snaptqStatus ); + m_gl.repaintSnapping( sp, snapStatus ); } - _tqrepaint( oldBoundingRect ); - _tqrepaint( kpobject ); + _repaint( oldBoundingRect ); + _repaint( kpobject ); emit objectSizeChanged(); } } -void KPrCanvas::finishResizeObject( const TQString &name, bool tqlayout ) +void KPrCanvas::finishResizeObject( const TQString &name, bool layout ) { if ( m_resizeObject ) { @@ -4958,12 +4958,12 @@ void KPrCanvas::finishResizeObject( const TQString &name, bool tqlayout ) m_view->kPresenterDoc()->addCommand( resizeCmd ); } - if ( tqlayout ) - m_view->kPresenterDoc()->tqlayout( m_resizeObject ); + if ( layout ) + m_view->kPresenterDoc()->layout( m_resizeObject ); m_ratio = 0.0; m_isResizing = false; - _tqrepaint( m_resizeObject ); + _repaint( m_resizeObject ); m_resizeObject = NULL; } } @@ -5321,14 +5321,14 @@ void KPrCanvas::textContentsToHeight() if ( !macro ) macro = new KMacroCommand(i18n("Extend Text Contents to Height")); macro->addCommand( cmd); - _tqrepaint( it.current() ); + _repaint( it.current() ); } } if( macro ) { macro->execute(); m_view->kPresenterDoc()->addCommand( macro ); - m_view->kPresenterDoc()->tqrepaint(this); + m_view->kPresenterDoc()->repaint(this); } } @@ -5354,7 +5354,7 @@ void KPrCanvas::textObjectToContents() { macro->execute(); m_view->kPresenterDoc()->addCommand( macro ); - m_view->kPresenterDoc()->tqrepaint(this); + m_view->kPresenterDoc()->repaint(this); } } @@ -5444,7 +5444,7 @@ bool KPrCanvas::checkCurrentTextEdit( KPrTextObject * textObj ) if ( textObj && m_currentTextObjectView && m_currentTextObjectView->kpTextObject() != textObj ) { m_currentTextObjectView->kpTextObject()->setEditingTextObj( false ); - _tqrepaint( m_currentTextObjectView->kpTextObject() ); + _repaint( m_currentTextObjectView->kpTextObject() ); //don't remove selection otherwise break dnd. m_currentTextObjectView->terminate(false); delete m_currentTextObjectView; @@ -5535,12 +5535,12 @@ void KPrCanvas::closeObject(bool /*close*/) m_view->kPresenterDoc()->addCommand( cmd ); } -void KPrCanvas::tqlayout() +void KPrCanvas::layout() { TQPtrListIterator<KPrObject> it(getObjectList()); for ( ; it.current(); ++it ) { if ( it.current()->getType() == OT_TEXT ) - static_cast<KPrTextObject *>( it.current() )->tqlayout(); + static_cast<KPrTextObject *>( it.current() )->layout(); } } @@ -5553,18 +5553,18 @@ KoPoint KPrCanvas::snapPoint( KoPoint &pos, bool repaintSnapping ) bool snapToGuideLines = doc->showGuideLines() && !m_disableSnapping; KoPoint snapDiff = KoPoint( 0, 0 ); // needed if all snapping is off - KoGuides::SnaptqStatus snaptqStatus = KoGuides::SNAP_NONE; + KoGuides::SnapStatus snapStatus = KoGuides::SNAP_NONE; if ( snapToGrid ) { snapDiff.setX( tqRound( sp.x() / doc->getGridX()) * doc->getGridX() - sp.x() ); snapDiff.setY( tqRound( sp.y() / doc->getGridY()) * doc->getGridY() - sp.y() ); - snaptqStatus = KoGuides::SNAP_BOTH; + snapStatus = KoGuides::SNAP_BOTH; } if ( snapToGuideLines ) { - m_gl.snapToGuideLines( sp, MOUSE_SNAP_DISTANCE, snaptqStatus, snapDiff ); + m_gl.snapToGuideLines( sp, MOUSE_SNAP_DISTANCE, snapStatus, snapDiff ); } sp += snapDiff; diff --git a/kpresenter/KPrCanvas.h b/kpresenter/KPrCanvas.h index e2b373e1..2d8c7f48 100644 --- a/kpresenter/KPrCanvas.h +++ b/kpresenter/KPrCanvas.h @@ -360,7 +360,7 @@ exportPage( 0, s, 800, 600, "/home/khz/page0.png", "PNG", 100 ); TQPixmap getPicturePixmap() const; void closeObject(bool _close); - void tqlayout(); + void layout(); void alignVertical(VerticalAlignmentType _type ); void savePicture(); @@ -376,8 +376,8 @@ exportPage( 0, s, 800, 600, "/home/khz/page0.png", "PNG", 100 ); void objectPopup( KPrObject *object, const TQPoint &point ); public slots: - // use tqrepaint = false when the KPrCanvas is destroyed to avaid a possible crash - void exitEditMode( bool tqrepaint = true ); + // use repaint = false when the KPrCanvas is destroyed to avaid a possible crash + void exitEditMode( bool repaint = true ); void clipCut(); void clipCopy(); @@ -543,9 +543,9 @@ protected: TQRect getPageRect( bool decBorders = true ) const; unsigned int pageNums() const; - void _tqrepaint( bool erase=true ); - void _tqrepaint( const TQRect &r ); - void _tqrepaint( KPrObject *o ); + void _repaint( bool erase=true ); + void _repaint( const TQRect &r ); + void _repaint( KPrObject *o ); /** * Draw page defined in step to painter. @@ -633,7 +633,7 @@ private: /// resize the m_resizeObject void resizeObject( ModifyType _modType, const KoPoint & point, bool keepRatio, bool scaleAroundCenter ); /// create KPrResizeCmd - void finishResizeObject( const TQString &name, bool tqlayout = true ); + void finishResizeObject( const TQString &name, bool layout = true ); /** * @brief Display object above the other objects in editiong mode @@ -692,7 +692,7 @@ private: * @param pos the point which should be snapped * @param repaintSnapping true if the guides should be repainted. * @param repaintSnapping false when the guides should not be repainted. - * You have to call tqrepaint by yourself. + * You have to call repaint by yourself. * * @return the position of the snapped point */ diff --git a/kpresenter/KPrClosedLineObject.cpp b/kpresenter/KPrClosedLineObject.cpp index be409183..208335f5 100644 --- a/kpresenter/KPrClosedLineObject.cpp +++ b/kpresenter/KPrClosedLineObject.cpp @@ -297,9 +297,9 @@ void KPrClosedLineObject::loadOasis( const TQDomElement &element, KoOasisContext points = parser.getPoints( d, true ); loadOasisApplyViewBox( element, points ); } - else if ( tag == "custom-tqshape" ) + else if ( tag == "custom-shape" ) { - TQDomElement enhancedGeometry = KoDom::namedItemNS( element, KoXmlNS::draw, "enhanced-tqgeometry" ); + TQDomElement enhancedGeometry = KoDom::namedItemNS( element, KoXmlNS::draw, "enhanced-geometry" ); if ( !enhancedGeometry.isNull() ) { diff --git a/kpresenter/KPrCommand.cpp b/kpresenter/KPrCommand.cpp index 5236aaf6..5f88381d 100644 --- a/kpresenter/KPrCommand.cpp +++ b/kpresenter/KPrCommand.cpp @@ -94,7 +94,7 @@ void KPrShadowCmd::execute() it.current()->setShadowParameter(newShadow.shadowDistance, newShadow.shadowDirection, newShadow.shadowColor); - doc->tqrepaint( false ); + doc->repaint( false ); doc->updateSideBarItem( m_page ); } @@ -105,7 +105,7 @@ void KPrShadowCmd::unexecute() objects.at( i )->setShadowParameter(oldShadow.at(i)->shadowDistance, oldShadow.at(i)->shadowDirection, oldShadow.at(i)->shadowColor); - doc->tqrepaint( false ); + doc->repaint( false ); doc->updateSideBarItem( m_page ); } @@ -145,7 +145,7 @@ void KPrSetOptionsCmd::execute() doc->setGridValue( gridX, gridY, false ); doc->updateRuler(); doc->setTxtBackCol( txtBackCol ); - doc->tqrepaint( false ); + doc->repaint( false ); } void KPrSetOptionsCmd::unexecute() @@ -155,7 +155,7 @@ void KPrSetOptionsCmd::unexecute() doc->setGridValue( oldGridX, oldGridY, false ); doc->updateRuler(); doc->setTxtBackCol( otxtBackCol ); - doc->tqrepaint( false ); + doc->repaint( false ); } KPrSetBackCmd::KPrSetBackCmd( const TQString &name, const KPrBackGround::Settings &settings, @@ -189,7 +189,7 @@ void KPrSetBackCmd::execute() } } - m_doc->tqrepaint( false ); + m_doc->repaint( false ); if ( m_takeGlobal ) { TQPtrListIterator<KPrPage> it( m_doc->getPageList() ); @@ -217,7 +217,7 @@ void KPrSetBackCmd::unexecute() m_doc->restoreBackground(it.current()); } } - m_doc->tqrepaint( false ); + m_doc->repaint( false ); if ( m_takeGlobal ) { TQPtrListIterator<KPrPage> it( m_doc->getPageList() ); @@ -272,7 +272,7 @@ void KPrRotateCmd::execute() it.current()->rotate( m_newAngle ); } m_doc->updateRuler(); - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -282,7 +282,7 @@ void KPrRotateCmd::unexecute() for ( unsigned int i = 0; i < m_objects.count(); i++ ) m_objects.at(i)->rotate( m_oldAngles.at( i )->angle ); m_doc->updateRuler(); - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -311,7 +311,7 @@ KPrChgPixCmd::~KPrChgPixCmd() void KPrChgPixCmd::execute() { m_page->replaceObject( oldObject, newObject ); - doc->tqrepaint( newObject ); + doc->repaint( newObject ); doc->updateSideBarItem( m_page ); } @@ -319,7 +319,7 @@ void KPrChgPixCmd::execute() void KPrChgPixCmd::unexecute() { m_page->replaceObject( newObject, oldObject ); - doc->tqrepaint( oldObject ); + doc->repaint( oldObject ); doc->updateSideBarItem( m_page ); } @@ -378,7 +378,7 @@ void KPrDeleteCmd::execute() for ( itDelete.toFirst(); itDelete.current(); ++itDelete ) { TQRect oldRect = m_doc->zoomHandler()->zoomRect( itDelete.current()->getRepaintRect() ); - m_doc->tqrepaint( oldRect ); + m_doc->repaint( oldRect ); } if(textObj) m_doc->updateRuler(); @@ -393,7 +393,7 @@ void KPrDeleteCmd::unexecute() for ( ; it.current(); ++it ) { it.current()->addToObjList(); - m_doc->tqrepaint( it.current() ); + m_doc->repaint( it.current() ); } m_doc->updateSideBarItem( m_page ); @@ -501,7 +501,7 @@ void KPrGroupObjCmd::execute() m_groupObject->setSelected( true ); m_doc->refreshGroupButton(); - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -522,7 +522,7 @@ void KPrGroupObjCmd::unexecute() m_doc->refreshGroupButton(); - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -561,7 +561,7 @@ void UnGroupObjCmd::execute() m_doc->refreshGroupButton(); - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -587,7 +587,7 @@ void UnGroupObjCmd::unexecute() m_groupObject->setSelected( true ); m_doc->refreshGroupButton(); - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -641,7 +641,7 @@ void KPrInsertCmd::execute() m_object->addToObjList(); if ( m_object->getType() == OT_TEXT ) m_doc->updateRuler(); - m_doc->tqrepaint( m_object ); + m_doc->repaint( m_object ); } else { @@ -653,7 +653,7 @@ void KPrInsertCmd::execute() ( *it )->addToObjList(); if ( ( *it )->getType() == OT_TEXT ) updateRuler = true; - m_doc->tqrepaint( *it ); + m_doc->repaint( *it ); } if ( updateRuler ) m_doc->updateRuler(); @@ -678,7 +678,7 @@ void KPrInsertCmd::unexecute() m_doc->updateRuler(); } } - m_doc->tqrepaint( oldRect ); + m_doc->repaint( oldRect ); } else { @@ -703,7 +703,7 @@ void KPrInsertCmd::unexecute() if ( updateRuler ) m_doc->updateRuler(); - m_doc->tqrepaint( false ); + m_doc->repaint( false ); } m_doc->updateSideBarItem( m_page ); @@ -736,7 +736,7 @@ KPrLowerRaiseCmd::~KPrLowerRaiseCmd() void KPrLowerRaiseCmd::execute() { m_page->setObjectList( newList ); - doc->tqrepaint( false ); + doc->repaint( false ); doc->updateSideBarItem( m_page ); } @@ -744,7 +744,7 @@ void KPrLowerRaiseCmd::execute() void KPrLowerRaiseCmd::unexecute() { m_page->setObjectList( oldList ); - doc->tqrepaint( false ); + doc->repaint( false ); doc->updateSideBarItem( m_page ); } @@ -783,8 +783,8 @@ void KPrMoveByCmd::execute() if(objects.at(i)->isSelected()) doc->updateRuler(); } - doc->tqrepaint( oldRect ); - doc->tqrepaint( objects.at( i ) ); + doc->repaint( oldRect ); + doc->repaint( objects.at( i ) ); } doc->updateSideBarItem( m_page ); @@ -803,8 +803,8 @@ void KPrMoveByCmd::unexecute() if(objects.at(i)->isSelected()) doc->updateRuler(); } - doc->tqrepaint( oldRect ); - doc->tqrepaint( objects.at( i ) ); + doc->repaint( oldRect ); + doc->repaint( objects.at( i ) ); } doc->updateSideBarItem( m_page ); @@ -888,8 +888,8 @@ void KPrAlignCmd::execute() doc->updateRuler(); } - doc->tqrepaint( oldRect ); - doc->tqrepaint( objects.at( i ) ); + doc->repaint( oldRect ); + doc->repaint( objects.at( i ) ); } doc->updateSideBarItem( m_page ); @@ -907,8 +907,8 @@ void KPrAlignCmd::unexecute() if(objects.at(i)->isSelected()) doc->updateRuler(); } - doc->tqrepaint( oldRect ); - doc->tqrepaint( objects.at( i ) ); + doc->repaint( oldRect ); + doc->repaint( objects.at( i ) ); doc->updateRuler(); } @@ -976,7 +976,7 @@ void KoPenCmd::applyPen( KPrObject *object, Pen *tmpPen ) //obj->setPen( tmpPen->pen ); obj->setLineBegin( tmpPen->lineBegin ); obj->setLineEnd( tmpPen->lineEnd ); - //doc->tqrepaint( obj ); + //doc->repaint( obj ); } } break; case OT_FREEHAND: @@ -990,7 +990,7 @@ void KoPenCmd::applyPen( KPrObject *object, Pen *tmpPen ) //obj->setPen( tmpPen->pen ); obj->setLineBegin( tmpPen->lineBegin ); obj->setLineEnd( tmpPen->lineEnd ); - //doc->tqrepaint( obj ); + //doc->repaint( obj ); } } break; case OT_PIE: @@ -1019,7 +1019,7 @@ void KoPenCmd::applyPen( KPrObject *object, Pen *tmpPen ) if ( obj ) { obj->setPen( tmpPen->pen ); - doc->tqrepaint( obj ); + doc->repaint( obj ); } } @@ -1220,7 +1220,7 @@ void KPrBrushCmd::applyBrush( KPr2DObject *object, Brush *tmpBrush ) object->setGUnbalanced( tmpBrush->unbalanced ); object->setGXFactor( tmpBrush->xfactor ); object->setGYFactor( tmpBrush->yfactor ); - doc->tqrepaint( object ); + doc->repaint( object ); } void KPrBrushCmd::unexecute() @@ -1345,7 +1345,7 @@ KPrPgLayoutCmd::KPrPgLayoutCmd( const TQString &_name, KoPageLayout _layout, KoP : KNamedCommand( _name ) { m_doc=_doc; - tqlayout = _layout; + layout = _layout; oldLayout = _oldLayout; oldUnit = _oldUnit; unit = _unit; @@ -1354,7 +1354,7 @@ KPrPgLayoutCmd::KPrPgLayoutCmd( const TQString &_name, KoPageLayout _layout, KoP void KPrPgLayoutCmd::execute() { m_doc->setUnit( unit ); - m_doc->setPageLayout( tqlayout ); + m_doc->setPageLayout( layout ); m_doc->updateHeaderFooterPosition(); m_doc->updateRuler(); m_doc->updateRulerPageLayout(); @@ -1456,7 +1456,7 @@ void KPrPieValueCmd::execute() obj->setPieLength( m_newValues.pieLength ); } } - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -1473,7 +1473,7 @@ void KPrPieValueCmd::unexecute() obj->setPieLength( m_oldValues.at( i )->pieLength ); } } - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -1553,7 +1553,7 @@ void KPrPolygonSettingCmd::execute() obj->setSharpnessValue(m_newSettings.sharpnessValue ); } } - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -1570,7 +1570,7 @@ void KPrPolygonSettingCmd::unexecute() obj->setSharpnessValue(m_oldSettings.at( i )->sharpnessValue); } } - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -1670,7 +1670,7 @@ void KPrPictureSettingCmd::execute() obj->setPictureBright( m_newSettings.bright ); } } - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -1688,7 +1688,7 @@ void KPrPictureSettingCmd::unexecute() obj->setPictureBright( pictureSettings->bright ); } } - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -1795,7 +1795,7 @@ void KPrRectValueCmd::execute() obj->setRnds( xtmp, ytmp ); } } - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -1809,7 +1809,7 @@ void KPrRectValueCmd::unexecute() if( obj ) obj->setRnds( m_oldValues.at( i )->xRnd, m_oldValues.at( i )->yRnd ); } - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -1842,12 +1842,12 @@ void KPrResizeCmd::execute() { if(object->isSelected()) doc->updateRuler(); - doc->tqlayout( object ); + doc->layout( object ); } if ( object->isSelected()) doc->updateObjectStatusBarItem(); - doc->tqrepaint( oldRect ); - doc->tqrepaint( object ); + doc->repaint( oldRect ); + doc->repaint( object ); doc->updateSideBarItem( m_page ); } @@ -1863,13 +1863,13 @@ void KPrResizeCmd::unexecute() { if(object->isSelected()) doc->updateRuler(); - doc->tqlayout( object ); + doc->layout( object ); } if ( object->isSelected()) doc->updateObjectStatusBarItem(); - doc->tqrepaint( oldRect ); - doc->tqrepaint( object ); + doc->repaint( oldRect ); + doc->repaint( object ); doc->updateSideBarItem( m_page ); } @@ -2368,7 +2368,7 @@ void KPrFlipObjectCommand::flipObjects() for ( ; it.current() ; ++it ) { it.current()->flip( horizontal ); - m_doc->tqrepaint( it.current() ); + m_doc->repaint( it.current() ); } m_doc->updateSideBarItem( m_page ); @@ -2425,7 +2425,7 @@ void KPrGeometryPropertiesCommand::execute() { it.current()->setProtect( m_newValue ); if ( it.current()->isSelected() ) - m_doc->tqrepaint( it.current() ); + m_doc->repaint( it.current() ); } else if ( m_type == KeepRatio) it.current()->setKeepRatio( m_newValue ); @@ -2441,7 +2441,7 @@ void KPrGeometryPropertiesCommand::unexecute() { obj->setProtect( *m_oldValue.at(i) ); if ( obj->isSelected() ) - m_doc->tqrepaint( obj ); + m_doc->repaint( obj ); } else if ( m_type == KeepRatio) obj->setKeepRatio( *m_oldValue.at(i) ); @@ -2568,7 +2568,7 @@ void KPrCloseObjectCommand::execute() ( *closeIt )->addToObjList(); ( *openIt )->setSelected( false ); ( *closeIt )->setSelected( selected ); - m_doc->tqrepaint( *closeIt ); + m_doc->repaint( *closeIt ); } m_doc->updateSideBarItem( m_page ); } @@ -2585,7 +2585,7 @@ void KPrCloseObjectCommand::unexecute() ( *openIt )->addToObjList(); ( *closeIt )->setSelected( false ); ( *openIt )->setSelected( selected ); - m_doc->tqrepaint( *openIt ); + m_doc->repaint( *openIt ); } m_doc->updateSideBarItem( m_page ); } @@ -2668,9 +2668,9 @@ void KPrChangeMarginCommand::execute() it.current()->setTextMargins( m_newMargins.leftMargin, m_newMargins.topMargin, m_newMargins.rightMargin, m_newMargins.bottomMargin); it.current()->resizeTextDocument(); - it.current()->tqlayout(); + it.current()->layout(); } - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -2684,9 +2684,9 @@ void KPrChangeMarginCommand::unexecute() object->setTextMargins( marginsStruct->leftMargin, marginsStruct->topMargin, marginsStruct->rightMargin, marginsStruct->bottomMargin); object->resizeTextDocument(); - object->tqlayout(); + object->layout(); } - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -2708,8 +2708,8 @@ KPrChangeVerticalAlignmentCommand::KPrChangeVerticalAlignmentCommand( const TQSt void KPrChangeVerticalAlignmentCommand::execute() { m_obj->setVerticalAligment( m_newAlign ); - m_obj->kPresenterDocument()->tqlayout(m_obj); - m_obj->kPresenterDocument()->tqrepaint(m_obj); + m_obj->kPresenterDocument()->layout(m_obj); + m_obj->kPresenterDocument()->repaint(m_obj); m_doc->updateSideBarItem( m_page ); } @@ -2717,8 +2717,8 @@ void KPrChangeVerticalAlignmentCommand::execute() void KPrChangeVerticalAlignmentCommand::unexecute() { m_obj->setVerticalAligment( m_oldAlign ); - m_obj->kPresenterDocument()->tqlayout(m_obj); - m_obj->kPresenterDocument()->tqrepaint(m_obj); + m_obj->kPresenterDocument()->layout(m_obj); + m_obj->kPresenterDocument()->repaint(m_obj); m_doc->updateSideBarItem( m_page ); } @@ -2779,7 +2779,7 @@ void KPrImageEffectCmd::execute() obj->setIEParams(newSettings.param1, newSettings.param2, newSettings.param3); } } - doc->tqrepaint( false ); + doc->repaint( false ); doc->updateSideBarItem( m_page ); } @@ -2794,7 +2794,7 @@ void KPrImageEffectCmd::unexecute() oldSettings.at( i )->param3); } } - doc->tqrepaint( false ); + doc->repaint( false ); doc->updateSideBarItem( m_page ); } diff --git a/kpresenter/KPrCommand.h b/kpresenter/KPrCommand.h index 4a4cc0ec..48e977ce 100644 --- a/kpresenter/KPrCommand.h +++ b/kpresenter/KPrCommand.h @@ -31,7 +31,7 @@ #include <KoPictureCollection.h> #include <tqvaluelist.h> #include <tqpen.h> -#include <tqbrush.h> +#include <brush.h> #include <KoPageLayoutDia.h> #include <KoParagLayout.h> #include <KoTextCommand.h> @@ -543,7 +543,7 @@ public: protected: KPrDocument *m_doc; - KoPageLayout tqlayout, oldLayout; + KoPageLayout layout, oldLayout; KoUnit::Unit unit, oldUnit; }; diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp index 42a701e9..aea1d31c 100644 --- a/kpresenter/KPrConfig.cpp +++ b/kpresenter/KPrConfig.cpp @@ -40,7 +40,7 @@ #include <tqgroupbox.h> #include <tqvgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <tqcheckbox.h> #include <tqcombobox.h> @@ -365,13 +365,13 @@ void KPrConfigureColorBackground::apply() if( oldGridColor != _col ) { config->setGroup( "KPresenter Color" ); config->writeEntry( "GridColor", _col ); - doc->tqrepaint( false ); + doc->repaint( false ); doc->setGridColor( _col ); oldGridColor=_col; repaintNeeded = true; } if (repaintNeeded) - doc->tqrepaint( false ); + doc->repaint( false ); } void KPrConfigureColorBackground::slotDefault() @@ -419,9 +419,9 @@ KPrConfigureMiscPage::KPrConfigureMiscPage( KPrView *_view, TQWidget *parent, ch config = KPrFactory::global()->config(); TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Misc"), this, "GroupBox" ); - tmpTQGroupBox->tqlayout()->setSpacing(KDialog::spacingHint()); - tmpTQGroupBox->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *grid = new TQGridLayout( tmpTQGroupBox->tqlayout(), 8, 1 ); + tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint()); + tmpTQGroupBox->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *grid = new TQGridLayout( tmpTQGroupBox->layout(), 8, 1 ); m_oldNbRedo=30; m_printNotes=true; @@ -469,9 +469,9 @@ KPrConfigureMiscPage::KPrConfigureMiscPage( KPrView *_view, TQWidget *parent, ch box->addWidget(tmpTQGroupBox); tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Grid"), this, "GroupBox" ); - tmpTQGroupBox->tqlayout()->setSpacing(KDialog::spacingHint()); - tmpTQGroupBox->tqlayout()->setMargin(KDialog::marginHint()); - grid = new TQGridLayout( tmpTQGroupBox->tqlayout(), 8, 1 ); + tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint()); + tmpTQGroupBox->layout()->setMargin(KDialog::marginHint()); + grid = new TQGridLayout( tmpTQGroupBox->layout(), 8, 1 ); KoRect rect = doc->masterPage()->getPageRect(); TQLabel *lab=new TQLabel(i18n("Horizontal grid size:"), tmpTQGroupBox); @@ -567,7 +567,7 @@ KCommand * KPrConfigureMiscPage::apply() doc->setGridValue( resolutionX->value(), resolutionY->value(), true); - doc->tqrepaint( false ); + doc->repaint( false ); config->sync(); diff --git a/kpresenter/KPrCustomSlideShowDia.cpp b/kpresenter/KPrCustomSlideShowDia.cpp index 7c0fa1c9..46c485cb 100644 --- a/kpresenter/KPrCustomSlideShowDia.cpp +++ b/kpresenter/KPrCustomSlideShowDia.cpp @@ -18,13 +18,13 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqlistbox.h> #include <tqpushbutton.h> #include <tqtoolbutton.h> #include <tqapplication.h> -#include <tqlayout.h> +#include <layout.h> #include <kdebug.h> #include <kmessagebox.h> #include <klocale.h> @@ -214,7 +214,7 @@ void KPrCustomSlideShowDia::slotCopy() { if ( !uniqueName( i, str ) ) { - str = str.tqarg( i ); + str = str.arg( i ); m_customSlideShowMap.insert( str, m_customSlideShowMap[item->text()] ); list->insertItem( str ); break; @@ -225,7 +225,7 @@ void KPrCustomSlideShowDia::slotCopy() bool KPrCustomSlideShowDia::uniqueName( int val, const TQString & name ) const { - TQString str = name.tqarg( val ); + TQString str = name.arg( val ); for ( int i= 0; i < ( int )list->count(); ++i ) { if ( list->text ( i ) == str ) diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp index 7a880406..17a8f0c6 100644 --- a/kpresenter/KPrDocument.cpp +++ b/kpresenter/KPrDocument.cpp @@ -43,7 +43,7 @@ #include "KPrSVGPathParser.h" #include <tqpopupmenu.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqregexp.h> #include <tqfileinfo.h> #include <tqdom.h> @@ -272,7 +272,7 @@ KPrDocument::KPrDocument( TQWidget *parentWidget, const char *widgetName, TQObje saveOnlyPage = -1; m_maxRecentFiles = 10; - connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ), + connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), this, TQT_SLOT( clipboardDataChanged() ) ); m_commandHistory = new KoCommandHistory( actionCollection(), true ) ; @@ -444,9 +444,9 @@ bool KPrDocument::saveChildren( KoStore* _store ) { int i = 0; - TQPtrListIterator<KoDocumentChild> it( tqchildren() ); + TQPtrListIterator<KoDocumentChild> it( children() ); for( ; it.current(); ++it ) { - // Don't save tqchildren that are only in the undo/redo history + // Don't save children that are only in the undo/redo history // but not anymore in the presentation TQPtrListIterator<KPrPage> pageIt( m_pageList ); for ( int pagePos = 0; pageIt.current(); ++pageIt, ++pagePos ) @@ -490,7 +490,7 @@ TQDomDocument KPrDocument::saveXML() emit sigProgress( 0 ); } - m_varColl->variableSetting()->setModificationDate(TQDateTime::tqcurrentDateTime()); + m_varColl->variableSetting()->setModificationDate(TQDateTime::currentDateTime()); recalcVariables( VT_DATE ); recalcVariables( VT_TIME ); recalcVariables( VT_STATISTIC ); @@ -669,9 +669,9 @@ TQDomDocument KPrDocument::saveXML() } // Write "OBJECT" tag for every child - TQPtrListIterator<KoDocumentChild> chl( tqchildren() ); + TQPtrListIterator<KoDocumentChild> chl( children() ); for( ; chl.current(); ++chl ) { - // Don't save tqchildren that are only in the undo/redo history + // Don't save children that are only in the undo/redo history // but not anymore in the presentation for ( int i = 0; i < static_cast<int>( m_pageList.count() ); i++ ) { if ( saveOnlyPage != -1 && i != saveOnlyPage ) @@ -735,8 +735,8 @@ void KPrDocument::saveEmbeddedObject(KPrPage *page, KoDocumentChild *chl, TQDomD TQDomElement embedded=doc.createElement("EMBEDDED"); KPrChild* curr = (KPrChild*)chl; - // tqgeometry is no zoom value ! - TQRect _rect = curr->tqgeometry(); + // geometry is no zoom value ! + TQRect _rect = curr->geometry(); int tmpX = (int)zoomHandler()->unzoomItX( _rect.x() ); int tmpY = (int)zoomHandler()->unzoomItY( _rect.y() ); int tmpWidth = (int)zoomHandler()->unzoomItX( _rect.width() ); @@ -909,7 +909,7 @@ TQDomElement KPrDocument::saveUsedSoundFileToXML( TQDomDocument &_doc, TQStringL TQString soundFileName = *it; int position = soundFileName.findRev( '.' ); TQString format = soundFileName.right( soundFileName.length() - position - 1 ); - TQString _name = TQString( "sounds/sound%1.%2" ).tqarg( ++i ).tqarg( format.lower() ); + TQString _name = TQString( "sounds/sound%1.%2" ).arg( ++i ).arg( format.lower() ); TQDomElement fileElem = _doc.createElement( "FILE" ); soundFiles.appendChild( fileElem ); @@ -955,7 +955,7 @@ void KPrDocument::saveUsedSoundFileToStore( KoStore *_store, TQStringList _list TQString soundFileName = *it; int position = soundFileName.findRev( '.' ); TQString format = soundFileName.right( soundFileName.length() - position - 1 ); - TQString _storeURL = TQString( "sounds/sound%1.%2" ).tqarg( ++i ).tqarg( format.lower() ); + TQString _storeURL = TQString( "sounds/sound%1.%2" ).arg( ++i ).arg( format.lower() ); if ( _store->open( _storeURL ) ) { KoStoreDevice dev( _store ); @@ -973,7 +973,7 @@ bool KPrDocument::loadChildren( KoStore* _store ) { if ( objStartY == 0 && _clean) // Don't do this when inserting a template or a page... { - TQPtrListIterator<KoDocumentChild> it( tqchildren() ); + TQPtrListIterator<KoDocumentChild> it( children() ); for( ; it.current(); ++it ) { if ( !((KoDocumentChild*)it.current())->loadDocument( _store ) ) return false; @@ -981,7 +981,7 @@ bool KPrDocument::loadChildren( KoStore* _store ) } else // instead load form the correct child on, m_childCountBeforeInsert has the be set { - TQPtrListIterator<KoDocumentChild> it( tqchildren() ); + TQPtrListIterator<KoDocumentChild> it( children() ); for( int i = 0; it.current(); ++it, ++i ) { if ( i < m_childCountBeforeInsert ) continue; @@ -1006,7 +1006,7 @@ bool KPrDocument::saveOasis( KoStore* store, KoXmlWriter* manifestWriter ) KoXmlWriter* contentWriter = createOasisXmlWriter( &contentDev, "office:document-content" ); - m_varColl->variableSetting()->setModificationDate(TQDateTime::tqcurrentDateTime()); + m_varColl->variableSetting()->setModificationDate(TQDateTime::currentDateTime()); recalcVariables( VT_DATE ); recalcVariables( VT_TIME ); recalcVariables( VT_STATISTIC ); @@ -1535,7 +1535,7 @@ void KPrDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyl Q_ASSERT( styles.count() == 1 ); it = styles.begin(); for ( ; it != styles.end() ; ++it ) { - (*it).style->writeStyle( stylesWriter, mainStyles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties", false /*don't close*/ ); + (*it).style->writeStyle( stylesWriter, mainStyles, "style:page-layout", (*it).name, "style:page-layout-properties", false /*don't close*/ ); stylesWriter->endElement(); } @@ -1614,7 +1614,7 @@ bool KPrDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles&oasisStyles if ( localName.isEmpty() ) setErrorMessage( i18n( "Invalid OASIS OpenDocument file. No tag found inside office:body." ) ); else - setErrorMessage( i18n( "This document is not a presentation, but a %1. Please try opening it with the appropriate application." ).tqarg( KoDocument::tagNameToDocumentType( localName ) ) ); + setErrorMessage( i18n( "This document is not a presentation, but a %1. Please try opening it with the appropriate application." ).arg( KoDocument::tagNameToDocumentType( localName ) ) ); return false; } @@ -1648,7 +1648,7 @@ bool KPrDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles&oasisStyles kdDebug()<<" masterPageName:"<<masterPageName<<endl; if ( ! master ) { - masterPageName = "Standard"; // use default tqlayout as fallback (default in kpresenter) + masterPageName = "Standard"; // use default layout as fallback (default in kpresenter) master = oasisStyles.masterPages()[ masterPageName]; if ( !master ) //last test... master = oasisStyles.masterPages()["Default"]; @@ -1685,7 +1685,7 @@ bool KPrDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles&oasisStyles kdDebug()<<" end load oasis master style \n"; Q_ASSERT( master ); - const TQDomElement *style = master ? oasisStyles.findStyle(master->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() )) : 0; + const TQDomElement *style = master ? oasisStyles.findStyle(master->attributeNS( KoXmlNS::style, "page-layout-name", TQString() )) : 0; const TQDomElement *backgroundStyle = oasisStyles.findStyle( "Standard-background", "presentation" ); kdDebug()<<"Standard background "<<backgroundStyle<<endl; // parse all pages @@ -1857,7 +1857,7 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, TQDomNode & drawPage, KoOa TQRect r; KPrPartObject *kppartobject = new KPrPartObject( ch ); kppartobject->loadOasis( o, context, m_loadingInfo ); - r = ch->tqgeometry(); + r = ch->geometry(); if ( groupObject ) groupObject->addObjects( kppartobject ); else @@ -1993,11 +1993,11 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, TQDomNode & drawPage, KoOa break; } } - else if ( name == "custom-tqshape" && isDrawNS ) + else if ( name == "custom-shape" && isDrawNS ) { fillStyleStack( o, context, "graphic" ); - TQDomElement enhancedGeometry = KoDom::namedItemNS( o, KoXmlNS::draw, "enhanced-tqgeometry" ); + TQDomElement enhancedGeometry = KoDom::namedItemNS( o, KoXmlNS::draw, "enhanced-geometry" ); if ( !enhancedGeometry.isNull() ) { @@ -2054,13 +2054,13 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, TQDomNode & drawPage, KoOa newpage->appendObject( kpClosedObject ); } break; default: - kdDebug(33001) << "draw:custom-tqshape found unsupported object type " << objType << " in draw:enhanced-path " << d << endl; + kdDebug(33001) << "draw:custom-shape found unsupported object type " << objType << " in draw:enhanced-path " << d << endl; break; } } else { - kdDebug(33001) << "draw:custom-tqshape not supported" << endl; + kdDebug(33001) << "draw:custom-shape not supported" << endl; } } } @@ -2089,7 +2089,7 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, TQDomNode & drawPage, KoOa if ( !note.isEmpty() ) note += "\n"; - //todo load tqlayout for note. + //todo load layout for note. TQDomNode textBox = KoDom::namedItemNS( frameBox, KoXmlNS::draw, "text-box" ); if ( !textBox.isNull() ) @@ -2136,10 +2136,10 @@ int KPrDocument::createPresentationAnimation(const TQDomElement& element, int or { const bool isPresentationNS = e.namespaceURI() == KoXmlNS::presentation; if ( isPresentationNS && - ( tagName == "show-tqshape" || tagName == "hide-tqshape" ) ) + ( tagName == "show-shape" || tagName == "hide-shape" ) ) { - Q_ASSERT( e.hasAttributeNS( KoXmlNS::draw, "tqshape-id" ) ); - TQString name = e.attributeNS( KoXmlNS::draw, "tqshape-id", TQString() ); + Q_ASSERT( e.hasAttributeNS( KoXmlNS::draw, "shape-id" ) ); + TQString name = e.attributeNS( KoXmlNS::draw, "shape-id", TQString() ); kdDebug()<<" insert animation " << tagName << " name :" << name << endl; if ( e.hasAttributeNS( KoXmlNS::koffice, "order-id" ) ) @@ -2150,7 +2150,7 @@ int KPrDocument::createPresentationAnimation(const TQDomElement& element, int or lstAnimation *tmp = new lstAnimation; tmp->element = new TQDomElement( e ); tmp->order = orderAnimation; - if ( tagName == "show-tqshape" ) + if ( tagName == "show-shape" ) { m_loadingInfo->storePresentationShowAnimation( tmp, name ); } @@ -2246,7 +2246,7 @@ bool KPrDocument::loadXML( TQIODevice * dev, const TQDomDocument& doc ) << " Line: " << errorLine << " Column: " << errorColumn << endl << " Message: " << errorMsg << endl; setErrorMessage( i18n( "parsing error in the main document (converted from an old KPresenter format) at line %1, column %2\nError message: %3" ) - .tqarg( errorLine ).tqarg( errorColumn ).tqarg( i18n ( errorMsg.utf8() ) ) ); + .arg( errorLine ).arg( errorColumn ).arg( i18n ( errorMsg.utf8() ) ) ); return false; } b = loadXML( newdoc ); @@ -2294,7 +2294,7 @@ void KPrDocument::insertEmbedded( KoStore *store, TQDomElement topElem, KMacroCo TQDomElement object=elem.namedItem("OBJECT").toElement(); if(!object.isNull()) { ch->load(object, true); // true == uppercase - r = ch->tqgeometry(); + r = ch->geometry(); ch->loadDocument( store ); insertChild( ch ); kppartobject = new KPrPartObject( ch ); @@ -2376,7 +2376,7 @@ bool KPrDocument::loadXML( const TQDomDocument &doc ) document.attribute("mime")!="application/x-kpresenter" && document.attribute("mime")!="application/vnd.kde.kpresenter" ) ) { kdError(33001) << "Unknown mime type " << document.attribute("mime") << endl; - setErrorMessage( i18n("Invalid document, expected mimetype application/x-kpresenter or application/vnd.kde.kpresenter, got %1").tqarg(document.attribute("mime")) ); + setErrorMessage( i18n("Invalid document, expected mimetype application/x-kpresenter or application/vnd.kde.kpresenter, got %1").arg(document.attribute("mime")) ); return false; } if(document.hasAttribute("url")) @@ -2401,7 +2401,7 @@ bool KPrDocument::loadXML( const TQDomDocument &doc ) TQDomElement object=elem.namedItem("OBJECT").toElement(); if(!object.isNull()) { ch->load(object, true); // true == uppercase - r = ch->tqgeometry(); + r = ch->geometry(); insertChild( ch ); kppartobject = new KPrPartObject( ch ); //emit sig_insertObject( ch, kppartobject ); @@ -2514,7 +2514,7 @@ bool KPrDocument::loadXML( const TQDomDocument &doc ) else if(borders.hasAttribute("mmBottom")) //compatibility __pgLayout.ptBottom = MM_TO_POINT( borders.attribute("inchBottom").toDouble() ); } - // PAPER found and parsed -> apply page tqlayout + // PAPER found and parsed -> apply page layout // e.g. the text objects need it if ( _clean ) setPageLayout( __pgLayout ); @@ -3275,26 +3275,26 @@ void KPrDocument::setPageLayout( const KoPageLayout &pgLayout ) //for ( int i = 0; i < static_cast<int>( m_pageList.count() ); i++ ) // m_pageList.at( i )->updateBackgroundSize(); - tqrepaint( false ); - tqlayout(); + repaint( false ); + layout(); // don't setModified(true) here, since this is called on startup } -//when we change pagetqlayout we must re-position header/footer +//when we change pagelayout we must re-position header/footer void KPrDocument::updateHeaderFooterPosition( ) { KoRect pageRect=m_masterPage->getPageRect(); TQRect oldBoundingRect = zoomHandler()->zoomRect( _header->getRepaintRect() ); _header->setOrig(pageRect.topLeft ()); _header->setSize(pageRect.width(),_header->getSize().height()); - tqrepaint( oldBoundingRect ); - tqrepaint(_header); + repaint( oldBoundingRect ); + repaint(_header); oldBoundingRect = zoomHandler()->zoomRect( _footer->getRepaintRect() ); _footer->setOrig(pageRect.left(),pageRect.bottom()-_footer->getSize().height()); _footer->setSize(pageRect.width(),_footer->getSize().height()); - tqrepaint(oldBoundingRect); - tqrepaint(_footer); + repaint(oldBoundingRect); + repaint(_footer); } bool KPrDocument::initDoc(InitDocFlags flags, TQWidget* parentWidget) @@ -3386,7 +3386,7 @@ void KPrDocument::setEmpty() { KoDocument::setEmpty(); // Whether loaded from template or from empty doc: this is a new one -> set creation date - m_varColl->variableSetting()->setCreationDate(TQDateTime::tqcurrentDateTime()); + m_varColl->variableSetting()->setCreationDate(TQDateTime::currentDateTime()); recalcVariables( VT_DATE ); // , VST_CREATION_DATE ... // If we then load a document, it will override that date. } @@ -3401,16 +3401,16 @@ void KPrDocument::setGridValue( double _x, double _y, bool _replace ) replaceObjs(); } -void KPrDocument::tqrepaint( bool erase ) +void KPrDocument::repaint( bool erase ) { TQPtrListIterator<KoView> it( views() ); for( ; it.current(); ++it ) { KPrCanvas* canvas = ((KPrView*)it.current())->getCanvas(); - canvas->tqrepaint( erase ); + canvas->repaint( erase ); } } -void KPrDocument::tqrepaint( const TQRect& rect ) +void KPrDocument::repaint( const TQRect& rect ) { TQRect r; TQPtrListIterator<KoView> it( views() ); @@ -3423,25 +3423,25 @@ void KPrDocument::tqrepaint( const TQRect& rect ) } } -void KPrDocument::tqlayout(KPrObject *kpobject) +void KPrDocument::layout(KPrObject *kpobject) { KPrTextObject * obj = dynamic_cast<KPrTextObject *>( kpobject ); if (obj) - obj->tqlayout(); + obj->layout(); } -void KPrDocument::tqlayout() +void KPrDocument::layout() { TQPtrListIterator<KoView> it( views() ); for( ; it.current(); ++it ) { KPrCanvas* canvas = ((KPrView*)it.current())->getCanvas(); - canvas->tqlayout(); + canvas->layout(); } } -void KPrDocument::tqrepaint( KPrObject *kpobject ) +void KPrDocument::repaint( KPrObject *kpobject ) { - tqrepaint( m_zoomHandler->zoomRect( kpobject->getRepaintRect() ) ); + repaint( m_zoomHandler->zoomRect( kpobject->getRepaintRect() ) ); } TQValueList<int> KPrDocument::getPageEffectSteps( unsigned int num ) @@ -3556,7 +3556,7 @@ void KPrDocument::takePage( KPrPage *page, int pageNum ) } } - tqrepaint( false ); + repaint( false ); } void KPrDocument::pageOrderChanged() @@ -3646,7 +3646,7 @@ int KPrDocument::insertNewPage( const TQString &cmdName, int _page, InsertPos _i KPrPage *newpage = new KPrPage( this, m_masterPage ); m_pageWhereLoadObject=newpage; - m_childCountBeforeInsert = tqchildren().count(); + m_childCountBeforeInsert = children().count(); bool ok = loadNativeFormat( fileName ); if ( !ok ) @@ -3726,7 +3726,7 @@ KCommand * KPrDocument::loadPastedObjs( const TQString &in, KPrPage* _page ) KCommand *cmd = loadObjects(document,true); m_pageWhereLoadObject=0L; - tqrepaint( false ); + repaint( false ); setModified( true ); return cmd; } @@ -3750,7 +3750,7 @@ void KPrDocument::setDisplayObjectMasterPage( bool b ) TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) ((KPrView*)it.current())->updateDisplayObjectMasterPageButton(); - tqrepaint(b); + repaint(b); } void KPrDocument::setDisplayBackground( bool b ) @@ -3758,7 +3758,7 @@ void KPrDocument::setDisplayBackground( bool b ) TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) ((KPrView*)it.current())->updateDisplayBackgroundButton(); - tqrepaint(b); + repaint(b); } void KPrDocument::setHeader( bool b ) @@ -3772,7 +3772,7 @@ void KPrDocument::setHeader( bool b ) } m_masterPage->setHeader( b, false ); updateHeaderFooterButton(); - tqrepaint(b); + repaint(b); } void KPrDocument::setFooter( bool b ) @@ -3786,7 +3786,7 @@ void KPrDocument::setFooter( bool b ) } m_masterPage->setFooter( b, false ); updateHeaderFooterButton(); - tqrepaint(b); + repaint(b); } void KPrDocument::updateHeaderFooterButton() @@ -3917,7 +3917,7 @@ void KPrDocument::movePage( int from, int to ) void KPrDocument::copyPage( int from ) { _clean = false; - m_childCountBeforeInsert = tqchildren().count(); + m_childCountBeforeInsert = children().count(); _duplicatePage=true; // ### now also set via savePage() parameter below @@ -3963,7 +3963,7 @@ void KPrDocument::copyPageToClipboard( int pgnum ) KURL url; url.setPath( tempFile.name() ); KURL::List lst; lst.append( url ); - TQApplication::tqclipboard()->setData( new KURLDrag( lst ) ); + TQApplication::clipboard()->setData( new KURLDrag( lst ) ); m_tempFileInClipboard = tempFile.name(); // do this last, the above calls clipboardDataChanged } @@ -3987,7 +3987,7 @@ void KPrDocument::clipboardDataChanged() } // TODO enable paste as well, when a txtobject is activated // and there is plain text in the clipboard. Then enable this code. - //TQMimeSource *data = TQApplication::tqclipboard()->data(); + //TQMimeSource *data = TQApplication::clipboard()->data(); //bool canPaste = data->provides( "text/uri-list" ) || data->provides( "application/x-kpresenter-selection" ); // emit enablePaste( canPaste ); } @@ -4145,7 +4145,7 @@ void KPrDocument::slotRepaintChanged( KPrTextObject *kptextobj ) { //todo //use this function for the moment - tqrepaint( kptextobj ); + repaint( kptextobj ); } @@ -4156,7 +4156,7 @@ void KPrDocument::recalcVariables( int type ) if ( modifiedVariables.isEmpty() ) return; - // TODO use the return value from recalcVariables to only tqrepaint what has changed. + // TODO use the return value from recalcVariables to only repaint what has changed. TQPtrListIterator<KPrPage> it( m_pageList ); for ( ; it.current(); ++it ) it.current()->slotRepaintVariable(); @@ -4295,7 +4295,7 @@ void KPrDocument::newZoomAndResolution( bool updateViews, bool /*forPrint*/ ) for (; it.current(); ++it ) { static_cast<KPrView *>( it.current() )->getCanvas()->update(); - static_cast<KPrView *>( it.current() )->getCanvas()->tqlayout(); + static_cast<KPrView *>( it.current() )->getCanvas()->layout(); } } } @@ -4665,7 +4665,7 @@ void KPrDocument::insertFile(const TQString & file ) { m_insertFilePage = m_pageList.count(); - m_childCountBeforeInsert = tqchildren().count(); + m_childCountBeforeInsert = children().count(); objStartY = 0; bool clean = _clean; _clean = false; diff --git a/kpresenter/KPrDocument.h b/kpresenter/KPrDocument.h index c51060a4..3584e372 100644 --- a/kpresenter/KPrDocument.h +++ b/kpresenter/KPrDocument.h @@ -166,7 +166,7 @@ class KPrDocument : public KoDocument virtual void addView( KoView *_view ); virtual void removeView( KoView *_view ); - // page tqlayout + // page layout void setPageLayout( const KoPageLayout &); virtual TQPixmap generatePreview( const TQSize &size ); @@ -236,11 +236,11 @@ class KPrDocument : public KoDocument void deletePage( int _page ); void copyPageToClipboard( int pgnum ); - // tqrepaint all views - void tqrepaint( bool ); + // repaint all views + void repaint( bool ); - void tqrepaint( const TQRect& ); - void tqrepaint( KPrObject* ); + void repaint( const TQRect& ); + void repaint( KPrObject* ); // stuff for screen-presentations /** @@ -461,8 +461,8 @@ class KPrDocument : public KoDocument KoCommandHistory * commandHistory()const { return m_commandHistory; } void updateObjectStatusBarItem(); void updateObjectSelected(); - void tqlayout(KPrObject *kpobject); - void tqlayout(); + void layout(KPrObject *kpobject); + void layout(); void changeBgSpellCheckingState( bool b ); bool cursorInProtectedArea()const; @@ -552,7 +552,7 @@ protected: void testAndCloseAllTextObjectProtectedContent(); // ************ functions ************ /** - * Overloaded function from @ref Document_impl. Saves all tqchildren. + * Overloaded function from @ref Document_impl. Saves all children. */ virtual bool saveChildren( KoStore* _store ); @@ -707,8 +707,8 @@ private: KPrLoadingInfo *m_loadingInfo; TQValueList<int> *m_customListTest; - /// here the amount of existing tqchildren before inserting a page/file - /// is saved, so that we load the correct tqchildren + /// here the amount of existing children before inserting a page/file + /// is saved, so that we load the correct children int m_childCountBeforeInsert; }; diff --git a/kpresenter/KPrDocumentIface.cpp b/kpresenter/KPrDocumentIface.cpp index 04235d73..aa4d154a 100644 --- a/kpresenter/KPrDocumentIface.cpp +++ b/kpresenter/KPrDocumentIface.cpp @@ -432,13 +432,13 @@ void KPrDocumentIface::setShowGuideLines( bool b ) { doc->setShowGuideLines( b ); doc->updateGuideLineButton(); - doc->tqrepaint( false ); + doc->repaint( false ); } void KPrDocumentIface::addGuideLine( bool horizontal, double pos ) { doc->addGuideLine( horizontal ? Qt::Horizontal: Qt::Vertical, pos ); - doc->tqrepaint( false ); + doc->repaint( false ); } unsigned int KPrDocumentIface::nbHorizontalHelpLine() const @@ -460,7 +460,7 @@ void KPrDocumentIface::setShowGrid ( bool _grid ) { doc->setShowGrid( _grid); doc->updateGridButton(); - doc->tqrepaint( false ); + doc->repaint( false ); } double KPrDocumentIface::gridX() const @@ -472,7 +472,7 @@ void KPrDocumentIface::setGridX(double _x) { doc->setGridX( _x ); if( showGrid() ) - doc->tqrepaint( false ); + doc->repaint( false ); } double KPrDocumentIface::gridY() const @@ -484,7 +484,7 @@ void KPrDocumentIface::setGridY(double _y) { doc->setGridY( _y ); if( showGrid() ) - doc->tqrepaint( false ); + doc->repaint( false ); } bool KPrDocumentIface::configAutoSuperScript() const @@ -555,9 +555,9 @@ TQStringList KPrDocumentIface::presentationList() return doc->presentationList(); } -void KPrDocumentIface::tqrepaint() +void KPrDocumentIface::repaint() { - doc->tqrepaint( false ); + doc->repaint( false ); } void KPrDocumentIface::setConfigToolTipCompletion( bool b ) diff --git a/kpresenter/KPrDocumentIface.h b/kpresenter/KPrDocumentIface.h index 3dd061df..83429fb0 100644 --- a/kpresenter/KPrDocumentIface.h +++ b/kpresenter/KPrDocumentIface.h @@ -178,7 +178,7 @@ k_dcop: /// Repaint document. Call this after moving or resizing an object, for instance. /// @since 1.4 - void tqrepaint(); + void repaint(); private: KPrDocument *doc; diff --git a/kpresenter/KPrDuplicateObjDia.cpp b/kpresenter/KPrDuplicateObjDia.cpp index 0b0c7646..6b4957f6 100644 --- a/kpresenter/KPrDuplicateObjDia.cpp +++ b/kpresenter/KPrDuplicateObjDia.cpp @@ -20,7 +20,7 @@ #include <klocale.h> #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqbuttongroup.h> diff --git a/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp index a394e0a8..3834e0dc 100644 --- a/kpresenter/KPrEffectDia.cpp +++ b/kpresenter/KPrEffectDia.cpp @@ -32,7 +32,7 @@ #include <tqcheckbox.h> #include <tqlineedit.h> #include <tqvaluelist.h> -#include <tqlayout.h> +#include <layout.h> #include <tqspinbox.h> #include <tqstringlist.h> #include <tqdir.h> @@ -62,13 +62,13 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< topLayout = new TQVBoxLayout( page, 0, spacingHint() ); TQGroupBox *grp1 = new TQGroupBox(0, Qt::Vertical, i18n( "Appear" ), page ); - grp1->tqlayout()->setSpacing(KDialog::spacingHint()); - grp1->tqlayout()->setMargin(KDialog::marginHint()); + grp1->layout()->setSpacing(KDialog::spacingHint()); + grp1->layout()->setMargin(KDialog::marginHint()); topLayout->addWidget(grp1); - TQGridLayout *upperRow = new TQGridLayout(grp1->tqlayout(), 6, 4); + TQGridLayout *upperRow = new TQGridLayout(grp1->layout(), 6, 4); lAppear = new TQLabel( i18n( "Order of appearance:" ), grp1 ); - lAppear->tqsetAlignment( AlignVCenter ); + lAppear->setAlignment( AlignVCenter ); upperRow->addWidget(lAppear, 0, 0); eAppearStep = new TQSpinBox( 0, 100, 1, grp1 ); @@ -79,7 +79,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< //( void )new TQWidget( grp1 ); lEffect = new TQLabel( i18n( "Effect (appearing):" ), grp1 ); - lEffect->tqsetAlignment( AlignVCenter ); + lEffect->setAlignment( AlignVCenter ); upperRow->addWidget(lEffect, 1, 0); cEffect = new TQComboBox( false, grp1, "cEffect" ); @@ -102,7 +102,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< connect( cEffect, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( appearEffectChanged( int ) ) ); lAppearSpeed = new TQLabel( i18n( "Speed:" ), grp1 ); - lAppearSpeed->tqsetAlignment( AlignVCenter ); + lAppearSpeed->setAlignment( AlignVCenter ); upperRow->addWidget(lAppearSpeed, 2, 0); cAppearSpeed = new TQComboBox( false, grp1, "cEffect" ); @@ -114,7 +114,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< appearEffectChanged( cEffect->currentItem() ); lEffect2 = new TQLabel( i18n( "Effect (object specific):" ), grp1 ); - lEffect2->tqsetAlignment( AlignVCenter ); + lEffect2->setAlignment( AlignVCenter ); upperRow->addWidget(lEffect2, 3, 0); cEffect2 = new TQComboBox( false, grp1, "cEffect2" ); @@ -144,7 +144,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< } TQLabel *lTimerOfAppear = new TQLabel( i18n( "Timer of the object:" ), grp1 ); - lTimerOfAppear->tqsetAlignment( AlignVCenter ); + lTimerOfAppear->setAlignment( AlignVCenter ); upperRow->addWidget( lTimerOfAppear, 4, 0 ); timerOfAppear = new KIntNumInput( obj->getAppearTimer(), grp1 ); @@ -164,7 +164,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< connect( appearSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( appearSoundEffectChanged() ) ); lSoundEffect1 = new TQLabel( i18n( "File name:" ), grp1 ); - lSoundEffect1->tqsetAlignment( AlignVCenter ); + lSoundEffect1->setAlignment( AlignVCenter ); upperRow->addWidget( lSoundEffect1, 6, 0 ); requester1 = new KURLRequester( grp1 ); @@ -197,13 +197,13 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< topLayout->addWidget(disappear); TQGroupBox *grp2 = new TQGroupBox(0, Qt::Vertical, i18n( "Disappear" ), page); - grp2->tqlayout()->setSpacing(KDialog::spacingHint()); - grp2->tqlayout()->setMargin(KDialog::marginHint()); + grp2->layout()->setSpacing(KDialog::spacingHint()); + grp2->layout()->setMargin(KDialog::marginHint()); topLayout->addWidget(grp2); - TQGridLayout *lowerRow = new TQGridLayout(grp2->tqlayout(), 5, 4); + TQGridLayout *lowerRow = new TQGridLayout(grp2->layout(), 5, 4); lDisappear = new TQLabel( i18n( "Order of disappearance:" ), grp2 ); - lDisappear->tqsetAlignment( AlignVCenter ); + lDisappear->setAlignment( AlignVCenter ); lowerRow->addWidget(lDisappear, 0, 0); eDisappearStep = new TQSpinBox( 0, 100, 1, grp2 ); @@ -211,7 +211,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< lowerRow->addWidget(eDisappearStep, 0, 1); lDEffect = new TQLabel( i18n( "Effect (disappearing):" ), grp2 ); - lDEffect->tqsetAlignment( AlignVCenter ); + lDEffect->setAlignment( AlignVCenter ); lowerRow->addWidget(lDEffect, 1, 0); cDisappear = new TQComboBox( false, grp2, "cDisappear" ); @@ -234,7 +234,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< connect( cDisappear, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( disappearEffectChanged( int ) ) ); lDisappearSpeed = new TQLabel( i18n( "Speed:" ), grp2 ); - lDisappearSpeed->tqsetAlignment( AlignVCenter ); + lDisappearSpeed->setAlignment( AlignVCenter ); lowerRow->addWidget(lDisappearSpeed, 2, 0); cDisappearSpeed = new TQComboBox( false, grp2, "cEffect" ); @@ -247,7 +247,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< //appearEffectChanged( cEffect->currentItem() ); TQLabel *lTimerOfDisappear = new TQLabel( i18n( "Timer of the object:" ), grp2 ); - lTimerOfDisappear->tqsetAlignment( AlignVCenter ); + lTimerOfDisappear->setAlignment( AlignVCenter ); lowerRow->addWidget( lTimerOfDisappear, 3, 0 ); timerOfDisappear = new KIntNumInput( obj->getDisappearTimer(), grp2 ); @@ -268,7 +268,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< connect( disappearSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( disappearSoundEffectChanged() ) ); lSoundEffect2 = new TQLabel( i18n( "File name:" ), grp2 ); - lSoundEffect2->tqsetAlignment( AlignVCenter ); + lSoundEffect2->setAlignment( AlignVCenter ); lowerRow->addWidget( lSoundEffect2, 5, 0 ); requester2 = new KURLRequester( grp2 ); @@ -514,7 +514,7 @@ TQString KPrEffectDia::getSoundFileFilter() const if ( comma ) str += '\n'; comma = true; - str += TQString( i18n( "*.%1|%2 Files" ) ).tqarg( *it ).tqarg( (*it).upper() ); + str += TQString( i18n( "*.%1|%2 Files" ) ).arg( *it ).arg( (*it).upper() ); full += TQString( "*.") + (*it) + ' '; } diff --git a/kpresenter/KPrFindReplace.cpp b/kpresenter/KPrFindReplace.cpp index 3836a8ad..709a86d1 100644 --- a/kpresenter/KPrFindReplace.cpp +++ b/kpresenter/KPrFindReplace.cpp @@ -55,10 +55,10 @@ void KPrFindReplace::emitNewCommand(KCommand *cmd) void KPrFindReplace::highlightPortion(KoTextParag * parag, int index, int length, KoTextDocument *_textdoc, KDialogBase* dialog) { - bool tqrepaint = isReplace() ? options() & KReplaceDialog::PromptOnReplace : true; + bool repaint = isReplace() ? options() & KReplaceDialog::PromptOnReplace : true; KPrTextDocument *textdoc = static_cast<KPrTextDocument *>(_textdoc); KPrTextObject* textobj = textdoc->textObject(); - textobj->highlightPortion( parag, index, length, m_canvas, tqrepaint, dialog ); + textobj->highlightPortion( parag, index, length, m_canvas, repaint, dialog ); } #include "KPrFindReplace.moc" diff --git a/kpresenter/KPrFreehandObject.cpp b/kpresenter/KPrFreehandObject.cpp index 077b9eed..273d6041 100644 --- a/kpresenter/KPrFreehandObject.cpp +++ b/kpresenter/KPrFreehandObject.cpp @@ -59,20 +59,20 @@ bool KPrFreehandObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) cons { // the rect for the view box have to be the rect and not the real rect KoRect rect( getRect() ); - sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( int( rect.width() * 100 ) ) - .tqarg( int( rect.height() * 100 ) ) ); + sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).arg( int( rect.width() * 100 ) ) + .arg( int( rect.height() * 100 ) ) ); unsigned int pointCount = points.count(); unsigned int pos = 0; TQString d; - d += TQString( "M%1 %2" ).tqarg( int( points.at(pos).x() * 100 ) ) - .tqarg( int( points.at(pos).y() * 100 ) ); + d += TQString( "M%1 %2" ).arg( int( points.at(pos).x() * 100 ) ) + .arg( int( points.at(pos).y() * 100 ) ); ++pos; while ( pos < pointCount ) { - d += TQString( "L%1 %2" ).tqarg( int( points.at( pos ).x() * 100 ) ) - .tqarg( int( points.at( pos ).y() * 100 ) ); + d += TQString( "L%1 %2" ).arg( int( points.at( pos ).x() * 100 ) ) + .arg( int( points.at( pos ).y() * 100 ) ); ++pos; } diff --git a/kpresenter/KPrFreehandObjectIface.cpp b/kpresenter/KPrFreehandObjectIface.cpp index 19843a1b..25ff2963 100644 --- a/kpresenter/KPrFreehandObjectIface.cpp +++ b/kpresenter/KPrFreehandObjectIface.cpp @@ -56,12 +56,12 @@ TQString KPrFreehandObjectIface::lineEnd() const void KPrFreehandObjectIface::horizontalFlip() { - //todo tqrepaint it + //todo repaint it obj->flip(true ); } void KPrFreehandObjectIface::verticalFlip() { - //todo tqrepaint it + //todo repaint it obj->flip( false ); } diff --git a/kpresenter/KPrGeneralProperty.cpp b/kpresenter/KPrGeneralProperty.cpp index 89cf00ab..e82defcc 100644 --- a/kpresenter/KPrGeneralProperty.cpp +++ b/kpresenter/KPrGeneralProperty.cpp @@ -22,7 +22,7 @@ #include <tqcheckbox.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <knuminput.h> @@ -37,11 +37,11 @@ KPrGeneralProperty::KPrGeneralProperty( TQWidget *parent, const char *name, Gene , m_generalValue( generalValue ) , m_unit( unit ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( m_ui = new KoGeneralPropertyUI( this ) ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( m_ui = new KoGeneralPropertyUI( this ) ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout->addItem( spacer ); + layout->addItem( spacer ); if ( m_generalValue.m_name.isNull() ) { diff --git a/kpresenter/KPrGotoPage.cpp b/kpresenter/KPrGotoPage.cpp index d5d0ed24..db09be84 100644 --- a/kpresenter/KPrGotoPage.cpp +++ b/kpresenter/KPrGotoPage.cpp @@ -22,7 +22,7 @@ #include <tqlabel.h> #include <tqlistbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <klocale.h> @@ -60,7 +60,7 @@ KPrGotoPage::KPrGotoPage( const KPrDocument *doc, t.truncate(30); t+="..."; } - spinbox->insertItem( TQString( "%1 - %2" ).tqarg( *it ).tqarg( t ), -1 ); + spinbox->insertItem( TQString( "%1 - %2" ).arg( *it ).arg( t ), -1 ); if ( *it == start ) spinbox->setCurrentItem( spinbox->count()-1 ); } diff --git a/kpresenter/KPrImageEffectDia.cpp b/kpresenter/KPrImageEffectDia.cpp index 6a0162c1..078a3918 100644 --- a/kpresenter/KPrImageEffectDia.cpp +++ b/kpresenter/KPrImageEffectDia.cpp @@ -217,7 +217,7 @@ void KPrImageEffectDia::setPixmap(TQPixmap pix) void KPrImageEffectDia::updatePreview() { base->m_previewLabel->setPixmap(m_pix); - base->m_previewLabel->tqrepaint(false); + base->m_previewLabel->repaint(false); } void KPrImageEffectDia::setEffect(ImageEffect eff, TQVariant p1, TQVariant p2, TQVariant p3) diff --git a/kpresenter/KPrImportStyleDia.cpp b/kpresenter/KPrImportStyleDia.cpp index c2db00b4..45a6f7cc 100644 --- a/kpresenter/KPrImportStyleDia.cpp +++ b/kpresenter/KPrImportStyleDia.cpp @@ -21,7 +21,7 @@ #include <klocale.h> #include "KPrDocument.h" #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqlistbox.h> diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp index f9a87fd5..8d696369 100644 --- a/kpresenter/KPrMSPresentationSetup.cpp +++ b/kpresenter/KPrMSPresentationSetup.cpp @@ -38,7 +38,7 @@ #include <tqfileinfo.h> #include <tqhbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpixmap.h> #include <tqpainter.h> #include <tqpushbutton.h> @@ -91,7 +91,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar ) kapp->processEvents(); for (int dirNum = 101; dirNum < 999; dirNum++) { - slidePath = TQString("/DCIM/%1MSPJP").tqarg(dirNum); + slidePath = TQString("/DCIM/%1MSPJP").arg(dirNum); if (! KIO::NetAccess::exists(( path + slidePath), true, ( TQWidget* )0L) ) break; } @@ -198,7 +198,7 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar ) // DCIM path 1, 68 bytes null padded char buff[68]; - strncpy( buff, TQString("%1").tqarg(slidePath).ascii(), 67 ); + strncpy( buff, TQString("%1").arg(slidePath).ascii(), 67 ); buff[67] = 0x00; sppStream.writeRawBytes( buff, 68 ); sppStream << (TQ_UINT32)0x00000001; // fixed value @@ -298,13 +298,13 @@ KPrMSPresentationSetup::KPrMSPresentationSetup( KPrDocument *_doc, KPrView *_vie TQLabel *helptext = new TQLabel( this ); - helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignTop| TQt::AlignLeft ); + helptext->setAlignment( TQt::WordBreak | TQt::AlignTop| TQt::AlignLeft ); helptext->setText( i18n( "Please enter the directory where the memory stick " "presentation should be saved. Please also enter a " "title for the slideshow presentation. " ) ); TQLabel *lable2 = new TQLabel( i18n("Path:"), this ); - lable2->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + lable2->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); path=new KURLRequester( this ); path->setMode( KFile::Directory); path->lineEdit()->setText(msPres.getPath()); @@ -320,7 +320,7 @@ KPrMSPresentationSetup::KPrMSPresentationSetup( KPrDocument *_doc, KPrView *_vie TQLabel *lable1 = new TQLabel( i18n("Title:"), this, "lable1" ); - lable1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + lable1->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); // TODO - check if there is already a presentation with this title, and // add a number after it until there isn't. title = new KLineEdit( msPres.getTitle(), this ); @@ -351,13 +351,13 @@ KPrMSPresentationSetup::KPrMSPresentationSetup( KPrDocument *_doc, KPrView *_vie "leave these set to the default.") ); TQHBox *textColourLayout = new TQHBox( colourGroup ); TQLabel *lable3 = new TQLabel( i18n("Text color:"), textColourLayout ); - lable3->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + lable3->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); textColour = new KColorButton( msPres.getTextColour(), textColourLayout ); lable3->setBuddy( textColour ); TQHBox *backgroundColourLayout = new TQHBox( colourGroup ); TQLabel *lable4 = new TQLabel( i18n("Background color:"), backgroundColourLayout ); - lable4->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + lable4->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); backColour = new KColorButton( msPres.getBackColour(), backgroundColourLayout ); lable4->setBuddy( backColour ); colourGroup->setHidden( true ); @@ -444,7 +444,7 @@ void KPrMSPresentationSetup::finish() if ( !KIO::NetAccess::exists(pathname, false, this) ) { TQString msg = i18n( "<qt>The directory <b>%1</b> does not exist.<br>" "Do you want create it?</qt>" ); - if( KMessageBox::questionYesNo( this, msg.tqarg( pathname ), + if( KMessageBox::questionYesNo( this, msg.arg( pathname ), i18n( "Directory Not Found" ) ) == KMessageBox::Yes) { @@ -471,7 +471,7 @@ void KPrMSPresentationSetup::finish() if ( KMessageBox::warningYesNo( 0, i18n( "You are about to overwrite an existing index " "file : %1.\n " - "Do you want to proceed?" ).tqarg( sppFile ), + "Do you want to proceed?" ).arg( sppFile ), i18n( "Overwrite Presentation" ) ) == KMessageBox::No) { path->setFocus(); diff --git a/kpresenter/KPrMarginWidget.cpp b/kpresenter/KPrMarginWidget.cpp index 48074143..52d474ba 100644 --- a/kpresenter/KPrMarginWidget.cpp +++ b/kpresenter/KPrMarginWidget.cpp @@ -24,7 +24,7 @@ #include <tqgroupbox.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <knuminput.h> @@ -38,13 +38,13 @@ KPrMarginWidget::KPrMarginWidget( TQWidget *parent, const char *name, const KoUn , m_changed( false ) , m_noSignal( false ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); m_ui = new MarginUI( this ); - tqlayout->addWidget( m_ui ); + layout->addWidget( m_ui ); TQSpacerItem *spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Expanding ); - tqlayout->addItem( spacer ); + layout->addItem( spacer ); m_ui->margins->setTitle( i18n( "Margins" ) ); diff --git a/kpresenter/KPrMoveHelpLineDia.cpp b/kpresenter/KPrMoveHelpLineDia.cpp index ea050f41..63832f35 100644 --- a/kpresenter/KPrMoveHelpLineDia.cpp +++ b/kpresenter/KPrMoveHelpLineDia.cpp @@ -20,7 +20,7 @@ #include <klocale.h> #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <knuminput.h> #include <tqbuttongroup.h> @@ -74,7 +74,7 @@ KPrInsertHelpLineDia::KPrInsertHelpLineDia( TQWidget *parent, const KoRect & _pa TQVBox *page = makeVBoxMainWidget(); TQButtonGroup *group = new TQButtonGroup( 1, Qt::Horizontal,i18n("Orientation"), page ); group->setRadioButtonExclusive( TRUE ); - group->tqlayout(); + group->layout(); m_rbHoriz = new TQRadioButton( i18n("Horizontal"), group ); m_rbVert = new TQRadioButton( i18n("Vertical"), group ); diff --git a/kpresenter/KPrNoteBar.cpp b/kpresenter/KPrNoteBar.cpp index 10048537..ef795d2d 100644 --- a/kpresenter/KPrNoteBar.cpp +++ b/kpresenter/KPrNoteBar.cpp @@ -19,7 +19,7 @@ */ -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqpaintdevicemetrics.h> #include <tqsimplerichtext.h> @@ -145,7 +145,7 @@ void KPrNoteBar::printNotes( TQPainter *_painter, KPrinter *_printer, TQValueLis TQRect viewRect( body ); do { - richText.draw( _painter, body.left(), body.top(), viewRect, tqcolorGroup() ); + richText.draw( _painter, body.left(), body.top(), viewRect, colorGroup() ); viewRect.moveBy( 0, body.height() ); _painter->translate( 0, -body.height() ); _painter->setFont( font ); @@ -174,7 +174,7 @@ TQString KPrNoteBar::getNotesTextForPrinting(TQValueList<int> _list) const if ( !firstText ) allText += TQString("\n\n"); - allText += i18n( "Slide Note %1:\n" ).tqarg( pageCount ); + allText += i18n( "Slide Note %1:\n" ).arg( pageCount ); if(noteIsEmpty && !doc->pageList().at(i)->noteText().isEmpty()) noteIsEmpty = false; allText += doc->pageList().at(i)->noteText(); diff --git a/kpresenter/KPrObject.cpp b/kpresenter/KPrObject.cpp index 5a03896a..8bc6089d 100644 --- a/kpresenter/KPrObject.cpp +++ b/kpresenter/KPrObject.cpp @@ -357,7 +357,7 @@ void KPrObject::saveOasisPosObject( KoXmlWriter &xmlWriter, int indexObj ) const transX.setNum( trans.x(), 'g', DBL_DIG ); TQCString transY; transY.setNum( trans.y(), 'g', DBL_DIG ); - TQString str = TQString( "rotate(%1) translate(%2pt %3pt)" ).tqarg( angInRad ).tqarg( transX.data() ).tqarg( transY.data() ); + TQString str = TQString( "rotate(%1) translate(%2pt %3pt)" ).arg( angInRad ).arg( transX.data() ).arg( transY.data() ); xmlWriter.addAttribute( "draw:transform", str ); } else @@ -422,8 +422,8 @@ bool KPrObject::saveOasisObjectStyleShowAnimation( KoXmlWriter &animation, int o { if ( effect != EF_NONE || appearStep != 0 || !a_fileName.isEmpty() ) { - animation.startElement( "presentation:show-tqshape" ); - animation.addAttribute( "draw:tqshape-id", "object" + TQString::number( objectId ) ); + animation.startElement( "presentation:show-shape" ); + animation.addAttribute( "draw:shape-id", "object" + TQString::number( objectId ) ); animation.addAttribute( "koffice:order-id", appearStep ); switch( effect ) @@ -522,8 +522,8 @@ bool KPrObject::saveOasisObjectStyleHideAnimation( KoXmlWriter &animation, int o //FIXME oo doesn't support hide animation object if ( effect3 != EF3_NONE || disappearStep != 0 || !d_fileName.isEmpty()) { - animation.startElement( "presentation:hide-tqshape" ); - animation.addAttribute( "draw:tqshape-id", "object" + TQString::number( objectId ) ); + animation.startElement( "presentation:hide-shape" ); + animation.addAttribute( "draw:shape-id", "object" + TQString::number( objectId ) ); animation.addAttribute( "koffice:order-id", disappearStep ); switch( effect3 ) { @@ -1743,14 +1743,14 @@ bool KPrShadowObject::saveOasisDrawPoints( const KoPointArray &points, KPOasisSa int tmpY = int( ( *it ).y() * 10000 ); // no space allows before first element if ( !listOfPoint.isEmpty() ) - listOfPoint += TQString( " %1,%2" ).tqarg( tmpX ).tqarg( tmpY ); + listOfPoint += TQString( " %1,%2" ).arg( tmpX ).arg( tmpY ); else - listOfPoint = TQString( "%1,%2" ).tqarg( tmpX ).tqarg( tmpY ); + listOfPoint = TQString( "%1,%2" ).arg( tmpX ).arg( tmpY ); maxX = TQMAX( maxX, tmpX ); maxY = TQMAX( maxY, tmpY ); } sc.xmlWriter.addAttribute("draw:points", listOfPoint ); - sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( maxX ).tqarg( maxY ) ); + sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).arg( maxX ).arg( maxY ) ); return true; } diff --git a/kpresenter/KPrObject.h b/kpresenter/KPrObject.h index 7b39be50..8850e2d0 100644 --- a/kpresenter/KPrObject.h +++ b/kpresenter/KPrObject.h @@ -22,7 +22,7 @@ #ifndef kpobject_h #define kpobject_h -#include <tqbrush.h> +#include <brush.h> #include <tqcursor.h> #include "global.h" diff --git a/kpresenter/KPrPBPreview.cpp b/kpresenter/KPrPBPreview.cpp index 1afef977..a6938d82 100644 --- a/kpresenter/KPrPBPreview.cpp +++ b/kpresenter/KPrPBPreview.cpp @@ -55,7 +55,7 @@ void KPrPBPreview::resizeEvent( TQResizeEvent *e ) { #if 1 gradient->setSize( contentsRect().size() ); - tqrepaint(); + repaint(); #endif } } @@ -67,7 +67,7 @@ void KPrPBPreview::drawContents( TQPainter *painter ) if ( paintType == Pen ) { painter->fillRect( 0, 0, contentsRect().width(), contentsRect().height(), - tqcolorGroup().base() ); + colorGroup().base() ); KoSize diff1( 0, 0 ), diff2( 0, 0 ); int _w = int( pen.pointWidth() ); @@ -94,7 +94,7 @@ void KPrPBPreview::drawContents( TQPainter *painter ) } else if ( paintType == Brush ) { painter->fillRect( 0, 0, contentsRect().width(), contentsRect().height(), - tqcolorGroup().base() ); + colorGroup().base() ); painter->fillRect( 0, 0, contentsRect().width(), contentsRect().height(), brush ); } else if ( paintType == Gradient ) painter->drawPixmap( 0, 0, gradient->pixmap()); @@ -118,7 +118,7 @@ void KPrPBPreview::setGradient( const TQColor &_c1, const TQColor &_c2, BCType _ gradient->setUnbalanced( _unbalanced ); gradient->setXFactor( _xfactor ); gradient->setYFactor( _yfactor ); - tqrepaint( false ); + repaint( false ); } diff --git a/kpresenter/KPrPBPreview.h b/kpresenter/KPrPBPreview.h index c3ba061e..a3f1b283 100644 --- a/kpresenter/KPrPBPreview.h +++ b/kpresenter/KPrPBPreview.h @@ -49,21 +49,21 @@ public: KPrPBPreview( TQWidget* parent, const char* name, PaintType _paintType = Pen ); ~KPrPBPreview(); - void setPen( const KoPen &_pen ) { pen = _pen; tqrepaint( true ); } - void setBrush( const TQBrush &_brush ) { brush = _brush; tqrepaint( true ); } - void setLineBegin( LineEnd lb ) { lineBegin = lb; tqrepaint( true ); } - void setLineEnd( LineEnd le ) { lineEnd = le; tqrepaint( true ); } - void setGradient( KPrGradient *g ) { if ( g ) { gradient = g; } tqrepaint( true ); } - void setPaintType( PaintType pt ) { paintType = pt; tqrepaint(true); } + void setPen( const KoPen &_pen ) { pen = _pen; repaint( true ); } + void setBrush( const TQBrush &_brush ) { brush = _brush; repaint( true ); } + void setLineBegin( LineEnd lb ) { lineBegin = lb; repaint( true ); } + void setLineEnd( LineEnd le ) { lineEnd = le; repaint( true ); } + void setGradient( KPrGradient *g ) { if ( g ) { gradient = g; } repaint( true ); } + void setPaintType( PaintType pt ) { paintType = pt; repaint(true); } void setGradient( const TQColor &_c1, const TQColor &_c2, BCType _t, bool _unbalanced, int _xfactor, int _yfactor ); - void setColor1( const TQColor &_color ) { gradient->setColor1( _color ); tqrepaint( false ); } - void setColor2( const TQColor &_color ) { gradient->setColor2( _color ); tqrepaint( false ); } - void setBackColorType( BCType _type ) { gradient->setBackColorType( _type ); tqrepaint( false ); } - void setUnbalanced( bool b ) { gradient->setUnbalanced( b ); tqrepaint( false ); } - void setXFactor( int i ) { gradient->setXFactor( i ); tqrepaint( false ); } - void setYFactor( int i ) { gradient->setYFactor( i ); tqrepaint( false ); } + void setColor1( const TQColor &_color ) { gradient->setColor1( _color ); repaint( false ); } + void setColor2( const TQColor &_color ) { gradient->setColor2( _color ); repaint( false ); } + void setBackColorType( BCType _type ) { gradient->setBackColorType( _type ); repaint( false ); } + void setUnbalanced( bool b ) { gradient->setUnbalanced( b ); repaint( false ); } + void setXFactor( int i ) { gradient->setXFactor( i ); repaint( false ); } + void setYFactor( int i ) { gradient->setYFactor( i ); repaint( false ); } protected: void drawContents( TQPainter *p ); diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp index d8e65bac..656b48e2 100644 --- a/kpresenter/KPrPage.cpp +++ b/kpresenter/KPrPage.cpp @@ -524,7 +524,7 @@ TQDomElement KPrPage::save( TQDomDocument &doc ) TQString KPrPage::oasisNamePage( int posPage ) const { - return ( m_manualTitle.isEmpty() ? TQString( "page%1" ).tqarg( posPage ) : m_manualTitle ); + return ( m_manualTitle.isEmpty() ? TQString( "page%1" ).arg( posPage ) : m_manualTitle ); } bool KPrPage::saveOasisPage( KoStore *store, KoXmlWriter &xmlWriter, int posPage, KoSavingContext& context, @@ -538,7 +538,7 @@ bool KPrPage::saveOasisPage( KoStore *store, KoXmlWriter &xmlWriter, int posPage xmlWriter.startElement( "style:master-page" ); xmlWriter.addAttribute( "style:name", "Standard" ); - xmlWriter.addAttribute( "style:page-tqlayout-name", pageLayoutName ); + xmlWriter.addAttribute( "style:page-layout-name", pageLayoutName ); TQString styleName = saveOasisPageStyle( store, context.mainStyles() ); if ( !styleName.isEmpty() ) @@ -655,7 +655,7 @@ bool KPrPage::saveOasisNote( KoXmlWriter &xmlWriter ) const return true; //todo : add size for draw:text-box otherwise we can't import into oo - //<draw:text-box presentation:style-name="pr1" draw:text-style-name="P1" draw:layer="tqlayout" svg:width="14.5cm" svg:height="11.408cm" svg:x="3.247cm" svg:y="14.126cm" presentation:class="notes"> + //<draw:text-box presentation:style-name="pr1" draw:text-style-name="P1" draw:layer="layout" svg:width="14.5cm" svg:height="11.408cm" svg:x="3.247cm" svg:y="14.126cm" presentation:class="notes"> xmlWriter.startElement( "presentation:notes" ); xmlWriter.startElement( "draw:frame" ); //todo save style @@ -881,7 +881,7 @@ void KPrPage::unifyObjectName( KPrObject *object ) { if ( rx.search( objectName ) != -1 ) { objectName.remove( rx ); } - objectName += TQString(" (%1)").tqarg( count ); + objectName += TQString(" (%1)").arg( count ); object->setObjectName( objectName ); } } @@ -930,7 +930,7 @@ void KPrPage::appendObjects( const TQValueList<KPrObject *> &objects ) if ( usedPageNames.contains( objectName ) ) { usedPageNames[objectName]++; - objectName += TQString(" (%1)").tqarg( usedPageNames[objectName] ); + objectName += TQString(" (%1)").arg( usedPageNames[objectName] ); ( *oIt )->setObjectName( objectName ); } m_objectList.append( *oIt ); @@ -1065,7 +1065,7 @@ void KPrPage::pasteObjs( const TQByteArray & data,int nbCopy, double angle, _tempObj->moveBy( moveX*(double)mod,moveY*(double)mod); _tempObj->setSelected( true ); if ( angle == 0.0 || (increaseY == 0.0 && increaseX == 0.0)) - m_doc->tqrepaint(_tempObj); + m_doc->repaint(_tempObj); } if ( angle != 0.0) @@ -1344,14 +1344,14 @@ KPrTextObject* KPrPage::insertTextObject( const KoRect& r, const TQString& text KPrTextObject *kptextobject = new KPrTextObject( m_doc ); insertObject( i18n( "Insert Textbox" ), kptextobject, r ); //TODO create macro command : now insertObject can return KCommand - //TODO fix tqrepaint object + //TODO fix repaint object if ( !text.isEmpty() ) { KPrTextView *view = kptextobject->createKPTextView( _view ? _view->getCanvas() : 0L ); view->insertText( text ); view->terminate(); delete view; - m_doc->tqrepaint( kptextobject ); + m_doc->repaint( kptextobject ); } return kptextobject; } @@ -1461,7 +1461,7 @@ KPrPartObject* KPrPage::insertObject( const KoRect& _rect, KoDocumentEntry& _e ) insertObject( i18n( "Embed Object" ), kppartobject, _rect ); //emit sig_insertObject( ch, kppartobject ); - m_doc->tqrepaint( false ); + m_doc->repaint( false ); return kppartobject; } @@ -1534,7 +1534,7 @@ void KPrPage::slotRepaintVariable() for ( ; it.current() ; ++it ) { if ( it.current()->getType() == OT_TEXT ) - m_doc->tqrepaint( it.current() ); + m_doc->repaint( it.current() ); } } @@ -1545,7 +1545,7 @@ void KPrPage::recalcPageNum() { if ( it.current()->getType() == OT_TEXT ) { ( (KPrTextObject*)it.current() )->recalcPageNum( this ); - m_doc->tqrepaint( it.current() ); // TODO only if something changed + m_doc->repaint( it.current() ); // TODO only if something changed } } } @@ -1605,7 +1605,7 @@ void KPrPage::insertPicture( const TQString &filename, const KoPoint &pos ) //kdDebug(33001) << k_funcinfo << "Size: " << w << ", " << h << endl; kppixmapobject->setOrig(0,0); kppixmapobject->setSize(w, h); - m_doc->tqrepaint( false ); + m_doc->repaint( false ); } } @@ -1883,7 +1883,7 @@ TQString KPrPage::pageTitle( const TQString &_title ) const { // MASTERPAGE if ( m_masterPage ) - title = i18n( "Slide %1" ).tqarg( m_doc->pageList().findRef( this ) + 1 ); + title = i18n( "Slide %1" ).arg( m_doc->pageList().findRef( this ) + 1 ); else title = i18n( "Slide Master" ); } @@ -1990,7 +1990,7 @@ void KPrPage::deSelectAllObj() void KPrPage::deSelectObj( KPrObject *kpobject ) { kpobject->setSelected( false ); - m_doc->tqrepaint( kpobject ); + m_doc->repaint( kpobject ); } TQDomElement KPrPage::saveObjects( TQDomDocument &doc, TQDomElement &objects, double yoffset, @@ -2158,8 +2158,8 @@ KCommand *KPrPage::moveObject(KPrView *_view, double diffx, double diffy) _objects.append( it.current() ); TQRect br = _view->zoomHandler()->zoomRect( it.current()->getRepaintRect() ); br.moveBy( _view->zoomHandler()->zoomItX( diffx ), _view->zoomHandler()->zoomItY( diffy ) ); - m_doc->tqrepaint( br ); // Previous position - m_doc->tqrepaint( it.current() ); // New position + m_doc->repaint( br ); // Previous position + m_doc->repaint( it.current() ); // New position createCommand=true; } } @@ -2189,8 +2189,8 @@ KCommand *KPrPage::moveObject(KPrView *m_view,const KoPoint &_move,bool key) it.current()->moveBy( _move ); _objects.append( it.current() ); - m_doc->tqrepaint( oldBoundingRect ); - m_doc->tqrepaint( it.current() ); + m_doc->repaint( oldBoundingRect ); + m_doc->repaint( it.current() ); } } @@ -2208,7 +2208,7 @@ void KPrPage::repaintObj() for ( ; it.current() ; ++it ) { if(it.current()->isSelected()) - m_doc->tqrepaint(it.current() ); + m_doc->repaint(it.current() ); } } @@ -2388,7 +2388,7 @@ void KPrPage::reactivateBgSpellChecking(bool refreshTextObj) { static_cast<KPrTextObject*>( oIt.current() )->textObject()->setNeedSpellCheck(true); if(refreshTextObj) - m_doc->tqrepaint( oIt.current() ); + m_doc->repaint( oIt.current() ); } } } @@ -2445,8 +2445,8 @@ void KPrPage::changeTabStopValue ( double _tabStop ) if ( obj ) { obj->textDocument()->setTabStops( m_doc->zoomHandler()->ptToLayoutUnitPixX( _tabStop )); - obj->tqlayout(); - m_doc->tqrepaint( obj ); + obj->layout(); + m_doc->repaint( obj ); } } } diff --git a/kpresenter/KPrPageEffects.cpp b/kpresenter/KPrPageEffects.cpp index a7c3093b..b358fd55 100644 --- a/kpresenter/KPrPageEffects.cpp +++ b/kpresenter/KPrPageEffects.cpp @@ -440,7 +440,7 @@ bool KPrPageEffects::effectSurround1() const int repaint_w = w; bool finished = false; - bool tqrepaint= false; + bool repaint= false; int rh = 0; int rw = 0; int repaint_rh = 0; @@ -454,7 +454,7 @@ bool KPrPageEffects::effectSurround1() const h = stepSize; if ( step + stepSize >= m_height ) { - tqrepaint = true; + repaint = true; repaint_rh = m_height - repaint_h; repaint_rw = step - m_height + repaint_w; @@ -469,7 +469,7 @@ bool KPrPageEffects::effectSurround1() const w = stepSize; if ( step + stepSize >= m_height + m_width - repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = m_height - ( step - m_height + repaint_h - m_width + repaint_w + stepSize ); repaint_rw = m_width - repaint_w; @@ -484,7 +484,7 @@ bool KPrPageEffects::effectSurround1() const h = stepSize; if ( step + stepSize >= 2 * m_height - repaint_h + m_width - repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = 0; repaint_rw = m_width - ( step - 2 * m_height + repaint_h - m_width + 2 * repaint_w + stepSize ); @@ -499,7 +499,7 @@ bool KPrPageEffects::effectSurround1() const w = stepSize; if ( step + stepSize >= 2 * m_height - repaint_h + 2 * m_width - 3 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = step - 2 * m_height + 2 * repaint_h - 2 * m_width + 3 * repaint_w; repaint_rw = repaint_w; @@ -514,7 +514,7 @@ bool KPrPageEffects::effectSurround1() const h = stepSize; if ( step + stepSize >= 3 * m_height - 3 * repaint_h + 2 * m_width - 3 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = m_height - 2 * repaint_h; repaint_rw = step - 3 * m_height + 3 * repaint_h - 2 * m_width + 5 * repaint_w; @@ -529,7 +529,7 @@ bool KPrPageEffects::effectSurround1() const w = stepSize; if ( step + stepSize >= 3 * m_height - 3 * repaint_h + 3 * m_width - 6 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = m_height - ( step - 3 * m_height + 5 * repaint_h - 3 * m_width + 6 * repaint_w + stepSize ); repaint_rw = m_width - 2 * repaint_w; @@ -544,7 +544,7 @@ bool KPrPageEffects::effectSurround1() const h = stepSize; if ( step + stepSize >= 4 * m_height - 6 * repaint_h + 3 * m_width - 6 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = repaint_h; repaint_rw = m_width - ( step - 4 * m_height + 6 * repaint_h - 3 * m_width + 8 * repaint_w + stepSize ); @@ -559,7 +559,7 @@ bool KPrPageEffects::effectSurround1() const w = stepSize; if ( step + stepSize >= 4 * m_height - 6 * repaint_h + 4 * m_width - 10 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = step - 4 * m_height + 8 * repaint_h - 4 * m_width + 10 * repaint_w; repaint_rw = 2 * repaint_w; @@ -574,7 +574,7 @@ bool KPrPageEffects::effectSurround1() const h = stepSize; if ( step + stepSize >= 5 * m_height - 10 * repaint_h + 4 * m_width - 10 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = m_height - 3 * repaint_h; repaint_rw = step - 5 * m_height + 10 * repaint_h - 4 * m_width + 13 * repaint_w; @@ -589,7 +589,7 @@ bool KPrPageEffects::effectSurround1() const w = stepSize; if ( step + stepSize >= 5 * m_height - 10 * repaint_h + 5 * m_width - 15 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = m_height - ( step - 5 * m_height + 13 * repaint_h - 5 * m_width + 15 * repaint_w + stepSize ); repaint_rw = m_width - 3 * repaint_w; @@ -604,7 +604,7 @@ bool KPrPageEffects::effectSurround1() const h = stepSize; if ( step + stepSize >= 6 * m_height - 15 * repaint_h + 5 * m_width - 15 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = 2 * repaint_h; repaint_rw = m_width - ( step - 6 * m_height + 15 * repaint_h - 5 * m_width + 18 * repaint_w + stepSize ); @@ -619,7 +619,7 @@ bool KPrPageEffects::effectSurround1() const w = stepSize; if ( step + stepSize >= 6 * m_height - 15 * repaint_h + 6 * m_width - 21 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = step - 6 * m_height + 18 * repaint_h - 6 * m_width + 21 * repaint_w; repaint_rw = 3 * repaint_w; @@ -634,7 +634,7 @@ bool KPrPageEffects::effectSurround1() const h = stepSize; if ( step + stepSize >= 7 * m_height - 21 * repaint_h + 6 * m_width - 21 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = m_height - 4 * repaint_h; repaint_rw = step - 7 * m_height + 21 * repaint_h - 6 * m_width + 25 * repaint_w; @@ -649,7 +649,7 @@ bool KPrPageEffects::effectSurround1() const w = stepSize; if ( step + stepSize >= 7 * m_height - 21 * repaint_h + 7 * m_width - 28 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = m_height - ( step - 7 * m_height + 25 * repaint_h - 7 * m_width + 28 * repaint_w + stepSize ); repaint_rw = m_width - 4 * repaint_w; @@ -664,7 +664,7 @@ bool KPrPageEffects::effectSurround1() const h = stepSize; if ( step + stepSize >= 8 * m_height - 28 * repaint_h + 7 * m_width - 28 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = 3 * repaint_h; repaint_rw = m_width - ( step - 8 * m_height + 28 * repaint_h - 7 * m_width + 32 * repaint_w + stepSize ); @@ -679,7 +679,7 @@ bool KPrPageEffects::effectSurround1() const w = stepSize; if ( step + stepSize >= 8 * m_height - 28 * repaint_h + 8 * m_width - 36 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = step - 8 * m_height + 32 * repaint_h - 8 * m_width + 36 * repaint_w; repaint_rw = 4 * repaint_w; @@ -694,7 +694,7 @@ bool KPrPageEffects::effectSurround1() const h = stepSize; if ( step + stepSize >= 9 * m_height - 36 * repaint_h + 8 * m_width - 36 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = m_height - 5 * repaint_h; repaint_rw = step - 9 * m_height + 36 * repaint_h - 8 * m_width + 41 * repaint_w; @@ -709,7 +709,7 @@ bool KPrPageEffects::effectSurround1() const w = stepSize; if ( step + stepSize >= 9 * m_height - 36 * repaint_h + 9 * m_width - 45 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = m_height - ( step - 9 * m_height + 41 * repaint_h - 9 * m_width + 45 * repaint_w + stepSize ); repaint_rw = m_width - 5 * repaint_w; @@ -737,7 +737,7 @@ bool KPrPageEffects::effectSurround1() const bitBlt( m_dst, rw, rh, &m_pageTo, rw, rh, w, h ); - if ( tqrepaint ) + if ( repaint ) { bitBlt( m_dst, repaint_rw, repaint_rh, &m_pageTo, repaint_rw, repaint_rh, repaint_w, repaint_h ); } diff --git a/kpresenter/KPrPartObject.cpp b/kpresenter/KPrPartObject.cpp index 9f903608..42054ded 100644 --- a/kpresenter/KPrPartObject.cpp +++ b/kpresenter/KPrPartObject.cpp @@ -68,7 +68,7 @@ bool KPrPartObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) const kdDebug() << "KPrPartObject::saveOasisPart " << sc.partIndexObj << endl; sc.xmlWriter.startElement( "draw:object" ); - const TQString name = TQString( "Object_%1" ).tqarg( sc.partIndexObj + 1 ); + const TQString name = TQString( "Object_%1" ).arg( sc.partIndexObj + 1 ); ++sc.partIndexObj; child->saveOasisAttributes( sc.xmlWriter, name ); @@ -152,7 +152,7 @@ void KPrPartObject::draw( TQPainter *_painter, KoTextZoomHandler *_zoomhandler, void KPrPartObject::slot_changed( KoChild *_koChild ) { KoTextZoomHandler* zh = child->parent()->zoomHandler(); - KoRect g = zh->unzoomRect( _koChild->tqgeometry() ); + KoRect g = zh->unzoomRect( _koChild->geometry() ); KPrObject::setOrig( g.x(), g.y() ); KPrObject::setSize( g.width(), g.height() ); } diff --git a/kpresenter/KPrPenStyleWidget.cpp b/kpresenter/KPrPenStyleWidget.cpp index d6790084..553cf3c1 100644 --- a/kpresenter/KPrPenStyleWidget.cpp +++ b/kpresenter/KPrPenStyleWidget.cpp @@ -23,7 +23,7 @@ #include "penstyle.h" #include "KPrPBPreview.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqvbox.h> @@ -37,11 +37,11 @@ KPrPenStyleWidget::KPrPenStyleWidget( TQWidget *parent, const char *name, const : TQWidget( parent, name ) , m_pen( pen ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( m_ui = new PenStyleUI( this ) ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( m_ui = new PenStyleUI( this ) ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout->addItem( spacer ); + layout->addItem( spacer ); connect( m_ui->colorChooser, TQT_SIGNAL( changed( const TQColor& ) ), this, TQT_SLOT( slotPenChanged() ) ); diff --git a/kpresenter/KPrPgConfDia.cpp b/kpresenter/KPrPgConfDia.cpp index a7df156f..a8219a7f 100644 --- a/kpresenter/KPrPgConfDia.cpp +++ b/kpresenter/KPrPgConfDia.cpp @@ -32,7 +32,7 @@ #include <tqvgroupbox.h> #include <tqheader.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqpen.h> #include <tqpushbutton.h> @@ -135,9 +135,9 @@ void KPrPgConfDia::setupPageGeneral() "using the mouse.</p>" "<p>You can configure the color of the drawing pen and the " "width of the pen.</p>" ) ); - penGroup->tqlayout()->setSpacing(KDialog::marginHint()); - penGroup->tqlayout()->setMargin(KDialog::spacingHint()); - //TQGridLayout *grid = new TQGridLayout(penGroup->tqlayout(), 3, 2 ); + penGroup->layout()->setSpacing(KDialog::marginHint()); + penGroup->layout()->setMargin(KDialog::spacingHint()); + //TQGridLayout *grid = new TQGridLayout(penGroup->layout(), 3, 2 ); TQLabel* label = new TQLabel( i18n( "Color:" ), penGroup ); //grid->addWidget( label, 0, 0 ); @@ -209,7 +209,7 @@ void KPrPgConfDia::setupPageSlides() TQWidget* spacer = new TQWidget( buttonGroup ); - spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); + spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); slidesLayout->addMultiCellWidget( buttonGroup, 4, 4, 0, 1 ); if ( !m_doc->presentationName().isEmpty() ) diff --git a/kpresenter/KPrPicturePreview.cpp b/kpresenter/KPrPicturePreview.cpp index a2eafde8..ba0c8b33 100644 --- a/kpresenter/KPrPicturePreview.cpp +++ b/kpresenter/KPrPicturePreview.cpp @@ -162,7 +162,7 @@ void KPrPicturePreview::slotNormalPicture() if ( mirrorType != PM_NORMAL ) { mirrorType = PM_NORMAL; - tqrepaint( false ); + repaint( false ); } } @@ -172,7 +172,7 @@ void KPrPicturePreview::slotHorizontalMirrorPicture() if ( mirrorType != PM_HORIZONTAL ) { mirrorType = PM_HORIZONTAL; - tqrepaint( false ); + repaint( false ); } } @@ -182,7 +182,7 @@ void KPrPicturePreview::slotVerticalMirrorPicture() if ( mirrorType != PM_VERTICAL ) { mirrorType = PM_VERTICAL; - tqrepaint( false ); + repaint( false ); } } @@ -192,7 +192,7 @@ void KPrPicturePreview::slotHorizontalAndVerticalMirrorPicture() if ( mirrorType != PM_HORIZONTALANDVERTICAL ) { mirrorType = PM_HORIZONTALANDVERTICAL; - tqrepaint( false ); + repaint( false ); } } @@ -202,7 +202,7 @@ void KPrPicturePreview::slotPictureDepth0() if ( depth !=0 ) { depth = 0; - tqrepaint( false ); + repaint( false ); } } @@ -212,7 +212,7 @@ void KPrPicturePreview::slotPictureDepth1() if ( depth != 1 ) { depth = 1; - tqrepaint( false ); + repaint( false ); } } @@ -222,7 +222,7 @@ void KPrPicturePreview::slotPictureDepth8() if ( depth != 8) { depth = 8; - tqrepaint( false ); + repaint( false ); } } @@ -232,7 +232,7 @@ void KPrPicturePreview::slotPictureDepth16() if ( depth != 16 ) { depth = 16; - tqrepaint( false ); + repaint( false ); } } @@ -242,7 +242,7 @@ void KPrPicturePreview::slotPictureDepth32() if ( depth !=32 ) { depth = 32; - tqrepaint( false ); + repaint( false ); } } @@ -252,7 +252,7 @@ void KPrPicturePreview::slotSwapRGBPicture( bool _on ) if ( swapRGB != _on ) { swapRGB = _on; - tqrepaint( false ); + repaint( false ); } } @@ -262,7 +262,7 @@ void KPrPicturePreview::slotGrayscalPicture( bool _on ) if ( grayscal != _on ) { grayscal = _on; - tqrepaint( false ); + repaint( false ); } } @@ -272,7 +272,7 @@ void KPrPicturePreview::slotBrightValue( int _value ) if ( bright != _value ) { bright = _value; - tqrepaint( false ); + repaint( false ); } } @@ -282,7 +282,7 @@ void KPrPicturePreview::setDepth( int _depth) if ( _depth != depth ) { depth = _depth; - tqrepaint( false ); + repaint( false ); } } @@ -292,7 +292,7 @@ void KPrPicturePreview::setMirrorType (PictureMirrorType _t) if ( mirrorType != _t ) { mirrorType = _t; - tqrepaint( false ); + repaint( false ); } } @@ -300,7 +300,7 @@ void KPrPicturePreview::setMirrorType (PictureMirrorType _t) void KPrPicturePreview::setPicturePixmap(const TQPixmap &_pixmap) { origPixmap = _pixmap; - tqrepaint( false ); + repaint( false ); } diff --git a/kpresenter/KPrPictureProperty.cpp b/kpresenter/KPrPictureProperty.cpp index 5e0e6db8..336f63c6 100644 --- a/kpresenter/KPrPictureProperty.cpp +++ b/kpresenter/KPrPictureProperty.cpp @@ -26,15 +26,15 @@ #include <knuminput.h> #include <tqradiobutton.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> KPrPictureProperty::KPrPictureProperty( TQWidget *parent, const char *name, const TQPixmap &pixmap, KPrPictureSettingCmd::PictureSettings pictureSettings ) : TQWidget( parent, name ) , m_pictureSettings( pictureSettings ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( m_ui = new PicturePropertyUI( this ) ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( m_ui = new PicturePropertyUI( this ) ); connect( m_ui->depth0, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth0() ) ); connect( m_ui->depth1, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth1() ) ); diff --git a/kpresenter/KPrPiePreview.h b/kpresenter/KPrPiePreview.h index 1f3ca45f..c483f95a 100644 --- a/kpresenter/KPrPiePreview.h +++ b/kpresenter/KPrPiePreview.h @@ -25,7 +25,7 @@ #include <tqframe.h> #include <tqpen.h> -#include <tqbrush.h> +#include <brush.h> #include "global.h" @@ -39,13 +39,13 @@ public: ~KPrPiePreview() {} void setAngle( int _angle ) - { angle = _angle; tqrepaint( true ); } + { angle = _angle; repaint( true ); } void setLength( int _len ) - { len = _len; tqrepaint( true ); } + { len = _len; repaint( true ); } void setType( PieType _type ) - { type = _type; tqrepaint( true ); } + { type = _type; repaint( true ); } void setPenBrush( const TQPen &_pen, const TQBrush &_brush ) - { pen = _pen; brush = _brush; tqrepaint( true ); } + { pen = _pen; brush = _brush; repaint( true ); } protected: void drawContents( TQPainter* ); diff --git a/kpresenter/KPrPieProperty.cpp b/kpresenter/KPrPieProperty.cpp index 694a9653..3dda3079 100644 --- a/kpresenter/KPrPieProperty.cpp +++ b/kpresenter/KPrPieProperty.cpp @@ -20,7 +20,7 @@ #include "KPrPieProperty.h" -#include <tqlayout.h> +#include <layout.h> #include <kcombobox.h> #include <klocale.h> @@ -35,8 +35,8 @@ KPrPieProperty::KPrPieProperty( TQWidget *parent, const char *name, KPrPieValueC : TQWidget( parent, name ) , m_pieValues( pieValues ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( m_ui = new PiePropertyUI( this ) ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( m_ui = new PiePropertyUI( this ) ); m_ui->typeCombo->insertItem( i18n( "Pie" ) ); m_ui->typeCombo->insertItem( i18n( "Arc" ) ); diff --git a/kpresenter/KPrPixmapObject.cpp b/kpresenter/KPrPixmapObject.cpp index 0a4c8921..9e4320e3 100644 --- a/kpresenter/KPrPixmapObject.cpp +++ b/kpresenter/KPrPixmapObject.cpp @@ -365,7 +365,7 @@ void KPrPixmapObject::loadOasis(const TQDomElement &element, KoOasisContext & co strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. } TQString filename(href/*.mid(1)*/); - const KoPictureKey key(filename, TQDateTime::tqcurrentDateTime(Qt::UTC)); + const KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC)); image.setKey(key); KoStore* store = context.store(); diff --git a/kpresenter/KPrPointObject.cpp b/kpresenter/KPrPointObject.cpp index a1fb0564..86fc4641 100644 --- a/kpresenter/KPrPointObject.cpp +++ b/kpresenter/KPrPointObject.cpp @@ -100,7 +100,7 @@ TQDomDocumentFragment KPrPointObject::save( TQDomDocument& doc, double offset ) const char * KPrPointObject::getOasisElementName() const { - return "draw:custom-tqshape"; + return "draw:custom-shape"; } void KPrPointObject::loadOasisMarker( KoOasisContext & context ) diff --git a/kpresenter/KPrPolyLineObjectIface.cpp b/kpresenter/KPrPolyLineObjectIface.cpp index cd419aec..8283a4c5 100644 --- a/kpresenter/KPrPolyLineObjectIface.cpp +++ b/kpresenter/KPrPolyLineObjectIface.cpp @@ -34,12 +34,12 @@ KPrPolyLineObjectIface::KPrPolyLineObjectIface( KPrPolylineObject *_obj ) void KPrPolyLineObjectIface::horizontalFlip() { - //todo tqrepaint it + //todo repaint it obj->flip(true ); } void KPrPolyLineObjectIface::verticalFlip() { - //todo tqrepaint it + //todo repaint it obj->flip( false ); } diff --git a/kpresenter/KPrPolygonObject.cpp b/kpresenter/KPrPolygonObject.cpp index 451b1a48..2f621df9 100644 --- a/kpresenter/KPrPolygonObject.cpp +++ b/kpresenter/KPrPolygonObject.cpp @@ -75,7 +75,7 @@ bool KPrPolygonObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) const sc.xmlWriter.addAttribute( "draw:concave", checkConcavePolygon ? "true" : "false" ); if ( checkConcavePolygon ) { - sc.xmlWriter.addAttribute( "draw:sharpness", TQString( "%1%").tqarg( sharpnessValue ) ); + sc.xmlWriter.addAttribute( "draw:sharpness", TQString( "%1%").arg( sharpnessValue ) ); } return true; diff --git a/kpresenter/KPrPolygonPreview.cpp b/kpresenter/KPrPolygonPreview.cpp index e41e9c6f..545472a3 100644 --- a/kpresenter/KPrPolygonPreview.cpp +++ b/kpresenter/KPrPolygonPreview.cpp @@ -85,35 +85,35 @@ void KPrPolygonPreview::drawContents( TQPainter *painter ) void KPrPolygonPreview::slotConvexConcave( bool convexConcave ) { isConcave = convexConcave; - tqrepaint(); + repaint(); } void KPrPolygonPreview::slotConvexPolygon() { isConcave = false; - tqrepaint(); + repaint(); } void KPrPolygonPreview::slotConcavePolygon() { isConcave = true; - tqrepaint(); + repaint(); } void KPrPolygonPreview::slotCornersValue( int value ) { nCorners = value; - tqrepaint(); + repaint(); } void KPrPolygonPreview::slotSharpnessValue( int value ) { sharpness = value; - tqrepaint(); + repaint(); } diff --git a/kpresenter/KPrPolygonPreview.h b/kpresenter/KPrPolygonPreview.h index 4d6cc248..8fdcb26a 100644 --- a/kpresenter/KPrPolygonPreview.h +++ b/kpresenter/KPrPolygonPreview.h @@ -26,7 +26,7 @@ #include <tqframe.h> #include <tqpen.h> -#include <tqbrush.h> +#include <brush.h> class TQPainter; @@ -40,7 +40,7 @@ public: ~KPrPolygonPreview() {} void setPenBrush( const TQPen &_pen, const TQBrush &_brush ) - { pen = _pen; brush = _brush; tqrepaint( true ); } + { pen = _pen; brush = _brush; repaint( true ); } public slots: void slotConvexConcave( bool convexConcave ); diff --git a/kpresenter/KPrPolygonProperty.cpp b/kpresenter/KPrPolygonProperty.cpp index fe303a0b..69405b99 100644 --- a/kpresenter/KPrPolygonProperty.cpp +++ b/kpresenter/KPrPolygonProperty.cpp @@ -20,7 +20,7 @@ #include "KPrPolygonProperty.h" -#include <tqlayout.h> +#include <layout.h> #include <kcombobox.h> #include <klocale.h> @@ -33,8 +33,8 @@ KPrPolygonProperty::KPrPolygonProperty( TQWidget *parent, const char *name, KPrP : TQWidget( parent, name ) , m_polygonSettings( polygonSettings ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( m_ui = new PolygonPropertyUI( this ) ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( m_ui = new PolygonPropertyUI( this ) ); m_ui->typeCombo->insertItem( i18n( "Polygon" ) ); m_ui->typeCombo->insertItem( i18n( "Convex/Concave" ) ); diff --git a/kpresenter/KPrPresDurationDia.cpp b/kpresenter/KPrPresDurationDia.cpp index 88163c62..8306dec3 100644 --- a/kpresenter/KPrPresDurationDia.cpp +++ b/kpresenter/KPrPresDurationDia.cpp @@ -25,7 +25,7 @@ #include <tqlabel.h> #include <tqheader.h> #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <klistview.h> #include <kdebug.h> #include <klocale.h> @@ -48,7 +48,7 @@ KPrPresDurationDia::KPrPresDurationDia( TQWidget *parent, const char *name, slides->setSelected( slides->firstChild(), true ); label = new TQLabel( i18n( "Presentation duration: " ) + _durationString, page ); - label->tqsetAlignment( AlignVCenter ); + label->setAlignment( AlignVCenter ); topLayout->addWidget( label ); setMinimumSize( 600, 400 ); @@ -71,7 +71,7 @@ void KPrPresDurationDia::setupSlideList( TQWidget *_page ) if ( doc->pageList().at( i )->isSlideSelected() ) { KListViewItem *item = new KListViewItem( slides ); item->setPixmap( 0, KPBarIcon( "slide" ) ); - item->setText( 0, TQString( "%1" ).tqarg( i + 1 ) ); + item->setText( 0, TQString( "%1" ).arg( i + 1 ) ); item->setText( 1, *m_durationListString.at( i ) ); item->setText( 2, doc->pageList().at( i )->pageTitle() ); } diff --git a/kpresenter/KPrPrinterDlg.cpp b/kpresenter/KPrPrinterDlg.cpp index 3dce55a3..7fc553cf 100644 --- a/kpresenter/KPrPrinterDlg.cpp +++ b/kpresenter/KPrPrinterDlg.cpp @@ -21,7 +21,7 @@ */ // TQt includes -#include <tqlayout.h> +#include <layout.h> // KDE includes #include <kdebug.h> @@ -36,7 +36,7 @@ : KPrintDialogPage( parent, name ) { setTitle( i18n( "KPresenter Options" ) ); - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 1, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( this, 2, 1, 11, 6 ); txtRows = new KIntNumInput(this ); txtRows->setMinValue(1); txtRows->setMaxValue(5); @@ -50,21 +50,21 @@ TQLabel *caption = new TQLabel(i18n("Slides in the pages:"), this ); TQToolTip::add( caption, i18n("Choose how many rows and columns with slides you want to have on all pages") ); - tqlayout->addMultiCellWidget( caption, 0, 0, 0, 1 ); + layout->addMultiCellWidget( caption, 0, 0, 0, 1 ); TQVBoxLayout *l2 = new TQVBoxLayout( 0, 0, 6 ); l2->addWidget( new TQLabel(i18n("Rows: "), this) ); l2->addWidget( new TQLabel(i18n("Columns: "), this) ); - tqlayout->addLayout( l2, 1, 0 ); + layout->addLayout( l2, 1, 0 ); TQVBoxLayout *l3 = new TQVBoxLayout( 0, 0, 6 ); l3->addWidget( txtRows ); l3->addWidget( txtColumns ); - tqlayout->addLayout( l3, 1, 1 ); + layout->addLayout( l3, 1, 1 ); drawBorder = new TQCheckBox(i18n("Draw border around the slides"), this ); drawBorder->setChecked( true ); drawBorder->setEnabled( false ); - tqlayout->addMultiCellWidget( drawBorder, 2, 2, 0, 1 ); + layout->addMultiCellWidget( drawBorder, 2, 2, 0, 1 ); } void KPrPrinterDlg::getOptions( TQMap<TQString, TQString>& opts, bool ) diff --git a/kpresenter/KPrRectPreview.h b/kpresenter/KPrRectPreview.h index bf539132..7e09a913 100644 --- a/kpresenter/KPrRectPreview.h +++ b/kpresenter/KPrRectPreview.h @@ -25,7 +25,7 @@ #include <tqframe.h> #include <tqpen.h> -#include <tqbrush.h> +#include <brush.h> class KPrRectPreview : public TQFrame { @@ -37,9 +37,9 @@ public: ~KPrRectPreview() {} void setRnds( int _rx, int _ry ) - { xRnd = _rx; yRnd = _ry; tqrepaint( contentsRect(), true ); } + { xRnd = _rx; yRnd = _ry; repaint( contentsRect(), true ); } void setPenBrush( const TQPen &_pen, const TQBrush &_brush ) - { pen = _pen; brush = _brush; tqrepaint( true ); } + { pen = _pen; brush = _brush; repaint( true ); } protected: void drawContents( TQPainter* ); diff --git a/kpresenter/KPrRectProperty.cpp b/kpresenter/KPrRectProperty.cpp index 2174755b..e3251e58 100644 --- a/kpresenter/KPrRectProperty.cpp +++ b/kpresenter/KPrRectProperty.cpp @@ -27,15 +27,15 @@ #include <tqspinbox.h> #include <tqtoolbutton.h> -#include <tqlayout.h> +#include <layout.h> KPrRectProperty::KPrRectProperty( TQWidget *parent, const char *name, KPrRectValueCmd::RectValues &rectValue ) : TQWidget( parent, name ) , m_rectValue( rectValue ) { formerVerticalValue = 0; - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( m_ui = new RectPropertyUI( this ) ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( m_ui = new RectPropertyUI( this ) ); KoImageResource kir; m_ui->combineButton->setPixmap(kir.chain()); diff --git a/kpresenter/KPrRotationDialogImpl.cpp b/kpresenter/KPrRotationDialogImpl.cpp index 4f2d59ca..a5977b4e 100644 --- a/kpresenter/KPrRotationDialogImpl.cpp +++ b/kpresenter/KPrRotationDialogImpl.cpp @@ -19,7 +19,7 @@ #include <tqtoolbutton.h> #include <tqslider.h> #include <tqgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqbuttongroup.h> #include <tqobject.h> #include <tqevent.h> diff --git a/kpresenter/KPrShadowDialogImpl.cpp b/kpresenter/KPrShadowDialogImpl.cpp index e46e80fd..61aced10 100644 --- a/kpresenter/KPrShadowDialogImpl.cpp +++ b/kpresenter/KPrShadowDialogImpl.cpp @@ -1,7 +1,7 @@ // -*- Mode: c++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; -*- #include <tqspinbox.h> #include <tqgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqbuttongroup.h> #include <kcolorbutton.h> diff --git a/kpresenter/KPrSideBar.cpp b/kpresenter/KPrSideBar.cpp index b39ab5b0..be2e4079 100644 --- a/kpresenter/KPrSideBar.cpp +++ b/kpresenter/KPrSideBar.cpp @@ -672,7 +672,7 @@ void OutlineSlideItem::updateTitle() { TQString title = m_page->pageTitle(); if ( ! m_page->isSlideSelected() ) - title = i18n( "(%1)" ).tqarg( title ); + title = i18n( "(%1)" ).arg( title ); setText( 0, title ); } @@ -762,7 +762,7 @@ KPrOutline::KPrOutline( TQWidget *parent, KPrDocument *d, KPrView *v ) setSorting( -1 ); header()->hide(); addColumn( i18n( "Slide" ) ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); connect( this, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); connect( this, TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int ) ), @@ -935,7 +935,7 @@ void KPrOutline::itemClicked( TQListViewItem *item ) m_doc->deSelectAllObj(); m_view->getCanvas()->selectObj( object ); m_view->showObjectRect( object ); - m_doc->tqrepaint( false ); + m_doc->repaint( false ); } } diff --git a/kpresenter/KPrSideBar.h b/kpresenter/KPrSideBar.h index b6450f11..8f23225f 100644 --- a/kpresenter/KPrSideBar.h +++ b/kpresenter/KPrSideBar.h @@ -109,7 +109,7 @@ public: KPrOutline( TQWidget *parent, KPrDocument *d, KPrView *v ); ~KPrOutline(); void setCurrentPage( int pg ); - TQSize tqsizeHint() const { return TQSize( 145, KListView::tqsizeHint().height() ); } + TQSize sizeHint() const { return TQSize( 145, KListView::sizeHint().height() ); } void updateItem( int pagenr, bool sticky = false); void addItem( int pos ); void moveItem( int oldPos, int newPos ); @@ -154,7 +154,7 @@ public: m_thb->setCurrentPage(pg); }; void setOn( int , bool ) { }; - //TQSize tqsizeHint() const { return TQSize( 120, TQTabWidget::tqsizeHint().height() ); }; + //TQSize sizeHint() const { return TQSize( 120, TQTabWidget::sizeHint().height() ); }; void updateItem( KPrPage *page ); void addItem( int pos ); void moveItem( int oldPos, int newPos ); diff --git a/kpresenter/KPrSlideTransitionDia.cpp b/kpresenter/KPrSlideTransitionDia.cpp index f0b3a05b..9afecb25 100644 --- a/kpresenter/KPrSlideTransitionDia.cpp +++ b/kpresenter/KPrSlideTransitionDia.cpp @@ -198,7 +198,7 @@ void KPrSlideTransitionDia::preview() delete m_pageEffect; m_pageEffect = 0; - m_dialog->previewPixmap->tqrepaint(); + m_dialog->previewPixmap->repaint(); } m_pageEffect = new KPrPageEffects( TQT_TQPAINTDEVICE(m_dialog->previewPixmap), m_target, effect, effectSpeed ); @@ -271,7 +271,7 @@ TQString KPrSlideTransitionDia::getSoundFileFilter() if ( comma ) str += '\n'; comma = true; - str += TQString( i18n( "*.%1|%2 Files" ) ).tqarg( *it ).tqarg( (*it).upper() ); + str += TQString( i18n( "*.%1|%2 Files" ) ).arg( *it ).arg( (*it).upper() ); full += TQString( "*.") + (*it) + ' '; } diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp index 6cec5fc2..0194e1fe 100644 --- a/kpresenter/KPrTextObject.cpp +++ b/kpresenter/KPrTextObject.cpp @@ -58,7 +58,7 @@ #include <tqapplication.h> #include <tqfontdatabase.h> #include <tqpopupmenu.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <KoParagCounter.h> #include <kaction.h> @@ -239,7 +239,7 @@ void KPrTextObject::saveOasisMarginElement( KoGenStyle &styleobjectauto ) const if ( bright != 0.0 ) styleobjectauto.addPropertyPt("fo:padding-right", bright ); - //add vertical tqalignment + //add vertical alignment switch( m_textVertAlign ) { case KP_TOP: @@ -272,15 +272,15 @@ void KPrTextObject::loadOasis(const TQDomElement &element, KoOasisContext& conte if( styleStack.hasAttributeNS( KoXmlNS::fo, "padding-right" ) ) bright = KoUnit::parseValue( styleStack.attributeNS( KoXmlNS::fo, "padding-right" ) ); kdDebug()<<" KPrTextObject::loadOasis : btp :"<<btop<<" bbottom :"<<bbottom<<" bleft :"<<bleft<<" bright :"<<bright<<endl; - // vertical tqalignment + // vertical alignment if ( styleStack.hasAttributeNS( KoXmlNS::draw, "textarea-vertical-align" ) ) { - TQString tqalignment = styleStack.attributeNS( KoXmlNS::draw, "textarea-vertical-align" ); - if ( tqalignment == "top" ) + TQString alignment = styleStack.attributeNS( KoXmlNS::draw, "textarea-vertical-align" ); + if ( alignment == "top" ) m_textVertAlign= KP_TOP; - else if ( tqalignment == "middle" ) + else if ( alignment == "middle" ) m_textVertAlign= KP_CENTER; - else if ( tqalignment == "bottom" ) + else if ( alignment == "bottom" ) m_textVertAlign= KP_BOTTOM; } kdDebug()<<" vertical Alignment :"<< ( ( m_textVertAlign== KP_TOP ) ? "top" : ( m_textVertAlign== KP_CENTER ) ? "center": "bottom" )<<endl; @@ -473,7 +473,7 @@ void KPrTextObject::drawText( TQPainter* _painter, KoTextZoomHandler *zoomHandle { //kdDebug(33001) << "KPrTextObject::drawText onlyChanged=" << onlyChanged << " cursor=" << cursor << " resetChanged=" << resetChanged << endl; recalcVerticalAlignment(); - TQColorGroup cg = TQApplication::tqpalette().active(); + TQColorGroup cg = TQApplication::palette().active(); _painter->save(); _painter->translate( m_doc->zoomHandler()->zoomItX( bLeft()), m_doc->zoomHandler()->zoomItY( bTop()+alignVertical)); if ( !editingTextObj || (_painter->device() && _painter->device()->devType() == TQInternal::Printer)) @@ -871,7 +871,7 @@ KoTextFormat KPrTextObject::loadFormat( TQDomElement &n, KoTextFormat * refForma if ( !n.isNull() ) { TQFontDatabase fdb; - TQStringList families = fdb.tqfamilies(); + TQStringList families = fdb.families(); if ( families.findIndex( n.attribute( attrFamily ) ) != -1 ) fn.setFamily( n.attribute( attrFamily ) ); else @@ -972,7 +972,7 @@ KoTextFormat KPrTextObject::loadFormat( TQDomElement &n, KoTextFormat * refForma KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocument *doc, bool findStyle) { - KoParagLayout tqlayout; + KoParagLayout layout; // Only when loading paragraphs, not when loading styles if ( findStyle ) @@ -998,7 +998,7 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu style = doc->styleCollection()->findStyle( "Standard" ); } Q_ASSERT(style); - tqlayout.style = style; + layout.style = style; } TQDomElement element = parentElem.namedItem( "INDENTS" ).toElement(); @@ -1007,17 +1007,17 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu double val=0.0; if(element.hasAttribute("first")) val=element.attribute("first").toDouble(); - tqlayout.margins[TQStyleSheetItem::MarginFirstLine] = val; + layout.margins[TQStyleSheetItem::MarginFirstLine] = val; val=0.0; if(element.hasAttribute( "left")) // The GUI prevents a negative indent, so let's fixup broken docs too val=TQMAX(0, element.attribute( "left").toDouble()); - tqlayout.margins[TQStyleSheetItem::MarginLeft] = val; + layout.margins[TQStyleSheetItem::MarginLeft] = val; val=0.0; if(element.hasAttribute("right")) // The GUI prevents a negative indent, so let's fixup broken docs too val=TQMAX(0, element.attribute("right").toDouble()); - tqlayout.margins[TQStyleSheetItem::MarginRight] = val; + layout.margins[TQStyleSheetItem::MarginRight] = val; } element = parentElem.namedItem( "LINESPACING" ).toElement(); if ( !element.isNull() ) @@ -1028,18 +1028,18 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu TQString value = element.attribute( "value" ); if ( value == "oneandhalf" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; - tqlayout.setLineSpacingValue(0); + layout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; + layout.setLineSpacingValue(0); } else if ( value == "double" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_DOUBLE; - tqlayout.setLineSpacingValue(0); + layout.lineSpacingType = KoParagLayout::LS_DOUBLE; + layout.setLineSpacingValue(0); } else { - tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM; - tqlayout.setLineSpacingValue(value.toDouble()); + layout.lineSpacingType = KoParagLayout::LS_CUSTOM; + layout.setLineSpacingValue(value.toDouble()); } } else @@ -1047,28 +1047,28 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu TQString type = element.attribute( "type" ); if ( type == "oneandhalf" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; - tqlayout.setLineSpacingValue(0); + layout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; + layout.setLineSpacingValue(0); } else if ( type == "double" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_DOUBLE; - tqlayout.setLineSpacingValue(0); + layout.lineSpacingType = KoParagLayout::LS_DOUBLE; + layout.setLineSpacingValue(0); } else if ( type == "custom" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM; - tqlayout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble()); + layout.lineSpacingType = KoParagLayout::LS_CUSTOM; + layout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble()); } else if ( type == "atleast" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_AT_LEAST; - tqlayout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble()); + layout.lineSpacingType = KoParagLayout::LS_AT_LEAST; + layout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble()); } else if ( type == "multiple" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_MULTIPLE; - tqlayout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble()); + layout.lineSpacingType = KoParagLayout::LS_MULTIPLE; + layout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble()); } } } @@ -1079,43 +1079,43 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu double val =0.0; if(element.hasAttribute("before")) val=TQMAX(0, element.attribute("before").toDouble()); - tqlayout.margins[TQStyleSheetItem::MarginTop] = val; + layout.margins[TQStyleSheetItem::MarginTop] = val; val = 0.0; if(element.hasAttribute("after")) val=TQMAX(0, element.attribute("after").toDouble()); - tqlayout.margins[TQStyleSheetItem::MarginBottom] = val; + layout.margins[TQStyleSheetItem::MarginBottom] = val; } element = parentElem.namedItem( "LEFTBORDER" ).toElement(); if ( !element.isNull() ) - tqlayout.leftBorder = KoBorder::loadBorder( element ); + layout.leftBorder = KoBorder::loadBorder( element ); else - tqlayout.leftBorder.setPenWidth( 0); + layout.leftBorder.setPenWidth( 0); element = parentElem.namedItem( "RIGHTBORDER" ).toElement(); if ( !element.isNull() ) - tqlayout.rightBorder = KoBorder::loadBorder( element ); + layout.rightBorder = KoBorder::loadBorder( element ); else - tqlayout.rightBorder.setPenWidth( 0); + layout.rightBorder.setPenWidth( 0); element = parentElem.namedItem( "TOPBORDER" ).toElement(); if ( !element.isNull() ) - tqlayout.topBorder = KoBorder::loadBorder( element ); + layout.topBorder = KoBorder::loadBorder( element ); else - tqlayout.topBorder.setPenWidth(0); + layout.topBorder.setPenWidth(0); element = parentElem.namedItem( "BOTTOMBORDER" ).toElement(); if ( !element.isNull() ) - tqlayout.bottomBorder = KoBorder::loadBorder( element ); + layout.bottomBorder = KoBorder::loadBorder( element ); else - tqlayout.bottomBorder.setPenWidth(0); + layout.bottomBorder.setPenWidth(0); element = parentElem.namedItem( "COUNTER" ).toElement(); if ( !element.isNull() ) { - tqlayout.counter = new KoParagCounter; - tqlayout.counter->load( element ); + layout.counter = new KoParagCounter; + layout.counter->load( element ); } KoTabulatorList tabList; @@ -1140,110 +1140,110 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu tabList.append( tab ); } } - tqlayout.setTabList( tabList ); + layout.setTabList( tabList ); - return tqlayout; + return layout; } -void KPrTextObject::saveParagLayout( const KoParagLayout& tqlayout, TQDomElement & parentElem ) +void KPrTextObject::saveParagLayout( const KoParagLayout& layout, TQDomElement & parentElem ) { TQDomDocument doc = parentElem.ownerDocument(); TQDomElement element = doc.createElement( "NAME" ); parentElem.appendChild( element ); - if ( tqlayout.style ) - element.setAttribute( "value", tqlayout.style->name() ); + if ( layout.style ) + element.setAttribute( "value", layout.style->name() ); else kdWarning() << "KWTextParag::saveParagLayout: style==0L!" << endl; - if ( tqlayout.margins[TQStyleSheetItem::MarginFirstLine] != 0 || - tqlayout.margins[TQStyleSheetItem::MarginLeft] != 0 || - tqlayout.margins[TQStyleSheetItem::MarginRight] != 0 ) + if ( layout.margins[TQStyleSheetItem::MarginFirstLine] != 0 || + layout.margins[TQStyleSheetItem::MarginLeft] != 0 || + layout.margins[TQStyleSheetItem::MarginRight] != 0 ) { element = doc.createElement( "INDENTS" ); parentElem.appendChild( element ); - if ( tqlayout.margins[TQStyleSheetItem::MarginFirstLine] != 0 ) - element.setAttribute( "first", tqlayout.margins[TQStyleSheetItem::MarginFirstLine] ); - if ( tqlayout.margins[TQStyleSheetItem::MarginLeft] != 0 ) - element.setAttribute( "left", tqlayout.margins[TQStyleSheetItem::MarginLeft] ); - if ( tqlayout.margins[TQStyleSheetItem::MarginRight] != 0 ) - element.setAttribute( "right", tqlayout.margins[TQStyleSheetItem::MarginRight] ); + if ( layout.margins[TQStyleSheetItem::MarginFirstLine] != 0 ) + element.setAttribute( "first", layout.margins[TQStyleSheetItem::MarginFirstLine] ); + if ( layout.margins[TQStyleSheetItem::MarginLeft] != 0 ) + element.setAttribute( "left", layout.margins[TQStyleSheetItem::MarginLeft] ); + if ( layout.margins[TQStyleSheetItem::MarginRight] != 0 ) + element.setAttribute( "right", layout.margins[TQStyleSheetItem::MarginRight] ); } - if ( tqlayout.margins[TQStyleSheetItem::MarginTop] != 0 || - tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 ) + if ( layout.margins[TQStyleSheetItem::MarginTop] != 0 || + layout.margins[TQStyleSheetItem::MarginBottom] != 0 ) { element = doc.createElement( "OFFSETS" ); parentElem.appendChild( element ); - if ( tqlayout.margins[TQStyleSheetItem::MarginTop] != 0 ) - element.setAttribute( "before", tqlayout.margins[TQStyleSheetItem::MarginTop] ); - if ( tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 ) - element.setAttribute( "after", tqlayout.margins[TQStyleSheetItem::MarginBottom] ); + if ( layout.margins[TQStyleSheetItem::MarginTop] != 0 ) + element.setAttribute( "before", layout.margins[TQStyleSheetItem::MarginTop] ); + if ( layout.margins[TQStyleSheetItem::MarginBottom] != 0 ) + element.setAttribute( "after", layout.margins[TQStyleSheetItem::MarginBottom] ); } - if ( tqlayout.lineSpacingType != KoParagLayout::LS_SINGLE ) + if ( layout.lineSpacingType != KoParagLayout::LS_SINGLE ) { element = doc.createElement( "LINESPACING" ); parentElem.appendChild( element ); - if ( tqlayout.lineSpacingType == KoParagLayout::LS_ONEANDHALF ) + if ( layout.lineSpacingType == KoParagLayout::LS_ONEANDHALF ) element.setAttribute( "type", "oneandhalf" ); - else if ( tqlayout.lineSpacingType == KoParagLayout::LS_DOUBLE ) + else if ( layout.lineSpacingType == KoParagLayout::LS_DOUBLE ) element.setAttribute( "type", "double" ); - else if ( tqlayout.lineSpacingType == KoParagLayout::LS_CUSTOM ) + else if ( layout.lineSpacingType == KoParagLayout::LS_CUSTOM ) { element.setAttribute( "type", "custom" ); - element.setAttribute( "spacingvalue", tqlayout.lineSpacingValue()); + element.setAttribute( "spacingvalue", layout.lineSpacingValue()); } - else if ( tqlayout.lineSpacingType == KoParagLayout::LS_AT_LEAST ) + else if ( layout.lineSpacingType == KoParagLayout::LS_AT_LEAST ) { element.setAttribute( "type", "atleast" ); - element.setAttribute( "spacingvalue", tqlayout.lineSpacingValue()); + element.setAttribute( "spacingvalue", layout.lineSpacingValue()); } - else if ( tqlayout.lineSpacingType == KoParagLayout::LS_MULTIPLE ) + else if ( layout.lineSpacingType == KoParagLayout::LS_MULTIPLE ) { element.setAttribute( "type", "multiple" ); - element.setAttribute( "spacingvalue", tqlayout.lineSpacingValue()); + element.setAttribute( "spacingvalue", layout.lineSpacingValue()); } else kdDebug(33001) << " error in lineSpacing Type" << endl; } - if ( tqlayout.leftBorder.penWidth() > 0 ) + if ( layout.leftBorder.penWidth() > 0 ) { element = doc.createElement( "LEFTBORDER" ); parentElem.appendChild( element ); - tqlayout.leftBorder.save( element ); + layout.leftBorder.save( element ); } - if ( tqlayout.rightBorder.penWidth() > 0 ) + if ( layout.rightBorder.penWidth() > 0 ) { element = doc.createElement( "RIGHTBORDER" ); parentElem.appendChild( element ); - tqlayout.rightBorder.save( element ); + layout.rightBorder.save( element ); } - if ( tqlayout.topBorder.penWidth() > 0 ) + if ( layout.topBorder.penWidth() > 0 ) { element = doc.createElement( "TOPBORDER" ); parentElem.appendChild( element ); - tqlayout.topBorder.save( element ); + layout.topBorder.save( element ); } - if ( tqlayout.bottomBorder.penWidth() > 0 ) + if ( layout.bottomBorder.penWidth() > 0 ) { element = doc.createElement( "BOTTOMBORDER" ); parentElem.appendChild( element ); - tqlayout.bottomBorder.save( element ); + layout.bottomBorder.save( element ); } - if ( tqlayout.counter && tqlayout.counter->numbering() != KoParagCounter::NUM_NONE ) + if ( layout.counter && layout.counter->numbering() != KoParagCounter::NUM_NONE ) { element = doc.createElement( "COUNTER" ); parentElem.appendChild( element ); - if (tqlayout.counter ) - tqlayout.counter->save( element ); + if (layout.counter ) + layout.counter->save( element ); } - KoTabulatorList tabList = tqlayout.tabList(); + KoTabulatorList tabList = layout.tabList(); KoTabulatorList::ConstIterator it = tabList.begin(); for ( ; it != tabList.end() ; it++ ) { @@ -1287,25 +1287,25 @@ void KPrTextObject::recalcPageNum( KPrPage *page ) } var->resize(); - var->paragraph()->tqinvalidate( 0 ); // size may have changed -> need reformatting ! + var->paragraph()->invalidate( 0 ); // size may have changed -> need reformatting ! var->paragraph()->setChanged( true ); } } } -void KPrTextObject::tqlayout() +void KPrTextObject::layout() { - tqinvalidate(); + invalidate(); // Get the thing going though, repainting doesn't call formatMore m_textobj->formatMore( 2 ); } -void KPrTextObject::tqinvalidate() +void KPrTextObject::invalidate() { - //kdDebug(33001) << "KWTextFrameSet::tqinvalidate " << getName() << endl; + //kdDebug(33001) << "KWTextFrameSet::invalidate " << getName() << endl; m_textobj->setLastFormattedParag( textDocument()->firstParag() ); textDocument()->formatter()->setViewFormattingChars( m_doc->viewFormattingChars() ); - textDocument()->tqinvalidate(); // lazy tqlayout, real update follows upon next tqrepaint + textDocument()->invalidate(); // lazy layout, real update follows upon next repaint } // For the "paragraph after paragraph" effect @@ -1380,7 +1380,7 @@ void KPrTextObject::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursorV //p->fillRect( clip, TQt::blue ); TQPixmap *pix = 0; - TQColorGroup cg = TQApplication::tqpalette().active(); + TQColorGroup cg = TQApplication::palette().active(); cg.setColor( TQColorGroup::Base, m_doc->txtBackCol() ); uint drawingFlags = KoTextDocument::DrawSelections; @@ -1451,13 +1451,13 @@ KPrTextView * KPrTextObject::createKPTextView( KPrCanvas * _canvas, bool temp ) void KPrTextObject::removeHighlight () { - m_textobj->removeHighlight( true /*tqrepaint*/ ); + m_textobj->removeHighlight( true /*repaint*/ ); } -void KPrTextObject::highlightPortion( KoTextParag * parag, int index, int length, KPrCanvas* canvas, bool tqrepaint, KDialogBase* dialog ) +void KPrTextObject::highlightPortion( KoTextParag * parag, int index, int length, KPrCanvas* canvas, bool repaint, KDialogBase* dialog ) { - m_textobj->highlightPortion( parag, index, length, tqrepaint ); - if ( tqrepaint ) + m_textobj->highlightPortion( parag, index, length, repaint ); + if ( repaint ) { KPrDocument* doc = canvas->getView()->kPresenterDoc(); @@ -1582,7 +1582,7 @@ void KPrTextObject::slotAfterFormatting( int bottom, KoTextParag* lastFormatted, if ( ( bottom > availHeight ) || // this parag is already below the avail height ( lastFormatted && (bottom + lastFormatted->rect().height() > availHeight) ) ) // or next parag will be below it { - int difference = ( bottom + 2 ) - availHeight; // in tqlayout unit pixels + int difference = ( bottom + 2 ) - availHeight; // in layout unit pixels if( lastFormatted && bottom + lastFormatted->rect().height() > availHeight ) { difference += lastFormatted->rect().height(); @@ -1616,7 +1616,7 @@ void KPrTextObject::slotAfterFormatting( int bottom, KoTextParag* lastFormatted, // Do recalculate the new available height though slotAvailableHeightNeeded(); m_doc->updateRuler(); - m_doc->tqrepaint( true ); + m_doc->repaint( true ); *abort = false; } } @@ -1822,7 +1822,7 @@ void KPrTextView::copy() //kdDebug(33001)<<"void KPrTextView::copy() "<<endl; if ( textDocument()->hasSelection( KoTextDocument::Standard ) ) { TQDragObject *drag = newDrag( 0 ); - TQApplication::tqclipboard()->setData( drag ); + TQApplication::clipboard()->setData( drag ); } } @@ -1830,11 +1830,11 @@ void KPrTextView::paste() { //kdDebug(33001) << "KPrTextView::paste()" << endl; - TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); TQCString returnedMimeType = KoTextObject::providesOasis( data ); if ( !returnedMimeType.isEmpty() ) { - TQByteArray arr = data->tqencodedData( returnedMimeType ); + TQByteArray arr = data->encodedData( returnedMimeType ); if ( arr.size() ) { #if 0 @@ -1850,13 +1850,13 @@ void KPrTextView::paste() } else { - // Note: TQClipboard::text() seems to do a better job than tqencodedData( "text/plain" ) + // Note: TQClipboard::text() seems to do a better job than encodedData( "text/plain" ) // In particular it handles charsets (in the mimetype). - TQString text = TQApplication::tqclipboard()->text(); + TQString text = TQApplication::clipboard()->text(); if ( !text.isEmpty() ) textObject()->pasteText( cursor(), text, currentFormat(), true /*removeSelected*/ ); } - kpTextObject()->tqlayout(); + kpTextObject()->layout(); } void KPrTextView::updateUI( bool updateFormat, bool force ) @@ -1864,9 +1864,9 @@ void KPrTextView::updateUI( bool updateFormat, bool force ) KoTextView::updateUI( updateFormat, force ); // Paragraph settings KoTextParag * parag = static_cast<KoTextParag*>( cursor()->parag()); - if ( m_paragLayout.tqalignment != parag->resolveAlignment() || force ) { - m_paragLayout.tqalignment = parag->resolveAlignment(); - m_canvas->getView()->alignChanged( m_paragLayout.tqalignment ); + if ( m_paragLayout.alignment != parag->resolveAlignment() || force ) { + m_paragLayout.alignment = parag->resolveAlignment(); + m_canvas->getView()->alignChanged( m_paragLayout.alignment ); } // Counter @@ -2356,7 +2356,7 @@ void KPrTextView::insertVariable( KoVariable *var, KoTextFormat *format, bool re customItemsMap ); if ( refreshCustomMenu && var->type() == VT_CUSTOM ) kpTextObject()->kPresenterDocument()->refreshMenuCustomVariable(); - kpTextObject()->kPresenterDocument()->tqrepaint( kpTextObject() ); + kpTextObject()->kPresenterDocument()->repaint( kpTextObject() ); } } @@ -2379,7 +2379,7 @@ TQDragObject * KPrTextView::newDrag( TQWidget * parent ) KPrDocument * doc = kpTextObject()->kPresenterDocument(); - doc->getVariableCollection()->variableSetting()->setModificationDate( TQDateTime::tqcurrentDateTime() ); + doc->getVariableCollection()->variableSetting()->setModificationDate( TQDateTime::currentDateTime() ); doc->recalcVariables( VT_DATE ); doc->recalcVariables( VT_TIME ); doc->recalcVariables( VT_STATISTIC ); @@ -2472,7 +2472,7 @@ void KPrTextView::dropEvent( TQDropEvent * e ) KCommand *cmd = textView()->prepareDropMove( dropCursor ); if(cmd) { - kpTextObject()->tqlayout(); + kpTextObject()->layout(); macroCmd->addCommand(cmd); addMacroCmd = true; } @@ -2490,7 +2490,7 @@ void KPrTextView::dropEvent( TQDropEvent * e ) TQCString returnedTypeMime = KoTextObject::providesOasis( e ); if ( !returnedTypeMime.isEmpty() ) { - TQByteArray arr = e->tqencodedData( returnedTypeMime ); + TQByteArray arr = e->encodedData( returnedTypeMime ); if ( arr.size() ) { KCommand *cmd = kpTextObject()->pasteOasis( cursor(), arr, false ); diff --git a/kpresenter/KPrTextObject.h b/kpresenter/KPrTextObject.h index 3bacdb69..6b62d6b8 100644 --- a/kpresenter/KPrTextObject.h +++ b/kpresenter/KPrTextObject.h @@ -115,7 +115,7 @@ public: void applyStyleChange( KoStyleChangeDefMap changed ); void removeHighlight(); - void highlightPortion( KoTextParag * parag, int index, int length, KPrCanvas *canvas, bool tqrepaint, KDialogBase* dialog = 0 ); + void highlightPortion( KoTextParag * parag, int index, int length, KPrCanvas *canvas, bool repaint, KDialogBase* dialog = 0 ); KCommand * pasteOasis( KoTextCursor * cursor, const TQByteArray & data, bool removeSelected ); @@ -137,7 +137,7 @@ public: bool isProtectContent() const { return textObject()->protectContent();} void loadVariable( TQValueList<TQDomElement> & listVariable,KoTextParag *lastParag, int offset=0 ); - void tqlayout(); + void layout(); /** Reimplemented from KoTextFlow */ int availableHeight() const; @@ -194,8 +194,8 @@ protected: virtual void loadKTextObject( const TQDomElement &e ); void drawText( TQPainter* _painter, KoTextZoomHandler* zoomHandler, bool onlyChanged, KoTextCursor* cursor, bool resetChanged ); void drawParags( TQPainter *p, KoTextZoomHandler* zoomHandler, const TQColorGroup& cg, int from, int to ); - void saveParagLayout( const KoParagLayout& tqlayout, TQDomElement & parentElem ); - void tqinvalidate(); + void saveParagLayout( const KoParagLayout& layout, TQDomElement & parentElem ); + void invalidate(); void recalcVerticalAlignment(); virtual KoPen defaultPen() const; protected slots: diff --git a/kpresenter/KPrTextObjectIface.cpp b/kpresenter/KPrTextObjectIface.cpp index 0dfc1d79..01478ef2 100644 --- a/kpresenter/KPrTextObjectIface.cpp +++ b/kpresenter/KPrTextObjectIface.cpp @@ -247,25 +247,25 @@ bool KPrTextObjectIface::isProtectContent() const void KPrTextObjectIface::setPtMarginLeft(double val) { m_textobject->setBLeft(val); - m_textobject->kPresenterDocument()->tqlayout( m_textobject ); + m_textobject->kPresenterDocument()->layout( m_textobject ); } void KPrTextObjectIface::setPtMarginRight(double val) { m_textobject->setBRight(val); - m_textobject->kPresenterDocument()->tqlayout( m_textobject ); + m_textobject->kPresenterDocument()->layout( m_textobject ); } void KPrTextObjectIface::setPtMarginTop(double val) { m_textobject->setBTop(val); - m_textobject->kPresenterDocument()->tqlayout( m_textobject ); + m_textobject->kPresenterDocument()->layout( m_textobject ); } void KPrTextObjectIface::setPtMarginBottom(double val) { m_textobject->setBBottom(val); - m_textobject->kPresenterDocument()->tqlayout( m_textobject ); + m_textobject->kPresenterDocument()->layout( m_textobject ); } double KPrTextObjectIface::ptMarginLeft()const diff --git a/kpresenter/KPrTextPreview.h b/kpresenter/KPrTextPreview.h index f25d6987..bedb4753 100644 --- a/kpresenter/KPrTextPreview.h +++ b/kpresenter/KPrTextPreview.h @@ -13,10 +13,10 @@ public: KPrTextPreview( TQWidget* parent, const char* name = 0 ); ~KPrTextPreview() {} - void setShadowDirection( ShadowDirection sd ) { shadowDirection = sd; tqrepaint( true ); } - void setShadowDistance( int sd ) { shadowDistance = sd; tqrepaint( true ); } - void setShadowColor( const TQColor &sc ) { shadowColor = sc; tqrepaint( true ); } - void setAngle( double a ) { angle = a; tqrepaint( true ); } + void setShadowDirection( ShadowDirection sd ) { shadowDirection = sd; repaint( true ); } + void setShadowDistance( int sd ) { shadowDistance = sd; repaint( true ); } + void setShadowColor( const TQColor &sc ) { shadowColor = sc; repaint( true ); } + void setAngle( double a ) { angle = a; repaint( true ); } protected: void drawContents( TQPainter* ); diff --git a/kpresenter/KPrTextProperty.cpp b/kpresenter/KPrTextProperty.cpp index 6708065b..fd794daa 100644 --- a/kpresenter/KPrTextProperty.cpp +++ b/kpresenter/KPrTextProperty.cpp @@ -23,7 +23,7 @@ #include "KPrTextProperty.h" #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kdebug.h> @@ -37,15 +37,15 @@ KPrTextProperty::KPrTextProperty( TQWidget *parent, const char *name, const Marg , m_unit( unit ) , m_protectContent( protectContent ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 1, 1, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( this, 1, 1, 11, 6 ); - tqlayout->addWidget( m_protectContentCheck = new TQCheckBox( i18n( "Protect content" ), this ), 0, 0 ); - tqlayout->addWidget( m_margins = new KPrMarginWidget( this, name, m_unit ), 1, 0 ); + layout->addWidget( m_protectContentCheck = new TQCheckBox( i18n( "Protect content" ), this ), 0, 0 ); + layout->addWidget( m_margins = new KPrMarginWidget( this, name, m_unit ), 1, 0 ); connect( m_protectContentCheck, TQT_SIGNAL( toggled ( bool ) ), this, TQT_SLOT( slotProtectContentChanged( bool ) ) ); - resize( TQSize( 301, 217 ).expandedTo( tqminimumSizeHint() ) ); + resize( TQSize( 301, 217 ).expandedTo( minimumSizeHint() ) ); m_margins->setValues( marginsStruct.leftMargin, marginsStruct.rightMargin, marginsStruct.topMargin, marginsStruct.bottomMargin ); diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp index a7fc0899..33a0e9ed 100644 --- a/kpresenter/KPrTransEffectDia.cpp +++ b/kpresenter/KPrTransEffectDia.cpp @@ -34,7 +34,7 @@ #include <tqheader.h> #include <tqwmatrix.h> #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqimage.h> #include <tqpushbutton.h> #include <tqcheckbox.h> @@ -105,7 +105,7 @@ void KPrEffectPreview::run( PageEffect effect, EffectSpeed speed ) delete m_pageEffect; m_pageEffect = 0; - TQLabel::tqrepaint(); + TQLabel::repaint(); } m_pageEffect = new KPrPageEffects( TQT_TQPAINTDEVICE(this), m_target, effect, speed ); @@ -160,8 +160,8 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name, // right-side of the dialog, for showing effect preview - TQVBoxLayout *righttqlayout = new TQVBoxLayout( rightpart, KDialog::marginHint(), KDialog::spacingHint() ); - righttqlayout->setAutoAdd( true ); + TQVBoxLayout *rightlayout = new TQVBoxLayout( rightpart, KDialog::marginHint(), KDialog::spacingHint() ); + rightlayout->setAutoAdd( true ); effectPreview = new KPrEffectPreview( rightpart, doc, view ); @@ -178,8 +178,8 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name, pageEffect = pg->getPageEffect(); speed = pg->getPageEffectSpeed(); - TQVBoxLayout *lefttqlayout = new TQVBoxLayout( leftpart, KDialog::marginHint(), KDialog::spacingHint() ); - lefttqlayout->setAutoAdd( true ); + TQVBoxLayout *leftlayout = new TQVBoxLayout( leftpart, KDialog::marginHint(), KDialog::spacingHint() ); + leftlayout->setAutoAdd( true ); new TQLabel( i18n("Effect:"), leftpart ); @@ -260,7 +260,7 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name, automaticPreview->setChecked( true ); TQWidget* previewspacer = new TQWidget( previewgrp ); - previewspacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, + previewspacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); previewButton = new TQPushButton( previewgrp ); @@ -314,7 +314,7 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name, connect( timeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(timeChanged(int)) ); TQWidget* rspacer = new TQWidget( rightpart ); - rspacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); + rspacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); TQWidget* lspacer = new TQWidget( leftpart ); lspacer->setMinimumSize( 10, spacingHint() ); @@ -386,7 +386,7 @@ static TQString getSoundFileFilter() if ( comma ) str += '\n'; comma = true; - str += TQString( i18n( "*.%1|%2 Files" ) ).tqarg( *it ).tqarg( (*it).upper() ); + str += TQString( i18n( "*.%1|%2 Files" ) ).arg( *it ).arg( (*it).upper() ); full += TQString( "*.") + (*it) + ' '; } diff --git a/kpresenter/KPrUtils.cpp b/kpresenter/KPrUtils.cpp index fa21141a..2cbf5dc6 100644 --- a/kpresenter/KPrUtils.cpp +++ b/kpresenter/KPrUtils.cpp @@ -383,7 +383,7 @@ TQString saveOasisTimer( int second ) //ISO8601 chapter 5.5.3.2 //TQDate doesn't encode it as this format. - TQString timeIso = TQString( "PT%1H%2M%3S" ).tqarg( hours ).tqarg( ms ).tqarg( sec ); + TQString timeIso = TQString( "PT%1H%2M%3S" ).arg( hours ).arg( ms ).arg( sec ); return timeIso; } diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index a86caa80..9958ac13 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -26,12 +26,12 @@ #include <tqpopupmenu.h> #include <tqcursor.h> #include <tqfileinfo.h> -#include <tqtextstream.h> +#include <textstream.h> #include <assert.h> #include <tqtoolbutton.h> #include <tqtooltip.h> #include <tqdir.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqradiobutton.h> #include <tqdragobject.h> #include <tqfile.h> @@ -410,23 +410,23 @@ KPrView::KPrView( KPrDocument* _doc, TQWidget *_parent, const char *_name ) if ( sb ) // No statusbar in e.g. konqueror { m_sbPageLabel = new KStatusBarLabel( TQString(), 0, sb ); - m_sbPageLabel->tqsetAlignment( AlignLeft | AlignVCenter ); + m_sbPageLabel->setAlignment( AlignLeft | AlignVCenter ); addStatusBarItem( m_sbPageLabel, 0 ); m_sbModifiedLabel = new KStatusBarLabel( " ", 0, sb ); - m_sbModifiedLabel->tqsetAlignment( AlignLeft | AlignVCenter ); + m_sbModifiedLabel->setAlignment( AlignLeft | AlignVCenter ); addStatusBarItem( m_sbModifiedLabel, 0 ); m_sbObjectLabel = new KStatusBarLabel( TQString(), 0, sb ); - m_sbObjectLabel->tqsetAlignment( AlignLeft | AlignVCenter ); + m_sbObjectLabel->setAlignment( AlignLeft | AlignVCenter ); addStatusBarItem( m_sbObjectLabel, 1 ); m_sbZoomLabel = new KStatusBarLabel( ' ' + TQString::number( m_pKPresenterDoc->zoomHandler()->zoom() ) + "% ", 0, sb ); - m_sbZoomLabel->tqsetAlignment( AlignHCenter | AlignVCenter ); + m_sbZoomLabel->setAlignment( AlignHCenter | AlignVCenter ); addStatusBarItem( m_sbZoomLabel, 0 ); m_sbUnitLabel = new KStatusBarLabel( ' ' + KoUnit::unitDescription( m_pKPresenterDoc->unit() ) + ' ', 0, sb ); - m_sbUnitLabel->tqsetAlignment( AlignHCenter | AlignVCenter ); + m_sbUnitLabel->setAlignment( AlignHCenter | AlignVCenter ); addStatusBarItem( m_sbUnitLabel, 0 ); } @@ -502,12 +502,12 @@ void KPrView::setupPrinter( KPrinter &prt ) prt.setFromTo( 1, m_pKPresenterDoc->getPageNums() ); prt.setOption( "kde-range", m_pKPresenterDoc->selectedForPrinting() ); prt.setPageSelection(KPrinter::ApplicationSide); - KoPageLayout tqlayout = m_pKPresenterDoc->pageLayout(); - prt.setOption( "kde-margin-top", TQString::number(tqlayout.ptTop) ); - prt.setOption( "kde-margin-bottom", TQString::number(tqlayout.ptBottom) ); - prt.setOption( "kde-margin-left", TQString::number(tqlayout.ptLeft) ); - prt.setOption( "kde-margin-right", TQString::number(tqlayout.ptRight) ); - KoFormat pageFormat = tqlayout.format; + KoPageLayout layout = m_pKPresenterDoc->pageLayout(); + prt.setOption( "kde-margin-top", TQString::number(layout.ptTop) ); + prt.setOption( "kde-margin-bottom", TQString::number(layout.ptBottom) ); + prt.setOption( "kde-margin-left", TQString::number(layout.ptLeft) ); + prt.setOption( "kde-margin-right", TQString::number(layout.ptRight) ); + KoFormat pageFormat = layout.format; prt.setPageSize( static_cast<KPrinter::PageSize>( KoPageFormat::printerPageSize( pageFormat ) ) ); if ( m_pKPresenterDoc->pageLayout().orientation == PG_LANDSCAPE || pageFormat == PG_SCREEN ) @@ -579,9 +579,9 @@ void KPrView::print( KPrinter &prt ) m_pKPresenterDoc->recalcVariables( VT_ALL ); } - m_canvas->tqrepaint(); + m_canvas->repaint(); kdDebug(33001) << "KPrView::print zoom&res reset" << endl; - m_pKPresenterDoc->getVariableCollection()->variableSetting()->setLastPrintingDate(TQDateTime::tqcurrentDateTime()); + m_pKPresenterDoc->getVariableCollection()->variableSetting()->setLastPrintingDate(TQDateTime::currentDateTime()); m_pKPresenterDoc->recalcVariables( VT_DATE ); } @@ -620,7 +620,7 @@ void KPrView::editPaste() if ( !m_canvas->currentTextObjectView() ) { m_canvas->setToolEditMode( TEM_MOUSE ); deSelectAllObjects(); - TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); if ( data->provides( "text/uri-list" ) ) { m_pKPresenterDoc->pastePage( data, currPg ); @@ -632,7 +632,7 @@ void KPrView::editPaste() { // TODO: it would be nice to have no offset when pasting onto a different page... m_canvas->activePage()->pasteObjs( - data->tqencodedData(KoStoreDrag::mimeType("application/x-kpresenter")), + data->encodedData(KoStoreDrag::mimeType("application/x-kpresenter")), 1, 0.0, 0.0, 0.0, 20.0, 20.0); m_canvas->setMouseSelectedObject(true); @@ -644,7 +644,7 @@ void KPrView::editPaste() //TODO : fix me !! // TODO: it would be nice to have no offset when pasting onto a different page... //m_canvas->activePage()->pasteObjs( - //data->tqencodedData(KoStoreDrag::mimeType("application/vnd.oasis.opendocument.presentation")), + //data->encodedData(KoStoreDrag::mimeType("application/vnd.oasis.opendocument.presentation")), //1, 0.0, 0.0, 0.0, 20.0, 20.0); m_canvas->setMouseSelectedObject(true); @@ -846,7 +846,7 @@ void KPrView::savePicture( const TQString& oldName, KoPicture& picture) if ( !KIO::NetAccess::upload( tempFile.name(), url, this ) ) { KMessageBox::sorry( this, i18n( - "Unable to save the file to '%1'. %2.").tqarg( url.prettyURL() ).tqarg( KIO::NetAccess::lastErrorString() ), + "Unable to save the file to '%1'. %2.").arg( url.prettyURL() ).arg( KIO::NetAccess::lastErrorString() ), i18n("Save Failed") ); } } @@ -857,7 +857,7 @@ void KPrView::savePicture( const TQString& oldName, KoPicture& picture) } else KMessageBox::sorry( this, i18n( - "Error during saving: could not create temporary file: %1.").tqarg( strerror( tempFile.status() ) ), + "Error during saving: could not create temporary file: %1.").arg( strerror( tempFile.status() ) ), i18n("Save Picture") ); } } @@ -1274,7 +1274,7 @@ void KPrView::extraShadow() if ( !shadowDia ) { shadowDia = new KPrShadowDialogImpl( this ); - shadowDia->resize( shadowDia->tqminimumSize() ); + shadowDia->resize( shadowDia->minimumSize() ); connect( shadowDia, TQT_SIGNAL( apply() ), TQT_TQOBJECT(this), TQT_SLOT( shadowOk() ) ); } @@ -1509,7 +1509,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ ) KProcess proc; proc << xdgScreenSaver; proc << "suspend"; - proc << TQString::number( tqtopLevelWidget()->winId() ); + proc << TQString::number( topLevelWidget()->winId() ); kdDebug() << k_funcinfo << proc.args() << endl; proc.start( KProcess::DontCare ); } else { @@ -1580,7 +1580,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ ) if ( !kPresenterDoc()->spManualSwitch() ) { m_autoPresStop = false; - m_pKPresenterDoc->tqrepaint( false ); + m_pKPresenterDoc->repaint( false ); if ( ! m_autoPresTimerConnected ) { connect( &m_autoPresTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( doAutomaticScreenPres() ) ); @@ -1633,7 +1633,7 @@ void KPrView::screenStop() KProcess proc; proc << xdgScreenSaver; proc << "resume"; - proc << TQString::number( tqtopLevelWidget()->winId() ); + proc << TQString::number( topLevelWidget()->winId() ); kdDebug() << k_funcinfo << proc.args() << endl; proc.start( KProcess::DontCare ); } else { @@ -1856,7 +1856,7 @@ void KPrView::slotApplyFont() void KPrView::slotCounterStyleSelected() { - TQString actionName = TQString::tqfromLatin1(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); + TQString actionName = TQString::fromLatin1(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); if ( actionName.startsWith( "counterstyle_" ) ) { TQString styleStr = actionName.mid(13); @@ -2175,7 +2175,7 @@ void KPrView::createGUI() // setup page pageBase = new PageBase( splitterVertical, this ); - pageBase->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + pageBase->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); m_canvas=new KPrCanvas( pageBase, "Canvas", this ); @@ -2414,7 +2414,7 @@ void KPrView::setupActions() actionToolsZoom->setExclusiveGroup( "tools" ); actionToolsShapePopup = new KActionMenu( i18n( "&Shape" ), "rectangle", - actionCollection(), "tools_tqshapepopup" ); + actionCollection(), "tools_shapepopup" ); actionToolsShapePopup->setDelayed(true); connect(actionToolsShapePopup, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(toolsShapePopup())); @@ -2597,7 +2597,7 @@ void KPrView::setupActions() // This approach allows to edit toolbars and extract separate actions from this menu KToggleAction* act = new KToggleAction( styleIt.current()->name(), /*TODO icon,*/ 0, TQT_TQOBJECT(this), TQT_SLOT( slotCounterStyleSelected() ), - actionCollection(), TQString("counterstyle_%1").tqarg( styleIt.current()->style() ).latin1() ); + actionCollection(), TQString("counterstyle_%1").arg( styleIt.current()->style() ).latin1() ); act->setExclusiveGroup( "counterstyle" ); // Add to the right menu: both for "none", bullet for bullets, numbers otherwise if ( styleIt.current()->style() == KoParagCounter::STYLE_NONE ) { @@ -3096,19 +3096,19 @@ void KPrView::setupActions() actionAlignVerticalTop = new KToggleAction( i18n( "Align Top" ), 0, TQT_TQOBJECT(this), TQT_SLOT( alignVerticalTop() ), actionCollection(), "align_top" ); - actionAlignVerticalTop->setExclusiveGroup( "vertical_tqalignment" ); + actionAlignVerticalTop->setExclusiveGroup( "vertical_alignment" ); actionAlignVerticalTop->setChecked( true ); actionAlignVerticalBottom = new KToggleAction( i18n( "Align Bottom" ), 0, TQT_TQOBJECT(this), TQT_SLOT( alignVerticalBottom() ), actionCollection(), "align_bottom" ); - actionAlignVerticalBottom->setExclusiveGroup( "vertical_tqalignment" ); + actionAlignVerticalBottom->setExclusiveGroup( "vertical_alignment" ); actionAlignVerticalCenter = new KToggleAction( i18n( "Align Middle" ), 0, TQT_TQOBJECT(this), TQT_SLOT( alignVerticalCenter() ), actionCollection(), "align_center" ); - actionAlignVerticalCenter->setExclusiveGroup( "vertical_tqalignment" ); + actionAlignVerticalCenter->setExclusiveGroup( "vertical_alignment" ); actionSavePicture= new KAction( i18n("Save Picture..."), 0, @@ -3491,8 +3491,8 @@ void KPrView::reorganize() if(kPresenterDoc()->showRuler()) { - int hSpace = v_ruler->tqminimumSizeHint().width(); - int vSpace = h_ruler->tqminimumSizeHint().height(); + int hSpace = v_ruler->minimumSizeHint().width(); + int vSpace = h_ruler->minimumSizeHint().height(); m_canvas->move( hSpace, vSpace ); if ( h_ruler ) @@ -3552,8 +3552,8 @@ void PageBase::resizeEvent( TQResizeEvent *e ) TQSize s = e ? e->size() : size(); if ( view->m_bShowGUI ) { - int hSpace = view->getVRuler()->tqminimumSizeHint().width(); - int vSpace = view->getVRuler()->tqminimumSizeHint().height(); + int hSpace = view->getVRuler()->minimumSizeHint().width(); + int vSpace = view->getVRuler()->minimumSizeHint().height(); view->m_canvas->resize( s.width() - ( hSpace + 16 ), s.height() - ( vSpace + 16 ) ); view->vert->setGeometry( s.width() - 16, 0, 16, s.height() - 32 ); @@ -3717,7 +3717,7 @@ void KPrView::setupPopupMenus() actionToolsLinePopup->insert(actionToolsCubicBezierCurve); actionToolsLinePopup->insert(actionToolsQuadricBezierCurve); - // create insert-tqshape popup + // create insert-shape popup actionToolsShapePopup->insert(actionToolsRectangle); actionToolsShapePopup->insert(actionToolsCircleOrEllipse); actionToolsShapePopup->insert(actionToolsPie); @@ -3778,8 +3778,8 @@ void KPrView::setupRulers() v_ruler = new KoRuler( pageBase, m_canvas, Qt::Vertical, kPresenterDoc()->pageLayout(), 0, kPresenterDoc()->unit() ); v_ruler->setReadWrite(kPresenterDoc()->isReadWrite()); - int hSpace = v_ruler->tqminimumSizeHint().width(); - int vSpace = h_ruler->tqminimumSizeHint().height(); + int hSpace = v_ruler->minimumSizeHint().width(); + int vSpace = h_ruler->minimumSizeHint().height(); m_canvas->resize( m_canvas->width() - hSpace, m_canvas->height() - vSpace ); m_canvas->move( hSpace, vSpace ); @@ -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->tqrepaint( FALSE ); + m_pKPresenterDoc->repaint( FALSE ); m_pKPresenterDoc->displayActivePage( page ); } @@ -4102,7 +4102,7 @@ void KPrView::updatePageInfo() { if (m_sbPageLabel) m_sbPageLabel->setText( TQString(" ") + - i18n("Slide %1/%2").tqarg(getCurrPgNum()).tqarg(m_pKPresenterDoc->getPageNums())+ + i18n("Slide %1/%2").arg(getCurrPgNum()).arg(m_pKPresenterDoc->getPageNums())+ TQString(" ") ); } @@ -4120,13 +4120,13 @@ void KPrView::updateObjectStatusBarItem() KPrObject * obj = m_canvas->getSelectedObj(); KoSize size = obj->getSize(); m_sbObjectLabel->setText( ' ' + i18n( "Statusbar info", "%1: %2, %3 - %4, %5 (width: %6, height: %7)" ) - .tqarg( /*frame->frameSet()->name()*/obj->getObjectName() ) - .tqarg( KoUnit::toUserStringValue( obj->getOrig().x(), unit ) ) - .tqarg( KoUnit::toUserStringValue( obj->getOrig().y() , unit) ) - .tqarg( KoUnit::toUserStringValue( obj->getOrig().x() + size.width(), unit ) ) - .tqarg( KoUnit::toUserStringValue( obj->getOrig().y() + size.height(), unit ) ) - .tqarg( KoUnit::toUserStringValue( size.width(), unit ) ) - .tqarg( KoUnit::toUserStringValue( size.height(), unit ) ) ); + .arg( /*frame->frameSet()->name()*/obj->getObjectName() ) + .arg( KoUnit::toUserStringValue( obj->getOrig().x(), unit ) ) + .arg( KoUnit::toUserStringValue( obj->getOrig().y() , unit) ) + .arg( KoUnit::toUserStringValue( obj->getOrig().x() + size.width(), unit ) ) + .arg( KoUnit::toUserStringValue( obj->getOrig().y() + size.height(), unit ) ) + .arg( KoUnit::toUserStringValue( size.width(), unit ) ) + .arg( KoUnit::toUserStringValue( size.height(), unit ) ) ); } else m_sbObjectLabel->setText( i18n("1 object selected", "%n objects selected", nbSelected) ); @@ -4206,7 +4206,7 @@ void KPrView::setEditMaster( bool editMaster ) if ( sidebar ) sidebar->setViewMasterPage( m_editMaster ); updateNoteBarText(); - m_canvas->tqrepaint( false ); + m_canvas->repaint( false ); } } @@ -4675,7 +4675,7 @@ void KPrView::spellCheckerMisspelling( const TQString &old, int pos ) kdDebug() << "KWView::spellCheckerMisspelling parag=" << parag->paragId() << " pos=" << pos << " length=" << old.length() << endl; - textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*tqrepaint*/ ); + textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*repaint*/ ); } void KPrView::spellCheckerCorrected( const TQString &old, int pos, const TQString &corr ) @@ -4694,7 +4694,7 @@ void KPrView::spellCheckerCorrected( const TQString &old, int pos, const TQStrin if ( !textdoc ) return; pos += m_spell.kospell->currentStartIndex(); - textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*tqrepaint*/ ); + textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*repaint*/ ); KoTextCursor cursor( textdoc ); cursor.setParag( parag ); @@ -4881,7 +4881,7 @@ void KPrView::refreshCustomMenu() if ( !lst.contains( varName) ) { lst.append( varName ); - TQCString name = TQString("custom-action_%1").tqarg(i).latin1(); + TQCString name = TQString("custom-action_%1").arg(i).latin1(); act = new KAction( varName, shortCuts[varName], TQT_TQOBJECT(this), TQT_SLOT( insertCustomVariable() ), actionCollection(), name ); @@ -4896,7 +4896,7 @@ void KPrView::refreshCustomMenu() actionInsertCustom->popupMenu()->insertSeparator(); act = new KAction( i18n("New..."), 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(), - TQString("custom-action_%1").tqarg(i).latin1() ); + TQString("custom-action_%1").arg(i).latin1() ); act->setGroup( "custom-variable-action" ); actionInsertCustom->insert( act ); @@ -5067,7 +5067,7 @@ void KPrView::slotUpdateRuler() if( getHRuler()->flags()!= flags ) { getHRuler()->changeFlags(flags); - getHRuler()->tqrepaint(); + getHRuler()->repaint(); } } if( getVRuler()) @@ -5075,7 +5075,7 @@ void KPrView::slotUpdateRuler() if( getVRuler()->flags() != 0 ) { getVRuler()->changeFlags(0); - getVRuler()->tqrepaint(); + getVRuler()->repaint(); } } } @@ -5244,22 +5244,22 @@ void KPrView::changeZoomMenu( int zoom ) qHeapSort( list ); for (TQValueList<int>::Iterator it = list.begin() ; it != list.end() ; ++it) - lst.append( i18n("%1%").tqarg(*it) ); + lst.append( i18n("%1%").arg(*it) ); } else { - lst << i18n("%1%").tqarg("33"); - lst << i18n("%1%").tqarg("50"); - lst << i18n("%1%").tqarg("75"); - lst << i18n("%1%").tqarg("100"); - lst << i18n("%1%").tqarg("125"); - lst << i18n("%1%").tqarg("150"); - lst << i18n("%1%").tqarg("200"); - lst << i18n("%1%").tqarg("250"); - lst << i18n("%1%").tqarg("350"); - lst << i18n("%1%").tqarg("400"); - lst << i18n("%1%").tqarg("450"); - lst << i18n("%1%").tqarg("500"); + lst << i18n("%1%").arg("33"); + lst << i18n("%1%").arg("50"); + lst << i18n("%1%").arg("75"); + lst << i18n("%1%").arg("100"); + lst << i18n("%1%").arg("125"); + lst << i18n("%1%").arg("150"); + lst << i18n("%1%").arg("200"); + lst << i18n("%1%").arg("250"); + lst << i18n("%1%").arg("350"); + lst << i18n("%1%").arg("400"); + lst << i18n("%1%").arg("450"); + lst << i18n("%1%").arg("500"); } actionViewZoom->setItems( lst ); } @@ -5267,7 +5267,7 @@ void KPrView::changeZoomMenu( int zoom ) void KPrView::showZoom( int zoom ) { TQStringList list = actionViewZoom->items(); - TQString zoomStr( i18n("%1%").tqarg( zoom ) ); + TQString zoomStr( i18n("%1%").arg( zoom ) ); int pos = list.findIndex(zoomStr); if( pos == -1) { @@ -5315,7 +5315,7 @@ void KPrView::viewZoom( const TQString &s ) } m_canvas->setFocus(); - m_canvas->tqrepaint(); + m_canvas->repaint(); } void KPrView::setZoomRect( const KoRect & rect ) @@ -5331,7 +5331,7 @@ void KPrView::setZoomRect( const KoRect & rect ) m_canvas->setToolEditMode( TEM_MOUSE ); m_canvas->scrollTopLeftPoint( zoomHandler()->zoomPoint( rect.topLeft() ) ); m_canvas->setUpdatesEnabled( true ); - m_canvas->tqrepaint(); + m_canvas->repaint(); } void KPrView::setZoom( int zoom, bool updateViews ) @@ -5360,8 +5360,8 @@ KoTextZoomHandler *KPrView::zoomHandler() const void KPrView::slotViewFormattingChars() { m_pKPresenterDoc->setViewFormattingChars(actionViewFormattingChars->isChecked()); - m_pKPresenterDoc->tqlayout(); // Due to the different formatting when this option is activated - m_pKPresenterDoc->tqrepaint(false); + m_pKPresenterDoc->layout(); // Due to the different formatting when this option is activated + m_pKPresenterDoc->repaint(false); } void KPrView::setPageDuration( int _pgNum ) @@ -5647,7 +5647,7 @@ void KPrView::viewGuideLines() m_pKPresenterDoc->updateGuideLineButton(); deSelectAllObjects(); refreshRuler( state ); - m_pKPresenterDoc->tqrepaint(false); + m_pKPresenterDoc->repaint(false); } @@ -5656,7 +5656,7 @@ void KPrView::viewGrid() m_pKPresenterDoc->setShowGrid( actionViewShowGrid->isChecked() ); m_pKPresenterDoc->setModified( true ); m_pKPresenterDoc->updateGridButton(); - m_pKPresenterDoc->tqrepaint(false); + m_pKPresenterDoc->repaint(false); } @@ -5681,7 +5681,7 @@ void KPrView::refreshRuler( bool state ) if ( !m_pKPresenterDoc->isReadWrite()) { getHRuler()->changeFlags(KoRuler::F_NORESIZE); - getHRuler()->tqrepaint(); + getHRuler()->repaint(); } else { @@ -5690,7 +5690,7 @@ void KPrView::refreshRuler( bool state ) if( getHRuler()->flags() != KoRuler::F_HELPLINES ) { getHRuler()->changeFlags(KoRuler::F_HELPLINES); - getHRuler()->tqrepaint(); + getHRuler()->repaint(); } } else @@ -5698,7 +5698,7 @@ void KPrView::refreshRuler( bool state ) if( getHRuler()->flags() != 0 ) { getHRuler()->changeFlags( 0 ); - getHRuler()->tqrepaint(); + getHRuler()->repaint(); } } } @@ -5709,7 +5709,7 @@ void KPrView::refreshRuler( bool state ) if ( !m_pKPresenterDoc->isReadWrite()) { getVRuler()->changeFlags(KoRuler::F_NORESIZE); - getVRuler()->tqrepaint(); + getVRuler()->repaint(); } else { @@ -5718,7 +5718,7 @@ void KPrView::refreshRuler( bool state ) if( getVRuler()->flags() != KoRuler::F_HELPLINES ) { getVRuler()->changeFlags(KoRuler::F_HELPLINES); - getVRuler()->tqrepaint(); + getVRuler()->repaint(); } } else @@ -5726,7 +5726,7 @@ void KPrView::refreshRuler( bool state ) if( getVRuler()->flags()!= 0) { getVRuler()->changeFlags(0); - getVRuler()->tqrepaint(); + getVRuler()->repaint(); } } } @@ -5889,7 +5889,7 @@ void KPrView::slotObjectEditChanged() KoParagCounter counter; if(paragLayout->counter) counter = *(paragLayout->counter); - int align = paragLayout->tqalignment; + int align = paragLayout->alignment; if ( align == TQt::AlignAuto ) align = TQt::AlignLeft; // ## seems hard to detect RTL here alignChanged( align ); @@ -5964,11 +5964,11 @@ void KPrView::duplicateObj() m_canvas->copyObjs(); m_canvas->setToolEditMode( TEM_MOUSE ); deSelectAllObjects(); - TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); TQCString clip_str = KoStoreDrag::mimeType("application/x-kpresenter"); if ( data->provides( clip_str ) ) { - m_canvas->activePage()->pasteObjs( data->tqencodedData(clip_str), + m_canvas->activePage()->pasteObjs( data->encodedData(clip_str), nbCopy, angle, increaseX,increaseY, moveX, moveY ); m_canvas->setMouseSelectedObject(true); emit objectSelectedChanged(); @@ -6224,7 +6224,7 @@ void KPrView::updateRulerInProtectContentMode() getHRuler()->changeFlags(KoRuler::F_INDENTS | KoRuler::F_TABS); else getHRuler()->changeFlags(0); - getHRuler()->tqrepaint(); + getHRuler()->repaint(); } } diff --git a/kpresenter/KPrView.h b/kpresenter/KPrView.h index 1fc3cc7e..f00b7e2d 100644 --- a/kpresenter/KPrView.h +++ b/kpresenter/KPrView.h @@ -1172,7 +1172,7 @@ private: CurrentLineTool m_currentLineTool; - // store the currently selected tqshape-tool + // store the currently selected shape-tool enum CurrentShapeTool { StRectangle = 1, StCircle = 2, diff --git a/kpresenter/KPrViewIface.cpp b/kpresenter/KPrViewIface.cpp index 6f8aa314..49c2d887 100644 --- a/kpresenter/KPrViewIface.cpp +++ b/kpresenter/KPrViewIface.cpp @@ -642,9 +642,9 @@ TQStringList KPrViewIface::exportPage( int _nPage, // see http://www.indeview.org for details. // Note: We use the 1-based page number as fallback page title. res << TQString("Name=%1") - .tqarg( page->pageTitle( TQString("Page%1").tqarg(_nPage) ) ); + .arg( page->pageTitle( TQString("Page%1").arg(_nPage) ) ); res << TQString("Notes=%1") - .tqarg( page->noteText() ); + .arg( page->noteText() ); } } } diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp index 2197cf32..5641c6cd 100644 --- a/kpresenter/KPrWebPresentation.cpp +++ b/kpresenter/KPrWebPresentation.cpp @@ -33,7 +33,7 @@ #include <ktempfile.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqvbox.h> #include <tqhbox.h> #include <tqlabel.h> @@ -46,10 +46,10 @@ #include <tqdir.h> #include <tqheader.h> #include <tqwmatrix.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqregexp.h> #include <tqimage.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwhatsthis.h> #include <tqcheckbox.h> @@ -87,7 +87,7 @@ static TQString EscapeSgmlText(const TQTextCodec* codec, const TQString& strIn, for (uint i=0; i<strIn.length(); i++) { ch=strIn[i]; - switch (ch.tqunicode()) + switch (ch.unicode()) { case 38: // & { @@ -129,7 +129,7 @@ static TQString EscapeSgmlText(const TQTextCodec* codec, const TQString& strIn, { if (!codec->canEncode(ch)) { - strReturn+=TQString("&#%1;").tqarg(ch.tqunicode()); + strReturn+=TQString("&#%1;").arg(ch.unicode()); break; } } @@ -156,7 +156,7 @@ static TQString EscapeEncodingOnly(const TQTextCodec* codec, const TQString& str { if (!codec->canEncode(ch)) { - strReturn+=TQString("&#%1;").tqarg(ch.tqunicode()); + strReturn+=TQString("&#%1;").arg(ch.unicode()); continue; } } @@ -211,7 +211,7 @@ void KPrWebPresentation::loadConfig() if ( num <= slideInfos.count() ) { for ( unsigned int i = 0; i < num; i++ ) { - TQString key = TQString::tqfromLatin1( "SlideTitle%1" ).tqarg( i ); + TQString key = TQString::fromLatin1( "SlideTitle%1" ).arg( i ); if ( cfg.hasKey( key ) ) { // We'll assume that the selected pages haven't changed... Hmm. @@ -245,7 +245,7 @@ void KPrWebPresentation::saveConfig() cfg.writeEntry( "Slides", slideInfos.count() ); for ( unsigned int i = 0; i < slideInfos.count(); i++ ) - cfg.writeEntry( TQString::tqfromLatin1( "SlideTitle%1" ).tqarg( i ), slideInfos[ i ].slideTitle ); + cfg.writeEntry( TQString::fromLatin1( "SlideTitle%1" ).arg( i ), slideInfos[ i ].slideTitle ); cfg.writeEntry( "BackColor", backColor ); cfg.writeEntry( "TitleColor", titleColor ); @@ -310,7 +310,7 @@ void KPrWebPresentation::createSlidesPictures( KProgress *progressBar ) for ( unsigned int i = 0; i < slideInfos.count(); i++ ) { int pgNum = slideInfos[i].pageNumber; view->getCanvas()->drawPageInPix( pix, pgNum, zoom, true /*force real variable value*/ ); - filename = TQString( "%1/pics/slide_%2.png" ).tqarg( path ).tqarg( i + 1 ); + filename = TQString( "%1/pics/slide_%2.png" ).arg( path ).arg( i + 1 ); KTempFile tmp; pix.save( tmp.name(), "PNG" ); @@ -395,8 +395,8 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar ) unsigned int pgNum = i + 1; // pgquiles # elpauer . org - I think this is a bug, seems to be an overflow if we have max_unsigned_int slides KTempFile tmp; - TQString dest= TQString( "%1/html/slide_%2.html" ).tqarg( path ).tqarg( pgNum ); - TQString next= TQString( "slide_%2.html" ).tqarg( pgNum<slideInfos.count() ? pgNum+1 : (m_bLoopSlides ? 1 : pgNum ) ); // Ugly, but it works + TQString dest= TQString( "%1/html/slide_%2.html" ).arg( path ).arg( pgNum ); + TQString next= TQString( "slide_%2.html" ).arg( pgNum<slideInfos.count() ? pgNum+1 : (m_bLoopSlides ? 1 : pgNum ) ); // Ugly, but it works TQFile file( tmp.name() ); file.open( IO_WriteOnly ); @@ -480,7 +480,7 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar ) streamOut << "<a href=\"" << next << "\">"; streamOut << "<img src=\"../pics/slide_" << pgNum << ".png\" border=\"0\" alt=\"" - << i18n( "Slide %1" ).tqarg( pgNum ) << "\"" << ( isXML() ?" /":"") << ">"; + << i18n( "Slide %1" ).arg( pgNum ) << "\"" << ( isXML() ?" /":"") << ">"; if ( i < slideInfos.count() - 1 ) streamOut << "</a>"; @@ -509,9 +509,9 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar ) if (email.isEmpty()) htmlAuthor=escapeHtmlText( codec, author ); else - htmlAuthor=TQString("<a href=\"mailto:%1\">%2</a>").tqarg( escapeHtmlText( codec, email )).tqarg( escapeHtmlText( codec, author )); + htmlAuthor=TQString("<a href=\"mailto:%1\">%2</a>").arg( escapeHtmlText( codec, email )).arg( escapeHtmlText( codec, author )); streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by <i>%2</i> with <a href=\"http://www.koffice.org/kpresenter\">KPresenter</a>" ) - .tqarg( KGlobal::locale()->formatDate ( TQDate::tqcurrentDate() ) ).tqarg( htmlAuthor ) ); + .arg( KGlobal::locale()->formatDate ( TQDate::currentDate() ) ).arg( htmlAuthor ) ); streamOut << " </center><hr noshade=\"noshade\"" << ( isXML() ?" /":"") << ">\n"; } @@ -532,7 +532,7 @@ void KPrWebPresentation::createMainPage( KProgress *progressBar ) { TQTextCodec *codec = KGlobal::charsets()->codecForName( m_encoding ); KTempFile tmp; - TQString dest = TQString( "%1/index.html" ).tqarg( path ); + TQString dest = TQString( "%1/index.html" ).arg( path ); TQFile file( tmp.name() ); file.open( IO_WriteOnly ); TQTextStream streamOut( &file ); @@ -560,9 +560,9 @@ void KPrWebPresentation::createMainPage( KProgress *progressBar ) // footer: author name, e-mail TQString htmlAuthor = email.isEmpty() ? escapeHtmlText( codec, author ) : - TQString("<a href=\"mailto:%1\">%2</a>").tqarg( escapeHtmlText( codec, email )).tqarg( escapeHtmlText( codec, author )); + TQString("<a href=\"mailto:%1\">%2</a>").arg( escapeHtmlText( codec, email )).arg( escapeHtmlText( codec, author )); streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by <i>%2</i> with <a href=\"http://www.koffice.org/kpresenter\">KPresenter</a>" ) - .tqarg( KGlobal::locale()->formatDate ( TQDate::tqcurrentDate() ) ).tqarg( htmlAuthor ) ); + .arg( KGlobal::locale()->formatDate ( TQDate::currentDate() ) ).arg( htmlAuthor ) ); streamOut << "</body>\n</html>\n"; file.close(); @@ -664,63 +664,63 @@ void KPrWebPresentationWizard::setupPage1() sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png")); TQWidget* canvas = new TQWidget( page1 ); - TQGridLayout *tqlayout = new TQGridLayout( canvas, 7, 2, + TQGridLayout *layout = new TQGridLayout( canvas, 7, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *helptext = new TQLabel( canvas ); - helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignTop| TQt::AlignLeft ); + helptext->setAlignment( TQt::WordBreak | TQt::AlignTop| TQt::AlignLeft ); helptext->setText( i18n( "Enter your name, email address and " "the title of the web presentation. " "Also enter the output directory where the " "web presentation should be saved. " ) ); - tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); + layout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); - tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); + layout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); TQLabel *label1 = new TQLabel( i18n("Author:"), canvas ); - label1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); TQWhatsThis::add( label1, i18n("This is where you enter the name of the person or " "organization that should be named as the author of " "the presentation.") ); - tqlayout->addWidget( label1, 2, 0 ); + layout->addWidget( label1, 2, 0 ); TQLabel *label2 = new TQLabel( i18n("Title:"), canvas ); - label2->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + label2->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); TQWhatsThis::add( label2, i18n("This is where you enter the title of the overall " "presentation." ) ); - tqlayout->addWidget( label2, 3, 0 ); + layout->addWidget( label2, 3, 0 ); TQLabel *label3 = new TQLabel( i18n("Email address:"), canvas ); - label3->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + label3->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); TQWhatsThis::add( label3, i18n("This is where you enter the email address of the " "person or organization that is responsible for " "the presentation.") ); - tqlayout->addWidget( label3, 4, 0 ); + layout->addWidget( label3, 4, 0 ); TQLabel *label4 = new TQLabel( i18n("Path:"), canvas ); - label4->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + label4->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); TQWhatsThis::add( label4, i18n("The value entered for the path is the directory " "where the presentation will be saved. If it does " "not exist, you'll be asked if you want to create " "the directory or abort the creation.") ); - tqlayout->addWidget( label4, 5, 0 ); + layout->addWidget( label4, 5, 0 ); author = new KLineEdit( webPres.getAuthor(), canvas ); TQWhatsThis::add( author, i18n("This is where you enter the name of the person or " "organization that should be named as the author of " "the presentation.") ); - tqlayout->addWidget( author, 2, 1 ); + layout->addWidget( author, 2, 1 ); title = new KLineEdit( webPres.getTitle(), canvas ); TQWhatsThis::add( title, i18n("This is where you enter the title of the overall " "presentation." ) ); - tqlayout->addWidget( title, 3, 1 ); + layout->addWidget( title, 3, 1 ); email = new KLineEdit( webPres.getEmail(), canvas ); TQWhatsThis::add( email, i18n("This is where you enter the email address of the " "person or organization that is responsible for " "the presentation.") ); - tqlayout->addWidget( email, 4, 1 ); + layout->addWidget( email, 4, 1 ); path=new KURLRequester( canvas ); path->setMode( KFile::Directory); @@ -729,11 +729,11 @@ void KPrWebPresentationWizard::setupPage1() "where the presentation will be saved. If it does " "not exist, you'll be asked if you want to create " "the directory or abort the creation.") ); - tqlayout->addWidget( path, 5, 1 ); + layout->addWidget( path, 5, 1 ); TQSpacerItem* spacer = new TQSpacerItem( 1, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout->addMultiCell( spacer, 6, 6, 0, 1 ); + layout->addMultiCell( spacer, 6, 6, 0, 1 ); connect(path, TQT_SIGNAL(textChanged(const TQString&)), this,TQT_SLOT(slotChoosePath(const TQString&))); @@ -762,43 +762,43 @@ void KPrWebPresentationWizard::setupPage2() sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png")); TQWidget* canvas = new TQWidget( page2 ); - TQGridLayout *tqlayout = new TQGridLayout( canvas, 6, 2, + TQGridLayout *layout = new TQGridLayout( canvas, 6, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *helptext = new TQLabel( canvas ); - helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft ); + helptext->setAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft ); TQString help = i18n("Here you can configure the style of the web pages."); help += i18n( "You can also specify the zoom for the slides." ); helptext->setText(help); - tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); + layout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); - tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); + layout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); TQLabel *label1 = new TQLabel( i18n("Zoom:"), canvas ); - label1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); TQWhatsThis::add( label1, i18n( "This selection allows you to specify " "the size of the slide image." ) ); - tqlayout->addWidget( label1, 2, 0 ); + layout->addWidget( label1, 2, 0 ); TQLabel *label2 = new TQLabel( i18n( "Encoding:" ), canvas ); - label2->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + label2->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); - tqlayout->addWidget( label2, 3, 0 ); + layout->addWidget( label2, 3, 0 ); TQLabel *label3 = new TQLabel( i18n( "Document type:" ), canvas ); - label3->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); - tqlayout->addWidget( label3, 4, 0 ); + label3->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); + layout->addWidget( label3, 4, 0 ); zoom = new KIntNumInput( webPres.getZoom(), canvas ); TQWhatsThis::add( zoom, i18n( "This selection allows you to specify " "the size of the slide image." ) ); - tqlayout->addWidget( zoom, 2, 1 ); + layout->addWidget( zoom, 2, 1 ); zoom->setSuffix( " %" ); zoom->setRange( 25, 1000, 5 ); encoding = new KComboBox( false, canvas ); - tqlayout->addWidget( encoding, 3, 1 ); + layout->addWidget( encoding, 3, 1 ); // Fill encoding combo // Stolen from tdelibs/kate/part/katedialogs.cpp @@ -819,7 +819,7 @@ void KPrWebPresentationWizard::setupPage2() } doctype = new KComboBox( false, canvas ); - tqlayout->addWidget( doctype, 4, 1 ); + layout->addWidget( doctype, 4, 1 ); doctype->insertItem( "HTML 4.01", -1 ); doctype->insertItem( "XHTML 1.0", -1 ); @@ -827,7 +827,7 @@ void KPrWebPresentationWizard::setupPage2() TQSpacerItem* spacer = new TQSpacerItem( 1, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout->addMultiCell( spacer, 5, 5, 0, 1 ); + layout->addMultiCell( spacer, 5, 5, 0, 1 ); addPage( page2, i18n( "Step 2: Configure HTML" ) ); @@ -852,40 +852,40 @@ void KPrWebPresentationWizard::setupPage3() sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png")); TQWidget* canvas = new TQWidget( page3 ); - TQGridLayout *tqlayout = new TQGridLayout( canvas, 6, 2, + TQGridLayout *layout = new TQGridLayout( canvas, 6, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *helptext = new TQLabel( canvas ); - helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft ); + helptext->setAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft ); helptext->setText( i18n( "Now you can customize the colors of the web pages." ) ); - tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); + layout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); - tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); + layout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); TQLabel *label1 = new TQLabel( i18n("Text color:"), canvas ); - label1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); - tqlayout->addWidget( label1, 2, 0 ); + label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); + layout->addWidget( label1, 2, 0 ); TQLabel *label2 = new TQLabel( i18n("Title color:"), canvas ); - label2->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); - tqlayout->addWidget( label2, 3, 0 ); + label2->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); + layout->addWidget( label2, 3, 0 ); TQLabel *label3 = new TQLabel( i18n("Background color:"), canvas ); - label3->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); - tqlayout->addWidget( label3, 4, 0 ); + label3->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); + layout->addWidget( label3, 4, 0 ); textColor = new KColorButton( webPres.getTextColor(), canvas ); - tqlayout->addWidget( textColor, 2, 1 ); + layout->addWidget( textColor, 2, 1 ); titleColor = new KColorButton( webPres.getTitleColor(), canvas ); - tqlayout->addWidget( titleColor, 3, 1 ); + layout->addWidget( titleColor, 3, 1 ); backColor = new KColorButton( webPres.getBackColor(), canvas ); - tqlayout->addWidget( backColor, 4, 1 ); + layout->addWidget( backColor, 4, 1 ); TQSpacerItem* spacer = new TQSpacerItem( 1, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout->addMultiCell( spacer, 5, 5, 0, 1 ); + layout->addMultiCell( spacer, 5, 5, 0, 1 ); addPage( page3, i18n( "Step 3: Customize Colors" ) ); @@ -909,11 +909,11 @@ void KPrWebPresentationWizard::setupPage4() sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png")); TQWidget* canvas = new TQWidget( page4 ); - TQGridLayout *tqlayout = new TQGridLayout( canvas, 3, 2, + TQGridLayout *layout = new TQGridLayout( canvas, 3, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *helptext = new TQLabel( canvas ); - helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft ); + helptext->setAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft ); helptext->setText( i18n( "Here you can specify titles for " "each slide. Click on a slide in " "the list and then enter the title " @@ -921,19 +921,19 @@ void KPrWebPresentationWizard::setupPage4() "click on a title, KPresenter " "mainview will display the slide.") ); - tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); + layout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); TQLabel *label = new TQLabel( i18n( "Slide title:" ), canvas ); - label->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); - tqlayout->addWidget( label, 1, 0 ); + label->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); + layout->addWidget( label, 1, 0 ); slideTitle = new KLineEdit( canvas ); - tqlayout->addWidget( slideTitle, 1, 1 ); + layout->addWidget( slideTitle, 1, 1 ); connect( slideTitle, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slideTitleChanged( const TQString & ) ) ); slideTitles = new KListView( canvas ); - tqlayout->addMultiCellWidget( slideTitles, 2, 2, 0, 1 ); + layout->addMultiCellWidget( slideTitles, 2, 2, 0, 1 ); slideTitles->addColumn( i18n( "No." ) ); slideTitles->addColumn( i18n( "Slide Title" ) ); connect( slideTitles, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, @@ -977,60 +977,60 @@ void KPrWebPresentationWizard::setupPage5() sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png")); TQWidget* canvas = new TQWidget( page5 ); - TQGridLayout *tqlayout = new TQGridLayout( canvas, 6, 2, + TQGridLayout *layout = new TQGridLayout( canvas, 6, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *helptext = new TQLabel( canvas ); - helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft ); + helptext->setAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft ); TQString help = i18n("Here you can configure some options for unattended " "presentations, such as time elapsed before automatically advance to " "the next slide, looping and the presence of headers."); helptext->setText(help); - tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); + layout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); - tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); + layout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); TQLabel *label1 = new TQLabel( i18n("Advance after:"), canvas ); - label1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); TQWhatsThis::add( label1, i18n( "This selection allows you to specify " "the time between slides." ) ); - tqlayout->addWidget( label1, 2, 0 ); + layout->addWidget( label1, 2, 0 ); timeBetweenSlides = new KIntNumInput( webPres.getTimeBetweenSlides(), canvas ); timeBetweenSlides->setSpecialValueText(i18n( "Disabled" )); TQWhatsThis::add( timeBetweenSlides, i18n( "This selection allows you to specify " "the time between slides." ) ); - tqlayout->addWidget( timeBetweenSlides, 2, 1 ); + layout->addWidget( timeBetweenSlides, 2, 1 ); timeBetweenSlides->setSuffix( " seconds" ); timeBetweenSlides->setRange( 0, 900, 1 ); - tqlayout->addMultiCell( new TQSpacerItem( 1, 10 ), 1, 1, 0, 1 ); + layout->addMultiCell( new TQSpacerItem( 1, 10 ), 1, 1, 0, 1 ); writeHeader=new TQCheckBox( i18n("Write header to the slides"), canvas); TQWhatsThis::add( writeHeader, i18n( "This checkbox allows you to specify if you " "want to write the navigation buttons on top " "of the slide." ) ); writeHeader->setChecked( webPres.wantHeader() ); - tqlayout->addWidget( writeHeader, 3, 1); + layout->addWidget( writeHeader, 3, 1); writeFooter=new TQCheckBox( i18n("Write footer to the slides"), canvas); TQWhatsThis::add( writeFooter, i18n( "This checkbox allows you to specify if you " "want to write an imprint consisting on the author " "and the software used to create these slides." ) ); writeFooter->setChecked( webPres.wantFooter() ); - tqlayout->addWidget( writeFooter, 4, 1); + layout->addWidget( writeFooter, 4, 1); loopSlides=new TQCheckBox( i18n("Loop presentation"), canvas); TQWhatsThis::add( loopSlides, i18n( "This checkbox allows you to specify if you " "want the presentation to start again once " "the latest slide is reached." ) ); loopSlides->setChecked( webPres.wantLoopSlides() ); - tqlayout->addWidget( loopSlides, 5, 1); + layout->addWidget( loopSlides, 5, 1); TQSpacerItem* spacer = new TQSpacerItem( 1, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout->addMultiCell( spacer, 5, 5, 0, 1 ); + layout->addMultiCell( spacer, 5, 5, 0, 1 ); addPage( page5, i18n( "Step 5: Options for Unattended Presentations" ) ); @@ -1081,7 +1081,7 @@ void KPrWebPresentationWizard::pageChanged() { TQString msg = i18n( "<qt>The directory <b>%1</b> does not exist.<br>" "Do you want create it?</qt>" ); - if( KMessageBox::questionYesNo( this, msg.tqarg( pathname ), + if( KMessageBox::questionYesNo( this, msg.arg( pathname ), i18n( "Directory Not Found" ) ) == KMessageBox::Yes) { diff --git a/kpresenter/autoformEdit/AFChoose.cpp b/kpresenter/autoformEdit/AFChoose.cpp index ccbfc0e8..d33675ab 100644 --- a/kpresenter/autoformEdit/AFChoose.cpp +++ b/kpresenter/autoformEdit/AFChoose.cpp @@ -22,7 +22,7 @@ #include <tqlabel.h> #include <tqvbox.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdir.h> #include <tqwhatsthis.h> @@ -86,7 +86,7 @@ void AFChoose::setupTabs() for (grpPtr=groupList.first();grpPtr != 0;grpPtr=groupList.next()) { grpPtr->tab = new TQVBox(this); - TQWhatsThis::add(grpPtr->tab, i18n( "Choose a predefined tqshape by clicking on it then clicking the OK button (or just double-click on the tqshape). You can then insert the tqshape onto your slide by drawing the area with the mouse pointer." ) ); + TQWhatsThis::add(grpPtr->tab, i18n( "Choose a predefined shape by clicking on it then clicking the OK button (or just double-click on the shape). You can then insert the shape onto your slide by drawing the area with the mouse pointer." ) ); grpPtr->loadWid = new KIconCanvas(grpPtr->tab); // Changes for the new KIconCanvas (Werner) TQDir d( grpPtr->dir.absFilePath() ); @@ -137,7 +137,7 @@ void AFChoose::setupTabs() continue; // Invalid .desktop file } } - grpPtr->loadWid->setBackgroundColor(tqcolorGroup().base()); + grpPtr->loadWid->setBackgroundColor(colorGroup().base()); grpPtr->loadWid->setResizeMode(TQIconView::Adjust); grpPtr->loadWid->sort(); connect(grpPtr->loadWid,TQT_SIGNAL(nameChanged(TQString)), @@ -148,7 +148,7 @@ void AFChoose::setupTabs() TQT_SLOT(slotDoubleClick())); grpPtr->label = new TQLabel(grpPtr->tab); grpPtr->label->setText(" "); - grpPtr->label->setMaximumHeight(grpPtr->label->tqsizeHint().height()); + grpPtr->label->setMaximumHeight(grpPtr->label->sizeHint().height()); addTab(grpPtr->tab,grpPtr->name); } } diff --git a/kpresenter/autoformEdit/ATFInterpreter.cpp b/kpresenter/autoformEdit/ATFInterpreter.cpp index 5f010518..0f01368a 100644 --- a/kpresenter/autoformEdit/ATFInterpreter.cpp +++ b/kpresenter/autoformEdit/ATFInterpreter.cpp @@ -199,7 +199,7 @@ TQPointArray ATFInterpreter::getPointArray(int wid,int heig) if (i == 14) py = tmp; } } - pntArray.setPoint(coordList.tqat(),px,py); + pntArray.setPoint(coordList.at(),px,py); } } return pntArray; @@ -239,7 +239,7 @@ void ATFInterpreter::interpret() for (TQStringList::Iterator it=lines.begin(); it!=lines.end(); ++it) { - if (!(*it).isEmpty() && (*it).tqat(0) != COMMENT) + if (!(*it).isEmpty() && (*it).at(0) != COMMENT) { if (level.top() == LEVEL_NULL) { @@ -265,7 +265,7 @@ void ATFInterpreter::interpret() } else if (level.top() == LEVEL_X || level.top() == LEVEL_Y || level.top() == LEVEL_ATTR) { - switch (((*it).tqat(0)).latin1()) + switch (((*it).at(0)).latin1()) { case VAR_1: { @@ -310,7 +310,7 @@ void ATFInterpreter::interpret() } break; case VAR_PW: { - pw = 1; pw = ((*it).tqat(4)).latin1() - 48; + pw = 1; pw = ((*it).at(4)).latin1() - 48; attrib.pwDiv = (*it); } break; case '}': @@ -363,10 +363,10 @@ TQPtrList<ATFInterpreter::Sign> ATFInterpreter::getVar(const TQString &s) for (unsigned int i=1; i<s.length(); ++i) { - if(s.tqat(i)==' ') + if(s.at(i)==' ') continue; signPtr = new Sign; - switch (s.tqat(i).latin1()) + switch (s.at(i).latin1()) { case VAR_W: signPtr->type = ST_WIDTH; break; case VAR_H: signPtr->type = ST_HEIGHT; break; @@ -431,20 +431,20 @@ TQPtrList<ATFInterpreter::Sign> ATFInterpreter::getVar(const TQString &s) signPtr->type = ST_NUMBER; if (s.length() - 1 > i) { - switch (s.tqat(i+1).latin1()) + switch (s.at(i+1).latin1()) { case NUM_0: case NUM_1: case NUM_2: case NUM_3: case NUM_4: case NUM_5: case NUM_6: case NUM_7: case NUM_8: case NUM_9: { - signPtr->num = (s.tqat(i).latin1() - 48) * 10 + s.tqat(i+1).latin1() - 48; + signPtr->num = (s.at(i).latin1() - 48) * 10 + s.at(i+1).latin1() - 48; i++; } break; default: - signPtr->num = s.tqat(i).latin1() - 48; break; + signPtr->num = s.at(i).latin1() - 48; break; } } else - signPtr->num = s.tqat(i).latin1() - 48; + signPtr->num = s.at(i).latin1() - 48; } break; } list.append(signPtr); diff --git a/kpresenter/generalpropertyui.ui b/kpresenter/generalpropertyui.ui index eec430f1..0dad8b48 100644 --- a/kpresenter/generalpropertyui.ui +++ b/kpresenter/generalpropertyui.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/kpresenter/gradientpropertyui.ui b/kpresenter/gradientpropertyui.ui index bc7f0707..b0ccae0a 100644 --- a/kpresenter/gradientpropertyui.ui +++ b/kpresenter/gradientpropertyui.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <grid> <property name="name"> @@ -77,7 +77,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <grid> <property name="name"> diff --git a/kpresenter/imageEffectBase.ui b/kpresenter/imageEffectBase.ui index 430bfac8..ec1f9959 100644 --- a/kpresenter/imageEffectBase.ui +++ b/kpresenter/imageEffectBase.ui @@ -48,7 +48,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>200</height> @@ -60,7 +60,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -336,7 +336,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>130</height> @@ -409,7 +409,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>130</height> @@ -471,7 +471,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>81</height> @@ -523,7 +523,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>71</height> @@ -572,7 +572,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>111</height> @@ -621,7 +621,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>71</height> @@ -648,7 +648,7 @@ <property name="text"> <string>This effect has no options.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -672,7 +672,7 @@ <property name="text"> <string>This effect has no options.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -718,7 +718,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>111</height> @@ -767,7 +767,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>121</height> @@ -794,7 +794,7 @@ <property name="text"> <string>This effect has no options.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -818,7 +818,7 @@ <property name="text"> <string>This effect has no options.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -867,7 +867,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>101</height> @@ -946,7 +946,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>101</height> @@ -998,7 +998,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>101</height> @@ -1050,7 +1050,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>181</height> @@ -1102,7 +1102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>181</height> @@ -1148,7 +1148,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>71</height> @@ -1200,7 +1200,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>181</height> @@ -1246,7 +1246,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>183</height> @@ -1325,7 +1325,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> @@ -1374,7 +1374,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>81</height> @@ -1436,7 +1436,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>91</height> diff --git a/kpresenter/insertpagedia.ui b/kpresenter/insertpagedia.ui index 9d7372cf..aecf704d 100644 --- a/kpresenter/insertpagedia.ui +++ b/kpresenter/insertpagedia.ui @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kpresenter/kprconverter.pl b/kpresenter/kprconverter.pl index 60aa3fb3..524b3d8d 100644 --- a/kpresenter/kprconverter.pl +++ b/kpresenter/kprconverter.pl @@ -43,9 +43,9 @@ while (<INPUT>) # In the old format we had horzAlign="[0|1|2]" 0=left, 1=center, 2=right # In the new one it's align="..." and uses the Qt::AlignmentFlags enums. # Qt::AlignLeft=1, AlignRight=2, AlignHCenter=4 - $tqalignment=$1 if(/horzAlign=(\"[0-2]+\")/); - $tqalignment =~ tr/01/14/; - s/horzAlign=\"[0-2]+\"/align=$tqalignment/; + $alignment=$1 if(/horzAlign=(\"[0-2]+\")/); + $alignment =~ tr/01/14/; + s/horzAlign=\"[0-2]+\"/align=$alignment/; s/>$/ type=$objType>/; } elsif (/<\/PARAGRAPH>/) diff --git a/kpresenter/marginui.ui b/kpresenter/marginui.ui index b4e1bd1e..8e638381 100644 --- a/kpresenter/marginui.ui +++ b/kpresenter/marginui.ui @@ -43,7 +43,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -59,7 +59,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> diff --git a/kpresenter/penstyle.ui b/kpresenter/penstyle.ui index bcbcca09..56241f6f 100644 --- a/kpresenter/penstyle.ui +++ b/kpresenter/penstyle.ui @@ -82,7 +82,7 @@ <property name="name"> <cstring>pbPreview</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>40</height> diff --git a/kpresenter/picturepropertyui.ui b/kpresenter/picturepropertyui.ui index 6812256c..b1df2a2f 100644 --- a/kpresenter/picturepropertyui.ui +++ b/kpresenter/picturepropertyui.ui @@ -131,7 +131,7 @@ <property name="name"> <cstring>picturePreview</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>200</height> diff --git a/kpresenter/piepropertyui.ui b/kpresenter/piepropertyui.ui index 854e3168..39c77f24 100644 --- a/kpresenter/piepropertyui.ui +++ b/kpresenter/piepropertyui.ui @@ -56,7 +56,7 @@ <property name="name"> <cstring>piePreview</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>200</height> diff --git a/kpresenter/polygonpropertyui.ui b/kpresenter/polygonpropertyui.ui index 2b1b87dd..813215db 100644 --- a/kpresenter/polygonpropertyui.ui +++ b/kpresenter/polygonpropertyui.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> @@ -42,7 +42,7 @@ <property name="name"> <cstring>polygonPreview</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>200</height> diff --git a/kpresenter/rectpropertyui.ui b/kpresenter/rectpropertyui.ui index ce16ef61..98bedfd5 100644 --- a/kpresenter/rectpropertyui.ui +++ b/kpresenter/rectpropertyui.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -35,7 +35,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> @@ -111,13 +111,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>16</width> <height>32767</height> @@ -142,7 +142,7 @@ <property name="name"> <cstring>rectPreview</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>100</height> diff --git a/kpresenter/rotationpropertyui.ui b/kpresenter/rotationpropertyui.ui index ea998478..3f604490 100644 --- a/kpresenter/rotationpropertyui.ui +++ b/kpresenter/rotationpropertyui.ui @@ -50,7 +50,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -100,7 +100,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> @@ -113,7 +113,7 @@ <property name="name"> <cstring>previewPanel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>160</width> <height>160</height> @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kpresenter/shadowdialog.ui b/kpresenter/shadowdialog.ui index 44fc0e02..9434c919 100644 --- a/kpresenter/shadowdialog.ui +++ b/kpresenter/shadowdialog.ui @@ -336,7 +336,7 @@ <property name="name"> <cstring>previewPanel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>160</width> <height>160</height> @@ -389,7 +389,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kpresenter/slidetransitionwidget.ui b/kpresenter/slidetransitionwidget.ui index 2314d8b9..b9774639 100644 --- a/kpresenter/slidetransitionwidget.ui +++ b/kpresenter/slidetransitionwidget.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout39</cstring> + <cstring>layout39</cstring> </property> <vbox> <property name="name"> @@ -42,7 +42,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>240</width> <height>180</height> @@ -67,7 +67,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> @@ -75,7 +75,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <grid> <property name="name"> @@ -147,7 +147,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <grid> <property name="name"> @@ -276,7 +276,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>29</height> diff --git a/kspread/DESIGN.html b/kspread/DESIGN.html index 31059876..3c43a860 100644 --- a/kspread/DESIGN.html +++ b/kspread/DESIGN.html @@ -22,7 +22,7 @@ and the source code itself.</p> <h2>Document/View Architecture</h2> -<p>tqStatus: IN PROGRESS.</p> +<p>Status: IN PROGRESS.</p> <p>MVC (Model/View/Controller) means that the application consists of three big parts, the <i>Model</i> which holds the data structure and objects, @@ -49,7 +49,7 @@ to some extent he can take most part of the KSpread back-end and glue a new user interface around the code.</p> <h2>Dependency Handling</h2> -<p>tqStatus: IN PROGRESS.</p> +<p>Status: IN PROGRESS.</p> <p>When a cell holds a formula, then it is likely that it depends on other cell(s) for calculating the result. For example, if cell A11 has the formula @@ -181,7 +181,7 @@ and the dependency manager will do the rest. In addition, this gives us recursive dependency calculation at almost no cost.</p> <h2>Manipulators</h2> -<p>tqStatus: PLANNED.</p> +<p>Status: PLANNED.</p> <p>Currently, every operation on a cell or on a range of cells is quite complex. You need to ensure correct repainting, recalculation, iterate on a range and so on.</p> @@ -218,7 +218,7 @@ below.</p> accomplish this.</p> <h2>Selection handling</h2> -<p>tqStatus: PLANNED</p> +<p>Status: PLANNED</p> <p>The selection shall be an instance of some RangeList class, or however we want to call it - this will contain a list of @@ -227,7 +227,7 @@ more entries. This will allow easy implementation of CTRL-selections and so, because thanks to manipulators, each operation will automatically support these.</p> <h2>Repaint Triggering</h2> -<p>tqStatus: PLANNED</p> +<p>Status: PLANNED</p> <p>As mentioned above, the interface between the core and the GUI needs to be kept at minimum. Also, the number of repaints needs to be as low as possible, and repaints @@ -255,7 +255,7 @@ the manipulators that derive from it, so that it knows whether it changed cell's content or formatting.</p> <h2>Formula Engine</h2> -<p>tqStatus: FINISHED.</p> +<p>Status: FINISHED.</p> <p>This formula engine is just an expression evaluator. To offer better performance, the expression is first compiled into byte codes which will @@ -472,7 +472,7 @@ token right before the percent. If yes, then the following code is generated: <h2>Value</h2> -<p>tqStatus: FINISHED.<br> +<p>Status: FINISHED.<br> </p> <p>to be written.</p> @@ -480,7 +480,7 @@ token right before the percent. If yes, then the following code is generated: <h2>Commands Based on KCommand<br> </h2> -<p>tqStatus: IN PROGRESS.</p> +<p>Status: IN PROGRESS.</p> <p>Until lately, to implement undo and redo, KSpread creates corresponding KSpreadUndo classes for each action and runs them when the user undoes @@ -492,15 +492,15 @@ hence we should be able to undo/redo every operation (provided that the corresponding manipulator provides methods to store/recall the undo information).</p> <h2>Cell Storage</h2> -<p>tqStatus: PLANNED.</p> +<p>Status: PLANNED.</p> <p>Cells are grouped together, and then hashed.</p> <h2>Format Storage</h2> -<p>tqStatus: PLANNED.</p> +<p>Status: PLANNED.</p> <p>Formatting specifies how a cell should look like. It involves font -attributes like bold or italics, vertical and horizontal tqalignment, +attributes like bold or italics, vertical and horizontal alignment, rotation angle, shading, background color and so on. Each cell can have its own format, but bear also in mind that a whole row or column format should also apply.</p> @@ -589,7 +589,7 @@ be in more than one leaf in the quad-tree. <i>Details on the possible use of quad-tree or other methods should be explored further more</i>.</p> <h2>Default Toolbars</h2> -<p>tqStatus: IN PROGRESS.</p> +<p>Status: IN PROGRESS.</p> <p>Relevant mailing-list threads:</p> @@ -652,7 +652,7 @@ Borders, Background, Foreground</li> </ul> <h2>Test Framework</h2> -<p>tqStatus: IN PROGRESS.</p> +<p>Status: IN PROGRESS.</p> <p>Relevant mailing-list threads:</p> @@ -704,7 +704,7 @@ test cases.</p> </p> <h2>Coding Style</h2> -<p>tqStatus: IN PROGRESS.</p> +<p>Status: IN PROGRESS.</p> <p>(to be written in details).</p> diff --git a/kspread/KSpreadColumnIface.cc b/kspread/KSpreadColumnIface.cc index c0fc813f..b7686b2f 100644 --- a/kspread/KSpreadColumnIface.cc +++ b/kspread/KSpreadColumnIface.cc @@ -19,7 +19,7 @@ * Boston, MA 02110-1301, USA. */ -#include <tqbrush.h> +#include <brush.h> #include "kspread_format.h" #include "KSpreadLayoutIface.h" diff --git a/kspread/KSpreadLayoutIface.cc b/kspread/KSpreadLayoutIface.cc index 1ca174cf..8099df6f 100644 --- a/kspread/KSpreadLayoutIface.cc +++ b/kspread/KSpreadLayoutIface.cc @@ -21,54 +21,54 @@ */ #include "KSpreadLayoutIface.h" -#include <tqbrush.h> +#include <brush.h> #include "kspread_format.h" using namespace KSpread; LayoutIface::LayoutIface(Format *_layout) { - tqlayout=_layout; + layout=_layout; } void LayoutIface::setBgColor(const TQString& _c) { TQColor c(_c); - tqlayout->setBgColor(c); + layout->setBgColor(c); } void LayoutIface::setBgColor(int r,int g,int b) { TQColor c(r,g,b); - tqlayout->setBgColor(c); + layout->setBgColor(c); } void LayoutIface::setTextColor(int r,int g,int b) { TQColor c(r,g,b); - tqlayout->setTextColor(c); + layout->setTextColor(c); } void LayoutIface::setTextColor(const TQString& _c) { TQColor c(_c); - tqlayout->setTextColor(c); + layout->setTextColor(c); } void LayoutIface::setAngle(int angle) { - tqlayout->setAngle(angle); + layout->setAngle(angle); } void LayoutIface::setVerticalText(bool _vertical) { - tqlayout->setVerticalText(_vertical); + layout->setVerticalText(_vertical); } void LayoutIface::setMultiRow(bool _multi) { - tqlayout->setMultiRow( _multi ); + layout->setMultiRow( _multi ); } void LayoutIface::setAlign( const TQString& _Align ) @@ -82,7 +82,7 @@ void LayoutIface::setAlign( const TQString& _Align ) Align=Format::Center; else Align=Format::Undefined; - tqlayout->setAlign( Align); + layout->setAlign( Align); } void LayoutIface::setAlignY( const TQString& _AlignY ) @@ -96,23 +96,23 @@ void LayoutIface::setAlignY( const TQString& _AlignY ) AlignY=Format::Bottom; else AlignY=Format::Middle; - tqlayout->setAlignY( AlignY); + layout->setAlignY( AlignY); } void LayoutIface::setPostfix(const TQString &_postfix) { - tqlayout->setPostfix( _postfix ); + layout->setPostfix( _postfix ); } void LayoutIface::setPrefix(const TQString &_prefix) { - tqlayout->setPrefix( _prefix ); + layout->setPrefix( _prefix ); } void LayoutIface::setFormatType(const TQString &_formatType) { FormatType format; - tqlayout->setPrecision(2); + layout->setPrecision(2); if (_formatType=="Generic") format = Generic_format; else if(_formatType=="Number") @@ -151,43 +151,43 @@ void LayoutIface::setFormatType(const TQString &_formatType) format=fraction_three_digits; else format=Generic_format; - tqlayout->setFormatType( format); + layout->setFormatType( format); } void LayoutIface::setPrecision(int _p) { - tqlayout->setPrecision( _p ); + layout->setPrecision( _p ); } void LayoutIface::setTextFontBold(bool _b) { - tqlayout->setTextFontBold( _b ); + layout->setTextFontBold( _b ); } void LayoutIface::setTextFontItalic(bool _b) { - tqlayout->setTextFontItalic( _b ); + layout->setTextFontItalic( _b ); } void LayoutIface::setTextFontUnderline(bool _b) { - tqlayout->setTextFontUnderline( _b ); + layout->setTextFontUnderline( _b ); } void LayoutIface::setTextFontStrike(bool _b) { - tqlayout->setTextFontStrike( _b ); + layout->setTextFontStrike( _b ); } void LayoutIface::setTextFontSize( int _size ) { - tqlayout->setTextFontSize( _size ); + layout->setTextFontSize( _size ); } void LayoutIface::setTextFontFamily( const TQString& _font ) { - tqlayout->setTextFontFamily( _font ); + layout->setTextFontFamily( _font ); } @@ -195,34 +195,34 @@ void LayoutIface::setTextFontFamily( const TQString& _font ) void LayoutIface::setLeftBorderStyle( const TQString& _style ) { if(_style=="DotLine") - tqlayout->setLeftBorderStyle(Qt::DotLine); + layout->setLeftBorderStyle(Qt::DotLine); else if(_style=="DashLine") - tqlayout->setLeftBorderStyle(Qt::DashLine); + layout->setLeftBorderStyle(Qt::DashLine); else if(_style=="DashDotLine") - tqlayout->setLeftBorderStyle(Qt::DashDotLine); + layout->setLeftBorderStyle(Qt::DashDotLine); else if(_style=="DashDotDotLine") - tqlayout->setLeftBorderStyle(Qt::DashDotDotLine); + layout->setLeftBorderStyle(Qt::DashDotDotLine); else if(_style=="SolidLine") - tqlayout->setLeftBorderStyle(Qt::SolidLine); + layout->setLeftBorderStyle(Qt::SolidLine); else - tqlayout->setLeftBorderStyle(Qt::SolidLine); + layout->setLeftBorderStyle(Qt::SolidLine); } void LayoutIface::setLeftBorderColor(const TQString& _c) { TQColor c(_c); - tqlayout->setLeftBorderColor(c ); + layout->setLeftBorderColor(c ); } void LayoutIface::setLeftBorderColor(int r,int g,int b) { TQColor c(r,g,b); - tqlayout->setLeftBorderColor(c ); + layout->setLeftBorderColor(c ); } void LayoutIface::setLeftBorderWidth( int _size ) { - tqlayout->setLeftBorderWidth( _size ); + layout->setLeftBorderWidth( _size ); } @@ -230,34 +230,34 @@ void LayoutIface::setLeftBorderWidth( int _size ) void LayoutIface::setRightBorderStyle( const TQString& _style ) { if(_style=="DotLine") - tqlayout->setRightBorderStyle(Qt::DotLine); + layout->setRightBorderStyle(Qt::DotLine); else if(_style=="DashLine") - tqlayout->setRightBorderStyle(Qt::DashLine); + layout->setRightBorderStyle(Qt::DashLine); else if(_style=="DashDotLine") - tqlayout->setRightBorderStyle(Qt::DashDotLine); + layout->setRightBorderStyle(Qt::DashDotLine); else if(_style=="DashDotDotLine") - tqlayout->setRightBorderStyle(Qt::DashDotDotLine); + layout->setRightBorderStyle(Qt::DashDotDotLine); else if(_style=="SolidLine") - tqlayout->setRightBorderStyle(Qt::SolidLine); + layout->setRightBorderStyle(Qt::SolidLine); else - tqlayout->setRightBorderStyle(Qt::SolidLine); + layout->setRightBorderStyle(Qt::SolidLine); } void LayoutIface::setRightBorderColor(const TQString& _c) { TQColor c(_c); - tqlayout->setRightBorderColor(c ); + layout->setRightBorderColor(c ); } void LayoutIface::setRightBorderColor(int r,int g,int b) { TQColor c(r,g,b); - tqlayout->setRightBorderColor(c ); + layout->setRightBorderColor(c ); } void LayoutIface::setRightBorderWidth( int _size ) { - tqlayout->setRightBorderWidth( _size ); + layout->setRightBorderWidth( _size ); } @@ -265,34 +265,34 @@ void LayoutIface::setRightBorderWidth( int _size ) void LayoutIface::setTopBorderStyle( const TQString& _style ) { if(_style=="DotLine") - tqlayout->setTopBorderStyle(Qt::DotLine); + layout->setTopBorderStyle(Qt::DotLine); else if(_style=="DashLine") - tqlayout->setTopBorderStyle(Qt::DashLine); + layout->setTopBorderStyle(Qt::DashLine); else if(_style=="DashDotLine") - tqlayout->setTopBorderStyle(Qt::DashDotLine); + layout->setTopBorderStyle(Qt::DashDotLine); else if(_style=="DashDotDotLine") - tqlayout->setTopBorderStyle(Qt::DashDotDotLine); + layout->setTopBorderStyle(Qt::DashDotDotLine); else if(_style=="SolidLine") - tqlayout->setTopBorderStyle(Qt::SolidLine); + layout->setTopBorderStyle(Qt::SolidLine); else - tqlayout->setTopBorderStyle(Qt::SolidLine); + layout->setTopBorderStyle(Qt::SolidLine); } void LayoutIface::setTopBorderColor(const TQString& _c) { TQColor c(_c); - tqlayout->setTopBorderColor(c ); + layout->setTopBorderColor(c ); } void LayoutIface::setTopBorderColor(int r,int g,int b) { TQColor c(r,g,b); - tqlayout->setTopBorderColor(c ); + layout->setTopBorderColor(c ); } void LayoutIface::setTopBorderWidth( int _size ) { - tqlayout->setTopBorderWidth( _size ); + layout->setTopBorderWidth( _size ); } @@ -300,33 +300,33 @@ void LayoutIface::setTopBorderWidth( int _size ) void LayoutIface::setBottomBorderStyle( const TQString& _style ) { if(_style=="DotLine") - tqlayout->setBottomBorderStyle(Qt::DotLine); + layout->setBottomBorderStyle(Qt::DotLine); else if(_style=="DashLine") - tqlayout->setBottomBorderStyle(Qt::DashLine); + layout->setBottomBorderStyle(Qt::DashLine); else if(_style=="DashDotLine") - tqlayout->setBottomBorderStyle(Qt::DashDotLine); + layout->setBottomBorderStyle(Qt::DashDotLine); else if(_style=="DashDotDotLine") - tqlayout->setBottomBorderStyle(Qt::DashDotDotLine); + layout->setBottomBorderStyle(Qt::DashDotDotLine); else if(_style=="SolidLine") - tqlayout->setBottomBorderStyle(Qt::SolidLine); + layout->setBottomBorderStyle(Qt::SolidLine); else - tqlayout->setBottomBorderStyle(Qt::SolidLine); + layout->setBottomBorderStyle(Qt::SolidLine); } void LayoutIface::setBottomBorderColor(const TQString& _c) { TQColor c(_c); - tqlayout->setBottomBorderColor(c ); + layout->setBottomBorderColor(c ); } void LayoutIface::setBottomBorderColor(int r,int g,int b) { TQColor c(r,g,b); - tqlayout->setBottomBorderColor(c ); + layout->setBottomBorderColor(c ); } void LayoutIface::setBottomBorderWidth( int _size ) { - tqlayout->setBottomBorderWidth( _size ); + layout->setBottomBorderWidth( _size ); } @@ -334,33 +334,33 @@ void LayoutIface::setBottomBorderWidth( int _size ) void LayoutIface::setFallDiagonalStyle( const TQString& _style ) { if(_style=="DotLine") - tqlayout->setFallDiagonalStyle(Qt::DotLine); + layout->setFallDiagonalStyle(Qt::DotLine); else if(_style=="DashLine") - tqlayout->setFallDiagonalStyle(Qt::DashLine); + layout->setFallDiagonalStyle(Qt::DashLine); else if(_style=="DashDotLine") - tqlayout->setFallDiagonalStyle(Qt::DashDotLine); + layout->setFallDiagonalStyle(Qt::DashDotLine); else if(_style=="DashDotDotLine") - tqlayout->setFallDiagonalStyle(Qt::DashDotDotLine); + layout->setFallDiagonalStyle(Qt::DashDotDotLine); else if(_style=="SolidLine") - tqlayout->setFallDiagonalStyle(Qt::SolidLine); + layout->setFallDiagonalStyle(Qt::SolidLine); else - tqlayout->setFallDiagonalStyle(Qt::SolidLine); + layout->setFallDiagonalStyle(Qt::SolidLine); } void LayoutIface::setFallDiagonalColor(const TQString& _c) { TQColor c(_c); - tqlayout->setFallDiagonalColor(c ); + layout->setFallDiagonalColor(c ); } void LayoutIface::setFallDiagonalColor(int r,int g,int b) { TQColor c(r,g,b); - tqlayout->setFallDiagonalColor(c ); + layout->setFallDiagonalColor(c ); } void LayoutIface::setFallDiagonalWidth( int _size ) { - tqlayout->setFallDiagonalWidth( _size ); + layout->setFallDiagonalWidth( _size ); } @@ -369,47 +369,47 @@ void LayoutIface::setFallDiagonalWidth( int _size ) void LayoutIface::setGoUpDiagonalStyle( const TQString& _style ) { if(_style=="DotLine") - tqlayout->setGoUpDiagonalStyle(Qt::DotLine); + layout->setGoUpDiagonalStyle(Qt::DotLine); else if(_style=="DashLine") - tqlayout->setGoUpDiagonalStyle(Qt::DashLine); + layout->setGoUpDiagonalStyle(Qt::DashLine); else if(_style=="DashDotLine") - tqlayout->setGoUpDiagonalStyle(Qt::DashDotLine); + layout->setGoUpDiagonalStyle(Qt::DashDotLine); else if(_style=="DashDotDotLine") - tqlayout->setGoUpDiagonalStyle(Qt::DashDotDotLine); + layout->setGoUpDiagonalStyle(Qt::DashDotDotLine); else if(_style=="SolidLine") - tqlayout->setGoUpDiagonalStyle(Qt::SolidLine); + layout->setGoUpDiagonalStyle(Qt::SolidLine); else - tqlayout->setGoUpDiagonalStyle(Qt::SolidLine); + layout->setGoUpDiagonalStyle(Qt::SolidLine); } void LayoutIface::setGoUpDiagonalColor(const TQString& _c) { TQColor c(_c); - tqlayout->setGoUpDiagonalColor(c ); + layout->setGoUpDiagonalColor(c ); } void LayoutIface::setGoUpDiagonalColor(int r,int g,int b) { TQColor c(r,g,b); - tqlayout->setGoUpDiagonalColor(c ); + layout->setGoUpDiagonalColor(c ); } void LayoutIface::setGoUpDiagonalWidth( int _size ) { - tqlayout->setGoUpDiagonalWidth( _size ); + layout->setGoUpDiagonalWidth( _size ); } void LayoutIface::setIndent( double indent ) { if( indent >= 0.0 ) - tqlayout->setIndent( indent ); + layout->setIndent( indent ); else - tqlayout->setIndent( 0.0 ); + layout->setIndent( 0.0 ); } void LayoutIface::setDontPrintText ( bool _print) { - tqlayout->setDontPrintText ( _print); + layout->setDontPrintText ( _print); } diff --git a/kspread/KSpreadLayoutIface.h b/kspread/KSpreadLayoutIface.h index c4231032..84de8ac4 100644 --- a/kspread/KSpreadLayoutIface.h +++ b/kspread/KSpreadLayoutIface.h @@ -95,7 +95,7 @@ k_dcop: //don't print text virtual void setDontPrintText ( bool _b); private: - Format *tqlayout; + Format *layout; }; } //namespace KSpread diff --git a/kspread/KSpreadRowIface.cc b/kspread/KSpreadRowIface.cc index 69db292f..826e49e5 100644 --- a/kspread/KSpreadRowIface.cc +++ b/kspread/KSpreadRowIface.cc @@ -22,7 +22,7 @@ #include "KSpreadLayoutIface.h" #include "KSpreadRowIface.h" #include "kspread_format.h" -#include <tqbrush.h> +#include <brush.h> using namespace KSpread; diff --git a/kspread/OASIS.txt b/kspread/OASIS.txt index 2eb878c8..bf0feb94 100644 --- a/kspread/OASIS.txt +++ b/kspread/OASIS.txt @@ -51,7 +51,7 @@ Document/Workbook [x] Active sheet [x] Header [x] Footer - [x] Page tqlayout + [x] Page layout [x] Protection status [x] Print range [x] Print setup @@ -155,29 +155,29 @@ Merged cells </table:table-cell> <table:covered-table-cell table:style-name="ce3"/> -Cell horizontal tqalignment: top +Cell horizontal alignment: top <style:style style:name="ce1" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties style:vertical-align="top"/> </style:style> -Cell horizontal tqalignment: middle +Cell horizontal alignment: middle <style:style style:name="ce2" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties style:vertical-align="middle"/> </style:style> -Cell horizontal tqalignment: bottom +Cell horizontal alignment: bottom <style:style style:name="ce3" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties style:vertical-align="bottom"/> </style:style> -Cell vertical tqalignment: top +Cell vertical alignment: top <style:style style:name="ce5" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties fo:text-align="center" style:text-align-source="fix" style:repeat-content="none" fo:margin-left="0in" style:vertical-align="top"/> </style:style> -Cell vertical tqalignment: middle +Cell vertical alignment: middle <style:style style:name="ce6" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties fo:text-align="center" style:text-align-source="fix" style:repeat-content="none" @@ -185,7 +185,7 @@ Cell vertical tqalignment: middle </style:style> -Cell vertical tqalignment: bottom +Cell vertical alignment: bottom <style:style style:name="ce7" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties fo:text-align="center" style:text-align-source="fix" style:repeat-content="none" diff --git a/kspread/commands.cc b/kspread/commands.cc index a4788bda..490bee81 100644 --- a/kspread/commands.cc +++ b/kspread/commands.cc @@ -77,7 +77,7 @@ TQString MergeCellCommand::name() const if( rangeName.isEmpty() ) return i18n("Merge Cells"); else - return i18n("Merge Cells %1").tqarg( rangeName ); + return i18n("Merge Cells %1").arg( rangeName ); } void MergeCellCommand::execute() @@ -174,7 +174,7 @@ void HideSheetCommand::unexecute() TQString HideSheetCommand::name() const { - TQString n = TQString( i18n("Hide Sheet %1") ).tqarg( sheetName ); + TQString n = TQString( i18n("Hide Sheet %1") ).arg( sheetName ); if( n.length() > 64 ) n = i18n("Hide Sheet"); return n; } @@ -205,7 +205,7 @@ void ShowSheetCommand::unexecute() TQString ShowSheetCommand::name() const { - TQString n = TQString( i18n("Show Sheet %1") ).tqarg( sheetName ); + TQString n = TQString( i18n("Show Sheet %1") ).arg( sheetName ); if( n.length() > 64 ) n = i18n("Show Sheet"); return n; } @@ -590,37 +590,37 @@ ChangeObjectGeometryCommand::~ChangeObjectGeometryCommand() void ChangeObjectGeometryCommand::execute() { - doc->tqrepaint( obj->tqgeometry() ); + doc->repaint( obj->geometry() ); - KoRect tqgeometry = obj->tqgeometry(); - tqgeometry.moveBy( m_diff.x(), m_diff.y() ); - tqgeometry.setWidth( tqgeometry.width() + r_diff.width() ); - tqgeometry.setHeight( tqgeometry.height() + r_diff.height() ); - obj->setGeometry( tqgeometry ); + KoRect geometry = obj->geometry(); + geometry.moveBy( m_diff.x(), m_diff.y() ); + geometry.setWidth( geometry.width() + r_diff.width() ); + geometry.setHeight( geometry.height() + r_diff.height() ); + obj->setGeometry( geometry ); // if ( object->isSelected()) // doc->updateObjectStatusBarItem(); - doc->tqrepaint( obj ); + doc->repaint( obj ); } void ChangeObjectGeometryCommand::unexecute() { - doc->tqrepaint( obj->tqgeometry() ); + doc->repaint( obj->geometry() ); - KoRect tqgeometry = obj->tqgeometry(); - tqgeometry.moveBy( -m_diff.x(), -m_diff.y() ); - tqgeometry.setWidth( tqgeometry.width() - r_diff.width() ); - tqgeometry.setHeight( tqgeometry.height() - r_diff.height() ); - obj->setGeometry( tqgeometry ); + KoRect geometry = obj->geometry(); + geometry.moveBy( -m_diff.x(), -m_diff.y() ); + geometry.setWidth( geometry.width() - r_diff.width() ); + geometry.setHeight( geometry.height() - r_diff.height() ); + obj->setGeometry( geometry ); // if ( object->isSelected()) // doc->updateObjectStatusBarItem(); - doc->tqrepaint( obj ); + doc->repaint( obj ); } TQString ChangeObjectGeometryCommand::name() const { - /*if ( fabs( obj->tqgeometry().width() - newGeometry.width() )<1e-3 && fabs( obj->tqgeometry().height() - newGeometry.height() ) < 1e-3 ) + /*if ( fabs( obj->geometry().width() - newGeometry.width() )<1e-3 && fabs( obj->geometry().height() - newGeometry.height() ) < 1e-3 ) return i18n("Move Object"); else */ return i18n("Resize Object"); @@ -665,7 +665,7 @@ void RemoveObjectCommand::execute() } obj->setSelected( false ); - doc->tqrepaint( obj ); + doc->repaint( obj ); executed = true; } @@ -677,7 +677,7 @@ void RemoveObjectCommand::unexecute() EmbeddedKOfficeObject *eko = dynamic_cast<EmbeddedKOfficeObject *>(obj); eko->embeddedObject()->setDeleted(false); } - doc->tqrepaint( obj ); + doc->repaint( obj ); executed = false; } @@ -689,18 +689,18 @@ TQString RemoveObjectCommand::name() const return i18n("Remove Object"); } -InsertObjectCommand::InsertObjectCommand( const KoRect& _tqgeometry, KoDocumentEntry& _entry, Canvas *_canvas ) //child +InsertObjectCommand::InsertObjectCommand( const KoRect& _geometry, KoDocumentEntry& _entry, Canvas *_canvas ) //child { - tqgeometry = _tqgeometry; + geometry = _geometry; entry = _entry; canvas = _canvas; type = OBJECT_KOFFICE_PART; obj = 0; } -InsertObjectCommand::InsertObjectCommand(const KoRect& _tqgeometry, KoDocumentEntry& _entry, const TQRect& _data, Canvas *_canvas ) //chart +InsertObjectCommand::InsertObjectCommand(const KoRect& _geometry, KoDocumentEntry& _entry, const TQRect& _data, Canvas *_canvas ) //chart { - tqgeometry = _tqgeometry; + geometry = _geometry; entry = _entry; data = _data; canvas = _canvas; @@ -708,10 +708,10 @@ InsertObjectCommand::InsertObjectCommand(const KoRect& _tqgeometry, KoDocumentEn obj = 0; } -InsertObjectCommand::InsertObjectCommand( const KoRect& _tqgeometry , KURL& _file, Canvas *_canvas ) //picture +InsertObjectCommand::InsertObjectCommand( const KoRect& _geometry , KURL& _file, Canvas *_canvas ) //picture { //In the case of pictures, only the top left point of the rectangle is relevant - tqgeometry = _tqgeometry; + geometry = _geometry; file = _file; canvas = _canvas; type = OBJECT_PICTURE; @@ -737,7 +737,7 @@ void InsertObjectCommand::execute() if ( obj ) //restore the object which was removed from the object list in InsertObjectCommand::unexecute() { canvas->doc()->embeddedObjects().append( obj ); - canvas->doc()->tqrepaint( obj ); + canvas->doc()->repaint( obj ); } else { @@ -746,17 +746,17 @@ void InsertObjectCommand::execute() { case OBJECT_CHART: { - success = canvas->activeSheet()->insertChart( tqgeometry, entry, data ); + success = canvas->activeSheet()->insertChart( geometry, entry, data ); break; } case OBJECT_KOFFICE_PART: { - success = canvas->activeSheet()->insertChild( tqgeometry, entry ); + success = canvas->activeSheet()->insertChild( geometry, entry ); break; } case OBJECT_PICTURE: { - success = canvas->activeSheet()->insertPicture( tqgeometry.topLeft() , file ); + success = canvas->activeSheet()->insertPicture( geometry.topLeft() , file ); break; } default: @@ -780,7 +780,7 @@ void InsertObjectCommand::unexecute() canvas->doc()->embeddedObjects().removeRef( obj ); obj->setSelected( false ); - canvas->doc()->tqrepaint( obj ); + canvas->doc()->repaint( obj ); executed = false; } @@ -871,7 +871,7 @@ void GeometryPropertiesCommand::execute() { it.current()->setProtect( m_newValue ); if ( it.current()->isSelected() ) - m_doc->tqrepaint( it.current() ); + m_doc->repaint( it.current() ); } else if ( m_type == KeepRatio) it.current()->setKeepRatio( m_newValue ); @@ -887,7 +887,7 @@ void GeometryPropertiesCommand::unexecute() { obj->setProtect( *m_oldValue.at(i) ); if ( obj->isSelected() ) - m_doc->tqrepaint( obj ); + m_doc->repaint( obj ); } else if ( m_type == KeepRatio) obj->setKeepRatio( *m_oldValue.at(i) ); @@ -920,13 +920,13 @@ void MoveObjectByCmd::execute() TQRect oldRect; for ( unsigned int i = 0; i < objects.count(); i++ ) { - doc->tqrepaint( objects.at( i )->tqgeometry() ); + doc->repaint( objects.at( i )->geometry() ); - KoRect r = objects.at( i )->tqgeometry(); + KoRect r = objects.at( i )->geometry(); r.moveBy( diff.x(), diff.y() ); objects.at( i )->setGeometry( r ); - doc->tqrepaint( objects.at( i ) ); + doc->repaint( objects.at( i ) ); } } @@ -935,12 +935,12 @@ void MoveObjectByCmd::unexecute() TQRect oldRect; for ( unsigned int i = 0; i < objects.count(); i++ ) { - doc->tqrepaint( objects.at( i )->tqgeometry() ); + doc->repaint( objects.at( i )->geometry() ); - KoRect r = objects.at( i )->tqgeometry(); + KoRect r = objects.at( i )->geometry(); r.moveBy( -diff.x(), -diff.y() ); objects.at( i )->setGeometry( r ); - doc->tqrepaint( objects.at( i ) ); + doc->repaint( objects.at( i ) ); } } diff --git a/kspread/commands.h b/kspread/commands.h index d0bd9132..b3622035 100644 --- a/kspread/commands.h +++ b/kspread/commands.h @@ -392,9 +392,9 @@ class RemoveObjectCommand : public KCommand class InsertObjectCommand : public KCommand { public: - InsertObjectCommand( const KoRect& _tqgeometry, KoDocumentEntry&, Canvas *_canvas ); //child - InsertObjectCommand( const KoRect& _tqgeometry, KoDocumentEntry&, const TQRect& _data, Canvas *_canvas ); //chart - InsertObjectCommand( const KoRect& _tqgeometry, KURL& _file, Canvas *_canvas ); //picture + InsertObjectCommand( const KoRect& _geometry, KoDocumentEntry&, Canvas *_canvas ); //child + InsertObjectCommand( const KoRect& _geometry, KoDocumentEntry&, const TQRect& _data, Canvas *_canvas ); //chart + InsertObjectCommand( const KoRect& _geometry, KURL& _file, Canvas *_canvas ); //picture ~InsertObjectCommand(); virtual void execute(); @@ -402,7 +402,7 @@ class InsertObjectCommand : public KCommand virtual TQString name() const; protected: - KoRect tqgeometry; + KoRect geometry; Canvas *canvas; bool executed; KoDocumentEntry entry; diff --git a/kspread/dialogs/font_cell_format.ui b/kspread/dialogs/font_cell_format.ui index 6e7f7403..095f1188 100644 --- a/kspread/dialogs/font_cell_format.ui +++ b/kspread/dialogs/font_cell_format.ui @@ -22,7 +22,7 @@ The default font is set for all cells in the Format -> Style Manager menu wit </property> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <grid> <property name="name"> @@ -168,7 +168,7 @@ The default font is set for all cells in the Format -> Style Manager menu wit <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> @@ -206,7 +206,7 @@ The default font is set for all cells in the Format -> Style Manager menu wit <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignHCenter</set> </property> <property name="whatsThis" stdset="0"> diff --git a/kspread/dialogs/kspread_dlg_angle.cc b/kspread/dialogs/kspread_dlg_angle.cc index 7c97f6c2..5dc3f83d 100644 --- a/kspread/dialogs/kspread_dlg_angle.cc +++ b/kspread/dialogs/kspread_dlg_angle.cc @@ -21,7 +21,7 @@ * Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <kbuttonbox.h> @@ -55,7 +55,7 @@ AngleDialog::AngleDialog(View* parent, const char* name, const TQPoint &_marker) lay->addWidget( m_pAngle ); TQWidget* spacer = new TQWidget( page ); - spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ) ); + spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ) ); lay->addWidget( spacer ); m_pAngle->setFocus(); diff --git a/kspread/dialogs/kspread_dlg_area.cc b/kspread/dialogs/kspread_dlg_area.cc index 9a78074b..71cb2ada 100644 --- a/kspread/dialogs/kspread_dlg_area.cc +++ b/kspread/dialogs/kspread_dlg_area.cc @@ -21,7 +21,7 @@ * Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqlineedit.h> @@ -51,7 +51,7 @@ AreaDialog::AreaDialog( View * parent, const char * name, const TQPoint & _marke lay1->addWidget( label ); m_areaName = new TQLineEdit(page); - m_areaName->setMinimumWidth( m_areaName->tqsizeHint().width() * 3 ); + m_areaName->setMinimumWidth( m_areaName->sizeHint().width() * 3 ); lay1->addWidget( m_areaName ); m_areaName->setFocus(); diff --git a/kspread/dialogs/kspread_dlg_comment.cc b/kspread/dialogs/kspread_dlg_comment.cc index 9ed3c551..8705fc5a 100644 --- a/kspread/dialogs/kspread_dlg_comment.cc +++ b/kspread/dialogs/kspread_dlg_comment.cc @@ -23,7 +23,7 @@ #include <tqmultilineedit.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kbuttonbox.h> diff --git a/kspread/dialogs/kspread_dlg_conditional.cc b/kspread/dialogs/kspread_dlg_conditional.cc index 531f2ee3..83f37b2f 100644 --- a/kspread/dialogs/kspread_dlg_conditional.cc +++ b/kspread/dialogs/kspread_dlg_conditional.cc @@ -43,7 +43,7 @@ #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> using namespace KSpread; @@ -54,10 +54,10 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags TQGroupBox * groupBox1_3 = new TQGroupBox( this, "groupBox1_3" ); groupBox1_3->setColumnLayout(0, Qt::Vertical ); - groupBox1_3->tqlayout()->setSpacing( KDialog::spacingHint() ); - groupBox1_3->tqlayout()->setMargin( KDialog::marginHint() ); - TQGridLayout * groupBox1_3Layout = new TQGridLayout( groupBox1_3->tqlayout() ); - groupBox1_3Layout->tqsetAlignment( TQt::AlignTop ); + groupBox1_3->layout()->setSpacing( KDialog::spacingHint() ); + groupBox1_3->layout()->setMargin( KDialog::marginHint() ); + TQGridLayout * groupBox1_3Layout = new TQGridLayout( groupBox1_3->layout() ); + groupBox1_3Layout->setAlignment( TQt::AlignTop ); TQLabel * textLabel1_3 = new TQLabel( groupBox1_3, "textLabel1_3" ); groupBox1_3Layout->addWidget( textLabel1_3, 0, 0 ); @@ -89,11 +89,11 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags TQGroupBox * groupBox1_2 = new TQGroupBox( this, "groupBox1_2" ); groupBox1_2->setColumnLayout(0, Qt::Vertical ); - groupBox1_2->tqlayout()->setSpacing( KDialog::spacingHint() ); - groupBox1_2->tqlayout()->setMargin( KDialog::marginHint() ); + groupBox1_2->layout()->setSpacing( KDialog::spacingHint() ); + groupBox1_2->layout()->setMargin( KDialog::marginHint() ); - TQGridLayout * groupBox1_2Layout = new TQGridLayout( groupBox1_2->tqlayout() ); - groupBox1_2Layout->tqsetAlignment( TQt::AlignTop ); + TQGridLayout * groupBox1_2Layout = new TQGridLayout( groupBox1_2->layout() ); + groupBox1_2Layout->setAlignment( TQt::AlignTop ); TQLabel * textLabel1_2 = new TQLabel( groupBox1_2, "textLabel1_2" ); groupBox1_2Layout->addWidget( textLabel1_2, 0, 0 ); @@ -125,11 +125,11 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags TQGroupBox * groupBox1_1 = new TQGroupBox( this, "groupBox1_1" ); groupBox1_1->setColumnLayout(0, Qt::Vertical ); - groupBox1_1->tqlayout()->setSpacing( KDialog::spacingHint() ); - groupBox1_1->tqlayout()->setMargin( KDialog::marginHint() ); + groupBox1_1->layout()->setSpacing( KDialog::spacingHint() ); + groupBox1_1->layout()->setMargin( KDialog::marginHint() ); - TQGridLayout * groupBox1_1Layout = new TQGridLayout( groupBox1_1->tqlayout() ); - groupBox1_1Layout->tqsetAlignment( TQt::AlignTop ); + TQGridLayout * groupBox1_1Layout = new TQGridLayout( groupBox1_1->layout() ); + groupBox1_1Layout->setAlignment( TQt::AlignTop ); TQLabel * textLabel1_1 = new TQLabel( groupBox1_1, "textLabel1_2_2" ); groupBox1_1Layout->addWidget( textLabel1_1, 0, 0 ); @@ -158,7 +158,7 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags groupBox1_1Layout->addItem( spacer_6, 1, 3 ); Form1Layout->addWidget( groupBox1_1, 0, 0 ); - resize( TQSize(702, 380).expandedTo( tqminimumSizeHint() ) ); + resize( TQSize(702, 380).expandedTo( minimumSizeHint() ) ); clearWState( WState_Polished ); TQStringList list; diff --git a/kspread/dialogs/kspread_dlg_cons.cc b/kspread/dialogs/kspread_dlg_cons.cc index 91589f9f..7d63a668 100644 --- a/kspread/dialogs/kspread_dlg_cons.cc +++ b/kspread/dialogs/kspread_dlg_cons.cc @@ -31,7 +31,7 @@ #include <tqcheckbox.h> #include <tqcombobox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <kdebug.h> @@ -197,14 +197,14 @@ void ConsolidateDialog::slotOk() h <= ( ( desc == D_BOTH || desc == D_ROW ) ? 1 : 0 ) ) { m_pView->slotUpdateView( m_pView->activeSheet() ); - KMessageBox::error( this, i18n( "The range\n%1\nis too small" ).tqarg( *( r.begin() ) )); + KMessageBox::error( this, i18n( "The range\n%1\nis too small" ).arg( *( r.begin() ) )); return; } if( (*it).range().bottom()==KS_rowMax || (*it).range().right()== KS_colMax ) { m_pView->slotUpdateView( m_pView->activeSheet() ); - KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).tqarg( *( r.begin() ) )); + KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).arg( *( r.begin() ) )); return; } @@ -220,7 +220,7 @@ void ConsolidateDialog::slotOk() if(currentRange.bottom()==KS_rowMax || currentRange.right()== KS_colMax) { m_pView->slotUpdateView( m_pView->activeSheet() ); - KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).tqarg( r[i])); + KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).arg( r[i])); return; } if ( ( desc == D_NONE && ( w != w2 || h != h2 ) ) || @@ -228,7 +228,7 @@ void ConsolidateDialog::slotOk() ( desc == D_COL && w != w2 ) ) { m_pView->slotUpdateView( m_pView->activeSheet() ); - TQString tmp = i18n( "The ranges\n%1\nand\n%2\nhave different size").tqarg( *( r.begin() ) ).tqarg( r[i] ); + TQString tmp = i18n( "The ranges\n%1\nand\n%2\nhave different size").arg( *( r.begin() ) ).arg( r[i] ); KMessageBox::error( this, tmp); return; } @@ -652,7 +652,7 @@ void ConsolidateDialog::slotReturnPressed() Range r( txt, m_pView->doc()->map() ); if ( !r.isValid() ) { - KMessageBox::error( this, i18n("The range\n%1\n is malformed").tqarg( txt )); + KMessageBox::error( this, i18n("The range\n%1\n is malformed").arg( txt )); return; } diff --git a/kspread/dialogs/kspread_dlg_csv.cc b/kspread/dialogs/kspread_dlg_csv.cc index c8ce2671..7008de4e 100644 --- a/kspread/dialogs/kspread_dlg_csv.cc +++ b/kspread/dialogs/kspread_dlg_csv.cc @@ -22,7 +22,7 @@ #include <tqbuttongroup.h> #include <tqcheckbox.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqcombobox.h> #include <tqlabel.h> #include <tqlineedit.h> @@ -30,7 +30,7 @@ #include <tqpushbutton.h> #include <tqradiobutton.h> #include <tqtable.h> -#include <tqlayout.h> +#include <layout.h> #include <kapplication.h> #include <kdebug.h> @@ -78,7 +78,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_targetRect.setBottom( lastCell->row() ); m_sheet = new TQTable( page, "m_table" ); - //m_sheet->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, m_sheet->sizePolicy().hasHeightForWidth() ) ); + //m_sheet->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, m_sheet->sizePolicy().hasHeightForWidth() ) ); m_sheet->setNumRows( 0 ); m_sheet->setNumCols( 0 ); @@ -86,13 +86,13 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod // Delimiter: comma, semicolon, tab, space, other m_delimiterBox = new TQButtonGroup( page, "m_delimiterBox" ); - m_delimiterBox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_delimiterBox->sizePolicy().hasHeightForWidth() ) ); + m_delimiterBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_delimiterBox->sizePolicy().hasHeightForWidth() ) ); m_delimiterBox->setTitle( i18n( "Delimiter" ) ); m_delimiterBox->setColumnLayout(0, Qt::Vertical ); - m_delimiterBox->tqlayout()->setSpacing( KDialog::spacingHint() ); - m_delimiterBox->tqlayout()->setMargin( KDialog::marginHint() ); - m_delimiterBoxLayout = new TQGridLayout( m_delimiterBox->tqlayout() ); - m_delimiterBoxLayout->tqsetAlignment( TQt::AlignTop ); + m_delimiterBox->layout()->setSpacing( KDialog::spacingHint() ); + m_delimiterBox->layout()->setMargin( KDialog::marginHint() ); + m_delimiterBoxLayout = new TQGridLayout( m_delimiterBox->layout() ); + m_delimiterBoxLayout->setAlignment( TQt::AlignTop ); MyDialogLayout->addMultiCellWidget( m_delimiterBox, 0, 2, 0, 0 ); m_ignoreDuplicates = new TQCheckBox( page, "m_ignoreDuplicates" ); @@ -122,20 +122,20 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_delimiterBoxLayout->addWidget( m_radioOther, 0, 2 ); m_delimiterEdit = new TQLineEdit( m_delimiterBox, "m_delimiterEdit" ); - m_delimiterEdit->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) ); + m_delimiterEdit->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) ); m_delimiterEdit->setMaximumSize( TQSize( 30, 32767 ) ); m_delimiterBoxLayout->addWidget( m_delimiterEdit, 1, 2 ); // Format: number, text, currency, m_formatBox = new TQButtonGroup( page, "m_formatBox" ); - m_formatBox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_formatBox->sizePolicy().hasHeightForWidth() ) ); + m_formatBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_formatBox->sizePolicy().hasHeightForWidth() ) ); m_formatBox->setTitle( i18n( "Format" ) ); m_formatBox->setColumnLayout(0, Qt::Vertical ); - m_formatBox->tqlayout()->setSpacing( KDialog::spacingHint() ); - m_formatBox->tqlayout()->setMargin( KDialog::marginHint() ); - m_formatBoxLayout = new TQGridLayout( m_formatBox->tqlayout() ); - m_formatBoxLayout->tqsetAlignment( TQt::AlignTop ); + m_formatBox->layout()->setSpacing( KDialog::spacingHint() ); + m_formatBox->layout()->setMargin( KDialog::marginHint() ); + m_formatBoxLayout = new TQGridLayout( m_formatBox->layout() ); + m_formatBoxLayout->setAlignment( TQt::AlignTop ); MyDialogLayout->addMultiCellWidget( m_formatBox, 0, 2, 1, 1 ); m_radioNumber = new TQRadioButton( m_formatBox, "m_radioNumber" ); @@ -157,7 +157,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_comboLine = new TQComboBox( FALSE, page, "m_comboLine" ); m_comboLine->insertItem( i18n( "1" ) ); - m_comboLine->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboLine->sizePolicy().hasHeightForWidth() ) ); + m_comboLine->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboLine->sizePolicy().hasHeightForWidth() ) ); MyDialogLayout->addWidget( m_comboLine, 1, 3 ); @@ -165,20 +165,20 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_comboQuote->insertItem( i18n( "\"" ) ); m_comboQuote->insertItem( i18n( "'" ) ); m_comboQuote->insertItem( i18n( "None" ) ); - m_comboQuote->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboQuote->sizePolicy().hasHeightForWidth() ) ); + m_comboQuote->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboQuote->sizePolicy().hasHeightForWidth() ) ); MyDialogLayout->addWidget( m_comboQuote, 1, 2 ); TQSpacerItem* spacer_2 = new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Preferred ); MyDialogLayout->addItem( spacer_2, 2, 3 ); TextLabel3 = new TQLabel( page, "TextLabel3" ); - TextLabel3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) ); + TextLabel3->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) ); TextLabel3->setText( i18n( "Start at line:" ) ); MyDialogLayout->addWidget( TextLabel3, 0, 3 ); TextLabel2 = new TQLabel( page, "TextLabel2" ); - TextLabel2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) ); + TextLabel2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) ); TextLabel2->setText( i18n( "Textquote:" ) ); MyDialogLayout->addWidget( TextLabel2, 0, 2 ); @@ -186,7 +186,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod if ( m_mode == Clipboard ) { setCaption( i18n( "Inserting From Clipboard" ) ); - TQMimeSource * mime = TQApplication::tqclipboard()->data(); + TQMimeSource * mime = TQApplication::clipboard()->data(); if ( !mime ) { KMessageBox::information( this, i18n("There is no data in the clipboard.") ); @@ -200,7 +200,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_cancelled = true; return; } - m_fileArray = TQByteArray(mime->tqencodedData( "text/plain" ) ); + m_fileArray = TQByteArray(mime->encodedData( "text/plain" ) ); } else if ( mode == File ) { @@ -249,7 +249,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod fillSheet(); fillComboBox(); - resize(tqsizeHint()); + resize(sizeHint()); m_sheet->setSelectionMode(TQTable::NoSelection); diff --git a/kspread/dialogs/kspread_dlg_database.cc b/kspread/dialogs/kspread_dlg_database.cc index 7cf242a9..4c1a5bcf 100644 --- a/kspread/dialogs/kspread_dlg_database.cc +++ b/kspread/dialogs/kspread_dlg_database.cc @@ -39,7 +39,7 @@ #include <tqframe.h> #include <tqheader.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqradiobutton.h> @@ -48,7 +48,7 @@ #include <tqsqlfield.h> #include <tqsqlquery.h> #include <tqsqlrecord.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqtooltip.h> #include <tqvariant.h> #include <tqwhatsthis.h> @@ -139,16 +139,16 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * Frame16Layout->addWidget( TextLabel5, 5, 0 ); Frame5Layout->addWidget( Frame16 ); - m_databasetqStatus = new TQLabel( Frame5, "m_databaseStatus" ); - m_databasetqStatus->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, m_databasetqStatus->sizePolicy().hasHeightForWidth() ) ); - m_databasetqStatus->setMaximumSize( TQSize( 32767, 30 ) ); - m_databasetqStatus->setText( " " ); - Frame5Layout->addWidget( m_databasetqStatus ); + m_databaseStatus = new TQLabel( Frame5, "m_databaseStatus" ); + m_databaseStatus->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, m_databaseStatus->sizePolicy().hasHeightForWidth() ) ); + m_databaseStatus->setMaximumSize( TQSize( 32767, 30 ) ); + m_databaseStatus->setText( " " ); + Frame5Layout->addWidget( m_databaseStatus ); m_databaseLayout->addWidget( Frame5, 0, 1 ); TQFrame * Frame17 = new TQFrame( m_database, "Frame17" ); - Frame17->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17->sizePolicy().hasHeightForWidth() ) ); + Frame17->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17->sizePolicy().hasHeightForWidth() ) ); Frame17->setMinimumSize( TQSize( 111, 0 ) ); Frame17->setFrameShape( TQFrame::NoFrame ); Frame17->setFrameShadow( TQFrame::Plain ); @@ -181,9 +181,9 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * Frame5_2Layout->addLayout( Layout21, 0, 0 ); - m_sheettqStatus = new TQLabel( Frame5_2, "m_tableStatus" ); - m_sheettqStatus->setText( " " ); - Frame5_2Layout->addWidget( m_sheettqStatus, 3, 0 ); + m_sheetStatus = new TQLabel( Frame5_2, "m_tableStatus" ); + m_sheetStatus->setText( " " ); + Frame5_2Layout->addWidget( m_sheetStatus, 3, 0 ); m_SelectSheetLabel = new TQLabel( Frame5_2, "m_SelectSheetLabel" ); m_SelectSheetLabel->setText( i18n( "Select tables:" ) ); @@ -198,7 +198,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * m_sheetLayout->addWidget( Frame5_2, 0, 1 ); TQFrame * Frame17_2 = new TQFrame( m_sheet, "Frame17_2" ); - Frame17_2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_2->sizePolicy().hasHeightForWidth() ) ); + Frame17_2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_2->sizePolicy().hasHeightForWidth() ) ); Frame17_2->setMinimumSize( TQSize( 111, 0 ) ); Frame17_2->setFrameShape( TQFrame::NoFrame ); Frame17_2->setFrameShadow( TQFrame::Plain ); @@ -227,14 +227,14 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * Frame5_2_2Layout->addWidget( m_columnView, 1, 0 ); - m_columnstqStatus = new TQLabel( Frame5_2_2, "m_columnsStatus" ); - m_columnstqStatus->setText( " " ); - Frame5_2_2Layout->addWidget( m_columnstqStatus, 2, 0 ); + m_columnsStatus = new TQLabel( Frame5_2_2, "m_columnsStatus" ); + m_columnsStatus->setText( " " ); + Frame5_2_2Layout->addWidget( m_columnsStatus, 2, 0 ); m_columnsLayout->addWidget( Frame5_2_2, 0, 1 ); TQFrame * Frame17_3 = new TQFrame( m_columns, "Frame17_3" ); - Frame17_3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_3->sizePolicy().hasHeightForWidth() ) ); + Frame17_3->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_3->sizePolicy().hasHeightForWidth() ) ); Frame17_3->setMinimumSize( TQSize( 111, 0 ) ); Frame17_3->setFrameShape( TQFrame::NoFrame ); Frame17_3->setFrameShadow( TQFrame::Plain ); @@ -353,7 +353,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * m_optionsLayout->addWidget( optionsFrame, 0, 1 ); TQFrame * Frame17_4 = new TQFrame( m_options, "Frame17_4" ); - Frame17_4->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_4->sizePolicy().hasHeightForWidth() ) ); + Frame17_4->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_4->sizePolicy().hasHeightForWidth() ) ); Frame17_4->setMinimumSize( TQSize( 111, 0 ) ); Frame17_4->setFrameShape( TQFrame::NoFrame ); Frame17_4->setFrameShadow( TQFrame::Plain ); @@ -402,7 +402,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * m_resultLayout->addWidget( Frame5_2_2_3, 0, 1 ); TQFrame * Frame17_5 = new TQFrame( m_result, "Frame17_5" ); - Frame17_5->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_5->sizePolicy().hasHeightForWidth() ) ); + Frame17_5->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_5->sizePolicy().hasHeightForWidth() ) ); Frame17_5->setMinimumSize( TQSize( 111, 0 ) ); Frame17_5->setFrameShape( TQFrame::NoFrame ); Frame17_5->setFrameShadow( TQFrame::Plain ); @@ -717,10 +717,10 @@ bool DatabaseDialog::databaseDoNext() m_dbConnection->setPort( port ); } - m_databasetqStatus->setText( i18n("Connecting to database...") ); + m_databaseStatus->setText( i18n("Connecting to database...") ); if ( m_dbConnection->open() ) { - m_databasetqStatus->setText( i18n("Connected. Retrieving table information...") ); + m_databaseStatus->setText( i18n("Connected. Retrieving table information...") ); TQStringList sheetList( m_dbConnection->tables() ); if ( sheetList.isEmpty() ) @@ -741,7 +741,7 @@ bool DatabaseDialog::databaseDoNext() } m_sheetView->setEnabled( true ); - m_databasetqStatus->setText( " " ); + m_databaseStatus->setText( " " ); } else { @@ -759,7 +759,7 @@ bool DatabaseDialog::databaseDoNext() errorMsg.append( error.databaseText() ); errorMsg.append( "\n" ); } - m_databasetqStatus->setText( " " ); + m_databaseStatus->setText( " " ); KMessageBox::error( this, errorMsg ); return false; @@ -768,7 +768,7 @@ bool DatabaseDialog::databaseDoNext() else { KMessageBox::error( this, i18n("Driver could not be loaded") ); - m_databasetqStatus->setText( " " ); + m_databaseStatus->setText( " " ); return false; } setNextEnabled(m_sheet, true); @@ -778,7 +778,7 @@ bool DatabaseDialog::databaseDoNext() bool DatabaseDialog::sheetsDoNext() { - m_databasetqStatus->setText( i18n("Retrieving meta data of tables...") ); + m_databaseStatus->setText( i18n("Retrieving meta data of tables...") ); TQStringList sheets; for (TQListViewItem * item = (TQCheckListItem *) m_sheetView->firstChild(); item; item = item->nextSibling()) diff --git a/kspread/dialogs/kspread_dlg_database.h b/kspread/dialogs/kspread_dlg_database.h index 6e82adc3..9334935c 100644 --- a/kspread/dialogs/kspread_dlg_database.h +++ b/kspread/dialogs/kspread_dlg_database.h @@ -88,7 +88,7 @@ class DatabaseDialog : public KWizard TQSqlDatabase * m_dbConnection; TQWidget * m_database; - TQLabel * m_databasetqStatus; + TQLabel * m_databaseStatus; TQLineEdit * m_username; TQLineEdit * m_port; TQLineEdit * m_databaseName; @@ -99,12 +99,12 @@ class DatabaseDialog : public KWizard TQWidget * m_sheet; TQComboBox * m_databaseList; KPushButton * m_connectButton; - TQLabel * m_sheettqStatus; + TQLabel * m_sheetStatus; TQLabel * m_SelectSheetLabel; KListView * m_sheetView; TQWidget * m_columns; KListView * m_columnView; - TQLabel * m_columnstqStatus; + TQLabel * m_columnsStatus; TQWidget * m_options; TQComboBox * m_columns_1; TQComboBox * m_columns_2; diff --git a/kspread/dialogs/kspread_dlg_find.cc b/kspread/dialogs/kspread_dlg_find.cc index d63bfd69..75330563 100644 --- a/kspread/dialogs/kspread_dlg_find.cc +++ b/kspread/dialogs/kspread_dlg_find.cc @@ -20,7 +20,7 @@ #include "kspread_dlg_find.h" #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <tqpushbutton.h> #include <tqlabel.h> @@ -30,17 +30,17 @@ using namespace KSpread; FindOption::FindOption( TQWidget *parent) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(parent); + TQVBoxLayout *layout = new TQVBoxLayout(parent); m_moreOptions = new TQPushButton( i18n( "More Options" ), parent ); - tqlayout->addWidget( m_moreOptions ); + layout->addWidget( m_moreOptions ); connect( m_moreOptions, TQT_SIGNAL( clicked () ), this, TQT_SLOT( slotMoreOptions() ) ); m_findExtension = new TQWidget( parent ); - tqlayout->addWidget( m_findExtension ); - TQVBoxLayout *tqlayout1 = new TQVBoxLayout( m_findExtension ); + layout->addWidget( m_findExtension ); + TQVBoxLayout *layout1 = new TQVBoxLayout( m_findExtension ); m_searchInAllSheet = new TQCheckBox( i18n( "Search entire sheet" ),m_findExtension ); - tqlayout1->addWidget( m_searchInAllSheet ); + layout1->addWidget( m_searchInAllSheet ); TQHBoxLayout *comboLayout = new TQHBoxLayout( m_findExtension ); TQLabel *label = new TQLabel( i18n( "Search in:" ), m_findExtension ); @@ -48,7 +48,7 @@ FindOption::FindOption( TQWidget *parent) m_searchIn = new TQComboBox( m_findExtension ); comboLayout->addWidget( m_searchIn ); - tqlayout1->addLayout( comboLayout ); + layout1->addLayout( comboLayout ); TQStringList lst; lst << i18n( "Cell Values" ); @@ -61,7 +61,7 @@ FindOption::FindOption( TQWidget *parent) m_searchDirection = new TQComboBox( m_findExtension ); comboLayout->addWidget( m_searchDirection ); - tqlayout1->addLayout( comboLayout ); + layout1->addLayout( comboLayout ); lst.clear(); lst << i18n( "Across then Down" ); @@ -120,7 +120,7 @@ FindDlg::FindDlg(TQWidget *parent, const char *name, long options, const TQStrin { m_findOptions = new FindOption( findExtension() ); connect( m_findOptions, TQT_SIGNAL( adjustSize() ), TQT_SLOT( slotAjustSize() ) ); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); } FindDlg::~FindDlg() @@ -144,7 +144,7 @@ SearchDlg::SearchDlg(TQWidget *parent, const char *name, long options, const TQS { m_findOptions = new FindOption( findExtension() ); connect( m_findOptions, TQT_SIGNAL( adjustSize() ), TQT_SLOT( slotAjustSize() ) ); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); } SearchDlg::~SearchDlg() diff --git a/kspread/dialogs/kspread_dlg_format.cc b/kspread/dialogs/kspread_dlg_format.cc index 6374c102..efb00f63 100644 --- a/kspread/dialogs/kspread_dlg_format.cc +++ b/kspread/dialogs/kspread_dlg_format.cc @@ -25,7 +25,7 @@ #include <tqcombobox.h> #include <tqfile.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqpushbutton.h> @@ -106,7 +106,7 @@ void FormatDialog::slotActivated( int index ) if ( img.isEmpty() ) { TQString str( i18n( "Could not find image %1." ) ); - str = str.tqarg( m_entries[ index ].image ); + str = str.arg( m_entries[ index ].image ); KMessageBox::error( this, str ); enableButtonOK(false); @@ -118,7 +118,7 @@ void FormatDialog::slotActivated( int index ) if ( pix.isNull() ) { TQString str( i18n( "Could not load image %1." ) ); - str = str.tqarg( img ); + str = str.arg( img ); KMessageBox::error( this,str ); enableButtonOK(false); @@ -138,7 +138,7 @@ void FormatDialog::slotOk() if ( xml.isEmpty() ) { TQString str( i18n( "Could not find sheet-style XML file '%1'." ) ); - str = str.tqarg( m_entries[ m_combo->currentItem() ].xml ); + str = str.arg( m_entries[ m_combo->currentItem() ].xml ); KMessageBox::error( this, str ); return; } @@ -152,7 +152,7 @@ void FormatDialog::slotOk() if ( !parseXML( doc ) ) { TQString str( i18n( "Parsing error in sheet-style XML file %1." ) ); - str = str.tqarg( m_entries[ m_combo->currentItem() ].xml ); + str = str.arg( m_entries[ m_combo->currentItem() ].xml ); KMessageBox::error( this, str ); return; } diff --git a/kspread/dialogs/kspread_dlg_formula.cc b/kspread/dialogs/kspread_dlg_formula.cc index 62e637f5..a63ff039 100644 --- a/kspread/dialogs/kspread_dlg_formula.cc +++ b/kspread/dialogs/kspread_dlg_formula.cc @@ -24,7 +24,7 @@ * Boston, MA 02110-1301, USA. */ -#include <tqtextbrowser.h> +#include <textbrowser.h> #include <tqtabwidget.h> #include "kspread_dlg_formula.h" @@ -49,7 +49,7 @@ #include <tqlabel.h> #include <tqpushbutton.h> #include <klineedit.h> -#include <tqlayout.h> +#include <layout.h> using namespace KSpread; @@ -87,7 +87,7 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for searchFunct = new KLineEdit(page); TQSizePolicy sp3( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); - searchFunct->tqsetSizePolicy( sp3 ); + searchFunct->setSizePolicy( sp3 ); grid1->addWidget( searchFunct, 0, 0 ); @@ -99,7 +99,7 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for functions = new TQListBox(page); TQSizePolicy sp1( TQSizePolicy::Preferred, TQSizePolicy::Expanding ); - functions->tqsetSizePolicy( sp1 ); + functions->setSizePolicy( sp1 ); grid1->addWidget( functions, 2, 0 ); selectFunction = new TQPushButton( page ); @@ -112,7 +112,7 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for m_tabwidget = new TQTabWidget( page ); TQSizePolicy sp2( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); - m_tabwidget->tqsetSizePolicy( sp2 ); + m_tabwidget->setSizePolicy( sp2 ); grid1->addMultiCellWidget( m_tabwidget, 0, 2, 1, 1 ); m_browser = new TQTextBrowser( m_tabwidget ); diff --git a/kspread/dialogs/kspread_dlg_goalseek.cc b/kspread/dialogs/kspread_dlg_goalseek.cc index 8902cf6c..44af6b68 100644 --- a/kspread/dialogs/kspread_dlg_goalseek.cc +++ b/kspread/dialogs/kspread_dlg_goalseek.cc @@ -44,7 +44,7 @@ #include <tqframe.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqtooltip.h> #include <tqvariant.h> @@ -152,7 +152,7 @@ GoalSeekDialog::GoalSeekDialog( View * parent, TQPoint const & marker, m_resultText = new TQLabel( m_resultFrame, "m_resultText" ); m_resultText->setText( "Goal seeking with cell <cell> found <a | no> solution:" ); - m_resultText->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); + m_resultText->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); m_resultFrameLayout->addMultiCellWidget( m_resultText, 0, 0, 0, 1 ); @@ -459,7 +459,7 @@ void GoalSeekDialog::startCalc(double _start, double _goal) // m_targetCell->setCalcDirtyFlag(); m_targetCell->calc( false ); - m_resultText->setText( i18n( "Goal seeking with cell %1 found a solution:" ).tqarg( m_sourceEdit->text() ) ); + m_resultText->setText( i18n( "Goal seeking with cell %1 found a solution:" ).arg( m_sourceEdit->text() ) ); m_newValue->setText( m_pView->doc()->locale()->formatNumber( startA ) ); m_currentValue->setText( m_pView->doc()->locale()->formatNumber( m_oldSource ) ); m_restored = false; @@ -471,7 +471,7 @@ void GoalSeekDialog::startCalc(double _start, double _goal) m_targetCell->setCalcDirtyFlag(); m_sourceCell->sheet()->setRegionPaintDirty(m_sourceCell->cellRect()); m_targetCell->calc( false ); - m_resultText->setText( i18n( "Goal seeking with cell %1 has found NO solution." ).tqarg( m_sourceEdit->text() ) ); + m_resultText->setText( i18n( "Goal seeking with cell %1 has found NO solution." ).arg( m_sourceEdit->text() ) ); m_newValue->setText( "" ); m_currentValue->setText( m_pView->doc()->locale()->formatNumber( m_oldSource ) ); m_restored = true; diff --git a/kspread/dialogs/kspread_dlg_goto.cc b/kspread/dialogs/kspread_dlg_goto.cc index 2d9935ac..83ae08bd 100644 --- a/kspread/dialogs/kspread_dlg_goto.cc +++ b/kspread/dialogs/kspread_dlg_goto.cc @@ -23,7 +23,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klineedit.h> diff --git a/kspread/dialogs/kspread_dlg_insert.cc b/kspread/dialogs/kspread_dlg_insert.cc index 8cd3f89f..f7b0ce44 100644 --- a/kspread/dialogs/kspread_dlg_insert.cc +++ b/kspread/dialogs/kspread_dlg_insert.cc @@ -27,7 +27,7 @@ #include <tqbuttongroup.h> #include <tqradiobutton.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <kbuttonbox.h> #include <kdebug.h> @@ -55,7 +55,7 @@ InsertDialog::InsertDialog( View* parent, const char* name,const TQRect &_rect,M TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Insert"),page); grp->setRadioButtonExclusive( TRUE ); - grp->tqlayout(); + grp->layout(); lay1->addWidget(grp); if( insRem==Insert) { diff --git a/kspread/dialogs/kspread_dlg_layout.cc b/kspread/dialogs/kspread_dlg_layout.cc index 53942457..2bac0636 100644 --- a/kspread/dialogs/kspread_dlg_layout.cc +++ b/kspread/dialogs/kspread_dlg_layout.cc @@ -36,7 +36,7 @@ #include <tqcheckbox.h> #include <tqframe.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <tqfontdatabase.h> #include <tqradiobutton.h> @@ -78,7 +78,7 @@ PatternSelect::PatternSelect( TQWidget *parent, const char * ) { penStyle = Qt::NoPen; penWidth = 1; - penColor = tqcolorGroup().text(); + penColor = colorGroup().text(); selected = false; undefined = false; } @@ -88,7 +88,7 @@ void PatternSelect::setPattern( const TQColor &_color, int _width, Qt::PenStyle penStyle = _style; penColor = _color; penWidth = _width; - tqrepaint(); + repaint(); } void PatternSelect::setUndefined() @@ -127,7 +127,7 @@ void PatternSelect::slotUnselect() setLineWidth( 1 ); setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - tqrepaint(); + repaint(); } void PatternSelect::slotSelect() @@ -136,7 +136,7 @@ void PatternSelect::slotSelect() setLineWidth( 2 ); setFrameStyle( TQFrame::Panel | TQFrame::Plain ); - tqrepaint(); + repaint(); } @@ -151,16 +151,16 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg ) : TQWidget( parent ), m_dlg( dlg ) { - TQGridLayout * tqlayout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint(), "tqlayout"); + TQGridLayout * layout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint(), "layout"); TQGroupBox * groupBox = new TQGroupBox( this, "groupBox1" ); groupBox->setColumnLayout(0, Qt::Vertical ); groupBox->setTitle( i18n( "Style" ) ); - groupBox->tqlayout()->setSpacing( KDialog::spacingHint() ); - groupBox->tqlayout()->setMargin( KDialog::marginHint() ); + groupBox->layout()->setSpacing( KDialog::spacingHint() ); + groupBox->layout()->setMargin( KDialog::marginHint() ); - TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->tqlayout() ); - groupBoxLayout->tqsetAlignment( TQt::AlignTop ); + TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->layout() ); + groupBoxLayout->setAlignment( TQt::AlignTop ); TQLabel * label1 = new TQLabel( groupBox, "label1" ); label1->setText( i18n( "Name:" ) ); @@ -198,8 +198,8 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg ) TQSpacerItem * spacer = new TQSpacerItem( 20, 260, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout->addWidget( groupBox, 0, 0 ); - tqlayout->addItem( spacer, 1, 0 ); + layout->addWidget( groupBox, 0, 0 ); + layout->addItem( spacer, 1, 0 ); if ( m_dlg->getStyle()->type() == Style::BUILTIN ) { @@ -207,7 +207,7 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg ) m_parentBox->setEnabled( false ); } - resize( TQSize( 534, 447 ).expandedTo(tqminimumSizeHint()) ); + resize( TQSize( 534, 447 ).expandedTo(minimumSizeHint()) ); } GeneralTab::~GeneralTab() @@ -262,7 +262,7 @@ bool GeneralTab::checkParent( const TQString & parentName ) { KMessageBox::sorry( this, i18n( "The style cannot inherit from '%1' because of recursive references." ) - .tqarg( m_parentBox->currentText() ) ); + .arg( m_parentBox->currentText() ) ); return false; } @@ -886,12 +886,12 @@ void CellFormatDialog::initParameters(Format *obj,int x,int y) void CellFormatDialog::init() { - TQColorGroup tqcolorGroup = TQApplication::tqpalette().active(); + TQColorGroup colorGroup = TQApplication::palette().active(); // Did we initialize the bitmaps ? if ( formatOnlyNegSignedPixmap == 0L ) { - TQColor black = tqcolorGroup.text(); // not necessarily black :) + TQColor black = colorGroup.text(); // not necessarily black :) formatOnlyNegSignedPixmap = paintFormatPixmap( "123.456", black, "-123.456", black ); formatRedOnlyNegSignedPixmap = paintFormatPixmap( "123.456", black, "-123.456", TQt::red ); formatRedNeverSignedPixmap = paintFormatPixmap( "123.456", black, "123.456", TQt::red ); @@ -948,7 +948,7 @@ TQPixmap * CellFormatDialog::paintFormatPixmap( const char * _string1, const TQC TQPainter painter; painter.begin( pixmap ); - painter.fillRect( 0, 0, 150, 14, TQApplication::tqpalette().active().base() ); + painter.fillRect( 0, 0, 150, 14, TQApplication::palette().active().base() ); painter.setPen( _color1 ); painter.drawText( 2, 11, TQString(_string1) ); painter.setPen( _color2 ); @@ -1082,7 +1082,7 @@ CellFormatPageFloat::CellFormatPageFloat( TQWidget* parent, CellFormatDialog *_d : TQWidget ( parent ), dlg( _dlg ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 6,10 ); + TQVBoxLayout* layout = new TQVBoxLayout( this, 6,10 ); TQButtonGroup *grp = new TQButtonGroup( i18n("Format"),this); TQGridLayout *grid = new TQGridLayout(grp,11,2,KDialog::marginHint(), KDialog::spacingHint()); @@ -1149,7 +1149,7 @@ CellFormatPageFloat::CellFormatPageFloat( TQWidget* parent, CellFormatDialog *_d listFormat=new TQListBox(grp); grid->addMultiCellWidget(listFormat,2,7,1,1); TQWhatsThis::add(listFormat, i18n( "Displays choices of format for the fraction, date or time formats." ) ); - tqlayout->addWidget(grp); + layout->addWidget(grp); /* *** */ @@ -1245,7 +1245,7 @@ CellFormatPageFloat::CellFormatPageFloat( TQWidget* parent, CellFormatDialog *_d format->setCurrentItem( 3 ); else if ( dlg->floatFormat == Format::AlwaysSigned && dlg->floatColor == Format::NegRed ) format->setCurrentItem( 4 ); - tqlayout->addWidget(box); + layout->addWidget(box); cellFormatType=dlg->formatType; newFormatType = cellFormatType; @@ -1465,8 +1465,8 @@ void CellFormatPageFloat::init() TQString tmp; TQString tmp2; TQDate tmpDate( 2000,2,18); - list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::tqcurrentDate(), true); - list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::tqcurrentDate(), false); + list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::currentDate(), true); + list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::currentDate(), false); ValueFormatter *fmt = dlg->getDoc()->formatter(); @@ -1965,7 +1965,7 @@ CellFormatPageFont::CellFormatPageFont( TQWidget* parent, CellFormatDialog *_dlg TQStringList tmpListFont; TQFontDatabase *fontDataBase = new TQFontDatabase(); - tmpListFont = fontDataBase->tqfamilies(); + tmpListFont = fontDataBase->families(); delete fontDataBase; family_combo->insertStringList( tmpListFont); @@ -1996,7 +1996,7 @@ CellFormatPageFont::CellFormatPageFont( TQWidget* parent, CellFormatDialog *_dlg TQStringList lst; lst.append(""); for ( unsigned int i = 1; i < 100; ++i ) - lst.append( TQString( "%1" ).tqarg( i ) ); + lst.append( TQString( "%1" ).arg( i ) ); size_combo->insertStringList( lst ); @@ -2151,7 +2151,7 @@ void CellFormatPageFont::display_example(const TQFont& font) TQString string; fontChanged=true; example_label->setFont(font); - example_label->tqrepaint(); + example_label->repaint(); } void CellFormatPageFont::setCombos() @@ -2164,10 +2164,10 @@ void CellFormatPageFont::setCombos() if ( dlg->bTextColor ) textColor = dlg->textColor; else - textColor = tqcolorGroup().text(); + textColor = colorGroup().text(); if ( !textColor.isValid() ) - textColor =tqcolorGroup().text(); + textColor =colorGroup().text(); textColorButton->setColor( textColor ); @@ -2281,7 +2281,7 @@ CellFormatPagePosition::CellFormatPagePosition( TQWidget* parent, CellFormatDial if ( dlg->isRowSelected ) width->setEnabled(false); - defaultWidth->setText(i18n("Default width (%1 %2)").tqarg(KoUnit::toUserValue(dlg->defaultWidthSize, dlg->getDoc()->unit()), 0, 'f', 2).tqarg(dlg->getDoc()->unitName())); + defaultWidth->setText(i18n("Default width (%1 %2)").arg(KoUnit::toUserValue(dlg->defaultWidthSize, dlg->getDoc()->unit()), 0, 'f', 2).arg(dlg->getDoc()->unitName())); if ( dlg->isRowSelected ) defaultWidth->setEnabled(false); @@ -2296,7 +2296,7 @@ CellFormatPagePosition::CellFormatPagePosition( TQWidget* parent, CellFormatDial if ( dlg->isColumnSelected ) height->setEnabled(false); - defaultHeight->setText(i18n("Default height (%1 %2)").tqarg(KoUnit::toUserValue(dlg->defaultHeightSize, dlg->getDoc()->unit()), 0, 'f', 2).tqarg(dlg->getDoc()->unitName())); //annma + defaultHeight->setText(i18n("Default height (%1 %2)").arg(KoUnit::toUserValue(dlg->defaultHeightSize, dlg->getDoc()->unit()), 0, 'f', 2).arg(dlg->getDoc()->unitName())); //annma if ( dlg->isColumnSelected ) defaultHeight->setEnabled(false); @@ -2533,7 +2533,7 @@ BorderButton::BorderButton( TQWidget *parent, const char *_name ) : TQPushButton { penStyle = Qt::NoPen; penWidth = 1; - penColor = tqcolorGroup().text(); + penColor = colorGroup().text(); setToggleButton( true ); setOn( false); setChanged(false); @@ -2549,7 +2549,7 @@ void BorderButton::setUndefined() { setPenStyle(Qt::SolidLine ); setPenWidth(1); - setColor(tqcolorGroup().midlight()); + setColor(colorGroup().midlight()); } @@ -2558,7 +2558,7 @@ void BorderButton::unselect() setOn(false); setPenWidth(1); setPenStyle(Qt::NoPen); - setColor( tqcolorGroup().text() ); + setColor( colorGroup().text() ); setChanged(true); } @@ -2586,7 +2586,7 @@ void Border::paintEvent( TQPaintEvent *_ev ) TQPen pen; TQPainter painter; painter.begin( this ); - pen=TQPen( tqcolorGroup().midlight(),2,SolidLine); + pen=TQPen( colorGroup().midlight(),2,SolidLine); painter.setPen( pen ); painter.drawLine( OFFSETX-5, OFFSETY, OFFSETX , OFFSETY ); @@ -2678,18 +2678,18 @@ void CellFormatPageBorder::InitializeGrids() { {0,0}, {0,1},{0,2} }; /***********************/ - /* set up a tqlayout box for most of the border setting buttons */ + /* set up a layout box for most of the border setting buttons */ tmpTQGroupBox = new TQGroupBox( this, "GroupBox_1" ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); tmpTQGroupBox->setTitle( i18n("Border") ); - tmpTQGroupBox->tqsetAlignment( AlignLeft ); + tmpTQGroupBox->setAlignment( AlignLeft ); grid2 = new TQGridLayout(tmpTQGroupBox,6,5,KDialog::marginHint(), KDialog::spacingHint()); int fHeight = tmpTQGroupBox->fontMetrics().height(); grid2->addRowSpacing( 0, fHeight/2 ); // groupbox title area=new Border(tmpTQGroupBox,"area",dlg->oneCol,dlg->oneRow); grid2->addMultiCellWidget(area,2,4,1,3); - area->setBackgroundColor( tqcolorGroup().base() ); + area->setBackgroundColor( colorGroup().base() ); /* initailize the buttons that are in this box */ for (int i=BorderType_Top; i < BorderType_END; i++) @@ -2709,7 +2709,7 @@ void CellFormatPageBorder::InitializeGrids() tmpTQGroupBox = new TQGroupBox( this, "GroupBox_3" ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); tmpTQGroupBox->setTitle( i18n("Preselect") ); - tmpTQGroupBox->tqsetAlignment( AlignLeft ); + tmpTQGroupBox->setAlignment( AlignLeft ); grid2 = new TQGridLayout(tmpTQGroupBox,1,3,KDialog::marginHint(), KDialog::spacingHint()); @@ -2748,7 +2748,7 @@ void CellFormatPageBorder::InitializeGrids() tmpTQGroupBox = new TQGroupBox( this, "GroupBox_10" ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); tmpTQGroupBox->setTitle( i18n("Pattern") ); - tmpTQGroupBox->tqsetAlignment( AlignLeft ); + tmpTQGroupBox->setAlignment( AlignLeft ); grid2 = new TQGridLayout(tmpTQGroupBox,7,2,KDialog::marginHint(), KDialog::spacingHint()); fHeight = tmpTQGroupBox->fontMetrics().height(); @@ -2804,7 +2804,7 @@ void CellFormatPageBorder::InitializeGrids() style->insertItem(paintFormatPixmap(DashDotLine),2 ); style->insertItem(paintFormatPixmap(DashDotDotLine),3 ); style->insertItem(paintFormatPixmap(SolidLine),4); - style->setBackgroundColor( tqcolorGroup().background() ); + style->setBackgroundColor( colorGroup().background() ); grid2->addMultiCell(grid3,6,6,0,1); grid->addMultiCellWidget(tmpTQGroupBox,0,3,1,1); @@ -2813,7 +2813,7 @@ void CellFormatPageBorder::InitializeGrids() tmpTQGroupBox = new TQGroupBox(this, "GroupBox_4" ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); tmpTQGroupBox->setTitle( i18n("Preview") ); - tmpTQGroupBox->tqsetAlignment( AlignLeft ); + tmpTQGroupBox->setAlignment( AlignLeft ); grid2 = new TQGridLayout(tmpTQGroupBox,1,1,KDialog::marginHint(), KDialog::spacingHint()); fHeight = tmpTQGroupBox->fontMetrics().height(); @@ -2970,9 +2970,9 @@ TQPixmap CellFormatPageBorder::paintFormatPixmap(PenStyle _style) TQPixmap pixmap( style->width(), 14 ); TQPainter painter; TQPen pen; - pen=TQPen( tqcolorGroup().text(),1,_style); + pen=TQPen( colorGroup().text(),1,_style); painter.begin( &pixmap ); - painter.fillRect( 0, 0, style->width(), 14, tqcolorGroup().background() ); + painter.fillRect( 0, 0, style->width(), 14, colorGroup().background() ); painter.setPen( pen ); painter.drawLine( 0, 7, style->width(), 7 ); painter.end(); @@ -3223,7 +3223,7 @@ void CellFormatPageBorder::preselect( BorderButton *_p ) vertical->setChanged(true); } } - area->tqrepaint(); + area->repaint(); } void CellFormatPageBorder::changeState( BorderButton *_p) @@ -3240,10 +3240,10 @@ void CellFormatPageBorder::changeState( BorderButton *_p) { _p->setPenWidth(1); _p->setPenStyle(Qt::NoPen); - _p->setColor( tqcolorGroup().text() ); + _p->setColor( colorGroup().text() ); } - area->tqrepaint(); + area->repaint(); } void CellFormatPageBorder::draw() @@ -3483,7 +3483,7 @@ if (rect.contains(TQPoint(_ev->x(),_ev->y()))) } } - area->tqrepaint(); + area->repaint(); } @@ -3505,7 +3505,7 @@ void BrushSelect::setPattern( const TQColor &_color,Qt::BrushStyle _style ) { brushStyle = _style; brushColor = _color; - tqrepaint(); + repaint(); } @@ -3535,7 +3535,7 @@ void BrushSelect::slotUnselect() setLineWidth( 1 ); setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - tqrepaint(); + repaint(); } void BrushSelect::slotSelect() @@ -3544,7 +3544,7 @@ void BrushSelect::slotSelect() setLineWidth( 2 ); setFrameStyle( TQFrame::Panel | TQFrame::Plain ); - tqrepaint(); + repaint(); } @@ -3567,7 +3567,7 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog tmpTQGroupBox = new TQGroupBox( this, "GroupBox_20" ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); tmpTQGroupBox->setTitle( i18n("Pattern") ); - tmpTQGroupBox->tqsetAlignment( AlignLeft ); + tmpTQGroupBox->setAlignment( AlignLeft ); TQGridLayout *grid2 = new TQGridLayout(tmpTQGroupBox,8,3,KDialog::marginHint(), KDialog::spacingHint()); int fHeight = tmpTQGroupBox->fontMetrics().height(); @@ -3656,10 +3656,10 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog if ( dlg->bBgColor ) bgColor = dlg->bgColor; else - bgColor = tqcolorGroup().base(); + bgColor = colorGroup().base(); if (!bgColor.isValid()) - bgColor = tqcolorGroup().base(); + bgColor = colorGroup().base(); bgColorButton->setColor( bgColor ); connect( bgColorButton, TQT_SIGNAL( changed( const TQColor & ) ), @@ -3678,7 +3678,7 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog tmpTQGroupBox = new TQGroupBox( this, "GroupBox1" ); tmpTQGroupBox->setTitle( i18n("Preview") ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); - tmpTQGroupBox->tqsetAlignment( AlignLeft ); + tmpTQGroupBox->setAlignment( AlignLeft ); grid2 = new TQGridLayout(tmpTQGroupBox,2,1,KDialog::marginHint(), KDialog::spacingHint()); fHeight = tmpTQGroupBox->fontMetrics().height(); @@ -3753,8 +3753,8 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog void CellFormatPagePattern::slotNotAnyColor() { b_notAnyColor = true; - bgColorButton->setColor( tqcolorGroup().base() ); - current->setBackgroundColor( tqcolorGroup().base() ); + bgColorButton->setColor( colorGroup().base() ); + current->setBackgroundColor( colorGroup().base() ); } void CellFormatPagePattern::slotSetBackgroundColor( const TQColor &_color ) diff --git a/kspread/dialogs/kspread_dlg_layout.h b/kspread/dialogs/kspread_dlg_layout.h index b8ec0bba..8d38663a 100644 --- a/kspread/dialogs/kspread_dlg_layout.h +++ b/kspread/dialogs/kspread_dlg_layout.h @@ -101,16 +101,16 @@ class PatternSelect : public TQFrame public: PatternSelect( TQWidget *parent, const char *_name ); - void setPenStyle( Qt::PenStyle _pat ) { penStyle = _pat; tqrepaint(); } + void setPenStyle( Qt::PenStyle _pat ) { penStyle = _pat; repaint(); } Qt::PenStyle getPenStyle() { return penStyle; } - void setColor( const TQColor &_col ) { penColor = _col; tqrepaint(); } + void setColor( const TQColor &_col ) { penColor = _col; repaint(); } const TQColor& getColor() { return penColor; } - void setPenWidth( int _w ) { penWidth = _w; tqrepaint(); } + void setPenWidth( int _w ) { penWidth = _w; repaint(); } int getPenWidth() { return penWidth; } void setPattern( const TQColor &_color, int _width, Qt::PenStyle _style ); void setUndefined(); - void setDefined() { undefined = FALSE; tqrepaint(); } + void setDefined() { undefined = FALSE; repaint(); } bool isDefined() { return !undefined; } @@ -389,7 +389,7 @@ class BrushSelect : public TQFrame public: BrushSelect( TQWidget *parent, const char *_name ); - void setBrushStyle( Qt::BrushStyle _pat ) { brushStyle = _pat; tqrepaint(); } + void setBrushStyle( Qt::BrushStyle _pat ) { brushStyle = _pat; repaint(); } Qt::BrushStyle getBrushStyle() const { return brushStyle; } TQColor getBrushColor() const { return brushColor; } void setBrushColor(const TQColor &_c) { brushColor=_c;} diff --git a/kspread/dialogs/kspread_dlg_list.cc b/kspread/dialogs/kspread_dlg_list.cc index f4e03269..cdff22f1 100644 --- a/kspread/dialogs/kspread_dlg_list.cc +++ b/kspread/dialogs/kspread_dlg_list.cc @@ -20,7 +20,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqlistbox.h> #include <tqmultilineedit.h> diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cc b/kspread/dialogs/kspread_dlg_paperlayout.cc index f0e6f664..6e89e2cf 100644 --- a/kspread/dialogs/kspread_dlg_paperlayout.cc +++ b/kspread/dialogs/kspread_dlg_paperlayout.cc @@ -37,7 +37,7 @@ #include <tqradiobutton.h> #include <tqbuttongroup.h> #include <tqcombobox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqhgroupbox.h> #include <kapplication.h> @@ -48,11 +48,11 @@ using namespace KSpread; PaperLayout::PaperLayout( TQWidget * parent, const char * name, - const KoPageLayout & tqlayout, + const KoPageLayout & layout, const KoHeadFoot & headfoot, int tabs, KoUnit::Unit unit, Sheet * sheet, View * view) - : KoPageLayoutDia( parent, name, tqlayout, headfoot, tabs, unit, false /*no modal*/), + : KoPageLayoutDia( parent, name, layout, headfoot, tabs, unit, false /*no modal*/), m_pSheet( sheet ), m_pView( view ) { @@ -130,7 +130,7 @@ void PaperLayout::initRanges( TQWidget * tab, TQVBoxLayout * vbox ) rangeGroup->setMargin( KDialog::marginHint() ); vbox->addWidget( rangeGroup ); - TQGridLayout *grid = new TQGridLayout( rangeGroup->tqlayout(), 3, 2, KDialog::spacingHint() ); + TQGridLayout *grid = new TQGridLayout( rangeGroup->layout(), 3, 2, KDialog::spacingHint() ); TQLabel *pPrintRange = new TQLabel ( i18n("Print range:"), rangeGroup ); grid->addWidget( pPrintRange, 0, 0 ); @@ -182,7 +182,7 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox ) zoomGroup->setMargin( KDialog::marginHint() ); vbox->addWidget( zoomGroup ); - TQGridLayout *grid = new TQGridLayout( zoomGroup->tqlayout(), 2, 6, + TQGridLayout *grid = new TQGridLayout( zoomGroup->layout(), 2, 6, KDialog::spacingHint() ); m_rScalingZoom = new TQRadioButton ( i18n("Zoom:"), zoomGroup ); @@ -194,17 +194,17 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox ) TQStringList lst; for( int i = 5; i < 500; i += 5 ) { - lst.append( TQString( i18n( "%1%" ) ).tqarg( i ) ); + lst.append( TQString( i18n( "%1%" ) ).arg( i ) ); if( tqRound( print->zoom() * 100 ) > i && tqRound( print->zoom() * 100 ) < i + 5 ) { - lst.append( TQString( i18n( "%1%" ) ).tqarg( tqRound( print->zoom() * 100 ) ) ); + lst.append( TQString( i18n( "%1%" ) ).arg( tqRound( print->zoom() * 100 ) ) ); } } m_cZoom->insertStringList( lst ); int number_of_entries = m_cZoom->count(); - TQString string = TQString( i18n( "%1%" ) ).tqarg( tqRound( print->zoom() * 100 ) ); + TQString string = TQString( i18n( "%1%" ) ).arg( tqRound( print->zoom() * 100 ) ); for (int i = 0; i < number_of_entries ; i++) { if ( string == (TQString) m_cZoom->text(i) ) @@ -227,11 +227,11 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox ) lstX.append( i18n( "No Limit" ) ); for( int i = 1; i <= 20; i += 1 ) { - lstX.append( TQString( "%1" ).tqarg( i ) ); + lstX.append( TQString( "%1" ).arg( i ) ); } if( print->pageLimitX() > 20 ) { - lstX.append( TQString( "%1" ).tqarg( print->pageLimitX() ) ); + lstX.append( TQString( "%1" ).arg( print->pageLimitX() ) ); } m_cLimitPagesX->insertStringList( lstX ); @@ -250,11 +250,11 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox ) lstY.append( i18n( "No Limit" ) ); for( int i = 1; i <= 20; i += 1 ) { - lstY.append( TQString( "%1" ).tqarg( i ) ); + lstY.append( TQString( "%1" ).arg( i ) ); } if( print->pageLimitY() > 20 ) { - lstY.append( TQString( "%1" ).tqarg( print->pageLimitY() ) ); + lstY.append( TQString( "%1" ).arg( print->pageLimitY() ) ); } m_cLimitPagesY->insertStringList( lstY ); @@ -312,7 +312,7 @@ void PaperLayout::slotOk() { SheetPrint *print = sheet->print(); - KoPageLayout pl = tqlayout(); + KoPageLayout pl = layout(); KoHeadFoot hf = headFoot(); KoUnit::Unit unit = sheet->doc()->unit(); print->setPrintGrid( pPrintGrid->isChecked() ); @@ -407,7 +407,7 @@ void PaperLayout::slotOk() if ( m_rScalingZoom->isChecked() ) { kdDebug() << "Zoom is selected" << endl; - if( TQString( "%1%" ).tqarg( tqRound( print->zoom() * 100 ) ) != m_cZoom->currentText() ) + if( TQString( "%1%" ).arg( tqRound( print->zoom() * 100 ) ) != m_cZoom->currentText() ) { kdDebug() << "New zoom is different than original: " << m_cZoom->currentText() << endl; TQString zoomtext = m_cZoom->currentText(); diff --git a/kspread/dialogs/kspread_dlg_paperlayout.h b/kspread/dialogs/kspread_dlg_paperlayout.h index c9a9e6e5..0260c1c8 100644 --- a/kspread/dialogs/kspread_dlg_paperlayout.h +++ b/kspread/dialogs/kspread_dlg_paperlayout.h @@ -42,7 +42,7 @@ class PaperLayout: public KoPageLayoutDia TQ_OBJECT public: PaperLayout( TQWidget* parent, const char* name, - const KoPageLayout& tqlayout, + const KoPageLayout& layout, const KoHeadFoot& headfoot, int tabs, KoUnit::Unit unit, Sheet * sheet, View *view); diff --git a/kspread/dialogs/kspread_dlg_pasteinsert.cc b/kspread/dialogs/kspread_dlg_pasteinsert.cc index 9b54644d..8dda529e 100644 --- a/kspread/dialogs/kspread_dlg_pasteinsert.cc +++ b/kspread/dialogs/kspread_dlg_pasteinsert.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kbuttonbox.h> #include <tqbuttongroup.h> @@ -49,7 +49,7 @@ PasteInsertDialog::PasteInsertDialog( View* parent, const char* name,const TQRec TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Insert"),page); grp->setRadioButtonExclusive( TRUE ); - grp->tqlayout(); + grp->layout(); lay1->addWidget(grp); rb1 = new TQRadioButton( i18n("Move towards right"), grp ); rb2 = new TQRadioButton( i18n("Move towards bottom"), grp ); diff --git a/kspread/dialogs/kspread_dlg_preference.cc b/kspread/dialogs/kspread_dlg_preference.cc index 51ca3cdc..531e6260 100644 --- a/kspread/dialogs/kspread_dlg_preference.cc +++ b/kspread/dialogs/kspread_dlg_preference.cc @@ -26,7 +26,7 @@ */ #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqcombobox.h> #include <tqvgroupbox.h> @@ -192,12 +192,12 @@ void parameterLocale::updateDefaultSystemConfig() void parameterLocale::updateToMatchLocale(KLocale* locale) { - m_language->setText( i18n("Language: %1").tqarg( locale->language() )); - m_number->setText( i18n("Default number format: %1").tqarg( locale->formatNumber(12.55) )); - m_date->setText( i18n("Long date format: %1").tqarg( locale->formatDate( TQDate::tqcurrentDate() ))); - m_shortDate->setText( i18n("Short date format: %1").tqarg( locale->formatDate( TQDate::tqcurrentDate() ,true) )); - m_time->setText( i18n("Time format: %1").tqarg( locale->formatTime( TQTime::currentTime() ) )); - m_money->setText( i18n("Currency format: %1").tqarg( locale->formatMoney(12.55) )); + m_language->setText( i18n("Language: %1").arg( locale->language() )); + m_number->setText( i18n("Default number format: %1").arg( locale->formatNumber(12.55) )); + m_date->setText( i18n("Long date format: %1").arg( locale->formatDate( TQDate::currentDate() ))); + m_shortDate->setText( i18n("Short date format: %1").arg( locale->formatDate( TQDate::currentDate() ,true) )); + m_time->setText( i18n("Time format: %1").arg( locale->formatTime( TQTime::currentTime() ) )); + m_money->setText( i18n("Currency format: %1").arg( locale->formatMoney(12.55) )); } configure::configure( View* _view, TQVBox *box , char *name ) @@ -488,7 +488,7 @@ miscParameters::miscParameters( View* _view,TQVBox *box, char *name ) // valIndent->setRange( 0.0, 100.0, 10.0 ); valIndent->setValue ( KoUnit::toUserValue( _indent, indentUnit ) ); TQWhatsThis::add(valIndent, i18n( "Lets you define the amount of indenting used by the Increase Indent and Decrease Indent option in the Format menu." ) ); - valIndent->setLabel(i18n("&Indentation step (%1):").tqarg(KoUnit::unitName(indentUnit))); + valIndent->setLabel(i18n("&Indentation step (%1):").arg(KoUnit::unitName(indentUnit))); msgError= new TQCheckBox(i18n("&Show error message for invalid formulae"),tmpTQGroupBox); msgError->setChecked(m_bMsgError); @@ -790,10 +790,10 @@ configureLayoutPage::configureLayoutPage( View* _view,TQVBox *box , char *name ) m_pView = _view; TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Default Parameters"), box, "GroupBox" ); - tmpTQGroupBox->tqlayout()->setSpacing(KDialog::spacingHint()); - tmpTQGroupBox->tqlayout()->setMargin(KDialog::marginHint()); + tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint()); + tmpTQGroupBox->layout()->setMargin(KDialog::marginHint()); - TQGridLayout *grid1 = new TQGridLayout(tmpTQGroupBox->tqlayout(),8,1); + TQGridLayout *grid1 = new TQGridLayout(tmpTQGroupBox->layout(),8,1); grid1->addRowSpacing( 0, KDialog::marginHint() ); grid1->setRowStretch( 7, 10 ); @@ -905,7 +905,7 @@ configureSpellPage::configureSpellPage( View* _view,TQVBox *box , char *name ) TQWhatsThis::add(dontCheckTitleCase, i18n( "Check this box if you want the spellchecker to ignore the title case, for example My Own Spreadsheet or My own spreadsheet. If this is unchecked, the spell checker will ask for a uppercase letter in the title nouns." ) ); TQWidget* spacer = new TQWidget( box ); - spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); + spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); if( config->hasGroup("KSpell kspread") ) { diff --git a/kspread/dialogs/kspread_dlg_reference.cc b/kspread/dialogs/kspread_dlg_reference.cc index c456efb3..7c3007e8 100644 --- a/kspread/dialogs/kspread_dlg_reference.cc +++ b/kspread/dialogs/kspread_dlg_reference.cc @@ -40,7 +40,7 @@ #include <tqlabel.h> #include <tqlineedit.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <kbuttonbox.h> #include <kmessagebox.h> @@ -75,7 +75,7 @@ reference::reference( View* parent, const char* name ) m_pOk = bb->addButton( KStdGuiItem::ok() ); m_pCancel = bb->addButton( KStdGuiItem::cancel() ); m_pOk->setDefault( TRUE ); - bb->tqlayout(); + bb->layout(); lay1->addWidget( bb ); TQString text; @@ -110,7 +110,7 @@ reference::reference( View* parent, const char* name ) TQT_SLOT(slotDoubleClicked(TQListBoxItem *))); connect( m_list, TQT_SIGNAL(highlighted ( TQListBoxItem * ) ), this, TQT_SLOT(slotHighlighted(TQListBoxItem * ))); - m_rangeName->setText(i18n("Area: %1").tqarg("")); + m_rangeName->setText(i18n("Area: %1").arg("")); resize( 250, 200 ); } @@ -134,7 +134,7 @@ void reference::displayAreaValues(TQString const & areaName) } } - tmpName = i18n("Area: %1").tqarg(tmpName); + tmpName = i18n("Area: %1").arg(tmpName); m_rangeName->setText(tmpName); } @@ -206,7 +206,7 @@ void reference::slotEdit() EditAreaName editDlg( m_pView, "EditArea", name ); editDlg.exec(); - m_rangeName->setText(i18n("Area: %1").tqarg("")); + m_rangeName->setText(i18n("Area: %1").arg("")); TQString tmp = m_list->text(m_list->currentItem()); if (!tmp.isEmpty()) displayAreaValues( tmp ); @@ -254,7 +254,7 @@ EditAreaName::EditAreaName( View * parent, m_pView = parent; resize( 350, 142 ); - tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, + setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)4, 0, 0, sizePolicy().hasHeightForWidth() ) ); diff --git a/kspread/dialogs/kspread_dlg_resize2.cc b/kspread/dialogs/kspread_dlg_resize2.cc index e6d74d26..4185847e 100644 --- a/kspread/dialogs/kspread_dlg_resize2.cc +++ b/kspread/dialogs/kspread_dlg_resize2.cc @@ -26,7 +26,7 @@ #include <float.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <knuminput.h> diff --git a/kspread/dialogs/kspread_dlg_series.cc b/kspread/dialogs/kspread_dlg_series.cc index 0158dd2a..4ce74abd 100644 --- a/kspread/dialogs/kspread_dlg_series.cc +++ b/kspread/dialogs/kspread_dlg_series.cc @@ -30,7 +30,7 @@ #include "kspread_sheet.h" #include "kspread_view.h" -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <tqlabel.h> diff --git a/kspread/dialogs/kspread_dlg_show.cc b/kspread/dialogs/kspread_dlg_show.cc index c73f71ec..e497a790 100644 --- a/kspread/dialogs/kspread_dlg_show.cc +++ b/kspread/dialogs/kspread_dlg_show.cc @@ -22,7 +22,7 @@ * Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <tqlistbox.h> #include <tqlabel.h> diff --git a/kspread/dialogs/kspread_dlg_showColRow.cc b/kspread/dialogs/kspread_dlg_showColRow.cc index 75a50cc3..450737a1 100644 --- a/kspread/dialogs/kspread_dlg_showColRow.cc +++ b/kspread/dialogs/kspread_dlg_showColRow.cc @@ -21,7 +21,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> @@ -78,9 +78,9 @@ ShowColRow::ShowColRow( View* parent, const char* name, Type _type ) for( it = listInt.begin(); it != listInt.end(); ++it ) { if(!showColNumber) - listCol+=i18n("Column: %1").tqarg(Cell::columnName(*it)); + listCol+=i18n("Column: %1").arg(Cell::columnName(*it)); else - listCol+=i18n("Column: %1").tqarg(text.setNum(*it)); + listCol+=i18n("Column: %1").arg(text.setNum(*it)); } list->insertStringList(listCol); } @@ -98,7 +98,7 @@ ShowColRow::ShowColRow( View* parent, const char* name, Type _type ) qHeapSort(listInt); TQValueList<int>::Iterator it; for( it = listInt.begin(); it != listInt.end(); ++it ) - listRow+=i18n("Row: %1").tqarg(text.setNum(*it)); + listRow+=i18n("Row: %1").arg(text.setNum(*it)); list->insertStringList(listRow); } diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc index 1e58ccf5..4ce0d91e 100644 --- a/kspread/dialogs/kspread_dlg_sort.cc +++ b/kspread/dialogs/kspread_dlg_sort.cc @@ -32,7 +32,7 @@ #include <tqcombobox.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqradiobutton.h> @@ -85,7 +85,7 @@ SortDialog::SortDialog( View * parent, const char * name, TQHButtonGroup * orientationGroup = new TQHButtonGroup( layoutGroup, "orientationGroup" ); orientationGroup->setLineWidth(0); orientationGroup->setMargin(0); - orientationGroup->tqlayout()->setMargin(0); + orientationGroup->layout()->setMargin(0); m_sortColumn = new TQRadioButton( orientationGroup, "m_sortColumn" ); m_sortColumn->setText( i18n( "Sort &Rows" ) ); @@ -108,10 +108,10 @@ SortDialog::SortDialog( View * parent, const char * name, sort1Box->setTitle( i18n( "Sort By" ) ); sort1Box->setFlat(true); sort1Box->setColumnLayout(0, Qt::Vertical ); - sort1Box->tqlayout()->setSpacing( KDialog::spacingHint() ); - sort1Box->tqlayout()->setMargin( KDialog::marginHint() ); - TQHBoxLayout * sort1BoxLayout = new TQHBoxLayout( sort1Box->tqlayout() ); - sort1BoxLayout->tqsetAlignment( TQt::AlignTop ); + sort1Box->layout()->setSpacing( KDialog::spacingHint() ); + sort1Box->layout()->setMargin( KDialog::marginHint() ); + TQHBoxLayout * sort1BoxLayout = new TQHBoxLayout( sort1Box->layout() ); + sort1BoxLayout->setAlignment( TQt::AlignTop ); m_sortKey1 = new TQComboBox( false, sort1Box, "m_sortKey1" ); sort1BoxLayout->addWidget( m_sortKey1 ); @@ -127,10 +127,10 @@ SortDialog::SortDialog( View * parent, const char * name, sort2Box->setTitle( i18n( "Then By" ) ); sort2Box->setFlat(true); sort2Box->setColumnLayout(0, Qt::Vertical ); - sort2Box->tqlayout()->setSpacing( KDialog::spacingHint() ); - sort2Box->tqlayout()->setMargin( KDialog::marginHint() ); - TQHBoxLayout * sort2BoxLayout = new TQHBoxLayout( sort2Box->tqlayout() ); - sort2BoxLayout->tqsetAlignment( TQt::AlignTop ); + sort2Box->layout()->setSpacing( KDialog::spacingHint() ); + sort2Box->layout()->setMargin( KDialog::marginHint() ); + TQHBoxLayout * sort2BoxLayout = new TQHBoxLayout( sort2Box->layout() ); + sort2BoxLayout->setAlignment( TQt::AlignTop ); m_sortKey2 = new TQComboBox( false, sort2Box, "m_sortKey2" ); m_sortKey2->insertItem( i18n( "None" ) ); @@ -147,10 +147,10 @@ SortDialog::SortDialog( View * parent, const char * name, sort3Box->setTitle( i18n( "Then By" ) ); sort3Box->setFlat(true); sort3Box->setColumnLayout(0, Qt::Vertical ); - sort3Box->tqlayout()->setSpacing( KDialog::spacingHint() ); - sort3Box->tqlayout()->setMargin( KDialog::marginHint() ); - TQHBoxLayout * sort3BoxLayout = new TQHBoxLayout( sort3Box->tqlayout() ); - sort3BoxLayout->tqsetAlignment( TQt::AlignTop ); + sort3Box->layout()->setSpacing( KDialog::spacingHint() ); + sort3Box->layout()->setMargin( KDialog::marginHint() ); + TQHBoxLayout * sort3BoxLayout = new TQHBoxLayout( sort3Box->layout() ); + sort3BoxLayout->setAlignment( TQt::AlignTop ); m_sortKey3 = new TQComboBox( false, sort3Box, "m_sortKey3" ); m_sortKey3->insertItem( i18n( "None" ) ); @@ -171,15 +171,15 @@ SortDialog::SortDialog( View * parent, const char * name, m_page2 = new TQWidget( m_tabWidget, "m_page2" ); TQGridLayout * page2Layout = new TQGridLayout( m_page2, 1, 1, 11, 6, "page2Layout"); - page2Layout->tqsetAlignment(TQt::AlignTop); + page2Layout->setAlignment(TQt::AlignTop); TQGroupBox * firstKeyBox = new TQGroupBox( m_page2, "firstKeyBox" ); firstKeyBox->setTitle( i18n( "First Key" ) ); firstKeyBox->setColumnLayout(0, Qt::Vertical ); - firstKeyBox->tqlayout()->setSpacing( KDialog::spacingHint() ); - firstKeyBox->tqlayout()->setMargin( KDialog::marginHint() ); - TQVBoxLayout * firstKeyBoxLayout = new TQVBoxLayout( firstKeyBox->tqlayout() ); - firstKeyBoxLayout->tqsetAlignment( TQt::AlignTop ); + firstKeyBox->layout()->setSpacing( KDialog::spacingHint() ); + firstKeyBox->layout()->setMargin( KDialog::marginHint() ); + TQVBoxLayout * firstKeyBoxLayout = new TQVBoxLayout( firstKeyBox->layout() ); + firstKeyBoxLayout->setAlignment( TQt::AlignTop ); m_useCustomLists = new TQCheckBox( firstKeyBox, "m_useCustomLists_2" ); m_useCustomLists->setText( i18n( "&Use custom list" ) ); @@ -201,12 +201,12 @@ SortDialog::SortDialog( View * parent, const char * name, TQGroupBox * resultToBox = new TQGroupBox( m_page2, "resultToBox" ); resultToBox->setTitle( i18n( "Location to Store Sort Results" ) ); resultToBox->setColumnLayout(0, Qt::Vertical ); - resultToBox->tqlayout()->setSpacing( KDialog::spacingHint() ); - resultToBox->tqlayout()->setMargin( KDialog::marginHint() ); + resultToBox->layout()->setSpacing( KDialog::spacingHint() ); + resultToBox->layout()->setMargin( KDialog::marginHint() ); - TQHBoxLayout * resultToBoxLayout = new TQHBoxLayout( resultToBox->tqlayout() ); - resultToBoxLayout->tqsetAlignment( TQt::AlignTop ); + TQHBoxLayout * resultToBoxLayout = new TQHBoxLayout( resultToBox->layout() ); + resultToBoxLayout->setAlignment( TQt::AlignTop ); TQLabel * destinationSheet=new TQLabel(resultToBox,"destinationSheet"); destinationSheet->setText("Destination Sheet:"); @@ -351,7 +351,7 @@ void SortDialog::init() for (int i = r.left(); i <= right; ++i) { TQString guessName=m_pView->activeSheet()->guessColumnTitle(r,i); - TQString colName=i18n(" (Column %1)").tqarg(Cell::columnName(i)); + TQString colName=i18n(" (Column %1)").arg(Cell::columnName(i)); if (!guessName.isEmpty()) { @@ -359,13 +359,13 @@ void SortDialog::init() } else { - m_listColumn += i18n("Column %1").tqarg(Cell::columnName(i)); + m_listColumn += i18n("Column %1").arg(Cell::columnName(i)); if ( i == r.left() ) selectionMayHaveHeader=false; } } - // m_listColumn += i18n("Column %1").tqarg(Cell::columnName(i)); + // m_listColumn += i18n("Column %1").arg(Cell::columnName(i)); } // Entire rows selected ? else if ( util_isRowSelected(r) ) @@ -377,7 +377,7 @@ void SortDialog::init() for (int i = r.top(); i <= bottom; ++i) { TQString guessName=m_pView->activeSheet()->guessRowTitle(r,i); - TQString rowName=i18n(" (Row %1)").tqarg(i); + TQString rowName=i18n(" (Row %1)").arg(i); if (!guessName.isEmpty()) { @@ -385,7 +385,7 @@ void SortDialog::init() } else { - m_listRow += i18n("Row %1").tqarg(i); + m_listRow += i18n("Row %1").arg(i); if ( i == r.top() ) selectionMayHaveHeader=false; @@ -419,13 +419,13 @@ void SortDialog::init() for (int i = r.left(); i <= right; ++i) { TQString guessName=m_pView->activeSheet()->guessColumnTitle(r,i); - TQString colName=i18n(" (Column %1)").tqarg(Cell::columnName(i)); + TQString colName=i18n(" (Column %1)").arg(Cell::columnName(i)); if (!guessName.isEmpty()) m_listColumn += guessName + colName; else { - m_listColumn += i18n("Column %1").tqarg(Cell::columnName(i)); + m_listColumn += i18n("Column %1").arg(Cell::columnName(i)); if (i == r.left()) selectionMayHaveHeader=false; @@ -435,13 +435,13 @@ void SortDialog::init() for (int i = r.top(); i <= bottom; ++i) { TQString guessName=m_pView->activeSheet()->guessRowTitle(r,i); - TQString rowName=i18n(" (Row %1)").tqarg(i); + TQString rowName=i18n(" (Row %1)").arg(i); if (!guessName.isEmpty()) m_listRow += guessName + rowName; else { - m_listRow += i18n("Row %1").tqarg(i); + m_listRow += i18n("Row %1").arg(i); if (i == r.top()) selectionMayHaveHeader=false; diff --git a/kspread/dialogs/kspread_dlg_special.cc b/kspread/dialogs/kspread_dlg_special.cc index 3f0c27e0..5c9f44a3 100644 --- a/kspread/dialogs/kspread_dlg_special.cc +++ b/kspread/dialogs/kspread_dlg_special.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <tqbuttongroup.h> #include <tqradiobutton.h> @@ -46,7 +46,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name ) TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Paste What" ),page ); grp->setRadioButtonExclusive( TRUE ); - grp->tqlayout(); + grp->layout(); lay1->addWidget(grp); rb1 = new TQRadioButton( i18n("Everything"), grp ); rb2 = new TQRadioButton( i18n("Text"), grp ); @@ -59,7 +59,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name ) grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Operation"),page); grp->setRadioButtonExclusive( TRUE ); - grp->tqlayout(); + grp->layout(); lay1->addWidget(grp); @@ -71,7 +71,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name ) rb5->setChecked(true); // cb = new TQCheckBox(i18n("Transpose"),this); - // cb->tqlayout(); + // cb->layout(); // lay1->addWidget(cb); connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); diff --git a/kspread/dialogs/kspread_dlg_styles.cc b/kspread/dialogs/kspread_dlg_styles.cc index 32a5474a..071aae69 100644 --- a/kspread/dialogs/kspread_dlg_styles.cc +++ b/kspread/dialogs/kspread_dlg_styles.cc @@ -19,7 +19,7 @@ */ #include <tqheader.h> -#include <tqlayout.h> +#include <layout.h> #include <tqmap.h> #include <kcombobox.h> @@ -42,15 +42,15 @@ using namespace KSpread; StyleWidget::StyleWidget( TQWidget * parent, const char * name, WFlags fl ) : TQWidget( parent, name, fl ) { - TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 11, 6, "tqlayout"); + TQVBoxLayout * layout = new TQVBoxLayout( this, 11, 6, "layout"); m_styleList = new KListView( this, "m_styleList" ); m_styleList->addColumn( i18n( "Styles" ) ); m_styleList->setResizeMode( KListView::AllColumns ); - tqlayout->addWidget( m_styleList ); + layout->addWidget( m_styleList ); m_displayBox = new KComboBox( FALSE, this, "m_displayBox" ); - tqlayout->addWidget( m_displayBox ); + layout->addWidget( m_displayBox ); m_styleList->header()->setLabel( 0, i18n( "Styles" ) ); m_displayBox->clear(); @@ -59,7 +59,7 @@ StyleWidget::StyleWidget( TQWidget * parent, const char * name, WFlags fl ) m_displayBox->insertItem( i18n( "Custom Styles" ) ); m_displayBox->insertItem( i18n( "Hierarchical" ) ); connect( m_styleList, TQT_SIGNAL(doubleClicked ( TQListViewItem *)),this, TQT_SIGNAL( modifyStyle())); - resize( TQSize(446, 384).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(446, 384).expandedTo(minimumSizeHint()) ); } StyleWidget::~StyleWidget() @@ -232,11 +232,11 @@ void StyleDlg::slotUser1() s = m_styleManager->defaultStyle(); int i = 1; - TQString newName( i18n( "style%1" ).tqarg( m_styleManager->count() + i ) ); + TQString newName( i18n( "style%1" ).arg( m_styleManager->count() + i ) ); while ( m_styleManager->style( newName ) != 0 ) { ++i; - newName = i18n( "style%1" ).tqarg( m_styleManager->count() + i ); + newName = i18n( "style%1" ).arg( m_styleManager->count() + i ); } CustomStyle * style = new CustomStyle( newName, s ); diff --git a/kspread/dialogs/kspread_dlg_subtotal.cc b/kspread/dialogs/kspread_dlg_subtotal.cc index 1b899ebf..f88f3a7f 100644 --- a/kspread/dialogs/kspread_dlg_subtotal.cc +++ b/kspread/dialogs/kspread_dlg_subtotal.cc @@ -243,7 +243,7 @@ void SubtotalDialog::fillColumnBoxes() if ( text.length() > 0 ) { - text = col.tqarg( Cell::columnName( i ) ); + text = col.arg( Cell::columnName( i ) ); } m_dialog->m_columnBox->insertItem( text ); diff --git a/kspread/dialogs/kspread_dlg_validity.cc b/kspread/dialogs/kspread_dlg_validity.cc index 8f61c5d8..4a370246 100644 --- a/kspread/dialogs/kspread_dlg_validity.cc +++ b/kspread/dialogs/kspread_dlg_validity.cc @@ -28,7 +28,7 @@ #include "kspread_sheet.h" #include "kspread_view.h" -#include <tqlayout.h> +#include <layout.h> #include <tqbuttongroup.h> #include <knumvalidator.h> #include <kdebug.h> @@ -38,7 +38,7 @@ #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqlabel.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqcheckbox.h> using namespace KSpread; @@ -54,9 +54,9 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker ) TQGroupBox* tmpTQButtonGroup; tmpTQButtonGroup = new TQGroupBox( 0, Qt::Vertical, i18n("Validity Criteria"), page1, "ButtonGroup_1" ); - tmpTQButtonGroup->tqlayout()->setSpacing(KDialog::spacingHint()); - tmpTQButtonGroup->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *grid1 = new TQGridLayout(tmpTQButtonGroup->tqlayout(),4,2); + tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint()); + tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *grid1 = new TQGridLayout(tmpTQButtonGroup->layout(),4,2); TQLabel *tmpTQLabel = new TQLabel( tmpTQButtonGroup, "Label_1" ); tmpTQLabel->setText(i18n("Allow:" )); @@ -148,9 +148,9 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker ) lay1 = new TQVBoxLayout( page2, KDialogBase::marginHint(), KDialogBase::spacingHint() ); tmpTQButtonGroup = new TQButtonGroup( 0, Qt::Vertical, i18n("Contents"), page2, "ButtonGroup_2" ); - tmpTQButtonGroup->tqlayout()->setSpacing(KDialog::spacingHint()); - tmpTQButtonGroup->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *grid2 = new TQGridLayout(tmpTQButtonGroup->tqlayout(),5,2); + tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint()); + tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *grid2 = new TQGridLayout(tmpTQButtonGroup->layout(),5,2); displayMessage = new TQCheckBox(i18n( "Show error message when invalid values are entered" ),tmpTQButtonGroup ); displayMessage->setChecked( true ); @@ -188,10 +188,10 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker ) lay1 = new TQVBoxLayout( page3, KDialogBase::marginHint(), KDialogBase::spacingHint() ); tmpTQButtonGroup = new TQButtonGroup( 0, Qt::Vertical, i18n("Contents"), page3, "ButtonGroup_2" ); - tmpTQButtonGroup->tqlayout()->setSpacing(KDialog::spacingHint()); - tmpTQButtonGroup->tqlayout()->setMargin(KDialog::marginHint()); + tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint()); + tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint()); - TQGridLayout *grid3 = new TQGridLayout(tmpTQButtonGroup->tqlayout(),5,2); + TQGridLayout *grid3 = new TQGridLayout(tmpTQButtonGroup->layout(),5,2); displayHelp = new TQCheckBox(i18n( "Show input help when cell is selected" ),tmpTQButtonGroup ); displayMessage->setChecked( false ); @@ -367,8 +367,8 @@ void DlgValidity::changeIndexType(int _index) } break; } - if ( width() < tqsizeHint().width() ) - resize( tqsizeHint() ); + if ( width() < sizeHint().width() ) + resize( sizeHint() ); } void DlgValidity::changeIndexCond(int _index) diff --git a/kspread/dialogs/kspreadsubtotal.ui b/kspread/dialogs/kspreadsubtotal.ui index cb73b12d..341d72a9 100644 --- a/kspread/dialogs/kspreadsubtotal.ui +++ b/kspread/dialogs/kspreadsubtotal.ui @@ -195,7 +195,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>152</height> diff --git a/kspread/dialogs/link.cc b/kspread/dialogs/link.cc index aba1a170..58b27528 100644 --- a/kspread/dialogs/link.cc +++ b/kspread/dialogs/link.cc @@ -27,7 +27,7 @@ #include <tqcombobox.h> #include <tqframe.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <kdesktopfile.h> #include <kdialogbase.h> @@ -105,7 +105,7 @@ LinkDialog::LinkDialog( TQWidget*, const char* ) fLayout->add( d->fileLink ); fLayout->add( new TQLabel( i18n("Recent file:" ), d->filePage ) ); TQComboBox* recentFile = new TQComboBox( d->filePage ); - recentFile->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + recentFile->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); fLayout->add( recentFile ); fLayout->addItem( new TQSpacerItem( 0, 40, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding ) ); connect( d->fileText, TQT_SIGNAL( textChanged( const TQString& ) ), this, diff --git a/kspread/dialogs/position_cell_format.ui b/kspread/dialogs/position_cell_format.ui index df2ff211..5e4af84d 100644 --- a/kspread/dialogs/position_cell_format.ui +++ b/kspread/dialogs/position_cell_format.ui @@ -55,7 +55,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <vbox> <property name="name"> @@ -271,7 +271,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba </property> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -298,7 +298,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>10</width> <height>20</height> @@ -331,7 +331,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -358,7 +358,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> diff --git a/kspread/dialogs/protection_cell_format.ui b/kspread/dialogs/protection_cell_format.ui index 0768d4f7..c9c3eb7a 100644 --- a/kspread/dialogs/protection_cell_format.ui +++ b/kspread/dialogs/protection_cell_format.ui @@ -60,7 +60,7 @@ Note that you can print it even if the cell is protected</string> </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <vbox> <property name="name"> @@ -79,7 +79,7 @@ Note that you can print it even if the cell is protected</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -95,7 +95,7 @@ Note that you can print it even if the cell is protected</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>21</height> @@ -120,7 +120,7 @@ Note that you can print it even if the cell is protected</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -136,7 +136,7 @@ Note that you can print it even if the cell is protected</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> diff --git a/kspread/dialogs/sheet_properties.cc b/kspread/dialogs/sheet_properties.cc index 69397687..7cdd6449 100644 --- a/kspread/dialogs/sheet_properties.cc +++ b/kspread/dialogs/sheet_properties.cc @@ -39,7 +39,7 @@ SheetPropertiesDialog::SheetPropertiesDialog( TQWidget* parent ): TQVBox* mainWidget = makeVBoxMainWidget(); d = new SheetPropertiesBase( mainWidget ); TQWidget* spacer = new TQWidget( mainWidget ); - spacer->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding ); + spacer->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding ); enableButtonSeparator( true ); } diff --git a/kspread/dialogs/sheet_properties_base.ui b/kspread/dialogs/sheet_properties_base.ui index 0750b8a9..d2a24d6c 100644 --- a/kspread/dialogs/sheet_properties_base.ui +++ b/kspread/dialogs/sheet_properties_base.ui @@ -47,7 +47,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -55,7 +55,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -99,7 +99,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -118,7 +118,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -127,7 +127,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> diff --git a/kspread/digest.cc b/kspread/digest.cc index ca45c35d..0d27375b 100644 --- a/kspread/digest.cc +++ b/kspread/digest.cc @@ -831,7 +831,7 @@ void rtl_digest_destroySHA1 (rtlDigest Digest) bool SHA1::getHash( TQString const & text, TQCString & hash ) { rtlDigest aDigest = rtl_digest_createSHA1(); - rtlDigestError aError = rtl_digest_updateSHA1( aDigest, text.tqunicode(), text.length() * sizeof(TQChar) ); + rtlDigestError aError = rtl_digest_updateSHA1( aDigest, text.unicode(), text.length() * sizeof(TQChar) ); if ( aError == rtl_Digest_E_None ) { diff --git a/kspread/doc/PAINTING.html b/kspread/doc/PAINTING.html index d3c739a8..1f2578f2 100644 --- a/kspread/doc/PAINTING.html +++ b/kspread/doc/PAINTING.html @@ -59,10 +59,10 @@ If it doesn't, two things can happen:</p> slightly buggy.) </ol> -The tqlayout code also takes into account if the cell has vertical text, +The layout code also takes into account if the cell has vertical text, if it is angled, indented text, and so on.</p> -<p>The result of the tqlayout process is the setting of the following +<p>The result of the layout process is the setting of the following variables in a cell:</p> <table cellspacing="0" cellpadding="3" border="1"> @@ -100,7 +100,7 @@ variables in a cell:</p> </pre> </table> -<p>After the tqlayout process, paintCell() uses these +<p>After the layout process, paintCell() uses these variables to position the text within the cell and also to paint "more text" markers, etc.</p> @@ -129,7 +129,7 @@ that is demanded can be handled in several different ways:</p> <li>The content can be partially shown, i.e. cut. <li>The content can overflow into neighbor cell(s). Which cells that - are affected is dependent on tqalignment, if the neighbors are + are affected is dependent on alignment, if the neighbors are empty, etc, etc. </ul> <h3>Borders and overflow</h3> diff --git a/kspread/formula.cc b/kspread/formula.cc index 1e42867a..fbcf8c0e 100644 --- a/kspread/formula.cc +++ b/kspread/formula.cc @@ -134,7 +134,7 @@ Token::Op KSpread::matchOperator( const TQString& text ) if( text.length() == 1 ) { TQChar p = text[0]; - switch( p.tqunicode() ) + switch( p.unicode() ) { case '+': result = Token::Plus; break; case '-': result = Token::Minus; break; @@ -355,7 +355,7 @@ void TokenStack::ensureSpace() // helper function: return true for valid identifier character bool KSpread::isIdentifier( TQChar ch ) { - return ( ch.tqunicode() == '_' ) || (ch.tqunicode() == '$' ) || ( ch.isLetter() ); + return ( ch.unicode() == '_' ) || (ch.unicode() == '$' ) || ( ch.isLetter() ); } @@ -527,7 +527,7 @@ Tokens Formula::scan( const TQString& expr, KLocale* locale ) const } // aposthrophe (') marks sheet name for 3-d cell, e.g 'Sales Q3'!A4, or a named range - else if ( ch.tqunicode() == '\'' ) + else if ( ch.unicode() == '\'' ) { i++; state = InSheetOrAreaName; @@ -680,7 +680,7 @@ Tokens Formula::scan( const TQString& expr, KLocale* locale ) const case InSheetOrAreaName: // consume until ' - if ( ch.tqunicode() != '\'' ) + if ( ch.unicode() != '\'' ) tokenText.append( ex[i++] ); else @@ -1479,10 +1479,10 @@ TQString Formula::dump() const compile( tokens ); } - result = TQString("Expression: [%1]\n").tqarg( d->expression ); + result = TQString("Expression: [%1]\n").arg( d->expression ); #if 0 Value value = eval(); - result.append( TQString("Result: %1\n").tqarg( + result.append( TQString("Result: %1\n").arg( converter->asString(value).asString() ) ); #endif @@ -1491,12 +1491,12 @@ TQString Formula::dump() const { TQString vtext; Value val = d->constants[c]; - if( val.isString() ) vtext = TQString("[%1]").tqarg( val.asString() ); - else if( val.isNumber() ) vtext = TQString("%1").tqarg( val.asFloat() ); - else if( val.isBoolean() ) vtext = TQString("%1").tqarg( val.asBoolean() ? "True":"False"); + if( val.isString() ) vtext = TQString("[%1]").arg( val.asString() ); + else if( val.isNumber() ) vtext = TQString("%1").arg( val.asFloat() ); + else if( val.isBoolean() ) vtext = TQString("%1").arg( val.asBoolean() ? "True":"False"); else if( val.isError() ) vtext = "error"; else vtext = "???"; - result += TQString(" #%1 = %2\n").tqarg(c).tqarg( vtext ); + result += TQString(" #%1 = %2\n").arg(c).arg( vtext ); } result.append("\n"); @@ -1506,9 +1506,9 @@ TQString Formula::dump() const TQString ctext; switch( d->codes[i].type ) { - case Opcode::Load: ctext = TQString("Load #%1").tqarg( d->codes[i].index ); break; - case Opcode::Ref: ctext = TQString("Ref #%1").tqarg( d->codes[i].index ); break; - case Opcode::Function: ctext = TQString("Function (%1)").tqarg( d->codes[i].index ); break; + case Opcode::Load: ctext = TQString("Load #%1").arg( d->codes[i].index ); break; + case Opcode::Ref: ctext = TQString("Ref #%1").arg( d->codes[i].index ); break; + case Opcode::Function: ctext = TQString("Function (%1)").arg( d->codes[i].index ); break; case Opcode::Add: ctext = "Add"; break; case Opcode::Sub: ctext = "Sub"; break; case Opcode::Mul: ctext = "Mul"; break; diff --git a/kspread/kspread_brush.cc b/kspread/kspread_brush.cc index 3a66549b..f3c6953c 100644 --- a/kspread/kspread_brush.cc +++ b/kspread/kspread_brush.cc @@ -103,8 +103,8 @@ void KSpreadBrush::saveOasisFillStyle( KoGenStyle &styleObjectAuto, KoGenStyles& if ( m_unbalanced ) { - unbalancedx = TQString( "%1%" ).tqarg( m_xfactor / 4 + 50 ); - unbalancedy = TQString( "%1%" ).tqarg( m_yfactor / 4 + 50 ); + unbalancedx = TQString( "%1%" ).arg( m_xfactor / 4 + 50 ); + unbalancedy = TQString( "%1%" ).arg( m_yfactor / 4 + 50 ); } gradientStyle.addAttribute( "draw:cx", unbalancedx ); gradientStyle.addAttribute( "draw:cy", unbalancedy ); diff --git a/kspread/kspread_brush.h b/kspread/kspread_brush.h index ebb0c5f6..4a5679aa 100644 --- a/kspread/kspread_brush.h +++ b/kspread/kspread_brush.h @@ -21,7 +21,7 @@ #ifndef KSPREADBRUSH_H #define KSPREADBRUSH_H -#include <tqbrush.h> +#include <brush.h> #include "kspread_global.h" diff --git a/kspread/kspread_canvas.cc b/kspread/kspread_canvas.cc index 3f482e27..08ab33e0 100644 --- a/kspread/kspread_canvas.cc +++ b/kspread/kspread_canvas.cc @@ -47,7 +47,7 @@ #include <tqapplication.h> #include <tqbuffer.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqdrawutil.h> #include <tqlabel.h> #include <tqpoint.h> @@ -547,7 +547,7 @@ void Canvas::validateSelection() ypos = sheet->dblRowPos( moveY ); } //d->validationInfo->setGeometry( 3, y + 3, len + 2, hei + 2 ); - d->validationInfo->tqsetAlignment( TQt::AlignVCenter ); + d->validationInfo->setAlignment( TQt::AlignVCenter ); TQPainter painter; painter.begin( this ); int len = 0; @@ -1011,7 +1011,7 @@ void Canvas::mouseMoveEvent( TQMouseEvent * _ev ) (int) _ev->y() ); if ( ( obj = getObject( p, activeSheet() ) ) && obj->isSelected() ) { - KoRect const bound = obj->tqgeometry(); + KoRect const bound = obj->geometry(); TQRect zoomedBound = doc()->zoomRect( KoRect(bound.left(), bound.top(), bound.width(), bound.height() ) ); @@ -1056,7 +1056,7 @@ void Canvas::mouseMoveEvent( TQMouseEvent * _ev ) } //Check to see if the mouse is over a highlight range size grip and if it is, change the cursor - //tqshape to a resize arrow + //shape to a resize arrow if (highlightRangeSizeGripAt(ev_PosX,ev_PosY)) { if ( sheet->layoutDirection()==Sheet::RightToLeft ) @@ -1177,7 +1177,7 @@ void Canvas::mouseReleaseEvent( TQMouseEvent* /*_ev*/) doc()->addCommand( cmd ); } else { - tqrepaint(); + repaint(); } d->m_isMoving = false; break; @@ -1253,13 +1253,13 @@ void Canvas::processLeftClickAnchor() if ( KRun::isExecutableFile( d->anchor , type ) ) { - //TQString question = i18n("Do you want to open this link to '%1'?\n").tqarg(d->anchor); + //TQString question = i18n("Do you want to open this link to '%1'?\n").arg(d->anchor); //question += i18n("Note that opening a link to a local file may " // "compromise your system's security."); TQString question = i18n("This link points to the program or script '%1'.\n" - "Malicious programs can harm your computer. Are you sure that you want to run this program?").tqarg(d->anchor); + "Malicious programs can harm your computer. Are you sure that you want to run this program?").arg(d->anchor); // this will also start local programs, so adding a "don't warn again" // checkbox will probably be too dangerous int choice = KMessageBox::warningYesNo(this, question, i18n("Open Link?")); @@ -1352,9 +1352,9 @@ void Canvas::mousePressEvent( TQMouseEvent * _ev ) d->m_resizeObject = obj; - d->m_ratio = static_cast<double>( obj->tqgeometry().width() ) / - static_cast<double>( obj->tqgeometry().height() ); - d->m_rectBeforeResize = obj->tqgeometry(); + d->m_ratio = static_cast<double>( obj->geometry().width() ) / + static_cast<double>( obj->geometry().height() ); + d->m_rectBeforeResize = obj->geometry(); } KoPoint docPoint ( doc()->unzoomPoint( _ev->pos() ) ); @@ -1816,7 +1816,7 @@ void Canvas::dropEvent( TQDropEvent * _ev ) } - b = _ev->tqencodedData( TextDrag::selectionMimeType() ); + b = _ev->encodedData( TextDrag::selectionMimeType() ); sheet->paste( b, TQRect( col, row, 1, 1 ), makeUndo ); if ( _ev->source() == this ) @@ -2150,13 +2150,13 @@ void Canvas::processEscapeKey(TQKeyEvent * event) case MT_RESIZE_RU: case MT_RESIZE_RD: { - TQRect oldBoundingRect = doc()->zoomRect( d->m_resizeObject->tqgeometry()/*getRepaintRect()*/); + TQRect oldBoundingRect = doc()->zoomRect( d->m_resizeObject->geometry()/*getRepaintRect()*/); d->m_resizeObject->setGeometry( d->m_rectBeforeResize ); oldBoundingRect.moveBy( (int)( -xOffset()*doc()->zoomedResolutionX() ) , (int)( -yOffset() * doc()->zoomedResolutionY()) ); activeSheet()->setRegionPaintDirty( oldBoundingRect ); - tqrepaint( oldBoundingRect ); + repaint( oldBoundingRect ); repaintObject( d->m_resizeObject ); d->m_ratio = 0.0; d->m_resizeObject = 0; @@ -3290,7 +3290,7 @@ KSpread::EmbeddedObject *Canvas::getObject( const TQPoint &pos, Sheet *_sheet ) { if ( itObject.current()->sheet() == _sheet ) { - KoRect const bound = ( itObject.current() )->tqgeometry(); + KoRect const bound = ( itObject.current() )->geometry(); TQRect zoomedBound = doc()->zoomRect( KoRect(bound.left(), bound.top(), bound.width(), bound.height() ) ); @@ -3429,7 +3429,7 @@ void Canvas::resizeObject( ModifyType _modType, const KoPoint & point, bool keep { EmbeddedObject *obj = d->m_resizeObject; - KoRect objRect = obj->tqgeometry(); + KoRect objRect = obj->geometry(); objRect.moveBy( -xOffset(), -yOffset() ); TQRect oldBoundingRect( doc()->zoomRect( objRect ) ); @@ -3440,22 +3440,22 @@ void Canvas::resizeObject( ModifyType _modType, const KoPoint & point, bool keep if ( _modType == MT_RESIZE_UP || _modType == MT_RESIZE_LU || _modType == MT_RESIZE_RU ) { top = true; -// snaptqStatus |= KoGuides::SNAP_HORIZ; +// snapStatus |= KoGuides::SNAP_HORIZ; } if ( _modType == MT_RESIZE_DN || _modType == MT_RESIZE_LD || _modType == MT_RESIZE_RD ) { bottom = true; -// snaptqStatus |= KoGuides::SNAP_HORIZ; +// snapStatus |= KoGuides::SNAP_HORIZ; } if ( _modType == MT_RESIZE_LF || _modType == MT_RESIZE_LU || _modType == MT_RESIZE_LD ) { left = true; -// snaptqStatus |= KoGuides::SNAP_VERT; +// snapStatus |= KoGuides::SNAP_VERT; } if ( _modType == MT_RESIZE_RT || _modType == MT_RESIZE_RU || _modType == MT_RESIZE_RD ) { right = true; -// snaptqStatus |= KoGuides::SNAP_VERT; +// snapStatus |= KoGuides::SNAP_VERT; } double newLeft = objRect.left(); @@ -3572,34 +3572,34 @@ void Canvas::resizeObject( ModifyType _modType, const KoPoint & point, bool keep // { // sp.setY( rect.bottom() ); // } -// m_gl.repaintSnapping( sp, snaptqStatus ); +// m_gl.repaintSnapping( sp, snapStatus ); // } - tqrepaint( oldBoundingRect ); + repaint( oldBoundingRect ); repaintObject( obj ); emit objectSizeChanged(); } } -void Canvas::finishResizeObject( const TQString &/*name*/, bool /*tqlayout*/ ) +void Canvas::finishResizeObject( const TQString &/*name*/, bool /*layout*/ ) { if ( d->m_resizeObject ) { - KoPoint move = KoPoint( d->m_resizeObject->tqgeometry().x() - d->m_rectBeforeResize.x(), - d->m_resizeObject->tqgeometry().y() - d->m_rectBeforeResize.y() ); - KoSize size = KoSize( d->m_resizeObject->tqgeometry().width() - d->m_rectBeforeResize.width(), - d->m_resizeObject->tqgeometry().height() - d->m_rectBeforeResize.height() ); + KoPoint move = KoPoint( d->m_resizeObject->geometry().x() - d->m_rectBeforeResize.x(), + d->m_resizeObject->geometry().y() - d->m_rectBeforeResize.y() ); + KoSize size = KoSize( d->m_resizeObject->geometry().width() - d->m_rectBeforeResize.width(), + d->m_resizeObject->geometry().height() - d->m_rectBeforeResize.height() ); - if ( ( d->m_resizeObject->tqgeometry() ) != d->m_rectBeforeResize ) + if ( ( d->m_resizeObject->geometry() ) != d->m_rectBeforeResize ) { ChangeObjectGeometryCommand *resizeCmd = new ChangeObjectGeometryCommand( d->m_resizeObject, move, size ); // the command is not executed as the object is allready resized. doc()->addCommand( resizeCmd ); } -// if ( tqlayout ) -// doc()->tqlayout( m_resizeObject ); +// if ( layout ) +// doc()->layout( m_resizeObject ); d->m_ratio = 0.0; d->m_isResizing = false; @@ -3669,7 +3669,7 @@ void Canvas::deleteEditor (bool saveChanges, bool array) TQString t = d->cellEditor->text(); // Delete the cell editor first and after that update the document. - // That means we get a synchronous tqrepaint after the cell editor + // That means we get a synchronous repaint after the cell editor // widget is gone. Otherwise we may get painting errors. delete d->cellEditor; d->cellEditor = 0; @@ -3775,7 +3775,7 @@ bool Canvas::createEditor( EditorType ed, bool addFocus, bool captureArrowKeys ) TQColor color = cell->format()->textColor( markerColumn(), markerRow() ); if ( !color.isValid() ) - color = TQApplication::tqpalette().active().text(); + color = TQApplication::palette().active().text(); g.setColor( TQColorGroup::Text, color); color = cell->bgColor( markerColumn(), markerRow() ); @@ -3819,8 +3819,8 @@ bool Canvas::createEditor( EditorType ed, bool addFocus, bool captureArrowKeys ) void Canvas::repaintObject( EmbeddedObject *obj ) { - //Calculate where the object appears on the canvas widget and then tqrepaint that part of the widget - TQRect canvasRelativeGeometry = doc()->zoomRect( obj->tqgeometry() ); + //Calculate where the object appears on the canvas widget and then repaint that part of the widget + TQRect canvasRelativeGeometry = doc()->zoomRect( obj->geometry() ); canvasRelativeGeometry.moveBy( (int)( -xOffset()*doc()->zoomedResolutionX() ) , (int)( -yOffset() * doc()->zoomedResolutionY()) ); @@ -3828,17 +3828,17 @@ void Canvas::repaintObject( EmbeddedObject *obj ) /* if ( !obj->isSelected() ) { - KoRect g = obj->tqgeometry(); + KoRect g = obj->geometry(); g.moveBy( -xOffset(), -yOffset() ); - TQRect tqgeometry( doc()->zoomRect( g ) ); + TQRect geometry( doc()->zoomRect( g ) ); - update( tqgeometry ); + update( geometry ); } else { TQPainter p(this); p.translate( -xOffset() * doc()->zoomedResolutionX() , -yOffset() * doc()->zoomedResolutionY() ); - obj->draw(&p); //this goes faster than calling tqrepaint + obj->draw(&p); //this goes faster than calling repaint p.end(); }*/ } @@ -3888,7 +3888,7 @@ void Canvas::copyOasisObjects() for( ; itObject.current(); ++itObject ) { if ( itObject.current()->isSelected() ) - p.drawPixmap( itObject.current()->tqgeometry().toTQRect().left() - r.left(), itObject.current()->tqgeometry().toTQRect().top() - r.top(), itObject.current()->toPixmap( 1.0 , 1.0 ) ); + p.drawPixmap( itObject.current()->geometry().toTQRect().left() - r.left(), itObject.current()->geometry().toTQRect().top() - r.top(), itObject.current()->toPixmap( 1.0 , 1.0 ) ); } p.end(); if (!pixmap.isNull()) @@ -3899,7 +3899,7 @@ void Canvas::copyOasisObjects() } TQDragObject *dragObject = multiDrag; - TQApplication::tqclipboard()->setData( dragObject, TQClipboard::Clipboard ); + TQApplication::clipboard()->setData( dragObject, TQClipboard::Clipboard ); } void Canvas::closeEditor() @@ -4064,7 +4064,7 @@ void Canvas::paintUpdates() } else { - matrix = painter.tqworldMatrix(); + matrix = painter.worldMatrix(); } @@ -4109,7 +4109,7 @@ void Canvas::paintUpdates() { cell = sheet->cellAt( x, y ); - // recalc and retqlayout only for non default cells + // recalc and relayout only for non default cells if (!cell->isDefault()) { if (cell->calcDirtyFlag()) cell->calc(); @@ -4202,7 +4202,7 @@ void Canvas::paintUpdates() paintHighlightedRanges(painter, unzoomedRect); paintNormalMarker(painter, unzoomedRect); - //restore clip region with tqchildren area + //restore clip region with children area painter.restore(); //painter.setClipRegion( rgnComplete ); } @@ -4223,7 +4223,7 @@ void Canvas::clipoutChildren( TQPainter& painter ) const { if ( ( itObject.current() )->sheet() == activeSheet() ) { - TQRect childGeometry = doc()->zoomRect( itObject.current()->tqgeometry()); + TQRect childGeometry = doc()->zoomRect( itObject.current()->geometry()); //The clipping region is given in device coordinates //so subtract the current offset (scroll position) of the canvas @@ -4232,7 +4232,7 @@ void Canvas::clipoutChildren( TQPainter& painter ) const if (painter.window().intersects(childGeometry)) rgn -= childGeometry; - //painter.fillRect( doc()->zoomRect( itObject.current()->tqgeometry() ), TQColor("red" ) ); + //painter.fillRect( doc()->zoomRect( itObject.current()->geometry() ), TQColor("red" ) ); } } @@ -4263,11 +4263,11 @@ void Canvas::paintChildren( TQPainter& painter, TQWMatrix& /*matrix*/ ) for( ; itObject.current(); ++itObject ) { - TQRect const zoomedObjectGeometry = doc()->zoomRect( itObject.current()->tqgeometry() ); + TQRect const zoomedObjectGeometry = doc()->zoomRect( itObject.current()->geometry() ); if ( ( itObject.current() )->sheet() == activeSheet() && zoomedWindowGeometry.intersects( zoomedObjectGeometry ) ) { - //To prevent unnecessary redrawing of the embedded object, we only tqrepaint + //To prevent unnecessary redrawing of the embedded object, we only repaint //if one or more of the cells underneath the object has been marked as 'dirty'. TQRect canvasRelativeGeometry = zoomedObjectGeometry; @@ -4656,7 +4656,7 @@ VBorder::~VBorder() delete m_scrollTimer; } -TQSize VBorder::tqsizeHint() const +TQSize VBorder::sizeHint() const { return TQSize( 40, 10 ); } @@ -5036,9 +5036,9 @@ void VBorder::paintSizeIndicator( int mouseY, bool firstTime ) TQString tmpSize; if ( m_iResizePos != y ) - tmpSize = i18n("Height: %1 %2").tqarg( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItY( m_iResizePos - y ), + tmpSize = i18n("Height: %1 %2").arg( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItY( m_iResizePos - y ), m_pView->doc()->unit() ) ) - .tqarg( m_pView->doc()->unitName() ); + .arg( m_pView->doc()->unitName() ); else tmpSize = i18n( "Hide Row" ); @@ -5057,7 +5057,7 @@ void VBorder::paintSizeIndicator( int mouseY, bool firstTime ) else m_lSize->setGeometry( 3, y + 3, len + 2,hei + 2 ); - m_lSize->tqsetAlignment( TQt::AlignVCenter ); + m_lSize->setAlignment( TQt::AlignVCenter ); m_lSize->setText( tmpSize ); m_lSize->setPalette( TQToolTip::palette() ); m_lSize->show(); @@ -5095,7 +5095,7 @@ void VBorder::paintEvent( TQPaintEvent* _ev ) TQColor highlightColor = View::highlightColor(); TQPen pen( TQt::black, 1 ); painter.setPen( pen ); - // painter.setBackgroundColor( tqcolorGroup().base() ); + // painter.setBackgroundColor( colorGroup().base() ); // painter.eraseRect( _ev->rect() ); @@ -5146,7 +5146,7 @@ void VBorder::paintEvent( TQPaintEvent* _ev ) } else { - TQColor c = tqcolorGroup().background(); + TQColor c = colorGroup().background(); TQBrush fill( c ); qDrawPlainRect ( &painter, 0, zoomedYPos, width, height+1, c.dark(150), 1, &fill ); @@ -5156,10 +5156,10 @@ void VBorder::paintEvent( TQPaintEvent* _ev ) // Reset painter painter.setFont( normalFont ); - painter.setPen( tqcolorGroup().text() ); + painter.setPen( colorGroup().text() ); if ( selected ) - painter.setPen( tqcolorGroup().highlightedText() ); + painter.setPen( colorGroup().highlightedText() ); else if ( highlighted ) painter.setFont( boldFont ); @@ -5212,7 +5212,7 @@ HBorder::~HBorder() delete m_scrollTimer; } -TQSize HBorder::tqsizeHint() const +TQSize HBorder::sizeHint() const { return TQSize( 40, 10 ); } @@ -5738,9 +5738,9 @@ void HBorder::paintSizeIndicator( int mouseX, bool firstTime ) TQString tmpSize; if ( m_iResizePos != x ) tmpSize = i18n("Width: %1 %2") - .tqarg( KGlobal::locale()->formatNumber( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItX( (sheet->layoutDirection()==Sheet::RightToLeft) ? x - m_iResizePos : m_iResizePos - x ), + .arg( KGlobal::locale()->formatNumber( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItX( (sheet->layoutDirection()==Sheet::RightToLeft) ? x - m_iResizePos : m_iResizePos - x ), m_pView->doc()->unit() ))) - .tqarg( m_pView->doc()->unitName() ); + .arg( m_pView->doc()->unitName() ); else tmpSize = i18n( "Hide Column" ); @@ -5758,7 +5758,7 @@ void HBorder::paintSizeIndicator( int mouseX, bool firstTime ) else m_lSize->setGeometry( x + 3, 3, len + 2, hei + 2 ); - m_lSize->tqsetAlignment( TQt::AlignVCenter ); + m_lSize->setAlignment( TQt::AlignVCenter ); m_lSize->setText( tmpSize ); m_lSize->setPalette( TQToolTip::palette() ); m_lSize->show(); @@ -5866,7 +5866,7 @@ void HBorder::paintEvent( TQPaintEvent* _ev ) } else { - TQColor c = tqcolorGroup().background(); + TQColor c = colorGroup().background(); TQBrush fill( c ); qDrawPlainRect ( &painter, zoomedXPos, 0, width+1, height, c.dark(150), 1, &fill ); @@ -5874,10 +5874,10 @@ void HBorder::paintEvent( TQPaintEvent* _ev ) // Reset painter painter.setFont( normalFont ); - painter.setPen( tqcolorGroup().text() ); + painter.setPen( colorGroup().text() ); if ( selected ) - painter.setPen( tqcolorGroup().highlightedText() ); + painter.setPen( colorGroup().highlightedText() ); else if ( highlighted ) painter.setFont( boldFont ); if ( !m_pView->activeSheet()->getShowColumnNumber() ) @@ -5929,7 +5929,7 @@ void HBorder::paintEvent( TQPaintEvent* _ev ) } else { - TQColor c = tqcolorGroup().background(); + TQColor c = colorGroup().background(); TQBrush fill( c ); qDrawPlainRect ( &painter, zoomedXPos, 0, width+1, height, c.dark(150), 1, &fill ); @@ -5937,10 +5937,10 @@ void HBorder::paintEvent( TQPaintEvent* _ev ) // Reset painter painter.setFont( normalFont ); - painter.setPen( tqcolorGroup().text() ); + painter.setPen( colorGroup().text() ); if ( selected ) - painter.setPen( tqcolorGroup().highlightedText() ); + painter.setPen( colorGroup().highlightedText() ); else if ( highlighted ) painter.setFont( boldFont ); if ( !m_pView->activeSheet()->getShowColumnNumber() ) @@ -5991,7 +5991,7 @@ ToolTip::ToolTip( Canvas* canvas ) // this is a hack of course, because it's not available from TQToolTip TQLabel *tip_findLabel() { - TQWidgetList *list = TQApplication::tqallWidgets(); + TQWidgetList *list = TQApplication::allWidgets(); TQWidgetListIt it( *list ); TQWidget * w; while ( (w=it.current()) != 0 ) diff --git a/kspread/kspread_canvas.h b/kspread/kspread_canvas.h index f5aa6746..ea7e3dd1 100644 --- a/kspread/kspread_canvas.h +++ b/kspread/kspread_canvas.h @@ -284,7 +284,7 @@ public: */ void closeEditor(); - // Created by the view since it's tqlayout is managed there, + // Created by the view since it's layout is managed there, // but is in fact a sibling of the canvas, which needs to know about it. void setEditWidget( KSpread::EditWidget * ew ); @@ -326,7 +326,7 @@ public: /// resize the m_resizeObject void resizeObject( ModifyType _modType, const KoPoint & point, bool keepRatio ); /// create KPrResizeCmd - void finishResizeObject( const TQString &name, bool tqlayout = true ); + void finishResizeObject( const TQString &name, bool layout = true ); /** * @brief Display object above the other objects in editiong mode @@ -444,7 +444,7 @@ private: TQRect cellsInArea( const TQRect area ) const; /** - * Paints the tqchildren + * Paints the children */ void paintChildren( TQPainter& painter, TQWMatrix& matrix ); @@ -586,7 +586,7 @@ public: void updateColumns( int from, int to ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; private slots: void doAutoScroll(); @@ -672,7 +672,7 @@ public: void equalizeRow( double resize ); void updateRows( int from, int to ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; private slots: void doAutoScroll(); diff --git a/kspread/kspread_cell.cc b/kspread/kspread_cell.cc index fdcf38be..0c5de5e6 100644 --- a/kspread/kspread_cell.cc +++ b/kspread/kspread_cell.cc @@ -486,7 +486,7 @@ void Cell::setValue( const Value& v ) clearAllErrors(); //If the value has not changed then we don't need to do anything - //(ie. no need to retqlayout, update dependant cells etc.), + //(ie. no need to relayout, update dependant cells etc.), //unless this cell contains a formula, in which case its dependancies might have changed //even though the value has not. For example, if this cell was previously empty (and its value is //therefore empty) and a new dependency upon an empty cell has been added. The new value would still @@ -697,7 +697,7 @@ void Cell::mergeCells( int _col, int _row, int _x, int _y ) d->extra()->mergedYCells = 0; } - // Refresh the tqlayout + // Refresh the layout setFlag( Flag_LayoutDirty ); return; } @@ -717,7 +717,7 @@ void Cell::mergeCells( int _col, int _row, int _x, int _y ) } } - // Refresh the tqlayout + // Refresh the layout setFlag( Flag_LayoutDirty ); } @@ -1049,20 +1049,20 @@ TQString Cell::encodeFormula( bool _era, int _col, int _row ) const int col = 0; col = util_decodeColumnLabelText( buffer ); if ( fix1 ) - erg += TQString( "$%1" ).tqarg( col ); + erg += TQString( "$%1" ).arg( col ); else if (_era) - erg += TQChar(0xA7) + TQString( "%1" ).tqarg( col ); + erg += TQChar(0xA7) + TQString( "%1" ).arg( col ); else - erg += TQString( "#%1" ).tqarg( col - _col ); + erg += TQString( "#%1" ).arg( col - _col ); if ( fix2 ) - erg += TQString( "$%1#").tqarg( row ); + erg += TQString( "$%1#").arg( row ); else if (_era) - erg += TQChar(0xA7) + TQString( "%1#" ).tqarg( row ); + erg += TQChar(0xA7) + TQString( "%1#" ).arg( row ); else - erg += TQString( "#%1#" ).tqarg( row - _row ); + erg += TQString( "#%1#" ).arg( row - _row ); } } else @@ -1204,7 +1204,7 @@ void Cell::freeAllObscuredCells() // Layout -// Recalculate the entire tqlayout. This includes the following members: +// Recalculate the entire layout. This includes the following members: // // d->textX, d->textY // d->textWidth, d->textHeight @@ -1222,11 +1222,11 @@ void Cell::makeLayout( TQPainter &_painter, int _col, int _row ) { // Are _col and _row really needed ? // - // Yes they are: they are useful if this is the default tqlayout, in + // Yes they are: they are useful if this is the default layout, in // which case d->row and d->column are 0 and 0, but _col and _row // are the real coordinates of the cell. - // There is no need to remake the tqlayout if it hasn't changed. + // There is no need to remake the layout if it hasn't changed. if ( !testFlag( Flag_LayoutDirty ) ) return; @@ -1244,7 +1244,7 @@ void Cell::makeLayout( TQPainter &_painter, int _col, int _row ) d->extra()->mergedXCells, d->extra()->mergedYCells ); // If the column for this cell is hidden or the row is too low, - // there is no use in remaking the tqlayout. + // there is no use in remaking the layout. ColumnFormat *cl1 = format()->sheet()->columnFormat( _col ); RowFormat *rl1 = format()->sheet()->rowFormat( _row ); if ( cl1->isHide() @@ -1597,11 +1597,11 @@ void Cell::setOutputText() return; } - // If nothing has changed, we don't need to remake the text tqlayout. + // If nothing has changed, we don't need to remake the text layout. if ( !testFlag(Flag_TextFormatDirty) ) return; - // We don't want to remake the tqlayout unnecessarily. + // We don't want to remake the layout unnecessarily. clearFlag( Flag_TextFormatDirty ); // Display a formula if warranted. If not, display the value instead; @@ -1687,7 +1687,7 @@ void Cell::offsetAlign( int _col, int _row ) const double effTop = BORDER_SPACE + 0.5 * effTopBorderPen( _col, _row ).width(); const double effBottom = h - BORDER_SPACE - 0.5 * effBottomBorderPen( _col, _row ).width(); - // Calculate d->textY based on the vertical tqalignment and a few + // Calculate d->textY based on the vertical alignment and a few // other inputs. switch( ay ) { @@ -1846,7 +1846,7 @@ void Cell::offsetAlign( int _col, int _row ) a = Format::Left; } - // Calculate d->textX based on tqalignment and textwidth. + // Calculate d->textX based on alignment and textwidth. switch ( a ) { case Format::Left: d->textX = 0.5 * effLeftBorderPen( _col, _row ).width() + BORDER_SPACE; @@ -2052,7 +2052,7 @@ bool Cell::makeFormula() if (format()->sheet()->doc()->getShowMessageError()) { TQString tmp(i18n("Error in cell %1\n\n")); - tmp = tmp.tqarg( fullName() ); + tmp = tmp.arg( fullName() ); KMessageBox::error( (TQWidget*)0L, tmp); } setFlag(Flag_ParseError); @@ -2193,7 +2193,7 @@ void Cell::paintCell( const KoRect &rect, TQPainter & painter, double width = width0; double height = height0; - // Handle right-to-left tqlayout. + // Handle right-to-left layout. // In an RTL sheet the cells have to be painted at their opposite horizontal // location on the canvas, meaning that column A will be the rightmost column // on screen, column B will be to the left of it and so on. Here we change @@ -2253,14 +2253,14 @@ void Cell::paintCell( const KoRect &rect, TQPainter & painter, selected = selected && !( markerArea.contains( cellRef ) ); // Don't draw any selection at all when printing. - if ( painter.tqdevice()->isExtDev() || !drawCursor ) + if ( painter.device()->isExtDev() || !drawCursor ) selected = false; } - // Need to make a new tqlayout ? + // Need to make a new layout ? // // FIXME: We have already used (at least) extraWidth/Height above, - // and now we are recalculating the tqlayout. This has to be + // and now we are recalculating the layout. This has to be // moved up above all uses. // // FIXME: This needs to be taken out eventually - it is done in @@ -2299,7 +2299,7 @@ void Cell::paintCell( const KoRect &rect, TQPainter & painter, // 2. Paint the default borders if we are on screen or if we are printing // and the checkbox to do this is checked. - if ( painter.tqdevice()->devType() != TQInternal::Printer + if ( painter.device()->devType() != TQInternal::Printer || format()->sheet()->print()->printGrid()) paintDefaultBorders( painter, rect, cellRect, cellRef, paintBorderRight, paintBorderBottom, @@ -2336,7 +2336,7 @@ void Cell::paintCell( const KoRect &rect, TQPainter & painter, // If we print pages, then we disable clipping, otherwise borders are // cut in the middle at the page borders. - if ( painter.tqdevice()->isExtDev() ) + if ( painter.device()->isExtDev() ) painter.setClipping( false ); // Paint the borders if this cell is not part of another merged cell. @@ -2350,7 +2350,7 @@ void Cell::paintCell( const KoRect &rect, TQPainter & painter, } // Turn clipping back on. - if ( painter.tqdevice()->isExtDev() ) + if ( painter.device()->isExtDev() ) painter.setClipping( true ); // 5. Paint diagonal lines and page borders. @@ -2364,12 +2364,12 @@ void Cell::paintCell( const KoRect &rect, TQPainter & painter, if ( !isObscured() ) { // 6a. Paint possible comment indicator. - if ( !painter.tqdevice()->isExtDev() + if ( !painter.device()->isExtDev() || format()->sheet()->print()->printCommentIndicator() ) paintCommentIndicator( painter, cellRect, cellRef, backgroundColor ); // 6b. Paint possible formula indicator. - if ( !painter.tqdevice()->isExtDev() + if ( !painter.device()->isExtDev() || format()->sheet()->print()->printFormulaIndicator() ) paintFormulaIndicator( painter, cellRect, backgroundColor ); @@ -2389,7 +2389,7 @@ void Cell::paintCell( const KoRect &rect, TQPainter & painter, // b) something indicates that the text should not be painted // c) the sheet is protected and the cell is hidden. if ( !d->strOutText.isEmpty() - && ( !painter.tqdevice()->isExtDev() + && ( !painter.device()->isExtDev() || !format()->getDontprintText( cellRef.x(), cellRef.y() ) ) && !( format()->sheet()->isProtected() && format()->isHideAll( cellRef.x(), cellRef.y() ) ) ) @@ -2402,7 +2402,7 @@ void Cell::paintCell( const KoRect &rect, TQPainter & painter, // cells, then paint the obscuring cell(s). Otherwise don't do // anything so that we don't cause an infinite loop. if ( isObscured() && paintingObscured == 0 && - !( sheetDir == Sheet::RightToLeft && painter.tqdevice()->isExtDev() ) ) + !( sheetDir == Sheet::RightToLeft && painter.device()->isExtDev() ) ) { //kdDebug(36001) << "painting cells that obscure " << name() << endl; @@ -2498,7 +2498,7 @@ void Cell::paintCell( const KoRect &rect, TQPainter & painter, */ if ( d->style == Cell::ST_Button ) { TQBrush fill( TQt::lightGray ); - TQApplication::style().tqdrawControl( TQStyle::CE_PushButton, &_painter, this, + TQApplication::style().drawControl( TQStyle::CE_PushButton, &_painter, this, TQRect( _tx + 1, _ty + 1, w2 - 1, h2 - 1 ), defaultColorGroup ); //, selected, &fill ); } @@ -2686,7 +2686,7 @@ void Cell::paintBackground( TQPainter& painter, const KoRect &cellRect, const TQPoint &cellRef, bool selected, TQColor &backgroundColor ) { - TQColorGroup defaultColorGroup = TQApplication::tqpalette().active(); + TQColorGroup defaultColorGroup = TQApplication::palette().active(); TQRect zoomedCellRect = sheet()->doc()->zoomRect( cellRect ); // If this is not the KS_rowMax and/or KS_colMax, then we reduce @@ -2723,7 +2723,7 @@ void Cell::paintBackground( TQPainter& painter, const KoRect &cellRect, TQColor bg( backgroundColor ); // Handle printers separately. - if ( !painter.tqdevice()->isExtDev() ) { + if ( !painter.device()->isExtDev() ) { if ( bg.isValid() ) painter.setBackgroundColor( bg ); else @@ -2742,7 +2742,7 @@ void Cell::paintBackground( TQPainter& painter, const KoRect &cellRect, } // Erase the background of the cell. - if ( !painter.tqdevice()->isExtDev() ) + if ( !painter.device()->isExtDev() ) painter.eraseRect( zoomedCellRect ); // Get a background brush @@ -2791,7 +2791,7 @@ void Cell::paintDefaultBorders( TQPainter& painter, const KoRect &rect, Doc* doc = sheet()->doc(); Sheet::LayoutDirection sheetDir = format()->sheet()->layoutDirection(); - bool paintingToExternalDevice = painter.tqdevice()->isExtDev(); + bool paintingToExternalDevice = painter.device()->isExtDev(); // Each cell is responsible for drawing it's top and left portions // of the "default" grid. --Or not drawing it if it shouldn't be @@ -2948,7 +2948,7 @@ void Cell::paintDefaultBorders( TQPainter& painter, const KoRect &rect, // If we are on paper printout, we limit the length of the lines. // On paper, we always have full cells, on screen not. - if ( painter.tqdevice()->isExtDev() ) { + if ( painter.device()->isExtDev() ) { if ( sheetDir == Sheet::RightToLeft ) painter.drawLine( doc->zoomItX( TQMAX( rect.left(), cellRect.x() ) ), doc->zoomItY( TQMAX( rect.top(), cellRect.y() + dt ) ), @@ -2995,7 +2995,7 @@ void Cell::paintDefaultBorders( TQPainter& painter, const KoRect &rect, // If we are on paper printout, we limit the length of the lines. // On paper, we always have full cells, on screen not. - if ( painter.tqdevice()->isExtDev() ) { + if ( painter.device()->isExtDev() ) { painter.drawLine( doc->zoomItX( TQMAX( rect.left(), cellRect.x() + dl ) ), doc->zoomItY( TQMAX( rect.top(), cellRect.bottom() ) ), doc->zoomItX( TQMIN( rect.right(), cellRect.right() - dr ) ), @@ -3026,7 +3026,7 @@ void Cell::paintCommentIndicator( TQPainter& painter, && cellRect.width() > 10.0 && cellRect.height() > 10.0 && ( sheet()->print()->printCommentIndicator() - || ( !painter.tqdevice()->isExtDev() && sheet()->getShowCommentIndicator() ) ) ) { + || ( !painter.device()->isExtDev() && sheet()->getShowCommentIndicator() ) ) ) { TQColor penColor = TQt::red; // If background has high red part, switch to blue. @@ -3123,7 +3123,7 @@ void Cell::paintMoreTextIndicator( TQPainter& painter, // Show a red triangle when it's not possible to write all text in cell. // Don't print the red triangle if we're printing. if( testFlag( Flag_CellTooShortX ) && - !painter.tqdevice()->isExtDev() && + !painter.device()->isExtDev() && cellRect.height() > 4.0 && cellRect.width() > 4.0 ) { @@ -3175,15 +3175,15 @@ void Cell::paintText( TQPainter& painter, ColumnFormat *colFormat = format()->sheet()->columnFormat( cellRef.x() ); - TQColorGroup defaultColorGroup = TQApplication::tqpalette().active(); + TQColorGroup defaultColorGroup = TQApplication::palette().active(); TQColor textColorPrint = effTextColor( cellRef.x(), cellRef.y() ); // Resolve the text color if invalid (=default). if ( !textColorPrint.isValid() ) { - if ( painter.tqdevice()->isExtDev() ) + if ( painter.device()->isExtDev() ) textColorPrint = TQt::black; else - textColorPrint = TQApplication::tqpalette().active().text(); + textColorPrint = TQApplication::palette().active().text(); } TQPen tmpPen( textColorPrint ); @@ -3209,7 +3209,7 @@ void Cell::paintText( TQPainter& painter, // Check for blue color, for hyperlink. if ( !link().isEmpty() ) { - tmpPen.setColor( TQApplication::tqpalette().active().link() ); + tmpPen.setColor( TQApplication::palette().active().link() ); TQFont f = painter.font(); f.setUnderline( true ); painter.setFont( f ); @@ -3466,7 +3466,7 @@ void Cell::paintPageBorders( TQPainter& painter, bool paintBorderBottom ) { // Not screen? Return immediately. - if ( painter.tqdevice()->isExtDev() ) + if ( painter.device()->isExtDev() ) return; if ( ! format()->sheet()->isShowPageBorders() ) @@ -3628,7 +3628,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect, // If we are on paper printout, we limit the length of the lines. // On paper, we always have full cells, on screen not. - if ( painter.tqdevice()->isExtDev() ) { + if ( painter.device()->isExtDev() ) { // FIXME: There is probably Cut&Paste bugs here as well as below. // The TQMIN/TQMAX and left/right pairs don't really make sense. // @@ -3675,7 +3675,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect, // If we are on paper printout, we limit the length of the lines. // On paper, we always have full cells, on screen not. - if ( painter.tqdevice()->isExtDev() ) { + if ( painter.device()->isExtDev() ) { if ( sheetDir == Sheet::RightToLeft ) painter.drawLine( TQMAX( zrect_left, zcellRect_left ), TQMAX( zrect_top, zcellRect_top - top ), @@ -3716,7 +3716,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect, // If we are on paper printout, we limit the length of the lines. // On paper, we always have full cells, on screen not. - if ( painter.tqdevice()->isExtDev() ) { + if ( painter.device()->isExtDev() ) { if ( zcellRect_top >= zrect_top + top_penWidth / 2) painter.drawLine( TQMAX( zrect_left, zcellRect_left ), zcellRect_top, @@ -3738,7 +3738,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect, // If we are on paper printout, we limit the length of the lines. // On paper, we always have full cells, on screen not. - if ( painter.tqdevice()->isExtDev() ) { + if ( painter.device()->isExtDev() ) { if ( zcellRect_bottom <= zrect_bottom + bottom_penWidth / 2) painter.drawLine( TQMAX( zrect_left, zcellRect_left ), zcellRect_bottom, @@ -3762,7 +3762,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect, #if 0 // Look at the cells on our corners. It may happen that we // just erased parts of their borders corner, so we might need - // to tqrepaint these corners. + // to repaint these corners. // TQPen vert_pen, horz_pen; int vert_penWidth, horz_penWidth; @@ -3810,7 +3810,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect, painter.setPen( vert_pen ); // If we are on paper printout, we limit the length of the lines. // On paper, we always have full cells, on screen not. - if ( painter.tqdevice()->isExtDev() ) { + if ( painter.device()->isExtDev() ) { if ( sheetDir == Sheet::RightToLeft ) painter.drawLine( TQMAX( zrect_left, zcellRect_right ), TQMAX( zrect_top, zcellRect_top ), @@ -3860,7 +3860,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect, painter.setPen( vert_pen ); //If we are on paper printout, we limit the length of the lines //On paper, we always have full cells, on screen not - if ( painter.tqdevice()->isExtDev() ) { + if ( painter.device()->isExtDev() ) { if ( sheetDir == Sheet::RightToLeft ) painter.drawLine( TQMAX( zrect_left, zcellRect_left ), TQMAX( zrect_top, zcellRect_top ), @@ -3913,7 +3913,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect, painter.setPen( vert_pen ); // If we are on paper printout, we limit the length of the lines. // On paper, we always have full cells, on screen not. - if ( painter.tqdevice()->isExtDev() ) { + if ( painter.device()->isExtDev() ) { if ( sheetDir == Sheet::RightToLeft ) painter.drawLine( TQMAX( zrect_left, zcellRect_right ), TQMAX( zrect_top, zcellRect_bottom - bottom ), @@ -3965,7 +3965,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect, painter.setPen( vert_pen ); // If we are on paper printout, we limit the length of the lines. // On paper, we always have full cells, on screen not. - if ( painter.tqdevice()->isExtDev() ) { + if ( painter.device()->isExtDev() ) { if ( sheetDir == Sheet::RightToLeft ) painter.drawLine( TQMAX( zrect_left, zcellRect_left ), TQMAX( zrect_top, zcellRect_bottom - bottom ), @@ -4704,7 +4704,7 @@ TQString Cell::link() const void Cell::update() { - /* those obscuring us need to redo their tqlayout cause they can't obscure us + /* those obscuring us need to redo their layout cause they can't obscure us now that we've got text. This includes cells obscuring cells that we are obscuring */ @@ -5232,7 +5232,7 @@ TQDomElement Cell::save( TQDomDocument& doc, { TQDomElement dateMin = doc.createElement( "datemin" ); TQString tmp("%1/%2/%3"); - tmp = tmp.tqarg(d->extra()->validity->dateMin.year()).tqarg(d->extra()->validity->dateMin.month()).tqarg(d->extra()->validity->dateMin.day()); + tmp = tmp.arg(d->extra()->validity->dateMin.year()).arg(d->extra()->validity->dateMin.month()).arg(d->extra()->validity->dateMin.day()); dateMin.appendChild( doc.createTextNode( tmp ) ); validity.appendChild( dateMin ); } @@ -5240,7 +5240,7 @@ TQDomElement Cell::save( TQDomDocument& doc, { TQDomElement dateMax = doc.createElement( "datemax" ); TQString tmp("%1/%2/%3"); - tmp = tmp.tqarg(d->extra()->validity->dateMax.year()).tqarg(d->extra()->validity->dateMax.month()).tqarg(d->extra()->validity->dateMax.day()); + tmp = tmp.arg(d->extra()->validity->dateMax.year()).arg(d->extra()->validity->dateMax.month()).arg(d->extra()->validity->dateMax.day()); dateMax.appendChild( doc.createTextNode( tmp ) ); validity.appendChild( dateMax ); } @@ -5312,7 +5312,7 @@ bool Cell::saveCellResult( TQDomDocument& doc, TQDomElement& result, TQDate dd = value().asDateTime().date(); dataType = "Date"; str = "%1/%2/%3"; - str = str.tqarg(dd.year()).tqarg(dd.month()).tqarg(dd.day()); + str = str.arg(dd.year()).arg(dd.month()).arg(dd.day()); } else if( isTime() ) { @@ -6048,25 +6048,25 @@ void Cell::loadOasisObjects( const TQDomElement &parent, KoOasisLoadingContext& if ( !point.isValid() ) continue; - KoRect tqgeometry = obj->tqgeometry(); - tqgeometry.setLeft( tqgeometry.left() + sheet()->columnPos( d->column, 0 ) ); - tqgeometry.setTop( tqgeometry.top() + sheet()->rowPos( d->row, 0 ) ); + KoRect geometry = obj->geometry(); + geometry.setLeft( geometry.left() + sheet()->columnPos( d->column, 0 ) ); + geometry.setTop( geometry.top() + sheet()->rowPos( d->row, 0 ) ); TQString str = e.attributeNS( KoXmlNS::table, "end-x", TQString() ); if ( !str.isNull() ) { uint end_x = (uint) KoUnit::parseValue( str ); - tqgeometry.setRight( sheet()->columnPos( point.column(), 0) + end_x ); + geometry.setRight( sheet()->columnPos( point.column(), 0) + end_x ); } str = e.attributeNS( KoXmlNS::table, "end-y", TQString() ); if ( !str.isNull() ) { uint end_y = (uint) KoUnit::parseValue( str ); - tqgeometry.setBottom( sheet()->rowPos( point.row(), 0) + end_y ); + geometry.setBottom( sheet()->rowPos( point.row(), 0) + end_y ); } - obj->setGeometry( tqgeometry ); + obj->setGeometry( geometry ); } } } @@ -6744,8 +6744,8 @@ bool Cell::loadCellData(const TQDomElement & text, Paste::Operation op ) if( inside_tag ) { inside_tag = false; - if( tag.tqstartsWith( "a href=\"", true ) ) - if( tag.tqendsWith( "\"" ) ) + if( tag.startsWith( "a href=\"", true ) ) + if( tag.endsWith( "\"" ) ) qml_link = tag.mid( 8, tag.length()-9 ); tag = TQString(); } diff --git a/kspread/kspread_cell.h b/kspread/kspread_cell.h index 500804f3..fd100c45 100644 --- a/kspread/kspread_cell.h +++ b/kspread/kspread_cell.h @@ -265,7 +265,7 @@ public: /** * Moves around the cell. It cares about obscured and obscuring cells and - * forces, retqlayout, calculation and redrawing of the cell. + * forces, relayout, calculation and redrawing of the cell. */ void move( int column, int row ); @@ -807,7 +807,7 @@ public: void clearAllErrors(); /** - * Calculates the tqlayout of the cell, i,e, determines what should be shown + * Calculates the layout of the cell, i,e, determines what should be shown * for this cell, m_strOutText. */ void makeLayout( TQPainter &_painter, int _col, int _row ); @@ -900,9 +900,9 @@ public: * In that case the cell usually displays "#####" * * LayoutDirty - * Flag showing whether the current tqlayout is OK. + * Flag showing whether the current layout is OK. * If you change for example the fonts point size, set this flag. When the - * cell must draw itself on the screen it will first recalculate its tqlayout. + * cell must draw itself on the screen it will first recalculate its layout. * * CalcDirty * Shows whether recalculation is necessary. @@ -925,7 +925,7 @@ public: * If this flag is set, then it is known that this cell has to be updated * on the display. This means that somewhere in the calling stack there is a * function which will call @ref Sheet::updateCell once it retains - * the control. If a function changes the contents/tqlayout of this cell and this + * the control. If a function changes the contents/layout of this cell and this * flag is not set, then the function must set it at once. After the changes * are done the function must call <tt>m_pSheet->updateCell(...). * The flag is cleared by the function format()->sheet()->updateCell. diff --git a/kspread/kspread_cluster.cc b/kspread/kspread_cluster.cc index 21fe0ef0..318ee758 100644 --- a/kspread/kspread_cluster.cc +++ b/kspread/kspread_cluster.cc @@ -1039,7 +1039,7 @@ bool ColumnCluster::insertColumn( int col ) int cx = col / KSPREAD_CLUSTER_LEVEL2; int dx = col % KSPREAD_CLUSTER_LEVEL2; - // Is there a column tqlayout at the right most position ? + // Is there a column layout at the right most position ? // In this case the shift is impossible. ColumnFormat** cl = m_cluster[ KSPREAD_CLUSTER_LEVEL1 - 1 ]; if ( cl && cl[ KSPREAD_CLUSTER_LEVEL2 - 1 ] ) @@ -1356,7 +1356,7 @@ bool RowCluster::insertRow( int row ) int cx = row / KSPREAD_CLUSTER_LEVEL2; int dx = row % KSPREAD_CLUSTER_LEVEL2; - // Is there a row tqlayout at the bottom most position ? + // Is there a row layout at the bottom most position ? // In this case the shift is impossible. RowFormat** cl = m_cluster[ KSPREAD_CLUSTER_LEVEL1 - 1 ]; if ( cl && cl[ KSPREAD_CLUSTER_LEVEL2 - 1 ] ) diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cc index 188dbe2e..ea698845 100644 --- a/kspread/kspread_doc.cc +++ b/kspread/kspread_doc.cc @@ -218,7 +218,7 @@ Doc::Doc( TQWidget *parentWidget, const char *widgetName, TQObject* parent, cons if ( !name ) { TQString tmp( "Document%1" ); - tmp = tmp.tqarg( d->s_docId++ ); + tmp = tmp.arg( d->s_docId++ ); setName( tmp.local8Bit());//tmp.latin1() ); dcopObject(); } @@ -941,7 +941,7 @@ void Doc::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyles ) con styles = mainStyles.styles( KoGenStyle::STYLE_PAGELAYOUT ); it = styles.begin(); for ( ; it != styles.end() ; ++it ) { - (*it).style->writeStyle( stylesWriter, mainStyles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties", false /*don't close*/ ); + (*it).style->writeStyle( stylesWriter, mainStyles, "style:page-layout", (*it).name, "style:page-layout-properties", false /*don't close*/ ); stylesWriter->endElement(); } @@ -998,7 +998,7 @@ bool Doc::loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles, const if ( localName.isEmpty() ) setErrorMessage( i18n( "Invalid OASIS OpenDocument file. No tag found inside office:body." ) ); else - setErrorMessage( i18n( "This document is not a spreadsheet, but %1. Please try opening it with the appropriate application." ).tqarg( KoDocument::tagNameToDocumentType( localName ) ) ); + setErrorMessage( i18n( "This document is not a spreadsheet, but %1. Please try opening it with the appropriate application." ).arg( KoDocument::tagNameToDocumentType( localName ) ) ); deleteLoadingInfo(); return false; } @@ -1086,7 +1086,7 @@ bool Doc::loadXML( TQIODevice *, const TQDomDocument& doc ) if ( spread.attribute( "mime" ) != "application/x-kspread" && spread.attribute( "mime" ) != "application/vnd.kde.kspread" ) { d->isLoading = false; - setErrorMessage( i18n( "Invalid document. Expected mimetype application/x-kspread or application/vnd.kde.kspread, got %1" ).tqarg( spread.attribute("mime") ) ); + setErrorMessage( i18n( "Invalid document. Expected mimetype application/x-kspread or application/vnd.kde.kspread, got %1" ).arg( spread.attribute("mime") ) ); return false; } @@ -1095,7 +1095,7 @@ bool Doc::loadXML( TQIODevice *, const TQDomDocument& doc ) { int ret = KMessageBox::warningContinueCancel( 0, i18n("This document was created with a newer version of KSpread (syntax version: %1)\n" - "When you open it with this version of KSpread, some information may be lost.").tqarg(d->syntaxVersion), + "When you open it with this version of KSpread, some information may be lost.").arg(d->syntaxVersion), i18n("File Format Mismatch"), KStdGuiItem::cont() ); if ( ret == KMessageBox::Cancel ) { @@ -1179,7 +1179,7 @@ bool Doc::loadXML( TQIODevice *, const TQDomDocument& doc ) return false; } - //Backwards compatibility with older versions for paper tqlayout + //Backwards compatibility with older versions for paper layout if ( d->syntaxVersion < 1 ) { TQDomElement paper = spread.namedItem( "paper" ).toElement(); @@ -1549,7 +1549,7 @@ void Doc::setZoomAndResolution( int zoom, int dpiX, int dpiY ) void Doc::newZoomAndResolution( bool updateViews, bool /*forPrint*/ ) { -/* tqlayout(); +/* layout(); updateAllFrames();*/ if ( updateViews ) { @@ -1656,12 +1656,12 @@ void Doc::paintContent( TQPainter& painter, const TQRect& rect, if ( m_zoomedResolutionX != zoomX ) d_zoom *= ( zoomX / m_zoomedResolutionX ); - // KSpread support zoom, therefore no need to scale with tqworldMatrix - TQWMatrix matrix = painter.tqworldMatrix(); + // KSpread support zoom, therefore no need to scale with worldMatrix + TQWMatrix matrix = painter.worldMatrix(); matrix.setMatrix( 1, 0, 0, 1, matrix.dx(), matrix.dy() ); TQRect prect = rect; - prect.setWidth( (int) (prect.width() * painter.tqworldMatrix().m11()) ); - prect.setHeight( (int) (prect.height() * painter.tqworldMatrix().m22()) ); + prect.setWidth( (int) (prect.width() * painter.worldMatrix().m11()) ); + prect.setHeight( (int) (prect.height() * painter.worldMatrix().m22()) ); setZoomAndResolution( (int) ( d_zoom * 100 ), KoGlobal::dpiX(), KoGlobal::dpiY() ); // paint the content, now zoom is correctly set kdDebug(36001)<<"paintContent-------------------------------------\n"; @@ -1731,7 +1731,7 @@ void Doc::paintCellRegions(TQPainter& painter, const TQRect &viewRect, const Sheet* sheet, bool /*drawCursor*/) { // - // Clip away tqchildren + // Clip away children // TQRegion rgn = painter.clipRegion(); @@ -1746,10 +1746,10 @@ void Doc::paintCellRegions(TQPainter& painter, const TQRect &viewRect, - view->canvasWidget()->yOffset() ); } else { - matrix = painter.tqworldMatrix(); + matrix = painter.worldMatrix(); } -// TQPtrListIterator<KoDocumentChild> it( tqchildren() ); +// TQPtrListIterator<KoDocumentChild> it( children() ); // for( ; it.current(); ++it ) { // // if ( ((Child*)it.current())->sheet() == sheet && // // !m_pView->hasDocumentInWindow( it.current()->document() ) ) @@ -2192,7 +2192,7 @@ void Doc::emitBeginOperation(bool waitCursor) //are expected to be completed in a short time anyway. TQCursor* activeOverride = static_cast<TQCursor*>(TQApplication::overrideCursor()); - if (waitCursor && ( (!activeOverride) || (activeOverride->tqshape() != TQt::waitCursor.tqshape()) ) ) + if (waitCursor && ( (!activeOverride) || (activeOverride->shape() != TQt::waitCursor.shape()) ) ) { TQApplication::setOverrideCursor(TQt::waitCursor); } @@ -2200,7 +2200,7 @@ void Doc::emitBeginOperation(bool waitCursor) // /* just duplicate the current cursor on the stack, then */ // else if (TQApplication::overrideCursor() != NULL) // { -// TQApplication::setOverrideCursor(TQApplication::overrideCursor()->tqshape()); +// TQApplication::setOverrideCursor(TQApplication::overrideCursor()->shape()); // } KoDocument::emitBeginOperation(); @@ -2379,7 +2379,7 @@ KoPictureCollection *Doc::pictureCollection() return &d->m_pictureCollection; } -void Doc::tqrepaint( const TQRect& rect ) +void Doc::repaint( const TQRect& rect ) { TQRect r; TQPtrListIterator<KoView> it( views() ); @@ -2393,7 +2393,7 @@ void Doc::tqrepaint( const TQRect& rect ) } } -void Doc::tqrepaint( EmbeddedObject *obj ) +void Doc::repaint( EmbeddedObject *obj ) { TQPtrListIterator<KoView> it( views() ); for( ; it.current(); ++it ) @@ -2404,7 +2404,7 @@ void Doc::tqrepaint( EmbeddedObject *obj ) } } -void Doc::tqrepaint( const KoRect& rect ) +void Doc::repaint( const KoRect& rect ) { TQRect r; TQPtrListIterator<KoView> it( views() ); diff --git a/kspread/kspread_doc.h b/kspread/kspread_doc.h index 63320a96..64d1fbf5 100644 --- a/kspread/kspread_doc.h +++ b/kspread/kspread_doc.h @@ -565,7 +565,7 @@ public: virtual void emitBeginOperation(); /** - * Mark the end of an operation and triggers a tqrepaint of any cells or regions of cells which + * Mark the end of an operation and triggers a repaint of any cells or regions of cells which * have been marked as 'dirty' via calls to Sheet::setRegionPaintDirty * See above comment to emitBeginOperation(bool). */ @@ -640,10 +640,10 @@ public: void loadConfigFromFile(); bool configLoadFromFile() const; - // tqrepaint (update) all views - void tqrepaint( const TQRect& ); - void tqrepaint( EmbeddedObject* ); - void tqrepaint( const KoRect& ); + // repaint (update) all views + void repaint( const TQRect& ); + void repaint( EmbeddedObject* ); + void repaint( const KoRect& ); virtual void addShell( KoMainWindow *shell ); diff --git a/kspread/kspread_editors.cc b/kspread/kspread_editors.cc index ddf41d31..7f0fa282 100644 --- a/kspread/kspread_editors.cc +++ b/kspread/kspread_editors.cc @@ -315,11 +315,11 @@ TQObject( editor ) d->editor = editor; d->hintLabel = 0; - d->completionPopup = new TQVBox( editor->tqtopLevelWidget(), 0, WType_Popup ); + d->completionPopup = new TQVBox( editor->topLevelWidget(), 0, WType_Popup ); d->completionPopup->setFrameStyle( TQFrame::Box | TQFrame::Plain ); d->completionPopup->setLineWidth( 1 ); d->completionPopup->installEventFilter( this ); - d->completionPopup->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum); + d->completionPopup->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum); d->completionListBox = new KListBox( d->completionPopup ); d->completionPopup->setFocusProxy( d->completionListBox ); @@ -430,7 +430,7 @@ void FunctionCompletion::showCompletion( const TQStringList &choices ) // size of the pop-up d->completionPopup->setMaximumHeight( 100 ); - d->completionPopup->resize( d->completionListBox->tqsizeHint() + + d->completionPopup->resize( d->completionListBox->sizeHint() + TQSize( d->completionListBox->verticalScrollBar()->width() + 4, d->completionListBox->horizontalScrollBar()->height() + 4 ) ); int h = d->completionListBox->height(); @@ -612,7 +612,7 @@ void CellEditor::triggerFunctionAutoComplete() TQStringList fnames = KSpread::FunctionRepository::self()->functionNames(); TQStringList choices; for( unsigned i=0; i<fnames.count(); i++ ) - if( fnames[i].tqstartsWith( id, false ) ) + if( fnames[i].startsWith( id, false ) ) choices.append( fnames[i] ); choices.sort(); @@ -828,7 +828,7 @@ void CellEditor::setEditorFont(TQFont const & font, bool updateSize) d->fontLength = fm.width('x'); int mw = fm.width( d->textEdit->text() ) + d->fontLength; - // don't make it smaller: then we would have to tqrepaint the obscured cells + // don't make it smaller: then we would have to repaint the obscured cells if (mw < width()) mw = width(); @@ -1455,7 +1455,7 @@ EditWidget::EditWidget( TQWidget *_parent, Canvas *_canvas, m_pCanvas = _canvas; Q_ASSERT(m_pCanvas != NULL); // Those buttons are created by the caller, so that they are inserted - // properly in the tqlayout - but they are then managed here. + // properly in the layout - but they are then managed here. m_pCancelButton = cancelButton; m_pOkButton = okButton; isArray = false; diff --git a/kspread/kspread_format.cc b/kspread/kspread_format.cc index ecebff60..b0960735 100644 --- a/kspread/kspread_format.cc +++ b/kspread/kspread_format.cc @@ -2725,7 +2725,7 @@ void RowFormat::setBottomBorderPen( const TQPen & p ) Format::setBottomBorderPen( p ); } -void RowFormat::setHide( bool _hide, bool tqrepaint ) +void RowFormat::setHide( bool _hide, bool repaint ) { if ( _hide != m_bHide ) // only if we change the status { @@ -2734,14 +2734,14 @@ void RowFormat::setHide( bool _hide, bool tqrepaint ) // Lower maximum size by height of row m_pSheet->adjustSizeMaxY ( - dblHeight() ); m_bHide = _hide; //hide must be set after we requested the height - m_pSheet->emit_updateRow( this, m_iRow, tqrepaint ); + m_pSheet->emit_updateRow( this, m_iRow, repaint ); } else { // Rise maximum size by height of row m_bHide = _hide; //unhide must be set before we request the height m_pSheet->adjustSizeMaxY ( dblHeight() ); - m_pSheet->emit_updateRow( this, m_iRow, tqrepaint ); + m_pSheet->emit_updateRow( this, m_iRow, repaint ); } } } diff --git a/kspread/kspread_format.h b/kspread/kspread_format.h index ed89807a..83b2daee 100644 --- a/kspread/kspread_format.h +++ b/kspread/kspread_format.h @@ -22,7 +22,7 @@ #ifndef __kspread_format_h__ #define __kspread_format_h__ -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> #include <tqfont.h> #include <tqpen.h> @@ -557,7 +557,7 @@ public: /** * Sets the hide flag */ - void setHide( bool _hide, bool tqrepaint = true ); + void setHide( bool _hide, bool repaint = true ); bool isHide()const { return m_bHide;} bool operator==( const RowFormat& other ) const; diff --git a/kspread/kspread_functions_conversion.cc b/kspread/kspread_functions_conversion.cc index 42246838..23f2ca01 100644 --- a/kspread/kspread_functions_conversion.cc +++ b/kspread/kspread_functions_conversion.cc @@ -168,7 +168,7 @@ Value func_roman (valVector args, ValueCalc *calc, FuncExtra *) if ((value < 0) || (value > 3999)) return Value::errorNA(); TQString result; - result = TQString::tqfromLatin1 (RNThousands[(value / 1000)] + + result = TQString::fromLatin1 (RNThousands[(value / 1000)] + RNHundreds[(value / 100) % 10] + RNTens[(value / 10 ) % 10] + RNUnits[(value) % 10]); @@ -179,7 +179,7 @@ Value func_roman (valVector args, ValueCalc *calc, FuncExtra *) // return < 0 if invalid int func_arabic_helper (TQChar c) { - switch (c.upper().tqunicode()) + switch (c.upper().unicode()) { case 'M': return 1000; case 'D': return 500; diff --git a/kspread/kspread_functions_datetime.cc b/kspread/kspread_functions_datetime.cc index b139057d..0136d298 100644 --- a/kspread/kspread_functions_datetime.cc +++ b/kspread/kspread_functions_datetime.cc @@ -32,8 +32,8 @@ using namespace KSpread; // prototypes, sorted -Value func_tqcurrentDate (valVector args, ValueCalc *calc, FuncExtra *); -Value func_tqcurrentDateTime (valVector args, ValueCalc *calc, FuncExtra *); +Value func_currentDate (valVector args, ValueCalc *calc, FuncExtra *); +Value func_currentDateTime (valVector args, ValueCalc *calc, FuncExtra *); Value func_currentTime (valVector args, ValueCalc *calc, FuncExtra *); Value func_date (valVector args, ValueCalc *calc, FuncExtra *); Value func_datevalue (valVector args, ValueCalc *calc, FuncExtra *); @@ -77,10 +77,10 @@ void RegisterDateTimeFunctions() FunctionRepository* repo = FunctionRepository::self(); Function *f; - f = new Function ("CURRENTDATE", func_tqcurrentDate); + f = new Function ("CURRENTDATE", func_currentDate); f->setParamCount (0); repo->add (f); - f = new Function ("CURRENTDATETIME", func_tqcurrentDateTime); + f = new Function ("CURRENTDATETIME", func_currentDateTime); f->setParamCount (0); repo->add (f); f = new Function ("CURRENTTIME", func_currentTime); @@ -140,7 +140,7 @@ void RegisterDateTimeFunctions() f = new Function ("MONTHS", func_months); f->setParamCount (3); repo->add (f); - f = new Function ("NOW", func_tqcurrentDateTime); + f = new Function ("NOW", func_currentDateTime); f->setParamCount (0); repo->add (f); f = new Function ("SECOND", func_second); @@ -154,7 +154,7 @@ void RegisterDateTimeFunctions() repo->add (f); f = new Function ("TIMEVALUE", func_timevalue); repo->add (f); - f = new Function ("TODAY", func_tqcurrentDate); + f = new Function ("TODAY", func_currentDate); f->setParamCount (0); repo->add (f); f = new Function ("WEEKDAY", func_weekday); @@ -519,7 +519,7 @@ Value func_monthname (valVector args, ValueCalc *calc, FuncExtra *) int number = calc->conv()->asInteger (args[0]).asInteger(); TQString monthName = calc->conv()->locale()->calendar()->monthName (number, - TQDate::tqcurrentDate().year()); + TQDate::currentDate().year()); if (monthName.isNull()) return Value::errorVALUE(); return Value (monthName); @@ -555,10 +555,10 @@ Value func_time (valVector args, ValueCalc *calc, FuncExtra *) return Value (TQTime (h, m, s)); } -// Function: tqcurrentDate -Value func_tqcurrentDate (valVector, ValueCalc *, FuncExtra *) +// Function: currentDate +Value func_currentDate (valVector, ValueCalc *, FuncExtra *) { - return Value (TQDate::tqcurrentDate ()); + return Value (TQDate::currentDate ()); } // Function: currentTime @@ -567,10 +567,10 @@ Value func_currentTime (valVector, ValueCalc *, FuncExtra *) return Value (TQTime::currentTime ()); } -// Function: tqcurrentDateTime -Value func_tqcurrentDateTime (valVector, ValueCalc *, FuncExtra *) +// Function: currentDateTime +Value func_currentDateTime (valVector, ValueCalc *, FuncExtra *) { - return Value (TQDateTime::tqcurrentDateTime ()); + return Value (TQDateTime::currentDateTime ()); } // Function: dayOfYear diff --git a/kspread/kspread_functions_information.cc b/kspread/kspread_functions_information.cc index 52ae0f99..2a5775aa 100644 --- a/kspread/kspread_functions_information.cc +++ b/kspread/kspread_functions_information.cc @@ -158,8 +158,8 @@ Value func_info (valVector args, ValueCalc *calc, FuncExtra *) struct utsname name; if (uname (&name) >= 0) { - TQString os = TQString("%1 %2 (%3)").tqarg( name.sysname ). - tqarg( name.release ).tqarg( name.machine ); + TQString os = TQString("%1 %2 (%3)").arg( name.sysname ). + arg( name.release ).arg( name.machine ); return Value (os); } } diff --git a/kspread/kspread_functions_text.cc b/kspread/kspread_functions_text.cc index 1f661d27..e61aff93 100644 --- a/kspread/kspread_functions_text.cc +++ b/kspread/kspread_functions_text.cc @@ -188,7 +188,7 @@ Value func_code (valVector args, ValueCalc *calc, FuncExtra *) if (str.length() <= 0) return Value::errorVALUE(); - return Value (str[0].tqunicode()); + return Value (str[0].unicode()); } // Function: COMPARE @@ -496,11 +496,11 @@ Value func_rot (valVector args, ValueCalc *calc, FuncExtra *) for( unsigned i=0; i<text.length(); i++ ) { - unsigned c = text[i].upper().tqunicode(); + unsigned c = text[i].upper().unicode(); if( ( c >= 'A' ) && ( c <= 'M' ) ) - text[i] = TQChar( text[i].tqunicode() + 13); + text[i] = TQChar( text[i].unicode() + 13); if( ( c >= 'N' ) && ( c <= 'Z' ) ) - text[i] = TQChar( text[i].tqunicode() - 13); + text[i] = TQChar( text[i].unicode() - 13); } return Value (text); diff --git a/kspread/kspread_generalProperty.cpp b/kspread/kspread_generalProperty.cpp index d2518494..506626bf 100644 --- a/kspread/kspread_generalProperty.cpp +++ b/kspread/kspread_generalProperty.cpp @@ -22,7 +22,7 @@ #include <tqcheckbox.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <knuminput.h> @@ -38,11 +38,11 @@ GeneralProperty::GeneralProperty( TQWidget *parent, const char *name, GeneralVal , m_generalValue( generalValue ) , m_unit( unit ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( m_ui = new KoGeneralPropertyUI( this ) ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( m_ui = new KoGeneralPropertyUI( this ) ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout->addItem( spacer ); + layout->addItem( spacer ); if ( m_generalValue.m_name.isNull() ) { diff --git a/kspread/kspread_map.cc b/kspread/kspread_map.cc index 7d55a8ff..a24c8cf2 100644 --- a/kspread/kspread_map.cc +++ b/kspread/kspread_map.cc @@ -80,7 +80,7 @@ void Map::setProtected( TQCString const & passwd ) Sheet* Map::createSheet() { TQString s( i18n("Sheet%1") ); - s = s.tqarg( tableId++ ); + s = s.arg( tableId++ ); Sheet *t = new Sheet ( this, s , s.utf8()); t->setSheetName( s, true ); // huh? (Werner) return t; @@ -159,7 +159,7 @@ void Map::loadOasisSettings( KoOasisSettings &settings ) void Map::saveOasisSettings( KoXmlWriter &settingsWriter ) { - settingsWriter.addConfigItem( "ViewId", TQString::tqfromLatin1( "View1" ) ); + settingsWriter.addConfigItem( "ViewId", TQString::fromLatin1( "View1" ) ); // Save visual info for the first view, such as active sheet and active cell // It looks like a hack, but reopening a document creates only one view anyway (David) View * view = m_doc->views().isEmpty() ? 0 : dynamic_cast<View*>(m_doc->views().getFirst()); diff --git a/kspread/kspread_object.cc b/kspread/kspread_object.cc index 9257a3f5..8c273700 100644 --- a/kspread/kspread_object.cc +++ b/kspread/kspread_object.cc @@ -55,8 +55,8 @@ class View; * EmbeddedObject * **********************************************************/ -EmbeddedObject::EmbeddedObject( Sheet *_sheet, const KoRect& _tqgeometry ) - : m_tqgeometry( _tqgeometry), m_sheet(_sheet), m_objectName(""), m_selected(false), m_protect(false), m_keepRatio(false), pen( TQt::black, 1, Qt::SolidLine ) +EmbeddedObject::EmbeddedObject( Sheet *_sheet, const KoRect& _geometry ) + : m_geometry( _geometry), m_sheet(_sheet), m_objectName(""), m_selected(false), m_protect(false), m_keepRatio(false), pen( TQt::black, 1, Qt::SolidLine ) { angle = 0.0; inObjList = true; @@ -66,23 +66,23 @@ EmbeddedObject::EmbeddedObject( Sheet *_sheet, const KoRect& _tqgeometry ) EmbeddedObject::~EmbeddedObject() { } -KoRect EmbeddedObject::tqgeometry() +KoRect EmbeddedObject::geometry() { - return m_tqgeometry; + return m_geometry; } void EmbeddedObject::setGeometry( const KoRect &rect ) { - m_tqgeometry = rect; + m_geometry = rect; } void EmbeddedObject::moveBy( const KoPoint &_point ) { - m_tqgeometry.moveTopLeft( m_tqgeometry.topLeft() + _point ); + m_geometry.moveTopLeft( m_geometry.topLeft() + _point ); } void EmbeddedObject::moveBy( double _dx, double _dy ) { - m_tqgeometry.moveTopLeft( m_tqgeometry.topLeft() + KoPoint( _dx, _dy ) ); + m_geometry.moveTopLeft( m_geometry.topLeft() + KoPoint( _dx, _dy ) ); } void EmbeddedObject::resizeBy( const KoSize & _size ) @@ -92,7 +92,7 @@ void EmbeddedObject::resizeBy( const KoSize & _size ) void EmbeddedObject::resizeBy( double _dx, double _dy) { - m_tqgeometry.setSize( KoSize( m_tqgeometry.width()+_dx, m_tqgeometry.height()+_dy) ); + m_geometry.setSize( KoSize( m_geometry.width()+_dx, m_geometry.height()+_dy) ); } // call (possibly reimplemented) setSize bool EmbeddedObject::load( const TQDomElement& /*element*/ ) @@ -105,10 +105,10 @@ void EmbeddedObject::loadOasis(const TQDomElement &element, KoOasisLoadingContex { if(element.hasAttributeNS( KoXmlNS::draw, "name" )) m_objectName = element.attributeNS( KoXmlNS::draw, "name", TQString()); - m_tqgeometry.setX( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "x", TQString() ) ) ); - m_tqgeometry.setY( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "y", TQString() ) ) ); - m_tqgeometry.setWidth(KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "width", TQString() )) ); - m_tqgeometry.setHeight(KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "height", TQString() ) ) ); + m_geometry.setX( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "x", TQString() ) ) ); + m_geometry.setY( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "y", TQString() ) ) ); + m_geometry.setWidth(KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "width", TQString() )) ); + m_geometry.setHeight(KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "height", TQString() ) ) ); //kdDebug()<<" orig.x() :"<<orig.x() <<" orig.y() :"<<orig.y() <<"ext.width() :"<<ext.width()<<" ext.height(): "<<ext.height()<<endl; KoStyleStack &styleStack = context.styleStack(); @@ -126,15 +126,15 @@ void EmbeddedObject::saveOasisPosObject( KoXmlWriter &xmlWriter, int indexObj ) { xmlWriter.addAttribute( "draw:id", "object" + TQString::number( indexObj ) ); //save all into pt - xmlWriter.addAttributePt( "svg:x", sheet()->doc()->savingWholeDocument() ? m_tqgeometry.x() : m_tqgeometry.x() + 20.0 ); - xmlWriter.addAttributePt( "svg:y", sheet()->doc()->savingWholeDocument() ? m_tqgeometry.y() : m_tqgeometry.y() + 20.0 ); - xmlWriter.addAttributePt( "svg:width", m_tqgeometry.width() ); - xmlWriter.addAttributePt( "svg:height", m_tqgeometry.height() ); + xmlWriter.addAttributePt( "svg:x", sheet()->doc()->savingWholeDocument() ? m_geometry.x() : m_geometry.x() + 20.0 ); + xmlWriter.addAttributePt( "svg:y", sheet()->doc()->savingWholeDocument() ? m_geometry.y() : m_geometry.y() + 20.0 ); + xmlWriter.addAttributePt( "svg:width", m_geometry.width() ); + xmlWriter.addAttributePt( "svg:height", m_geometry.height() ); // if ( kAbs( angle ) > 1E-6 ) // { // double value = -1 * ( ( double )angle* M_PI )/180.0; -// TQString str=TQString( "rotate (%1)" ).tqarg( value ); +// TQString str=TQString( "rotate (%1)" ).arg( value ); // xmlWriter.addAttribute( "draw:transform", str ); // } } @@ -187,7 +187,7 @@ TQPixmap EmbeddedObject::toPixmap(double /*xZoom*/ , double /*yZoom*/) void EmbeddedObject::calculateRequiredZoom( TQSize desiredSize, double& xZoom, double& yZoom) { - TQSize actualSize = tqgeometry().size().toTQSize(); + TQSize actualSize = geometry().size().toTQSize(); xZoom = (double) desiredSize.width() / (double)actualSize.width(); yZoom = (double) desiredSize.height() / (double)actualSize.height(); @@ -199,8 +199,8 @@ void EmbeddedObject::paintSelection( TQPainter *_painter, SelectionMode mode ) return; _painter->save(); - KoRect bound( tqgeometry().left(), tqgeometry().top(), - tqgeometry().width() , tqgeometry().height() ); + KoRect bound( geometry().left(), geometry().top(), + geometry().width() , geometry().height() ); TQRect zoomedBound = sheet()->doc()->zoomRect( bound ) ; //_painter->setPen( TQPen( TQt::black, 1, TQPen::SolidLine ) ); @@ -261,14 +261,14 @@ void EmbeddedObject::paintSelection( TQPainter *_painter, SelectionMode mode ) _painter->restore(); } -TQCursor EmbeddedObject::getCursor( const TQPoint &_point, ModifyType &_modType, TQRect &tqgeometry) const +TQCursor EmbeddedObject::getCursor( const TQPoint &_point, ModifyType &_modType, TQRect &geometry) const { int px = /*sheet()->doc()->zoomItX*/(_point.x()); int py = /*sheet()->doc()->zoomItY*/(_point.y()); - int ox = /*sheet()->doc()->zoomItX*/(/*orig*/tqgeometry.x()); - int oy = /*sheet()->doc()->zoomItY*/(/*orig*/tqgeometry.y()); - int ow = /*sheet()->doc()->zoomItX*/(/*ext*/tqgeometry.width()); - int oh = /*sheet()->doc()->zoomItY*/(/*ext*/tqgeometry.height()); + int ox = /*sheet()->doc()->zoomItX*/(/*orig*/geometry.x()); + int oy = /*sheet()->doc()->zoomItY*/(/*orig*/geometry.y()); + int ow = /*sheet()->doc()->zoomItX*/(/*ext*/geometry.width()); + int oh = /*sheet()->doc()->zoomItY*/(/*ext*/geometry.height()); // if ( angle != 0.0 ) // { @@ -367,10 +367,10 @@ void EmbeddedObject::doDelete() * EmbeddedKOfficeObject * **********************************************************/ -EmbeddedKOfficeObject::EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet, KoDocument* doc, const KoRect& tqgeometry ) - : EmbeddedObject( _sheet, tqgeometry ), m_parent(parent) +EmbeddedKOfficeObject::EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet, KoDocument* doc, const KoRect& geometry ) + : EmbeddedObject( _sheet, geometry ), m_parent(parent) { - m_embeddedObject = new KoDocumentChild(parent, doc, tqgeometry.toTQRect() ); + m_embeddedObject = new KoDocumentChild(parent, doc, geometry.toTQRect() ); } EmbeddedKOfficeObject::EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet ) @@ -399,7 +399,7 @@ bool EmbeddedKOfficeObject::saveOasisObjectAttributes( KSpreadOasisSaveContext & kdDebug() << "EmbeddedKOfficeObject::saveOasisPart " << sc.partIndexObj << endl; sc.xmlWriter.startElement( "draw:object" ); - const TQString name = TQString( "Object_%1" ).tqarg( sc.partIndexObj + 1 ); + const TQString name = TQString( "Object_%1" ).arg( sc.partIndexObj + 1 ); ++sc.partIndexObj; m_embeddedObject->saveOasisAttributes( sc.xmlWriter, name ); @@ -417,7 +417,7 @@ bool EmbeddedKOfficeObject::load( const TQDomElement& element ) { kdDebug() << "Loading EmbeddedKOfficeObject" << endl; bool result = embeddedObject()->load( element ); - setGeometry( KoRect::fromTQRect( embeddedObject()->tqgeometry() ) ); + setGeometry( KoRect::fromTQRect( embeddedObject()->geometry() ) ); return result; } @@ -436,7 +436,7 @@ void EmbeddedKOfficeObject::loadOasis(const TQDomElement &element, KoOasisLoadin TQDomElement EmbeddedKOfficeObject::save( TQDomDocument& doc ) { kdDebug() << "Saving EmbeddedKOfficeObject" << endl; - embeddedObject()->setGeometry( tqgeometry().toTQRect() ); + embeddedObject()->setGeometry( geometry().toTQRect() ); return m_embeddedObject->save( doc ); } @@ -446,21 +446,21 @@ void EmbeddedKOfficeObject::draw( TQPainter *_painter ) int const penw = pen.width() ; KoRect bound( 0, 0, - tqgeometry().width() - ( 2 * penw ), tqgeometry().height() - ( 2 * penw ) ); + geometry().width() - ( 2 * penw ), geometry().height() - ( 2 * penw ) ); TQRect const zoomedBound = sheet()->doc()->zoomRect( bound ); _painter->save(); - int const xOffset = sheet()->doc()->zoomItX( tqgeometry().left() + penw); - int const yOffset = sheet()->doc()->zoomItY( tqgeometry().top() + penw ); + int const xOffset = sheet()->doc()->zoomItX( geometry().left() + penw); + int const yOffset = sheet()->doc()->zoomItY( geometry().top() + penw ); - TQRect new_tqgeometry = zoomedBound; + TQRect new_geometry = zoomedBound; //if ( translate ) //{ _painter->translate( xOffset , yOffset ); - new_tqgeometry.moveBy( xOffset , yOffset ); - new_tqgeometry.moveBy( -_painter->window().x(), -_painter->window().y() ); + new_geometry.moveBy( xOffset , yOffset ); + new_geometry.moveBy( -_painter->window().x(), -_painter->window().y() ); //} _painter->setClipRect( zoomedBound, TQPainter::CoordPainter ); @@ -477,7 +477,7 @@ void EmbeddedKOfficeObject::draw( TQPainter *_painter ) zoomY ); - embeddedObject()->setGeometry( new_tqgeometry ); + embeddedObject()->setGeometry( new_geometry ); _painter->restore(); EmbeddedObject::draw( _painter ); @@ -485,10 +485,10 @@ void EmbeddedKOfficeObject::draw( TQPainter *_painter ) TQPixmap EmbeddedKOfficeObject::toPixmap( double xZoom , double yZoom ) { - TQPixmap pixmap( (int)( tqgeometry().width()*xZoom ), (int)( tqgeometry().height()*yZoom ) ); + TQPixmap pixmap( (int)( geometry().width()*xZoom ), (int)( geometry().height()*yZoom ) ); TQPainter painter(&pixmap); - TQRect bound( 0,0,(int)( tqgeometry().width()*xZoom ), (int)(tqgeometry().height()*yZoom) ); + TQRect bound( 0,0,(int)( geometry().width()*xZoom ), (int)(geometry().height()*yZoom) ); embeddedObject()->document()->paintEverything(painter,bound, embeddedObject()->isTransparent(), 0, @@ -516,10 +516,10 @@ void EmbeddedKOfficeObject::deactivate() void EmbeddedKOfficeObject::updateChildGeometry() { // KoZoomHandler* zh = m_sheet->doc(); -// embeddedObject()->setGeometry( zh->zoomRect( tqgeometry() ), true ); +// embeddedObject()->setGeometry( zh->zoomRect( geometry() ), true ); // return; -// TQRect r = sheet()->doc()->zoomRect( tqgeometry() ); +// TQRect r = sheet()->doc()->zoomRect( geometry() ); // if ( _canvas ) // { // kdDebug() << "_canvas->xOffset():" << _canvas->xOffset() << endl; @@ -537,8 +537,8 @@ void EmbeddedKOfficeObject::updateChildGeometry() * **********************************************************/ -EmbeddedChart::EmbeddedChart( Doc *_spread, Sheet *_sheet, KoDocument* doc, const KoRect& tqgeometry ) - : EmbeddedKOfficeObject( _spread, _sheet, doc, tqgeometry ) +EmbeddedChart::EmbeddedChart( Doc *_spread, Sheet *_sheet, KoDocument* doc, const KoRect& geometry ) + : EmbeddedKOfficeObject( _spread, _sheet, doc, geometry ) { m_pBinding = 0; } @@ -687,8 +687,8 @@ KoChart::Part* EmbeddedChart::chart() * EmbeddedPictureObject * **********************************************************/ -EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _tqgeometry, KoPictureCollection *_imageCollection ) - : EmbeddedObject( _sheet, _tqgeometry ) +EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _geometry, KoPictureCollection *_imageCollection ) + : EmbeddedObject( _sheet, _geometry ) { imageCollection = _imageCollection; pen = KoPen( TQt::black, 1.0, Qt::NoPen ); @@ -706,8 +706,8 @@ EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _tqge } -EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _tqgeometry, KoPictureCollection *_imageCollection, const KoPictureKey & key ) - : EmbeddedObject( _sheet, _tqgeometry ) +EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _geometry, KoPictureCollection *_imageCollection, const KoPictureKey & key ) + : EmbeddedObject( _sheet, _geometry ) { imageCollection = _imageCollection; @@ -1015,7 +1015,7 @@ void EmbeddedPictureObject::loadOasis(const TQDomElement &element, KoOasisLoadin strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. } TQString filename(href/*.mid(1)*/); - const KoPictureKey key(filename, TQDateTime::tqcurrentDateTime(Qt::UTC)); + const KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC)); image.setKey(key); KoStore* store = context.store(); @@ -1149,10 +1149,10 @@ void EmbeddedPictureObject::loadOasis(const TQDomElement &element, KoOasisLoadin void EmbeddedPictureObject::drawShadow( TQPainter* /*_painter*/, KoZoomHandler* /*_zoomHandler*/) { -// const double ox = /*orig*/m_tqgeometry.x(); -// const double oy = /*orig*/m_tqgeometry.y(); -// const double ow = /*ext*/m_tqgeometry.width(); -// const double oh = /*ext*/m_tqgeometry.height(); +// const double ox = /*orig*/m_geometry.x(); +// const double oy = /*orig*/m_geometry.y(); +// const double ow = /*ext*/m_geometry.width(); +// const double oh = /*ext*/m_geometry.height(); // // _painter->save(); // @@ -1208,7 +1208,7 @@ TQPixmap EmbeddedPictureObject::generatePixmap(KoZoomHandler*_zoomHandler) { const double penw = _zoomHandler->zoomItX( ( ( pen.style() == Qt::NoPen ) ? 1 : pen.width() ) / 2.0 ); - TQSize size( _zoomHandler->zoomSize( m_tqgeometry.size() /*ext*/ ) ); + TQSize size( _zoomHandler->zoomSize( m_geometry.size() /*ext*/ ) ); //kdDebug(33001) << "EmbeddedPictureObject::generatePixmap size= " << size << endl; TQPixmap pixmap(size); TQPainter paint; @@ -1221,8 +1221,8 @@ TQPixmap EmbeddedPictureObject::generatePixmap(KoZoomHandler*_zoomHandler) paint.setBrush( getBrush() ); TQRect rect( (int)( penw ), (int)( penw ), - (int)( _zoomHandler->zoomItX( /*ext*/m_tqgeometry.width() ) - 2.0 * penw ), - (int)( _zoomHandler->zoomItY( /*ext*/m_tqgeometry.height() ) - 2.0 * penw ) ); + (int)( _zoomHandler->zoomItX( /*ext*/m_geometry.width() ) - 2.0 * penw ), + (int)( _zoomHandler->zoomItY( /*ext*/m_geometry.height() ) - 2.0 * penw ) ); // if ( getFillType() == FT_BRUSH || !gradient ) paint.drawRect( rect ); @@ -1231,8 +1231,8 @@ TQPixmap EmbeddedPictureObject::generatePixmap(KoZoomHandler*_zoomHandler) // gradient->setSize( size ); // paint.drawPixmap( (int)( penw ), (int)( penw ), // gradient->pixmap(), 0, 0, -// (int)( _zoomHandler->zoomItX( m_tqgeometry/*ext*/.width() ) - 2 * penw ), -// (int)( _zoomHandler->zoomItY( m_tqgeometry/*ext*/.height() ) - 2 * penw ) ); +// (int)( _zoomHandler->zoomItX( m_geometry/*ext*/.width() ) - 2 * penw ), +// (int)( _zoomHandler->zoomItY( m_geometry/*ext*/.height() ) - 2 * penw ) ); // } @@ -1260,10 +1260,10 @@ void EmbeddedPictureObject::draw( TQPainter *_painter/*, KoZoomHandler*_zoomHand // if ( shadowDistance > 0 && !drawContour ) // drawShadow(_painter, _zoomHandler); - const double ox = /*orig*/m_tqgeometry.x(); - const double oy = /*orig*/m_tqgeometry.y(); - const double ow = /*ext*/m_tqgeometry.width(); - const double oh = /*ext*/m_tqgeometry.height(); + const double ox = /*orig*/m_geometry.x(); + const double oy = /*orig*/m_geometry.y(); + const double ow = /*ext*/m_geometry.width(); + const double oh = /*ext*/m_geometry.height(); //const double penw = _zoomHandler->zoomItX( ( ( pen.style() == Qt::NoPen ) ? 1.0 : pen.width() ) / 2.0 ); _painter->save(); diff --git a/kspread/kspread_object.h b/kspread/kspread_object.h index 46074109..b66d67ac 100644 --- a/kspread/kspread_object.h +++ b/kspread/kspread_object.h @@ -108,13 +108,13 @@ enum AlignType { class EmbeddedObject { public: - EmbeddedObject( Sheet *_sheet, const KoRect& _tqgeometry ); + EmbeddedObject( Sheet *_sheet, const KoRect& _geometry ); virtual ~EmbeddedObject(); virtual ObjType getType() const { return OBJECT_GENERAL; } virtual TQString getTypeString() const { return TQString(); } - KoRect tqgeometry(); + KoRect geometry(); void setGeometry( const KoRect &rect ); virtual void moveBy( const KoPoint &_point ); virtual void moveBy( double _dx, double _dy ); @@ -183,7 +183,7 @@ class EmbeddedObject void paintSelection( TQPainter *_painter, SelectionMode selectionMode ); - virtual TQCursor getCursor( const TQPoint &_point, ModifyType &_modType, TQRect &tqgeometry ) const; + virtual TQCursor getCursor( const TQPoint &_point, ModifyType &_modType, TQRect &geometry ) const; virtual void removeFromObjList() { inObjList = false; } @@ -217,7 +217,7 @@ class EmbeddedObject */ void calculateRequiredZoom( TQSize desiredSize , double& xZoom, double& yZoom ); - KoRect m_tqgeometry; + KoRect m_geometry; Sheet *m_sheet; Canvas *m_canvas; TQString m_objectName; @@ -238,7 +238,7 @@ class EmbeddedObject class EmbeddedKOfficeObject : public EmbeddedObject { public: - EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet, KoDocument* doc, const KoRect& tqgeometry ); + EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet, KoDocument* doc, const KoRect& geometry ); EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet ); virtual ~EmbeddedKOfficeObject(); virtual ObjType getType() const { return OBJECT_KOFFICE_PART; } @@ -314,8 +314,8 @@ class EmbeddedChart : public EmbeddedKOfficeObject class EmbeddedPictureObject : public EmbeddedObject { public: - EmbeddedPictureObject(Sheet *_sheet, const KoRect& _tqgeometry, KoPictureCollection *_imageCollection ); - EmbeddedPictureObject(Sheet *_sheet, const KoRect& _tqgeometry, KoPictureCollection *_imageCollection, const KoPictureKey & key ); + EmbeddedPictureObject(Sheet *_sheet, const KoRect& _geometry, KoPictureCollection *_imageCollection ); + EmbeddedPictureObject(Sheet *_sheet, const KoRect& _geometry, KoPictureCollection *_imageCollection, const KoPictureKey & key ); EmbeddedPictureObject( Sheet *_sheet, KoPictureCollection *_imageCollection ); virtual ~EmbeddedPictureObject(); EmbeddedPictureObject &operator=( const EmbeddedPictureObject & ); diff --git a/kspread/kspread_propertyEditor.cpp b/kspread/kspread_propertyEditor.cpp index 6f38c25e..3b84a3db 100644 --- a/kspread/kspread_propertyEditor.cpp +++ b/kspread/kspread_propertyEditor.cpp @@ -280,7 +280,7 @@ KCommand * PropertyEditor::getCommand() TQPtrListIterator<EmbeddedObject> it( m_objects ); for ( ; it.current(); ++it ) { - KoRect oldRect = it.current()->tqgeometry()/*getRect()*/; + KoRect oldRect = it.current()->geometry()/*getRect()*/; KoRect newRect = oldRect; if ( change & GeneralProperty::Left ) @@ -446,7 +446,7 @@ GeneralProperty::GeneralValue PropertyEditor::getGeneralValue() generalValue.m_protect = protect ? STATE_ON : STATE_OFF; keepRatio = it.current()->isKeepRatio(); generalValue.m_keepRatio = keepRatio ? STATE_ON : STATE_OFF; - generalValue.m_rect = it.current()->tqgeometry()/*getRect()*/; + generalValue.m_rect = it.current()->geometry()/*getRect()*/; ++it; } diff --git a/kspread/kspread_sheet.cc b/kspread/kspread_sheet.cc index 09abcf8a..d0eb13d7 100644 --- a/kspread/kspread_sheet.cc +++ b/kspread/kspread_sheet.cc @@ -29,9 +29,9 @@ #include <tqapplication.h> #include <tqcheckbox.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpicture.h> #include <tqregexp.h> @@ -151,7 +151,7 @@ void ChartBinding::cellChanged( Cell* /*changedCell*/ ) //Ensure display gets updated by marking all cells underneath the chart as //dirty - const TQRect chartGeometry = m_child->tqgeometry().toTQRect(); + const TQRect chartGeometry = m_child->geometry().toTQRect(); double tmp; int left = sheet()->leftColumn( chartGeometry.left() , tmp ); @@ -201,7 +201,7 @@ void ChartBinding::cellChanged( Cell* /*changedCell*/ ) // Force a redraw of the chart on all views - /** TODO - replace the call below with something that will tqrepaint this chart */ + /** TODO - replace the call below with something that will repaint this chart */ #endif // sheet()->emit_polygonInvalidated( m_child->framePointArray() ); } @@ -222,12 +222,12 @@ TextDrag::~TextDrag() } -TQByteArray TextDrag::tqencodedData( const char * mime ) const +TQByteArray TextDrag::encodedData( const char * mime ) const { if ( strcmp( selectionMimeType(), mime ) == 0) return m_kspread; else - return TQTextDrag::tqencodedData( mime ); + return TQTextDrag::encodedData( mime ); } bool TextDrag::canDecode( TQMimeSource* e ) @@ -1819,7 +1819,7 @@ struct SetSelectionFirstLetterUpperWorker : public Sheet::CellWorker cell->setDisplayDirtyFlag(); TQString tmp = cell->text(); int len = tmp.length(); - cell->setCellText( (tmp.tqat(0).upper()+tmp.right(len-1)) ); + cell->setCellText( (tmp.at(0).upper()+tmp.right(len-1)) ); cell->clearDisplayDirtyFlag(); } }; @@ -3940,7 +3940,7 @@ void Sheet::swapCells( int x1, int y1, int x2, int y2, bool cpFormat ) } // Dummy cell used for swapping cells. - // In fact we copy only content and no tqlayout + // In fact we copy only content and no layout // information. Imagine sorting in a sheet. Swapping // the format while sorting is not what you would expect // as a user. @@ -5088,7 +5088,7 @@ void Sheet::copySelection( Selection* selectionInfo ) kd->setPlain( copyAsText(selectionInfo) ); kd->setKSpread( buffer.buffer() ); - TQApplication::tqclipboard()->setData( kd ); + TQApplication::clipboard()->setData( kd ); } void Sheet::cutSelection( Selection* selectionInfo ) @@ -5107,7 +5107,7 @@ void Sheet::cutSelection( Selection* selectionInfo ) kd->setPlain( copyAsText(selectionInfo) ); kd->setKSpread( buffer.buffer() ); - TQApplication::tqclipboard()->setData( kd ); + TQApplication::clipboard()->setData( kd ); deleteSelection( selectionInfo, true ); } @@ -5117,7 +5117,7 @@ void Sheet::paste( const TQRect& pasteArea, bool makeUndo, bool insert, int insertTo, bool pasteFC, TQClipboard::Mode clipboardMode ) { - TQMimeSource * mime = TQApplication::tqclipboard()->data( clipboardMode ); + TQMimeSource * mime = TQApplication::clipboard()->data( clipboardMode ); if ( !mime ) return; @@ -5125,13 +5125,13 @@ void Sheet::paste( const TQRect& pasteArea, bool makeUndo, if ( mime->provides( TextDrag::selectionMimeType() ) ) { - b = mime->tqencodedData( TextDrag::selectionMimeType() ); + b = mime->encodedData( TextDrag::selectionMimeType() ); } else if( mime->provides( "text/plain" ) ) { - // Note: TQClipboard::text() seems to do a better job than tqencodedData( "text/plain" ) + // Note: TQClipboard::text() seems to do a better job than encodedData( "text/plain" ) // In particular it handles charsets (in the mimetype). Copied from KPresenter ;-) - TQString _text = TQApplication::tqclipboard()->text( clipboardMode ); + TQString _text = TQApplication::clipboard()->text( clipboardMode ); doc()->emitBeginOperation(); pasteTextPlain( _text, pasteArea ); emit sig_updateView( this ); @@ -5152,7 +5152,7 @@ void Sheet::paste( const TQRect& pasteArea, bool makeUndo, void Sheet::pasteTextPlain( TQString &_text, TQRect pasteArea) { // TQString tmp; -// tmp= TQString::fromLocal8Bit(_mime->tqencodedData( "text/plain" )); +// tmp= TQString::fromLocal8Bit(_mime->encodedData( "text/plain" )); if( _text.isEmpty() ) return; @@ -5523,14 +5523,14 @@ void Sheet::loadSelectionUndo(const TQDomDocument& d, const TQRect& loadArea, bool Sheet::testAreaPasteInsert()const { - TQMimeSource* mime = TQApplication::tqclipboard()->data( TQClipboard::Clipboard ); + TQMimeSource* mime = TQApplication::clipboard()->data( TQClipboard::Clipboard ); if ( !mime ) return false; TQByteArray b; if ( mime->provides( "application/x-kspread-snippet" ) ) - b = mime->tqencodedData( "application/x-kspread-snippet" ); + b = mime->encodedData( "application/x-kspread-snippet" ); else return false; @@ -6129,7 +6129,7 @@ KoRect Sheet::getRealRect( bool all ) { if ( all || ( it.current()->isSelected() && ! it.current()->isProtect() ) ) - rect |= it.current()->tqgeometry(); + rect |= it.current()->geometry(); } return rect; @@ -6149,12 +6149,12 @@ KCommand *Sheet::moveObject(View *_view, double diffx, double diffy) if ( it.current()->isSelected() && !it.current()->isProtect()) { _objects.append( it.current() ); - KoRect tqgeometry = it.current()->tqgeometry(); - tqgeometry.moveBy( -canvas->xOffset(), -canvas->yOffset() ); - TQRect br = doc()->zoomRect( tqgeometry/*it.current()->tqgeometry()*/ ); + KoRect geometry = it.current()->geometry(); + geometry.moveBy( -canvas->xOffset(), -canvas->yOffset() ); + TQRect br = doc()->zoomRect( geometry/*it.current()->geometry()*/ ); br.moveBy( doc()->zoomItX( diffx ), doc()->zoomItY( diffy ) ); br.moveBy( doc()->zoomItX( -canvas->xOffset() ), doc()->zoomItY( -canvas->yOffset() ) ); - canvas->tqrepaint( br ); // Previous position + canvas->repaint( br ); // Previous position canvas->repaintObject( it.current() ); // New position createCommand=true; } @@ -6179,18 +6179,18 @@ KCommand *Sheet::moveObject(View *_view,const KoPoint &_move,bool key) { if ( it.current()->isSelected() && !it.current()->isProtect()) { - KoRect tqgeometry = it.current()->tqgeometry(); - tqgeometry.moveBy( -canvas->xOffset(), -canvas->yOffset() ); - TQRect oldBoundingRect = doc()->zoomRect( tqgeometry ); + KoRect geometry = it.current()->geometry(); + geometry.moveBy( -canvas->xOffset(), -canvas->yOffset() ); + TQRect oldBoundingRect = doc()->zoomRect( geometry ); - KoRect r = it.current()->tqgeometry(); + KoRect r = it.current()->geometry(); r.moveBy( _move.x(), _move.y() ); it.current()->setGeometry( r ); _objects.append( it.current() ); - canvas->tqrepaint( oldBoundingRect ); + canvas->repaint( oldBoundingRect ); canvas->repaintObject( it.current() ); } } @@ -6235,7 +6235,7 @@ void Sheet::unifyObjectName( EmbeddedObject *object ) { if ( rx.search( objectName ) != -1 ) { objectName.remove( rx ); } - objectName += TQString(" (%1)").tqarg( count ); + objectName += TQString(" (%1)").arg( count ); object->setObjectName( objectName ); } } @@ -6418,16 +6418,16 @@ bool Sheet::loadOasis( const TQDomElement& sheetElement, KoOasisLoadingContext& if ( masterStyle ) { loadSheetStyleFormat( masterStyle ); - if ( masterStyle->hasAttributeNS( KoXmlNS::style, "page-tqlayout-name" ) ) + if ( masterStyle->hasAttributeNS( KoXmlNS::style, "page-layout-name" ) ) { - TQString masterPageLayoutStyleName = masterStyle->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() ); + TQString masterPageLayoutStyleName = masterStyle->attributeNS( KoXmlNS::style, "page-layout-name", TQString() ); //kdDebug()<<"masterPageLayoutStyleName :"<<masterPageLayoutStyleName<<endl; const TQDomElement *masterLayoutStyle = oasisContext.oasisStyles().findStyle( masterPageLayoutStyleName ); if ( masterLayoutStyle ) { //kdDebug()<<"masterLayoutStyle :"<<masterLayoutStyle<<endl; KoStyleStack styleStack; - styleStack.setTypeProperties( "page-tqlayout" ); + styleStack.setTypeProperties( "page-layout" ); styleStack.push( *masterLayoutStyle ); loadOasisMasterLayoutPage( styleStack ); } @@ -6479,7 +6479,7 @@ bool Sheet::loadOasis( const TQDomElement& sheetElement, KoOasisLoadingContext& loadRowFormat( rowElement, rowIndex, oasisContext, /*rowNode.isNull() ,*/ styleMap ); kdDebug()<<" table-row found :index row after "<<rowIndex<<endl; } - else if ( rowElement.localName() == "tqshapes" ) + else if ( rowElement.localName() == "shapes" ) loadOasisObjects( rowElement, oasisContext ); } } @@ -6564,7 +6564,7 @@ void Sheet::loadOasisMasterLayoutPage( KoStyleStack &styleStack ) TQString orientation = "Portrait"; TQString format; - // Laurent : Why we stored tqlayout information as Millimeter ?!!!!! + // Laurent : Why we stored layout information as Millimeter ?!!!!! // kspread used point for all other attribute // I don't understand :( if ( styleStack.hasAttributeNS( KoXmlNS::fo, "page-width" ) ) @@ -6685,7 +6685,7 @@ void Sheet::loadOasisMasterLayoutPage( KoStyleStack &styleStack ) kdDebug()<<" table-centering unknown :"<<str<<endl; #endif } - format = TQString( "%1x%2" ).tqarg( width ).tqarg( height ); + format = TQString( "%1x%2" ).arg( width ).arg( height ); kdDebug()<<" format : "<<format<<endl; d->print->setPaperLayout( left, top, right, bottom, format, orientation ); @@ -6717,7 +6717,7 @@ bool Sheet::loadColumnFormat(const TQDomElement& column, const KoOasisStyles& oa kdDebug() << "Repeated: " << number << endl; } - Format tqlayout( this , doc()->styleManager()->defaultStyle() ); + Format layout( this , doc()->styleManager()->defaultStyle() ); if ( column.hasAttributeNS( KoXmlNS::table, "default-cell-style-name" ) ) { const TQString styleName = column.attributeNS( KoXmlNS::table, "default-cell-style-name", TQString() ); @@ -6726,7 +6726,7 @@ bool Sheet::loadColumnFormat(const TQDomElement& column, const KoOasisStyles& oa Style* const style = styleMap[ styleName ]; if ( style ) { - tqlayout.setStyle( style ); + layout.setStyle( style ); isNonDefaultColumn = true; } } @@ -6799,7 +6799,7 @@ bool Sheet::loadColumnFormat(const TQDomElement& column, const KoOasisStyles& oa { columnFormat = this->columnFormat( indexCol ); } - columnFormat->copy( tqlayout ); + columnFormat->copy( layout ); ++indexCol; } @@ -6828,7 +6828,7 @@ bool Sheet::loadRowFormat( const TQDomElement& row, int &rowIndex, KoOasisLoadin } styleStack.setTypeProperties( "table-row" ); - Format tqlayout( this , doc()->styleManager()->defaultStyle() ); + Format layout( this , doc()->styleManager()->defaultStyle() ); if ( row.hasAttributeNS( KoXmlNS::table,"default-cell-style-name" ) ) { const TQString styleName = row.attributeNS( KoXmlNS::table, "default-cell-style-name", TQString() ); @@ -6837,7 +6837,7 @@ bool Sheet::loadRowFormat( const TQDomElement& row, int &rowIndex, KoOasisLoadin Style* const style = styleMap[ styleName ]; if ( style ) { - tqlayout.setStyle( style ); + layout.setStyle( style ); isNonDefaultRow = true; } } @@ -6908,7 +6908,7 @@ bool Sheet::loadRowFormat( const TQDomElement& row, int &rowIndex, KoOasisLoadin { rowFormat = this->rowFormat( rowIndex ); } - rowFormat->copy( tqlayout ); + rowFormat->copy( layout ); ++rowIndex; } @@ -7171,7 +7171,7 @@ void Sheet::convertPart( const TQString & part, KoXmlWriter & xmlWriter ) const TQDomElement t = dd.createElement( "text:date" ); t.setAttribute( "text:date-value", "0-00-00" ); // todo: "style:data-style-name", "N2" - t.appendChild( dd.createTextNode( TQDate::tqcurrentDate().toString() ) ); + t.appendChild( dd.createTextNode( TQDate::currentDate().toString() ) ); parent.appendChild( t ); #endif } @@ -7355,7 +7355,7 @@ TQString Sheet::saveOasisSheetStyleName( KoGenStyles &mainStyles ) KoGenStyle pageStyle( Doc::STYLE_PAGE, "table"/*FIXME I don't know if name is sheet*/ ); KoGenStyle pageMaster( Doc::STYLE_PAGEMASTER ); - pageMaster.addAttribute( "style:page-tqlayout-name", d->print->saveOasisSheetStyleLayout( mainStyles ) ); + pageMaster.addAttribute( "style:page-layout-name", d->print->saveOasisSheetStyleLayout( mainStyles ) ); TQBuffer buffer; buffer.open( IO_WriteOnly ); @@ -7391,7 +7391,7 @@ void Sheet::saveOasisColRowCell( KoXmlWriter& xmlWriter, KoGenStyles &mainStyles currentColumnStyle.addPropertyPt( "style:column-width", column->dblWidth() ); currentColumnStyle.addProperty( "fo:break-before", "auto" );/*FIXME auto or not ?*/ - //style default tqlayout for column + //style default layout for column KoGenStyle currentDefaultCellStyle; // the type is determined in saveOasisCellStyle TQString currentDefaultCellStyleName = column->saveOasisCellStyle( currentDefaultCellStyle, mainStyles ); @@ -7774,7 +7774,7 @@ bool Sheet::loadXML( const TQDomElement& sheet ) // we just ignore 'ok' - if it didn't work, go on } - // Load the paper tqlayout + // Load the paper layout TQDomElement paper = sheet.namedItem( "paper" ).toElement(); if ( !paper.isNull() ) { @@ -8071,7 +8071,7 @@ void Sheet::updateCell( Cell */*cell*/, int _column, int _row ) updateCellArea(cellArea); } -void Sheet::emit_updateRow( RowFormat *_format, int _row, bool tqrepaint ) +void Sheet::emit_updateRow( RowFormat *_format, int _row, bool repaint ) { if ( doc()->isLoading() ) return; @@ -8081,7 +8081,7 @@ void Sheet::emit_updateRow( RowFormat *_format, int _row, bool tqrepaint ) if ( c->row() == _row ) c->setLayoutDirtyFlag( true ); - if ( tqrepaint ) + if ( repaint ) { //All the cells in this row, or below this row will need to be repainted //So add that region of the sheet to the paint dirty list. @@ -8256,7 +8256,7 @@ bool Sheet::saveChildren( KoStore* _store, const TQString &_path ) { if ( it.current()->sheet() == this && ( it.current()->getType() == OBJECT_KOFFICE_PART || it.current()->getType() == OBJECT_CHART ) ) { - TQString path = TQString( "%1/%2" ).tqarg( _path ).tqarg( i++ ); + TQString path = TQString( "%1/%2" ).arg( _path ).arg( i++ ); if ( !dynamic_cast<EmbeddedKOfficeObject*>( it.current() )->embeddedObject()->document()->saveToStore( _store, path ) ) return false; } @@ -8279,7 +8279,7 @@ bool Sheet::saveOasisObjects( KoStore */*store*/, KoXmlWriter &xmlWriter, KoGenS { if ( !objectFound ) { - xmlWriter.startElement( "table:tqshapes" ); + xmlWriter.startElement( "table:shapes" ); objectFound = true; } if ( !it.current()->saveOasisObject(sc) ) @@ -8565,7 +8565,7 @@ void Sheet::printDebug() cellDescr += " | "; cellDescr += cell->text(); if ( cell->isFormula() ) - cellDescr += TQString(" [result: %1]").tqarg( cell->value().asString() ); + cellDescr += TQString(" [result: %1]").arg( cell->value().asString() ); kdDebug(36001) << cellDescr << endl; } } diff --git a/kspread/kspread_sheet.h b/kspread/kspread_sheet.h index 5d907810..723e6807 100644 --- a/kspread/kspread_sheet.h +++ b/kspread/kspread_sheet.h @@ -22,7 +22,7 @@ #ifndef KSPREAD_SHEET #define KSPREAD_SHEET -#include <tqclipboard.h> +#include <clipboard.h> #include <tqdragobject.h> #include <tqintdict.h> #include <tqmemarray.h> @@ -160,7 +160,7 @@ public: void setPlain( TQString const & _plain ) { setText( _plain ); } void setKSpread( TQByteArray const & _kspread ) { m_kspread = _kspread; } - virtual TQByteArray tqencodedData( const char * mime ) const; + virtual TQByteArray encodedData( const char * mime ) const; virtual const char* format( int i ) const; static bool canDecode( TQMimeSource * e ); @@ -240,11 +240,11 @@ public: Doc* doc() const; /** - * Saves the sheet and all it's tqchildren in XML format + * Saves the sheet and all it's children in XML format */ virtual TQDomElement saveXML( TQDomDocument& ); /** - * Loads the sheet and all it's tqchildren in XML format + * Loads the sheet and all it's children in XML format */ virtual bool loadXML( const TQDomElement& ); @@ -259,12 +259,12 @@ public: void saveOasisPrintStyleLayout( KoGenStyle &style ) const; /** - * Saves a tqchildren + * Saves a children */ virtual bool saveChildren( KoStore* _store, const TQString &_path ); bool saveOasisObjects( KoStore *store, KoXmlWriter &xmlWriter, KoGenStyles& mainStyles, int & indexObj, int &partIndexObj ); /** - * Loads a tqchildren + * Loads a children */ virtual bool loadChildren( KoStore* _store ); @@ -305,13 +305,13 @@ public: void unifyObjectName( EmbeddedObject *object ); /** - * Returns the tqlayout direction of the sheet. + * Returns the layout direction of the sheet. */ LayoutDirection layoutDirection() const; /** - * Sets the tqlayout direction of the sheet. For example, for Arabic or Hebrew - * documents, it is possibly to tqlayout the sheet from right to left. + * Sets the layout direction of the sheet. For example, for Arabic or Hebrew + * documents, it is possibly to layout the sheet from right to left. */ void setLayoutDirection( LayoutDirection dir ); @@ -991,9 +991,9 @@ public: void autofill( TQRect &src, TQRect &dest ); - bool insertChild( const KoRect& _tqgeometry, KoDocumentEntry& ); + bool insertChild( const KoRect& _geometry, KoDocumentEntry& ); - bool insertChart( const KoRect& _tqgeometry, KoDocumentEntry&, const TQRect& _data ); + bool insertChart( const KoRect& _geometry, KoDocumentEntry&, const TQRect& _data ); /** @@ -1016,9 +1016,9 @@ public: */ bool insertPicture( const KoPoint& point, const TQPixmap& pixmap ); - void changeChildGeometry( EmbeddedKOfficeObject *_child, const KoRect& _tqgeometry ); + void changeChildGeometry( EmbeddedKOfficeObject *_child, const KoRect& _geometry ); - const TQColorGroup& tqcolorGroup() { return widget()->tqcolorGroup(); } + const TQColorGroup& colorGroup() { return widget()->colorGroup(); } int id() const; @@ -1033,7 +1033,7 @@ public: * Checks if the argument _column is out of the current maximum range of the vertical border * If this is the case, the current maximum value m_iMaxColumn is adjusted and the vertical border * is resized. - * Use this function with care, as it involves a tqrepaint of the border, when it is out of range. + * Use this function with care, as it involves a repaint of the border, when it is out of range. */ void checkRangeHBorder ( int _column ); @@ -1048,7 +1048,7 @@ public: * Checks if the argument _row is out of the current maximum range of the horizontal border * If this is the case, the current maximum value m_iMaxRow is adjusted and the horizontal border * is resized. - * Use this function with care, as it involves a tqrepaint of the border, when it is out of range. + * Use this function with care, as it involves a repaint of the border, when it is out of range. */ void checkRangeVBorder ( int _row ); @@ -1064,7 +1064,7 @@ public: #endif /** - * Calculates the cell if necessary, makes its tqlayout if necessary, + * Calculates the cell if necessary, makes its layout if necessary, * and force redraw. * Then it sets the cell's @ref Cell::m_bDisplayDirtyFlag to false. */ @@ -1102,7 +1102,7 @@ public: */ void refreshView(const Region& region); - void emit_updateRow( RowFormat *_format, int _row, bool tqrepaint = true ); + void emit_updateRow( RowFormat *_format, int _row, bool repaint = true ); void emit_updateColumn( ColumnFormat *_format, int _column ); /** diff --git a/kspread/kspread_sheetprint.cc b/kspread/kspread_sheetprint.cc index c3c12117..a70445eb 100644 --- a/kspread/kspread_sheetprint.cc +++ b/kspread/kspread_sheetprint.cc @@ -126,8 +126,8 @@ TQRect SheetPrint::cellsPrintRange() } } - // Now look at the tqchildren - TQPtrListIterator<KoDocumentChild> cit( m_pDoc->tqchildren() ); + // Now look at the children + TQPtrListIterator<KoDocumentChild> cit( m_pDoc->children() ); double dummy; int i; for( ; cit.current(); ++cit ) @@ -190,7 +190,7 @@ bool SheetPrint::pageNeedsPrinting( TQRect& page_range ) } // filled = true; - //Page empty, but maybe tqchildren on it? + //Page empty, but maybe children on it? TQRect intView = TQRect( TQPoint( m_pDoc->zoomItX( m_pSheet->dblColumnPos( page_range.left() ) ), m_pDoc->zoomItY( m_pSheet->dblRowPos( page_range.top() ) ) ), @@ -199,7 +199,7 @@ bool SheetPrint::pageNeedsPrinting( TQRect& page_range ) m_pDoc->zoomItY( m_pSheet->dblRowPos( page_range.bottom() ) + m_pSheet->rowFormat( page_range.bottom() )->dblHeight() ) ) ); - TQPtrListIterator<KoDocumentChild> it( m_pDoc->tqchildren() ); + TQPtrListIterator<KoDocumentChild> it( m_pDoc->children() ); for( ;it.current(); ++it ) { TQRect bound = it.current()->boundingRect(); @@ -295,7 +295,7 @@ bool SheetPrint::print( TQPainter &painter, KPrinter *_printer ) ( obj->getType() == OBJECT_CHART && m_bPrintCharts ) ) ) continue; - TQRect zoomRect = m_pDoc->zoomRect( itObject.current()->tqgeometry() ); + TQRect zoomRect = m_pDoc->zoomRect( itObject.current()->geometry() ); TQPixmap *p = new TQPixmap( zoomRect.size() ); TQPainter painter(p); painter.fillRect( p->rect(), TQColor("white") ); @@ -575,24 +575,24 @@ void SheetPrint::printRect( TQPainter& painter, const KoPoint& topLeft, } // - // Draw the tqchildren + // Draw the children // TQRect zoomedView = m_pDoc->zoomRect( view ); - //TQPtrListIterator<KoDocumentChild> it( m_pDoc->tqchildren() ); + //TQPtrListIterator<KoDocumentChild> it( m_pDoc->children() ); //TQPtrListIterator<EmbeddedObject> itObject( m_pDoc->embeddedObjects() ); TQValueList<PrintObject *>::iterator itObject; for ( itObject = m_printObjects.begin(); itObject != m_printObjects.end(); ++itObject ) { EmbeddedObject *obj = (*itObject)->obj; // TQString tmp=TQString("Testing child %1/%2 %3/%4 against view %5/%6 %7/%8") -// .tqarg(it.current()->contentRect().left()) -// .tqarg(it.current()->contentRect().top()) -// .tqarg(it.current()->contentRect().right()) -// .tqarg(it.current()->contentRect().bottom()) -// .tqarg(view.left()).tqarg(view.top()).tqarg(zoomedView.right()).tqarg(zoomedView.bottom()); +// .arg(it.current()->contentRect().left()) +// .arg(it.current()->contentRect().top()) +// .arg(it.current()->contentRect().right()) +// .arg(it.current()->contentRect().bottom()) +// .arg(view.left()).arg(view.top()).arg(zoomedView.right()).arg(zoomedView.bottom()); // kdDebug(36001)<<tmp<<" offset "<<_childOffset.x()<<"/"<<_childOffset.y()<<endl; - KoRect const bound = obj->tqgeometry(); + KoRect const bound = obj->geometry(); TQRect zoomedBound = m_pDoc->zoomRect( KoRect(bound.left(), bound.top(), bound.width(), bound.height() ) ); @@ -614,14 +614,14 @@ void SheetPrint::printRect( TQPainter& painter, const KoPoint& topLeft, -zoomedView.top() + m_pDoc->zoomItY( topLeft.y() ) ); //obj->draw( &painter ); - painter.drawPixmap( m_pDoc->zoomRect( obj->tqgeometry() ).topLeft(), *(*itObject)->p ); //draw the cached object + painter.drawPixmap( m_pDoc->zoomRect( obj->geometry() ).topLeft(), *(*itObject)->p ); //draw the cached object //painter.fillRect(zoomedBound, TQBrush("red")); //for debug purpose painter.restore(); } } - //Don't let obscuring cells and tqchildren overpaint this area + //Don't let obscuring cells and children overpaint this area clipRegion -= TQRegion ( m_pDoc->zoomItX( leftBorderPts() + topLeft.x() ), m_pDoc->zoomItY( topBorderPts() + topLeft.y() ), m_pDoc->zoomItX( xpos ), @@ -1273,7 +1273,7 @@ TQString SheetPrint::completeHeading( const TQString &_data, int _page, const TQ fileName=""; TQString t(TQTime::currentTime().toString()); - TQString d(TQDate::tqcurrentDate().toString()); + TQString d(TQDate::currentDate().toString()); TQString ta; if ( !_sheet.isEmpty() ) ta = _sheet; @@ -1303,7 +1303,7 @@ TQString SheetPrint::completeHeading( const TQString &_data, int _page, const TQ full_name=p->pw_gecos; if( email_addr.isEmpty()) - email_addr = TQString("%1@%2").tqarg(p->pw_name).tqarg(hostname); + email_addr = TQString("%1@%2").arg(p->pw_name).arg(hostname); tmp = _data; int pos = 0; diff --git a/kspread/kspread_sheetprint.h b/kspread/kspread_sheetprint.h index 0062476d..1f22dc7d 100644 --- a/kspread/kspread_sheetprint.h +++ b/kspread/kspread_sheetprint.h @@ -148,12 +148,12 @@ public: void setPaperOrientation(KoOrientation _orient); /** - * Returns the page tqlayout + * Returns the page layout */ KoPageLayout paperLayout() const; /** - * Changes the paper tqlayout and repaints the currently displayed Sheet. + * Changes the paper layout and repaints the currently displayed Sheet. */ void setPaperLayout( float _leftBorder, float _topBorder, float _rightBorder, float _bottomBoder, KoFormat _paper, KoOrientation orientation ); @@ -449,7 +449,7 @@ private: * the printing frame. * * @param _childOffset KoPoint used to calculate the correct position of - * tqchildren, if there are repeated columns/rows. + * children, if there are repeated columns/rows. */ void printPage( TQPainter &_painter, const TQRect& page_range, const KoRect& view, const KoPoint _childOffset ); @@ -492,7 +492,7 @@ private: /** * Returns a rect, which contains the cols and rows to be printed. - * It respects the printrange and the tqchildren + * It respects the printrange and the children */ TQRect cellsPrintRange(); diff --git a/kspread/kspread_style.cc b/kspread/kspread_style.cc index af5b91a1..dc8b7add 100644 --- a/kspread/kspread_style.cc +++ b/kspread/kspread_style.cc @@ -134,7 +134,7 @@ bool Style::operator == (const Style& style) const if ( m_type != style.m_type ) return false; // NOTE Stefan: Only compare the values of the set features. - if ( // tqlayout (4) + if ( // layout (4) ( m_featuresSet & SAlignX ) && ( m_alignX != style.m_alignX ) || ( m_featuresSet & SAlignY ) && ( m_alignY != style.m_alignY ) || ( m_featuresSet & SAngle ) && ( m_rotateAngle != style.m_rotateAngle ) || diff --git a/kspread/kspread_style.h b/kspread/kspread_style.h index 2ae6299c..a0e7f0d5 100644 --- a/kspread/kspread_style.h +++ b/kspread/kspread_style.h @@ -20,7 +20,7 @@ #ifndef __kspread_style__ #define __kspread_style__ -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> #include <tqfont.h> #include <tqpen.h> diff --git a/kspread/kspread_toolbox.cc b/kspread/kspread_toolbox.cc index 06e7a689..d2b6edcd 100644 --- a/kspread/kspread_toolbox.cc +++ b/kspread/kspread_toolbox.cc @@ -22,7 +22,7 @@ #include <twin.h> -#include <tqlayout.h> +#include <layout.h> #include <tqspinbox.h> #include <tqobjectlist.h> @@ -59,7 +59,7 @@ void ToolBox::setEnabled( bool enable ) } else { - if ( tqfocusWidget() == this ) + if ( focusWidget() == this ) focusNextPrevChild( TRUE ); TQObjectList clo = childrenListObject(); if ( !clo.isEmpty() ) @@ -97,12 +97,12 @@ void ToolBox::childEvent( TQChildEvent* ev ) { if ( ev->inserted() && ev->child()->isWidgetType() ) m_layout->addWidget( (TQWidget*)ev->child() ); - resize( tqsizeHint() ); + resize( sizeHint() ); } void ToolBox::mousePressEvent( TQMouseEvent* ev ) { - m_startPos = tqgeometry().topLeft(); + m_startPos = geometry().topLeft(); m_mousePos = ev->globalPos(); } diff --git a/kspread/kspread_undo.cc b/kspread/kspread_undo.cc index 6036344c..28f59265 100644 --- a/kspread/kspread_undo.cc +++ b/kspread/kspread_undo.cc @@ -266,7 +266,7 @@ UndoRemoveColumn::UndoRemoveColumn( Doc *_doc, Sheet *_sheet, int _column,int _n TQTextStream str( &buffer, IO_WriteOnly ); str << doc; - // This is a terrible hack to store tqunicode + // This is a terrible hack to store unicode // data in a TQCString in a way that // TQCString::length() == TQCString().size(). // This allows us to treat the TQCString like a TQByteArray later on. @@ -385,7 +385,7 @@ UndoRemoveRow::UndoRemoveRow( Doc *_doc, Sheet *_sheet, int _row,int _nbRow) : TQTextStream str( &buffer, IO_WriteOnly ); str << doc; - // This is a terrible hack to store tqunicode + // This is a terrible hack to store unicode // data in a TQCString in a way that // TQCString::length() == TQCString().size(). // This allows us to treat the TQCString like a TQByteArray later on. @@ -942,20 +942,20 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list, /* Don't need to go through the loop twice... for (int i = range.left(); i <= right; ++i) { - layoutColumn tmptqlayout; - tmptqlayout.col = i; - tmptqlayout.l = new ColumnFormat( sheet, i ); - tmptqlayout.l->copy( *(sheet->columnFormat( i )) ); - listCol.append(tmptqlayout); + layoutColumn tmplayout; + tmplayout.col = i; + tmplayout.l = new ColumnFormat( sheet, i ); + tmplayout.l->copy( *(sheet->columnFormat( i )) ); + listCol.append(tmplayout); } */ for ( int c = range.left(); c <= right; ++c ) { - layoutColumn tmptqlayout; - tmptqlayout.col = c; - tmptqlayout.l = new ColumnFormat( sheet, c ); - tmptqlayout.l->copy( *(sheet->columnFormat( c )) ); - listCol.append(tmptqlayout); + layoutColumn tmplayout; + tmplayout.col = c; + tmplayout.l = new ColumnFormat( sheet, c ); + tmplayout.l->copy( *(sheet->columnFormat( c )) ); + listCol.append(tmplayout); cell = sheet->getFirstCellColumn( c ); while ( cell ) @@ -966,12 +966,12 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list, continue; } - layoutCell tmptqlayout; - tmptqlayout.col = c; - tmptqlayout.row = cell->row(); - tmptqlayout.l = new Format( sheet, 0 ); - tmptqlayout.l->copy( *(sheet->cellAt( tmptqlayout.col, tmptqlayout.row )->format()) ); - list.append(tmptqlayout); + layoutCell tmplayout; + tmplayout.col = c; + tmplayout.row = cell->row(); + tmplayout.l = new Format( sheet, 0 ); + tmplayout.l->copy( *(sheet->cellAt( tmplayout.col, tmplayout.row )->format()) ); + list.append(tmplayout); cell = sheet->getNextCellDown( c, cell->row() ); } @@ -984,12 +984,12 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list, if ( range.left() <= col && right >= col && !c->isPartOfMerged()) { - layoutCell tmptqlayout; - tmptqlayout.col = c->column(); - tmptqlayout.row = c->row(); - tmptqlayout.l = new Format( sheet, 0 ); - tmptqlayout.l->copy( *(sheet->cellAt( tmptqlayout.col, tmptqlayout.row )) ); - list.append(tmptqlayout); + layoutCell tmplayout; + tmplayout.col = c->column(); + tmplayout.row = c->row(); + tmplayout.l = new Format( sheet, 0 ); + tmplayout.l->copy( *(sheet->cellAt( tmplayout.col, tmplayout.row )) ); + list.append(tmplayout); } } */ @@ -998,11 +998,11 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list, { for ( int row = range.top(); row <= bottom; ++row ) { - layoutRow tmptqlayout; - tmptqlayout.row = row; - tmptqlayout.l = new RowFormat( sheet, row ); - tmptqlayout.l->copy( *(sheet->rowFormat( row )) ); - listRow.append(tmptqlayout); + layoutRow tmplayout; + tmplayout.row = row; + tmplayout.l = new RowFormat( sheet, row ); + tmplayout.l->copy( *(sheet->rowFormat( row )) ); + listRow.append(tmplayout); cell = sheet->getFirstCellRow( row ); while ( cell ) @@ -1012,12 +1012,12 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list, cell = sheet->getNextCellRight( cell->column(), row ); continue; } - layoutCell tmptqlayout; - tmptqlayout.col = cell->column(); - tmptqlayout.row = row; - tmptqlayout.l = new Format( sheet, 0 ); - tmptqlayout.l->copy( *(sheet->cellAt( cell->column(), row )->format()) ); - list.append(tmptqlayout); + layoutCell tmplayout; + tmplayout.col = cell->column(); + tmplayout.row = row; + tmplayout.l = new Format( sheet, 0 ); + tmplayout.l->copy( *(sheet->cellAt( cell->column(), row )->format()) ); + list.append(tmplayout); cell = sheet->getNextCellRight( cell->column(), row ); } @@ -1030,12 +1030,12 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list, if ( range.top() <= row && bottom >= row && !c->isPartOfMerged()) { - layoutCell tmptqlayout; - tmptqlayout.col = c->column(); - tmptqlayout.row = c->row(); - tmptqlayout.l = new Format( sheet, 0 ); - tmptqlayout.l->copy( *(sheet->cellAt( tmptqlayout.col, tmptqlayout.row )) ); - list.append(tmptqlayout); + layoutCell tmplayout; + tmplayout.col = c->column(); + tmplayout.row = c->row(); + tmplayout.l = new Format( sheet, 0 ); + tmplayout.l->copy( *(sheet->cellAt( tmplayout.col, tmplayout.row )) ); + list.append(tmplayout); } } */ @@ -1048,12 +1048,12 @@ void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list, Cell * cell = sheet->nonDefaultCell( x, y ); if ( !cell->isPartOfMerged() ) { - layoutCell tmptqlayout; - tmptqlayout.col = x; - tmptqlayout.row = y; - tmptqlayout.l = new Format( sheet, 0 ); - tmptqlayout.l->copy( *(sheet->cellAt( x, y )->format()) ); - list.append(tmptqlayout); + layoutCell tmplayout; + tmplayout.col = x; + tmplayout.row = y; + tmplayout.l = new Format( sheet, 0 ); + tmplayout.l->copy( *(sheet->cellAt( x, y )->format()) ); + list.append(tmplayout); } } } @@ -1265,24 +1265,24 @@ void UndoSort::copyAll(TQValueList<layoutTextCell> & list, TQValueList<layoutCol Cell * c; for (int col = m_rctRect.left(); col <= m_rctRect.right(); ++col) { - layoutColumn tmptqlayout; - tmptqlayout.col = col; - tmptqlayout.l = new ColumnFormat( sheet, col ); - tmptqlayout.l->copy( *(sheet->columnFormat( col )) ); - listCol.append(tmptqlayout); + layoutColumn tmplayout; + tmplayout.col = col; + tmplayout.l = new ColumnFormat( sheet, col ); + tmplayout.l->copy( *(sheet->columnFormat( col )) ); + listCol.append(tmplayout); c = sheet->getFirstCellColumn( col ); while ( c ) { if ( !c->isPartOfMerged() ) { - layoutTextCell tmptqlayout; - tmptqlayout.col = col; - tmptqlayout.row = c->row(); - tmptqlayout.l = new Format( sheet, 0 ); - tmptqlayout.l->copy( *(sheet->cellAt( tmptqlayout.col, tmptqlayout.row )->format()) ); - tmptqlayout.text = c->text(); - list.append(tmptqlayout); + layoutTextCell tmplayout; + tmplayout.col = col; + tmplayout.row = c->row(); + tmplayout.l = new Format( sheet, 0 ); + tmplayout.l->copy( *(sheet->cellAt( tmplayout.col, tmplayout.row )->format()) ); + tmplayout.text = c->text(); + list.append(tmplayout); } c = sheet->getNextCellDown( col, c->row() ); @@ -1294,24 +1294,24 @@ void UndoSort::copyAll(TQValueList<layoutTextCell> & list, TQValueList<layoutCol Cell * c; for ( int row = m_rctRect.top(); row <= m_rctRect.bottom(); ++row) { - layoutRow tmptqlayout; - tmptqlayout.row = row; - tmptqlayout.l = new RowFormat( sheet, row ); - tmptqlayout.l->copy( *(sheet->rowFormat( row )) ); - listRow.append(tmptqlayout); + layoutRow tmplayout; + tmplayout.row = row; + tmplayout.l = new RowFormat( sheet, row ); + tmplayout.l->copy( *(sheet->rowFormat( row )) ); + listRow.append(tmplayout); c = sheet->getFirstCellRow( row ); while ( c ) { if ( !c->isPartOfMerged() ) { - layoutTextCell tmptqlayout; - tmptqlayout.col = c->column(); - tmptqlayout.row = row; - tmptqlayout.l = new Format( sheet, 0 ); - tmptqlayout.l->copy( *(sheet->cellAt( tmptqlayout.col, tmptqlayout.row )->format()) ); - tmptqlayout.text = c->text(); - list.append(tmptqlayout); + layoutTextCell tmplayout; + tmplayout.col = c->column(); + tmplayout.row = row; + tmplayout.l = new Format( sheet, 0 ); + tmplayout.l->copy( *(sheet->cellAt( tmplayout.col, tmplayout.row )->format()) ); + tmplayout.text = c->text(); + list.append(tmplayout); } c = sheet->getNextCellRight( c->column(), row ); } @@ -1328,13 +1328,13 @@ void UndoSort::copyAll(TQValueList<layoutTextCell> & list, TQValueList<layoutCol cell = sheet->nonDefaultCell( x, y ); if (!cell->isPartOfMerged()) { - layoutTextCell tmptqlayout; - tmptqlayout.col = x; - tmptqlayout.row = y; - tmptqlayout.l = new Format( sheet, 0 ); - tmptqlayout.l->copy( *(sheet->cellAt( x, y )->format()) ); - tmptqlayout.text = cell->text(); - list.append(tmptqlayout); + layoutTextCell tmplayout; + tmplayout.col = x; + tmplayout.row = y; + tmplayout.l = new Format( sheet, 0 ); + tmplayout.l->copy( *(sheet->cellAt( x, y )->format()) ); + tmplayout.text = cell->text(); + list.append(tmplayout); } } } @@ -1557,7 +1557,7 @@ void UndoDelete::createListCell( TQCString &listCell,TQValueList<columnSize> &li TQTextStream str( &buffer, IO_WriteOnly ); str << doc; - // This is a terrible hack to store tqunicode + // This is a terrible hack to store unicode // data in a TQCString in a way that // TQCString::length() == TQCString().size(). // This allows us to treat the TQCString like a TQByteArray later on. @@ -2243,7 +2243,7 @@ void UndoAutofill::createListCell( TQCString &list, Sheet* sheet ) TQTextStream str( &buffer, IO_WriteOnly ); str << doc; - // This is a terrible hack to store tqunicode + // This is a terrible hack to store unicode // data in a TQCString in a way that // TQCString::length() == TQCString().size(). // This allows us to treat the TQCString like a TQByteArray later on. @@ -2400,7 +2400,7 @@ UndoRemoveCellRow::UndoRemoveCellRow( Doc *_doc, Sheet *_sheet, const TQRect &re TQTextStream str( &buffer, IO_WriteOnly ); str << doc; - // This is a terrible hack to store tqunicode + // This is a terrible hack to store unicode // data in a TQCString in a way that // TQCString::length() == TQCString().size(). // This allows us to treat the TQCString like a TQByteArray later on. @@ -2459,7 +2459,7 @@ UndoRemoveCellCol::UndoRemoveCellCol( Doc *_doc, Sheet *_sheet, const TQRect &_r TQTextStream str( &buffer, IO_WriteOnly ); str << doc; - // This is a terrible hack to store tqunicode + // This is a terrible hack to store unicode // data in a TQCString in a way that // TQCString::length() == TQCString().size(). // This allows us to treat the TQCString like a TQByteArray later on. @@ -2529,7 +2529,7 @@ void UndoConditional::createListCell( TQCString &list, Sheet* sheet ) TQDomDocument doc = sheet->saveCellRegion( m_region ); str << doc; - // This is a terrible hack to store tqunicode + // This is a terrible hack to store unicode // data in a TQCString in a way that // TQCString::length() == TQCString().size(). // This allows us to treat the TQCString like a TQByteArray later on. @@ -2671,7 +2671,7 @@ void UndoCellPaste::createListCell(TQCString& listCell, TQTextStream str( &buffer, IO_WriteOnly ); str << doc; - // This is a terrible hack to store tqunicode + // This is a terrible hack to store unicode // data in a TQCString in a way that // TQCString::length() == TQCString().size(). // This allows us to treat the TQCString like a TQByteArray later on. diff --git a/kspread/kspread_util.cc b/kspread/kspread_util.cc index 47edd2ac..e84f1d47 100644 --- a/kspread/kspread_util.cc +++ b/kspread/kspread_util.cc @@ -53,7 +53,7 @@ bool KSpread::formatIsFraction (FormatType fmt) //used in Point::init, Cell::encodeFormula and -// dialogs/kspread_dlg_papertqlayout.cc +// dialogs/kspread_dlg_paperlayout.cc int KSpread::util_decodeColumnLabelText( const TQString &_col ) { int col = 0; @@ -72,20 +72,20 @@ int KSpread::util_decodeColumnLabelText( const TQString &_col ) return col; } -//used in dialogs/kspread_dlg_papertqlayout.cc +//used in dialogs/kspread_dlg_paperlayout.cc TQString KSpread::util_rangeColumnName( const TQRect &_area) { return TQString("%1:%2") - .tqarg( Cell::columnName( _area.left())) - .tqarg( Cell::columnName(_area.right())); + .arg( Cell::columnName( _area.left())) + .arg( Cell::columnName(_area.right())); } -//used in dialogs/kspread_dlg_papertqlayout.cc +//used in dialogs/kspread_dlg_paperlayout.cc TQString KSpread::util_rangeRowName( const TQRect &_area) { return TQString("%1:%2") - .tqarg( _area.top()) - .tqarg(_area.bottom()); + .arg( _area.top()) + .arg(_area.bottom()); } TQString KSpread::util_rangeName(const TQRect &_area) @@ -933,7 +933,7 @@ TQString KSpread::convertOasisPenToString( const TQPen & pen ) // a fast algorithm for diagonals. A line width of 1 will // also produce a 1 pixel wide line, but uses a slower more // accurate algorithm for diagonals. - TQString s = TQString( "%1pt " ).tqarg( (pen.width() == 0) ? 1 : pen.width() ); + TQString s = TQString( "%1pt " ).arg( (pen.width() == 0) ? 1 : pen.width() ); switch( pen.style() ) { case TQt::NoPen: @@ -1065,7 +1065,7 @@ TQString KSpread::Oasis::decodeFormula(const TQString& expr, const KLocale* loca } // [ marks sheet name for 3-d cell, e.g ['Sales Q3'.A4] - else if ( ch.tqunicode() == '[' ) + else if ( ch.unicode() == '[' ) { ++i; state = InReference; diff --git a/kspread/kspread_value.cc b/kspread/kspread_value.cc index 898abd11..a4532fdc 100644 --- a/kspread/kspread_value.cc +++ b/kspread/kspread_value.cc @@ -22,7 +22,7 @@ #include <kdebug.h> #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <float.h> #include <math.h> diff --git a/kspread/kspread_value.h b/kspread/kspread_value.h index 0c76e40f..b43ac909 100644 --- a/kspread/kspread_value.h +++ b/kspread/kspread_value.h @@ -22,7 +22,7 @@ #include <tqdatetime.h> #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <koffice_export.h> diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc index cb947f34..67b326e5 100644 --- a/kspread/kspread_view.cc +++ b/kspread/kspread_view.cc @@ -35,9 +35,9 @@ // TQt includes #include <tqbuffer.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqcursor.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpaintdevicemetrics.h> #include <tqregexp.h> #include <tqtimer.h> @@ -237,7 +237,7 @@ public: TQPopupMenu *popupRow; TQPopupMenu *popupColumn; - TQPopupMenu* popupChild; // for embedded tqchildren + TQPopupMenu* popupChild; // for embedded children TQPopupMenu* popupListChoose; // for list of choose // the child for which the popup menu has been opened. @@ -911,7 +911,7 @@ void View::Private::initActions() actions->paperLayout = new KAction( i18n("Page Layout..."), 0, TQT_TQOBJECT(view), TQT_SLOT( paperLayoutDlg() ), ac, "paperLayout" ); - actions->paperLayout->setToolTip(i18n("Specify the tqlayout of the spreadsheet for a printout.")); + actions->paperLayout->setToolTip(i18n("Specify the layout of the spreadsheet for a printout.")); actions->definePrintRange = new KAction( i18n("Define Print Range"), 0, TQT_TQOBJECT(view), TQT_SLOT( definePrintRange() ), ac, "definePrintRange" ); @@ -1473,7 +1473,7 @@ bool KPSheetSelectPage::isValid(TQString& /*msg*/) TQString KPSheetSelectPage::printOptionForIndex(unsigned int index) { - return TQString("sheetprintorder%1").tqarg(index); + return TQString("sheetprintorder%1").arg(index); } void KPSheetSelectPage::prependAvailableSheet(const TQString& sheetname) @@ -1880,7 +1880,7 @@ View::~View() // of embedded child documents possible repaints in Sheet are not // performed. The repains can happen if you delete an embedded document, // which leads to an regionInvalidated() signal emission in KoView, which calls - // tqrepaint, etc.etc. :-) (Simon) + // repaint, etc.etc. :-) (Simon) delete d->selection; delete d->choice; @@ -1968,8 +1968,8 @@ void View::initView() d->hBorderWidget = new HBorder( this, d->canvas,this ); d->vBorderWidget = new VBorder( this, d->canvas ,this ); - d->hBorderWidget->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - d->vBorderWidget->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ); + d->hBorderWidget->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + d->vBorderWidget->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ); d->canvas->setFocusPolicy( TQ_StrongFocus ); TQWidget::setFocusPolicy( TQ_StrongFocus ); @@ -3832,8 +3832,8 @@ void View::setActiveSheet( Sheet * _t, bool updateSheet ) if ( updateSheet ) { d->tabBar->setActiveTab( _t->sheetName() ); - d->vBorderWidget->tqrepaint(); - d->hBorderWidget->tqrepaint(); + d->vBorderWidget->repaint(); + d->hBorderWidget->repaint(); d->activeSheet->setRegionPaintDirty(TQRect(TQPoint(0,0), TQPoint(KS_colMax, KS_rowMax))); d->canvas->slotMaxColumn( d->activeSheet->maxColumn() ); d->canvas->slotMaxRow( d->activeSheet->maxRow() ); @@ -3914,8 +3914,8 @@ void View::changeSheet( const TQString& _name ) updateBorderButton(); //update visible area - d->vBorderWidget->tqrepaint(); - d->hBorderWidget->tqrepaint(); + d->vBorderWidget->repaint(); + d->hBorderWidget->repaint(); d->canvas->slotMaxColumn( d->activeSheet->maxColumn() ); d->canvas->slotMaxRow( d->activeSheet->maxRow() ); t->setRegionPaintDirty( t->visibleRect( d->canvas ) ); @@ -4135,7 +4135,7 @@ void View::paste() if (!koDocument()->isReadWrite()) // don't paste into a read only document return; - TQMimeSource *data = TQApplication::tqclipboard()->data( TQClipboard::Clipboard ); + TQMimeSource *data = TQApplication::clipboard()->data( TQClipboard::Clipboard ); for ( int i=0; data->format(i) != 0; i++ ) kdDebug() << "format:" << data->format(i) << endl; @@ -4143,7 +4143,7 @@ void View::paste() { canvasWidget()->deselectAllObjects(); TQCString returnedTypeMime = "application/vnd.oasis.opendocument.spreadsheet"; - const TQByteArray arr = data->tqencodedData( returnedTypeMime ); + const TQByteArray arr = data->encodedData( returnedTypeMime ); if( arr.isEmpty() ) return; TQBuffer buffer( arr ); @@ -4206,7 +4206,7 @@ void View::paste() else { //TODO: What if the clipboard data is available in both pixmap and OASIS format? (ie. for embedded parts) - TQPixmap clipboardPixmap = TQApplication::tqclipboard()->pixmap( TQClipboard::Clipboard ); + TQPixmap clipboardPixmap = TQApplication::clipboard()->pixmap( TQClipboard::Clipboard ); if (!clipboardPixmap.isNull()) { d->activeSheet->insertPicture( markerDocumentPosition() , clipboardPixmap ); @@ -4914,7 +4914,7 @@ void View::setupPrinter( KPrinter &prt ) SheetPrint* print = d->activeSheet->print(); - //apply page tqlayout parameters + //apply page layout parameters KoFormat pageFormat = print->paperFormat(); prt.setPageSize( static_cast<KPrinter::PageSize>( KoPageFormat::printerPageSize( pageFormat ) ) ); @@ -4971,7 +4971,7 @@ void View::print( KPrinter &prt ) Sheet* sheet = doc()->map()->findSheet(*sheetlistiterator); if (sheet == NULL) { - kdWarning() << i18n("Sheet %1 could not be found for printing").tqarg(*sheetlistiterator) << endl; + kdWarning() << i18n("Sheet %1 could not be found for printing").arg(*sheetlistiterator) << endl; continue; } @@ -5038,7 +5038,7 @@ void View::print( KPrinter &prt ) if( !prt.previewOnly() ) { KMessageBox::information( 0, - i18n("Nothing to print for sheet %1.").tqarg( + i18n("Nothing to print for sheet %1.").arg( d->activeSheet->sheetName()) ); //@todo: make sure we really can comment this out, // what to do with partially broken printouts? @@ -5051,13 +5051,13 @@ void View::print( KPrinter &prt ) this->setActiveSheet(selectedsheet); } -void View::insertChart( const TQRect& _tqgeometry, KoDocumentEntry& _e ) +void View::insertChart( const TQRect& _geometry, KoDocumentEntry& _e ) { if ( !d->activeSheet ) return; // Transform the view coordinates to document coordinates - KoRect unzoomedRect = doc()->unzoomRect( _tqgeometry ); + KoRect unzoomedRect = doc()->unzoomRect( _geometry ); unzoomedRect.moveBy( d->canvas->xOffset(), d->canvas->yOffset() ); InsertObjectCommand *cmd = 0; @@ -5073,13 +5073,13 @@ void View::insertChart( const TQRect& _tqgeometry, KoDocumentEntry& _e ) cmd->execute(); } -void View::insertChild( const TQRect& _tqgeometry, KoDocumentEntry& _e ) +void View::insertChild( const TQRect& _geometry, KoDocumentEntry& _e ) { if ( !d->activeSheet ) return; // Transform the view coordinates to document coordinates - KoRect unzoomedRect = doc()->unzoomRect( _tqgeometry ); + KoRect unzoomedRect = doc()->unzoomRect( _geometry ); unzoomedRect.moveBy( d->canvas->xOffset(), d->canvas->yOffset() ); InsertObjectCommand *cmd = new InsertObjectCommand( unzoomedRect, _e, d->canvas ); @@ -5135,11 +5135,11 @@ void View::slotUpdateChildGeometry( EmbeddedKOfficeObject */*_child*/ ) assert( f != 0L ); // Are we already up to date ? - if ( _child->tqgeometry() == f->partGeometry() ) + if ( _child->geometry() == f->partGeometry() ) return; // TODO zooming - f->setPartGeometry( _child->tqgeometry() ); + f->setPartGeometry( _child->geometry() ); */ } @@ -5498,7 +5498,7 @@ KoDocument * View::hitTest( const TQPoint& /*pos*/ ) // return 0; // } // -// TQPtrListIterator<KoDocumentChild> it( doc()->tqchildren() ); +// TQPtrListIterator<KoDocumentChild> it( doc()->children() ); // for (; it.current(); ++it ) // { // // Is the child document on the visible sheet ? @@ -5896,7 +5896,7 @@ void View::slotListChoosePopupMenu( ) if ( d->activeSheet->layoutDirection()==Sheet::RightToLeft ) { - p2.setX( p2.x() - d->popupListChoose->tqsizeHint().width() + 1 ); + p2.setX( p2.x() - d->popupListChoose->sizeHint().width() + 1 ); } d->popupListChoose->popup( p2 ); @@ -6401,7 +6401,7 @@ void View::styleDialog() d->activeSheet->setRegionPaintDirty( d->activeSheet->visibleRect( d->canvas ) ); } if ( d->canvas ) - d->canvas->tqrepaint(); + d->canvas->repaint(); } void View::paperLayoutDlg() @@ -6748,9 +6748,9 @@ void View::zoomMinus() if ( d->activeSheet != 0L ) d->activeSheet->setLayoutDirtyFlag(); - d->canvas->tqrepaint(); - d->vBorderWidget->tqrepaint(); - d->hBorderWidget->tqrepaint(); + d->canvas->repaint(); + d->vBorderWidget->repaint(); + d->hBorderWidget->repaint(); } void View::zoomPlus() @@ -6763,9 +6763,9 @@ void View::zoomPlus() if ( d->activeSheet != 0L ) d->activeSheet->setLayoutDirtyFlag(); - d->canvas->tqrepaint(); - d->vBorderWidget->tqrepaint(); - d->hBorderWidget->tqrepaint(); + d->canvas->repaint(); + d->vBorderWidget->repaint(); + d->hBorderWidget->repaint(); } */ @@ -6911,9 +6911,9 @@ void View::slotAddSheet( Sheet *_sheet ) void View::slotRefreshView() { refreshView(); - d->canvas->tqrepaint(); - d->vBorderWidget->tqrepaint(); - d->hBorderWidget->tqrepaint(); + d->canvas->repaint(); + d->vBorderWidget->repaint(); + d->hBorderWidget->repaint(); } void View::slotUpdateView( Sheet *_sheet ) @@ -7209,7 +7209,7 @@ void View::transformPart() if ( d->transformToolBox.isNull() ) { - d->transformToolBox = new KoTransformToolBox( selectedChild(), tqtopLevelWidget() ); + d->transformToolBox = new KoTransformToolBox( selectedChild(), topLevelWidget() ); d->transformToolBox->show(); d->transformToolBox->setDocumentChild( selectedChild() ); @@ -7537,7 +7537,7 @@ void View::runInspector() TQColor View::highlightColor() { - return TQApplication::tqpalette().active().highlight().light( 175 ); + return TQApplication::palette().active().highlight().light( 175 ); } } // namespace KSpread diff --git a/kspread/kspread_view.h b/kspread/kspread_view.h index 2dfecfa5..f9ce1bdd 100644 --- a/kspread/kspread_view.h +++ b/kspread/kspread_view.h @@ -253,22 +253,22 @@ public: /** * - * @param _tqgeometry is the zoomed tqgeometry of the new child. + * @param _geometry is the zoomed geometry of the new child. * @param _entry is the entry to insert. * * @todo check validity of @p _entry docs. */ - void insertChart( const TQRect& _tqgeometry, KoDocumentEntry& _entry ); + void insertChart( const TQRect& _geometry, KoDocumentEntry& _entry ); /** * - * @param _tqgeometry is the tqgeometry of the new child. + * @param _geometry is the geometry of the new child. * @param _entry is the entry to insert. * * @todo check validity of @p _entry docs. */ - void insertChild( const TQRect& _tqgeometry, KoDocumentEntry& _entry ); + void insertChild( const TQRect& _geometry, KoDocumentEntry& _entry ); - // void insertPicture( const TQRect& _tqgeometry, KURL& _file ); + // void insertPicture( const TQRect& _geometry, KURL& _file ); virtual void print( KPrinter &printer ); virtual void setupPrinter( KPrinter &printer ); @@ -321,7 +321,7 @@ public: void updateShowSheetMenu(); /** - * Mark all selected cells / regions of cells as 'dirty' (ie. requiring a tqrepaint) + * Mark all selected cells / regions of cells as 'dirty' (ie. requiring a repaint) * They will be repainted on the next call to paintUpdates() */ void markSelectionAsDirty(); diff --git a/kspread/manipulator.cc b/kspread/manipulator.cc index bed111ba..f1a5838b 100644 --- a/kspread/manipulator.cc +++ b/kspread/manipulator.cc @@ -445,20 +445,20 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list, /* Don't need to go through the loop twice... for (int i = range.left(); i <= right; ++i) { - layoutColumn tmptqlayout; - tmptqlayout.col = i; - tmptqlayout.l = new ColumnFormat( m_sheet, i ); - tmptqlayout.l->copy( *(m_sheet->columnFormat( i )) ); - listCol.append(tmptqlayout); + layoutColumn tmplayout; + tmplayout.col = i; + tmplayout.l = new ColumnFormat( m_sheet, i ); + tmplayout.l->copy( *(m_sheet->columnFormat( i )) ); + listCol.append(tmplayout); } */ for ( int col = range.left(); col <= right; ++col ) { - layoutColumn tmptqlayout; - tmptqlayout.col = col; - tmptqlayout.l = new ColumnFormat( m_sheet, col ); - tmptqlayout.l->copy( *(m_sheet->columnFormat( col )) ); - listCol.append(tmptqlayout); + layoutColumn tmplayout; + tmplayout.col = col; + tmplayout.l = new ColumnFormat( m_sheet, col ); + tmplayout.l->copy( *(m_sheet->columnFormat( col )) ); + listCol.append(tmplayout); cell = m_sheet->getFirstCellColumn( col ); while ( cell ) @@ -469,12 +469,12 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list, continue; } - layoutCell tmptqlayout; - tmptqlayout.col = col; - tmptqlayout.row = cell->row(); - tmptqlayout.l = new Format( m_sheet, 0 ); - tmptqlayout.l->copy( *(m_sheet->cellAt( tmptqlayout.col, tmptqlayout.row )->format()) ); - list.append(tmptqlayout); + layoutCell tmplayout; + tmplayout.col = col; + tmplayout.row = cell->row(); + tmplayout.l = new Format( m_sheet, 0 ); + tmplayout.l->copy( *(m_sheet->cellAt( tmplayout.col, tmplayout.row )->format()) ); + list.append(tmplayout); cell = m_sheet->getNextCellDown( col, cell->row() ); } @@ -487,12 +487,12 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list, if ( range.left() <= col && right >= col && !cell->isPartOfMerged()) { - layoutCell tmptqlayout; - tmptqlayout.col = cell->column(); - tmptqlayout.row = cell->row(); - tmptqlayout.l = new Format( m_sheet, 0 ); - tmptqlayout.l->copy( *(m_sheet->cellAt( tmptqlayout.col, tmptqlayout.row )) ); - list.append(tmptqlayout); + layoutCell tmplayout; + tmplayout.col = cell->column(); + tmplayout.row = cell->row(); + tmplayout.l = new Format( m_sheet, 0 ); + tmplayout.l->copy( *(m_sheet->cellAt( tmplayout.col, tmplayout.row )) ); + list.append(tmplayout); } } */ @@ -501,11 +501,11 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list, { for ( int row = range.top(); row <= bottom; ++row ) { - layoutRow tmptqlayout; - tmptqlayout.row = row; - tmptqlayout.l = new RowFormat( m_sheet, row ); - tmptqlayout.l->copy( *(m_sheet->rowFormat( row )) ); - listRow.append(tmptqlayout); + layoutRow tmplayout; + tmplayout.row = row; + tmplayout.l = new RowFormat( m_sheet, row ); + tmplayout.l->copy( *(m_sheet->rowFormat( row )) ); + listRow.append(tmplayout); cell = m_sheet->getFirstCellRow( row ); while ( cell ) @@ -515,12 +515,12 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list, cell = m_sheet->getNextCellRight( cell->column(), row ); continue; } - layoutCell tmptqlayout; - tmptqlayout.col = cell->column(); - tmptqlayout.row = row; - tmptqlayout.l = new Format( m_sheet, 0 ); - tmptqlayout.l->copy( *(m_sheet->cellAt( cell->column(), row )->format()) ); - list.append(tmptqlayout); + layoutCell tmplayout; + tmplayout.col = cell->column(); + tmplayout.row = row; + tmplayout.l = new Format( m_sheet, 0 ); + tmplayout.l->copy( *(m_sheet->cellAt( cell->column(), row )->format()) ); + list.append(tmplayout); cell = m_sheet->getNextCellRight( cell->column(), row ); } @@ -533,12 +533,12 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list, if ( range.top() <= row && bottom >= row && !cell->isPartOfMerged()) { - layoutCell tmptqlayout; - tmptqlayout.col = cell->column(); - tmptqlayout.row = cell->row(); - tmptqlayout.l = new Format( m_sheet, 0 ); - tmptqlayout.l->copy( *(m_sheet->cellAt( tmptqlayout.col, tmptqlayout.row )) ); - list.append(tmptqlayout); + layoutCell tmplayout; + tmplayout.col = cell->column(); + tmplayout.row = cell->row(); + tmplayout.l = new Format( m_sheet, 0 ); + tmplayout.l->copy( *(m_sheet->cellAt( tmplayout.col, tmplayout.row )) ); + list.append(tmplayout); } } */ @@ -551,12 +551,12 @@ void FormatManipulator::copyFormat(TQValueList<layoutCell> & list, Cell * cell = m_sheet->nonDefaultCell( col, row ); if ( !cell->isPartOfMerged() ) { - layoutCell tmptqlayout; - tmptqlayout.col = col; - tmptqlayout.row = row; - tmptqlayout.l = new Format( m_sheet, 0 ); - tmptqlayout.l->copy( *(m_sheet->cellAt( col, row )->format()) ); - list.append(tmptqlayout); + layoutCell tmplayout; + tmplayout.col = col; + tmplayout.row = row; + tmplayout.l = new Format( m_sheet, 0 ); + tmplayout.l->copy( *(m_sheet->cellAt( col, row )->format()) ); + list.append(tmplayout); } } } @@ -1444,20 +1444,20 @@ double AdjustColumnRowManipulator::adjustColumnHelper(Cell* cell, int col, int r if ( cell->textWidth() > long_max ) { double indent = 0.0; - Format::Align tqalignment = cell->format()->align(cell->column(), cell->row()); - if (tqalignment == Format::Undefined) + Format::Align alignment = cell->format()->align(cell->column(), cell->row()); + if (alignment == Format::Undefined) { if (cell->value().isNumber() || cell->isDate() || cell->isTime()) { - tqalignment = Format::Right; + alignment = Format::Right; } else { - tqalignment = Format::Left; + alignment = Format::Left; } } - if (tqalignment == Format::Left) + if (alignment == Format::Left) { indent = cell->format()->getIndent( cell->column(), cell->row() ); } diff --git a/kspread/plugins/calculator/configdlg.cpp b/kspread/plugins/calculator/configdlg.cpp index cec64193..e02d914d 100644 --- a/kspread/plugins/calculator/configdlg.cpp +++ b/kspread/plugins/calculator/configdlg.cpp @@ -29,7 +29,7 @@ #include <klocale.h> #include <kdialog.h> -#include <tqlayout.h> +#include <layout.h> // Undefine HAVE_LONG_DOUBLE for Beta 4 since RedHat 5.0 comes with a borken // glibc @@ -48,10 +48,10 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, DefStruct *defstruct) lay1->setSpacing( KDialog::spacingHint() ); box = new TQGroupBox(0, Qt::Vertical, i18n("Defaults"), this, "box"); - box->tqlayout()->setSpacing(KDialog::spacingHint()); - box->tqlayout()->setMargin(KDialog::marginHint()); + box->layout()->setSpacing(KDialog::spacingHint()); + box->layout()->setMargin(KDialog::marginHint()); - TQGridLayout *grid1 = new TQGridLayout(box->tqlayout(),8,2); + TQGridLayout *grid1 = new TQGridLayout(box->layout(),8,2); label1 = new TQLabel(box); label1->setText(i18n("Foreground color:")); grid1->addWidget(label1,0,0); diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp index 4c80e7b4..b15f844c 100644 --- a/kspread/plugins/calculator/kcalc.cpp +++ b/kspread/plugins/calculator/kcalc.cpp @@ -26,7 +26,7 @@ #include "version.h" #include <klocale.h> #include <knotifyclient.h> -#include <tqlayout.h> +#include <layout.h> #include <tqobjectlist.h> #include <tqpushbutton.h> #include <kapplication.h> @@ -80,7 +80,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char // Create the display calc_display = new DLabel( this, "display" ); calc_display->setFrameStyle( TQFrame::WinPanel | TQFrame::Sunken ); - calc_display->tqsetAlignment( AlignRight|AlignVCenter ); + calc_display->setAlignment( AlignRight|AlignVCenter ); calc_display->setFocus(); calc_display->setFocusPolicy( TQ_StrongFocus ); @@ -89,18 +89,18 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char statusINVLabel = new TQLabel( this, "INV" ); Q_CHECK_PTR( statusINVLabel ); statusINVLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - statusINVLabel->tqsetAlignment( AlignCenter ); + statusINVLabel->setAlignment( AlignCenter ); statusINVLabel->setText("NORM"); statusHYPLabel = new TQLabel( this, "HYP" ); Q_CHECK_PTR( statusHYPLabel ); statusHYPLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - statusHYPLabel->tqsetAlignment( AlignCenter ); + statusHYPLabel->setAlignment( AlignCenter ); statusERRORLabel = new TQLabel( this, "ERROR" ); Q_CHECK_PTR( statusERRORLabel ); statusERRORLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - statusERRORLabel->tqsetAlignment( AlignLeft|AlignVCenter ); + statusERRORLabel->setAlignment( AlignLeft|AlignVCenter ); // create angle button group @@ -390,12 +390,12 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char mainLayout->addLayout(btnLayout); mainLayout->addLayout(statusLayout); - // button tqlayout + // button layout btnLayout->addWidget(mSmallPage,0,AlignTop); btnLayout->addSpacing(mInternalSpacing); btnLayout->addWidget(mLargePage,0,AlignTop); - // small button tqlayout + // small button layout smallBtnLayout->addWidget(pbhyp, 0, 0); smallBtnLayout->addWidget(pbinv, 0, 1); smallBtnLayout->addWidget(pbA, 0, 2); @@ -427,7 +427,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char smallBtnLayout->setRowStretch(4, 0); smallBtnLayout->setRowStretch(5, 0); - // large button tqlayout + // large button layout largeBtnLayout->addWidget(pbEE, 0, 0); largeBtnLayout->addWidget(pbMR, 0, 1); largeBtnLayout->addWidget(pbMplusminus, 0, 2); @@ -472,11 +472,11 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char topLayout->addWidget(calc_display, 10); - // radiobutton tqlayout + // radiobutton layout radioLayout->addWidget(base_group); radioLayout->addWidget(angle_group); - // status tqlayout + // status layout statusLayout->addWidget(statusINVLabel); statusLayout->addWidget(statusHYPLabel); statusLayout->addWidget(statusERRORLabel, 10); @@ -578,7 +578,7 @@ void TQtCalculator::updateGeometry() s.setWidth(mSmallPage->fontMetrics().width("MMM")); s.setHeight(mSmallPage->fontMetrics().lineSpacing()); - l = (TQObjectList*)mSmallPage->tqchildren(); // silence please + l = (TQObjectList*)mSmallPage->children(); // silence please for(uint i=0; i < l->count(); i++) { @@ -586,20 +586,20 @@ void TQtCalculator::updateGeometry() if( o->isWidgetType() ) { margin = TQApplication::style(). - tqpixelMetric(TQStyle::PM_ButtonMargin, ((TQWidget *)o))*2; + pixelMetric(TQStyle::PM_ButtonMargin, ((TQWidget *)o))*2; ((TQWidget*)o)->setMinimumSize(s.width()+margin, s.height()+margin); ((TQWidget*)o)->installEventFilter( this ); ((TQWidget*)o)->setAcceptDrops(true); } } - l = (TQObjectList*)mLargePage->tqchildren(); // silence please + l = (TQObjectList*)mLargePage->children(); // silence please - int h1 = pbF->tqminimumSize().height(); + int h1 = pbF->minimumSize().height(); int h2 = (int)((((float)h1 + 4.0) / 5.0)); s.setWidth(mLargePage->fontMetrics().width("MMM") + TQApplication::style(). - tqpixelMetric(TQStyle::PM_ButtonMargin, pbF)*2); + pixelMetric(TQStyle::PM_ButtonMargin, pbF)*2); s.setHeight(h1 + h2); for(uint i = 0; i < l->count(); i++) @@ -621,7 +621,7 @@ void TQtCalculator::updateGeometry() statusINVLabel->setMinimumWidth(s.width()); statusHYPLabel->setMinimumWidth(s.width()); - //setFixedSize(tqminimumSize()); + //setFixedSize(minimumSize()); } void TQtCalculator::exit() @@ -1465,9 +1465,9 @@ void TQtCalculator::configclicked(){ lay1->setSpacing( KDialog::spacingHint() ); TQGroupBox *box = new TQGroupBox(0,Qt::Vertical,about,"box"); - box->tqlayout()->setSpacing(KDialog::spacingHint()); - box->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *grid1 = new TQGridLayout(box->tqlayout(),2,2); + box->layout()->setSpacing(KDialog::spacingHint()); + box->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *grid1 = new TQGridLayout(box->layout(),2,2); TQLabel *label = new TQLabel(box,"label"); TQLabel *label2 = new TQLabel(box,"label2"); @@ -1494,10 +1494,10 @@ void TQtCalculator::configclicked(){ "enabled. See the README for details."); #endif - label->tqsetAlignment(AlignLeft|WordBreak|ExpandTabs); + label->setAlignment(AlignLeft|WordBreak|ExpandTabs); label->setText(labelstring); - label2->tqsetAlignment(AlignLeft|WordBreak|ExpandTabs); + label2->setAlignment(AlignLeft|WordBreak|ExpandTabs); label2->setText(labelstring2); // HACK @@ -1540,7 +1540,7 @@ void TQtCalculator::configclicked(){ set_precision(); set_style(); updateGeometry(); - resize(tqminimumSize()); + resize(minimumSize()); } delete configdlg; } @@ -1628,7 +1628,7 @@ void TQtCalculator::display_selected(){ if(calc_display->isLit()){ - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setText(calc_display->text()); selection_timer->start(100); @@ -1643,7 +1643,7 @@ void TQtCalculator::display_selected(){ } else{ - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); CALCAMNT result; result = (CALCAMNT) cb->text().toDouble(); diff --git a/kspread/plugins/calculator/kcalc.h b/kspread/plugins/calculator/kcalc.h index dfa67b63..a1205bc2 100644 --- a/kspread/plugins/calculator/kcalc.h +++ b/kspread/plugins/calculator/kcalc.h @@ -35,7 +35,7 @@ using std::queue; #include <ctype.h> #include <tqlistbox.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqptrlist.h> #include <tqaccel.h> #include <tqtabdialog.h> diff --git a/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc b/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc index d55c332b..0311c913 100644 --- a/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc +++ b/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc @@ -40,7 +40,7 @@ InsertCalendarDialog::InsertCalendarDialog(TQWidget* parent, const char* name) //we start with a default calendar for the current month; - TQDate first_day_in_month = TQDate::tqcurrentDate(); + TQDate first_day_in_month = TQDate::currentDate(); first_day_in_month.setYMD(first_day_in_month.year(),first_day_in_month.month(),1); TQDate last_day_in_month(first_day_in_month.year(),first_day_in_month.month(),first_day_in_month.daysInMonth()); diff --git a/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui b/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui index 712b11b4..d2c8fc08 100644 --- a/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui +++ b/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui @@ -144,7 +144,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>400</width> <height>19</height> diff --git a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc index 1bb16a95..c0d5c1ca 100644 --- a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc +++ b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc @@ -194,7 +194,7 @@ void PluginInsertCalendar::slotInsertCalendar(const TQDate &start, const TQDate int row = selection.y(); int col = selection.x(); int colstart = col; //this is where we get back after each week - sheet->setText(row,colstart,i18n("Calendar from %1 to %2").tqarg(start.toString()).tqarg(end.toString())); + sheet->setText(row,colstart,i18n("Calendar from %1 to %2").arg(start.toString()).arg(end.toString())); TQDate current(start); // TQDate previous(current); diff --git a/kspread/plugins/scripting/kspreadcore/kspreadcoremodule.cpp b/kspread/plugins/scripting/kspreadcore/kspreadcoremodule.cpp index 108516dc..9f67dfbb 100644 --- a/kspread/plugins/scripting/kspreadcore/kspreadcoremodule.cpp +++ b/kspread/plugins/scripting/kspreadcore/kspreadcoremodule.cpp @@ -45,9 +45,9 @@ using namespace Kross::KSpreadCore; KSpreadCoreModule::KSpreadCoreModule(Kross::Api::Manager* manager) : Kross::Api::Module("kspreadcore") , m_manager(manager) { - TQMap<TQString, Object::Ptr> tqchildren = manager->getChildren(); - kdDebug() << " there are " << tqchildren.size() << endl; - for(TQMap<TQString, Object::Ptr>::const_iterator it = tqchildren.begin(); it != tqchildren.end(); it++) + TQMap<TQString, Object::Ptr> children = manager->getChildren(); + kdDebug() << " there are " << children.size() << endl; + for(TQMap<TQString, Object::Ptr>::const_iterator it = children.begin(); it != children.end(); it++) { kdDebug() << it.key() << " " << it.data() << endl; } diff --git a/kspread/plugins/scripting/scripting.cc b/kspread/plugins/scripting/scripting.cc index 44f8fa01..a919b31d 100644 --- a/kspread/plugins/scripting/scripting.cc +++ b/kspread/plugins/scripting/scripting.cc @@ -43,9 +43,9 @@ Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &) setInstance(KSpreadScriptingFactory::instance()); kdDebug() << "Scripting plugin. Class: " - << tqmetaObject()->className() + << metaObject()->className() << ", Parent: " - << parent->tqmetaObject()->className() + << parent->metaObject()->className() << "\n"; if ( parent->inherits("KSpread::View") ) diff --git a/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py b/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py index a34a4dd1..529a2d26 100755 --- a/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py +++ b/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py @@ -30,11 +30,11 @@ class Dialog(qt.QDialog): import qt qt.QDialog.__init__(self, parent, "Dialog", 1, qt.Qt.WDestructiveClose) self.setCaption("Export to HTML File") - tqlayout = qt.QVBoxLayout(self) + layout = qt.QVBoxLayout(self) box = qt.QVBox(self) box.setMargin(10) box.setSpacing(10) - tqlayout.addWidget(box) + layout.addWidget(box) sheetbox = qt.QHBox(box) sheetbox.setSpacing(6) diff --git a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py index e3d6237c..c6da1fe2 100755 --- a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py +++ b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py @@ -763,11 +763,11 @@ class SampleDialog(qt.QDialog): import qt qt.QDialog.__init__(self, parent, "SampleDialog", 1) - tqlayout = qt.QVBoxLayout(self) + layout = qt.QVBoxLayout(self) box = qt.QVBox(self) box.setMargin(4) box.setSpacing(10) - tqlayout.addWidget(box) + layout.addWidget(box) self.scrollview = qt.QScrollView(box) self.scrollview.setResizePolicy(qt.QScrollView.AutoOne) @@ -829,11 +829,11 @@ class MainDialog(qt.QDialog): qt.QDialog.__init__(self, parent, "MainDialog", 1, qt.Qt.WDestructiveClose) self.setCaption("Script Editor") - tqlayout = qt.QVBoxLayout(self) + layout = qt.QVBoxLayout(self) box = qt.QVBox(self) box.setMargin(4) box.setSpacing(10) - tqlayout.addWidget(box) + layout.addWidget(box) menu = qt.QMenuBar(box) diff --git a/kspread/tests/inspector.cc b/kspread/tests/inspector.cc index 17179793..f861343c 100644 --- a/kspread/tests/inspector.cc +++ b/kspread/tests/inspector.cc @@ -19,9 +19,9 @@ #include "inspector.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdialogbase.h> @@ -65,7 +65,7 @@ static TQString boolAsString( bool b ) static TQString longAsHexstring( long l ) { - return TQString("%1").tqarg(l, 8, 16); + return TQString("%1").arg(l, 8, 16); } static TQString dirAsString( Sheet::LayoutDirection dir ) diff --git a/kspread/tests/tester.cc b/kspread/tests/tester.cc index 05df95d1..cdadeaef 100644 --- a/kspread/tests/tester.cc +++ b/kspread/tests/tester.cc @@ -20,7 +20,7 @@ #include "tester.h" #include <tqstringlist.h> -#include <tqtextstream.h> +#include <textstream.h> using namespace KSpread; diff --git a/kspread/tests/testrunner.cc b/kspread/tests/testrunner.cc index 53fe60b3..fa45c9c0 100644 --- a/kspread/tests/testrunner.cc +++ b/kspread/tests/testrunner.cc @@ -22,8 +22,8 @@ #include <tqapplication.h> #include <tqdict.h> #include <tqlabel.h> -#include <tqlayout.h> -#include <tqtextedit.h> +#include <layout.h> +#include <textedit.h> #include <kcombobox.h> #include <kdialogbase.h> @@ -58,23 +58,23 @@ TestRunner::TestRunner(): d = new Private; TQFrame* mainWidget = plainPage(); - TQGridLayout* tqlayout = new TQGridLayout( mainWidget, 3, 4, marginHint(), spacingHint() ); + TQGridLayout* layout = new TQGridLayout( mainWidget, 3, 4, marginHint(), spacingHint() ); setMinimumSize( 360, 230 ); TQLabel* typeLabel = new TQLabel( "Type of Test:", mainWidget ); - tqlayout->addWidget( typeLabel, 0, 0 ); + layout->addWidget( typeLabel, 0, 0 ); d->testType = new KComboBox( mainWidget ); - tqlayout->addWidget( d->testType, 0, 1 ); + layout->addWidget( d->testType, 0, 1 ); - TQSpacerItem* tqspacerItem = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - tqlayout->addItem( tqspacerItem, 0, 2 ); + TQSpacerItem* spacerItem = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + layout->addItem( spacerItem, 0, 2 ); d->runButton = new KPushButton( "Run", mainWidget ); - tqlayout->addWidget( d->runButton, 0, 3 ); + layout->addWidget( d->runButton, 0, 3 ); d->logView = new TQTextEdit( mainWidget ); - tqlayout->addMultiCellWidget( d->logView, 2, 2, 0, 3 ); + layout->addMultiCellWidget( d->logView, 2, 2, 0, 3 ); d->logView->setTextFormat( TQt::LogText ); TQObject::connect( d->runButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( runTest() ) ); @@ -108,7 +108,7 @@ void TestRunner::runTest() if( tester ) { d->logView->clear(); - d->logView->append( TQString("Test: %1").tqarg( testName ) ); + d->logView->append( TQString("Test: %1").arg( testName ) ); TQApplication::setOverrideCursor(TQt::waitCursor); tester->run(); @@ -117,13 +117,13 @@ void TestRunner::runTest() TQStringList errorList = tester->errors(); if( tester->failed() ) { - d->logView->append( TQString( "%1 tests, <b>%2 failed.</b>").tqarg( tester->count() ). + d->logView->append( TQString( "%1 tests, <b>%2 failed.</b>").arg( tester->count() ). arg( tester->failed() ) ); for( unsigned k = 0; k < errorList.count(); k++ ) d->logView->append( errorList[k] ); } else - d->logView->append( TQString( "%1 tests, everything is OK. ").tqarg( tester->count() ) ); + d->logView->append( TQString( "%1 tests, everything is OK. ").arg( tester->count() ) ); d->logView->append( "Test finished." ); } diff --git a/kspread/valueconverter.cc b/kspread/valueconverter.cc index 8dda86d1..cd649c36 100644 --- a/kspread/valueconverter.cc +++ b/kspread/valueconverter.cc @@ -228,11 +228,11 @@ Value ValueConverter::asDateTime (const Value &value) const switch (value.type()) { case Value::Empty: - val.setValue (TQDateTime::tqcurrentDateTime()); + val.setValue (TQDateTime::currentDateTime()); break; case Value::Boolean: //ignore the bool value... any better idea? ;) - val.setValue (TQDateTime::tqcurrentDateTime()); + val.setValue (TQDateTime::currentDateTime()); break; case Value::Integer: val.setValue (value.asFloat()); @@ -269,11 +269,11 @@ Value ValueConverter::asDate (const Value &value) const switch (value.type()) { case Value::Empty: - val.setValue (TQDate::tqcurrentDate()); + val.setValue (TQDate::currentDate()); break; case Value::Boolean: //ignore the bool value... any better idea? ;) - val.setValue (TQDate::tqcurrentDate()); + val.setValue (TQDate::currentDate()); break; case Value::Integer: val.setValue (value.asFloat()); diff --git a/kspread/valueformatter.cc b/kspread/valueformatter.cc index 9e3c57da..1eda41da 100644 --- a/kspread/valueformatter.cc +++ b/kspread/valueformatter.cc @@ -358,15 +358,15 @@ TQString ValueFormatter::fractionFormat (double value, FormatType fmtType) diff = fabs(result - calc); } } - if( index1 == 0 ) return TQString("%1").tqarg( floor(value) ); - if( index1 == index ) return TQString("%1").tqarg( floor(value)+1 ); + if( index1 == 0 ) return TQString("%1").arg( floor(value) ); + if( index1 == index ) return TQString("%1").arg( floor(value)+1 ); if( floor(value) == 0) - return TQString("%1/%2").tqarg( index1 ).tqarg( index ); + return TQString("%1/%2").arg( index1 ).arg( index ); return TQString("%1 %2/%3") - .tqarg( floor(value) ) - .tqarg( index1 ) - .tqarg( index ); + .arg( floor(value) ) + .arg( index1 ) + .arg( index ); } @@ -407,12 +407,12 @@ TQString ValueFormatter::fractionFormat (double value, FormatType fmtType) else { if ( floor(value) == 0 ) - return TQString("%1/%2").tqarg(numerator).tqarg(denominator); + return TQString("%1/%2").arg(numerator).arg(denominator); else return TQString("%1 %2/%3") - .tqarg(floor(value)) - .tqarg(numerator) - .tqarg(denominator); + .arg(floor(value)) + .arg(numerator) + .arg(denominator); } } @@ -436,35 +436,35 @@ TQString ValueFormatter::timeFormat (const TQDateTime &dt, FormatType fmtType) if (fmtType == Time_format1) { // 9 : 01 AM return TQString("%1:%2 %3") - .tqarg((pm ? h - 12 : h),2) - .tqarg(minute,2) - .tqarg(AMPM); + .arg((pm ? h - 12 : h),2) + .arg(minute,2) + .arg(AMPM); } if (fmtType == Time_format2) { //9:01:05 AM return TQString("%1:%2:%3 %4") - .tqarg((pm ? h-12 : h),2) - .tqarg(minute,2) - .tqarg(second,2) - .tqarg(AMPM); + .arg((pm ? h-12 : h),2) + .arg(minute,2) + .arg(second,2) + .arg(AMPM); } if (fmtType == Time_format3) { return TQString("%1 %2 %3 %4 %5 %6") // 9 h 01 min 28 s - .tqarg(hour,2) - .tqarg(i18n("h")) - .tqarg(minute,2) - .tqarg(i18n("min")) - .tqarg(second,2) - .tqarg(i18n("s")); + .arg(hour,2) + .arg(i18n("h")) + .arg(minute,2) + .arg(i18n("min")) + .arg(second,2) + .arg(i18n("s")); } if (fmtType == Time_format4) { // 9:01 - return TQString("%1:%2").tqarg(hour, 2).tqarg(minute, 2); + return TQString("%1:%2").arg(hour, 2).arg(minute, 2); } if (fmtType == Time_format5) { // 9:01:12 - return TQString("%1:%2:%3").tqarg(hour, 2).tqarg(minute, 2).tqarg(second, 2); + return TQString("%1:%2:%3").arg(hour, 2).arg(minute, 2).arg(second, 2); } TQDate d1(dt.date()); @@ -476,15 +476,15 @@ TQString ValueFormatter::timeFormat (const TQDateTime &dt, FormatType fmtType) if (fmtType == Time_format6) { // [mm]:ss m += (h * 60); - return TQString("%1:%2").tqarg(m, 1).tqarg(second, 2); + return TQString("%1:%2").arg(m, 1).arg(second, 2); } if (fmtType == Time_format7) { // [h]:mm:ss - return TQString("%1:%2:%3").tqarg(h, 1).tqarg(minute, 2).tqarg(second, 2); + return TQString("%1:%2:%3").arg(h, 1).arg(minute, 2).arg(second, 2); } if (fmtType == Time_format8) { // [h]:mm m += (h * 60); - return TQString("%1:%2").tqarg(h, 1).tqarg(minute, 2); + return TQString("%1:%2").arg(h, 1).arg(minute, 2); } return converter->locale()->formatTime( dt.time(), false ); @@ -540,7 +540,7 @@ TQString ValueFormatter::dateFormat (const TQDate &date, FormatType fmtType) tmp += TQString::number(date.year()); } else if (fmtType == date_format10) { /*F-99 */ - tmp = converter->locale()->calendar()->monthString(date, false).tqat(0) + "-"; + tmp = converter->locale()->calendar()->monthString(date, false).at(0) + "-"; tmp += TQString::number(date.year()).right(2); } else if (fmtType == date_format11) { /*18/Feb */ diff --git a/kugar/kudesigner/kudesigner_doc.cpp b/kugar/kudesigner/kudesigner_doc.cpp index 0e7355b2..58d27637 100644 --- a/kugar/kudesigner/kudesigner_doc.cpp +++ b/kugar/kudesigner/kudesigner_doc.cpp @@ -33,8 +33,8 @@ #include <tqfileinfo.h> #include <tqdockwindow.h> #include <tqdom.h> -#include <tqtextstream.h> -#include <tqtextcodec.h> +#include <textstream.h> +#include <textcodec.h> #include <canvas.h> #include <kugartemplate.h> diff --git a/kugar/kudesigner/kudesigner_view.cpp b/kugar/kudesigner/kudesigner_view.cpp index 991d8304..6a478a3f 100644 --- a/kugar/kudesigner/kudesigner_view.cpp +++ b/kugar/kudesigner/kudesigner_view.cpp @@ -28,7 +28,7 @@ #include <tqevent.h> #include <tqmainwindow.h> #include <tqaction.h> -#include <tqlayout.h> +#include <layout.h> #include <tqdockwindow.h> #include <tqmenubar.h> #include <tqmessagebox.h> diff --git a/kugar/kudesigner_lib/canvas.cpp b/kugar/kudesigner_lib/canvas.cpp index d486ae9d..3d4ba603 100644 --- a/kugar/kudesigner_lib/canvas.cpp +++ b/kugar/kudesigner_lib/canvas.cpp @@ -162,11 +162,11 @@ bool Canvas::loadXML( const TQDomNode &report ) templ->props[ "RightMargin" ].setValue( attributes.namedItem( "RightMargin" ).nodeValue().toInt() ); // Get all the child report elements - TQDomNodeList tqchildren = report.childNodes(); - int childCount = tqchildren.length(); + TQDomNodeList children = report.childNodes(); + int childCount = children.length(); for ( int j = 0; j < childCount; j++ ) { - TQDomNode child = tqchildren.item( j ); + TQDomNode child = children.item( j ); if ( child.nodeType() == TQDomNode::ElementNode ) { @@ -301,12 +301,12 @@ void Canvas::setDetailFooterAttributes( TQDomNode *node ) void Canvas::addReportItems( TQDomNode *node, Band *section ) { - TQDomNodeList tqchildren = node->childNodes(); - int childCount = tqchildren.length(); + TQDomNodeList children = node->childNodes(); + int childCount = children.length(); for ( int j = 0; j < childCount; j++ ) { - TQDomNode child = tqchildren.item( j ); + TQDomNode child = children.item( j ); if ( child.nodeType() == TQDomNode::ElementNode ) { if ( child.nodeName() == "Line" ) diff --git a/kugar/kudesigner_lib/detail.cpp b/kugar/kudesigner_lib/detail.cpp index db3765f8..a9f2faa5 100644 --- a/kugar/kudesigner_lib/detail.cpp +++ b/kugar/kudesigner_lib/detail.cpp @@ -39,7 +39,7 @@ Detail::Detail( int x, int y, int width, int height, int level, Canvas *canvas ) void Detail::draw( TQPainter &painter ) { - TQString str = TQString( "%1 %2" ).tqarg( i18n( "Detail" ) ).tqarg( props[ "Level" ].value().toInt() ); + TQString str = TQString( "%1 %2" ).arg( i18n( "Detail" ) ).arg( props[ "Level" ].value().toInt() ); painter.drawText( rect(), AlignVCenter | AlignLeft, str ); Band::draw( painter ); } diff --git a/kugar/kudesigner_lib/detailfooter.cpp b/kugar/kudesigner_lib/detailfooter.cpp index 14b5e13f..b1715920 100644 --- a/kugar/kudesigner_lib/detailfooter.cpp +++ b/kugar/kudesigner_lib/detailfooter.cpp @@ -36,7 +36,7 @@ DetailFooter::DetailFooter( int x, int y, int width, int height, int level, Canv void DetailFooter::draw( TQPainter &painter ) { - TQString str = TQString( "%1 %2" ).tqarg( i18n( "Detail Footer" ) ).tqarg( props[ "Level" ].value().toInt() ); + TQString str = TQString( "%1 %2" ).arg( i18n( "Detail Footer" ) ).arg( props[ "Level" ].value().toInt() ); painter.drawText( rect(), AlignVCenter | AlignLeft, str ); Band::draw( painter ); } diff --git a/kugar/kudesigner_lib/detailheader.cpp b/kugar/kudesigner_lib/detailheader.cpp index 071dea72..d43ce942 100644 --- a/kugar/kudesigner_lib/detailheader.cpp +++ b/kugar/kudesigner_lib/detailheader.cpp @@ -36,7 +36,7 @@ DetailHeader::DetailHeader( int x, int y, int width, int height, int level, Canv void DetailHeader::draw( TQPainter &painter ) { - TQString str = TQString( "%1 %2" ).tqarg( i18n( "Detail Header" ) ).tqarg( props[ "Level" ].value().toInt() ); + TQString str = TQString( "%1 %2" ).arg( i18n( "Detail Header" ) ).arg( props[ "Level" ].value().toInt() ); painter.drawText( rect(), AlignVCenter | AlignLeft, str ); Band::draw( painter ); } diff --git a/kugar/kudesigner_lib/propertyserializer.cpp b/kugar/kudesigner_lib/propertyserializer.cpp index 32ebe470..ae9f30d7 100644 --- a/kugar/kudesigner_lib/propertyserializer.cpp +++ b/kugar/kudesigner_lib/propertyserializer.cpp @@ -40,7 +40,7 @@ TQString PropertySerializer::toString( Property *prop ) switch ( prop->type() ) { case KoProperty::Color: - return TQString( "%1,%2,%3" ).tqarg( val.toColor().red() ).tqarg( val.toColor().green() ).tqarg( val.toColor().blue() ); + return TQString( "%1,%2,%3" ).arg( val.toColor().red() ).arg( val.toColor().green() ).arg( val.toColor().blue() ); case KoProperty::Boolean: return val.toBool() ? "true" : "false"; case KoProperty::Font: @@ -67,7 +67,7 @@ TQVariant PropertySerializer::fromString( Property *prop, const TQString &str ) case KoProperty::LineStyle: return TQVariant( str.toInt() ); case KoProperty::Symbol: - return TQVariant( str.tqat( 0 ).latin1() ); + return TQVariant( str.at( 0 ).latin1() ); default: return TQVariant( str ); } diff --git a/kugar/kudesigner_lib/structurewidget.cpp b/kugar/kudesigner_lib/structurewidget.cpp index 7ad4ac1b..01b4289e 100644 --- a/kugar/kudesigner_lib/structurewidget.cpp +++ b/kugar/kudesigner_lib/structurewidget.cpp @@ -142,7 +142,7 @@ void StructureWidget::refreshSection( Kudesigner::Band *section, StructureItem * break; } if ( level > 0 ) - name += tqtr( " (level %1)" ).tqarg( level ); + name += tqtr( " (level %1)" ).arg( level ); StructureItem *item = new StructureItem( root, name ); m_items[ section ] = item; @@ -165,18 +165,18 @@ void StructureWidget::refreshSectionContents( Kudesigner::Band *section, Structu switch ( box->rtti() ) { case Kudesigner::Rtti_Label: - name = tqtr( "Label: %1" ).tqarg( box->props[ "Text" ].value().toString() ); + name = tqtr( "Label: %1" ).arg( box->props[ "Text" ].value().toString() ); break; case Kudesigner::Rtti_Field: - name = tqtr( "Field: %1" ).tqarg( box->props[ "Field" ].value().toString() ); + name = tqtr( "Field: %1" ).arg( box->props[ "Field" ].value().toString() ); break; case Kudesigner::Rtti_Calculated: - name = tqtr( "Calculated Field: %1" ).tqarg( box->props[ "Field" ].value().toString() ); + name = tqtr( "Calculated Field: %1" ).arg( box->props[ "Field" ].value().toString() ); break; case Kudesigner::Rtti_Special: idx = box->props[ "Type" ].listData()->keys.findIndex( box->props[ "Type" ].value().toInt() ); - name = tqtr( "Special Field: %1" ).tqarg( box->props[ "Type" ].listData()->keys[ idx ].toString() ); + name = tqtr( "Special Field: %1" ).arg( box->props[ "Type" ].listData()->keys[ idx ].toString() ); break; case Kudesigner::Rtti_Line: name = tqtr( "Line" ); @@ -198,7 +198,7 @@ void StructureWidget::selectionMade() { StructureItem * item = static_cast<StructureItem*>( m_items[ *it ] ); item->setBold( true ); - item->tqrepaint(); + item->repaint(); m_selected.append( item ); } } @@ -211,7 +211,7 @@ void StructureWidget::selectionClear() if ( ( *it ) == 0 ) continue; ( *it ) ->setBold( false ); - ( *it ) ->tqrepaint(); + ( *it ) ->repaint(); } m_selected.clear(); } diff --git a/kugar/lib/inputmask.cpp b/kugar/lib/inputmask.cpp index 923323cb..850b7a73 100644 --- a/kugar/lib/inputmask.cpp +++ b/kugar/lib/inputmask.cpp @@ -210,13 +210,13 @@ bool InputMask::isValidInput( TQChar key, TQChar mask ) const TQString InputMask::maskString( uint pos, const TQString &str, bool clear ) const { if ( pos >= ( uint ) m_maxLength ) - return TQString::tqfromLatin1( "" ); + return TQString::fromLatin1( "" ); TQString fill; fill = clear ? clearString( 0, m_maxLength ) : m_text; uint strIndex = 0; - TQString s = TQString::tqfromLatin1( "" ); + TQString s = TQString::fromLatin1( "" ); int i = pos; while ( i < m_maxLength ) { diff --git a/kugar/lib/mlabelobject.cpp b/kugar/lib/mlabelobject.cpp index 6a0db974..fecbd560 100644 --- a/kugar/lib/mlabelobject.cpp +++ b/kugar/lib/mlabelobject.cpp @@ -29,7 +29,7 @@ MLabelObject::MLabelObject() : MReportObject(), xMargin( 0 ), yMargin( 0 ) fontWeight = MLabelObject::Normal; fontItalic = false; - // Set the default tqalignment + // Set the default alignment hAlignment = MLabelObject::Left; vAlignment = MLabelObject::Top; wordWrap = false; @@ -76,13 +76,13 @@ void MLabelObject::setFont( const TQString family, int size, int weight, bool it fontItalic = italic; } -/** Sets the label's horizontal tqalignment */ +/** Sets the label's horizontal alignment */ void MLabelObject::setHorizontalAlignment( int a ) { hAlignment = a; } -/** Sets the label's vertical tqalignment */ +/** Sets the label's vertical alignment */ void MLabelObject::setVerticalAlignment( int a ) { vAlignment = a; @@ -113,7 +113,7 @@ void MLabelObject::draw( TQPainter* p, int xoffset, int yoffset ) p->setFont( font ); TQFontMetrics fm = p->fontMetrics(); - // Set the text tqalignment flags + // Set the text alignment flags //Qt::Horizontal switch ( hAlignment ) @@ -165,7 +165,7 @@ void MLabelObject::copy( const MLabelObject* mLabelObject ) fontWeight = mLabelObject->fontWeight; fontItalic = mLabelObject->fontItalic; - // Copy the label's tqalignment data + // Copy the label's alignment data vAlignment = mLabelObject->vAlignment; hAlignment = mLabelObject->hAlignment; wordWrap = mLabelObject->wordWrap; diff --git a/kugar/lib/mlabelobject.h b/kugar/lib/mlabelobject.h index 2b35f233..3526552e 100644 --- a/kugar/lib/mlabelobject.h +++ b/kugar/lib/mlabelobject.h @@ -27,9 +27,9 @@ class MLabelObject : public MReportObject public: /** Font weight constants */ enum FontWeight { Light = 25, Normal = 50, DemiBold = 63, Bold = 75, Black = 87 }; - /**Qt::Horizontal tqalignment constants */ + /**Qt::Horizontal alignment constants */ enum HAlignment { Left = 0, Center, Right }; - /** Vertial tqalignment constants */ + /** Vertial alignment constants */ enum VAlignment { Top = 0, Middle, Bottom }; /** Constructor */ @@ -52,9 +52,9 @@ protected: int fontWeight; /** Label text font italic flag */ bool fontItalic; - /** Lable text horizontal tqalignment */ + /** Lable text horizontal alignment */ int hAlignment; - /** Label text vertical tqalignment */ + /** Label text vertical alignment */ int vAlignment; /** Label text word wrap flag */ bool wordWrap; @@ -70,9 +70,9 @@ public: virtual void setText( const TQString txt ); /** Sets the label's text font - default is Times,10,Normal,false */ void setFont( const TQString family, int size, int weight, bool italic ); - /** Sets the label's horizontal tqalignment -default is Left */ + /** Sets the label's horizontal alignment -default is Left */ void setHorizontalAlignment( int a ); - /** Sets the label's vertical tqalignment - default is Top */ + /** Sets the label's vertical alignment - default is Top */ void setVerticalAlignment( int a ); /** Sets the label's word wrap flag - default is false */ void setWordWrap( bool state ); diff --git a/kugar/lib/mlineobject.cpp b/kugar/lib/mlineobject.cpp index 2a4a0bc9..abd7927c 100644 --- a/kugar/lib/mlineobject.cpp +++ b/kugar/lib/mlineobject.cpp @@ -14,7 +14,7 @@ namespace Kugar /** Constructor */ MLineObject::MLineObject() : TQObject() { - // Set the object's default tqgeometry + // Set the object's default geometry xpos1 = 0; ypos1 = 0; xpos2 = 0; @@ -104,7 +104,7 @@ void MLineObject::drawBase( TQPainter* p, int xoffset, int yoffset ) Used by the copy constructor and assignment operator */ void MLineObject::copy( const MLineObject* mLineObject ) { - // Copy the object's tqgeometry + // Copy the object's geometry xpos1 = mLineObject->xpos1; ypos1 = mLineObject->ypos1; xpos2 = mLineObject->xpos2; diff --git a/kugar/lib/mpagedisplay.cpp b/kugar/lib/mpagedisplay.cpp index 12eac741..4f4b1869 100644 --- a/kugar/lib/mpagedisplay.cpp +++ b/kugar/lib/mpagedisplay.cpp @@ -45,7 +45,7 @@ void MPageDisplay::setPageDimensions( TQSize size ) // Return the preferred size of the display. -TQSize MPageDisplay::tqsizeHint() const +TQSize MPageDisplay::sizeHint() const { return buffer.size(); } diff --git a/kugar/lib/mpagedisplay.h b/kugar/lib/mpagedisplay.h index 65a419d5..919d8a36 100644 --- a/kugar/lib/mpagedisplay.h +++ b/kugar/lib/mpagedisplay.h @@ -42,7 +42,7 @@ public: /** Sets the page display dimensions */ void setPageDimensions( TQSize size ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSizePolicy sizePolicy() const; protected: diff --git a/kugar/lib/mreportengine.cpp b/kugar/lib/mreportengine.cpp index 4e1544d3..ca747b3e 100644 --- a/kugar/lib/mreportengine.cpp +++ b/kugar/lib/mreportengine.cpp @@ -289,7 +289,7 @@ MPageCollection* MReportEngine::renderReport() // Initialize the basic page data currHeight = pageHeight - ( topMargin + bottomMargin + pFooter.getHeight() ); currPage = 0; - currDate = TQDate::tqcurrentDate(); + currDate = TQDate::currentDate(); // Initialise global report variables unsigned int rowCount = records.length(); @@ -336,7 +336,7 @@ MPageCollection* MReportEngine::renderReport() { // Update status event if ( ( chkRow = ( j / 2 ) % 20 ) == 0 ) - emit signalRendertqStatus( j / 2 ); + emit signalRenderStatus( j / 2 ); // Check for cancel action if ( cancelRender ) @@ -481,7 +481,7 @@ MPageCollection* MReportEngine::renderReport() pages->setPageOrientation( pageOrientation ); // Send final status - emit signalRendertqStatus( rowCount / 2 ); + emit signalRenderStatus( rowCount / 2 ); m_needRegeneration = false; m_pageCollection = pages; return pages; @@ -652,21 +652,21 @@ void MReportEngine::recalcDimensions() recalcAttribute( "LeftMargin", rattributes ); recalcAttribute( "RightMargin", rattributes ); - TQDomNodeList tqchildren = report.childNodes(); - int childCount = tqchildren.length(); + TQDomNodeList children = report.childNodes(); + int childCount = children.length(); for ( int j = 0; j < childCount; j++ ) { - child = tqchildren.item( j ); + child = children.item( j ); TQDomNamedNodeMap attributes = child.attributes(); - TQDomNodeList tqchildren2 = child.childNodes(); - int childCount2 = tqchildren2.length(); + TQDomNodeList children2 = child.childNodes(); + int childCount2 = children2.length(); recalcAttribute( "Height", attributes ); for ( int k = 0; k < childCount2; k++ ) { - TQDomNode child2 = tqchildren2.item( k ); + TQDomNode child2 = children2.item( k ); TQDomNamedNodeMap attributes = child2.attributes(); recalcAttribute( "X", attributes ); recalcAttribute( "Y", attributes ); @@ -685,11 +685,11 @@ void MReportEngine::recalcAttribute( const TQString& name, TQDomNamedNodeMap att { if ( !attributes.namedItem( name ).isNull() ) { - attributes.namedItem( name ).setNodeValue( TQString( "%1" ).tqarg( attributes.namedItem( name ).nodeValue().toInt() * 93 / 81 ) ); + attributes.namedItem( name ).setNodeValue( TQString( "%1" ).arg( attributes.namedItem( name ).nodeValue().toInt() * 93 / 81 ) ); } } -/** Walks the document tree, setting the report tqlayout */ +/** Walks the document tree, setting the report layout */ void MReportEngine::initTemplate() { heightOfDetails = 0; @@ -712,12 +712,12 @@ void MReportEngine::initTemplate() setReportAttributes( &report ); // Get all the child report elements - TQDomNodeList tqchildren = report.childNodes(); - int childCount = tqchildren.length(); + TQDomNodeList children = report.childNodes(); + int childCount = children.length(); for ( int j = 0; j < childCount; j++ ) { - child = tqchildren.item( j ); + child = children.item( j ); if ( child.nodeType() == TQDomNode::ElementNode ) { @@ -748,7 +748,7 @@ void MReportEngine::initTemplate() } } -/** Sets the main tqlayout attributes for the report */ +/** Sets the main layout attributes for the report */ void MReportEngine::setReportAttributes( TQDomNode* report ) { // Get the attributes for the report @@ -792,7 +792,7 @@ int MReportEngine::scaleDeltaHeight( int height ) const return f > 1 ? int( f + 0.5 ) : ceil( f ); } -/** Sets the tqlayout attributes for the given report section */ +/** Sets the layout attributes for the given report section */ void MReportEngine::setSectionAttributes( MReportSection* section, TQDomNode* report ) { // Get the attributes for the section @@ -803,14 +803,14 @@ void MReportEngine::setSectionAttributes( MReportSection* section, TQDomNode* re section->setPrintFrequency( attributes.namedItem( "PrintFrequency" ).nodeValue().toInt() ); // Process the sections labels - TQDomNodeList tqchildren = report->childNodes(); - int childCount = tqchildren.length(); + TQDomNodeList children = report->childNodes(); + int childCount = children.length(); // For each label, extract the attr list and add the new label // to the sections's label collection for ( int j = 0; j < childCount; j++ ) { - TQDomNode child = tqchildren.item( j ); + TQDomNode child = children.item( j ); if ( child.nodeType() == TQDomNode::ElementNode ) { if ( child.nodeName() == "Line" ) @@ -852,7 +852,7 @@ void MReportEngine::setSectionAttributes( MReportSection* section, TQDomNode* re } } -/** Sets the tqlayout attributes for the detail headers and footers */ +/** Sets the layout attributes for the detail headers and footers */ void MReportEngine::setDetMiscAttributes( MReportSection* section, TQDomNode* report ) { // Get the attributes for the section @@ -866,7 +866,7 @@ void MReportEngine::setDetMiscAttributes( MReportSection* section, TQDomNode* re } -/** Sets the tqlayout attributes for the detail section */ +/** Sets the layout attributes for the detail section */ void MReportEngine::setDetailAttributes( TQDomNode* report ) { // Get the attributes for the detail section @@ -881,12 +881,12 @@ void MReportEngine::setDetailAttributes( TQDomNode* report ) detail->setRepeat( attributes.namedItem( "Repeat" ).nodeValue() == "true" ); // Process the report detail labels - TQDomNodeList tqchildren = report->childNodes(); - int childCount = tqchildren.length(); + TQDomNodeList children = report->childNodes(); + int childCount = children.length(); for ( int j = 0; j < childCount; j++ ) { - TQDomNode child = tqchildren.item( j ); + TQDomNode child = children.item( j ); if ( child.nodeType() == TQDomNode::ElementNode ) { if ( child.nodeName() == "Line" ) @@ -923,7 +923,7 @@ void MReportEngine::setDetailAttributes( TQDomNode* report ) details.append( detail ); } -/** Sets a line's tqlayout attributes */ +/** Sets a line's layout attributes */ void MReportEngine::setLineAttributes( MLineObject* line, TQDomNamedNodeMap* attr ) { line->setLine( scaleDeltaWidth( attr->namedItem( "X1" ).nodeValue().toInt() ), @@ -941,7 +941,7 @@ void MReportEngine::setLineAttributes( MLineObject* line, TQDomNamedNodeMap* att line->setStyle( attr->namedItem( "Style" ).nodeValue().toInt() ); } -/** Sets a label's tqlayout attributes */ +/** Sets a label's layout attributes */ void MReportEngine::setLabelAttributes( MLabelObject* label, TQDomNamedNodeMap* attr ) { TQString tmp; @@ -986,7 +986,7 @@ void MReportEngine::setLabelAttributes( MLabelObject* label, TQDomNamedNodeMap* label->setWordWrap( attr->namedItem( "WordWrap" ).nodeValue().toInt() == 0 ? false : true ); } -/** Sets a special field's tqlayout attributes */ +/** Sets a special field's layout attributes */ void MReportEngine::setSpecialAttributes( MSpecialObject* field, TQDomNamedNodeMap* attr ) { field->setType( attr->namedItem( "Type" ).nodeValue().toInt() ); @@ -995,7 +995,7 @@ void MReportEngine::setSpecialAttributes( MSpecialObject* field, TQDomNamedNodeM setLabelAttributes( ( MLabelObject * ) field, attr ); } -/** Sets a field's tqlayout attributes */ +/** Sets a field's layout attributes */ void MReportEngine::setFieldAttributes( MFieldObject* field, TQDomNamedNodeMap* attr ) { field->setFieldName( attr->namedItem( "Field" ).nodeValue() ); @@ -1015,7 +1015,7 @@ void MReportEngine::setFieldAttributes( MFieldObject* field, TQDomNamedNodeMap* setLabelAttributes( ( MLabelObject * ) field, attr ); } -/** Sets a calculated field's tqlayout attributes */ +/** Sets a calculated field's layout attributes */ void MReportEngine::setCalculatedFieldAttributes( MCalcObject* field, TQDomNamedNodeMap* attr ) { field->setCalculationType( attr->namedItem( "CalculationType" ).nodeValue().toInt() ); diff --git a/kugar/lib/mreportengine.h b/kugar/lib/mreportengine.h index 33b651cc..846d0a3a 100644 --- a/kugar/lib/mreportengine.h +++ b/kugar/lib/mreportengine.h @@ -71,7 +71,7 @@ public slots: void slotCancelRendering(); signals: - void signalRendertqStatus( int ); + void signalRenderStatus( int ); void preferedTemplate( const TQString & ); protected: @@ -170,27 +170,27 @@ private: void initData(); void initTemplate(); - /** Sets the main tqlayout attributes for the report */ + /** Sets the main layout attributes for the report */ void setReportAttributes( TQDomNode* report ); int scaleDeltaWidth( int width ) const; int scaleDeltaHeight( int width ) const; - /** Sets the tqlayout attributes for the given report section */ + /** Sets the layout attributes for the given report section */ void setSectionAttributes( MReportSection* section, TQDomNode* report ); - /** Sets the tqlayout attributes for the detail headers and footers */ + /** Sets the layout attributes for the detail headers and footers */ void setDetMiscAttributes( MReportSection* section, TQDomNode* report ); - /** Sets the tqlayout attributes for the detail section */ + /** Sets the layout attributes for the detail section */ void setDetailAttributes( TQDomNode* report ); - /** Sets a line's tqlayout attributes */ + /** Sets a line's layout attributes */ void setLineAttributes( MLineObject* line, TQDomNamedNodeMap* attr ); - /** Sets a label's tqlayout attributes */ + /** Sets a label's layout attributes */ void setLabelAttributes( MLabelObject* label, TQDomNamedNodeMap* attr ); - /** Sets a special field's tqlayout attributes */ + /** Sets a special field's layout attributes */ void setSpecialAttributes( MSpecialObject* field, TQDomNamedNodeMap* attr ); - /** Sets a field's tqlayout attributes */ + /** Sets a field's layout attributes */ void setFieldAttributes( MFieldObject* field, TQDomNamedNodeMap* attr ); - /** Sets a calculated field's tqlayout attributes */ + /** Sets a calculated field's layout attributes */ void setCalculatedFieldAttributes( MCalcObject* field, TQDomNamedNodeMap* attr ); /** Copies member data from one object to another. diff --git a/kugar/lib/mreportobject.cpp b/kugar/lib/mreportobject.cpp index 7fec9dd9..7a9366f6 100644 --- a/kugar/lib/mreportobject.cpp +++ b/kugar/lib/mreportobject.cpp @@ -16,7 +16,7 @@ namespace Kugar /** Constructor */ MReportObject::MReportObject() : TQObject() { - // Set the object's default tqgeometry + // Set the object's default geometry xpos = 0; ypos = 0; width = 40; @@ -166,7 +166,7 @@ void MReportObject::setBorderStyle( int style ) Used by the copy constructor and assignment operator */ void MReportObject::copy( const MReportObject* mReportObject ) { - // Copy the object's tqgeometry + // Copy the object's geometry xpos = mReportObject->xpos; ypos = mReportObject->ypos; width = mReportObject->width; diff --git a/kugar/lib/mreportsection.cpp b/kugar/lib/mreportsection.cpp index 1184d773..b412d332 100644 --- a/kugar/lib/mreportsection.cpp +++ b/kugar/lib/mreportsection.cpp @@ -17,14 +17,14 @@ namespace Kugar /** Constructor */ MReportSection::MReportSection() { - // Set tqgeometry + // Set geometry height = 50; // Set print frequency frequency = MReportSection::EveryPage; // Set special field data - reportDate = TQDate::tqcurrentDate(); + reportDate = TQDate::currentDate(); pageNumber = 0; // Set the line list to AutoDelete @@ -293,7 +293,7 @@ void MReportSection::drawObjects( TQPainter* p, int xoffset, int yoffset ) Used by the copy constructor and assignment operator */ void MReportSection::copy( const MReportSection* mReportSection ) { - // Copy the section's tqgeometry + // Copy the section's geometry height = mReportSection->height; // Copy the print frequency diff --git a/kugar/lib/mreportviewer.cpp b/kugar/lib/mreportviewer.cpp index a3fd9ab5..5cbacf58 100644 --- a/kugar/lib/mreportviewer.cpp +++ b/kugar/lib/mreportviewer.cpp @@ -38,7 +38,7 @@ void MReportViewer::init() scroller = new TQScrollView( this ); // Connect the rendering update signal and slot - connect( rptEngine, TQT_SIGNAL( signalRendertqStatus( int ) ), + connect( rptEngine, TQT_SIGNAL( signalRenderStatus( int ) ), TQT_SLOT( slotRenderProgress( int ) ) ); connect( rptEngine, TQT_SIGNAL( preferedTemplate( const TQString & ) ), @@ -175,7 +175,7 @@ void MReportViewer::slotFirstPage() if ( ( page = report->getFirstPage() ) != 0 ) { display->setPage( page ); - display->tqrepaint(); + display->repaint(); } } @@ -192,7 +192,7 @@ void MReportViewer::slotNextPage() if ( ( page = report->getNextPage() ) != 0 ) { display->setPage( page ); - display->tqrepaint(); + display->repaint(); } else report->setCurrentPage( index ); @@ -211,7 +211,7 @@ void MReportViewer::slotPrevPage() if ( ( page = report->getPreviousPage() ) != 0 ) { display->setPage( page ); - display->tqrepaint(); + display->repaint(); } else report->setCurrentPage( index ); @@ -228,7 +228,7 @@ void MReportViewer::slotLastPage() if ( ( page = report->getLastPage() ) != 0 ) { display->setPage( page ); - display->tqrepaint(); + display->repaint(); } } @@ -273,9 +273,9 @@ void MReportViewer::slotRenderProgress( int p ) // Return the preferred size. -TQSize MReportViewer::tqsizeHint() const +TQSize MReportViewer::sizeHint() const { - return scroller -> tqsizeHint(); + return scroller -> sizeHint(); } void MReportViewer::printReport( KPrinter &printer ) diff --git a/kugar/lib/mreportviewer.h b/kugar/lib/mreportviewer.h index 599e22db..ca47b12b 100644 --- a/kugar/lib/mreportviewer.h +++ b/kugar/lib/mreportviewer.h @@ -59,7 +59,7 @@ public: void setupPrinter( KPrinter &printer ); void printReportSilent( int printFrom = -1, int printTo = -1, int printCopies = -1, TQString printerName = TQString() ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; public slots: void slotFirstPage(); diff --git a/kugar/lib/mutil.cpp b/kugar/lib/mutil.cpp index f70b67bf..e53c1ef2 100644 --- a/kugar/lib/mutil.cpp +++ b/kugar/lib/mutil.cpp @@ -40,40 +40,40 @@ TQString MUtil::formatDate( const TQDate& value, int format ) switch ( format ) { case MUtil::MDY_SLASH: - string = TQString( "%1/%2/%3" ).tqarg( value.month() ).tqarg( value.day() ).tqarg( year ); + string = TQString( "%1/%2/%3" ).arg( value.month() ).arg( value.day() ).arg( year ); break; case MUtil::MDY_DASH: - string = TQString( "%1-%2-%3" ).tqarg( value.month() ).tqarg( value.day() ).tqarg( year ); + string = TQString( "%1-%2-%3" ).arg( value.month() ).arg( value.day() ).arg( year ); break; case MUtil::MMDDY_SLASH: - string = TQString( "%1/%2/%3" ).tqarg( month ).tqarg( day ).tqarg( year ); + string = TQString( "%1/%2/%3" ).arg( month ).arg( day ).arg( year ); break; case MUtil::MMDDY_DASH: - string = TQString( "%1-%2-%3" ).tqarg( month ).tqarg( day ).tqarg( year ); + string = TQString( "%1-%2-%3" ).arg( month ).arg( day ).arg( year ); break; case MUtil::MDYYYY_SLASH: - string = TQString( "%1/%2/%3" ).tqarg( value.month() ).tqarg( value.day() ).tqarg( value.year() ); + string = TQString( "%1/%2/%3" ).arg( value.month() ).arg( value.day() ).arg( value.year() ); break; case MUtil::MDYYYY_DASH: - string = TQString( "%1-%2-%3" ).tqarg( value.month() ).tqarg( value.day() ).tqarg( value.year() ); + string = TQString( "%1-%2-%3" ).arg( value.month() ).arg( value.day() ).arg( value.year() ); break; case MUtil::MMDDYYYY_SLASH: - string = TQString( "%1/%2/%3" ).tqarg( month ).tqarg( day ).tqarg( value.year() ); + string = TQString( "%1/%2/%3" ).arg( month ).arg( day ).arg( value.year() ); break; case MUtil::MMDDYYYY_DASH: - string = TQString( "%1-%2-%3" ).tqarg( month ).tqarg( day ).tqarg( value.year() ); + string = TQString( "%1-%2-%3" ).arg( month ).arg( day ).arg( value.year() ); break; case MUtil::YYYYMD_SLASH: - string = TQString( "%1/%2/%3" ).tqarg( value.year() ).tqarg( value.month() ).tqarg( value.day() ); + string = TQString( "%1/%2/%3" ).arg( value.year() ).arg( value.month() ).arg( value.day() ); break; case MUtil::YYYYMD_DASH: - string = TQString( "%1-%2-%3" ).tqarg( value.year() ).tqarg( value.month() ).tqarg( value.day() ); + string = TQString( "%1-%2-%3" ).arg( value.year() ).arg( value.month() ).arg( value.day() ); break; case MUtil::DDMMYY_PERIOD: - string = TQString( "%1.%2.%3" ).tqarg( day ).tqarg( month ).tqarg( year ); + string = TQString( "%1.%2.%3" ).arg( day ).arg( month ).arg( year ); break; case MUtil::DDMMYYYY_PERIOD: - string = TQString( "%1.%2.%3" ).tqarg( day ).tqarg( month ).tqarg( value.year() ); + string = TQString( "%1.%2.%3" ).arg( day ).arg( month ).arg( value.year() ); break; default: string = value.toString(); diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp index 38ac5257..894dd1eb 100644 --- a/kugar/part/kugar_part.cpp +++ b/kugar/part/kugar_part.cpp @@ -89,19 +89,19 @@ bool KugarPart::loadXML( TQIODevice *file, const TQDomDocument & /*doc*/ ) } } if ( !ok ) - KMessageBox::sorry( 0, i18n( "Invalid data file %1" ).tqarg( m_file ) ); + KMessageBox::sorry( 0, i18n( "Invalid data file %1" ).arg( m_file ) ); } else { ok = false; - KMessageBox::sorry( 0, i18n( "The zero sized data file %1 can't be rendered" ).tqarg( m_file ) ); + KMessageBox::sorry( 0, i18n( "The zero sized data file %1 can't be rendered" ).arg( m_file ) ); } } else { ok = false; - KMessageBox::sorry( 0, i18n( "Unable to open data file: %1" ).tqarg( m_file ) ); + KMessageBox::sorry( 0, i18n( "Unable to open data file: %1" ).arg( m_file ) ); } return ok; @@ -166,7 +166,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl ) if ( KIO::NetAccess::download( tmpURL, localtpl ) ) isTemp = true; else - KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).tqarg( url.prettyURL() ) ); + KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).arg( url.prettyURL() ) ); } else localtpl = tpl; @@ -183,7 +183,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl ) if ( KIO::NetAccess::download( tmpURL, localtpl ) ) isTemp = true; else - KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).tqarg( url.prettyURL() ) ); + KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).arg( url.prettyURL() ) ); } } } @@ -192,7 +192,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl ) if ( KIO::NetAccess::download( url, localtpl ) ) isTemp = true; else - KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).tqarg( url.prettyURL() ) ); + KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).arg( url.prettyURL() ) ); } /* kdDebug() << "localtpl: " << localtpl.latin1() << endl;*/ @@ -215,7 +215,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl ) /* kdDebug() << "RawXML" << endl;*/ f.open( IO_ReadOnly ); if ( !m_reportEngine -> setReportTemplate( TQT_TQIODEVICE(&f) ) ) - KMessageBox::sorry( 0, i18n( "Invalid template file: %1" ).tqarg( localtpl ) ); + KMessageBox::sorry( 0, i18n( "Invalid template file: %1" ).arg( localtpl ) ); else { m_templateOk = true; @@ -229,13 +229,13 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl ) if ( tmpStore->open( "maindoc.xml" ) ) { if ( !m_reportEngine -> setReportTemplate( tmpStore->device() ) ) - KMessageBox::sorry( 0, i18n( "%1 is not a valid Kugar Designer template file." ).tqarg( localtpl ) ); + KMessageBox::sorry( 0, i18n( "%1 is not a valid Kugar Designer template file." ).arg( localtpl ) ); else m_templateOk = true; tmpStore->close(); } else - KMessageBox::sorry( 0, i18n( "%1 is not a valid Kugar Designer template file." ).tqarg( localtpl ) ); + KMessageBox::sorry( 0, i18n( "%1 is not a valid Kugar Designer template file." ).arg( localtpl ) ); delete tmpStore; } @@ -244,12 +244,12 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl ) else { f.close(); - KMessageBox::sorry( 0, i18n( "Couldn't read the beginning of the template file: %1" ).tqarg( localtpl ) ); + KMessageBox::sorry( 0, i18n( "Couldn't read the beginning of the template file: %1" ).arg( localtpl ) ); } } else - KMessageBox::sorry( 0, i18n( "Unable to open template file: %1" ).tqarg( localtpl ) ); + KMessageBox::sorry( 0, i18n( "Unable to open template file: %1" ).arg( localtpl ) ); if ( isTemp ) KIO::NetAccess::removeTempFile( localtpl ); diff --git a/kugar/part/kugar_view.cpp b/kugar/part/kugar_view.cpp index ddd8dfe1..631bbe1d 100644 --- a/kugar/part/kugar_view.cpp +++ b/kugar/part/kugar_view.cpp @@ -15,7 +15,7 @@ #include <tqfile.h> #include <kglobal.h> #include <kiconloader.h> -#include <tqlayout.h> +#include <layout.h> #if defined(HAVE_CONFIG_H) #include "config.h" @@ -90,12 +90,12 @@ bool KugarPart::openFile() ok = true; } else - KMessageBox::sorry( this, i18n( "Invalid data file: %1" ).tqarg( m_file ) ); + KMessageBox::sorry( this, i18n( "Invalid data file: %1" ).arg( m_file ) ); f.close(); } else - KMessageBox::sorry( this, i18n( "Unable to open data file: %1" ).tqarg( m_file ) ); + KMessageBox::sorry( this, i18n( "Unable to open data file: %1" ).arg( m_file ) ); return ok; } diff --git a/kword/DESIGN b/kword/DESIGN index a920c8db..6a01ae28 100644 --- a/kword/DESIGN +++ b/kword/DESIGN @@ -38,7 +38,7 @@ cell, we contain the cells in their own KWTextFrameset. is defined by m_zOrder in KWFrame. This number is relative to the other frames *on the same page*. -Frame tqlayout and pages +Frame layout and pages ====================== Generally, the user is free to position frames where he/she wants to. @@ -63,10 +63,10 @@ In WP mode, removing pages is automatically done by KWDocument::tryRemovingPages In DTP mode pages are user-controlled (insert and delete page actions), but overflowing text can still create a new page as well. -The difficulty with frame tqlayout is that in most cases the frame size and -number depends on the text inside, and the text tqlayout depends on the frames -(frame width, frames on top, etc.). This is why text tqlayout (formatMore()) -and frame tqlayout (e.g. KWFrameLayout) often call each other, resulting in +The difficulty with frame layout is that in most cases the frame size and +number depends on the text inside, and the text layout depends on the frames +(frame width, frames on top, etc.). This is why text layout (formatMore()) +and frame layout (e.g. KWFrameLayout) often call each other, resulting in infinite loops when some code goes wrong. Editing diff --git a/kword/HACKING b/kword/HACKING index c808ac27..440da6bd 100644 --- a/kword/HACKING +++ b/kword/HACKING @@ -59,7 +59,7 @@ DIRECTORIES: various QTSQL interface implementation files to handle table selection and mailmerge data templates: - various page tqlayout templates + various page layout templates make_template.pl - Perl script to create XML templates - from KWord-saved XML files subdirectories @@ -89,7 +89,7 @@ FILES: main.cc - the main kwaboutdata.h - the appname, authors... - shared between main.cc and kwfactory.cc - kword.rc - xml-gui tqlayout + kword.rc - xml-gui layout kword.desktop - application .desktop file main document data structures: @@ -154,7 +154,7 @@ FILES: framedia.h/cc - frame dialog kwframe.h/cc - frame, framesets (picture/formula/...), - framesetedit objects for editing framesets - kwframetqlayout.h/cc - the frame tqlayout engine for headers/main + kwframelayout.h/cc - the frame layout engine for headers/main frames/footers/footnotes. (this is a helper for KWDoc::recalcFrames) kwtextframeset.h/cc - text frameset diff --git a/kword/KWAnchor.cpp b/kword/KWAnchor.cpp index 11136e3d..a291999e 100644 --- a/kword/KWAnchor.cpp +++ b/kword/KWAnchor.cpp @@ -70,7 +70,7 @@ void KWAnchor::finalize() void KWAnchor::draw( TQPainter* p, int x, int y, int cx, int cy, int cw, int ch, const TQColorGroup& cg, bool selected ) { // (x,y) is the position of the inline item (in Layout Units) - // (cx,cy,cw,ch) is the rectangle to be painted, in tqlayout units too + // (cx,cy,cw,ch) is the rectangle to be painted, in layout units too if ( m_deleted ) return; @@ -234,7 +234,7 @@ void KWAnchor::resize() if ( parag ) { kdDebug(32001) << "KWAnchor::resize invalidating parag " << parag->paragId() << endl; - parag->tqinvalidate( 0 ); + parag->invalidate( 0 ); } } } diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index fdd6eb6b..5b15914b 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -40,7 +40,7 @@ #include <tqbuffer.h> #include <tqtimer.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqprogressdialog.h> #include <tqobjectlist.h> #include <tqapplication.h> @@ -201,7 +201,7 @@ void KWCanvas::repaintChanged( KWFrameSet * fs, bool resetChanged ) void KWCanvas::repaintAll( bool erase /* = false */ ) { //kdDebug(32002) << "KWCanvas::repaintAll erase=" << erase << endl; - viewport()->tqrepaint( erase ); + viewport()->repaint( erase ); } void KWCanvas::viewportResizeEvent( TQResizeEvent * ) @@ -305,7 +305,7 @@ void KWCanvas::drawFrameSet( KWFrameSet * frameset, TQPainter * painter, if ( painter->device()->devType() == TQInternal::Printer ) focus = false; - TQColorGroup gb = TQApplication::tqpalette().active(); + TQColorGroup gb = TQApplication::palette().active(); if ( focus && m_currentFrameSetEdit && frameset == m_currentFrameSetEdit->frameSet() ) // Currently edited frameset m_currentFrameSetEdit->drawContents( painter, crect, gb, onlyChanged, resetChanged, viewMode, m_frameViewManager ); @@ -543,9 +543,9 @@ void KWCanvas::contentsMousePressEvent( TQMouseEvent *e ) if ( e->button() == Qt::MidButton ) { if ( m_doc->isReadWrite() && m_currentFrameSetEdit && m_mouseMode == MM_EDIT ) { - TQApplication::tqclipboard()->setSelectionMode( true ); + TQApplication::clipboard()->setSelectionMode( true ); m_currentFrameSetEdit->paste(); - TQApplication::tqclipboard()->setSelectionMode( false ); + TQApplication::clipboard()->setSelectionMode( false ); } } else if ( e->button() == Qt::RightButton ) { @@ -1032,7 +1032,7 @@ void KWCanvas::mrCreateTable() emit docStructChanged(Tables); } m_doc->updateAllFrames(); - m_doc->tqlayout(); + m_doc->layout(); repaintAll(); } @@ -1751,7 +1751,7 @@ bool KWCanvas::eventFilter( TQObject *o, TQEvent *e ) break; case TQt::Key_M: // 'M' -> mark debug output { - const TQDateTime dtMark ( TQDateTime::tqcurrentDateTime() ); + const TQDateTime dtMark ( TQDateTime::currentDateTime() ); kdDebug(32002) << "Developer mark: " << dtMark.toString("yyyy-MM-dd hh:mm:ss,zzz") << endl; keyev->accept(); break; @@ -2231,7 +2231,7 @@ void FrameResizePolicy::handleMouseMove(TQt::ButtonState keyState, const KoPoint sizeRect.setX( TQMAX(0, sizeRect.x()) ); // otherwise it would get wider than the page } - // each frame in m_frames should be retqshaped from the original size stored in the + // each frame in m_frames should be reshaped from the original size stored in the // m_frameResize data to a size that equals the reshaping of m_boundingrect to sizeRect class Converter { public: diff --git a/kword/KWCanvas.h b/kword/KWCanvas.h index 955ea605..5283db0a 100644 --- a/kword/KWCanvas.h +++ b/kword/KWCanvas.h @@ -25,7 +25,7 @@ #include <kprinter.h> #include <KoRect.h> #include <tqscrollview.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <KoRichText.h> #include <KoQueryTrader.h> #include <KoPicture.h> @@ -76,13 +76,13 @@ public: void repaintAll( bool erase = false ); /** - * Only tqrepaint the frameset @p fs. + * Only repaint the frameset @p fs. * @p resetChanged should only be true for the last view * (see KWFrameSet::drawContents) */ void repaintChanged( KWFrameSet * fs, bool resetChanged ); - /** We need to tqrepaint if the window is resized. */ + /** We need to repaint if the window is resized. */ void viewportResizeEvent( TQResizeEvent * ); void print( TQPainter *painter, KPrinter *printer ); diff --git a/kword/KWCommand.cpp b/kword/KWCommand.cpp index 47fda3e6..20a4c918 100644 --- a/kword/KWCommand.cpp +++ b/kword/KWCommand.cpp @@ -145,14 +145,14 @@ KoTextCursor * KWPasteTextCommand::execute( KoTextCursor *c ) break; } TQDomElement paragElem = *it; - // First line (if appending to non-empty line) : apply offset to formatting, don't apply parag tqlayout + // First line (if appending to non-empty line) : apply offset to formatting, don't apply parag layout if ( item == 0 && m_idx > 0 ) { // First load the default format, but only apply it to our new chars - TQDomElement tqlayout = paragElem.namedItem( "LAYOUT" ).toElement(); - if ( !tqlayout.isNull() ) + TQDomElement layout = paragElem.namedItem( "LAYOUT" ).toElement(); + if ( !layout.isNull() ) { - TQDomElement formatElem = tqlayout.namedItem( "FORMAT" ).toElement(); + TQDomElement formatElem = layout.namedItem( "FORMAT" ).toElement(); if ( !formatElem.isNull() ) { KoTextFormat f = parag->loadFormat( formatElem, 0L, TQFont(), KGlobal::locale()->language(),false ); @@ -167,7 +167,7 @@ KoTextCursor * KWPasteTextCommand::execute( KoTextCursor *c ) } else { - if ( item == 0 ) // This paragraph existed, store its parag tqlayout + if ( item == 0 ) // This paragraph existed, store its parag layout { delete m_oldParagLayout; m_oldParagLayout = new KoParagLayout( parag->paragLayout() ); @@ -179,7 +179,7 @@ KoTextCursor * KWPasteTextCommand::execute( KoTextCursor *c ) parag->setFormat( 0, len, parag->paragFormat(), TRUE ); parag->loadFormatting( paragElem, 0, (textFs->isMainFrameset()) ); } - parag->tqinvalidate(0); // the formatting will be done by caller (either KWTextFrameSet::pasteOasis or KoTextObject::undo/redo) + parag->invalidate(0); // the formatting will be done by caller (either KWTextFrameSet::pasteOasis or KoTextObject::undo/redo) parag->setChanged( TRUE ); parag = static_cast<KWTextParag *>(parag->next()); //kdDebug() << "KWPasteTextCommand::execute going to next parag: " << parag << endl; @@ -913,7 +913,7 @@ KWFrameMoveCommand::KWFrameMoveCommand( const TQString &name, void KWFrameMoveCommand::execute() { - bool needRetqlayout = false; + bool needRelayout = false; KWDocument * doc = 0L; TQValueList<FrameMoveStruct>::Iterator moveIt = m_frameMove.begin(); TQValueList<FrameIndex>::Iterator tmp = m_indexFrame.begin(); @@ -925,13 +925,13 @@ void KWFrameMoveCommand::execute() frame->moveTopLeft( (*moveIt).newPos ); frame->updateRulerHandles(); - needRetqlayout = needRetqlayout || ( frame->runAround() != KWFrame::RA_NO ); + needRelayout = needRelayout || ( frame->runAround() != KWFrame::RA_NO ); } if ( doc ) { doc->updateAllFrames(); - if ( needRetqlayout ) - doc->tqlayout(); + if ( needRelayout ) + doc->layout(); doc->updateRulerFrameStartEnd(); doc->repaintAllViews(); @@ -940,7 +940,7 @@ void KWFrameMoveCommand::execute() void KWFrameMoveCommand::unexecute() { - bool needRetqlayout = false; + bool needRelayout = false; KWDocument * doc = 0L; TQValueList<FrameMoveStruct>::Iterator moveIt = m_frameMove.begin(); TQValueList<FrameIndex>::Iterator tmp = m_indexFrame.begin(); @@ -952,14 +952,14 @@ void KWFrameMoveCommand::unexecute() frame->moveTopLeft( (*moveIt).oldPos ); frame->updateRulerHandles(); - needRetqlayout = needRetqlayout || ( frame->runAround() != KWFrame::RA_NO ); + needRelayout = needRelayout || ( frame->runAround() != KWFrame::RA_NO ); } if ( doc ) { doc->updateAllFrames(); - if ( needRetqlayout ) - doc->tqlayout(); + if ( needRelayout ) + doc->layout(); doc->updateRulerFrameStartEnd(); doc->repaintAllViews(); } @@ -995,7 +995,7 @@ void KWFramePropertiesCommand::execute() { doc->frameChanged( frame ); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); doc->repaintAllViews(); doc->updateRulerFrameStartEnd(); } @@ -1016,7 +1016,7 @@ void KWFramePropertiesCommand::unexecute() { doc->frameChanged( frame ); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); doc->repaintAllViews(); doc->updateRulerFrameStartEnd(); } @@ -1226,7 +1226,7 @@ void KWDeleteTableCommand::execute() doc->refreshDocStructure((int)Tables); doc->updateAllFrames(); m_pTable->updateFrames(); // not in the doc list anymore, so the above call didn't do it! - doc->tqlayout(); + doc->layout(); doc->repaintAllViews(); doc->updateRulerFrameStartEnd(); @@ -1240,7 +1240,7 @@ void KWDeleteTableCommand::unexecute() doc->addFrameSet(m_pTable); doc->refreshDocStructure((int)Tables); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); doc->repaintAllViews(); doc->updateRulerFrameStartEnd(); } @@ -1284,7 +1284,7 @@ void KWInsertColumnCommand::execute() } Q_ASSERT(m_pTable->boundingRect().right() <= m_maxRight); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); doc->repaintAllViews(); } @@ -1300,7 +1300,7 @@ void KWInsertColumnCommand::unexecute() m_pTable->resizeWidth(m_oldWidth); } doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); doc->repaintAllViews(); } @@ -1332,7 +1332,7 @@ void KWInsertRowCommand::execute() m_pTable->insertNewRow(m_rowPos); //only happens the first time } doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); doc->repaintAllViews(); } @@ -1345,7 +1345,7 @@ void KWInsertRowCommand::unexecute() m_pTable->deleteRow( m_rowPos, *m_rr); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); } @@ -1372,7 +1372,7 @@ void KWRemoveRowCommand::execute() m_pTable->deleteRow( m_rowPos, *m_rr); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); } void KWRemoveRowCommand::unexecute() @@ -1381,7 +1381,7 @@ void KWRemoveRowCommand::unexecute() KWDocument * doc = m_pTable->kWordDocument(); m_pTable->reInsertRow(*m_rr); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); doc->repaintAllViews(); } @@ -1407,7 +1407,7 @@ void KWRemoveColumnCommand::execute() m_pTable->deleteColumn( m_colPos, *m_rc); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); } void KWRemoveColumnCommand::unexecute() @@ -1416,7 +1416,7 @@ void KWRemoveColumnCommand::unexecute() KWDocument * doc = m_pTable->kWordDocument(); m_pTable->reInsertColumn(*m_rc); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); doc->repaintAllViews(); } @@ -1441,7 +1441,7 @@ void KWSplitCellCommand::execute() //kdDebug()<<"split Cell m_colBegin :"<<m_colBegin<<" m_colEnd :"<<m_colEnd<<" m_rowBegin :"<<m_rowBegin<<" m_colEnd :"<<m_colEnd<<endl; m_pTable->splitCell(m_rowEnd, m_colEnd,m_colBegin,m_rowBegin,m_ListFrameSet); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); } void KWSplitCellCommand::unexecute() @@ -1478,7 +1478,7 @@ void KWSplitCellCommand::unexecute() m_rowBegin+m_rowEnd-1+cell->rowSpan()-1); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); } @@ -1507,7 +1507,7 @@ void KWJoinCellCommand::execute() doc->terminateEditing(m_pTable); m_pTable->joinCells(m_colBegin,m_rowBegin,m_colEnd,m_rowEnd); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); } void KWJoinCellCommand::unexecute() @@ -1517,7 +1517,7 @@ void KWJoinCellCommand::unexecute() doc->terminateEditing(m_pTable); m_pTable->splitCell(m_rowEnd-m_rowBegin+1, m_colEnd-m_colBegin+1,m_colBegin,m_rowBegin,m_ListFrameSet,m_copyFrame); doc->updateAllFrames(); - doc->tqlayout(); + doc->layout(); } @@ -1746,7 +1746,7 @@ KWInsertRemovePageCommand::~KWInsertRemovePageCommand() { TQString KWInsertRemovePageCommand::name() const { return m_cmd == Insert ? i18n("Insert Page") // problem with after/before page - : i18n("Delete Page %1").tqarg(m_pgNum); + : i18n("Delete Page %1").arg(m_pgNum); } void KWInsertRemovePageCommand::execute() { @@ -1977,7 +1977,7 @@ void KWChangeFootNoteParametersCommand::changeVariableParameter( FootNoteParamet if ( m_var->numberingType()== KWFootNoteVariable::Manual) { m_var->resize(); - m_var->paragraph()->tqinvalidate(0); + m_var->paragraph()->invalidate(0); m_var->paragraph()->setChanged( true ); } @@ -1986,7 +1986,7 @@ void KWChangeFootNoteParametersCommand::changeVariableParameter( FootNoteParamet if ( frameset) frameset->renumberFootNotes(); - // Re-tqlayout the footnote/endnote frame + // Re-layout the footnote/endnote frame KWFrame* footNoteFrame = m_var->frameSet()->frame( 0 ); int framePage = footNoteFrame->pageNumber(); m_doc->recalcFrames( framePage, -1 ); @@ -2061,14 +2061,14 @@ KWResizeColumnCommand::KWResizeColumnCommand( KWTableFrameSet *table, int col, d void KWResizeColumnCommand::execute() { m_table->resizeColumn(m_col, m_newSize); - m_table->kWordDocument()->tqlayout(); + m_table->kWordDocument()->layout(); m_table->kWordDocument()->repaintAllViews(); } void KWResizeColumnCommand::unexecute() { m_table->resizeColumn(m_col, m_oldSize); - m_table->kWordDocument()->tqlayout(); + m_table->kWordDocument()->layout(); m_table->kWordDocument()->repaintAllViews(); } diff --git a/kword/KWCommand.h b/kword/KWCommand.h index 7c905fb3..71d13f1f 100644 --- a/kword/KWCommand.h +++ b/kword/KWCommand.h @@ -380,7 +380,7 @@ protected: bool m_oldValue; }; -///////////////////////////////tqlayout command/////////////////////////// +///////////////////////////////layout command/////////////////////////// struct KWPageLayoutStruct { KWPageLayoutStruct( const KoPageLayout& pgLayout, const KoColumns& cl, const KoKWHeaderFooter& hf ) : _pgLayout(pgLayout), _cl(cl), _hf(hf) { @@ -391,7 +391,7 @@ struct KWPageLayoutStruct { }; /** - * Command created when changing the page tqlayout + * Command created when changing the page layout */ class KWPageLayoutCommand : public KNamedCommand { diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp index 977ff322..82db66e8 100644 --- a/kword/KWConfig.cpp +++ b/kword/KWConfig.cpp @@ -36,7 +36,7 @@ #include <tqpushbutton.h> #include <tqlistbox.h> #include <tqlineedit.h> -#include <tqlayout.h> +#include <layout.h> #include "KWConfig.h" #include "KWView.h" @@ -75,7 +75,7 @@ using namespace KSpell2; // (Note: KDialogBase should have version of the methods that take a TQString for the icon name) static inline TQPixmap loadIcon( const char * name ) { return KGlobal::instance()->iconLoader() - ->loadIcon( TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); + ->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); } KWConfig::KWConfig( KWView* parent ) @@ -217,7 +217,7 @@ ConfigureSpellPage::ConfigureSpellPage( KWView *view, TQVBox *box, char *name ) config = KWFactory::instance()->config(); m_spellConfigWidget = new ConfigWidget( view->broker(), box ); m_spellConfigWidget->setBackgroundCheckingButtonShown( true ); - m_spellConfigWidget->tqlayout()->setMargin( 0 ); + m_spellConfigWidget->layout()->setMargin( 0 ); } void ConfigureSpellPage::apply() @@ -655,7 +655,7 @@ KCommand *ConfigureMiscPage::apply() } if ( needRepaint ) { - doc->tqlayout(); + doc->layout(); doc->repaintAllViews(); } return macroCmd; @@ -803,7 +803,7 @@ ConfigureDefaultDocPage::ConfigureDefaultDocPage( KWView *view, TQVBox *box, cha labelStartingPage->setBuddy( m_variableNumberOffset ); TQHBox* hbTabStop = new TQHBox( gbDocumentSettings ); - tabStop = new TQLabel(i18n("Tab stop (%1):").tqarg(doc->unitName()), hbTabStop); + tabStop = new TQLabel(i18n("Tab stop (%1):").arg(doc->unitName()), hbTabStop); m_tabStopWidth = new KoUnitDoubleSpinBox( hbTabStop, MM_TO_POINT(2), doc->pageManager()->page(doc->startPage())->width(), diff --git a/kword/KWConfigFootNoteDia.cpp b/kword/KWConfigFootNoteDia.cpp index 8cfa8975..e0bf26de 100644 --- a/kword/KWConfigFootNoteDia.cpp +++ b/kword/KWConfigFootNoteDia.cpp @@ -35,7 +35,7 @@ #include <tqvbuttongroup.h> #include <tqlabel.h> #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcombobox.h> @@ -81,8 +81,8 @@ void KWConfigFootNoteDia::setupTab3() "of the three alignments."); TQWhatsThis::add(positionGroupBox, comment); positionGroupBox->setColumnLayout(0, Qt::Vertical ); - TQVBoxLayout *positionLayout = new TQVBoxLayout( positionGroupBox->tqlayout() ); - positionLayout->tqsetAlignment( TQt::AlignTop ); + TQVBoxLayout *positionLayout = new TQVBoxLayout( positionGroupBox->layout() ); + positionLayout->setAlignment( TQt::AlignTop ); // i18n context information necessary for gender considerations (e.g. in Polish) rbPosLeft = new TQRadioButton( i18n("Position", "Left"), positionGroupBox, "rbPosLeft" ); @@ -106,35 +106,35 @@ void KWConfigFootNoteDia::setupTab3() break; } - TQGridLayout *tqlayout = new TQGridLayout( 0, 1, 1, 0, KDialog::spacingHint()); + TQGridLayout *layout = new TQGridLayout( 0, 1, 1, 0, KDialog::spacingHint()); spWidth = new KoUnitDoubleSpinBox(page, 0, 5, 0.5, m_doc->footNoteSeparatorLineWidth(), m_doc->unit(), 1); - tqlayout->addWidget( spWidth, 1, 1 ); + layout->addWidget( spWidth, 1, 1 ); spLength = new KIntNumInput( page, "spLength" ); spLength->setRange( 1, 100, 1,false ); spLength->setValue( m_doc->footNoteSeparatorLineLength()); spLength->setSuffix(i18n(" %")); - tqlayout->addWidget( spLength, 0, 1 ); + layout->addWidget( spLength, 0, 1 ); TQLabel *lSize = new TQLabel( i18n( "&Width:"), page ); lSize->setBuddy( spWidth ); comment= i18n ("The width is the thickness of the separator line, set to 0 for no separator line."); TQWhatsThis::add(lSize, comment); TQWhatsThis::add(spWidth, comment); - tqlayout->addWidget( lSize, 1, 0 ); + layout->addWidget( lSize, 1, 0 ); TQSpacerItem* spacer = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - tqlayout->addMultiCell( spacer, 0, 1, 2, 2 ); + layout->addMultiCell( spacer, 0, 1, 2, 2 ); TQLabel *lWidth = new TQLabel( i18n("&Size on page:"), page, "lWidth" ); lWidth->setBuddy( spLength ); comment= i18n ("The size of the separator line can be defined as a percentage of the width of the page."); TQWhatsThis::add(spLength, comment); TQWhatsThis::add(lWidth, comment); - tqlayout->addWidget( lWidth, 0, 0 ); - pageLayout->addLayout( tqlayout ); + layout->addWidget( lWidth, 0, 0 ); + pageLayout->addLayout( layout ); TQHBoxLayout *styleLayout = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "styleLayout"); diff --git a/kword/KWCreateBookmarkDia.cpp b/kword/KWCreateBookmarkDia.cpp index 131192e9..1c802156 100644 --- a/kword/KWCreateBookmarkDia.cpp +++ b/kword/KWCreateBookmarkDia.cpp @@ -20,7 +20,7 @@ #include <klocale.h> #include "KWDocument.h" #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqlistbox.h> diff --git a/kword/KWCreateBookmarkDiaBase.ui b/kword/KWCreateBookmarkDiaBase.ui index 0d164ed4..e789ac28 100644 --- a/kword/KWCreateBookmarkDiaBase.ui +++ b/kword/KWCreateBookmarkDiaBase.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> diff --git a/kword/KWDeleteDia.cpp b/kword/KWDeleteDia.cpp index 12f7b3b5..aec0eebf 100644 --- a/kword/KWDeleteDia.cpp +++ b/kword/KWDeleteDia.cpp @@ -24,7 +24,7 @@ #include <klocale.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> KWDeleteDia::KWDeleteDia( KWView *parent, KWTableFrameSet *table, DeleteType type, TQValueList<uint> remove) : KDialogBase( Plain, (type==deleteRow?i18n("Delete Row") : i18n("Delete Column")), Ok | Cancel, Ok, parent, "Delete Table items dialog", true ) @@ -58,7 +58,7 @@ void KWDeleteDia::setupTab1() { message = m_type == deleteRow ? i18n("Delete all selected rows?") : i18n("Delete all selected cells?"); else if ( count == 1 ) { message = m_type == deleteRow ? i18n( "Delete row number %1?" ) : i18n( "Delete column number %1?" ); - message = message.tqarg( m_toRemove.first() + 1 ); // +1 because humans count from 1 + message = message.arg( m_toRemove.first() + 1 ); // +1 because humans count from 1 } else { message = m_type == deleteRow ? i18n( "Delete rows: %1 ?" ) : i18n( "Delete columns: %1 ?" ); @@ -70,12 +70,12 @@ void KWDeleteDia::setupTab1() { rows += ", "; rows += TQString().setNum((*items) +1); } - message = message.tqarg( rows ); + message = message.arg( rows ); } TQLabel *rc = new TQLabel( message , tab1 ); - rc->resize( rc->tqsizeHint() ); - rc->tqsetAlignment( AlignLeft | AlignBottom ); + rc->resize( rc->sizeHint() ); + rc->setAlignment( AlignLeft | AlignBottom ); grid1->addWidget( rc, 1, 0 ); } diff --git a/kword/KWDocStruct.cpp b/kword/KWDocStruct.cpp index 5fe52cf6..bf39df9f 100644 --- a/kword/KWDocStruct.cpp +++ b/kword/KWDocStruct.cpp @@ -44,7 +44,7 @@ #include <ktoolbar.h> #include <ktoolbarbutton.h> -#include <tqlayout.h> +#include <layout.h> /******************************************************************/ /* Class: KWOrderedFrameSet */ @@ -385,12 +385,12 @@ void KWDocStructTextFrameSetItem::setupTextFrames() if ( KListViewItem::parent()->firstChild() == this && dok->processingType() == KWDocument::WP ) { if ( dok->numColumns() == 1 ) - name=i18n( "Page %1" ).tqarg(TQString::number(j + 1)); + name=i18n( "Page %1" ).arg(TQString::number(j + 1)); else - name=i18n( "Column %1" ).tqarg(TQString::number(j + 1)); + name=i18n( "Column %1" ).arg(TQString::number(j + 1)); } else - name=i18n( "Text Frame %1" ).tqarg(TQString::number(j + 1)); + name=i18n( "Text Frame %1" ).arg(TQString::number(j + 1)); KWDocStructTextFrameItem* child = findTextFrameItem(frame); if (child) child->setText(0, name); @@ -899,7 +899,7 @@ void KWDocStructRootItem::setupFormulaFrames() if ( frameset->type() == FT_FORMULA && frameset->frameCount()>0 ) { - _name=i18n("Formula Frame %1").tqarg(TQString::number(i+1)); + _name=i18n("Formula Frame %1").arg(TQString::number(i+1)); child = new KWDocStructFormulaItem(this, _name, dynamic_cast<KWFormulaFrameSet*>( frameset )); } } @@ -977,7 +977,7 @@ void KWDocStructRootItem::setupPictures() frameset = dok->frameSet( i ); if ( frameset->type() == FT_PICTURE && frameset->frameCount()>0) { - _name=i18n("Picture (%1) %2").tqarg(dynamic_cast<KWPictureFrameSet*>( frameset )->key().filename()).tqarg(++j); + _name=i18n("Picture (%1) %2").arg(dynamic_cast<KWPictureFrameSet*>( frameset )->key().filename()).arg(++j); child = new KWDocStructPictureItem(this, _name, dynamic_cast<KWPictureFrameSet*>( frameset )); } } diff --git a/kword/KWDocStruct.h b/kword/KWDocStruct.h index 2eb4eb9d..87ac0f6f 100644 --- a/kword/KWDocStruct.h +++ b/kword/KWDocStruct.h @@ -290,7 +290,7 @@ public: void setup(); void refreshTree(int _type); - TQSize tqminimumSizeHint() const { + TQSize minimumSizeHint() const { return TQSize( 0, 0 ); } void selectItem(); diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp index 9420f048..55f5f351 100644 --- a/kword/KWDocument.cpp +++ b/kword/KWDocument.cpp @@ -483,8 +483,8 @@ void KWDocument::newZoomAndResolution( bool updateViews, bool forPrint ) // First recalc all frames (including the kotextdocument width) updateAllFrames(); - // Then retqlayout the text inside the frames - tqlayout(); + // Then relayout the text inside the frames + layout(); if ( updateViews ) { emit newContentsSize(); @@ -617,9 +617,9 @@ KoPageLayout KWDocument::pageLayout(int pageNumber /* = 0 */) const return pageManager()->pageLayout(pageNumber); } -void KWDocument::setPageLayout( const KoPageLayout& tqlayout, const KoColumns& cl, const KoKWHeaderFooter& hf, bool updateViews ) +void KWDocument::setPageLayout( const KoPageLayout& layout, const KoColumns& cl, const KoKWHeaderFooter& hf, bool updateViews ) { - m_pageLayout = tqlayout; + m_pageLayout = layout; if ( m_processingType == WP ) { m_pageColumns = cl; } @@ -643,8 +643,8 @@ void KWDocument::setPageLayout( const KoPageLayout& tqlayout, const KoColumns& c if ( updateViews ) { - // Invalidate document tqlayout, for proper tqrepaint - this->tqlayout(); + // Invalidate document layout, for proper repaint + this->layout(); emit pageLayoutChanged( m_pageLayout ); updateContentsSize(); } @@ -953,10 +953,10 @@ void KWDocument::recalcFrames( int fromPage, int toPage /*-1 for all*/, uint fla if ( fromPage > toPage ) // this can happen with "endnotes only" pages :) // ### really? fromPage = toPage; // ie. start at the last real page KWFrameLayout frameLayout( this, headerFooterList, footnotesHFList, endnotesHFList ); - frameLayout.tqlayout( frameset, m_pageColumns.columns, fromPage, toPage, flags ); + frameLayout.layout( frameset, m_pageColumns.columns, fromPage, toPage, flags ); // If the number of pages changed, update views and variables etc. - // (now that the frame tqlayout has been done) + // (now that the frame layout has been done) if ( pageCount() != oldPages && !m_bGeneratingPreview ) { // Very much like the end of appendPage, but we don't want to call recalcFrames ;) @@ -996,7 +996,7 @@ void KWDocument::recalcFrames( int fromPage, int toPage /*-1 for all*/, uint fla bool KWDocument::loadChildren( KoStore *store ) { //kdDebug(32001) << "KWDocument::loadChildren" << endl; - TQPtrListIterator<KoDocumentChild> it( tqchildren() ); + TQPtrListIterator<KoDocumentChild> it( children() ); for( ; it.current(); ++it ) { if ( !it.current()->loadDocument( store ) ) return FALSE; @@ -1060,7 +1060,7 @@ bool KWDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles if ( localName.isEmpty() ) setErrorMessage( i18n( "Invalid OASIS OpenDocument file. No tag found inside office:body." ) ); else - setErrorMessage( i18n( "This is not a word processing document, but %1. Please try opening it with the appropriate application." ).tqarg( KoDocument::tagNameToDocumentType( localName ) ) ); + setErrorMessage( i18n( "This is not a word processing document, but %1. Please try opening it with the appropriate application." ).arg( KoDocument::tagNameToDocumentType( localName ) ) ); return false; } @@ -1072,7 +1072,7 @@ bool KWDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles // In theory the page format is the style:master-page-name of the first paragraph... // But, hmm, in a doc with only a table there was no reference to the master page at all... - // So we load the standard page tqlayout to start with, and in KWTextParag + // So we load the standard page layout to start with, and in KWTextParag // we might overwrite it with another one. m_loadingInfo->m_currentMasterPage = "Standard"; if ( !loadOasisPageLayout( m_loadingInfo->m_currentMasterPage, context ) ) @@ -1133,15 +1133,15 @@ bool KWDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles // load padding, background and borders for the main frame const TQDomElement* masterPage = context.oasisStyles().masterPages()[ m_loadingInfo->m_currentMasterPage ]; - const TQDomElement *masterPageStyle = masterPage ? context.oasisStyles().findStyle(masterPage->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() ) ) : 0; + const TQDomElement *masterPageStyle = masterPage ? context.oasisStyles().findStyle(masterPage->attributeNS( KoXmlNS::style, "page-layout-name", TQString() ) ) : 0; if ( masterPageStyle ) { KoStyleStack styleStack; styleStack.push( *masterPageStyle ); - styleStack.setTypeProperties( "page-tqlayout" ); + styleStack.setTypeProperties( "page-layout" ); frame->loadBorderProperties( styleStack ); } - fs->renumberFootNotes( false /*no tqrepaint*/ ); + fs->renumberFootNotes( false /*no repaint*/ ); } else { // DTP mode: the items in the body are page-sequence and then frames @@ -1152,7 +1152,7 @@ bool KWDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles const TQString localName = tag.localName(); if ( localName == "page-sequence" && tag.namespaceURI() == KoXmlNS::text ) { - // We don't have support for changing the page tqlayout yet, so just take the + // We don't have support for changing the page layout yet, so just take the // number of pages int pages=1; TQDomElement page; @@ -1205,14 +1205,14 @@ bool KWDocument::loadOasisPageLayout( const TQString& masterPageName, KoOasisCon const KoOasisStyles& oasisStyles = context.oasisStyles(); const TQDomElement* masterPage = oasisStyles.masterPages()[ masterPageName ]; Q_ASSERT( masterPage ); - const TQDomElement *masterPageStyle = masterPage ? oasisStyles.findStyle( masterPage->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() ) ) : 0; + const TQDomElement *masterPageStyle = masterPage ? oasisStyles.findStyle( masterPage->attributeNS( KoXmlNS::style, "page-layout-name", TQString() ) ) : 0; Q_ASSERT( masterPageStyle ); if ( masterPageStyle ) { m_pageLayout.loadOasis( *masterPageStyle ); pageManager()->setDefaultPage(m_pageLayout); - const TQDomElement properties( KoDom::namedItemNS( *masterPageStyle, KoXmlNS::style, "page-tqlayout-properties" ) ); + const TQDomElement properties( KoDom::namedItemNS( *masterPageStyle, KoXmlNS::style, "page-layout-properties" ) ); const TQDomElement footnoteSep = KoDom::namedItemNS( properties, KoXmlNS::style, "footnote-sep" ); if ( !footnoteSep.isNull() ) { // style:width="0.018cm" style:distance-before-sep="0.101cm" @@ -1292,24 +1292,24 @@ bool KWDocument::loadMasterPageStyle( const TQString& masterPageName, KoOasisCon const KoOasisStyles& oasisStyles = context.oasisStyles(); const TQDomElement* masterPage = oasisStyles.masterPages()[ masterPageName ]; Q_ASSERT( masterPage ); - const TQDomElement *masterPageStyle = masterPage ? oasisStyles.findStyle( masterPage->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() ) ) : 0; + const TQDomElement *masterPageStyle = masterPage ? oasisStyles.findStyle( masterPage->attributeNS( KoXmlNS::style, "page-layout-name", TQString() ) ) : 0; Q_ASSERT( masterPageStyle ); // This check is done here and not in loadOasisPageLayout in case the Standard master-page // has no page information but the first paragraph points to a master-page that does (#129585) if ( m_pageLayout.ptWidth <= 1e-13 || m_pageLayout.ptHeight <= 1e-13 ) { - // Loading page tqlayout failed, try to see why. - TQDomElement properties( KoDom::namedItemNS( *masterPageStyle, KoXmlNS::style, "page-tqlayout-properties" ) ); + // Loading page layout failed, try to see why. + TQDomElement properties( KoDom::namedItemNS( *masterPageStyle, KoXmlNS::style, "page-layout-properties" ) ); //if ( properties.isNull() ) - // setErrorMessage( i18n( "Invalid document. No page tqlayout properties were found. The application which produced this document isn't OASIS-compliant." ) ); + // setErrorMessage( i18n( "Invalid document. No page layout properties were found. The application which produced this document isn't OASIS-compliant." ) ); //else if ( properties.hasAttributeNS( KoXmlNS::fo, "page-width" ) ) - // setErrorMessage( i18n( "Invalid document. Page tqlayout has no page width. The application which produced this document isn't OASIS-compliant." ) ); + // setErrorMessage( i18n( "Invalid document. Page layout has no page width. The application which produced this document isn't OASIS-compliant." ) ); //else if ( properties.hasAttributeNS( "http://www.w3.org/1999/XSL/Format", "page-width" ) ) setErrorMessage( i18n( "Invalid document. 'fo' has the wrong namespace. The application which produced this document is not OASIS-compliant." ) ); else - setErrorMessage( i18n( "Invalid document. Paper size: %1x%2" ).tqarg( m_pageLayout.ptWidth ).tqarg( m_pageLayout.ptHeight ) ); + setErrorMessage( i18n( "Invalid document. Paper size: %1x%2" ).arg( m_pageLayout.ptWidth ).arg( m_pageLayout.ptHeight ) ); return false; } @@ -1484,7 +1484,7 @@ bool KWDocument::loadXML( TQIODevice *, const TQDomDocument & doc ) else if ( value != "application/x-kword" && value != "application/vnd.kde.kword" ) { kdError(32001) << "Unknown mime type " << value << endl; - setErrorMessage( i18n( "Invalid document. Expected mimetype application/x-kword or application/vnd.kde.kword, got %1" ).tqarg( value ) ); + setErrorMessage( i18n( "Invalid document. Expected mimetype application/x-kword or application/vnd.kde.kword, got %1" ).arg( value ) ); return false; } m_syntaxVersion = KWDocument::getAttribute( word, "syntaxVersion", 0 ); @@ -1492,7 +1492,7 @@ bool KWDocument::loadXML( TQIODevice *, const TQDomDocument & doc ) { int ret = KMessageBox::warningContinueCancel( 0, i18n("This document was created with a newer version of KWord (syntax version: %1)\n" - "Opening it in this version of KWord will lose some information.").tqarg(m_syntaxVersion), + "Opening it in this version of KWord will lose some information.").arg(m_syntaxVersion), i18n("File Format Mismatch"), KStdGuiItem::cont() ); if ( ret == KMessageBox::Cancel ) { @@ -1535,7 +1535,7 @@ bool KWDocument::loadXML( TQIODevice *, const TQDomDocument & doc ) if ( pgLayout.ptWidth <= 0 || pgLayout.ptHeight <= 0 ) { setErrorMessage( i18n( "Invalid document. Paper size: %1x%2" ) - .tqarg( pgLayout.ptWidth ).tqarg( pgLayout.ptHeight ) ); + .arg( pgLayout.ptWidth ).arg( pgLayout.ptHeight ) ); return false; } } @@ -1928,7 +1928,7 @@ void KWDocument::endOfLoading() // called by both oasis and oldxml // Renumber footnotes KWTextFrameSet *frameset = dynamic_cast<KWTextFrameSet *>( m_lstFrameSet.getFirst() ); if ( frameset ) - frameset->renumberFootNotes( false /*no tqrepaint*/ ); + frameset->renumberFootNotes( false /*no repaint*/ ); emit sigProgress(-1); @@ -2499,7 +2499,7 @@ void KWDocument::processAnchorRequests() KWFrameSet * fs = frameSetByName( fsname ); Q_ASSERT( fs ); if ( fs ) - fs->setAnchored( itanch.data().textfs, itanch.data().paragId, itanch.data().index, true, false /*don't tqrepaint yet*/ ); + fs->setAnchored( itanch.data().textfs, itanch.data().paragId, itanch.data().index, true, false /*don't repaint yet*/ ); } m_anchorRequests.clear(); } @@ -2533,7 +2533,7 @@ bool KWDocument::processFootNoteRequests() if ( ret ) { KWFrameSet *frameset = m_lstFrameSet.getFirst(); if ( frameset && frameset->type() == FT_TEXT ) - static_cast<KWTextFrameSet *>(frameset)->renumberFootNotes( false /*no tqrepaint*/ ); + static_cast<KWTextFrameSet *>(frameset)->renumberFootNotes( false /*no repaint*/ ); } return ret; } @@ -2545,13 +2545,13 @@ TQString KWDocument::uniqueFramesetName( const TQString& oldName ) { // make up a new name for the frameset, use Copy[digits]-[oldname] as template. // Fully translatable naturally :) - TQString searchString( "^(" + i18n("Copy%1-%2").tqarg("\\d*").tqarg("){0,1}") ); + TQString searchString( "^(" + i18n("Copy%1-%2").arg("\\d*").arg("){0,1}") ); searchString = searchString.replace(TQRegExp("\\-"), "\\-"); // escape the '-' TQRegExp searcher(searchString); int count=0; do { newName=oldName; - newName.replace(searcher,i18n("Copy%1-%2").tqarg(count > 0? TQString("%1").tqarg(count):"").tqarg("")); + newName.replace(searcher,i18n("Copy%1-%2").arg(count > 0? TQString("%1").arg(count):"").arg("")); count++; } while ( frameSetByName( newName ) ); } @@ -2705,7 +2705,7 @@ void KWDocument::completePasting() processAnchorRequests(); if ( processFootNoteRequests() ) { - // We pasted footnotes. Retqlayout frames. + // We pasted footnotes. Relayout frames. recalcFrames(); } @@ -2762,7 +2762,7 @@ void KWDocument::insertEmbedded( KoStore *store, TQDomElement topElem, KMacroCom kdDebug() << "KWDocument::insertEmbedded loading embedded object" << endl; part->load( settings ); if ( offset != 0 ) { - TQRect r = ch->tqgeometry(); + TQRect r = ch->geometry(); r.moveBy( (int)offset, (int)offset ); ch->setGeometry( r ); } @@ -2804,7 +2804,7 @@ bool KWDocument::saveOasisHelper( KoStore* store, KoXmlWriter* manifestWriter, S if ( saveFlag == SaveAll ) pictureList = savePictureList(); - m_varColl->variableSetting()->setModificationDate(TQDateTime::tqcurrentDateTime()); + m_varColl->variableSetting()->setModificationDate(TQDateTime::currentDateTime()); recalcVariables( VT_DATE ); recalcVariables( VT_TIME ); // for "current time" recalcVariables( VT_STATISTIC ); @@ -2837,7 +2837,7 @@ bool KWDocument::saveOasisHelper( KoStore* store, KoXmlWriter* manifestWriter, S } // Header and footers save their content into master-styles/master-page, and their - // styles into the page-tqlayout automatic-style. + // styles into the page-layout automatic-style. // However the paragraph styles used by header/footers need to be known before // hand, to promote them to styles.xml. So we collect them first, which means // storing the content into a buffer. @@ -3235,7 +3235,7 @@ void KWDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyle buffer.close(); if ( m_pageColumns.columns > 1 ) { - buffer.tqsetBufferFromCopy(TQByteArray()); // clear data + buffer.setBuffer(TQByteArray()); // clear data buffer.open( IO_WriteOnly ); KoXmlWriter columnsTmpWriter( TQT_TQIODEVICE(&buffer) ); // TODO pass indentation level columnsTmpWriter.startElement( "style:columns" ); @@ -3251,8 +3251,8 @@ void KWDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyle // if there's more than one pagemaster we need to rethink all this pageLayoutName = mainStyles.lookup( pageLayout, "pm" ); - pageLayout.writeStyle( stylesWriter, mainStyles, "style:page-tqlayout", pageLayoutName, - "style:page-tqlayout-properties", false /*don't close*/ ); + pageLayout.writeStyle( stylesWriter, mainStyles, "style:page-layout", pageLayoutName, + "style:page-layout-properties", false /*don't close*/ ); // Ouch another problem: there is only one header style in oasis // ##### can't have different borders for even/odd headers... @@ -3301,7 +3301,7 @@ void KWDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyle stylesWriter->endElement(); // header-style } } - stylesWriter->endElement(); // style:page-tqlayout + stylesWriter->endElement(); // style:page-layout // Headers and footers might have created new automatic parag/text styles -> save those KWOasisSaver::writeAutomaticStyles( *stylesWriter, mainStyles, true ); @@ -3313,7 +3313,7 @@ void KWDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyle stylesWriter->startElement( "office:master-styles" ); stylesWriter->startElement( "style:master-page" ); stylesWriter->addAttribute( "style:name", "Standard" ); - stylesWriter->addAttribute( "style:page-tqlayout-name", pageLayoutName ); + stylesWriter->addAttribute( "style:page-layout-name", pageLayoutName ); if ( isHeaderVisible() || isFooterVisible() ) { // ### TODO save them even when hidden (and not empty)? stylesWriter->addCompleteElement( headerFooterContent.data() ); @@ -3405,7 +3405,7 @@ void KWDocument::saveOasisBody( KoXmlWriter& writer, KoSavingContext& context ) TQDomDocument KWDocument::saveXML() { - m_varColl->variableSetting()->setModificationDate(TQDateTime::tqcurrentDateTime()); + m_varColl->variableSetting()->setModificationDate(TQDateTime::currentDateTime()); recalcVariables( VT_DATE ); recalcVariables( VT_TIME ); // for "current time" recalcVariables( VT_STATISTIC ); @@ -3601,7 +3601,7 @@ TQDomDocument KWDocument::saveXML() } // Save embedded objects - saveEmbeddedObjects( kwdoc, tqchildren() ); + saveEmbeddedObjects( kwdoc, children() ); return doc; } @@ -3779,7 +3779,7 @@ void KWDocument::paintContent( TQPainter& painter, const TQRect& rectangle, bool viewMode->setDrawFrameBackground( !transparent ); viewMode->setDrawSelections( false ); - TQColorGroup cg = TQApplication::tqpalette().active(); + TQColorGroup cg = TQApplication::palette().active(); if (!transparent) { @@ -3810,8 +3810,8 @@ TQPixmap KWDocument::generatePreview( const TQSize& size ) double oldZoomX = zoomedResolutionX(); double oldZoomY = zoomedResolutionY(); - // Sometimes (due to the different resolution?) the tqlayout creates a new page - // while saving the preview. If this happens, we don't want to tqrepaint the real views + // Sometimes (due to the different resolution?) the layout creates a new page + // while saving the preview. If this happens, we don't want to repaint the real views // (due to KWCanvas::slotNewContentsSize) // ##### One day when we have real doc/view separation in kotextparag, we shouldn't mess with // the real view's resolution, we should instead create a fake view for the preview itself. @@ -3887,7 +3887,7 @@ KWPartFrameSet* KWDocument::insertObject( const KoRect& rect, KoDocumentEntry& e KWCreateFrameCommand *cmd = new KWCreateFrameCommand( i18n("Create Part Frame"), frame); addCommand(cmd); - frameChanged( frame ); // tqrepaint etc. + frameChanged( frame ); // repaint etc. return frameset; } @@ -4210,7 +4210,7 @@ TQString KWDocument::generateFramesetName( const TQString & templateName ) int num = 1; bool exists; do { - name = templateName.tqarg( num ); + name = templateName.arg( num ); exists = frameSetByName( name ); ++num; } while ( exists ); @@ -4364,7 +4364,7 @@ void KWDocument::setHeaderVisible( bool h ) m_headerVisible = h; recalcFrames(); updateAllFrames(); - tqlayout(); + layout(); setModified(true); repaintAllViews( true ); } @@ -4374,7 +4374,7 @@ void KWDocument::setFooterVisible( bool f ) m_footerVisible = f; recalcFrames(); updateAllFrames(); - tqlayout(); + layout(); setModified(true); repaintAllViews( true ); } @@ -4457,9 +4457,9 @@ void KWDocument::setMailMergeRecord( int r ) slRecordNum = r; } -void KWDocument::getPageLayout( KoPageLayout& tqlayout, KoColumns& cl, KoKWHeaderFooter& hf ) +void KWDocument::getPageLayout( KoPageLayout& layout, KoColumns& cl, KoKWHeaderFooter& hf ) { - tqlayout = m_pageLayout; + layout = m_pageLayout; cl = m_pageColumns; hf = m_pageHeaderFooter; } @@ -4560,20 +4560,20 @@ void KWDocument::printDebug() } #endif -void KWDocument::tqlayout() +void KWDocument::layout() { TQPtrListIterator<KWFrameSet> it = framesetsIterator(); for (; it.current(); ++it ) if ( it.current()->isVisible() ) - it.current()->tqlayout(); + it.current()->layout(); } -void KWDocument::tqinvalidate(const KWFrameSet *skipThisFrameSet) +void KWDocument::invalidate(const KWFrameSet *skipThisFrameSet) { TQPtrListIterator<KWFrameSet> it = framesetsIterator(); for (; it.current(); ++it ) if(it.current()!=skipThisFrameSet) - it.current()->tqinvalidate(); + it.current()->invalidate(); } KFormula::Document* KWDocument::formulaDocument( bool init ) @@ -4835,7 +4835,7 @@ void KWDocument::slotChapterParagraphFormatted( KoTextParag* /*parag*/ ) { // Attempt at invalidating from the parag's page only // But that's not good enough - if a header gets moved down, - // we also need to tqinvalidate the previous page, from where the paragraph disappeared. + // we also need to invalidate the previous page, from where the paragraph disappeared. /* KoPoint p; KWFrame* frame = internalToDocument( parag->rect().topLeft(), p ); @@ -5033,7 +5033,7 @@ void KWDocument::displayFootNoteFieldCode() KoTextParag * parag = it.current()->paragraph(); if ( parag ) { - parag->tqinvalidate( 0 ); + parag->invalidate( 0 ); parag->setChanged( true ); } } @@ -5058,7 +5058,7 @@ void KWDocument::changeFootNoteConfig() KoTextParag * parag = footNoteVar->paragraph(); if ( parag ) { - parag->tqinvalidate( 0 ); + parag->invalidate( 0 ); parag->setChanged( true ); } KoTextDocument* textdoc = parag->textDocument(); @@ -5083,7 +5083,7 @@ void KWDocument::setTabStopValue ( double tabStop ) KWTextFrameSet *frm; for ( frm=textFramesets.first(); frm != 0; frm=textFramesets.next() ){ frm->textDocument()->setTabStops( ptToLayoutUnitPixX( tabStop )); - frm->tqlayout(); + frm->layout(); } repaintAllViews(); } @@ -5120,11 +5120,11 @@ void KWDocument::switchViewMode( const TQString& newViewModeType ) (*it)->switchModeView(); emit newContentsSize(); - // Since the text tqlayout depends on the view mode, we need to redo it + // Since the text layout depends on the view mode, we need to redo it // But after telling the canvas about the new viewmode, otherwise stuff like // slotNewContentsSize will crash. updateAllFrames(); - tqlayout(); + layout(); repaintAllViews( true ); for( TQValueList<KWView *>::Iterator it = m_lstViews.begin(); it != m_lstViews.end(); ++it ) @@ -5395,7 +5395,7 @@ void KWDocument::setEmpty() { KoDocument::setEmpty(); // Whether loaded from template or from empty doc: this is a new one -> set creation date - m_varColl->variableSetting()->setCreationDate(TQDateTime::tqcurrentDateTime()); + m_varColl->variableSetting()->setCreationDate(TQDateTime::currentDateTime()); recalcVariables( VT_DATE ); // , VST_CREATION_DATE ... // If we then load a document, it will override that date. } @@ -5466,15 +5466,15 @@ void KWDocument::FramesChangedHandler::execute() { KWFrameSet *fs = *iter; fs->updateFrames(); if(!m_needLayout) - fs->tqlayout(); + fs->layout(); } KWFrameList::recalcAllFrames(m_parent); } - // If frame with text flowing around it -> re-tqlayout all frames + // If frame with text flowing around it -> re-layout all frames if ( m_needLayout) - m_parent->tqlayout(); + m_parent->layout(); //m_parent->repaintAllViewsExcept( 0 ); m_parent->repaintAllViews(); m_parent->updateRulerFrameStartEnd(); diff --git a/kword/KWDocument.h b/kword/KWDocument.h index fcda863f..1a9aa16e 100644 --- a/kword/KWDocument.h +++ b/kword/KWDocument.h @@ -214,9 +214,9 @@ public: /// because KoDocument:insertChild is protected. KWDocumentChild* createChildDoc( const KoRect& rect, KoDocument* childDoc ); - void setPageLayout( const KoPageLayout& tqlayout, const KoColumns& cl, const KoKWHeaderFooter& hf, bool updateViews = true ); + void setPageLayout( const KoPageLayout& layout, const KoColumns& cl, const KoKWHeaderFooter& hf, bool updateViews = true ); - void getPageLayout( KoPageLayout& tqlayout, KoColumns& cl, KoKWHeaderFooter& hf ); + void getPageLayout( KoPageLayout& layout, KoColumns& cl, KoKWHeaderFooter& hf ); KWTextFrameSet * textFrameSet ( unsigned int num ) const; /// Return the frameset number @p num @@ -268,12 +268,12 @@ public: /** - * schedule a tqrepaint of all views but don't execute immediately + * schedule a repaint of all views but don't execute immediately */ void delayedRepaintAllViews(); /** - * schedule a frame tqlayout (e.g. for footnotes) but don't execute immediately + * schedule a frame layout (e.g. for footnotes) but don't execute immediately */ void delayedRecalcFrames( int fromPage ); @@ -437,7 +437,7 @@ public: //int applyStyleChangeMask() { return styleMask; } //void setApplyStyleChangeMask( int f ) { styleMask = f; } - // paragLayoutChanged is a set of flags for the parag tqlayout - see the enum in KWParagLayout + // paragLayoutChanged is a set of flags for the parag layout - see the enum in KWParagLayout // formatChanged is a set of flags from KoTextFormat // If both are -1, it means the style has been deleted. void applyStyleChange( KoStyleChangeDefMap changed ); @@ -519,7 +519,7 @@ public: void newZoomAndResolution( bool updateViews, bool forPrint ); /** - * Due to the way the text formatter works (it caches tqlayout information in + * Due to the way the text formatter works (it caches layout information in * the paragraphs and characters), we currently can't have one viewmode per view. * It has to be the same for all views. */ @@ -565,8 +565,8 @@ public: void printDebug(); #endif - /** calls tqlayout() on all framesets */ - void tqlayout(); + /** calls layout() on all framesets */ + void layout(); // This settings has to be here [instead of KWView] because we need to // format paragraphs slightly differently (to add room for the CR char) @@ -764,7 +764,7 @@ public: KWBgSpellCheck* backSpeller() const { return m_bgSpellCheck; } - /// Load the given page tqlayout; public for KWTextParag + /// Load the given page layout; public for KWTextParag bool loadOasisPageLayout( const TQString& masterPageName, KoOasisContext& context ); // end of public methods @@ -773,7 +773,7 @@ signals: /// This is emitted by setPageLayout if updateViews=true void pageLayoutChanged( const KoPageLayout& ); - /// Emitted when the scrollview contents must be resized (e.g. new page, new tqlayout...) + /// Emitted when the scrollview contents must be resized (e.g. new page, new layout...) void newContentsSize(); /** This is emitted when the height of the text in the main frameset changes @@ -796,8 +796,8 @@ public slots: void slotRepaintChanged( KWFrameSet * frameset ); void framesChanged( const TQValueList<KWFrame*> &frames); - /** calls tqinvalidate() on all framesets */ - void tqinvalidate(const KWFrameSet *skipThisFrameSet=0); + /** calls invalidate() on all framesets */ + void invalidate(const KWFrameSet *skipThisFrameSet=0); virtual void initEmpty(); diff --git a/kword/KWEditPersonnalExpression.cpp b/kword/KWEditPersonnalExpression.cpp index 3638301d..501705e0 100644 --- a/kword/KWEditPersonnalExpression.cpp +++ b/kword/KWEditPersonnalExpression.cpp @@ -30,7 +30,7 @@ #include <tqcombobox.h> #include <tqlineedit.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> KWEditPersonnalExpression::KWEditPersonnalExpression( TQWidget *parent, const char *name ) : KDialogBase( parent, name , true, i18n("Edit Personal Expression"), Ok|Cancel, Ok, true ) @@ -40,62 +40,62 @@ KWEditPersonnalExpression::KWEditPersonnalExpression( TQWidget *parent, const ch setMainWidget(page); TQGridLayout* form1Layout = new TQGridLayout( page, 1, 1, 0, KDialog::spacingHint(), "form1Layout"); - TQHBoxLayout *hortqlayout1 = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "hortqlayout1"); + TQHBoxLayout *horlayout1 = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "horlayout1"); TQLabel *groupnameLabel = new TQLabel(i18n("Group name:"), page, "groupnameLabel" ); - hortqlayout1->addWidget( groupnameLabel ); + horlayout1->addWidget( groupnameLabel ); m_groupLineEdit = new TQLineEdit( page, "groupLineEdit" ); - hortqlayout1->addWidget( m_groupLineEdit ); + horlayout1->addWidget( m_groupLineEdit ); - form1Layout->addLayout( hortqlayout1, 0, 1 ); + form1Layout->addLayout( horlayout1, 0, 1 ); TQGroupBox *expressionGroupBox = new TQGroupBox( page, "expressionGroupBox" ); - expressionGroupBox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, expressionGroupBox->sizePolicy().hasHeightForWidth() ) ); + expressionGroupBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, expressionGroupBox->sizePolicy().hasHeightForWidth() ) ); expressionGroupBox->setTitle( i18n( "Expressions" ) ); expressionGroupBox->setColumnLayout(0, Qt::Vertical ); - expressionGroupBox->tqlayout()->setSpacing( KDialog::spacingHint() ); - expressionGroupBox->tqlayout()->setMargin( KDialog::marginHint() ); - TQVBoxLayout *expressionGroupBoxLayout = new TQVBoxLayout( expressionGroupBox->tqlayout() ); - expressionGroupBoxLayout->tqsetAlignment( TQt::AlignTop ); + expressionGroupBox->layout()->setSpacing( KDialog::spacingHint() ); + expressionGroupBox->layout()->setMargin( KDialog::marginHint() ); + TQVBoxLayout *expressionGroupBoxLayout = new TQVBoxLayout( expressionGroupBox->layout() ); + expressionGroupBoxLayout->setAlignment( TQt::AlignTop ); m_ExpressionsList = new TQListBox( expressionGroupBox, "listOfExpressions" ); - m_ExpressionsList->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 1, 0, m_ExpressionsList->sizePolicy().hasHeightForWidth() ) ); + m_ExpressionsList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 1, 0, m_ExpressionsList->sizePolicy().hasHeightForWidth() ) ); expressionGroupBoxLayout->addWidget( m_ExpressionsList ); m_expressionLineEdit = new TQLineEdit( expressionGroupBox, "expressionLineEdit" ); expressionGroupBoxLayout->addWidget( m_expressionLineEdit ); - TQHBoxLayout *hortqlayout2 = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "hortqlayout2"); + TQHBoxLayout *horlayout2 = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "horlayout2"); TQSpacerItem* spacer = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - hortqlayout2->addItem( spacer ); + horlayout2->addItem( spacer ); m_addExpression = new TQPushButton( i18n("&New"), expressionGroupBox, "m_addExpression" ); - hortqlayout2->addWidget( m_addExpression ); + horlayout2->addWidget( m_addExpression ); m_delExpression = new TQPushButton( i18n("&Delete"), expressionGroupBox, "m_delExpression" ); - hortqlayout2->addWidget( m_delExpression ); - expressionGroupBoxLayout->addLayout( hortqlayout2 ); + horlayout2->addWidget( m_delExpression ); + expressionGroupBoxLayout->addLayout( horlayout2 ); form1Layout->addWidget( expressionGroupBox, 1, 1 ); - TQVBoxLayout *verttqlayout = new TQVBoxLayout( 0, 0, KDialog::spacingHint(), "verttqlayout"); + TQVBoxLayout *vertlayout = new TQVBoxLayout( 0, 0, KDialog::spacingHint(), "vertlayout"); m_groupList = new TQListBox( page, "groupList" ); m_groupList->insertItem( "group1" ); m_groupList->setMaximumSize( TQSize( 200, 32767 ) ); - verttqlayout->addWidget( m_groupList ); + vertlayout->addWidget( m_groupList ); - TQHBoxLayout *hortqlayout3 = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "hortqlayout3"); + TQHBoxLayout *horlayout3 = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "horlayout3"); m_addGroup = new TQPushButton( i18n("New"), page, "m_addGroup" ); - hortqlayout3->addWidget( m_addGroup ); + horlayout3->addWidget( m_addGroup ); m_delGroup = new TQPushButton(i18n("Delete"), page, "m_delGroup" ); - hortqlayout3->addWidget( m_delGroup ); - verttqlayout->addLayout( hortqlayout3 ); + horlayout3->addWidget( m_delGroup ); + vertlayout->addLayout( horlayout3 ); - form1Layout->addMultiCellLayout( verttqlayout, 0, 1, 0, 0 ); + form1Layout->addMultiCellLayout( vertlayout, 0, 1, 0, 0 ); loadFile(); if(listExpression.count() == 0) diff --git a/kword/KWFindReplace.cpp b/kword/KWFindReplace.cpp index f1168ba3..6b9ce223 100644 --- a/kword/KWFindReplace.cpp +++ b/kword/KWFindReplace.cpp @@ -55,8 +55,8 @@ void KWFindReplace::emitNewCommand(KCommand *cmd) void KWFindReplace::highlightPortion(KoTextParag * parag, int index, int length, KoTextDocument *textdocument, KDialogBase* dialog) { KWTextDocument *textdoc=static_cast<KWTextDocument *>(textdocument); - bool tqrepaint = isReplace() ? options() & KReplaceDialog::PromptOnReplace : true; - textdoc->textFrameSet()->highlightPortion( parag, index, length, m_canvas, tqrepaint, dialog ); + bool repaint = isReplace() ? options() & KReplaceDialog::PromptOnReplace : true; + textdoc->textFrameSet()->highlightPortion( parag, index, length, m_canvas, repaint, dialog ); } #include "KWFindReplace.moc" diff --git a/kword/KWFootNoteDia.cpp b/kword/KWFootNoteDia.cpp index 24060cf2..5822c299 100644 --- a/kword/KWFootNoteDia.cpp +++ b/kword/KWFootNoteDia.cpp @@ -25,7 +25,7 @@ #include <tqradiobutton.h> #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include "KWConfigFootNoteDia.h" diff --git a/kword/KWFormulaFrameSet.cpp b/kword/KWFormulaFrameSet.cpp index f8d597e8..f54942a4 100644 --- a/kword/KWFormulaFrameSet.cpp +++ b/kword/KWFormulaFrameSet.cpp @@ -219,7 +219,7 @@ void KWFormulaFrameSet::slotFormulaChanged( double width, double height ) m_frames.first()->setHeight( height ); updateFrames(); - kWordDocument()->tqlayout(); + kWordDocument()->layout(); if ( ( oldWidth != width ) || ( oldHeight != height ) ) { kWordDocument()->repaintAllViews( false ); kWordDocument()->updateRulerFrameStartEnd(); diff --git a/kword/KWFrame.cpp b/kword/KWFrame.cpp index a559b892..e1cdb9d8 100644 --- a/kword/KWFrame.cpp +++ b/kword/KWFrame.cpp @@ -166,7 +166,7 @@ void KWFrame::copySettings(KWFrame *frm) void KWFrame::frameBordersChanged() { if (frameSet()->isFloating()) - frameSet()->anchorFrameset()->tqinvalidate(); + frameSet()->anchorFrameset()->invalidate(); } diff --git a/kword/KWFrame.h b/kword/KWFrame.h index 88552259..fbd53572 100644 --- a/kword/KWFrame.h +++ b/kword/KWFrame.h @@ -24,7 +24,7 @@ #include "defs.h" #include <KoRect.h> -#include <tqbrush.h> +#include <brush.h> #include "KoBorder.h" #include <tqptrlist.h> @@ -221,7 +221,7 @@ public: /** The "internal Y" is the offset (in pt) of the real frame showed in this one * ("real" means "the last that isn't a copy") * This offset in pt is the sum of the height of the frames before that one. - * For text frames, this is equivalent to the tqlayout units (after multiplication). */ + * For text frames, this is equivalent to the layout units (after multiplication). */ void setInternalY( double y ) { m_internalY = y; } double internalY() const { return m_internalY; } diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp index 2d9cb423..ec5578ee 100644 --- a/kword/KWFrameDia.cpp +++ b/kword/KWFrameDia.cpp @@ -50,7 +50,7 @@ #include <tqbuttongroup.h> #include <tqhbox.h> #include <tqheader.h> -#include <tqlayout.h> +#include <layout.h> #include <stdlib.h> #include <limits.h> @@ -67,7 +67,7 @@ void KWBrushStylePreview::drawContents( TQPainter* painter ) { painter->save(); painter->translate( contentsRect().x(), contentsRect().y() ); - painter->fillRect( contentsRect(), tqcolorGroup().base() ); // in case of a transparent brush + painter->fillRect( contentsRect(), colorGroup().base() ); // in case of a transparent brush painter->fillRect( contentsRect(), brush ); painter->restore(); } @@ -102,7 +102,7 @@ KWFrameDia::KWFrameDia( TQWidget* parent, KWFrame *frame) kdDebug() << "ERROR: KWFrameDia::constructor no frame.."<<endl; return; } - setCaption( i18n( "Frame Properties for %1" ).tqarg( m_frame->frameSet()->name() ) ); + setCaption( i18n( "Frame Properties for %1" ).arg( m_frame->frameSet()->name() ) ); KWFrameSet *fs = m_frame->frameSet()->groupmanager(); if(fs==0L) fs=m_frame->frameSet(); m_frameType = fs->type(); @@ -149,7 +149,7 @@ KWFrameDia::KWFrameDia( TQWidget *parent, TQPtrList<KWFrame> listOfFrames) : KDi return; } if ( listOfFrames.count() == 1 ) - setCaption( i18n( "Frame Settings for %1" ).tqarg( f->frameSet()->name() ) ); + setCaption( i18n( "Frame Settings for %1" ).arg( f->frameSet()->name() ) ); KWFrameSet *fs = f->frameSet()->groupmanager(); if(fs==0L) fs=f->frameSet(); @@ -518,14 +518,14 @@ void KWFrameDia::setupTab1(){ // TAB Frame Options m_grid1->addWidget(m_sideHeads, row, 0); m_sideGrid = new TQGridLayout( m_sideHeads, 4, 2, KDialog::marginHint(), KDialog::spacingHint() ); - sideTitle1 = new TQLabel ( i18n("Size (%1):").tqarg(m_doc->unitName()),m_sideHeads); - sideTitle1->resize(sideTitle1->tqsizeHint()); + sideTitle1 = new TQLabel ( i18n("Size (%1):").arg(m_doc->unitName()),m_sideHeads); + sideTitle1->resize(sideTitle1->sizeHint()); m_sideGrid->addWidget(sideTitle1,1,0); m_sideWidth= new TQLineEdit(m_sideHeads,""); m_sideWidth->setMaxLength(6); m_sideGrid->addWidget(m_sideWidth,1,1); - sideTitle2 = new TQLabel( i18n("Gap size (%1):").tqarg(m_doc->unitName()),m_sideHeads); - sideTitle2->resize(sideTitle2->tqsizeHint()); + sideTitle2 = new TQLabel( i18n("Gap size (%1):").arg(m_doc->unitName()),m_sideHeads); + sideTitle2->resize(sideTitle2->sizeHint()); m_sideGrid->addWidget(sideTitle2,2,0); m_sideGap = new TQLineEdit(m_sideHeads,""); m_sideGap->setMaxLength(6); @@ -536,7 +536,7 @@ void KWFrameDia::setupTab1(){ // TAB Frame Options m_sideAlign->insertItem ( i18n("Right")); m_sideAlign->insertItem ( i18n("Closest to Binding")); m_sideAlign->insertItem ( i18n("Closest to Page Edge")); - m_sideAlign->resize(m_sideAlign->tqsizeHint()); + m_sideAlign->resize(m_sideAlign->sizeHint()); m_sideGrid->addMultiCellWidget(m_sideAlign,3,3,0,1); m_sideGrid->addRowSpacing( 0, KDialog::marginHint() + 5 ); @@ -614,9 +614,9 @@ void KWFrameDia::setupTab2() { // TAB Text Runaround // First groupbox m_runGroup = new TQButtonGroup( i18n( "Layout of Text in Other Frames" ), m_tab2); m_runGroup->setColumnLayout( 0, Qt::Vertical ); - m_runGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); - TQGridLayout *groupBox1Layout = new TQGridLayout( m_runGroup->tqlayout() ); - groupBox1Layout->tqsetAlignment( TQt::AlignTop ); + m_runGroup->layout()->setSpacing( KDialog::spacingHint() ); + TQGridLayout *groupBox1Layout = new TQGridLayout( m_runGroup->layout() ); + groupBox1Layout->setAlignment( TQt::AlignTop ); m_rRunNo = new TQRadioButton( i18n( "Text will run &through this frame" ), m_runGroup ); groupBox1Layout->addWidget( m_rRunNo, 0, 1 ); @@ -650,10 +650,10 @@ void KWFrameDia::setupTab2() { // TAB Text Runaround // Second groupbox m_runSideGroup = new TQButtonGroup( i18n( "Run Around Side" ), m_tab2); m_runSideGroup->setColumnLayout( 0, Qt::Vertical ); - m_runSideGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); - m_runSideGroup->tqlayout()->setMargin( KDialog::marginHint() ); - TQGridLayout *runSideLayout = new TQGridLayout( m_runSideGroup->tqlayout() ); - runSideLayout->tqsetAlignment( TQt::AlignTop ); + m_runSideGroup->layout()->setSpacing( KDialog::spacingHint() ); + m_runSideGroup->layout()->setMargin( KDialog::marginHint() ); + TQGridLayout *runSideLayout = new TQGridLayout( m_runSideGroup->layout() ); + runSideLayout->setAlignment( TQt::AlignTop ); m_rRunLeft = new TQRadioButton( i18n( "Run Around", "&Left" ), m_runSideGroup ); runSideLayout->addWidget( m_rRunLeft, 0, 0 /*1*/ ); @@ -803,9 +803,9 @@ void KWFrameDia::setupTab3(){ // TAB Frameset myGroup->insert(m_rExistingFrameset,1); connect (m_rExistingFrameset, TQT_SIGNAL( toggled(bool)), this, TQT_SLOT(ensureValidFramesetSelected())); - TQHBoxLayout *tqlayout2 = new TQHBoxLayout( 0, 0, 6); + TQHBoxLayout *layout2 = new TQHBoxLayout( 0, 0, 6); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout2->addItem( spacer ); + layout2->addItem( spacer ); m_lFrameSList = new TQListView( m_tab3, "m_lFrameSList" ); m_lFrameSList->addColumn( i18n("No.") ); @@ -815,8 +815,8 @@ void KWFrameDia::setupTab3(){ // TAB Frameset connect( m_lFrameSList, TQT_SIGNAL(selectionChanged ()),this,TQT_SLOT(selectExistingFrameset ()) ); connect (m_lFrameSList, TQT_SIGNAL( selectionChanged()), this, TQT_SLOT(ensureValidFramesetSelected())); - tqlayout2->addWidget( m_lFrameSList ); - tabLayout->addLayout( tqlayout2 ); + layout2->addWidget( m_lFrameSList ); + tabLayout->addLayout( layout2 ); m_rNewFrameset = new TQRadioButton( m_tab3); m_rNewFrameset->setText( i18n( "Create a new frameset" ) ); @@ -829,14 +829,14 @@ void KWFrameDia::setupTab3(){ // TAB Frameset line1->setFrameShape( TQFrame::HLine ); tabLayout->addWidget( line1 ); - TQHBoxLayout *tqlayout1 = new TQHBoxLayout( 0, 0, 6 ); + TQHBoxLayout *layout1 = new TQHBoxLayout( 0, 0, 6 ); TQLabel *textLabel1 = new TQLabel( m_tab3 ); textLabel1->setText( i18n( "Name of frameset:" ) ); - tqlayout1->addWidget( textLabel1 ); + layout1->addWidget( textLabel1 ); m_eFrameSetName = new TQLineEdit( m_tab3 ); - tqlayout1->addWidget( m_eFrameSetName ); - tabLayout->addLayout( tqlayout1 ); + layout1->addWidget( m_eFrameSetName ); + tabLayout->addLayout( layout1 ); int amount=0; // now fill the gui. @@ -853,7 +853,7 @@ void KWFrameDia::setupTab3(){ // TAB Frameset if ( fs->isDeleted() ) continue; TQListViewItem *item = new TQListViewItem( m_lFrameSList ); - item->setText( 0, TQString( "%1" ).tqarg( i + 1 ) ); + item->setText( 0, TQString( "%1" ).arg( i + 1 ) ); item->setText( 1, fs->name() ); amount++; if( m_frame && m_frame->frameSet() == fs ) { @@ -961,43 +961,43 @@ void KWFrameDia::setupTab4() { // TAB Geometry TQGridLayout* pGrid = new TQGridLayout( m_grp1, 3, 4, KDialog::marginHint(), KDialog::spacingHint() ); m_lx = new TQLabel( i18n( "Left:" ), m_grp1 ); - m_lx->resize( m_lx->tqsizeHint() ); + m_lx->resize( m_lx->sizeHint() ); pGrid->addWidget( m_lx, 1, 0 ); m_sx = new KoUnitDoubleSpinBox( m_grp1, 0, 9999, 1, 0.0, m_doc->unit() ); - m_sx->resize( m_sx->tqsizeHint() ); + m_sx->resize( m_sx->sizeHint() ); pGrid->addWidget( m_sx, 1, 1 ); m_ly = new TQLabel( i18n( "Top:" ), m_grp1 ); - m_ly->resize( m_ly->tqsizeHint() ); + m_ly->resize( m_ly->sizeHint() ); pGrid->addWidget( m_ly, 1, 2 ); m_sy = new KoUnitDoubleSpinBox( m_grp1, 0, 9999, 1, 0.0, m_doc->unit() ); - m_sy->resize( m_sy->tqsizeHint() ); + m_sy->resize( m_sy->sizeHint() ); pGrid->addWidget( m_sy, 1, 3 ); m_lw = new TQLabel( i18n( "Width:" ), m_grp1 ); - m_lw->resize( m_lw->tqsizeHint() ); + m_lw->resize( m_lw->sizeHint() ); pGrid->addWidget( m_lw, 2, 0 ); m_sw = new KoUnitDoubleSpinBox( m_grp1, 0, 9999, 1, 0.0, m_doc->unit() ); - m_sw->resize( m_sw->tqsizeHint() ); + m_sw->resize( m_sw->sizeHint() ); connect( m_sw, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotUpdateHeightForWidth(double)) ); pGrid->addWidget( m_sw, 2, 1 ); m_lh = new TQLabel( i18n( "Height:" ), m_grp1 ); - m_lh->resize( m_lh->tqsizeHint() ); + m_lh->resize( m_lh->sizeHint() ); pGrid->addWidget( m_lh, 2, 2 ); m_sh = new KoUnitDoubleSpinBox( m_grp1, 0, 9999, 1, 0.0, m_doc->unit() ); connect( m_sh, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotUpdateWidthForHeight(double)) ); - m_sh->resize( m_sh->tqsizeHint() ); + m_sh->resize( m_sh->sizeHint() ); pGrid->addWidget( m_sh, 2, 3 ); @@ -1290,10 +1290,10 @@ void KWFrameDia::setupTab6() // Border style TQGroupBox *grp=new TQGroupBox( 0, Qt::Vertical, i18n( "Preview" ), m_tab6, "previewgrp" ); grid->addMultiCellWidget( grp , 0, 7, 1, 1 ); - grp->tqlayout()->setSpacing(KDialog::spacingHint()); - grp->tqlayout()->setMargin(KDialog::marginHint()); + grp->layout()->setSpacing(KDialog::spacingHint()); + grp->layout()->setMargin(KDialog::marginHint()); m_prev3 = new KoBorderPreview( grp ); - TQVBoxLayout *lay1 = new TQVBoxLayout( grp->tqlayout() ); + TQVBoxLayout *lay1 = new TQVBoxLayout( grp->layout() ); lay1->addWidget(m_prev3); connect( m_prev3, TQT_SIGNAL( choosearea(TQMouseEvent * ) ), @@ -1627,7 +1627,7 @@ void KWFrameDia::updateBrushPreview() } else { brushPreview->show(); brushPreview->setBrush(frameBrushStyle()); - brushPreview->tqrepaint(true); + brushPreview->repaint(true); } } #endif @@ -1857,11 +1857,11 @@ bool KWFrameDia::applyChanges() i18n( "A new frameset with the name '%1' " "can not be made because a frameset with that name " "already exists. Please enter another name or select " - "an existing frameset from the list.").tqarg(name)); + "an existing frameset from the list.").arg(name)); else KMessageBox::sorry( this, i18n( "A frameset with the name '%1' " - "already exists. Please enter another name." ).tqarg(name) ); + "already exists. Please enter another name." ).arg(name) ); m_eFrameSetName->setText(m_oldFrameSetName); return false; } @@ -2330,7 +2330,7 @@ bool KWFrameDia::applyChanges() void KWFrameDia::updateFrames() { m_doc->updateAllFrames(); - m_doc->tqlayout(); + m_doc->layout(); m_doc->repaintAllViews(); } @@ -2374,7 +2374,7 @@ bool KWFrameDia::mayDeleteFrameSet(KWTextFrameSet *fs) { i18n( "You are about to reconnect the last frame of the " "frameset '%1'. " "The contents of this frameset will be deleted.\n" - "Are you sure you want to do that?").tqarg(fs->name()), + "Are you sure you want to do that?").arg(fs->name()), i18n("Reconnect Frame"), i18n("&Reconnect")); if (result != KMessageBox::Continue) return false; @@ -2397,7 +2397,7 @@ KWFourSideConfigWidget::KWFourSideConfigWidget( KWDocument* doc, const TQString& mGrid->addMultiCellWidget( m_synchronize, 1, 1, 0, 1 ); TQLabel* lml = new TQLabel( i18n( "Left:" ), grp2 ); - //lml->resize( lml->tqsizeHint() ); + //lml->resize( lml->sizeHint() ); mGrid->addWidget( lml, 2, 0 ); m_inputLeft = new KoUnitDoubleSpinBox( grp2, 0, 9999, 1, 0.0, m_doc->unit() ); @@ -2405,31 +2405,31 @@ KWFourSideConfigWidget::KWFourSideConfigWidget( KWDocument* doc, const TQString& mGrid->addWidget( m_inputLeft, 2, 1 ); TQLabel* lmt = new TQLabel( i18n( "Top:" ), grp2 ); - //lmt->resize( lmt->tqsizeHint() ); + //lmt->resize( lmt->sizeHint() ); mGrid->addWidget( lmt, 2, 2 ); m_inputTop = new KoUnitDoubleSpinBox( grp2, 0, 9999, 1, 0.0, m_doc->unit() ); - //m_inputTop->resize( m_inputTop->tqsizeHint() ); + //m_inputTop->resize( m_inputTop->sizeHint() ); mGrid->addWidget( m_inputTop, 2, 3 ); TQLabel* lmr = new TQLabel( i18n( "Right:" ), grp2 ); - //lmr->resize( lmr->tqsizeHint() ); + //lmr->resize( lmr->sizeHint() ); mGrid->addWidget( lmr, 3, 0 ); m_inputRight = new KoUnitDoubleSpinBox( grp2, 0, 9999, 1, 0.0, m_doc->unit() ); - //m_inputRight->resize( m_inputRight->tqsizeHint() ); + //m_inputRight->resize( m_inputRight->sizeHint() ); mGrid->addWidget( m_inputRight, 3, 1 ); TQLabel* lmb = new TQLabel( i18n( "Bottom:" ), grp2 ); - //lmb->resize( lmb->tqsizeHint() ); + //lmb->resize( lmb->sizeHint() ); mGrid->addWidget( lmb, 3, 2 ); m_inputBottom = new KoUnitDoubleSpinBox( grp2, 0, 9999, 1, 0.0, m_doc->unit() ); - //m_inputBottom->resize( m_inputBottom->tqsizeHint() ); + //m_inputBottom->resize( m_inputBottom->sizeHint() ); mGrid->addWidget( m_inputBottom, 3, 3 ); mGrid->setRowSpacing( 0, KDialog::spacingHint() + 5 ); diff --git a/kword/KWFrameLayout.cpp b/kword/KWFrameLayout.cpp index 5a484198..8db6227a 100644 --- a/kword/KWFrameLayout.cpp +++ b/kword/KWFrameLayout.cpp @@ -38,7 +38,7 @@ KWFrameLayout::HeaderFooterFrameset::HeaderFooterFrameset( KWTextFrameSet* fs, i if ( fs->frameCount() > 0 ) m_height = fs->frame(0)->height(); else - m_height = 20; // whatever. The text tqlayout will resize it. + m_height = 20; // whatever. The text layout will resize it. Q_ASSERT( m_height > 0 ); } @@ -129,13 +129,13 @@ int KWFrameLayout::HeaderFooterFrameset::frameNumberForPage( int page ) const ///// -void KWFrameLayout::tqlayout( KWFrameSet* mainTextFrameSet, int numColumns, +void KWFrameLayout::layout( KWFrameSet* mainTextFrameSet, int numColumns, int fromPage, int toPage, uint flags ) { - //kdDebug(32002) << "KWFrameLayout::tqlayout " << kdBacktrace() << endl; + //kdDebug(32002) << "KWFrameLayout::layout " << kdBacktrace() << endl; // Just debug stuff #ifdef DEBUG_FRAMELAYOUT - kdDebug(32002) << "KWFrameLayout::tqlayout " << fromPage << " to " << toPage << endl; + kdDebug(32002) << "KWFrameLayout::layout " << fromPage << " to " << toPage << endl; Q_ASSERT( toPage >= fromPage ); TQPtrListIterator<HeaderFooterFrameset> itdbg( m_headersFooters ); for ( ; itdbg.current() ; ++itdbg ) @@ -492,10 +492,10 @@ void KWFrameLayout::tqlayout( KWFrameSet* mainTextFrameSet, int numColumns, KWTextFrameSet* fs = static_cast<KWTextFrameSet *>(mainTextFrameSet); // Not right now, this could be called during formatting... - //m_doc->tqinvalidate(); - // ### This means the tqlayout will be done during painting. Not good. - // What about mainTextFrameSet->tqinvalidate() or even tqlayout()? - //TQTimer::singleShot( 0, m_doc, TQT_SLOT( tqinvalidate() ) ); + //m_doc->invalidate(); + // ### This means the layout will be done during painting. Not good. + // What about mainTextFrameSet->invalidate() or even layout()? + //TQTimer::singleShot( 0, m_doc, TQT_SLOT( invalidate() ) ); // Invalidate main textframeset only, and from top of page only. // Otherwise loading a long document (with headers/footers) takes ages, @@ -549,8 +549,8 @@ void KWFrameLayout::resizeOrCreateHeaderFooter( KWTextFrameSet* headerFooter, ui m_framesetsToUpdate.insert( headerFooter, true ); } -// Called at beginning and end of the tqlayout for a given page, -// to determine if the main-text-frame tqlayout really changed or not. +// Called at beginning and end of the layout for a given page, +// to determine if the main-text-frame layout really changed or not. // Testing in resizeMainTextFrame doesn't work, we call it several times, // once for each footnote, so it can't detect the "no change" case. KoRect KWFrameLayout::firstColumnRect( KWFrameSet* mainTextFrameSet, int pageNum, int numColumns ) const diff --git a/kword/KWFrameLayout.h b/kword/KWFrameLayout.h index 18089ee5..c4b3f7eb 100644 --- a/kword/KWFrameLayout.h +++ b/kword/KWFrameLayout.h @@ -68,7 +68,7 @@ public: // frame number for the given page.... -1 if no frame on that page // The first frame is number 0. int frameNumberForPage( int page ) const; - // The last frame we need (0-based), tqlayout() will delete any frame after that + // The last frame we need (0-based), layout() will delete any frame after that int lastFrameNumber( int lastPage ) const; void debug(); @@ -89,14 +89,14 @@ public: enum { DontRemovePages = 1 }; /** - * The main method of this file. Do the frame tqlayout. + * The main method of this file. Do the frame layout. * @param mainTextFrameSet if set, its frames will be resized. Usually: set in WP mode, not set in DTP mode. * @param numColumns number of columns to create for the main textframeset. Only relevant if mainTextFrameSet!=0. - * @param fromPage first page to tqlayout ( 0-based ) - * @param toPage last page to tqlayout ( 0-based ) + * @param fromPage first page to layout ( 0-based ) + * @param toPage last page to layout ( 0-based ) * @param flags see enum above */ - void tqlayout( KWFrameSet* mainTextFrameSet, int numColumns, + void layout( KWFrameSet* mainTextFrameSet, int numColumns, int fromPage, int toPage, uint flags ); protected: diff --git a/kword/KWFrameSet.cpp b/kword/KWFrameSet.cpp index d1129b1f..515b0df0 100644 --- a/kword/KWFrameSet.cpp +++ b/kword/KWFrameSet.cpp @@ -292,7 +292,7 @@ void KWFrameSet::setFloating() frameSet->findPosition( dPoint, parag, index ); // Create anchor. TODO: refcount the anchors! setAnchored( frameSet, parag, index ); - frameSet->tqlayout(); + frameSet->layout(); m_doc->frameChanged( m_frames.first() ); return; } @@ -303,15 +303,15 @@ void KWFrameSet::setProtectSize( bool b) m_protectSize = b; } -void KWFrameSet::setAnchored( KWTextFrameSet* textfs, int paragId, int index, bool placeHolderExists /* = false */, bool tqrepaint ) +void KWFrameSet::setAnchored( KWTextFrameSet* textfs, int paragId, int index, bool placeHolderExists /* = false */, bool repaint ) { KWTextParag * parag = static_cast<KWTextParag *>( textfs->textDocument()->paragAt( paragId ) ); Q_ASSERT( parag ); if ( parag ) - setAnchored( textfs, parag, index, placeHolderExists, tqrepaint ); + setAnchored( textfs, parag, index, placeHolderExists, repaint ); } -void KWFrameSet::setAnchored( KWTextFrameSet* textfs, KoTextParag* parag, int index, bool placeHolderExists /* = false */, bool tqrepaint ) +void KWFrameSet::setAnchored( KWTextFrameSet* textfs, KoTextParag* parag, int index, bool placeHolderExists /* = false */, bool repaint ) { kdDebug(32001) << "KWFrameSet::setAnchored " << textfs << " " << parag->paragId() << " " << index << " " << placeHolderExists << endl; Q_ASSERT( textfs ); @@ -321,7 +321,7 @@ void KWFrameSet::setAnchored( KWTextFrameSet* textfs, KoTextParag* parag, int in m_anchorTextFs = textfs; KWFrameList::createFrameList(textfs, m_doc); // remove ourselves from others list now we are inline if ( parag ) - createAnchors( parag, index, placeHolderExists, tqrepaint ); + createAnchors( parag, index, placeHolderExists, repaint ); if ( !placeHolderExists ) // i.e. not while loading { @@ -381,7 +381,7 @@ KWAnchor * KWFrameSet::createAnchor( KoTextDocument *txt, int frameNum ) } void KWFrameSet::createAnchors( KoTextParag * parag, int index, bool placeHolderExists /*= false */ /*only used when loading*/, - bool tqrepaint ) + bool repaint ) { kdDebug(32001) << "KWFrameSet::createAnchors" << endl; Q_ASSERT( m_anchorTextFs ); @@ -398,7 +398,7 @@ void KWFrameSet::createAnchors( KoTextParag * parag, int index, bool placeHolder } } parag->setChanged( true ); - if ( tqrepaint ) + if ( repaint ) emit repaintChanged( m_anchorTextFs ); } @@ -460,7 +460,7 @@ void KWFrameSet::moveFloatingFrame( int frameNum, const KoPoint &position ) if( frame->frameStack() ) frame->frameStack()->updateAfterMove( oldPageNum ); } - tqinvalidate(); + invalidate(); } KoRect KWFrameSet::floatingFrameRect( int frameNum ) @@ -789,7 +789,7 @@ void KWFrameSet::drawFrame( KWFrame *frame, TQPainter *painter, const TQRect &fc doubleBufPainter->begin( pix ); // Initialize the pixmap to the page background color // (if the frame is over the page margins, no underlying frame will paint anything there) - doubleBufPainter->fillRect( 0, 0, outerCRect.width(), outerCRect.height(), TQApplication::tqpalette().active().brush( TQColorGroup::Base ) ); + doubleBufPainter->fillRect( 0, 0, outerCRect.width(), outerCRect.height(), TQApplication::palette().active().brush( TQColorGroup::Base ) ); // The double-buffer pixmap has (0,0) at outerCRect.topLeft(), so we need to // translate the double-buffer painter; drawFrameAndBorders will draw using view coordinates. @@ -828,7 +828,7 @@ void KWFrameSet::drawFrame( KWFrame *frame, TQPainter *painter, const TQRect &fc kdDebug(32001) << " translating by " << translationOffset.x() << ", " << translationOffset.y() << " before drawFrameContents" << endl; #endif doubleBufPainter->translate( translationOffset.x(), translationOffset.y() ); // This assume that viewToNormal() is only a translation - // We can't "tqrepaint changed parags only" if we just drew the underlying frames, hence the "false" + // We can't "repaint changed parags only" if we just drew the underlying frames, hence the "false" drawFrameContents( frame, doubleBufPainter, fcrect, frameColorGroup, false, resetChanged, edit, viewMode ); doubleBufPainter->restore(); diff --git a/kword/KWFrameSet.h b/kword/KWFrameSet.h index 7218abe7..67cad0da 100644 --- a/kword/KWFrameSet.h +++ b/kword/KWFrameSet.h @@ -199,7 +199,7 @@ public: * The way this "onlyChanged/resetChanged" works is: when something changes, * all views are asked to redraw themselves with onlyChanged=true. * But all views except the last one shouldn't reset the changed flag to false, - * otherwise the other views wouldn't tqrepaint anything. + * otherwise the other views wouldn't repaint anything. * So resetChanged is called with "false" for all views except the last one, * and with "true" for the last one, so that it resets the flag. * @@ -310,9 +310,9 @@ public: /** Allows to detect that updateFrames() hasn't been called yet (e.g. on loading) */ bool hasFramesInPageArray() const { return !m_framesInPage.isEmpty(); } - /** retqlayout text in frames, so that it flows correctly around other frames */ - virtual void tqlayout() {} - virtual void tqinvalidate() {} + /** relayout text in frames, so that it flows correctly around other frames */ + virtual void layout() {} + virtual void invalidate() {} /// save to XML - when saving virtual TQDomElement save( TQDomElement &parentElem, bool saveFrames = true ) = 0; @@ -359,11 +359,11 @@ public: * Make this frameset anchored, with the anchor at @p paragId,@p index in the text frameset @p textfs. * Also used during OASIS loading (placeHolderExists=true) */ - void setAnchored( KWTextFrameSet* textfs, KoTextParag* parag, int index, bool placeHolderExists = false, bool tqrepaint = true ); + void setAnchored( KWTextFrameSet* textfs, KoTextParag* parag, int index, bool placeHolderExists = false, bool repaint = true ); /** Make this frameset floating, with the anchor at @p paragId,@p index in the text frameset @p textfs. * \deprecated */ - void setAnchored( KWTextFrameSet* textfs, int paragId, int index, bool placeHolderExists = false, bool tqrepaint = true ); + void setAnchored( KWTextFrameSet* textfs, int paragId, int index, bool placeHolderExists = false, bool repaint = true ); /** Note that this frameset has been made floating already, and store anchor position */ void setAnchored( KWTextFrameSet* textfs ); /// Make this frameset fixed, i.e. not anchored @@ -455,7 +455,7 @@ public: signals: /// Emitted when something has changed in this frameset, - /// so that all views tqrepaint it. KWDocument connects to it, + /// so that all views repaint it. KWDocument connects to it, /// and KWCanvas connects to KWDocument. void repaintChanged( KWFrameSet * frameset ); @@ -478,7 +478,7 @@ protected: void deleteAnchor( KWAnchor * anchor ); virtual void deleteAnchors(); - virtual void createAnchors( KoTextParag * parag, int index, bool placeHolderExists = false, bool tqrepaint = true ); + virtual void createAnchors( KoTextParag * parag, int index, bool placeHolderExists = false, bool repaint = true ); KWDocument *m_doc; // Document diff --git a/kword/KWFrameStyle.cpp b/kword/KWFrameStyle.cpp index 816afa9b..65ae6fbb 100644 --- a/kword/KWFrameStyle.cpp +++ b/kword/KWFrameStyle.cpp @@ -32,7 +32,7 @@ #include <tqdom.h> KWFrameStyleCollection::KWFrameStyleCollection() - : KoUserStyleCollection( TQString::tqfromLatin1( "frame" ) ) + : KoUserStyleCollection( TQString::fromLatin1( "frame" ) ) { } diff --git a/kword/KWFrameStyle.h b/kword/KWFrameStyle.h index 3336daa2..210b9b17 100644 --- a/kword/KWFrameStyle.h +++ b/kword/KWFrameStyle.h @@ -25,7 +25,7 @@ #include <KoUserStyleCollection.h> #include "KoBorder.h" -#include <tqbrush.h> +#include <brush.h> class TQDomElement; class KoOasisContext; @@ -98,7 +98,7 @@ class KWFrameStyleCollection : public KoUserStyleCollection public: KWFrameStyleCollection(); - static TQString defaultStyleName() { return TQString::tqfromLatin1( "Plain" ); } + static TQString defaultStyleName() { return TQString::fromLatin1( "Plain" ); } /** * Find style based on the untranslated name @p name. diff --git a/kword/KWFrameStyleManager.cpp b/kword/KWFrameStyleManager.cpp index 781e9e8f..3d148f69 100644 --- a/kword/KWFrameStyleManager.cpp +++ b/kword/KWFrameStyleManager.cpp @@ -33,10 +33,10 @@ #include <tqtabwidget.h> #include <tqpushbutton.h> #include <tqlabel.h> -#include <tqbrush.h> +#include <brush.h> #include <tqgroupbox.h> #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> /******************************************************************/ /* Class: KWTableStylePreview */ @@ -90,7 +90,7 @@ void KWFrameStylePreview::setFrameStyle( KWFrameStyle *_frameStyle ) frameStyle = _frameStyle; - tqrepaint( true ); + repaint( true ); } /******************************************************************/ @@ -235,27 +235,27 @@ void KWFrameStyleManager::addGeneralTab() tabLayout->setMargin( KDialog::marginHint() ); previewBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Preview" ), tab ); - previewBox->tqlayout()->setSpacing(KDialog::spacingHint()); - previewBox->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *previewLayout = new TQGridLayout( previewBox->tqlayout() ); + previewBox->layout()->setSpacing(KDialog::spacingHint()); + previewBox->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *previewLayout = new TQGridLayout( previewBox->layout() ); preview = new KWFrameStylePreview( previewBox ); - preview->resize(preview->tqsizeHint()); + preview->resize(preview->sizeHint()); previewLayout->addWidget( preview, 0, 0 ); tabLayout->addMultiCellWidget( previewBox, 1, 1, 0, 1 ); m_nameString = new TQLineEdit( tab ); - m_nameString->resize(m_nameString->tqsizeHint() ); + m_nameString->resize(m_nameString->sizeHint() ); connect( m_nameString, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( renameStyle(const TQString &) ) ); tabLayout->addWidget( m_nameString, 0, 1 ); TQLabel *nameLabel = new TQLabel( tab ); nameLabel->setText( i18n( "Name:" ) ); - nameLabel->resize(nameLabel->tqsizeHint()); - nameLabel->tqsetAlignment( AlignRight | AlignVCenter ); + nameLabel->resize(nameLabel->sizeHint()); + nameLabel->setAlignment( AlignRight | AlignVCenter ); tabLayout->addWidget( nameLabel, 0, 0 ); @@ -383,7 +383,7 @@ void KWFrameStyleManager::addStyle() { save(); - TQString str = i18n( "New Framestyle Template (%1)" ).tqarg(numFrameStyles++); + TQString str = i18n( "New Framestyle Template (%1)" ).arg(numFrameStyles++); if ( m_currentFrameStyle ) { m_currentFrameStyle = new KWFrameStyle( *m_currentFrameStyle ); // Create a new style, initializing from the current one @@ -598,7 +598,7 @@ void KWFrameStyleBackgroundTab::updateBrushConfiguration( const TQColor & _color m_backgroundColor.setColor( _color ); brushPreview->show(); brushPreview->setBrush( m_backgroundColor ); - brushPreview->tqrepaint(true); + brushPreview->repaint(true); } TQString KWFrameStyleBackgroundTab::tabName() diff --git a/kword/KWFrameStyleManager.h b/kword/KWFrameStyleManager.h index f261b2cd..32420f31 100644 --- a/kword/KWFrameStyleManager.h +++ b/kword/KWFrameStyleManager.h @@ -60,11 +60,11 @@ public: protected: void paintEvent( TQPaintEvent *e ); - void setTopBorder(KoBorder _bTop) { frameStyle->setTopBorder( _bTop ); tqrepaint( true ); } - void setBottomBorder(KoBorder _bBottom) { frameStyle->setBottomBorder( _bBottom ); tqrepaint( true ); } - void setRightBorder(KoBorder _bRight) { frameStyle->setRightBorder( _bRight ); tqrepaint( true ); } - void setLeftBorder(KoBorder _bLeft) { frameStyle->setLeftBorder( _bLeft ); tqrepaint( true ); } - void setBackground( const TQColor & col ) { frameStyle->setBackgroundColor( col ); tqrepaint( true ); } + void setTopBorder(KoBorder _bTop) { frameStyle->setTopBorder( _bTop ); repaint( true ); } + void setBottomBorder(KoBorder _bBottom) { frameStyle->setBottomBorder( _bBottom ); repaint( true ); } + void setRightBorder(KoBorder _bRight) { frameStyle->setRightBorder( _bRight ); repaint( true ); } + void setLeftBorder(KoBorder _bLeft) { frameStyle->setLeftBorder( _bLeft ); repaint( true ); } + void setBackground( const TQColor & col ) { frameStyle->setBackgroundColor( col ); repaint( true ); } KWFrameStyle *frameStyle; }; diff --git a/kword/KWFrameViewManager.cpp b/kword/KWFrameViewManager.cpp index c4349ae8..a0070584 100644 --- a/kword/KWFrameViewManager.cpp +++ b/kword/KWFrameViewManager.cpp @@ -283,14 +283,14 @@ TQCursor KWFrameViewManager::mouseCursor( const KoPoint &point, int keyState ) c } if(view == 0) - return TQCursor(); // default arrow tqshape + return TQCursor(); // default arrow shape KWFrameSet*frameSet = view->frame()->frameSet(); switch ( meaning ) { case MEANING_NONE: return TQt::ibeamCursor; // default cursor in margins case MEANING_MOUSE_INSIDE: - return TQCursor(); // default arrow tqshape + return TQCursor(); // default arrow shape case MEANING_MOUSE_INSIDE_TEXT: return TQt::ibeamCursor; case MEANING_MOUSE_OVER_LINK: @@ -327,7 +327,7 @@ TQCursor KWFrameViewManager::mouseCursor( const KoPoint &point, int keyState ) c case MEANING_FORBIDDEN: return KCursor::handCursor(); } - return TQCursor(); // default arrow tqshape + return TQCursor(); // default arrow shape } MouseMeaning KWFrameViewManager::mouseMeaning( const KoPoint &point, int keyState) const { diff --git a/kword/KWImportStyleDia.cpp b/kword/KWImportStyleDia.cpp index 725c932e..2eefb164 100644 --- a/kword/KWImportStyleDia.cpp +++ b/kword/KWImportStyleDia.cpp @@ -21,7 +21,7 @@ #include "KWDocument.h" #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqlistbox.h> @@ -99,7 +99,7 @@ void KWImportStyleDia::loadFile() TQDomElement styleElem = listStyles.item( item ).toElement(); KoParagStyle *sty = new KoParagStyle( TQString() ); - // Load the paragtqlayout from the <STYLE> element + // Load the paraglayout from the <STYLE> element sty->loadStyle( styleElem, m_doc->syntaxVersion() ); //#### wrong syntaxVersion! TQString name = sty->displayName(); @@ -196,7 +196,7 @@ TQString KWImportFrameTableStyleDia::generateStyleName( const TQString & templat int num = 1; bool exists; do { - name = templateName.tqarg( num ); + name = templateName.arg( num ); exists = (m_list.findIndex( name )!=-1); ++num; } while ( exists ); diff --git a/kword/KWInsertDia.cpp b/kword/KWInsertDia.cpp index 09764608..23c7654a 100644 --- a/kword/KWInsertDia.cpp +++ b/kword/KWInsertDia.cpp @@ -28,7 +28,7 @@ #include <tqspinbox.h> #include <tqradiobutton.h> #include <tqbuttongroup.h> -#include <tqlayout.h> +#include <layout.h> KWInsertDia::KWInsertDia( KWView *parent, KWTableFrameSet *table, InsertType type, int insertHint) : KDialogBase( Plain, (type==insertRow?i18n("Insert Row") : i18n("Insert Column")), Ok | Cancel, Ok, parent, "Insert Table items dialog", true ) diff --git a/kword/KWInsertPageDia.cpp b/kword/KWInsertPageDia.cpp index 28d0cd34..95aed5c0 100644 --- a/kword/KWInsertPageDia.cpp +++ b/kword/KWInsertPageDia.cpp @@ -23,7 +23,7 @@ #include <klocale.h> #include <tqradiobutton.h> #include <tqgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqbuttongroup.h> #include <tqvbox.h> @@ -34,7 +34,7 @@ KWInsertPageDia::KWInsertPageDia( TQWidget *parent, const char* name ) TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Insert Page" ),page ); grp->setRadioButtonExclusive( TRUE ); - grp->tqlayout(); + grp->layout(); m_after = new TQRadioButton( i18n("After"), grp ); m_before = new TQRadioButton( i18n("Before"), grp ); diff --git a/kword/KWInsertPicDia.cpp b/kword/KWInsertPicDia.cpp index 4b5f3daa..4477068e 100644 --- a/kword/KWInsertPicDia.cpp +++ b/kword/KWInsertPicDia.cpp @@ -21,7 +21,7 @@ #include <tqpainter.h> #include <tqpushbutton.h> #include <tqbitmap.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqscrollview.h> @@ -62,7 +62,7 @@ public: m_size = picture.getOriginalSize(); m_picture = picture; resizeContents( m_size.width(), m_size.height() ); - tqrepaint( false ); + repaint( false ); return true; } else diff --git a/kword/KWInsertTOCCommand.cpp b/kword/KWInsertTOCCommand.cpp index 6c9851fe..ebf6c480 100644 --- a/kword/KWInsertTOCCommand.cpp +++ b/kword/KWInsertTOCCommand.cpp @@ -80,7 +80,7 @@ KoTextCursor * KWInsertTOCCommand::execute( KoTextCursor *c ) prevTOCParag->setPageBreaking( prevTOCParag->pageBreaking() | KWParagLayout::HardFrameBreakAfter ); // Format paragraphs, to take this page break into account and update page numbers - fs->tqlayout(); + fs->layout(); fs->updateFrames(); //kdDebug() << "KWInsertTOCCommand::execute layouting done, setting page numbers" << endl; @@ -199,7 +199,7 @@ KoTextCursor * KWInsertTOCCommand::removeTOC( KWTextFrameSet *fs, KoTextCursor * } p = p->prev(); } - textdoc->tqinvalidate(); + textdoc->invalidate(); if(posOfToc) { posOfTable=new KoTextCursor( textdoc ); @@ -217,8 +217,8 @@ KoParagStyle * KWInsertTOCCommand::findOrCreateTOCStyle( KWTextFrameSet *fs, int TQString displayName; if ( depth >= 0 ) { // Don't add i18n to this one, those are internal names and must have no spaces. - name = TQString( "Contents_Head_%1" ).tqarg( depth+1 ); - displayName = i18n( "Contents Head %1" ).tqarg( depth+1 ); + name = TQString( "Contents_Head_%1" ).arg( depth+1 ); + displayName = i18n( "Contents Head %1" ).arg( depth+1 ); } else { name = "Contents_Title"; displayName = i18n( "Contents Title" ); @@ -238,7 +238,7 @@ KoParagStyle * KWInsertTOCCommand::findOrCreateTOCStyle( KWTextFrameSet *fs, int // (not the whole line anymore), so we need the 4 borders. style->paragLayout().leftBorder = KoBorder( TQt::black, KoBorder::SOLID, 1 ); style->paragLayout().rightBorder = KoBorder( TQt::black, KoBorder::SOLID, 1 ); - style->paragLayout().tqalignment = TQt::AlignHCenter; + style->paragLayout().alignment = TQt::AlignHCenter; } else { diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp index e477f502..acca9922 100644 --- a/kword/KWMailMergeDataBase.cpp +++ b/kword/KWMailMergeDataBase.cpp @@ -37,7 +37,7 @@ #include <tqfile.h> #include <tqvbox.h> #include <tqspinbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqpushbutton.h> @@ -60,7 +60,7 @@ KWMailMergeDataBase::KWMailMergeDataBase( KWDocument *doc_ ) TQStringList KWMailMergeDataBase::availablePlugins() { TQStringList tmp; - KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::tqfromLatin1("KWord/MailMergePlugin"),TQString()); + KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),TQString()); for (KTrader::OfferList::Iterator it=pluginOffers.begin();*it;++it) { tmp.append((*it)->property("X-KDE-InternalName").toString()); @@ -79,7 +79,7 @@ bool KWMailMergeDataBase::loadPlugin(const TQString &name,const TQString &comman if (rejectdcopcall)return false; TQString constrain=TQString("[X-KDE-InternalName] =='"+name+"'"); kdDebug()<<constrain<<endl; - KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::tqfromLatin1("KWord/MailMergePlugin"),constrain); + KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),constrain); KService::Ptr it=pluginOffers.first(); TQVariant verProp=it->property("X-KDE-PluginVersion"); @@ -116,9 +116,9 @@ KWMailMergeDataSource *KWMailMergeDataBase::openPluginFor(int type,int &version) { version=0; KWMailMergeDataSource *ret=0; - TQString constrain=TQString("'%1' in [X-KDE-Capabilities]").tqarg(((type==KWSLCreate)?KWSLCreate_text:KWSLOpen_text)); + TQString constrain=TQString("'%1' in [X-KDE-Capabilities]").arg(((type==KWSLCreate)?KWSLCreate_text:KWSLOpen_text)); kdDebug()<<constrain<<endl; - KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::tqfromLatin1("KWord/MailMergePlugin"),constrain); + KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),constrain); //Only for debugging for (KTrader::OfferList::Iterator it=pluginOffers.begin();*it;++it) @@ -162,7 +162,7 @@ KWMailMergeDataSource *KWMailMergeDataBase::loadPlugin(const TQString& name) KLibrary *lib = loader->library(TQFile::encodeName(libname)); if (lib) { // get the create_ function - TQString factory=TQString("create_%1").tqarg(name); + TQString factory=TQString("create_%1").arg(name); void *create = lib->symbol(TQFile::encodeName(factory)); if (create) @@ -280,7 +280,7 @@ TQDomElement KWMailMergeDataBase::save(TQDomDocument &doc) const if (plugin) { kdDebug()<<"KWMailMergeDataBase::save() There is really something to save"<<endl; - TQDomElement el=doc.createElement(TQString::tqfromLatin1("PLUGIN")); + TQDomElement el=doc.createElement(TQString::fromLatin1("PLUGIN")); TQDataStream ds(plugin->info,IO_ReadOnly); TQString libname; @@ -288,7 +288,7 @@ TQDomElement KWMailMergeDataBase::save(TQDomDocument &doc) const el.setAttribute("library",libname); parentElem.appendChild(el); kdDebug()<<"KWMailMergeDataBase::save() Calling datasource save()"<<endl; - TQDomElement el2=doc.createElement(TQString::tqfromLatin1("DATASOURCE")); + TQDomElement el2=doc.createElement(TQString::fromLatin1("DATASOURCE")); plugin->save(doc,el2); parentElem.appendChild(el2); @@ -329,35 +329,35 @@ KWMailMergeChoosePluginDialog::KWMailMergeChoosePluginDialog( KTrader::OfferList /*parent*/ 0, "", true ), pluginOffers( offers ) { TQWidget *back = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( back, 0, spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( back, 0, spacingHint() ); TQLabel *label = new TQLabel( i18n( "&Available sources:" ), back ); chooser = new TQComboBox( false, back ); label->setBuddy( chooser ); descriptionLabel = new TQLabel( back ); descriptionLabel->hide(); - descriptionLabel->tqsetAlignment( WordBreak ); + descriptionLabel->setAlignment( WordBreak ); descriptionLabel->setFrameShape( TQFrame::Box ); descriptionLabel->setFrameShadow( TQFrame::Sunken ); - TQSize old_tqsizeHint; + TQSize old_sizeHint; for ( KTrader::OfferList::Iterator it = pluginOffers.begin(); *it; ++it ) { chooser->insertItem( (*it)->name() ); - old_tqsizeHint = descriptionLabel->tqsizeHint(); + old_sizeHint = descriptionLabel->sizeHint(); descriptionLabel->setText( (*it)->comment() ); - if (descriptionLabel->tqsizeHint().width()*descriptionLabel->tqsizeHint().height() > old_tqsizeHint.width()*old_tqsizeHint.height()) - descriptionLabel->setMinimumSize(descriptionLabel->tqsizeHint() ); + if (descriptionLabel->sizeHint().width()*descriptionLabel->sizeHint().height() > old_sizeHint.width()*old_sizeHint.height()) + descriptionLabel->setMinimumSize(descriptionLabel->sizeHint() ); } descriptionLabel->show(); connect( chooser, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( pluginChanged( int ) ) ); - tqlayout->addWidget( label ); - tqlayout->addWidget( chooser ); - tqlayout->addWidget( descriptionLabel ); - tqlayout->addStretch( 1 ); + layout->addWidget( label ); + layout->addWidget( chooser ); + layout->addWidget( descriptionLabel ); + layout->addStretch( 1 ); pluginChanged( 0 ); } @@ -387,41 +387,41 @@ KWMailMergeConfigDialog::KWMailMergeConfigDialog(TQWidget *parent,KWMailMergeDat { db_=db; TQWidget *back = plainPage(); - TQVBoxLayout *tqlayout=new TQVBoxLayout(back); + TQVBoxLayout *layout=new TQVBoxLayout(back); // TQVBox *back = new TQVBox( page ); - tqlayout->setSpacing( KDialog::spacingHint() ); + layout->setSpacing( KDialog::spacingHint() ); // TQVBox *row1 = new TQVBox( back ); // row1->setSpacing( KDialog::spacingHint() ); TQLabel *l = new TQLabel( i18n( "Datasource:" ),back ); -// l->setMaximumHeight( l->tqsizeHint().height() ); - tqlayout->addWidget(l); +// l->setMaximumHeight( l->sizeHint().height() ); + layout->addWidget(l); TQHBox *row1=new TQHBox(back); - tqlayout->addWidget(row1); + layout->addWidget(row1); row1->setSpacing( KDialog::spacingHint() ); edit=new TQPushButton(i18n("Edit Current..."),row1); create=new TQPushButton(i18n("Create New..."),row1); open=new TQPushButton(i18n("Open Existing..."),row1); KSeparator *separator1 = new KSeparator(back); - tqlayout->addWidget(separator1); + layout->addWidget(separator1); l = new TQLabel( i18n( "Merging:" ),back ); - tqlayout->addWidget(l); -// l->setMaximumHeight( l->tqsizeHint().height() ); + layout->addWidget(l); +// l->setMaximumHeight( l->sizeHint().height() ); TQHBox *row2=new TQHBox(back); - tqlayout->addWidget(row2); + layout->addWidget(row2); row2->setSpacing( KDialog::spacingHint() ); preview=new TQPushButton(i18n("Print Preview..."),row2); document=new TQPushButton(i18n("Create New Document"),row2); document->hide(); (void) new TQWidget(row2); - tqlayout->addStretch(); + layout->addStretch(); KSeparator *separator2 = new KSeparator(back); - tqlayout->addWidget(separator2); + layout->addWidget(separator2); enableDisableEdit(); @@ -482,7 +482,7 @@ void KWMailMergeConfigDialog::slotOpenClicked() void KWMailMergeConfigDialog::slotPreviewClicked() { db_->action=KWSLMergePreview; - KMainWindow *mw=dynamic_cast<KMainWindow*>(((TQWidget *)parent())->tqtopLevelWidget()); + KMainWindow *mw=dynamic_cast<KMainWindow*>(((TQWidget *)parent())->topLevelWidget()); if (mw) { KAction *ac=mw->actionCollection()->action(KStdAction::stdName(KStdAction::PrintPreview)); @@ -516,11 +516,11 @@ KWMailMergeVariableInsertDia::KWMailMergeVariableInsertDia( TQWidget *parent, KW m_db=db; TQWidget *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() ); - tqlayout->setAutoAdd( true ); + TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() ); + layout->setAutoAdd( true ); TQLabel *l = new TQLabel( i18n( "Name:" ), page ); - l->setMaximumHeight( l->tqsizeHint().height() ); + l->setMaximumHeight( l->sizeHint().height() ); names = new TQListBox( page ); TQMap< TQString, TQString >::ConstIterator it = db->getRecordEntries().begin(); diff --git a/kword/KWMailMergeDataBase.h b/kword/KWMailMergeDataBase.h index 70f75f9e..36aff677 100644 --- a/kword/KWMailMergeDataBase.h +++ b/kword/KWMailMergeDataBase.h @@ -30,7 +30,7 @@ #include <tqstring.h> #include <tqstringlist.h> #include <tqdom.h> -#include <tqtextstream.h> +#include <textstream.h> #include "KWMailMergeDataSource.h" #include "KWordMailMergeDatabaseIface.h" diff --git a/kword/KWMailMergeLabelAction.cpp b/kword/KWMailMergeLabelAction.cpp index f3d70cb6..facb6e9d 100644 --- a/kword/KWMailMergeLabelAction.cpp +++ b/kword/KWMailMergeLabelAction.cpp @@ -63,7 +63,7 @@ protected: { validDrag = false; } - TQSize tqsizeHint() const + TQSize sizeHint() const { int w = fontMetrics().width( text() ); int h = fontMetrics().height(); @@ -72,10 +72,10 @@ protected: void drawButton( TQPainter * p ) { // Draw the background - tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, p, this, rect(), tqcolorGroup(), + tqstyle().drawComplexControl( TQStyle::CC_ToolButton, p, this, rect(), colorGroup(), TQStyle::Style_Enabled, TQStyle::SC_ToolButton ); // Draw the label - tqstyle().tqdrawControl( TQStyle::CE_ToolButtonLabel, p, this, rect(), tqcolorGroup(), + tqstyle().drawControl( TQStyle::CE_ToolButtonLabel, p, this, rect(), colorGroup(), TQStyle::Style_Enabled ); } void enterEvent( TQEvent* ) {}; diff --git a/kword/KWOasisLoader.cpp b/kword/KWOasisLoader.cpp index 42d72b5e..daaa8502 100644 --- a/kword/KWOasisLoader.cpp +++ b/kword/KWOasisLoader.cpp @@ -182,7 +182,7 @@ static KWFrameSet::Info headerTypeToFrameInfo( const TQString& localName, bool / return KWFrameSet::FI_EVEN_FOOTER; // ######## KWord extension, because I'm too lazy. - // TODO: the real solution is a separate page tqlayout for the first page. + // TODO: the real solution is a separate page layout for the first page. if ( localName == "header-first" ) // NOT OASIS COMPLIANT return KWFrameSet::FI_FIRST_HEADER; if ( localName == "footer-first" ) // NOT OASIS COMPLIANT diff --git a/kword/KWPageManager.cpp b/kword/KWPageManager.cpp index 9dc797a6..e13d4099 100644 --- a/kword/KWPageManager.cpp +++ b/kword/KWPageManager.cpp @@ -196,8 +196,8 @@ void KWPageManager::removePage(KWPage *page) { m_pageList.remove(page); } -void KWPageManager::setDefaultPage(const KoPageLayout &tqlayout) { - m_defaultPageLayout = tqlayout; +void KWPageManager::setDefaultPage(const KoPageLayout &layout) { + m_defaultPageLayout = layout; // make sure we have 1 default, either pageBound or left/right bound. if(m_defaultPageLayout.ptLeft < 0 || m_defaultPageLayout.ptRight < 0) { m_defaultPageLayout.ptLeft = -1; diff --git a/kword/KWPageManager.h b/kword/KWPageManager.h index 869a68f3..8f09b577 100644 --- a/kword/KWPageManager.h +++ b/kword/KWPageManager.h @@ -111,7 +111,7 @@ public: /// return the effective pageLayout of @p pageNumber combining the default and the page specific ones const KoPageLayout pageLayout(int pageNumber) const; - void setDefaultPage(const KoPageLayout &tqlayout); + void setDefaultPage(const KoPageLayout &layout); /** * Returns the argument point, with altered coordinats if the point happens to be diff --git a/kword/KWPartFrameSet.cpp b/kword/KWPartFrameSet.cpp index fc257709..33203d0b 100644 --- a/kword/KWPartFrameSet.cpp +++ b/kword/KWPartFrameSet.cpp @@ -137,9 +137,9 @@ void KWPartFrameSet::slotChildChanged() KWFrame *frame = listFrame.current(); if ( frame ) { - frame->setRect( KoRect::fromTQRect( getChild()->tqgeometry() ) ); + frame->setRect( KoRect::fromTQRect( getChild()->geometry() ) ); - //kdDebug(32001) << "KWPartFrameSet::slotChildChanged child's tqgeometry " << getChild()->tqgeometry() + //kdDebug(32001) << "KWPartFrameSet::slotChildChanged child's geometry " << getChild()->geometry() // << " frame set to " << *frame << endl; m_doc->frameChanged( frame ); //there is just a frame @@ -237,7 +237,7 @@ void KWPartFrameSet::printDebug() kdDebug() << " Url : " << getChild()->document()->url().url()<<endl; else kdWarning() << "NO DOCUMENT" << endl; - kdDebug() << " Rectangle : " << getChild()->tqgeometry().x() << "," << getChild()->tqgeometry().y() << " " << getChild()->tqgeometry().width() << "x" << getChild()->tqgeometry().height() << endl; + kdDebug() << " Rectangle : " << getChild()->geometry().x() << "," << getChild()->geometry().y() << " " << getChild()->geometry().width() << "x" << getChild()->geometry().height() << endl; } else kdWarning() << "NO CHILD" << endl; } @@ -335,12 +335,12 @@ KWDocumentChild::~KWDocumentChild() { } -void KWDocumentChild::setDocument( KoDocument *doc, const TQRect &tqgeometry ) +void KWDocumentChild::setDocument( KoDocument *doc, const TQRect &geometry ) { // When hitTest returns true, we want to activate the part right away. // PartManager supports selecting parts, but not in a doc/view separated way. doc->setSelectable( false ); - KoDocumentChild::setDocument( doc, tqgeometry ); + KoDocumentChild::setDocument( doc, geometry ); } KoDocument* KWDocumentChild::hitTest( const TQPoint& p, const TQWMatrix& _matrix ) diff --git a/kword/KWPartFrameSet.h b/kword/KWPartFrameSet.h index 25609c1a..d486b298 100644 --- a/kword/KWPartFrameSet.h +++ b/kword/KWPartFrameSet.h @@ -53,7 +53,7 @@ public: void setChild( KWDocumentChild* child ); /** - * Update the tqgeometry of m_child based on the tqgeometry of the frame. + * Update the geometry of m_child based on the geometry of the frame. */ void updateChildGeometry(); @@ -157,7 +157,7 @@ public: KWDocument* parent()const { return m_pKWordDoc; } - virtual void setDocument( KoDocument *doc, const TQRect &tqgeometry ); + virtual void setDocument( KoDocument *doc, const TQRect &geometry ); void setPartFrameSet( KWPartFrameSet* fs ) { m_partFrameSet = fs; } KWPartFrameSet * partFrameSet() const { return m_partFrameSet; } diff --git a/kword/KWPictureFrameSet.cpp b/kword/KWPictureFrameSet.cpp index 3d04fda0..2cc8443b 100644 --- a/kword/KWPictureFrameSet.cpp +++ b/kword/KWPictureFrameSet.cpp @@ -184,7 +184,7 @@ void KWPictureFrameSet::loadOasis( const TQDomElement& frame, const TQDomElement { TQCString data = binaryData.toElement().text().latin1(); m_picture.loadFromBase64( data ); - key = KoPictureKey("nofile", TQDateTime::tqcurrentDateTime(Qt::UTC)); + key = KoPictureKey("nofile", TQDateTime::currentDateTime(Qt::UTC)); m_picture.setKey(key); } else @@ -199,7 +199,7 @@ void KWPictureFrameSet::loadOasis( const TQDomElement& frame, const TQDomElement strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. } TQString filename(href/*.mid(1)*/); - key = KoPictureKey(filename, TQDateTime::tqcurrentDateTime(Qt::UTC)); + key = KoPictureKey(filename, TQDateTime::currentDateTime(Qt::UTC)); m_picture.setKey(key); KoStore* store = context.store(); diff --git a/kword/KWResizeTableDia.cpp b/kword/KWResizeTableDia.cpp index 3502701b..08c2ada2 100644 --- a/kword/KWResizeTableDia.cpp +++ b/kword/KWResizeTableDia.cpp @@ -43,10 +43,10 @@ KWResizeTableDia::KWResizeTableDia( TQWidget *parent, KWTableFrameSet *table, KW void KWResizeTableDia::setupTab1(int resizeColumn) { TQVBox *page = makeVBoxMainWidget(); TQLabel *rc = new TQLabel( i18n( "Column:" ), page ); - rc->resize( rc->tqsizeHint() ); - rc->tqsetAlignment( AlignLeft | AlignBottom ); + rc->resize( rc->sizeHint() ); + rc->setAlignment( AlignLeft | AlignBottom ); m_value = new TQSpinBox( 1, m_table->getColumns(), 1, page ); - m_value->resize( m_value->tqsizeHint() ); + m_value->resize( m_value->sizeHint() ); m_value->setValue( resizeColumn ); rc = new TQLabel( i18n( "Width:" ), page ); diff --git a/kword/KWSelectBookmarkDiaBase.ui b/kword/KWSelectBookmarkDiaBase.ui index 474498f4..55da7d96 100644 --- a/kword/KWSelectBookmarkDiaBase.ui +++ b/kword/KWSelectBookmarkDiaBase.ui @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kword/KWSortDia.cpp b/kword/KWSortDia.cpp index 047dcf93..ff6d1d73 100644 --- a/kword/KWSortDia.cpp +++ b/kword/KWSortDia.cpp @@ -20,7 +20,7 @@ #include "KWSortDia.h" -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <tqradiobutton.h> #include <tqgroupbox.h> @@ -34,7 +34,7 @@ KWSortDia::KWSortDia( TQWidget *parent, const char* name ) TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Sort" ),page ); grp->setRadioButtonExclusive( TRUE ); - grp->tqlayout(); + grp->layout(); m_increase = new TQRadioButton( i18n("Increase"), grp ); m_decrease = new TQRadioButton( i18n("Decrease"), grp ); diff --git a/kword/KWSplitCellDia.cpp b/kword/KWSplitCellDia.cpp index 5e988ea3..c67e46c9 100644 --- a/kword/KWSplitCellDia.cpp +++ b/kword/KWSplitCellDia.cpp @@ -21,7 +21,7 @@ #include "KWSplitCellDia.moc" #include "KWTableDia.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqspinbox.h> diff --git a/kword/KWStartupWidget.cpp b/kword/KWStartupWidget.cpp index 60dab02b..3f941aae 100644 --- a/kword/KWStartupWidget.cpp +++ b/kword/KWStartupWidget.cpp @@ -25,7 +25,7 @@ #include <kdebug.h> #include <tqpushbutton.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> KWStartupWidget::KWStartupWidget(TQWidget *parent, KWDocument *doc, const KoColumns &columns) : KWStartupWidgetBase(parent) { @@ -55,9 +55,9 @@ KWStartupWidget::KWStartupWidget(TQWidget *parent, KWDocument *doc, const KoColu connect (m_WpStyleCheckbox, TQT_SIGNAL(toggled(bool)), m_columnsWidget, TQT_SLOT(setEnableColumns(bool))); } -void KWStartupWidget::sizeUpdated(KoPageLayout &tqlayout) { - m_layout = tqlayout; - m_columnsWidget->setLayout(tqlayout); +void KWStartupWidget::sizeUpdated(KoPageLayout &layout) { + m_layout = layout; + m_columnsWidget->setLayout(layout); } void KWStartupWidget::columnsUpdated(KoColumns &columns) { diff --git a/kword/KWStartupWidget.h b/kword/KWStartupWidget.h index 8202488c..22460eed 100644 --- a/kword/KWStartupWidget.h +++ b/kword/KWStartupWidget.h @@ -43,7 +43,7 @@ public: KWStartupWidget(TQWidget *parent, KWDocument *doc, const KoColumns &columns); private slots: - void sizeUpdated(KoPageLayout &tqlayout); + void sizeUpdated(KoPageLayout &layout); void columnsUpdated(KoColumns &columns); void buttonClicked(); diff --git a/kword/KWStartupWidgetBase.ui b/kword/KWStartupWidgetBase.ui index 57d7ce2f..cac182d2 100644 --- a/kword/KWStartupWidgetBase.ui +++ b/kword/KWStartupWidgetBase.ui @@ -65,7 +65,7 @@ For letters and notes with one main text, possibly on several pages, you should <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -90,7 +90,7 @@ For letters and notes with one main text, possibly on several pages, you should <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kword/KWStatisticsDialog.cpp b/kword/KWStatisticsDialog.cpp index e8cd0e92..be1fa14e 100644 --- a/kword/KWStatisticsDialog.cpp +++ b/kword/KWStatisticsDialog.cpp @@ -23,7 +23,7 @@ #include <tqtabwidget.h> #include <tqvbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqprogressdialog.h> #include <tqcheckbox.h> @@ -206,7 +206,7 @@ bool KWStatisticsDialog::calcStats( TQLabel **resultLabel, bool selection, bool TQString flesch = locale->formatNumber( f , 1 ); if( words < 200 ) { // a kind of warning if too few words: - flesch = i18n("approximately %1").tqarg( flesch ); + flesch = i18n("approximately %1").arg( flesch ); } resultLabel[6]->setText( flesch ); return true; @@ -295,7 +295,7 @@ void KWStatisticsDialog::addBox( TQFrame *page, TQLabel **resultLabel, bool calc grid->addRowSpacing( 0, fHeight ); //maximum size for result column (don't know how to do this better..) - TQString init = i18n("approximately %1").tqarg( "00000000" ); + TQString init = i18n("approximately %1").arg( "00000000" ); // insert labels TQLabel *label1 = new TQLabel( i18n( "Characters including spaces:" ), box ); diff --git a/kword/KWTableDia.cpp b/kword/KWTableDia.cpp index 013a2be6..21b0670c 100644 --- a/kword/KWTableDia.cpp +++ b/kword/KWTableDia.cpp @@ -32,7 +32,7 @@ #include <kcommand.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqspinbox.h> #include <tqcheckbox.h> #include <tqbuttongroup.h> diff --git a/kword/KWTableDia.h b/kword/KWTableDia.h index 09dff25a..bf0f835f 100644 --- a/kword/KWTableDia.h +++ b/kword/KWTableDia.h @@ -52,8 +52,8 @@ public: KWTablePreview( TQWidget *_parent, int _rows, int _cols ) : TQWidget( _parent ), rows( _rows ), cols( _cols ) {} - void setRows( int _rows ) { rows = _rows; tqrepaint( true ); } - void setCols( int _cols ) { cols = _cols; tqrepaint( true ); } + void setRows( int _rows ) { rows = _rows; repaint( true ); } + void setCols( int _cols ) { cols = _cols; repaint( true ); } protected: void paintEvent( TQPaintEvent *e ); diff --git a/kword/KWTableFrameSet.cpp b/kword/KWTableFrameSet.cpp index f108573b..34765348 100644 --- a/kword/KWTableFrameSet.cpp +++ b/kword/KWTableFrameSet.cpp @@ -52,7 +52,7 @@ DESCRIPTION #include <dcopobject.h> #include <tqapplication.h> #include <tqpopupmenu.h> -#include <tqclipboard.h> +#include <clipboard.h> KWTableFrameSet::KWTableFrameSet( KWDocument *doc, const TQString & name ) : @@ -143,7 +143,7 @@ KWAnchor * KWTableFrameSet::createAnchor( KoTextDocument *txt, int frameNum ) } void KWTableFrameSet::createAnchors( KoTextParag * parag, int index, bool placeHolderExists /*= false */ /*only used when loading*/, - bool tqrepaint ) + bool repaint ) { //kdDebug(32004) << "KWTableFrameSet::createAnchors" << endl; // TODO make one rect per page, and create one anchor per page @@ -154,7 +154,7 @@ void KWTableFrameSet::createAnchors( KoTextParag * parag, int index, bool placeH parag->setCustomItem( index, anchor, 0 ); kdDebug(32004) << "KWTableFrameSet::createAnchors setting anchor" << endl; parag->setChanged( true ); - if ( tqrepaint ) + if ( repaint ) emit repaintChanged( m_anchorTextFs ); } @@ -1454,7 +1454,7 @@ void KWTableFrameSet::validate() for(uint j = cells->firstColumn(); j < cells->columnAfter(); ++j) { if( cell(i,j) != cells.current() ) { - TQString str = TQString("| 0x%1 ").tqarg( (unsigned long)cells.current(), 0, 16 ); + TQString str = TQString("| 0x%1 ").arg( (unsigned long)cells.current(), 0, 16 ); kdDebug(32004) << " KWTableFrameSet::validate() failed " << endl; kdDebug(32004) << "at row: "<< i << " col: "<< j << " cell: "<< str << endl; kdDebug(32004) << cells->firstRow() << " " << cells->firstColumn() << " " << cells->rowSpan() @@ -2183,16 +2183,16 @@ void KWTableFrameSet::finalize( ) { KWFrameSet::finalize(); } -void KWTableFrameSet::tqlayout() +void KWTableFrameSet::layout() { for (TableIter cells(this) ; cells ; ++cells) - cells->tqlayout(); + cells->layout(); } -void KWTableFrameSet::tqinvalidate() +void KWTableFrameSet::invalidate() { for (TableIter cells(this) ; cells ; ++cells) - cells->tqinvalidate(); + cells->invalidate(); } void KWTableFrameSet::setVisible( bool v ) @@ -2291,9 +2291,9 @@ void KWTableFrameSet::printArrayDebug() { kdDebug(32004) << " | Row/Cell arrays" << endl; Q_ASSERT( m_rows == m_rowArray.size() ); for ( unsigned int row = 0; row < m_rows; ++row ) { - TQString str = TQString( " | Row %1: " ).tqarg( row ); + TQString str = TQString( " | Row %1: " ).arg( row ); for ( unsigned int col = 0; col < getColumns(); ++col ) - str += TQString("| 0x%1 ").tqarg( (unsigned long)(*m_rowArray[row])[col], 0, 16 ); + str += TQString("| 0x%1 ").arg( (unsigned long)(*m_rowArray[row])[col], 0, 16 ); kdDebug(32004) << str<< " |" << endl; } } @@ -2319,7 +2319,7 @@ KWTableFrameSet::Cell::Cell( KWTableFrameSet *table, unsigned int row, unsigned KWTextFrameSet( table->m_doc, // Generate frameset name from table_name+row+col i18n("Hello dear translator :), 1 is the table name, 2 and 3 are row and column", "%1 Cell %2,%3") - .tqarg( table->name() ).tqarg(row).tqarg(col) ) + .arg( table->name() ).arg(row).arg(col) ) { m_row = row; m_col = col; @@ -2829,7 +2829,7 @@ KWTableFrameSet::MarkedIterator::MarkedIterator(KWTableFrameSet *table) : if ( current() ) { // kdDebug() << "MarkedIterator: visit: " -// << TQString("| 0x%1 ").tqarg((unsigned long)current(), 0, 16) << endl; +// << TQString("| 0x%1 ").arg((unsigned long)current(), 0, 16) << endl; current()->setMark(); } } @@ -2844,7 +2844,7 @@ KWTableFrameSet::MarkedIterator::operator++() } if ( current() ) { // kdDebug() << "MarkedIterator: visit: " -// << TQString("| 0x%1 ").tqarg((unsigned long)current(), 0, 16) << endl; +// << TQString("| 0x%1 ").arg((unsigned long)current(), 0, 16) << endl; current()->setMark(); } return ret; diff --git a/kword/KWTableFrameSet.h b/kword/KWTableFrameSet.h index e379f3b6..d5fdea1a 100644 --- a/kword/KWTableFrameSet.h +++ b/kword/KWTableFrameSet.h @@ -472,8 +472,8 @@ public: ulong & sentences, ulong & syllables,ulong & lines, bool selected ); virtual void finalize(); - virtual void tqinvalidate(); - virtual void tqlayout(); + virtual void invalidate(); + virtual void layout(); virtual void updateFrames( int flags = 0xff ); @@ -520,7 +520,7 @@ protected: /// \overload KWFrameSet::deleteAnchors virtual void deleteAnchors(); /// \overload KWFrameSet::createAnchors - virtual void createAnchors( KoTextParag * parag, int index, bool placeHolderExists = false, bool tqrepaint = true ); + virtual void createAnchors( KoTextParag * parag, int index, bool placeHolderExists = false, bool repaint = true ); private: void addCellToArray( Cell* cell ); diff --git a/kword/KWTableStyle.cpp b/kword/KWTableStyle.cpp index 47f9029b..20016d49 100644 --- a/kword/KWTableStyle.cpp +++ b/kword/KWTableStyle.cpp @@ -31,7 +31,7 @@ #include <tqdom.h> KWTableStyleCollection::KWTableStyleCollection() - : KoUserStyleCollection( TQString::tqfromLatin1( "table" ) ) + : KoUserStyleCollection( TQString::fromLatin1( "table" ) ) { } diff --git a/kword/KWTableStyle.h b/kword/KWTableStyle.h index 0452312e..aa987589 100644 --- a/kword/KWTableStyle.h +++ b/kword/KWTableStyle.h @@ -26,7 +26,7 @@ #include <tqdom.h> #include <tqptrlist.h> -#include <tqbrush.h> +#include <brush.h> class KWFrameStyleCollection; class KoStyleCollection; @@ -89,7 +89,7 @@ class KWTableStyleCollection : public KoUserStyleCollection public: KWTableStyleCollection(); - static TQString defaultStyleName() { return TQString::tqfromLatin1( "Plain" ); } + static TQString defaultStyleName() { return TQString::fromLatin1( "Plain" ); } /** * Find style based on the untranslated name @p name. diff --git a/kword/KWTableStyleManager.cpp b/kword/KWTableStyleManager.cpp index c7cd547a..4682c2cf 100644 --- a/kword/KWTableStyleManager.cpp +++ b/kword/KWTableStyleManager.cpp @@ -39,7 +39,7 @@ #include <tqgroupbox.h> #include <tqpainter.h> #include <tqlineedit.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcombobox.h> #include <tqframe.h> @@ -118,19 +118,19 @@ void KWTableStylePreview::drawContents( TQPainter *p ) { // For centering to work, and to even get word wrapping when the thing is too big :) m_textdoc->setWidth( widthLU ); - parag->tqinvalidate(0); + parag->invalidate(0); } parag->format(); TQRect textRect = parag->pixelRect( m_zoomHandler ); - // Center vertically, but not horizontally, to keep the parag tqalignment working, + // Center vertically, but not horizontally, to keep the parag alignment working, textRect.moveTopLeft( TQPoint( fr.x(), fr.y() + ( fr.height() - textRect.height() ) / 2 ) ); p->setClipRect( textRect.intersect( fr ) ); p->translate( textRect.x(), textRect.y() ); - TQColorGroup cg = TQApplication::tqpalette().active(); + TQColorGroup cg = TQApplication::palette().active(); cg.setBrush( TQColorGroup::Base, tableStyle->frameStyle()->backgroundColor() ); m_textdoc->drawWYSIWYG( p, 1, 0, textRect.width() - 1, textRect.height(), cg, m_zoomHandler ); @@ -145,7 +145,7 @@ void KWTableStylePreview::setTableStyle( KWTableStyle *_tableStyle ) KoTextParag * parag = m_textdoc->firstParag(); parag->applyStyle( tableStyle->paragraphStyle() ); - tqrepaint(true); + repaint(true); } /******************************************************************/ @@ -275,35 +275,35 @@ void KWTableStyleManager::setupMain() mainLayout->setSpacing( KDialog::spacingHint() ); preview = new KWTableStylePreview( i18n("Preview"), i18n("Tablestyles preview"), main ); - preview->resize(preview->tqsizeHint()); + preview->resize(preview->sizeHint()); mainLayout->addMultiCellWidget( preview, 1, 1, 0, 1 ); m_nameString = new TQLineEdit( main ); - m_nameString->resize(m_nameString->tqsizeHint() ); + m_nameString->resize(m_nameString->sizeHint() ); connect( m_nameString, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( renameStyle(const TQString &) ) ); mainLayout->addWidget( m_nameString, 0, 1 ); TQLabel *nameLabel = new TQLabel( main ); nameLabel->setText( i18n( "Name:" ) ); - nameLabel->resize(nameLabel->tqsizeHint()); - nameLabel->tqsetAlignment( AlignRight | AlignVCenter ); + nameLabel->resize(nameLabel->sizeHint()); + nameLabel->setAlignment( AlignRight | AlignVCenter ); mainLayout->addWidget( nameLabel, 0, 0 ); TQGroupBox *adjustBox = new TQGroupBox( 0, Qt::Vertical, i18n("Adjust"), main); - adjustBox->tqlayout()->setSpacing(KDialog::spacingHint()); - adjustBox->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *adjustLayout = new TQGridLayout( adjustBox->tqlayout() ); + adjustBox->layout()->setSpacing(KDialog::spacingHint()); + adjustBox->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *adjustLayout = new TQGridLayout( adjustBox->layout() ); TQLabel *frameStyleLabel = new TQLabel( adjustBox ); frameStyleLabel->setText( i18n( "Framestyle:" ) ); - frameStyleLabel->tqsetAlignment( AlignRight | AlignVCenter ); + frameStyleLabel->setAlignment( AlignRight | AlignVCenter ); TQLabel *styleLabel = new TQLabel( adjustBox ); styleLabel->setText( i18n( "Textstyle:" ) ); - styleLabel->tqsetAlignment( AlignRight | AlignVCenter ); + styleLabel->setAlignment( AlignRight | AlignVCenter ); m_frameStyle = new TQComboBox( adjustBox ); m_style = new TQComboBox( adjustBox ); @@ -412,7 +412,7 @@ void KWTableStyleManager::addStyle() save(); KWTableStyleCollection* collection = m_doc->tableStyleCollection(); - TQString str = i18n( "New Tablestyle Template (%1)" ).tqarg(numTableStyles++); + TQString str = i18n( "New Tablestyle Template (%1)" ).arg(numTableStyles++); if ( m_currentTableStyle ) { m_currentTableStyle = new KWTableStyle( *m_currentTableStyle ); diff --git a/kword/KWTableTemplate.h b/kword/KWTableTemplate.h index b0e608d7..6d62dc56 100644 --- a/kword/KWTableTemplate.h +++ b/kword/KWTableTemplate.h @@ -24,7 +24,7 @@ #include <tqdom.h> #include <tqptrlist.h> -#include <tqbrush.h> +#include <brush.h> class KWTableTemplate; class KWDocument; diff --git a/kword/KWTableTemplateSelector.cpp b/kword/KWTableTemplateSelector.cpp index c36743df..98e5e8fb 100644 --- a/kword/KWTableTemplateSelector.cpp +++ b/kword/KWTableTemplateSelector.cpp @@ -41,7 +41,7 @@ #include <tqdom.h> #include <tqrect.h> #include <tqptrlist.h> -#include <tqlayout.h> +#include <layout.h> #include <stdlib.h> #include <math.h> @@ -190,7 +190,7 @@ void KWTableTemplatePreview::drawCell( TQPainter *p, const KWTableStyle *ts, con { // For centering to work, and to even get word wrapping when the thing is too big :) m_textdoc->setWidth( widthLU ); - parag->tqinvalidate(0); + parag->invalidate(0); } double x_add = ( (rb < ts->frameStyle()->rightBorder().width()) ? ts->frameStyle()->rightBorder().width() : rb ) +1; @@ -207,7 +207,7 @@ void KWTableTemplatePreview::drawCell( TQPainter *p, const KWTableStyle *ts, con p->setClipRect( textRect.intersect( globalRect ) ); p->translate( textRect.x(), textRect.y() ); - TQColorGroup cg = TQApplication::tqpalette().active(); + TQColorGroup cg = TQApplication::palette().active(); cg.setBrush( TQColorGroup::Base, ts->frameStyle()->backgroundColor() ); m_textdoc->drawWYSIWYG( p, 1, 0, textRect.width() - 1, textRect.height(), cg, m_zoomHandler ); @@ -403,7 +403,7 @@ void KWTableTemplatePreview::setTableTemplate( KWTableTemplate *_tableTemplate ) setSpecialCells(_tableTemplate); - tqrepaint( true ); + repaint( true ); } void KWTableTemplatePreview::fillContents() @@ -447,7 +447,7 @@ void KWTableTemplatePreview::cbFirstRowChanged( bool enable ) if ( (!enable) && ( origTableTemplate->pTopRightCorner()==origTableTemplate->pFirstRow() ) ) tableTemplate->setTopRightCorner( tableTemplate->pBodyCell() ); if ( !m_disableRepaint ) - tqrepaint( true ); + repaint( true ); } void KWTableTemplatePreview::cbFirstColChanged( bool enable ) @@ -470,7 +470,7 @@ void KWTableTemplatePreview::cbFirstColChanged( bool enable ) tableTemplate->setBottomLeftCorner( tableTemplate->pBodyCell() ); if ( !m_disableRepaint ) - tqrepaint( true ); + repaint( true ); } void KWTableTemplatePreview::cbLastRowChanged( bool enable ) @@ -493,7 +493,7 @@ void KWTableTemplatePreview::cbLastRowChanged( bool enable ) tableTemplate->setBottomLeftCorner( tableTemplate->pBodyCell() ); if ( !m_disableRepaint ) - tqrepaint( true ); + repaint( true ); } void KWTableTemplatePreview::cbLastColChanged( bool enable ) @@ -516,7 +516,7 @@ void KWTableTemplatePreview::cbLastColChanged( bool enable ) tableTemplate->setBottomRightCorner( tableTemplate->pBodyCell() ); if ( !m_disableRepaint ) - tqrepaint( true ); + repaint( true ); } void KWTableTemplatePreview::cbBodyChanged( bool enable ) @@ -533,7 +533,7 @@ void KWTableTemplatePreview::cbBodyChanged( bool enable ) delete oldTemplate; if ( !m_disableRepaint ) - tqrepaint( true ); + repaint( true ); } @@ -648,7 +648,7 @@ void KWTableTemplateSelector::initPreview() preview->cbLastColChanged( cbLastCol->isChecked() ); preview->cbBodyChanged( cbBody->isChecked() ); preview->disableRepaint(false); - preview->tqrepaint(); + preview->repaint(); } int KWTableTemplateSelector::getFormatType() const diff --git a/kword/KWTableTemplateSelector.h b/kword/KWTableTemplateSelector.h index 1bae479b..9933b57a 100644 --- a/kword/KWTableTemplateSelector.h +++ b/kword/KWTableTemplateSelector.h @@ -26,9 +26,9 @@ #include <tqlabel.h> #include <tqpushbutton.h> -/*#include <tqlayout.h> +/*#include <layout.h> #include <tqfont.h> -#include <tqbrush.h> +#include <brush.h> */ class TQListBox; diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp index 43a1de5a..cf0d8943 100644 --- a/kword/KWTextFrameSet.cpp +++ b/kword/KWTextFrameSet.cpp @@ -59,7 +59,7 @@ #include <kmessagebox.h> #include <kdebug.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqdragobject.h> #include <tqcursor.h> #include <tqfile.h> @@ -396,7 +396,7 @@ KWFrame * KWTextFrameSet::internalToDocumentWithHint( const TQPoint &iPoint, KoP kdDebug() << "ITD: r=" << r << " iPoint=" << iPoint.x() << "," << iPoint.y() << endl; #endif // r is the frame in qrt coords - if ( r.contains( iPoint ) ) // both r and p are in tqlayout units (aka internal) + if ( r.contains( iPoint ) ) // both r and p are in layout units (aka internal) { dPoint = internalToDocumentKnowingFrame( iPoint, theFrame ); #ifdef DEBUG_ITD @@ -615,7 +615,7 @@ void KWTextFrameSet::drawFrameContents( KWFrame *theFrame, TQPainter *painter, c var->resize(); TQSize newSize( var->width, var->height ); if ( oldSize != newSize ) - var->paragraph()->tqinvalidate( 0 ); // size has changed -> need reformatting ! + var->paragraph()->invalidate( 0 ); // size has changed -> need reformatting ! var->paragraph()->setChanged( true ); } } @@ -757,7 +757,7 @@ void KWTextFrameSet::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursor #endif p->save(); - TQColorGroup cg = TQApplication::tqpalette().active(); + TQColorGroup cg = TQApplication::palette().active(); if ( hasFrames ) { @@ -824,18 +824,18 @@ void KWTextFrameSet::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursor m_currentDrawnFrame = 0L; } -void KWTextFrameSet::tqlayout() +void KWTextFrameSet::layout() { - tqinvalidate(); + invalidate(); // Get the thing going though, repainting doesn't call formatMore m_textobj->formatMore( 2 ); } -void KWTextFrameSet::tqinvalidate() +void KWTextFrameSet::invalidate() { - //kdDebug() << "KWTextFrameSet::tqinvalidate " << name() << endl; + //kdDebug() << "KWTextFrameSet::invalidate " << name() << endl; m_textobj->setLastFormattedParag( textDocument()->firstParag() ); - textDocument()->tqinvalidate(); // lazy tqlayout, real update follows upon next tqrepaint + textDocument()->invalidate(); // lazy layout, real update follows upon next repaint } void KWTextFrameSet::slotRepaintChanged() @@ -960,7 +960,7 @@ void KWTextFrameSet::getMargins( int yp, int h, int reqMinWidth, if ( validHeight ) *validHeight = h; // TODO - // Everything from there is in tqlayout units + // Everything from there is in layout units // Note: it is very important that this method works in internal coordinates. // Otherwise, parags broken at the line-level (e.g. between two columns) are seen // as still in one piece, and we miss the frames in the 2nd column. @@ -1984,7 +1984,7 @@ bool KWTextFrameSet::slotAfterFormattingNeedMoreSpace( int bottom, KoTextParag * frmBehavior = KWFrame::Ignore; } - int difference = ( bottom + 2 ) - availHeight; // in tqlayout unit pixels + int difference = ( bottom + 2 ) - availHeight; // in layout unit pixels #ifdef DEBUG_FORMAT_MORE kdDebug(32002) << "AutoExtendFrame bottom=" << bottom << " availHeight=" << availHeight << " => difference = " << difference << endl; @@ -2388,7 +2388,7 @@ bool KWTextFrameSet::createNewPageAndNewFrame( KoTextParag* lastFormatted, int / Q_ASSERT(frame(0) && frame(0)->frameStack()); frame(0)->frameStack()->update(); /// We don't want to start from the beginning every time ! - ////m_doc->tqinvalidate(); + ////m_doc->invalidate(); // Reformat the last paragraph. If it's over the two pages, it will need // the new page (e.g. for inline frames that need internalToDocument to work) @@ -2400,7 +2400,7 @@ bool KWTextFrameSet::createNewPageAndNewFrame( KoTextParag* lastFormatted, int / if ( lastFormatted ) { m_textobj->setLastFormattedParag( lastFormatted ); - lastFormatted->tqinvalidate( 0 ); + lastFormatted->invalidate( 0 ); //This was a way to format the rest from here (recursively), but it didn't help much ensureCursorVisible() //So instead I fixed formatMore to return formatMore(2) itself. //m_textobj->formatMore( 2 ); @@ -2484,12 +2484,12 @@ void KWTextFrameSet::frameResized( KWFrame *theFrame, bool invalidateLayout ) m_doc->recalcFrames( theFrame->pageNumber(), -1 ); // warning this can delete theFrame! // m_doc->frameChanged( theFrame ); - // Warning, can't call tqlayout() (frameChanged calls it) + // Warning, can't call layout() (frameChanged calls it) // from here, since it calls formatMore() ! if ( invalidateLayout ) - m_doc->tqinvalidate(this); + m_doc->invalidate(this); - // Can't tqrepaint directly, we might be in a paint event already + // Can't repaint directly, we might be in a paint event already m_doc->delayedRepaintAllViews(); } @@ -2770,7 +2770,7 @@ bool KWTextFrameSet::minMaxInternalOnPage( int pageNum, int& topLU, int& bottomL topPt = TQMIN( topPt, y ); bottomPt = TQMAX( bottomPt, y + frameIt.current()->height() ); } - // Convert to tqlayout units + // Convert to layout units topLU = m_doc->ptToLayoutUnitPixY( topPt ); bottomLU = m_doc->ptToLayoutUnitPixY( bottomPt ); return true; @@ -2819,13 +2819,13 @@ TQString KWTextFrameSet::toPlainText() const return m_textobj->textDocument()->plainText(); } -void KWTextFrameSet::highlightPortion( KoTextParag * parag, int index, int length, KWCanvas * canvas, bool tqrepaint, KDialogBase* dialog ) +void KWTextFrameSet::highlightPortion( KoTextParag * parag, int index, int length, KWCanvas * canvas, bool repaint, KDialogBase* dialog ) { Q_ASSERT( isVisible() ); Q_ASSERT( m_textobj->isVisible() ); - //kdDebug() << "highlighting in " << name() << " parag=" << parag->paragId() << " index=" << index << " tqrepaint=" << tqrepaint << endl; - m_textobj->highlightPortion( parag, index, length, tqrepaint ); - if ( tqrepaint ) { + //kdDebug() << "highlighting in " << name() << " parag=" << parag->paragId() << " index=" << index << " repaint=" << repaint << endl; + m_textobj->highlightPortion( parag, index, length, repaint ); + if ( repaint ) { // Position the cursor canvas->editTextFrameSet( this, parag, index ); // Ensure text is fully visible @@ -2843,9 +2843,9 @@ void KWTextFrameSet::highlightPortion( KoTextParag * parag, int index, int lengt } } -void KWTextFrameSet::removeHighlight( bool tqrepaint ) +void KWTextFrameSet::removeHighlight( bool repaint ) { - m_textobj->removeHighlight( tqrepaint ); + m_textobj->removeHighlight( repaint ); } void KWTextFrameSet::clearUndoRedoInfo() @@ -2920,7 +2920,7 @@ protected: } }; -void KWTextFrameSet::renumberFootNotes( bool tqrepaint ) +void KWTextFrameSet::renumberFootNotes( bool repaint ) { KWFootNoteVarList lst; TQPtrListIterator<KoTextCustomItem> cit( textDocument()->allCustomItems() ); @@ -2986,17 +2986,17 @@ void KWTextFrameSet::renumberFootNotes( bool tqrepaint ) if ( var->numberingType()== KWFootNoteVariable::Manual) var->frameSet()->setName( m_doc->generateFramesetName(fsName)); else - var->frameSet()->setName( fsName.tqarg( var->text() ) ); + var->frameSet()->setName( fsName.arg( var->text() ) ); var->frameSet()->setCounterText( var->text() ); } var->resize(); - var->paragraph()->tqinvalidate(0); + var->paragraph()->invalidate(0); var->paragraph()->setChanged( true ); needRepaint = true; } ++vit; } - if ( needRepaint && tqrepaint ) + if ( needRepaint && repaint ) m_doc->slotRepaintChanged( this ); } @@ -3048,7 +3048,7 @@ TQByteArray KWTextFrameSet::sortText(SortType type) const // This is used when loading (KWTextDocument::loadOasisFootnote) // and when inserting from the GUI (KWTextFrameSetEdit::insertFootNote), -// so don't add any 'tqrepaint' or 'recalc' code here +// so don't add any 'repaint' or 'recalc' code here KWFootNoteFrameSet * KWTextFrameSet::insertFootNote( NoteType noteType, KWFootNoteVariable::Numbering numType, const TQString &manualString ) { kdDebug() << "KWTextFrameSetEdit::insertFootNote " << endl; @@ -3146,7 +3146,7 @@ void KWTextFrameSetEdit::slotFrameDeleted( KWFrame *frm ) void KWTextFrameSetEdit::paste() { - TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); int provides = KWView::checkClipboard( data ); pasteData( data, provides, false ); } @@ -3161,9 +3161,9 @@ void KWTextFrameSetEdit::pasteData( TQMimeSource* data, int provides, bool drop } else if ( provides & KWView::ProvidesPlainText ) { - // Note: TQClipboard::text() seems to do a better job than tqencodedData( "text/plain" ) + // Note: TQClipboard::text() seems to do a better job than encodedData( "text/plain" ) // In particular it handles charsets (in the mimetype). - const TQString text = TQApplication::tqclipboard()->text(); + const TQString text = TQApplication::clipboard()->text(); const bool removeSelected = !drop; if ( !text.isEmpty() ) textObject()->pasteText( cursor(), text, currentFormat(), removeSelected ); @@ -3188,7 +3188,7 @@ KCommand* KWTextFrameSetEdit::pasteOasisCommand( TQMimeSource* data ) TQCString returnedTypeMime = KoTextObject::providesOasis( data ); if ( !returnedTypeMime.isEmpty() ) { - TQByteArray arr = data->tqencodedData( returnedTypeMime ); + TQByteArray arr = data->encodedData( returnedTypeMime ); Q_ASSERT( !arr.isEmpty() ); if ( arr.size() ) return textFrameSet()->pasteOasis( cursor(), arr, true ); @@ -3208,7 +3208,7 @@ void KWTextFrameSetEdit::copy() { if ( textDocument()->hasSelection( KoTextDocument::Standard ) ) { TQDragObject *drag = newDrag( 0 ); - TQApplication::tqclipboard()->setData( drag ); + TQApplication::clipboard()->setData( drag ); } } @@ -3652,9 +3652,9 @@ void KWTextFrameSetEdit::dropEvent( TQDropEvent * e, const TQPoint & nPoint, con cmd = pasteOasisCommand( e ); if ( cmd ) macroCmd->addCommand(cmd); - //retqlayout textframeset after a dnd otherwise autoextend + //relayout textframeset after a dnd otherwise autoextend //frameset is not re-layouted - textFrameSet()->tqlayout(); + textFrameSet()->layout(); frameSet()->kWordDocument()->addCommand( macroCmd ); } return; @@ -3984,9 +3984,9 @@ void KWTextFrameSetEdit::updateUI( bool updateFormat, bool force ) // Paragraph settings KWTextParag * parag = static_cast<KWTextParag *>(cursor()->parag()); - if ( m_paragLayout.tqalignment != parag->resolveAlignment() || force ) { - m_paragLayout.tqalignment = parag->resolveAlignment(); - m_canvas->gui()->getView()->showAlign( m_paragLayout.tqalignment ); + if ( m_paragLayout.alignment != parag->resolveAlignment() || force ) { + m_paragLayout.alignment = parag->resolveAlignment(); + m_canvas->gui()->getView()->showAlign( m_paragLayout.alignment ); } // Counter @@ -4034,8 +4034,8 @@ void KWTextFrameSetEdit::updateUI( bool updateFormat, bool force ) m_paragLayout.margins[TQStyleSheetItem::MarginRight] = parag->margin(TQStyleSheetItem::MarginRight); if ( m_rtl != parag->string()->isRightToLeft() && parag->counter() ) { - parag->counter()->tqinvalidate(); - parag->setChanged( true ); // tqrepaint + parag->counter()->invalidate(); + parag->setChanged( true ); // repaint } m_rtl = parag->string()->isRightToLeft(); m_canvas->gui()->getView()->showRulerIndent( m_paragLayout.margins[TQStyleSheetItem::MarginLeft], m_paragLayout.margins[TQStyleSheetItem::MarginFirstLine], m_paragLayout.margins[TQStyleSheetItem::MarginRight], m_rtl ); diff --git a/kword/KWTextFrameSet.h b/kword/KWTextFrameSet.h index ef83a3c8..aee28007 100644 --- a/kword/KWTextFrameSet.h +++ b/kword/KWTextFrameSet.h @@ -93,14 +93,14 @@ public: void clearUndoRedoInfo(); /** Convert the @p dPoint in the normal coordinate system (and in pt) - * into a point (@p iPoint) in the internal qtextdoc coordinates (in tqlayout units). */ + * into a point (@p iPoint) in the internal qtextdoc coordinates (in layout units). */ KWFrame * documentToInternal( const KoPoint &dPoint, TQPoint &iPoint ) const; /// used by documentToInternalMouseSelection() enum RelativePosition { InsideFrame, LeftOfFrame, TopOfFrame, AtEnd }; KWFrame * documentToInternalMouseSelection( const KoPoint &dPoint, TQPoint &iPoint, RelativePosition& relPos, KWViewMode *viewMode ) const; - /** Convert the @p in the internal qtextdoc coordinates (in tqlayout units) + /** Convert the @p in the internal qtextdoc coordinates (in layout units) * into a point in the document coordinate system (in pt). * Also returns the frame in which this point is. */ KWFrame * internalToDocument( const KoPoint &relPoint, KoPoint &dPoint ) const; @@ -125,7 +125,7 @@ public: KoPoint internalToDocumentKnowingFrame( const TQPoint &iPoint, KWFrame* theFrame ) const; /** Implementation of Ctrl+PageUp/PageDown - * Returns a point in tqlayout units (for placing the cursor) */ + * Returns a point in layout units (for placing the cursor) */ TQPoint moveToPage( int currentPgNum, short int direction ) const; /** Return the available height in pixels (sum of all frames' height, with zoom applied) @@ -215,8 +215,8 @@ public: void findPosition( const KoPoint &dPoint, KoTextParag * & parag, int & index ); /** Highlighting support (for search/replace, spellchecking etc.) */ - void highlightPortion( KoTextParag * parag, int index, int length, KWCanvas * canvas, bool tqrepaint = true, KDialogBase* dialog = 0 ); - void removeHighlight( bool tqrepaint = true ); + void highlightPortion( KoTextParag * parag, int index, int length, KWCanvas * canvas, bool repaint = true, KDialogBase* dialog = 0 ); + void removeHighlight( bool repaint = true ); virtual void addTextFrameSets( TQPtrList<KWTextFrameSet> &lst, bool onlyReadWrite=false ); @@ -237,9 +237,9 @@ public: #endif /** Invalidate all paragraphs and start re-formatting */ - virtual void tqlayout(); + virtual void layout(); /** Invalidate all paragraphs (causes a re-flow of the text upon next redraw) */ - virtual void tqinvalidate(); + virtual void invalidate(); virtual int paragraphs(); virtual int paragraphsSelected(); @@ -275,19 +275,19 @@ public: /** Let KoTextFormatInterface set the modified format */ virtual KCommand *setFormatCommand( const KoTextFormat * newFormat, int flags, bool zoomFont = false ); - /** Let KoTextFormatInterface access the current parag tqlayout */ + /** Let KoTextFormatInterface access the current parag layout */ virtual const KoParagLayout * currentParagLayoutFormat() const; virtual bool rtl() const ; - /** Let KoTextFormatInterface set a modified current parag tqlayout */ + /** Let KoTextFormatInterface set a modified current parag layout */ virtual KCommand *setParagLayoutFormatCommand( KoParagLayout *newLayout, int flags, int marginIndex=-1); virtual KCommand *setChangeCaseOfTextCommand(KoChangeCaseDia::TypeOfCase _type); /** (Assuming this==main frameset), recalc the foot note numbers */ - void renumberFootNotes( bool tqrepaint = true ); + void renumberFootNotes( bool repaint = true ); /** * Iteration over text objects - used by KWBgSpellCheck diff --git a/kword/KWTextParag.cpp b/kword/KWTextParag.cpp index d50e98a0..41d1749a 100644 --- a/kword/KWTextParag.cpp +++ b/kword/KWTextParag.cpp @@ -109,9 +109,9 @@ void KWTextParag::drawFormattingChars( TQPainter &painter, int start, int len, void KWTextParag::setPageBreaking( int pb ) { m_layout.pageBreaking = pb; - tqinvalidate(0); + invalidate(0); if ( next() && ( pb & KoParagLayout::HardFrameBreakAfter ) ) - next()->tqinvalidate(0); + next()->invalidate(0); } KWTextDocument * KWTextParag::kwTextDocument() const @@ -385,7 +385,7 @@ void KWTextParag::save( TQDomElement &parentElem, int from /* default 0 */, TQDomElement layoutElem = doc.createElement( "LAYOUT" ); paragElem.appendChild( layoutElem ); - // save with the real tqalignment (left or right, not auto) + // save with the real alignment (left or right, not auto) m_layout.saveParagLayout( layoutElem, resolveAlignment() ); // Paragraph's format @@ -552,16 +552,16 @@ KoTextFormat KWTextParag::loadFormat( TQDomElement &formatElem, KoTextFormat * r void KWTextParag::loadLayout( TQDomElement & attributes ) { - TQDomElement tqlayout = attributes.namedItem( "LAYOUT" ).toElement(); - if ( !tqlayout.isNull() ) + TQDomElement layout = attributes.namedItem( "LAYOUT" ).toElement(); + if ( !layout.isNull() ) { KWDocument * doc = kwTextDocument()->textFrameSet()->kWordDocument(); - KoParagLayout paragLayout = loadParagLayout( tqlayout, doc, true ); + KoParagLayout paragLayout = loadParagLayout( layout, doc, true ); setParagLayout( paragLayout ); // Load default format from style. KoTextFormat *defaultFormat = style() ? &style()->format() : 0L; - TQDomElement formatElem = tqlayout.namedItem( "FORMAT" ).toElement(); + TQDomElement formatElem = layout.namedItem( "FORMAT" ).toElement(); if ( !formatElem.isNull() ) { // Load paragraph format @@ -577,7 +577,7 @@ void KWTextParag::loadLayout( TQDomElement & attributes ) else { // Even the simplest import filter should do <LAYOUT><NAME value="Standard"/></LAYOUT> - kdWarning(32001) << "No LAYOUT tag in PARAGRAPH, dunno what tqlayout to apply" << endl; + kdWarning(32001) << "No LAYOUT tag in PARAGRAPH, dunno what layout to apply" << endl; } } @@ -601,7 +601,7 @@ void KWTextParag::load( TQDomElement &attributes ) loadFormatting( attributes ); setChanged( true ); - tqinvalidate( 0 ); + invalidate( 0 ); } void KWTextParag::loadFormatting( TQDomElement &attributes, int offset, bool loadFootNote ) @@ -639,7 +639,7 @@ void KWTextParag::loadFormatting( TQDomElement &attributes, int offset, bool loa // However, as it is an invalid XML character, we must replace it // or it will be written out while save the file. KoTextStringChar& ch = string()->at(index); - if (ch.c.tqunicode()==1) + if (ch.c.unicode()==1) { kdDebug() << "Replacing TQChar(1) (in KWTextParag::loadFormatting)" << endl; ch.c='#'; @@ -740,12 +740,12 @@ void KWTextParag::loadFormatting( TQDomElement &attributes, int offset, bool loa } } -void KWTextParag::setParagLayout( const KoParagLayout & tqlayout, int flags, int marginIndex ) +void KWTextParag::setParagLayout( const KoParagLayout & layout, int flags, int marginIndex ) { - KoTextParag::setParagLayout( tqlayout, flags, marginIndex ); + KoTextParag::setParagLayout( layout, flags, marginIndex ); if ( flags & KoParagLayout::PageBreaking ) - setPageBreaking( tqlayout.pageBreaking ); + setPageBreaking( layout.pageBreaking ); } ////////// @@ -753,7 +753,7 @@ void KWTextParag::setParagLayout( const KoParagLayout & tqlayout, int flags, int // Create a KoParagLayout from XML. KoParagLayout KWTextParag::loadParagLayout( TQDomElement & parentElem, KWDocument *doc, bool findStyle ) { - KoParagLayout tqlayout; + KoParagLayout layout; // Only when loading paragraphs, not when loading styles if ( findStyle ) @@ -779,12 +779,12 @@ KoParagLayout KWTextParag::loadParagLayout( TQDomElement & parentElem, KWDocumen style = doc->styleCollection()->findStyle( "Standard" ); } Q_ASSERT(style); - tqlayout.style = style; + layout.style = style; } - KoParagLayout::loadParagLayout( tqlayout, parentElem, doc->syntaxVersion() ); + KoParagLayout::loadParagLayout( layout, parentElem, doc->syntaxVersion() ); - return tqlayout; + return layout; } void KWTextParag::join( KoTextParag *parag ) @@ -808,10 +808,10 @@ void KWTextParag::loadOasis( const TQDomElement& paragElement, KoOasisContext& c const TQDomElement* paragraphStyle = context.oasisStyles().findStyle( styleName, "paragraph" ); TQString masterPageName = paragraphStyle ? paragraphStyle->attributeNS( KoXmlNS::style, "master-page-name", TQString() ) : TQString(); - // In KWord we don't support sections so the first paragraph is the one that determines the page tqlayout. + // In KWord we don't support sections so the first paragraph is the one that determines the page layout. if ( prev() == 0 ) { if ( masterPageName.isEmpty() ) - masterPageName = "Standard"; // Seems to be a builtin name for the default tqlayout... + masterPageName = "Standard"; // Seems to be a builtin name for the default layout... currentMasterPageRef = masterPageName; // do this first to avoid recursion context.styleStack().save(); context.styleStack().setTypeProperties( "paragraph" ); @@ -822,18 +822,18 @@ void KWTextParag::loadOasis( const TQDomElement& paragElement, KoOasisContext& c doc->variableCollection()->variableSetting()->setStartingPageNumber( pageNumber.toInt() ); context.styleStack().restore(); - doc->loadOasisPageLayout( masterPageName, context ); // page tqlayout + doc->loadOasisPageLayout( masterPageName, context ); // page layout } else if ( !masterPageName.isEmpty() // empty means no change && masterPageName != currentMasterPageRef ) { - // Detected a change in the master page -> this means we have to use a new page tqlayout + // Detected a change in the master page -> this means we have to use a new page layout // and insert a frame break if not on the first paragraph. kdDebug(32001) << "KWTextParag::loadOasis: change of master page detected: from " << currentMasterPageRef << " to " << masterPageName << " -> inserting page break" << endl; currentMasterPageRef = masterPageName; // [see also KoParagLayout for the 'normal' way to insert page breaks] m_layout.pageBreaking |= KoParagLayout::HardFrameBreakBefore; - // We have no way to load/use the new page tqlayout, KWord doesn't have "sections". + // We have no way to load/use the new page layout, KWord doesn't have "sections". } } } diff --git a/kword/KWTextParag.h b/kword/KWTextParag.h index b0a9d044..de484a48 100644 --- a/kword/KWTextParag.h +++ b/kword/KWTextParag.h @@ -46,7 +46,7 @@ public: KWTextDocument * kwTextDocument() const; - virtual void setParagLayout( const KoParagLayout &tqlayout, int flags = KoParagLayout::All, int marginIndex = -1 ); + virtual void setParagLayout( const KoParagLayout &layout, int flags = KoParagLayout::All, int marginIndex = -1 ); /** The type of page-breaking behaviour */ void setPageBreaking( int pb ); // warning this sets all the flags! @@ -73,7 +73,7 @@ public: /** Load (from KWord-1.3 XML) and apply \<FORMAT\> tags (used by KWTextParag::load and by KWPasteCommand) */ void loadFormatting( TQDomElement &attributes, int offset = 0, bool loadFootNote=true ); - /** Load (from KWord-1.3 XML) and apply paragraph tqlayout */ + /** Load (from KWord-1.3 XML) and apply paragraph layout */ void loadLayout( TQDomElement & attributes ); /** Load (from KWord-1.3 XML), optionally using styles from document. */ diff --git a/kword/KWVariable.cpp b/kword/KWVariable.cpp index 5b82b220..80666965 100644 --- a/kword/KWVariable.cpp +++ b/kword/KWVariable.cpp @@ -351,7 +351,7 @@ void KWFootNoteVariable::saveOasis( KoXmlWriter& writer, KoSavingContext& contex writer.startElement( "text:note-citation" ); if ( m_numberingType == Auto ) - writer.addTextNode( TQString( "%1" ).tqarg( m_numDisplay ) ); + writer.addTextNode( TQString( "%1" ).arg( m_numDisplay ) ); else { writer.addAttribute( "text:label", m_varValue.toString() ); @@ -478,7 +478,7 @@ TQString KWFootNoteVariable::text(bool realValue) void KWFootNoteVariable::setNumDisplay( int val ) { m_numDisplay = val; - if ( val != -1 ) // -1 is used to 'tqinvalidate so that renumberFootNotes recalcs' + if ( val != -1 ) // -1 is used to 'invalidate so that renumberFootNotes recalcs' formatedNote(); } @@ -532,7 +532,7 @@ void KWFootNoteVariable::finalize() fs->textObject()->abortFormatting(); // abortFormatting is a bool in kotextobject. So we need to return there before - // starting text tqlayout again. + // starting text layout again. m_doc->delayedRecalcFrames( TQMIN( pageNum, framePage ) ); m_doc->delayedRepaintAllViews(); } @@ -596,7 +596,7 @@ void KWFootNoteVariable::setDeleted( bool del ) m_doc->recalcFrames(); if (!del) - m_frameset->tqlayout(); // format its text, so that it resizes the frame + m_frameset->layout(); // format its text, so that it resizes the frame KoVariable::setDeleted( del ); // Does this compress? Probably not. m_doc->delayedRepaintAllViews(); @@ -617,7 +617,7 @@ double KWFootNoteVariable::varY() const if ( !fs->hasFramesInPageArray() ) // we need it for internalToDocument { kdDebug(32001) << "KWFootNoteVariable::varY too early, no updateFrames yet" << endl; - return 0; // this happens on loading - frame tqlayout is done before text tqlayout + return 0; // this happens on loading - frame layout is done before text layout } // What we need is "has never been formatted". Not "has just been invalidated"... //if ( !paragraph()->isValid() ) diff --git a/kword/KWView.cpp b/kword/KWView.cpp index 4ec739eb..785a57de 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -119,10 +119,10 @@ #include <tdeversion.h> #include <kiconloader.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqapplication.h> #include <tqgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpaintdevicemetrics.h> #include <tqprogressdialog.h> #include <tqregexp.h> @@ -288,27 +288,27 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW if ( KStatusBar* sb = statusBar() ) // No statusbar in e.g. konqueror { m_sbPageLabel = new KStatusBarLabel( TQString(), 0, sb ); - m_sbPageLabel->tqsetAlignment( AlignLeft | AlignVCenter ); + m_sbPageLabel->setAlignment( AlignLeft | AlignVCenter ); addStatusBarItem( m_sbPageLabel, 0 ); m_sbModifiedLabel = new KStatusBarLabel( " ", 0, sb ); - m_sbModifiedLabel->tqsetAlignment( AlignLeft | AlignVCenter ); + m_sbModifiedLabel->setAlignment( AlignLeft | AlignVCenter ); addStatusBarItem( m_sbModifiedLabel, 0 ); m_sbFramesLabel = new KStatusBarLabel( TQString(), 0, sb ); - m_sbFramesLabel->tqsetAlignment( AlignLeft | AlignVCenter ); + m_sbFramesLabel->setAlignment( AlignLeft | AlignVCenter ); addStatusBarItem( m_sbFramesLabel, 1 ); m_sbOverwriteLabel = new KStatusBarLabel( ' ' + i18n( "INSRT" ) + ' ', 0, sb ); - m_sbOverwriteLabel->tqsetAlignment( AlignHCenter | AlignVCenter ); + m_sbOverwriteLabel->setAlignment( AlignHCenter | AlignVCenter ); addStatusBarItem( m_sbOverwriteLabel, 0 ); m_sbZoomLabel = new KStatusBarLabel( ' ' + TQString::number( m_doc->zoom() ) + "% ", 0, sb ); - m_sbZoomLabel->tqsetAlignment( AlignHCenter | AlignVCenter ); + m_sbZoomLabel->setAlignment( AlignHCenter | AlignVCenter ); addStatusBarItem( m_sbZoomLabel, 0 ); m_sbUnitLabel = new KStatusBarLabel( ' ' + KoUnit::unitDescription( m_doc->unit() ) + ' ', 0, sb ); - m_sbUnitLabel->tqsetAlignment( AlignHCenter | AlignVCenter ); + m_sbUnitLabel->setAlignment( AlignHCenter | AlignVCenter ); addStatusBarItem( m_sbUnitLabel, 0 ); } @@ -339,7 +339,7 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW connect( frameViewManager(), TQT_SIGNAL(sigFrameSetRenamed()), TQT_TQOBJECT(this), TQT_SLOT( updateFrameStatusBarItem())); - connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ), + connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), TQT_TQOBJECT(this), TQT_SLOT( clipboardDataChanged() ) ); connect( m_gui->canvasWidget(), TQT_SIGNAL(currentFrameSetEditChanged()), @@ -404,7 +404,7 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW // Determine initial scroll position // We do this delayed, so that the GUI has been fully constructed - // (and e.g. the statusbar can tqrepaint). + // (and e.g. the statusbar can repaint). TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetInitialPosition() ) ); TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( updateZoom() ) ); } @@ -640,7 +640,7 @@ void KWView::setupActions() TQT_TQOBJECT(this), TQT_SLOT( viewTextMode() ), actionCollection(), "view_textmode" ); m_actionViewTextMode->setToolTip( i18n( "Only show the text of the document." ) ); - m_actionViewTextMode->setWhatsThis( i18n( "Do not show any pictures, formatting or tqlayout. KWord will display only the text for editing." ) ); + m_actionViewTextMode->setWhatsThis( i18n( "Do not show any pictures, formatting or layout. KWord will display only the text for editing." ) ); m_actionViewTextMode->setExclusiveGroup( "viewmodes" ); m_actionViewPageMode = new KToggleAction( i18n( "&Page Mode" ), 0, @@ -1000,7 +1000,7 @@ void KWView::setupActions() // This approach allows to edit toolbars and extract separate actions from this menu KToggleAction* act = new KToggleAction( styleIt.current()->name(), /*TODO icon,*/ 0, TQT_TQOBJECT(this), TQT_SLOT( slotCounterStyleSelected() ), - actionCollection(), TQString("counterstyle_%1").tqarg( styleIt.current()->style() ).latin1() ); + actionCollection(), TQString("counterstyle_%1").arg( styleIt.current()->style() ).latin1() ); act->setExclusiveGroup( "counterstyle" ); // Add to the right menu: both for "none", bullet for bullets, numbers otherwise if ( styleIt.current()->style() == KoParagCounter::STYLE_NONE ) { @@ -1491,7 +1491,7 @@ void KWView::createExpressionActions( KActionMenu * parentMenu,const TQString& f TQString text = i18n( e2.namedItem( "Text" ).toElement().text().utf8() ); KAction * act = new KAction( text, 0, TQT_TQOBJECT(this), TQT_SLOT( insertExpression() ), actionCollection(), - TQString("expression-action_%1").tqarg(i).latin1() ); + TQString("expression-action_%1").arg(i).latin1() ); if ( personalShortCut.contains(text) ) act->setShortcut( personalShortCut[text] ); i++; @@ -1542,7 +1542,7 @@ void KWView::addVariableActions( int type, const TQStringList & texts, KAction * act = new KAction( (*it), 0, TQT_TQOBJECT(this), TQT_SLOT( insertVariable() ), actionCollection(), actionName ); // Mainly for KEditToolbar - act->setToolTip( i18n( "Insert variable \"%1\" into the text" ).tqarg( *it ) ); + act->setToolTip( i18n( "Insert variable \"%1\" into the text" ).arg( *it ) ); m_variableDefMap.insert( act, v ); parentMenu->insert( act ); } @@ -1583,7 +1583,7 @@ void KWView::refreshCustomMenu() if ( !lst.contains( varName) ) { lst.append( varName ); - TQCString name = TQString("custom-action_%1").tqarg(i).latin1(); + TQCString name = TQString("custom-action_%1").arg(i).latin1(); act = new KAction( varName, shortCuts[varName], TQT_TQOBJECT(this), TQT_SLOT( insertCustomVariable() ),actionCollection(), name ); act->setGroup( "custom-variable-action" ); m_actionInsertCustom->insert( act ); @@ -1595,7 +1595,7 @@ void KWView::refreshCustomMenu() if(state) m_actionInsertCustom->popupMenu()->insertSeparator(); - act = new KAction( i18n("New..."), 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(),TQString("custom-action_%1").tqarg(i).latin1()); + act = new KAction( i18n("New..."), 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(),TQString("custom-action_%1").arg(i).latin1()); act->setGroup( "custom-variable-action" ); @@ -1653,15 +1653,15 @@ void KWView::updatePageInfo() TQString oldText = m_sbPageLabel->text(); TQString newText; if ( viewMode()->hasPages() ) - newText = ' ' + i18n( "Page %1 of %2" ).tqarg(m_currentPage->pageNumber()) - .tqarg(m_doc->pageCount()) + ' '; + newText = ' ' + i18n( "Page %1 of %2" ).arg(m_currentPage->pageNumber()) + .arg(m_doc->pageCount()) + ' '; if ( newText != oldText ) { m_sbPageLabel->setText( newText ); - // Need to tqrepaint immediately. Otherwise when deleting 100 pages + // Need to repaint immediately. Otherwise when deleting 100 pages // at once, there's no feedback. - m_sbPageLabel->tqrepaint(); + m_sbPageLabel->repaint(); } } slotUpdateRuler(); @@ -1688,16 +1688,16 @@ void KWView::updateFrameStatusBarItem() TQString unitName = m_doc->unitName(); KWFrame * frame = frameViewManager()->selectedFrames()[0]->frame(); m_sbFramesLabel->setText( ' ' + i18n( "Statusbar info", "%1: %2, %3 - %4, %5 (width: %6, height: %7)" ) - .tqarg( frame->frameSet()->name() ) - .tqarg( KoUnit::toUserStringValue( frame->left(), unit ) ) - .tqarg( KoUnit::toUserStringValue( frame->top() - m_doc->pageManager()->topOfPage( + .arg( frame->frameSet()->name() ) + .arg( KoUnit::toUserStringValue( frame->left(), unit ) ) + .arg( KoUnit::toUserStringValue( frame->top() - m_doc->pageManager()->topOfPage( m_doc->pageManager()->pageNumber(frame->rect()) ), unit) ) - .tqarg( KoUnit::toUserStringValue( frame->right(), unit ) ) - .tqarg( KoUnit::toUserStringValue( frame->bottom(), unit ) ) - .tqarg( KoUnit::toUserStringValue( frame->width(), unit ) ) - .tqarg( KoUnit::toUserStringValue( frame->height(), unit ) ) ); + .arg( KoUnit::toUserStringValue( frame->right(), unit ) ) + .arg( KoUnit::toUserStringValue( frame->bottom(), unit ) ) + .arg( KoUnit::toUserStringValue( frame->width(), unit ) ) + .arg( KoUnit::toUserStringValue( frame->height(), unit ) ) ); } else - m_sbFramesLabel->setText( ' ' + i18n( "%1 frames selected" ).tqarg( nbFrame ) ); + m_sbFramesLabel->setText( ' ' + i18n( "%1 frames selected" ).arg( nbFrame ) ); } else if ( sb && m_sbFramesLabel ) m_sbFramesLabel->setText( TQString() ); @@ -1718,12 +1718,12 @@ void KWView::clipboardDataChanged() } KWFrameSetEdit * edit = m_gui->canvasWidget()->currentFrameSetEdit(); // Is there plain text in the clipboard ? - if ( edit && !TQApplication::tqclipboard()->text().isEmpty() ) + if ( edit && !TQApplication::clipboard()->text().isEmpty() ) { m_actionEditPaste->setEnabled(true); return; } - TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); const int provides = checkClipboard( data ); if ( provides & ( ProvidesImage | ProvidesOasis | ProvidesFormula ) ) m_actionEditPaste->setEnabled( true ); @@ -1789,7 +1789,7 @@ void KWView::print( KPrinter &prt ) m_doc->recalcVariables( VT_ALL ); } -// Don't tqrepaint behind the print dialog until we're done zooming/unzooming the doc +// Don't repaint behind the print dialog until we're done zooming/unzooming the doc m_gui->canvasWidget()->setUpdatesEnabled(false); m_gui->canvasWidget()->viewport()->setCursor( waitCursor ); @@ -1938,7 +1938,7 @@ void KWView::print( KPrinter &prt ) m_doc->variableCollection()->recalcVariables(VT_MAILMERGE); painter.end(); // this is what triggers the printing - m_doc->variableCollection()->variableSetting()->setLastPrintingDate(TQDateTime::tqcurrentDateTime()); + m_doc->variableCollection()->variableSetting()->setLastPrintingDate(TQDateTime::currentDateTime()); m_doc->recalcVariables( VT_DATE ); } @@ -2365,7 +2365,7 @@ void KWView::editCut() edit->cut(); else { TQDragObject *drag = m_doc->dragSelected( frameViewManager()->selectedFrames() ); - TQApplication::tqclipboard()->setData( drag ); + TQApplication::clipboard()->setData( drag ); deleteFrame(false); } } @@ -2377,13 +2377,13 @@ void KWView::editCopy() edit->copy(); else { TQDragObject *drag = m_doc->dragSelected( frameViewManager()->selectedFrames() ); - TQApplication::tqclipboard()->setData( drag ); + TQApplication::clipboard()->setData( drag ); } } void KWView::editPaste() { - TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); pasteData( data, false ); } @@ -2423,7 +2423,7 @@ void KWView::pasteData( TQMimeSource* data, bool drop ) provides = ProvidesPlainText; } if ( !drop ) // get it again, to avoid crashes - data = TQApplication::tqclipboard()->data(); + data = TQApplication::clipboard()->data(); } KWTextFrameSetEdit * edit = currentTextEdit(); if ( edit && ( provides & ProvidesPlainText ) ) { @@ -2433,7 +2433,7 @@ void KWView::pasteData( TQMimeSource* data, bool drop ) TQCString returnedTypeMime = KoTextObject::providesOasis( data ); if ( !returnedTypeMime.isEmpty() ) { - const TQByteArray arr = data->tqencodedData( returnedTypeMime ); + const TQByteArray arr = data->encodedData( returnedTypeMime ); if( !arr.isEmpty() ) { TQBuffer buffer( arr ); @@ -2629,7 +2629,7 @@ void KWView::adjustZOrderOfSelectedFrames(MoveFrameType moveType) { // Calling updateFrames() on the selected frames' framesets isn't enough, // we also need other framesets to notice the new frames on top. m_doc->updateAllFrames(); - m_doc->tqlayout(); + m_doc->layout(); m_doc->repaintAllViews(); } @@ -2784,7 +2784,7 @@ void KWView::deleteFrame( bool warning ) "Frameset '%1'. " "The contents of this Frameset will not appear " "anymore!\n" - "Are you sure you want to do that?").tqarg(fs->name()), + "Are you sure you want to do that?").arg(fs->name()), i18n("Delete Frame"), KStdGuiItem::del()); if (result != KMessageBox::Continue) @@ -2836,7 +2836,7 @@ void KWView::createLinkedFrame() if (selectedFrames.count() != 1) return; // action is disabled in such a case KWFrame* frame = selectedFrames[0]->frame(); - KWFrame* newFrame = new KWFrame(0L, frame->x() + m_gui->getVertRuler()->tqminimumSizeHint().width(), frame->y() + m_gui->getHorzRuler()->tqminimumSizeHint().height(), frame->width(), frame->height() ); + KWFrame* newFrame = new KWFrame(0L, frame->x() + m_gui->getVertRuler()->minimumSizeHint().width(), frame->y() + m_gui->getHorzRuler()->minimumSizeHint().height(), frame->width(), frame->height() ); newFrame->setZOrder( m_doc->maxZOrder( newFrame->pageNumber(m_doc) ) + 1 ); // make sure it's on top newFrame->setCopy(true); newFrame->setNewFrameBehavior( KWFrame::Copy ); @@ -3074,22 +3074,22 @@ void KWView::changeZoomMenu( int zoom ) qHeapSort( list ); for (TQValueList<int>::Iterator it = list.begin() ; it != list.end() ; ++it) - lst.append( i18n("%1%").tqarg(*it) ); + lst.append( i18n("%1%").arg(*it) ); } else { - lst << i18n("%1%").tqarg("33"); - lst << i18n("%1%").tqarg("50"); - lst << i18n("%1%").tqarg("75"); - lst << i18n("%1%").tqarg("100"); - lst << i18n("%1%").tqarg("125"); - lst << i18n("%1%").tqarg("150"); - lst << i18n("%1%").tqarg("200"); - lst << i18n("%1%").tqarg("250"); - lst << i18n("%1%").tqarg("350"); - lst << i18n("%1%").tqarg("400"); - lst << i18n("%1%").tqarg("450"); - lst << i18n("%1%").tqarg("500"); + lst << i18n("%1%").arg("33"); + lst << i18n("%1%").arg("50"); + lst << i18n("%1%").arg("75"); + lst << i18n("%1%").arg("100"); + lst << i18n("%1%").arg("125"); + lst << i18n("%1%").arg("150"); + lst << i18n("%1%").arg("200"); + lst << i18n("%1%").arg("250"); + lst << i18n("%1%").arg("350"); + lst << i18n("%1%").arg("400"); + lst << i18n("%1%").arg("450"); + lst << i18n("%1%").arg("500"); } m_actionViewZoom->setItems( lst ); } @@ -3097,7 +3097,7 @@ void KWView::changeZoomMenu( int zoom ) void KWView::showZoom( int zoom ) { TQStringList list = m_actionViewZoom->items(); - TQString zoomStr( i18n("%1%").tqarg( zoom ) ); + TQString zoomStr( i18n("%1%").arg( zoom ) ); m_actionViewZoom->setCurrentItem( list.findIndex(zoomStr) ); } @@ -3110,7 +3110,7 @@ void KWView::showZoom( const TQString& zoom ) void KWView::slotViewFormattingChars() { m_doc->setViewFormattingChars(m_actionViewFormattingChars->isChecked()); - m_doc->tqlayout(); // Due to the different formatting when this option is activated + m_doc->layout(); // Due to the different formatting when this option is activated m_doc->repaintAllViews(); } @@ -4112,7 +4112,7 @@ void KWView::insertFormula( TQMimeSource* source ) KWFormulaFrameSet *frameset = new KWFormulaFrameSet( m_doc, TQString() ); m_doc->addFrameSet( frameset, false ); // done first since the frame number is stored in the undo/redo if ( source ) { - TQByteArray data = source->tqencodedData( KFormula::MimeSource::selectionMimeType() ); + TQByteArray data = source->encodedData( KFormula::MimeSource::selectionMimeType() ); TQDomDocument formula; formula.setContent( data ); TQDomElement formulaElem = formula.namedItem("math").toElement(); @@ -4370,7 +4370,7 @@ void KWView::tableJoinCells() return; } m_doc->addCommand(cmd); - m_doc->tqlayout(); + m_doc->layout(); } void KWView::tableSplitCells() { @@ -4405,7 +4405,7 @@ void KWView::tableSplitCells(int cols, int rows) } m_doc->addCommand(cmd); m_doc->updateAllFrames(); - m_doc->tqlayout(); + m_doc->layout(); frameViewManager()->view(cell->frame(0))->setSelected(true); } @@ -4980,10 +4980,10 @@ void KWView::setSpacing( KoParagLayout::SpacingType spacing, const TQString& com KMacroCommand* macroCmd = 0L; for ( ; it.current() ; ++it ) { - KoParagLayout tqlayout( *it.current()->currentParagLayoutFormat() ); - tqlayout.lineSpacingType = spacing; + KoParagLayout layout( *it.current()->currentParagLayoutFormat() ); + layout.lineSpacingType = spacing; - KCommand *cmd = it.current()->setParagLayoutFormatCommand( &tqlayout, KoParagLayout::LineSpacing ); + KCommand *cmd = it.current()->setParagLayoutFormatCommand( &layout, KoParagLayout::LineSpacing ); if (cmd) { if ( !macroCmd ) @@ -5021,7 +5021,7 @@ void KWView::textSpacingDouble() void KWView::slotCounterStyleSelected() { - TQString actionName = TQString::tqfromLatin1(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); + TQString actionName = TQString::fromLatin1(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); TQString styleStr = actionName.mid(13); //kdDebug() << "KWView::slotCounterStyleSelected styleStr=" << styleStr << endl; KoParagCounter::Style style = (KoParagCounter::Style)(styleStr.toInt()); @@ -5167,8 +5167,8 @@ void KWView::textIncreaseIndent() m_doc->addCommand(macroCmd); if(!lst.isEmpty()) { - const KoParagLayout *tqlayout=lst.first()->currentParagLayoutFormat(); - showRulerIndent( tqlayout->margins[TQStyleSheetItem::MarginLeft], tqlayout->margins[TQStyleSheetItem::MarginFirstLine], tqlayout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl()); + const KoParagLayout *layout=lst.first()->currentParagLayoutFormat(); + showRulerIndent( layout->margins[TQStyleSheetItem::MarginLeft], layout->margins[TQStyleSheetItem::MarginFirstLine], layout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl()); } #if 0 @@ -5216,8 +5216,8 @@ void KWView::textDecreaseIndent() m_doc->addCommand(macroCmd); if(!lst.isEmpty()) { - const KoParagLayout *tqlayout=lst.first()->currentParagLayoutFormat(); - showRulerIndent( tqlayout->margins[TQStyleSheetItem::MarginLeft], tqlayout->margins[TQStyleSheetItem::MarginFirstLine], tqlayout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl()); + const KoParagLayout *layout=lst.first()->currentParagLayoutFormat(); + showRulerIndent( layout->margins[TQStyleSheetItem::MarginLeft], layout->margins[TQStyleSheetItem::MarginFirstLine], layout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl()); } @@ -5445,7 +5445,7 @@ void KWView::tabListChanged( const KoTabulatorList & tabList ) m_doc->addCommand(macroCmd); } -void KWView::newPageLayout( const KoPageLayout &tqlayout ) +void KWView::newPageLayout( const KoPageLayout &layout ) { TQString mode = viewMode()->type(); bool state = (mode!="ModeText"); @@ -5457,14 +5457,14 @@ void KWView::newPageLayout( const KoPageLayout &tqlayout ) KoKWHeaderFooter hf; m_doc->getPageLayout( pgLayout, cl, hf ); - if(tqlayout==pgLayout) + if(layout==pgLayout) return; KWPageLayoutStruct oldLayout( pgLayout, cl, hf ); - m_doc->setPageLayout( tqlayout, cl, hf ); + m_doc->setPageLayout( layout, cl, hf ); - KWPageLayoutStruct newLayout( tqlayout, cl, hf ); + KWPageLayoutStruct newLayout( layout, cl, hf ); KWTextFrameSetEdit *edit = currentTextEdit(); if (edit) @@ -5473,12 +5473,12 @@ void KWView::newPageLayout( const KoPageLayout &tqlayout ) m_doc->addCommand(cmd); } -void KWView::slotPageLayoutChanged( const KoPageLayout& tqlayout ) +void KWView::slotPageLayoutChanged( const KoPageLayout& layout ) { // This is connected to a signal of KWDocument, so that when the - // above method, or any other way of changing the page tqlayout happens, + // above method, or any other way of changing the page layout happens, // the rulers are updated in all views. - viewMode()->setPageLayout( m_gui->getHorzRuler(), m_gui->getVertRuler(), tqlayout ); + viewMode()->setPageLayout( m_gui->getHorzRuler(), m_gui->getVertRuler(), layout ); m_gui->canvasWidget()->repaintAll(); } @@ -5947,7 +5947,7 @@ void KWView::frameSelectedChanged() if(paragLayout->counter) counter = *(paragLayout->counter); showCounter( counter ); - int align = paragLayout->tqalignment; + int align = paragLayout->alignment; if ( align == TQt::AlignAuto ) align = TQt::AlignLeft; // ## seems hard to detect RTL here showAlign( align ); @@ -6038,7 +6038,7 @@ TQWidget* KWView::canvas() const { // used to be ->viewport(), but this makes no sense. // active embedded objects must be positioned relative to the real view, - // to scroll around with it, instead of being tqchildren of the fixed viewport. + // to scroll around with it, instead of being children of the fixed viewport. return m_gui->canvasWidget(); } @@ -6144,7 +6144,7 @@ void KWView::savePicture() if ( !KIO::NetAccess::upload( tempFile.name(), url, this ) ) { KMessageBox::sorry( this, i18n( - "Unable to save the file to '%1'. %2.").tqarg( url.prettyURL() ).tqarg( KIO::NetAccess::lastErrorString() ), + "Unable to save the file to '%1'. %2.").arg( url.prettyURL() ).arg( KIO::NetAccess::lastErrorString() ), i18n("Save Failed") ); } } @@ -6155,12 +6155,12 @@ void KWView::savePicture() } else KMessageBox::sorry( this, i18n( - "Error during saving. Could not create temporary file: %1.").tqarg( strerror( tempFile.status() ) ), + "Error during saving. Could not create temporary file: %1.").arg( strerror( tempFile.status() ) ), i18n("Save Picture") ); } } else - KMessageBox::sorry( this, i18n("URL %1 is invalid.").tqarg( url.prettyURL() ), i18n("Save Picture") ); + KMessageBox::sorry( this, i18n("URL %1 is invalid.").arg( url.prettyURL() ), i18n("Save Picture") ); } } } @@ -6586,7 +6586,7 @@ void KWView::switchModeView() updateZoomControls(); updatePageInfo(); - // set page tqlayout in rulers + // set page layout in rulers canvas->viewMode()->setPageLayout( m_gui->getHorzRuler(), m_gui->getVertRuler(), m_doc->pageLayout() ); } @@ -7167,7 +7167,7 @@ void KWView::updateRulerInProtectContentMode() hRuler->changeFlags(KoRuler::F_INDENTS | KoRuler::F_TABS); else hRuler->changeFlags(0); - hRuler->tqrepaint(); + hRuler->repaint(); } } @@ -7263,7 +7263,7 @@ void KWView::convertToTextBox() if ( cmd ) macro->addCommand( cmd ); // Auto-resize the frame from its contents - edit->textFrameSet()->tqlayout(); + edit->textFrameSet()->layout(); } m_doc->addCommand( macro ); } @@ -7618,19 +7618,19 @@ KWGUI::KWGUI( const TQString& viewMode, TQWidget *parent, KWView *daView ) l << 90; m_panner->setSizes( l ); - KoPageLayout tqlayout = doc->pageLayout(); + KoPageLayout layout = doc->pageLayout(); m_tabChooser = new KoTabChooser( m_right, KoTabChooser::TAB_ALL ); m_tabChooser->setReadWrite(doc->isReadWrite()); gridLayout->addWidget( m_tabChooser, 0, 0 ); - m_horRuler = new KoRuler( m_right, m_canvas->viewport(), Qt::Horizontal, tqlayout, + m_horRuler = new KoRuler( m_right, m_canvas->viewport(), Qt::Horizontal, layout, KoRuler::F_INDENTS | KoRuler::F_TABS, doc->unit(), m_tabChooser ); m_horRuler->setReadWrite(doc->isReadWrite()); gridLayout->addWidget( m_horRuler, 0, 1 ); - m_vertRuler = new KoRuler( m_right, m_canvas->viewport(), Qt::Vertical, tqlayout, + m_vertRuler = new KoRuler( m_right, m_canvas->viewport(), Qt::Vertical, layout, 0, doc->unit() ); m_vertRuler->setReadWrite(doc->isReadWrite()); gridLayout->addWidget( m_vertRuler, 1, 0 ); @@ -7680,8 +7680,8 @@ void KWGUI::resizeEvent( TQResizeEvent *e ) void KWGUI::reorganize() { - int hSpace = m_vertRuler->tqminimumSizeHint().width(); - int vSpace = m_horRuler->tqminimumSizeHint().height(); + int hSpace = m_vertRuler->minimumSizeHint().width(); + int vSpace = m_horRuler->minimumSizeHint().height(); if(m_view->kWordDocument()->showRuler()) { m_vertRuler->show(); diff --git a/kword/KWView.h b/kword/KWView.h index f023e6c6..095633bf 100644 --- a/kword/KWView.h +++ b/kword/KWView.h @@ -37,7 +37,7 @@ #include <kshortcut.h> #include <KoZoomMode.h> -#include <tqbrush.h> +#include <brush.h> #include <tqhbox.h> class KWPage; @@ -350,7 +350,7 @@ public slots: void configure(); void configureCompletion(); - void newPageLayout( const KoPageLayout &tqlayout ); + void newPageLayout( const KoPageLayout &layout ); void newLeftIndent( double leftIndent); void newFirstIndent( double firstIndent); void newRightIndent( double rightIndent); @@ -487,7 +487,7 @@ protected slots: void spellAddAutoCorrect (const TQString & originalword, const TQString & newword); void slotApplyFont(); void slotApplyParag(); - void slotPageLayoutChanged( const KoPageLayout& tqlayout ); + void slotPageLayoutChanged( const KoPageLayout& layout ); void slotChangeCaseState(bool b); void slotChangeCutState(bool b); void slotCorrectWord(); @@ -868,7 +868,7 @@ protected: KWDocStruct *m_docStruct; // The right side - TQWidget *m_right; // The tqlayout widget. + TQWidget *m_right; // The layout widget. KoTabChooser *m_tabChooser; KoRuler *m_vertRuler; diff --git a/kword/KWViewMode.cpp b/kword/KWViewMode.cpp index c1c6f16e..b8249839 100644 --- a/kword/KWViewMode.cpp +++ b/kword/KWViewMode.cpp @@ -63,7 +63,7 @@ void KWViewMode::drawOnePageBorder( TQPainter * painter, const TQRect & crect, c TQRegion pageEmptyRegion = emptySpaceRegion.intersect( pagecrect ); //kdDebug() << "RESULT: pageEmptyRegion: " << pageEmptyRegion << endl; if ( !pageEmptyRegion.isEmpty() ) - m_doc->eraseEmptySpace( painter, pageEmptyRegion, TQApplication::tqpalette().active().brush( TQColorGroup::Base ) ); + m_doc->eraseEmptySpace( painter, pageEmptyRegion, TQApplication::palette().active().brush( TQColorGroup::Base ) ); } } @@ -74,7 +74,7 @@ TQRect KWViewMode::drawRightShadow( TQPainter * painter, const TQRect & crect, c if ( !shadowRect.isEmpty() ) { painter->fillRect( shadowRect, - TQApplication::tqpalette().active().brush( TQColorGroup::Shadow ) ); + TQApplication::palette().active().brush( TQColorGroup::Shadow ) ); } return shadowRect; } @@ -85,7 +85,7 @@ TQRect KWViewMode::drawBottomShadow( TQPainter * painter, const TQRect & crect, shadowRect &= crect; // intersect if ( !shadowRect.isEmpty() ) painter->fillRect( shadowRect, - TQApplication::tqpalette().active().brush( TQColorGroup::Shadow ) ); + TQApplication::palette().active().brush( TQColorGroup::Shadow ) ); return shadowRect; } @@ -144,10 +144,10 @@ TQRect KWViewMode::rulerFrameRect() return TQRect(); } -void KWViewMode::setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPageLayout& tqlayout ) +void KWViewMode::setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPageLayout& layout ) { - hRuler->setPageLayout( tqlayout ); - vRuler->setPageLayout( tqlayout ); + hRuler->setPageLayout( layout ); + vRuler->setPageLayout( layout ); } // static @@ -230,7 +230,7 @@ int KWViewModeNormal::xOffset(KWPage *page, int canvasWidth /* = -1 */) { void KWViewModeNormal::drawPageBorders( TQPainter * painter, const TQRect & crect, const TQRegion & emptySpaceRegion ) { painter->save(); - painter->setPen( TQApplication::tqpalette().active().color( TQColorGroup::Dark ) ); + painter->setPen( TQApplication::palette().active().color( TQColorGroup::Dark ) ); painter->setBrush( TQt::NoBrush ); TQRect pageRect; @@ -258,7 +258,7 @@ void KWViewModeNormal::drawPageBorders( TQPainter * painter, const TQRect & crec leftArea &= crect; if ( !leftArea.isEmpty() ) { painter->fillRect( leftArea, - TQApplication::tqpalette().active().brush( TQColorGroup::Mid ) ); + TQApplication::palette().active().brush( TQColorGroup::Mid ) ); } // The area on the right of the page @@ -267,7 +267,7 @@ void KWViewModeNormal::drawPageBorders( TQPainter * painter, const TQRect & crec if ( !rightArea.isEmpty() ) { painter->fillRect( rightArea, - TQApplication::tqpalette().active().brush( TQColorGroup::Mid ) ); + TQApplication::palette().active().brush( TQColorGroup::Mid ) ); // Draw a shadow int topOffset = ( page==0 ) ? s_shadowOffset : 0; // leave a few pixels on top, only for first page @@ -284,7 +284,7 @@ void KWViewModeNormal::drawPageBorders( TQPainter * painter, const TQRect & crec if ( !repaintRect.isEmpty() ) { painter->fillRect( repaintRect, - TQApplication::tqpalette().active().brush( TQColorGroup::Mid ) ); + TQApplication::palette().active().brush( TQColorGroup::Mid ) ); // Draw a shadow drawBottomShadow( painter, crect, pageRect, s_shadowOffset ); } @@ -406,7 +406,7 @@ TQPoint KWViewModePreview::viewToNormal( const TQPoint & vPoint ) void KWViewModePreview::drawPageBorders( TQPainter * painter, const TQRect & crect, const TQRegion & emptySpaceRegion ) { painter->save(); - painter->setPen( TQApplication::tqpalette().active().color( TQColorGroup::Dark ) ); + painter->setPen( TQApplication::palette().active().color( TQColorGroup::Dark ) ); painter->setBrush( TQt::NoBrush ); //kdDebug() << "KWViewModePreview::drawPageBorders crect=" << DEBUGRECT( crect ) << endl; TQRegion grayRegion( crect ); @@ -439,7 +439,7 @@ void KWViewModePreview::drawPageBorders( TQPainter * painter, const TQRect & cre if ( !grayRegion.isEmpty() ) { //kdDebug() << "KWViewModePreview::drawPageBorders grayRegion's bounding Rect = " << DEBUGRECT( grayRegion.boundingRect() ) << endl; - m_doc->eraseEmptySpace( painter, grayRegion, TQApplication::tqpalette().active().brush( TQColorGroup::Mid ) ); + m_doc->eraseEmptySpace( painter, grayRegion, TQApplication::palette().active().brush( TQColorGroup::Mid ) ); } painter->restore(); } @@ -541,7 +541,7 @@ void KWViewModeText::drawPageBorders( TQPainter * painter, const TQRect & crect, painter->save(); TQRegion grayRegion( crect ); //kdDebug() << "KWViewModeText::drawPageBorders crect=" << grayRegion << endl; - painter->setPen( TQApplication::tqpalette().active().color( TQColorGroup::Dark ) ); + painter->setPen( TQApplication::palette().active().color( TQColorGroup::Dark ) ); TQSize cSize = contentsSize(); // Draw a line on the right -- ## or a shadow? // +1 to be out of the contents, and +1 for TQRect @@ -562,7 +562,7 @@ void KWViewModeText::drawPageBorders( TQPainter * painter, const TQRect & crect, } //kdDebug() << "KWViewModeText::drawPageBorders erasing grayRegion " << grayRegion << endl; if ( !grayRegion.isEmpty() ) - m_doc->eraseEmptySpace( painter, grayRegion, TQApplication::tqpalette().active().brush( TQColorGroup::Mid ) ); + m_doc->eraseEmptySpace( painter, grayRegion, TQApplication::palette().active().brush( TQColorGroup::Mid ) ); painter->restore(); } @@ -571,24 +571,24 @@ TQRect KWViewModeText::rulerFrameRect() return TQRect( TQPoint(OFFSET, 0), contentsSize() ); } -void KWViewModeText::setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPageLayout& /*tqlayout*/ ) +void KWViewModeText::setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPageLayout& /*layout*/ ) { - // Create a dummy page-tqlayout, as if we had a single page englobing the whole text. - KoPageLayout tqlayout; - tqlayout.format = PG_CUSTOM; - tqlayout.orientation = PG_PORTRAIT; + // Create a dummy page-layout, as if we had a single page englobing the whole text. + KoPageLayout layout; + layout.format = PG_CUSTOM; + layout.orientation = PG_PORTRAIT; TQSize cSize = contentsSize(); - tqlayout.ptWidth = m_doc->unzoomItX( cSize.width() ); - tqlayout.ptHeight = m_doc->unzoomItY( cSize.height() ); - //kdDebug() << "KWViewModeText::setPageLayout tqlayout size " << tqlayout.ptWidth << "x" << tqlayout.ptHeight << endl; - tqlayout.ptLeft = OFFSET; - tqlayout.ptRight = 0; - tqlayout.ptTop = 0; - tqlayout.ptBottom = 0; - tqlayout.ptBindingSide = 0; - tqlayout.ptPageEdge = 0; - hRuler->setPageLayout( tqlayout ); - vRuler->setPageLayout( tqlayout ); + layout.ptWidth = m_doc->unzoomItX( cSize.width() ); + layout.ptHeight = m_doc->unzoomItY( cSize.height() ); + //kdDebug() << "KWViewModeText::setPageLayout layout size " << layout.ptWidth << "x" << layout.ptHeight << endl; + layout.ptLeft = OFFSET; + layout.ptRight = 0; + layout.ptTop = 0; + layout.ptBottom = 0; + layout.ptBindingSide = 0; + layout.ptPageEdge = 0; + hRuler->setPageLayout( layout ); + vRuler->setPageLayout( layout ); } bool KWViewModeText::isTextModeFrameset(KWFrameSet *fs) const { diff --git a/kword/KWViewMode.h b/kword/KWViewMode.h index fc78779a..fa0ec1d9 100644 --- a/kword/KWViewMode.h +++ b/kword/KWViewMode.h @@ -85,9 +85,9 @@ public: /** The result of this is passed to setFrameStartEnd for both rulers * (after adjustement with pageCorner()) */ virtual TQRect rulerFrameRect(); - /** Called when the page tqlayout is set, or changes. + /** Called when the page layout is set, or changes. * Usually this is directly passed to KoRuler (for page-based viewmodes) */ - virtual void setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPageLayout& tqlayout ); + virtual void setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPageLayout& layout ); virtual void drawPageBorders( TQPainter * painter, const TQRect & crect, const TQRegion & emptySpaceRegion ) = 0; @@ -273,7 +273,7 @@ public: // There is no page concept. Keep everything relative to (0,0) virtual TQPoint pageCorner() { return TQPoint( 0, 0 ); } virtual TQRect rulerFrameRect(); - virtual void setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPageLayout& tqlayout ); + virtual void setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPageLayout& layout ); virtual void drawPageBorders( TQPainter * painter, const TQRect & crect, const TQRegion & emptySpaceRegion ); virtual const TQString type() const { return "ModeText"; } diff --git a/kword/KWordFrameSetIface.cpp b/kword/KWordFrameSetIface.cpp index 928cddb5..e284862e 100644 --- a/kword/KWordFrameSetIface.cpp +++ b/kword/KWordFrameSetIface.cpp @@ -135,25 +135,25 @@ bool KWordFrameSetIface::isCopy()const void KWordFrameSetIface::setPtMarginLeft(double val) { m_frame->frame( 0 )->setPaddingLeft(val); - m_frame->kWordDocument()->tqlayout(); + m_frame->kWordDocument()->layout(); } void KWordFrameSetIface::setPtMarginRight(double val) { m_frame->frame( 0 )->setPaddingRight(val); - m_frame->kWordDocument()->tqlayout(); + m_frame->kWordDocument()->layout(); } void KWordFrameSetIface::setPtMarginTop(double val) { m_frame->frame( 0 )->setPaddingTop(val); - m_frame->kWordDocument()->tqlayout(); + m_frame->kWordDocument()->layout(); } void KWordFrameSetIface::setPtMarginBottom(double val) { m_frame->frame( 0 )->setPaddingBottom(val); - m_frame->kWordDocument()->tqlayout(); + m_frame->kWordDocument()->layout(); } TQColor KWordFrameSetIface::leftBorderColor() const diff --git a/kword/KWordFrameSetIface.h b/kword/KWordFrameSetIface.h index 9a5c9238..175d8fc0 100644 --- a/kword/KWordFrameSetIface.h +++ b/kword/KWordFrameSetIface.h @@ -25,7 +25,7 @@ #include <tqstring.h> #include <tqcolor.h> -#include <tqbrush.h> +#include <brush.h> class KWFrameSet; class KWordFrameSetIface : public DCOPObject diff --git a/kword/KWordViewIface.cpp b/kword/KWordViewIface.cpp index 246b92e6..a259d9e7 100644 --- a/kword/KWordViewIface.cpp +++ b/kword/KWordViewIface.cpp @@ -394,7 +394,7 @@ bool KWordViewIface::pictureKeepRatio() const return view->getGUI()->canvasWidget()->pictureKeepRatio(); } -void KWordViewIface::changeAutoSpellChecktqStatus(bool b) +void KWordViewIface::changeAutoSpellCheckStatus(bool b) { view->autoSpellCheck(b); } diff --git a/kword/KWordViewIface.h b/kword/KWordViewIface.h index ea422ad9..5181359d 100644 --- a/kword/KWordViewIface.h +++ b/kword/KWordViewIface.h @@ -126,7 +126,7 @@ k_dcop: void setPictureKeepRatio( bool _keep); bool pictureKeepRatio() const; - void changeAutoSpellChecktqStatus(bool b); + void changeAutoSpellCheckStatus(bool b); void deselectAllFrames(); int currentPage(); void convertTableToText(); diff --git a/kword/OASIS b/kword/OASIS index fdbfc016..b840b92d 100644 --- a/kword/OASIS +++ b/kword/OASIS @@ -25,7 +25,7 @@ and the page-based DTP mode (page-sequence element). * Headers and footers OpenDocument supports odd/even headers and footers using "header" and "header-left". -But for first page header/footer KWord should create a separate page tqlayout, +But for first page header/footer KWord should create a separate page layout, this is not done yet (it uses its own tag instead, as a temporary hack). Also OpenDocument doesn't allow a different style for header and header-left, so they must have the same min-size, border, margins... @@ -60,7 +60,7 @@ List of features that KWord has, but OOo doesn't have, and which are in the Open List of features that KWord doesn't have, and which OpenDocument has: (that list would be quite long, but let's list the real-life interoperability problems) - - lack of section support (changes of page tqlayout, but also changes of column settings + - lack of section support (changes of page layout, but also changes of column settings in the middle of a page) We could at least keep section styles and section markers (begin/end), so that load+save preserves it. diff --git a/kword/defs.h b/kword/defs.h index b4b60665..a1bc3677 100644 --- a/kword/defs.h +++ b/kword/defs.h @@ -20,7 +20,7 @@ #ifndef defs_h #define defs_h -#include <tqtextstream.h> +#include <textstream.h> #include <tqstring.h> #include <KoGlobal.h> #include "KWFactory.h" diff --git a/kword/demos/framestest.kwd b/kword/demos/framestest.kwd index f673d49c..c9e7fb03 100644 --- a/kword/demos/framestest.kwd +++ b/kword/demos/framestest.kwd @@ -262,7 +262,7 @@ </LAYOUT> </PARAGRAPH> <PARAGRAPH> - <TEXT>acbdefghijklmnopqrstuvwxyz. 1234567890. kofficyet sdfgsdfgsdfgsdfg(libty koffitcecore): KoMainWindow::setRootDocument this = [KoMainWindow pointer (0x813ff28) to widget kword-mainwindow#1, tqgeometry=894x723+0+0] doc = 0x8133470</TEXT> + <TEXT>acbdefghijklmnopqrstuvwxyz. 1234567890. kofficyet sdfgsdfgsdfgsdfg(libty koffitcecore): KoMainWindow::setRootDocument this = [KoMainWindow pointer (0x813ff28) to widget kword-mainwindow#1, geometry=894x723+0+0] doc = 0x8133470</TEXT> <LAYOUT> <NAME value="Standard" /> <FLOW align="left" /> diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp index 1e6c20fe..57b574a5 100644 --- a/kword/mailmerge/KWClassicSerialDataSource.cpp +++ b/kword/mailmerge/KWClassicSerialDataSource.cpp @@ -24,7 +24,7 @@ #include <kinputdialog.h> #include <tqlabel.h> #include <tqhbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <tqpushbutton.h> #include <tqlineedit.h> @@ -107,7 +107,7 @@ void KWClassicSerialDataSource::removeRecord( int i ) if ( (i < 0) || (i > (int)db.count() - 1) ) return; - kdDebug()<<TQString("Removing record %1").tqarg(i)<<endl; + kdDebug()<<TQString("Removing record %1").arg(i)<<endl; Db::Iterator it = db.at( i); db.remove( it ); @@ -115,25 +115,25 @@ void KWClassicSerialDataSource::removeRecord( int i ) void KWClassicSerialDataSource::save( TQDomDocument &doc, TQDomElement &parent) { - TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION")); + TQDomElement def=doc.createElement(TQString::fromLatin1("DEFINITION")); parent.appendChild(def); for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it) { - TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("FIELD")); - defEnt.setAttribute(TQString::tqfromLatin1("name"),it.key()); + TQDomElement defEnt=doc.createElement(TQString::fromLatin1("FIELD")); + defEnt.setAttribute(TQString::fromLatin1("name"),it.key()); def.appendChild(defEnt); } - TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT")); + TQDomElement cont=doc.createElement(TQString::fromLatin1("CONTENT")); parent.appendChild(cont); for (Db::Iterator dbI=db.begin();dbI!=db.end();++dbI) { - TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD")); + TQDomElement rec=doc.createElement(TQString::fromLatin1("RECORD")); cont.appendChild(rec); for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it) { - TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM")); - recEnt.setAttribute(TQString::tqfromLatin1("name"),it.key()); - recEnt.setAttribute(TQString::tqfromLatin1("data"),(*dbI)[it.key()]); + TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM")); + recEnt.setAttribute(TQString::fromLatin1("name"),it.key()); + recEnt.setAttribute(TQString::fromLatin1("data"),(*dbI)[it.key()]); rec.appendChild(recEnt); } } @@ -148,7 +148,7 @@ void KWClassicSerialDataSource::load( TQDomElement& parentElem ) TQDomElement def=defNd.toElement(); for (TQDomElement defEnt=def.firstChild().toElement();!defEnt.isNull();defEnt=defEnt.nextSibling().toElement()) { - sampleRecord[defEnt.attribute(TQString::tqfromLatin1("name"))]=i18n( "No Value" ); + sampleRecord[defEnt.attribute(TQString::fromLatin1("name"))]=i18n( "No Value" ); } TQDomNode contNd=parentElem.namedItem("CONTENT"); if (contNd.isNull()) return; @@ -157,8 +157,8 @@ void KWClassicSerialDataSource::load( TQDomElement& parentElem ) appendRecord(); for (TQDomElement recEnt=rec.firstChild().toElement();!recEnt.isNull();recEnt=recEnt.nextSibling().toElement()) { - setValue(recEnt.attribute(TQString::tqfromLatin1("name")), - recEnt.attribute(TQString::tqfromLatin1("data")),db.count()-1); + setValue(recEnt.attribute(TQString::fromLatin1("name")), + recEnt.attribute(TQString::fromLatin1("data")),db.count()-1); } } } @@ -219,9 +219,9 @@ TQString KWClassicMailMergeEditorListItem::text( int i ) const void KWClassicMailMergeEditorListItem::setup() { setHeight( TQMAX( listView()->fontMetrics().height(), - editWidget->tqsizeHint().height() ) ); - if ( listView()->columnWidth( 1 ) < editWidget->tqsizeHint().width() ) - listView()->setColumnWidth( 1, editWidget->tqsizeHint().width() ); + editWidget->sizeHint().height() ) ); + if ( listView()->columnWidth( 1 ) < editWidget->sizeHint().width() ) + listView()->setColumnWidth( 1, editWidget->sizeHint().width() ); } void KWClassicMailMergeEditorListItem::update() @@ -342,27 +342,27 @@ KWClassicMailMergeEditor::KWClassicMailMergeEditor( TQWidget *parent, KWClassicS first = new TQToolButton( toolbar ); first->setIconSet( SmallIconSet( "start" ) ); - first->setFixedSize( first->tqsizeHint() ); + first->setFixedSize( first->sizeHint() ); connect(first, TQT_SIGNAL(clicked()), this, TQT_SLOT(firstRecord())); back_ = new TQToolButton( toolbar ); back_->setIconSet( SmallIconSet( "back" ) ); - back_->setFixedSize( back_->tqsizeHint() ); + back_->setFixedSize( back_->sizeHint() ); connect(back_, TQT_SIGNAL(clicked()), this, TQT_SLOT(prevRecord())); records = new TQSpinBox( 1, db->getNumRecords(), 1, toolbar ); - records->setMaximumHeight( records->tqsizeHint().height() ); + records->setMaximumHeight( records->sizeHint().height() ); connect( records, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changeRecord( int ) ) ); forward = new TQToolButton( toolbar ); forward->setIconSet( SmallIconSet( "forward" ) ); - forward->setFixedSize( forward->tqsizeHint() ); + forward->setFixedSize( forward->sizeHint() ); connect(forward, TQT_SIGNAL(clicked()), this, TQT_SLOT(nextRecord())); finish = new TQToolButton( toolbar ); finish->setIconSet( SmallIconSet( "finish" ) ); - finish->setFixedSize( finish->tqsizeHint() ); + finish->setFixedSize( finish->sizeHint() ); connect(finish, TQT_SIGNAL(clicked()), this, TQT_SLOT(lastRecord())); TQWidget *sep = new TQWidget( toolbar ); @@ -370,28 +370,28 @@ KWClassicMailMergeEditor::KWClassicMailMergeEditor( TQWidget *parent, KWClassicS newRecord = new TQToolButton( toolbar ); newRecord->setIconSet( SmallIconSet( "sl_addrecord" ) ); - newRecord->setFixedSize( newRecord->tqsizeHint() ); + newRecord->setFixedSize( newRecord->sizeHint() ); connect( newRecord, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addRecord() ) ); TQToolTip::add( newRecord, i18n( "Add record" ) ); newEntry = new TQToolButton( toolbar ); newEntry->setIconSet( SmallIconSet( "sl_addentry" ) ); - newEntry->setFixedSize( newEntry->tqsizeHint() ); + newEntry->setFixedSize( newEntry->sizeHint() ); connect( newEntry, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addEntry() ) ); TQToolTip::add( newEntry, i18n( "Add entry" ) ); deleteRecord = new TQToolButton( toolbar ); deleteRecord->setIconSet( SmallIconSet( "sl_delrecord" ) ); - deleteRecord->setFixedSize( deleteRecord->tqsizeHint() ); + deleteRecord->setFixedSize( deleteRecord->sizeHint() ); connect( deleteRecord, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeRecord() ) ); TQToolTip::add( deleteRecord, i18n( "Remove record" ) ); deleteEntry = new TQToolButton( toolbar ); deleteEntry->setIconSet( SmallIconSet( "sl_delentry" ) ); - deleteEntry->setFixedSize( deleteEntry->tqsizeHint() ); + deleteEntry->setFixedSize( deleteEntry->sizeHint() ); connect( deleteEntry, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeEntry() ) ); TQToolTip::add( deleteEntry, i18n( "Remove entry" ) ); diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp index 411ee5e5..1886207c 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABC.cpp +++ b/kword/mailmerge/kabc/KWMailMergeKABC.cpp @@ -168,7 +168,7 @@ TQString KWMailMergeKABC::getValue( const TQString &name, int record ) const if( !uidAvailable ) { - return ( i18n ( "KAddressbook entry '%1' not available." ).tqarg( *_UIDIterator ) ); + return ( i18n ( "KAddressbook entry '%1' not available." ).arg( *_UIDIterator ) ); } @@ -350,16 +350,16 @@ TQString KWMailMergeKABC::getValue( const TQString &name, int record ) const TQString lat; TQString longi; if( geo.latitude()<0 ) - lat = TQString( i18n("%1 South") ).tqarg( -geo.latitude() ); + lat = TQString( i18n("%1 South") ).arg( -geo.latitude() ); else - lat = TQString( i18n("%1 North") ).tqarg( geo.latitude() ); + lat = TQString( i18n("%1 North") ).arg( geo.latitude() ); if( geo.longitude()<0 ) // There is something going wrong, because "W" is replaced by "q ". // Needs fix. - longi = TQString( i18n("%1 West") ).tqarg( -geo.longitude() ); + longi = TQString( i18n("%1 West") ).arg( -geo.longitude() ); else - longi = TQString( i18n("%1 East") ).tqarg( geo.longitude() ); + longi = TQString( i18n("%1 East") ).arg( geo.longitude() ); return i18n( "Geographic coordinates", "%1, %2" ).arg ( lat, longi ); } @@ -409,7 +409,7 @@ void KWMailMergeKABC::load( TQDomElement& parentElem ) for( TQDomElement recEnt=rec.firstChild().toElement(); !recEnt.isNull(); recEnt=recEnt.nextSibling().toElement() ) { - addEntry( recEnt.attribute( TQString::tqfromLatin1("uid") ) ); + addEntry( recEnt.attribute( TQString::fromLatin1("uid") ) ); } } else if( rec.nodeName() == "LIST" ) @@ -417,7 +417,7 @@ void KWMailMergeKABC::load( TQDomElement& parentElem ) for( TQDomElement recEnt=rec.firstChild().toElement(); !recEnt.isNull(); recEnt=recEnt.nextSibling().toElement() ) { - addList( recEnt.attribute( TQString::tqfromLatin1("listid") ) ); + addList( recEnt.attribute( TQString::fromLatin1("listid") ) ); } } else @@ -482,26 +482,26 @@ void KWMailMergeKABC::refresh( bool ) void KWMailMergeKABC::save( TQDomDocument& doc, TQDomElement& parent) { - TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT")); + TQDomElement cont=doc.createElement(TQString::fromLatin1("CONTENT")); parent.appendChild(cont); TQValueList<TQString>::ConstIterator it = _individualUIDs.begin(); for( ; it != _individualUIDs.end(); ++it ) { - TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD")); + TQDomElement rec=doc.createElement(TQString::fromLatin1("RECORD")); cont.appendChild(rec); - TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM")); - recEnt.setAttribute(TQString::tqfromLatin1("uid"),*it); + TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM")); + recEnt.setAttribute(TQString::fromLatin1("uid"),*it); rec.appendChild(recEnt); } it = _lists.begin(); for( ; !(it == _lists.end()); ++it ) { - TQDomElement rec=doc.createElement(TQString::tqfromLatin1("LIST")); + TQDomElement rec=doc.createElement(TQString::fromLatin1("LIST")); cont.appendChild(rec); - TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM")); - recEnt.setAttribute(TQString::tqfromLatin1("listid"),*it); + TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM")); + recEnt.setAttribute(TQString::fromLatin1("listid"),*it); rec.appendChild(recEnt); } } diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp index d1c03809..d3f3a21c 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp +++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp @@ -20,7 +20,7 @@ #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <kapplication.h> @@ -376,7 +376,7 @@ void KWMailMergeKABCConfig::saveDistributionList() KMessageBox::information( 0, i18n( "<qt>Distribution list with the given name <b>%1</b> " "already exists. Please select a different name.</qt>" ) - .tqarg( listName ) ); + .arg( listName ) ); return; } KABC::DistributionList *distList = new KABC::DistributionList( &dlm, listName ); diff --git a/kword/mailmerge/kabc/addresspicker.ui b/kword/mailmerge/kabc/addresspicker.ui index c7276c9b..af8f5723 100644 --- a/kword/mailmerge/kabc/addresspicker.ui +++ b/kword/mailmerge/kabc/addresspicker.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -76,7 +76,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -101,7 +101,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -217,7 +217,7 @@ <property name="text"> <string>&Address Book</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> <property name="buddy" stdset="0"> @@ -236,7 +236,7 @@ <property name="text"> <string>&Selected Addresses</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> <property name="buddy" stdset="0"> diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp index 6801a64a..025e9a4e 100644 --- a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp +++ b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp @@ -53,7 +53,7 @@ TQString KWMailMergeKSpread::getValue( const TQString &name, int record ) const if ( cell ) return cellText( cell ); else - return i18n( "Unkown mail merge variable: %1" ).tqarg( name ); + return i18n( "Unkown mail merge variable: %1" ).arg( name ); } void KWMailMergeKSpread::load( TQDomElement& parentElem ) @@ -66,15 +66,15 @@ void KWMailMergeKSpread::load( TQDomElement& parentElem ) if ( element.isNull() ) return; - _url = element.attribute( TQString::tqfromLatin1( "URL" ) ); - _spreadSheetNumber = element.attribute( TQString::tqfromLatin1( "SpreadSheetNumber" ) ).toInt(); + _url = element.attribute( TQString::fromLatin1( "URL" ) ); + _spreadSheetNumber = element.attribute( TQString::fromLatin1( "SpreadSheetNumber" ) ).toInt(); initDocument(); } void KWMailMergeKSpread::save( TQDomDocument& doc, TQDomElement& parent ) { - TQDomElement content = doc.createElement( TQString::tqfromLatin1( "CONTENT" ) ); + TQDomElement content = doc.createElement( TQString::fromLatin1( "CONTENT" ) ); parent.appendChild( content ); content.setAttribute( "URL", _url.url() ); diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp index f08ae82e..595633d9 100644 --- a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp +++ b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp @@ -20,7 +20,7 @@ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <kcombobox.h> #include <klineedit.h> @@ -100,20 +100,20 @@ void KWMailMergeKSpreadConfig::initGUI() { TQFrame *page = plainPage(); - TQGridLayout *tqlayout = new TQGridLayout( page, 2, 2, marginHint(), spacingHint() ); + TQGridLayout *layout = new TQGridLayout( page, 2, 2, marginHint(), spacingHint() ); TQLabel *label = new TQLabel( i18n( "URL:" ), page ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); _urlRequester = new KURLRequester( page ); - tqlayout->addWidget( _urlRequester, 0, 1 ); + layout->addWidget( _urlRequester, 0, 1 ); label = new TQLabel( i18n( "Page number:" ), page ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); _pageNumber = new KComboBox( page ); _pageNumber->setEnabled( false ); - tqlayout->addWidget( _pageNumber, 1, 1 ); + layout->addWidget( _pageNumber, 1, 1 ); connect( _urlRequester->lineEdit() , TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged( const TQString & ) ) ); } diff --git a/kword/mailmerge/sql/KWMySqlCursor.h b/kword/mailmerge/sql/KWMySqlCursor.h index 4a25323b..8919cc9a 100644 --- a/kword/mailmerge/sql/KWMySqlCursor.h +++ b/kword/mailmerge/sql/KWMySqlCursor.h @@ -59,9 +59,9 @@ TQSqlCursor( TQString(), autopopulate ) TQSqlIndex() ) { return exec( lastQuery() ); } TQSqlIndex primaryIndex( bool /*prime*/ = TRUE ) const { return TQSqlIndex(); } - int insert( bool /*tqinvalidate*/ = TRUE ) { return FALSE; } - int update( bool /*tqinvalidate*/ = TRUE ) { return FALSE; } - int del( bool /*tqinvalidate*/ = TRUE ) { return FALSE; } + 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/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp index 3db1d9d6..b424f227 100644 --- a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp +++ b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp @@ -3,7 +3,7 @@ #include <tqtable.h> #include <tqscrollview.h> #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> KWQtSqlEasyFilter::KWQtSqlEasyFilter( TQWidget *parent) @@ -33,7 +33,7 @@ KWQtSqlEasyFilter::KWQtSqlEasyFilter( TQWidget *parent) int h=m_table->rowHeight(0); for (int i=0;i<6;i++) h+=m_table->rowHeight(i); - h+=m_table->horizontalHeader()->tqsizeHint().height(); + h+=m_table->horizontalHeader()->sizeHint().height(); m_table->setMinimumHeight(h); int w=0; diff --git a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp index d3feca22..3e860d76 100644 --- a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp +++ b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp @@ -22,7 +22,7 @@ #include <kcombobox.h> #include <klineedit.h> #include <kdebug.h> -#include <tqlayout.h> +#include <layout.h> #include <kconfig.h> #include <kpushbutton.h> #include <klineeditdlg.h> diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp index 544f7990..e7671e03 100644 --- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp +++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp @@ -20,7 +20,7 @@ #include "KWQtSqlPowerSerialDataSource.h" #include "KWQtSqlPowerSerialDataSource.moc" #include "KWQtSqlMailMergeOpen.h" -#include <tqlayout.h> +#include <layout.h> #include <tqdom.h> #include <kcombobox.h> #include <klineedit.h> @@ -68,7 +68,7 @@ void KWQtSqlPowerSerialDataSource::refresh(bool force) myquery=new KWMySqlCursor(query,true,database); myquery->setMode(TQSqlCursor::ReadOnly); } - kdDebug()<<TQString("There were %1 rows in the query").tqarg(myquery->size())<<endl; + kdDebug()<<TQString("There were %1 rows in the query").arg(myquery->size())<<endl; } TQString KWQtSqlPowerSerialDataSource::getValue( const TQString &name, int record ) const @@ -79,33 +79,33 @@ TQString KWQtSqlPowerSerialDataSource::getValue( const TQString &name, int recor if ( num < 0 || num > (int)myquery->size() ) return name; if (!myquery->seek(num,false)) return i18n(">>>Illegal position within datasource<<<"); - if (!myquery->contains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").tqarg(name); + if (!myquery->contains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").arg(name); return (myquery->value(name)).toString(); } void KWQtSqlPowerSerialDataSource::save( TQDomDocument &doc, TQDomElement &parent) { - TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION")); + TQDomElement def=doc.createElement(TQString::fromLatin1("DEFINITION")); parent.appendChild(def); { - TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("DATABASE")); - defEnt.setAttribute(TQString::tqfromLatin1("hostname"),hostname); - defEnt.setAttribute(TQString::tqfromLatin1("port"),port); - defEnt.setAttribute(TQString::tqfromLatin1("driver"),driver); - defEnt.setAttribute(TQString::tqfromLatin1("databasename"),databasename); - defEnt.setAttribute(TQString::tqfromLatin1("username"),username); + TQDomElement defEnt=doc.createElement(TQString::fromLatin1("DATABASE")); + defEnt.setAttribute(TQString::fromLatin1("hostname"),hostname); + defEnt.setAttribute(TQString::fromLatin1("port"),port); + defEnt.setAttribute(TQString::fromLatin1("driver"),driver); + defEnt.setAttribute(TQString::fromLatin1("databasename"),databasename); + defEnt.setAttribute(TQString::fromLatin1("username"),username); def.appendChild(defEnt); - defEnt=doc.createElement(TQString::tqfromLatin1("QUERY")); - defEnt.setAttribute(TQString::tqfromLatin1("value"),query); + defEnt=doc.createElement(TQString::fromLatin1("QUERY")); + defEnt.setAttribute(TQString::fromLatin1("value"),query); def.appendChild(defEnt); - TQDomElement sampleEnt=doc.createElement(TQString::tqfromLatin1("SAMPLERECORD")); + TQDomElement sampleEnt=doc.createElement(TQString::fromLatin1("SAMPLERECORD")); parent.appendChild(sampleEnt); for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it) { - TQDomElement fieldEnt=doc.createElement(TQString::tqfromLatin1("FIELD")); - fieldEnt.setAttribute(TQString::tqfromLatin1("name"),it.key()); + TQDomElement fieldEnt=doc.createElement(TQString::fromLatin1("FIELD")); + fieldEnt.setAttribute(TQString::fromLatin1("name"),it.key()); sampleEnt.appendChild(fieldEnt); } } @@ -122,19 +122,19 @@ void KWQtSqlPowerSerialDataSource::load( TQDomElement& parentElem ) if (!dbNd.isNull()) { TQDomElement dbEnt=dbNd.toElement(); - if (dbEnt.tagName()==TQString::tqfromLatin1("DATABASE")) + if (dbEnt.tagName()==TQString::fromLatin1("DATABASE")) { - hostname=dbEnt.attribute(TQString::tqfromLatin1("hostname")); - port=dbEnt.attribute(TQString::tqfromLatin1("port")); - driver=dbEnt.attribute(TQString::tqfromLatin1("driver")); - databasename=dbEnt.attribute(TQString::tqfromLatin1("databasename")); - username=dbEnt.attribute(TQString::tqfromLatin1("username")); + hostname=dbEnt.attribute(TQString::fromLatin1("hostname")); + port=dbEnt.attribute(TQString::fromLatin1("port")); + driver=dbEnt.attribute(TQString::fromLatin1("driver")); + databasename=dbEnt.attribute(TQString::fromLatin1("databasename")); + username=dbEnt.attribute(TQString::fromLatin1("username")); } } TQDomNode queryNd=def.namedItem("QUERY"); if (!queryNd.isNull()) { - query=queryNd.toElement().attribute(TQString::tqfromLatin1("value")); + query=queryNd.toElement().attribute(TQString::fromLatin1("value")); } } @@ -144,7 +144,7 @@ void KWQtSqlPowerSerialDataSource::load( TQDomElement& parentElem ) TQDomElement def1=defNd.toElement(); for (TQDomElement defEnt=defNd.firstChild().toElement();!defEnt.isNull();defEnt=defEnt.nextSibling().toElement()) { - addSampleRecordEntry(defEnt.attribute(TQString::tqfromLatin1("name"))); + addSampleRecordEntry(defEnt.attribute(TQString::fromLatin1("name"))); } } } @@ -203,7 +203,7 @@ void KWQtSqlPowerMailMergeEditor::slotExecute() cur->setMode(TQSqlCursor::ReadOnly); db->clearSampleRecord(); - kdDebug()<<TQString("Fieldname count %1").tqarg(cur->count())<<endl; + kdDebug()<<TQString("Fieldname count %1").arg(cur->count())<<endl; for (uint i=0;i<cur->count();i++) db->addSampleRecordEntry(cur->fieldName(i)); diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp index ec31df35..b956335b 100644 --- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp +++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp @@ -22,7 +22,7 @@ #include "KWQtSqlEasyFilter.h" #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqsqlcursor.h> #include <tqdatatable.h> #include <tqcheckbox.h> @@ -59,32 +59,32 @@ TQString KWQtSqlSerialDataSource::getValue( const TQString &name, int record ) c if ( num < 0 || num > (int)myquery->size() ) return name; if (!myquery->seek(num,false)) return i18n(">>>Illegal position within datasource<<<"); - if (!myquery->contains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").tqarg(name); + if (!myquery->contains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").arg(name); return (myquery->value(name)).toString(); } void KWQtSqlSerialDataSource::save( TQDomDocument & /*doc*/, TQDomElement & /*parent*/) { /* - TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION")); + TQDomElement def=doc.createElement(TQString::fromLatin1("DEFINITION")); parent.appendChild(def); for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it) { - TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("FIELD")); - defEnt.setAttribute(TQString::tqfromLatin1("name"),it.key()); + TQDomElement defEnt=doc.createElement(TQString::fromLatin1("FIELD")); + defEnt.setAttribute(TQString::fromLatin1("name"),it.key()); def.appendChild(defEnt); } - TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT")); + TQDomElement cont=doc.createElement(TQString::fromLatin1("CONTENT")); parent.appendChild(cont); for (Db::Iterator dbI=db.begin();dbI!=db.end();++dbI) { - TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD")); + TQDomElement rec=doc.createElement(TQString::fromLatin1("RECORD")); cont.appendChild(rec); for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it) { - TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM")); - recEnt.setAttribute(TQString::tqfromLatin1("name"),it.key()); - recEnt.setAttribute(TQString::tqfromLatin1("data"),(*dbI)[it.key()]); + TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM")); + recEnt.setAttribute(TQString::fromLatin1("name"),it.key()); + recEnt.setAttribute(TQString::fromLatin1("data"),(*dbI)[it.key()]); rec.appendChild(recEnt); } } @@ -101,7 +101,7 @@ void KWQtSqlSerialDataSource::load( TQDomElement& /*parentElem*/ ) TQDomElement def=defNd.toElement(); for (TQDomElement defEnt=def.firstChild().toElement();!defEnt.isNull();defEnt=defEnt.nextSibling().toElement()) { - sampleRecord[defEnt.attribute(TQString::tqfromLatin1("name"))]=defEnt.attribute(TQString::tqfromLatin1("name"));//i18n( "No Value" ); + sampleRecord[defEnt.attribute(TQString::fromLatin1("name"))]=defEnt.attribute(TQString::fromLatin1("name"));//i18n( "No Value" ); } TQDomNode contNd=parentElem.namedItem("CONTENT"); if (contNd.isNull()) return; @@ -110,8 +110,8 @@ void KWQtSqlSerialDataSource::load( TQDomElement& /*parentElem*/ ) appendRecord(); for (TQDomElement recEnt=rec.firstChild().toElement();!recEnt.isNull();recEnt=recEnt.nextSibling().toElement()) { - setValue(recEnt.attribute(TQString::tqfromLatin1("name")), - recEnt.attribute(TQString::tqfromLatin1("data")),db.count()-1); + setValue(recEnt.attribute(TQString::fromLatin1("name")), + recEnt.attribute(TQString::fromLatin1("data")),db.count()-1); } } */ @@ -146,7 +146,7 @@ void KWQtSqlSerialDataSource::refresh(bool force) myquery->setMode(TQSqlCursor::ReadOnly); myquery->select(filter); } - kdDebug()<<TQString("There were %1 rows in the query").tqarg(myquery->size())<<endl; + kdDebug()<<TQString("There were %1 rows in the query").arg(myquery->size())<<endl; } diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp index f31a431a..0d414cdc 100644 --- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp +++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp @@ -20,7 +20,7 @@ #include "KWQtSqlSerialDataSourceBase.h" #include "KWQtSqlSerialDataSourceBase.moc" #include "KWQtSqlMailMergeOpen.h" -#include <tqlayout.h> +#include <layout.h> #include <tqdom.h> #include <kcombobox.h> #include <klineedit.h> @@ -49,7 +49,7 @@ int KWQtSqlSerialDataSourceBase::connectionId=0; KWQtSqlSerialDataSourceBase::KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *parent) : KWMailMergeDataSource(inst,parent) { - DataBaseConnection=TQString("KWTQTSQLPOWER")+parent->name()+TQString("--%1").tqarg(connectionId++); + DataBaseConnection=TQString("KWTQTSQLPOWER")+parent->name()+TQString("--%1").arg(connectionId++); port=i18n("default"); } diff --git a/kword/mailmerge/sql/kwqtsqlpower.ui b/kword/mailmerge/sql/kwqtsqlpower.ui index a68b62db..afff8c7f 100644 --- a/kword/mailmerge/sql/kwqtsqlpower.ui +++ b/kword/mailmerge/sql/kwqtsqlpower.ui @@ -54,7 +54,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>120</height> @@ -73,7 +73,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>120</height> @@ -168,7 +168,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>0</height> @@ -196,7 +196,7 @@ <property name="name"> <cstring>Line2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> diff --git a/kword/mailmerge/sql/qtsqlopenwidget.ui b/kword/mailmerge/sql/qtsqlopenwidget.ui index fc32bded..c0d2423a 100644 --- a/kword/mailmerge/sql/qtsqlopenwidget.ui +++ b/kword/mailmerge/sql/qtsqlopenwidget.ui @@ -283,7 +283,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kword/tests/KWPageManagerTester.cpp b/kword/tests/KWPageManagerTester.cpp index 641e6534..9b261d90 100644 --- a/kword/tests/KWPageManagerTester.cpp +++ b/kword/tests/KWPageManagerTester.cpp @@ -200,11 +200,11 @@ void KWPageManagerTester::removePages() { void KWPageManagerTester::pageInfo() { KWPageManager *pageManager = new KWPageManager(); - KoPageLayout tqlayout; - tqlayout.ptWidth = 300; - tqlayout.ptHeight = 600; - tqlayout.format = PG_DIN_A4; - pageManager->setDefaultPage(tqlayout); + KoPageLayout layout; + layout.ptWidth = 300; + layout.ptHeight = 600; + layout.format = PG_DIN_A4; + pageManager->setDefaultPage(layout); pageManager->setStartPage(1); KWPage *page1 = pageManager->appendPage(); page1->setWidth(100); @@ -216,19 +216,19 @@ void KWPageManagerTester::pageInfo() { CHECK(pageManager->topOfPage(3), 300.0); CHECK(pageManager->bottomOfPage(3), 900.0); - tqlayout.ptHeight = 500; - pageManager->setDefaultPage(tqlayout); + layout.ptHeight = 500; + pageManager->setDefaultPage(layout); CHECK(pageManager->bottomOfPage(3), 800.0); page2->setHeight(-1); CHECK(pageManager->bottomOfPage(3), 1200.0); - tqlayout.ptTop = 5; - tqlayout.ptLeft = 6; - tqlayout.ptBottom = 7; - tqlayout.ptRight = 8; - tqlayout.ptBindingSide = -1; - tqlayout.ptPageEdge = -1; - pageManager->setDefaultPage(tqlayout); + layout.ptTop = 5; + layout.ptLeft = 6; + layout.ptBottom = 7; + layout.ptRight = 8; + layout.ptBindingSide = -1; + layout.ptPageEdge = -1; + pageManager->setDefaultPage(layout); page2->setTopMargin(9); page2->setLeftMargin(10); page2->setBottomMargin(11); diff --git a/lib/kformula/DESIGN b/lib/kformula/DESIGN index 3402d9ee..a6a7eccb 100644 --- a/lib/kformula/DESIGN +++ b/lib/kformula/DESIGN @@ -19,21 +19,21 @@ objects from it. Responsebilities (This goes for every derived element and therefore for each one.) -- knows its tqchildren. Actually BasicElement doesn't have any. But it - already defines that tqchildren must be known by their parent. -- knows its bounding rectangle (its size.) The tqchildren are included +- knows its children. Actually BasicElement doesn't have any. But it + already defines that children must be known by their parent. +- knows its bounding rectangle (its size.) The children are included in this rect. (The position is relative to the parent.) -//- knows its middle line. (for tqalignment) -- knows it's zero point for midline (vertical tqalignment) and +//- knows its middle line. (for alignment) +- knows it's zero point for midline (vertical alignment) and keep open the possibility of negative positions (out of bounding rect) -- draws itself (given a painter); tqchildren are drawn, too +- draws itself (given a painter); children are drawn, too - knows all positions where the cursor is allowed to be. (see below) - knows its parent; The topmost element has no parent; there is a implicit guaranty that the topmost element is always a SequenceElement. - can save and load itself. different formates. (see below) -- all tqchildren must be a SequenceElement. Except for SequenceElement's - tqchildren that might be of any type. +- all children must be a SequenceElement. Except for SequenceElement's + children that might be of any type. - might have its own color. - might have its own font size (see below). @@ -41,14 +41,14 @@ Responsebilities SequenceElement from BasicElement --------------- -Manages a list of tqchildren. The tqchildren are aligned horizontally at +Manages a list of children. The children are aligned horizontally at one middle line. No gaps, no overlaps. -Has no own look. It just draws all its tqchildren and is done. Except if +Has no own look. It just draws all its children and is done. Except if its empty. It looks like an empty space then (i.e. a little square) Has n+1 valid cursor positions where n is the number of -tqchildren. These are before, between and after the tqchildren. +children. These are before, between and after the children. May contain any (type of) element as child @@ -73,20 +73,20 @@ FormulaElement we get a chance to pass messages to the outside world. RootElement from BasicElement ----------- -contains two tqchildren. content and index. index is optional. +contains two children. content and index. index is optional. IndexElement from BasicElement ------------ -contains five tqchildren. content and four indexes. all indexes are +contains five children. content and four indexes. all indexes are optional. If there is no index the element might be replaced by its content. TextElement from BasicElement ----------- -contains one char and no tqchildren at all. +contains one char and no children at all. Might have its own font and size. But preferes to use a reasonalbe @@ -104,7 +104,7 @@ choose with. FractionElement from BasicElement --------------- -2 tqchildren: numerator, denominator +2 children: numerator, denominator DecorationElement from BasicElement @@ -121,7 +121,7 @@ the other side of the decoration. SumIntegralElement from BasicElement //PrefixedElement ------------------ -draws all sorts of mathematical symbols with three tqchildren. Above, +draws all sorts of mathematical symbols with three children. Above, below (or whereever the indices and limits go)and to the right. @@ -142,7 +142,7 @@ typical of a math formula. MatrixElement from BasicElement ------------- -A matrix of tqchildren. +A matrix of children. With all align stuff, internal borders etc, matrix dots handling (i.e. those dots or lines that complete the matrix, not well handled in TeX), etc.. @@ -150,7 +150,7 @@ etc.. SpaceElement from BasicElement ------------ -No tqchildren at all. Provides the facility to insert horizontal spaces +No children at all. Provides the facility to insert horizontal spaces in the formula. (therefore it is similar to TextElement.) @@ -184,14 +184,14 @@ If the cursor points into an element this element is said to own the cursor. There are a few rules that describe how new cursor positions are calculated given the current key: -- An elements cursor positions are its tqchildren. The element might not -own the cursor except when it is owned by one of its tqchildren. The +- An elements cursor positions are its children. The element might not +own the cursor except when it is owned by one of its children. The only exception is SequenceElement which has valid cursor positions -before, between and after its tqchildren, too. +before, between and after its children, too. (Therefore the cursor is always owned by a SequenceElement.) -- Each element's tqchildren are ordered. If the cursor leaves one child +- Each element's children are ordered. If the cursor leaves one child the next child it. The direction depends on the key that moved the cursor. If there is child left the cursor is passed to the parent. @@ -344,7 +344,7 @@ We want a formula to look different according to its surroundings. (Most obviosly according to the available height and/or width.) It would be great to get something like automatic operator -tqalignment. So if you type some formulas each on its own line the +alignment. So if you type some formulas each on its own line the assigment operators should be automatically in a column. (If the user turns this on.) diff --git a/lib/kformula/MatrixDialog.cc b/lib/kformula/MatrixDialog.cc index c8169f24..ec89326c 100644 --- a/lib/kformula/MatrixDialog.cc +++ b/lib/kformula/MatrixDialog.cc @@ -22,7 +22,7 @@ #include <tqspinbox.h> #include <tqlabel.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> KFORMULA_NAMESPACE_BEGIN diff --git a/lib/kformula/actionelement.cc b/lib/kformula/actionelement.cc index d4ef8ec4..e1dce937 100644 --- a/lib/kformula/actionelement.cc +++ b/lib/kformula/actionelement.cc @@ -69,7 +69,7 @@ void ActionElement::writeMathMLAttributes( TQDomElement& element ) const element.setAttribute( "actiontype", m_actionType ); } if ( m_selection ) { - element.setAttribute( "selection", TQString( "%1" ).tqarg( m_selection ) ); + element.setAttribute( "selection", TQString( "%1" ).arg( m_selection ) ); } } diff --git a/lib/kformula/basicelement.h b/lib/kformula/basicelement.h index 1fe46cc1..73d031e1 100644 --- a/lib/kformula/basicelement.h +++ b/lib/kformula/basicelement.h @@ -53,7 +53,7 @@ class StyleElement; * Basis of every formula element. An element is used basically by * other elements and by the @ref FormulaCursor . * - * Each element knows its size (a rect that includes all tqchildren) + * Each element knows its size (a rect that includes all children) * and how to draw itself. See @ref calcSizes and @ref draw . * * An element might contain valid cursor position. If the cursor @@ -63,11 +63,11 @@ class StyleElement; * cursor that tell how it wants to move. See @ref moveLeft , * @ref moveRight , @ref moveUp , @ref moveDown . * - * To build a tree an element must own tqchildren. If there are tqchildren + * To build a tree an element must own children. If there are children * there must be a main child. This is the child that might be used to * replace the element. See @ref getMainChild(). * - * If there can be tqchildren you might want to @ref insert and @ref remove + * If there can be children you might want to @ref insert and @ref remove * them. After a removal the element might be senseless. * (See @ref isSenseless ) * If it is it must be removed. @@ -81,10 +81,10 @@ class BasicElement public: /* - * Each element might contain tqchildren. Each child needs + * Each element might contain children. Each child needs * its own unique number. It is not guaranteed, however, * that the number stays the same all the time. - * (The SequenceElement's tqchildren are simply counted.) + * (The SequenceElement's children are simply counted.) */ BasicElement(BasicElement* parent = 0); @@ -102,7 +102,7 @@ public: /** * @returns whether the child should be read-only. The idea is - * that a read-only parent has read-only tqchildren. + * that a read-only parent has read-only children. */ virtual bool readOnly( const BasicElement* child ) const; @@ -158,7 +158,7 @@ public: /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ virtual void calcSizes( const ContextStyle& context, ContextStyle::TextStyle tstyle, @@ -166,7 +166,7 @@ public: StyleAttributes& style ) = 0; /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ @@ -179,7 +179,7 @@ public: /** - * Dispatch this FontCommand to all our TextElement tqchildren. + * Dispatch this FontCommand to all our TextElement children. */ virtual void dispatchFontCommand( FontCommand* /*cmd*/ ) {} @@ -243,7 +243,7 @@ public: */ virtual void entered( SequenceElement* /*child*/ ); - // tqchildren + // children /** * Removes the child. If this was the main child this element might @@ -257,7 +257,7 @@ public: // main child // - // If an element has tqchildren one has to become the main one. + // If an element has children one has to become the main one. virtual SequenceElement* getMainChild() { return 0; } //virtual void setMainChild(SequenceElement*) {} @@ -265,10 +265,10 @@ public: // editing // - // Insert and remove tqchildren. + // Insert and remove children. /** - * Inserts all new tqchildren at the cursor position. Places the + * Inserts all new children at the cursor position. Places the * cursor according to the direction. * * The list will be emptied but stays the property of the caller. @@ -276,8 +276,8 @@ public: virtual void insert(FormulaCursor*, TQPtrList<BasicElement>&, Direction) {} /** - * Removes all selected tqchildren and returns them. Places the - * cursor to where the tqchildren have been. + * Removes all selected children and returns them. Places the + * cursor to where the children have been. */ virtual void remove(FormulaCursor*, TQPtrList<BasicElement>&, Direction) {} @@ -290,7 +290,7 @@ public: /** * Returns wether the element has no more useful - * tqchildren (except its main child) and should therefore + * children (except its main child) and should therefore * be replaced by its main child's content. */ virtual bool isSenseless() { return false; } @@ -316,7 +316,7 @@ public: /** - * Callback for the tabs among our tqchildren. Needed for tqalignment. + * Callback for the tabs among our children. Needed for alignment. */ virtual void registerTab( BasicElement* /*tab*/ ) {} @@ -368,7 +368,7 @@ public: /** * @return a TQDomElement that contain as DomChildren the - * tqchildren, and as attribute the attribute of this + * children, and as attribute the attribute of this * element. */ TQDomElement getElementDom( TQDomDocument& doc); @@ -380,13 +380,13 @@ public: virtual void writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat = false ) const ; /** - * Set this element attribute, build tqchildren and + * Set this element attribute, build children and * call their buildFromDom. */ bool buildFromDom(TQDomElement element); /** - * Set this element attribute, build tqchildren and call + * Set this element attribute, build children and call * their builFromMathMLDom. * Returns the number of nodes processed or -1 if it failed. */ @@ -445,7 +445,7 @@ protected: * Returns if the SequenceElement could be constructed from the nodes first child. * The node name must match the given name. * - * This is a service for all subclasses that contain tqchildren. + * This is a service for all subclasses that contain children. */ bool buildChild( SequenceElement* child, TQDomNode node, TQString name ); @@ -467,7 +467,7 @@ protected: /** * @returns the latex representation of the element and - * of the element's tqchildren + * of the element's children */ virtual TQString toLatex(); @@ -521,7 +521,7 @@ private: * along this line. * * There are elements (like matrix) that don't have a base line. It is - * -1 in this case. The tqalignment is done using the middle line. + * -1 in this case. The alignment is done using the middle line. */ luPixel m_baseline; diff --git a/lib/kformula/bracketelement.cc b/lib/kformula/bracketelement.cc index df51ffa8..a3714e60 100644 --- a/lib/kformula/bracketelement.cc +++ b/lib/kformula/bracketelement.cc @@ -281,7 +281,7 @@ BasicElement* BracketElement::goToPos( FormulaCursor* cursor, bool& handled, /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ void BracketElement::calcSizes( const ContextStyle& context, ContextStyle::TextStyle tstyle, @@ -360,7 +360,7 @@ void BracketElement::calcSizes( const ContextStyle& context, /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ @@ -707,7 +707,7 @@ int BracketElement::operatorType( TQDomNode& node, bool open ) TQString s = e.text(); if ( s.isNull() ) return -1; - *type = static_cast<SymbolType>( TQString::number( s.tqat( 0 ).latin1() ).toInt() ); + *type = static_cast<SymbolType>( TQString::number( s.at( 0 ).latin1() ).toInt() ); } } else { diff --git a/lib/kformula/bracketelement.h b/lib/kformula/bracketelement.h index 83879aac..baf0ff1e 100644 --- a/lib/kformula/bracketelement.h +++ b/lib/kformula/bracketelement.h @@ -62,7 +62,7 @@ public: const LuPixelPoint& point, const LuPixelPoint& parentOrigin ); /** - * Dispatch this FontCommand to all our TextElement tqchildren. + * Dispatch this FontCommand to all our TextElement children. */ virtual void dispatchFontCommand( FontCommand* cmd ); @@ -95,8 +95,8 @@ public: virtual void moveDown(FormulaCursor* cursor, BasicElement* from); /** - * Removes all selected tqchildren and returns them. Places the - * cursor to where the tqchildren have been. + * Removes all selected children and returns them. Places the + * cursor to where the children have been. * * We remove ourselve if we are requested to remove our content. */ @@ -110,7 +110,7 @@ public: // main child // - // If an element has tqchildren one has to become the main one. + // If an element has children one has to become the main one. virtual SequenceElement* getMainChild(); @@ -200,7 +200,7 @@ public: /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ virtual void calcSizes( const ContextStyle& context, ContextStyle::TextStyle tstyle, @@ -208,7 +208,7 @@ public: StyleAttributes& style ); /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ @@ -254,7 +254,7 @@ protected: /** * @returns the latex representation of the element and - * of the element's tqchildren + * of the element's children */ virtual TQString toLatex(); @@ -322,7 +322,7 @@ public: /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ virtual void calcSizes( const ContextStyle& context, ContextStyle::TextStyle tstyle, @@ -330,7 +330,7 @@ public: StyleAttributes& style ); /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ @@ -343,7 +343,7 @@ public: /** * @returns the latex representation of the element and - * of the element's tqchildren + * of the element's children */ virtual TQString toLatex(); @@ -389,7 +389,7 @@ public: /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ virtual void calcSizes( const ContextStyle& context, ContextStyle::TextStyle tstyle, @@ -397,7 +397,7 @@ public: StyleAttributes& style ); /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ @@ -410,7 +410,7 @@ public: /** * @returns the latex representation of the element and - * of the element's tqchildren + * of the element's children */ virtual TQString toLatex(); diff --git a/lib/kformula/config/esstixeight.font b/lib/kformula/config/esstixeight.font index 88992333..37cbdfdb 100644 --- a/lib/kformula/config/esstixeight.font +++ b/lib/kformula/config/esstixeight.font @@ -3,7 +3,7 @@ # Unicode mapping for the esstixeight font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # 33, 0xE201 37, 0xE205 diff --git a/lib/kformula/config/esstixeleven.font b/lib/kformula/config/esstixeleven.font index 41e9fbe1..d94bd375 100644 --- a/lib/kformula/config/esstixeleven.font +++ b/lib/kformula/config/esstixeleven.font @@ -3,5 +3,5 @@ # Unicode mapping for the esstixeleven font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # diff --git a/lib/kformula/config/esstixfifteen.font b/lib/kformula/config/esstixfifteen.font index 920be0c1..3df00e54 100644 --- a/lib/kformula/config/esstixfifteen.font +++ b/lib/kformula/config/esstixfifteen.font @@ -3,5 +3,5 @@ # Unicode mapping for the esstixfifteen font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # diff --git a/lib/kformula/config/esstixfive.font b/lib/kformula/config/esstixfive.font index 62724a84..9f57fec2 100644 --- a/lib/kformula/config/esstixfive.font +++ b/lib/kformula/config/esstixfive.font @@ -3,7 +3,7 @@ # Unicode mapping for the esstixfive font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # 52, 0x2295 53, 0x2297 diff --git a/lib/kformula/config/esstixfour.font b/lib/kformula/config/esstixfour.font index 411a138a..dc6844b9 100644 --- a/lib/kformula/config/esstixfour.font +++ b/lib/kformula/config/esstixfour.font @@ -3,7 +3,7 @@ # Unicode mapping for the esstixfour font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # 56, 0x2291 77, 0x2290 diff --git a/lib/kformula/config/esstixfourteen.font b/lib/kformula/config/esstixfourteen.font index 723a4094..802c47ec 100644 --- a/lib/kformula/config/esstixfourteen.font +++ b/lib/kformula/config/esstixfourteen.font @@ -3,7 +3,7 @@ # Unicode mapping for the esstixfourteen font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # 99, 0x2138 97, 0x2135 diff --git a/lib/kformula/config/esstixnine.font b/lib/kformula/config/esstixnine.font index e294bd6d..4f4e6197 100644 --- a/lib/kformula/config/esstixnine.font +++ b/lib/kformula/config/esstixnine.font @@ -3,5 +3,5 @@ # Unicode mapping for the esstixnine font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # diff --git a/lib/kformula/config/esstixone.font b/lib/kformula/config/esstixone.font index df3e95ec..9ff6cabf 100644 --- a/lib/kformula/config/esstixone.font +++ b/lib/kformula/config/esstixone.font @@ -3,7 +3,7 @@ # Unicode mapping for the esstixone font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # 75, 0x219B 70, 0x219A diff --git a/lib/kformula/config/esstixseven.font b/lib/kformula/config/esstixseven.font index 37650ee1..25a7d01c 100644 --- a/lib/kformula/config/esstixseven.font +++ b/lib/kformula/config/esstixseven.font @@ -3,7 +3,7 @@ # Unicode mapping for the esstixseven font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # 61, 0x0028 62, 0x0029 diff --git a/lib/kformula/config/esstixseventeen.font b/lib/kformula/config/esstixseventeen.font index 00df77cd..c3b8f311 100644 --- a/lib/kformula/config/esstixseventeen.font +++ b/lib/kformula/config/esstixseventeen.font @@ -3,5 +3,5 @@ # Unicode mapping for the esstixseventeen font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # diff --git a/lib/kformula/config/esstixsix.font b/lib/kformula/config/esstixsix.font index 43e2752c..a6412a58 100644 --- a/lib/kformula/config/esstixsix.font +++ b/lib/kformula/config/esstixsix.font @@ -3,7 +3,7 @@ # Unicode mapping for the esstixsix font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # 46, 0x220F 35, 0x222E diff --git a/lib/kformula/config/esstixsixteen.font b/lib/kformula/config/esstixsixteen.font index 2a96c0c1..c212e08d 100644 --- a/lib/kformula/config/esstixsixteen.font +++ b/lib/kformula/config/esstixsixteen.font @@ -3,5 +3,5 @@ # Unicode mapping for the esstixsixteen font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # diff --git a/lib/kformula/config/esstixten.font b/lib/kformula/config/esstixten.font index fa9c5ee2..dd4c2b0f 100644 --- a/lib/kformula/config/esstixten.font +++ b/lib/kformula/config/esstixten.font @@ -3,7 +3,7 @@ # Unicode mapping for the esstixten font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # 118, 0x2202 86, 0x2207 diff --git a/lib/kformula/config/esstixthirteen.font b/lib/kformula/config/esstixthirteen.font index cee5bf99..fc13f891 100644 --- a/lib/kformula/config/esstixthirteen.font +++ b/lib/kformula/config/esstixthirteen.font @@ -3,5 +3,5 @@ # Unicode mapping for the esstixthirteen font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # diff --git a/lib/kformula/config/esstixthree.font b/lib/kformula/config/esstixthree.font index fe359c1f..c55acaeb 100644 --- a/lib/kformula/config/esstixthree.font +++ b/lib/kformula/config/esstixthree.font @@ -3,7 +3,7 @@ # Unicode mapping for the esstixthree font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # 101, 0x2204 95, 0x227B diff --git a/lib/kformula/config/esstixtwelve.font b/lib/kformula/config/esstixtwelve.font index 3a4b9d23..b82e5d7f 100644 --- a/lib/kformula/config/esstixtwelve.font +++ b/lib/kformula/config/esstixtwelve.font @@ -3,5 +3,5 @@ # Unicode mapping for the esstixtwelve font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # diff --git a/lib/kformula/config/esstixtwo.font b/lib/kformula/config/esstixtwo.font index 201f95e1..ed83909f 100644 --- a/lib/kformula/config/esstixtwo.font +++ b/lib/kformula/config/esstixtwo.font @@ -3,7 +3,7 @@ # Unicode mapping for the esstixtwo font. You can find it at # ftp://ftp.elsevier.nl/pub/styles/esstix/esstix.zip # -# Each line consist of a char position and its tqunicode value. +# Each line consist of a char position and its unicode value. # 100, 0x2203 99, 0x2200 diff --git a/lib/kformula/config/unicode.tbl b/lib/kformula/config/unicode.tbl index d86b1df3..e3e27db8 100644 --- a/lib/kformula/config/unicode.tbl +++ b/lib/kformula/config/unicode.tbl @@ -1,6 +1,6 @@ # -# KFormula tqunicode table -# Each line contains the tqunicode value, the char class +# KFormula unicode table +# Each line contains the unicode value, the char class # (ORDINARY, BINOP or RELATION) and optionally the # chars TeX name. # diff --git a/lib/kformula/contextstyle.h b/lib/kformula/contextstyle.h index be4a8bcf..11a103dd 100644 --- a/lib/kformula/contextstyle.h +++ b/lib/kformula/contextstyle.h @@ -312,7 +312,7 @@ private: /** * true means to center the symbol between its indexes. - * false means tqalignment to the right. + * false means alignment to the right. */ bool centerSymbol; diff --git a/lib/kformula/elementtype.cc b/lib/kformula/elementtype.cc index a2e44ee6..bd2c3373 100644 --- a/lib/kformula/elementtype.cc +++ b/lib/kformula/elementtype.cc @@ -406,9 +406,9 @@ void AbstractOperatorType::saveMathML( SequenceElement* se, TQDomDocument& doc, op.appendChild( doc.createTextNode( be->getCharacter() ) ); } else { - // tqunicode char + // unicode char TQString s; - op.appendChild( doc.createEntityReference( s.sprintf( "#x%05X", be->getCharacter().tqunicode() ) ) ); + op.appendChild( doc.createEntityReference( s.sprintf( "#x%05X", be->getCharacter().unicode() ) ) ); } TextElement* te = static_cast<TextElement*>( be ); TQString mathvariant = format2variant( te->getCharStyle(), te->getCharFamily() ); diff --git a/lib/kformula/entities.h b/lib/kformula/entities.h index 78e39315..38a5a0e8 100644 --- a/lib/kformula/entities.h +++ b/lib/kformula/entities.h @@ -38,7 +38,7 @@ struct entityMap { return strcmp( name, right ) < 0; } const char* name; - const uint tqunicode; + const uint unicode; }; extern const entityMap entities[]; diff --git a/lib/kformula/errorelement.cc b/lib/kformula/errorelement.cc index 7a685f86..cb1f6c54 100644 --- a/lib/kformula/errorelement.cc +++ b/lib/kformula/errorelement.cc @@ -27,7 +27,7 @@ ErrorElement::ErrorElement( BasicElement* parent ) : SequenceElement( parent ) { } /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ diff --git a/lib/kformula/errorelement.h b/lib/kformula/errorelement.h index cfc2735d..d52f949a 100644 --- a/lib/kformula/errorelement.h +++ b/lib/kformula/errorelement.h @@ -30,7 +30,7 @@ public: ErrorElement( BasicElement* parent = 0 ); /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ diff --git a/lib/kformula/fontstyle.cc b/lib/kformula/fontstyle.cc index 0e37028a..0df68fcb 100644 --- a/lib/kformula/fontstyle.cc +++ b/lib/kformula/fontstyle.cc @@ -53,7 +53,7 @@ class FontList { public: FontList() { TQFontDatabase db; - const TQStringList lst = db.tqfamilies(); + const TQStringList lst = db.families(); for ( TQStringList::const_iterator it = lst.begin(), end = lst.end() ; it != end ; ++it ) { const TQString name = *it; int i = name.find('['); diff --git a/lib/kformula/fontstyle.h b/lib/kformula/fontstyle.h index 8132bbb6..9fcd78b7 100644 --- a/lib/kformula/fontstyle.h +++ b/lib/kformula/fontstyle.h @@ -48,7 +48,7 @@ public: */ bool init( ContextStyle* context, bool install = true ); - /// the table for ordinary symbols (those that have a tqunicode value) + /// the table for ordinary symbols (those that have a unicode value) const SymbolTable* symbolTable() const { return &m_symbolTable; } SymbolTable* symbolTable() { return &m_symbolTable; } diff --git a/lib/kformula/formulacursor.cc b/lib/kformula/formulacursor.cc index 9fe3afbd..2257d262 100644 --- a/lib/kformula/formulacursor.cc +++ b/lib/kformula/formulacursor.cc @@ -301,21 +301,21 @@ void FormulaCursor::insert(BasicElement* child, Direction direction) insert(list, direction); } -void FormulaCursor::insert(TQPtrList<BasicElement>& tqchildren, +void FormulaCursor::insert(TQPtrList<BasicElement>& children, Direction direction) { assert( !isReadOnly() ); BasicElement* element = getElement(); - element->insert(this, tqchildren, direction); + element->insert(this, children, direction); } /** - * Removes the current selected tqchildren and returns them. + * Removes the current selected children and returns them. * The cursor needs to be normal (that is be inside a SequenceElement) * for this to have any effect. */ -void FormulaCursor::remove(TQPtrList<BasicElement>& tqchildren, +void FormulaCursor::remove(TQPtrList<BasicElement>& children, Direction direction) { assert( !isReadOnly() ); @@ -328,12 +328,12 @@ void FormulaCursor::remove(TQPtrList<BasicElement>& tqchildren, BasicElement* parent = sequence->getParent(); if (parent != 0) { parent->selectChild(this, sequence); - parent->remove(this, tqchildren, direction); + parent->remove(this, children, direction); return; } } else { - sequence->remove(this, tqchildren, direction); + sequence->remove(this, children, direction); } } } @@ -383,18 +383,18 @@ void FormulaCursor::replaceSelectionWith(BasicElement* element, BasicElement* FormulaCursor::replaceByMainChildContent(Direction direction) { assert( !isReadOnly() ); - TQPtrList<BasicElement> tqchildrenList; + TQPtrList<BasicElement> childrenList; TQPtrList<BasicElement> list; BasicElement* element = getElement(); SequenceElement* mainChild = element->getMainChild(); if ((mainChild != 0) && (mainChild->countChildren() > 0)) { mainChild->selectAllChildren(this); - remove(tqchildrenList); + remove(childrenList); } element->getParent()->selectChild(this, element); setSelection(false); remove(list); - insert(tqchildrenList, direction); + insert(childrenList, direction); if (list.count() > 0) { return list.take(0); } @@ -582,7 +582,7 @@ MatrixElement* FormulaCursor::getActiveMatrixElement() } /** - * The element is going to leave the formula with and all its tqchildren. + * The element is going to leave the formula with and all its children. */ void FormulaCursor::elementWillVanish(BasicElement* element) { diff --git a/lib/kformula/formulacursor.h b/lib/kformula/formulacursor.h index 9843abfa..cca6cf1a 100644 --- a/lib/kformula/formulacursor.h +++ b/lib/kformula/formulacursor.h @@ -152,7 +152,7 @@ public: void insert(BasicElement*, Direction = beforeCursor); /** - * Inserts the listed tqchildren at the current position. + * Inserts the listed children at the current position. * Ignores the selection. * The list will be emptied. */ @@ -160,7 +160,7 @@ public: Direction = beforeCursor); /** - * Removes the current selected tqchildren and returns them. + * Removes the current selected children and returns them. * The cursor needs to be normal (that is be inside a SequenceElement) * for this to have any effect. */ @@ -341,7 +341,7 @@ public: void setCursorData(CursorData* data); /** - * The element is going to leave the formula with and all its tqchildren. + * The element is going to leave the formula with and all its children. */ void elementWillVanish(BasicElement* element); @@ -409,7 +409,7 @@ private: /** * The position the cursor in on inside the element. - * Might be anything from 0 to current->tqchildren->size(). + * Might be anything from 0 to current->children->size(). * * This is where new elements are put in. */ diff --git a/lib/kformula/formulaelement.h b/lib/kformula/formulaelement.h index e6702668..a7e83e4c 100644 --- a/lib/kformula/formulaelement.h +++ b/lib/kformula/formulaelement.h @@ -34,7 +34,7 @@ class SymbolTable; /** * The main element. - * A formula consists of a FormulaElement and its tqchildren. + * A formula consists of a FormulaElement and its children. * The only element that has no parent. */ class FormulaElement : public SequenceElement { @@ -113,7 +113,7 @@ public: /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ virtual void calcSizes( const ContextStyle& context, ContextStyle::TextStyle tstyle, @@ -121,7 +121,7 @@ public: StyleAttributes& style ); /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ @@ -159,7 +159,7 @@ public: /** * @returns the latex representation of the element and - * of the element's tqchildren + * of the element's children */ virtual TQString toLatex(); diff --git a/lib/kformula/fractionelement.cc b/lib/kformula/fractionelement.cc index 1230bb60..77d93076 100644 --- a/lib/kformula/fractionelement.cc +++ b/lib/kformula/fractionelement.cc @@ -121,7 +121,7 @@ BasicElement* FractionElement::goToPos( FormulaCursor* cursor, bool& handled, /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ void FractionElement::calcSizes( const ContextStyle& context, ContextStyle::TextStyle tstyle, @@ -155,7 +155,7 @@ void FractionElement::calcSizes( const ContextStyle& context, /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ @@ -332,8 +332,8 @@ void FractionElement::insert(FormulaCursor* cursor, /** - * Removes all selected tqchildren and returns them. Places the - * cursor to where the tqchildren have been. + * Removes all selected children and returns them. Places the + * cursor to where the children have been. * * We remove ourselve if we are requested to remove our numerator. * @@ -362,7 +362,7 @@ void FractionElement::remove(FormulaCursor* cursor, /** * Returns wether the element has no more useful - * tqchildren (except its main child) and should therefore + * children (except its main child) and should therefore * be replaced by its main child's content. */ bool FractionElement::isSenseless() @@ -373,7 +373,7 @@ bool FractionElement::isSenseless() // main child // -// If an element has tqchildren one has to become the main one. +// If an element has children one has to become the main one. SequenceElement* FractionElement::getMainChild() { @@ -581,13 +581,13 @@ void FractionElement::writeMathMLAttributes( TQDomElement& element ) const { switch ( m_lineThicknessType ) { case AbsoluteSize: - element.setAttribute( "linethickness", TQString( "%1pt" ).tqarg( m_lineThickness ) ); + element.setAttribute( "linethickness", TQString( "%1pt" ).arg( m_lineThickness ) ); break; case RelativeSize: - element.setAttribute( "linethickness", TQString( "%1%" ).tqarg( m_lineThickness * 100.0 ) ); + element.setAttribute( "linethickness", TQString( "%1%" ).arg( m_lineThickness * 100.0 ) ); break; case PixelSize: - element.setAttribute( "linethickness", TQString( "%1px" ).tqarg( m_lineThickness ) ); + element.setAttribute( "linethickness", TQString( "%1px" ).arg( m_lineThickness ) ); break; default: break; diff --git a/lib/kformula/fractionelement.h b/lib/kformula/fractionelement.h index cef69c13..408c3f3e 100644 --- a/lib/kformula/fractionelement.h +++ b/lib/kformula/fractionelement.h @@ -70,7 +70,7 @@ public: /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ virtual void calcSizes( const ContextStyle& cstyle, ContextStyle::TextStyle tstyle, @@ -78,7 +78,7 @@ public: StyleAttributes& style ); /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ @@ -90,7 +90,7 @@ public: const LuPixelPoint& parentOrigin ); /** - * Dispatch this FontCommand to all our TextElement tqchildren. + * Dispatch this FontCommand to all our TextElement children. */ virtual void dispatchFontCommand( FontCommand* cmd ); @@ -128,8 +128,8 @@ public: virtual void insert(FormulaCursor*, TQPtrList<BasicElement>&, Direction); /** - * Removes all selected tqchildren and returns them. Places the - * cursor to where the tqchildren have been. + * Removes all selected children and returns them. Places the + * cursor to where the children have been. * * We remove ourselve if we are requested to remove our numerator. * @@ -141,7 +141,7 @@ public: // main child // - // If an element has tqchildren one has to become the main one. + // If an element has children one has to become the main one. virtual SequenceElement* getMainChild(); @@ -150,7 +150,7 @@ public: /** * Returns wether the element has no more useful - * tqchildren (except its main child) and should therefore + * children (except its main child) and should therefore * be replaced by its main child's content. */ virtual bool isSenseless(); @@ -182,7 +182,7 @@ public: /** * @returns the latex representation of the element and - * of the element's tqchildren + * of the element's children */ virtual TQString toLatex(); diff --git a/lib/kformula/glyphelement.cc b/lib/kformula/glyphelement.cc index 9d0b26e6..709609cf 100644 --- a/lib/kformula/glyphelement.cc +++ b/lib/kformula/glyphelement.cc @@ -69,7 +69,7 @@ bool GlyphElement::readAttributesFromMathMLDom( const TQDomElement& element ) /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ void GlyphElement::calcSizes( const ContextStyle& context, ContextStyle::TextStyle tstyle, @@ -105,7 +105,7 @@ void GlyphElement::calcSizes( const ContextStyle& context, } /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ @@ -152,7 +152,7 @@ void GlyphElement::draw( TQPainter& painter, const LuPixelRect& /*r*/, void GlyphElement::writeMathMLAttributes( TQDomElement& element ) const { element.setAttribute( "fontfamily", m_fontFamily ); - element.setAttribute( "index", m_char.tqunicode() ); + element.setAttribute( "index", m_char.unicode() ); element.setAttribute( "alt", m_alt ); } diff --git a/lib/kformula/glyphelement.h b/lib/kformula/glyphelement.h index e3934fce..68833dd0 100644 --- a/lib/kformula/glyphelement.h +++ b/lib/kformula/glyphelement.h @@ -31,7 +31,7 @@ public: /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ virtual void calcSizes( const ContextStyle& cstyle, ContextStyle::TextStyle tstyle, @@ -39,7 +39,7 @@ public: StyleAttributes& style ); /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ diff --git a/lib/kformula/indexelement.cc b/lib/kformula/indexelement.cc index 25b8997a..a540a7e1 100644 --- a/lib/kformula/indexelement.cc +++ b/lib/kformula/indexelement.cc @@ -341,7 +341,7 @@ void IndexElement::setMiddleX(int xOffset, int middleWidth) /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ void IndexElement::calcSizes(const ContextStyle& context, ContextStyle::TextStyle tstyle, @@ -542,7 +542,7 @@ void IndexElement::calcSizes(const ContextStyle& context, } /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ @@ -885,12 +885,12 @@ void IndexElement::moveDown(FormulaCursor* cursor, BasicElement* from) } -// tqchildren +// children // main child // -// If an element has tqchildren one has to become the main one. +// If an element has children one has to become the main one. // void IndexElement::setMainChild(SequenceElement* child) // { @@ -902,7 +902,7 @@ void IndexElement::moveDown(FormulaCursor* cursor, BasicElement* from) /** - * Inserts all new tqchildren at the cursor position. Places the + * Inserts all new children at the cursor position. Places the * cursor according to the direction. * * You only can insert one index at a time. So the list must contain @@ -954,8 +954,8 @@ void IndexElement::insert(FormulaCursor* cursor, /** - * Removes all selected tqchildren and returns them. Places the - * cursor to where the tqchildren have been. + * Removes all selected children and returns them. Places the + * cursor to where the children have been. * * The cursor has to be inside one of our indexes which is supposed * to be empty. The index will be removed and the cursor will @@ -1032,7 +1032,7 @@ void IndexElement::normalize(FormulaCursor* cursor, Direction direction) /** * Returns wether the element has no more useful - * tqchildren (except its main child) and should therefore + * children (except its main child) and should therefore * be replaced by its main child's content. */ bool IndexElement::isSenseless() @@ -1659,13 +1659,13 @@ void IndexElement::writeMathMLAttributes( TQDomElement& element ) const if ( tag == "msub" || tag == "msubsup" ) { switch ( m_subScriptShiftType ) { case AbsoluteSize: - element.setAttribute( "subscriptshift", TQString( "%1pt" ).tqarg( m_subScriptShift ) ); + element.setAttribute( "subscriptshift", TQString( "%1pt" ).arg( m_subScriptShift ) ); break; case RelativeSize: - element.setAttribute( "subscriptshift", TQString( "%1%" ).tqarg( m_subScriptShift * 100.0 ) ); + element.setAttribute( "subscriptshift", TQString( "%1%" ).arg( m_subScriptShift * 100.0 ) ); break; case PixelSize: - element.setAttribute( "subscriptshift", TQString( "%1px" ).tqarg( m_subScriptShift ) ); + element.setAttribute( "subscriptshift", TQString( "%1px" ).arg( m_subScriptShift ) ); break; default: break; @@ -1674,13 +1674,13 @@ void IndexElement::writeMathMLAttributes( TQDomElement& element ) const if ( tag == "msup" || tag == "msubsup" ) { switch ( m_superScriptShiftType ) { case AbsoluteSize: - element.setAttribute( "superscriptshift", TQString( "%1pt" ).tqarg( m_superScriptShift ) ); + element.setAttribute( "superscriptshift", TQString( "%1pt" ).arg( m_superScriptShift ) ); break; case RelativeSize: - element.setAttribute( "superscriptshift", TQString( "%1%" ).tqarg( m_superScriptShift * 100.0 ) ); + element.setAttribute( "superscriptshift", TQString( "%1%" ).arg( m_superScriptShift * 100.0 ) ); break; case PixelSize: - element.setAttribute( "superscriptshift", TQString( "%1px" ).tqarg( m_superScriptShift ) ); + element.setAttribute( "superscriptshift", TQString( "%1px" ).arg( m_superScriptShift ) ); break; default: break; diff --git a/lib/kformula/indexelement.h b/lib/kformula/indexelement.h index f3fc1acb..b8e567b8 100644 --- a/lib/kformula/indexelement.h +++ b/lib/kformula/indexelement.h @@ -77,7 +77,7 @@ public: /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ virtual void calcSizes( const ContextStyle& cstyle, ContextStyle::TextStyle tstyle, @@ -85,7 +85,7 @@ public: StyleAttributes& style ); /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ @@ -97,7 +97,7 @@ public: const LuPixelPoint& parentOrigin ); /** - * Dispatch this FontCommand to all our TextElement tqchildren. + * Dispatch this FontCommand to all our TextElement children. */ virtual void dispatchFontCommand( FontCommand* cmd ); @@ -137,7 +137,7 @@ public: */ virtual void moveDown(FormulaCursor* cursor, BasicElement* from); - // tqchildren + // children /** * Removes the child. If this was the main child this element might @@ -151,7 +151,7 @@ public: // main child // - // If an element has tqchildren one has to become the main one. + // If an element has children one has to become the main one. virtual SequenceElement* getMainChild() { return content; } //SequenceElement* upperLeft; @@ -163,7 +163,7 @@ public: /** - * Inserts all new tqchildren at the cursor position. Places the + * Inserts all new children at the cursor position. Places the * cursor according to the direction. * * You only can insert one index at a time. So the list must contain @@ -175,8 +175,8 @@ public: virtual void insert(FormulaCursor*, TQPtrList<BasicElement>&, Direction); /** - * Removes all selected tqchildren and returns them. Places the - * cursor to where the tqchildren have been. + * Removes all selected children and returns them. Places the + * cursor to where the children have been. * * The cursor has to be inside one of our indexes which is supposed * to be empty. The index will be removed and the cursor will @@ -212,7 +212,7 @@ public: /** * Returns wether the element has no more useful - * tqchildren (except its main child) and should therefore + * children (except its main child) and should therefore * be replaced by its main child's content. */ virtual bool isSenseless(); @@ -259,7 +259,7 @@ public: /** * @returns the latex representation of the element and - * of the element's tqchildren + * of the element's children */ virtual TQString toLatex(); diff --git a/lib/kformula/kformulacommand.cc b/lib/kformula/kformulacommand.cc index 267038c4..65bfa6c3 100644 --- a/lib/kformula/kformulacommand.cc +++ b/lib/kformula/kformulacommand.cc @@ -556,10 +556,10 @@ void CharStyleCommand::execute() TQMap<SequenceElement*, int> parentCollector; styleList.clear(); - uint count = tqchildrenList().count(); + uint count = childrenList().count(); styleList.reserve( count ); for ( uint i=0; i<count; ++i ) { - TextElement* child = tqchildrenList().at( i ); + TextElement* child = childrenList().at( i ); styleList[i] = child->getCharStyle(); child->setCharStyle( charStyle ); parentCollector[static_cast<SequenceElement*>( child->getParent() )] = 1; @@ -571,10 +571,10 @@ void CharStyleCommand::execute() void CharStyleCommand::unexecute() { TQMap<SequenceElement*, int> parentCollector; - uint count = tqchildrenList().count(); + uint count = childrenList().count(); //styleList.reserve( count ); for ( uint i=0; i<count; ++i ) { - TextElement* child = tqchildrenList().at( i ); + TextElement* child = childrenList().at( i ); child->setCharStyle( styleList[i] ); parentCollector[static_cast<SequenceElement*>( child->getParent() )] = 1; } @@ -595,10 +595,10 @@ void CharFamilyCommand::execute() TQMap<SequenceElement*, int> parentCollector; familyList.clear(); - uint count = tqchildrenList().count(); + uint count = childrenList().count(); familyList.reserve( count ); for ( uint i=0; i<count; ++i ) { - TextElement* child = tqchildrenList().at( i ); + TextElement* child = childrenList().at( i ); familyList[i] = child->getCharFamily(); child->setCharFamily( charFamily ); parentCollector[static_cast<SequenceElement*>( child->getParent() )] = 1; @@ -610,10 +610,10 @@ void CharFamilyCommand::execute() void CharFamilyCommand::unexecute() { TQMap<SequenceElement*, int> parentCollector; - uint count = tqchildrenList().count(); + uint count = childrenList().count(); //familyList.reserve( count ); for ( uint i=0; i<count; ++i ) { - TextElement* child = tqchildrenList().at( i ); + TextElement* child = childrenList().at( i ); child->setCharFamily( familyList[i] ); parentCollector[static_cast<SequenceElement*>( child->getParent() )] = 1; } diff --git a/lib/kformula/kformulacommand.h b/lib/kformula/kformulacommand.h index 09001040..bc1703be 100644 --- a/lib/kformula/kformulacommand.h +++ b/lib/kformula/kformulacommand.h @@ -495,13 +495,13 @@ public: void addTextElement( TextElement* element ) { list.append(element); } /** - * Collects all parent elements those tqchildren are to be changend. + * Collects all parent elements those children are to be changend. */ void addElement( BasicElement* element ) { elementList.append( element ); } protected: - TQPtrList<TextElement>& tqchildrenList() { return list; } + TQPtrList<TextElement>& childrenList() { return list; } void collectChildren(); @@ -520,7 +520,7 @@ private: /** - * Changes the char style of a number of elements an their tqchildren. + * Changes the char style of a number of elements an their children. */ class CharStyleCommand : public FontCommand { public: @@ -539,7 +539,7 @@ private: /** - * Changes the char family of a number of elements an their tqchildren. + * Changes the char family of a number of elements an their children. */ class CharFamilyCommand : public FontCommand { public: diff --git a/lib/kformula/kformulacompatibility.h b/lib/kformula/kformulacompatibility.h index 9be5c7ba..a221854c 100644 --- a/lib/kformula/kformulacompatibility.h +++ b/lib/kformula/kformulacompatibility.h @@ -51,8 +51,8 @@ private: TQDomElement findIndexNode(const TQDomDocument& doc, TQDomElement sequence); - ushort nextToken() { return formulaString[pos++].tqunicode(); } - ushort lookAhead(uint i) const { return formulaString[pos+i].tqunicode(); } + ushort nextToken() { return formulaString[pos++].unicode(); } + ushort lookAhead(uint i) const { return formulaString[pos+i].unicode(); } void pushback() { pos--; } bool hasNext() const { return pos < formulaString.length(); } diff --git a/lib/kformula/kformulaconfigpage.cc b/lib/kformula/kformulaconfigpage.cc index 21c3b946..593defa3 100644 --- a/lib/kformula/kformulaconfigpage.cc +++ b/lib/kformula/kformulaconfigpage.cc @@ -23,7 +23,7 @@ #include <tqcheckbox.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqmap.h> #include <tqradiobutton.h> #include <tqspinbox.h> @@ -63,7 +63,7 @@ ConfigurePage::ConfigurePage( Document* document, TQWidget* view, KConfig* confi TQGroupBox *gbox = new TQGroupBox( i18n( "Fonts" ), box ); gbox->setColumnLayout( 0, Qt::Horizontal ); - TQGridLayout* grid = new TQGridLayout( gbox->tqlayout(), 5, 3 ); + TQGridLayout* grid = new TQGridLayout( gbox->layout(), 5, 3 ); grid->setSpacing( KDialog::spacingHint() ); grid->setColStretch(1, 1); @@ -108,7 +108,7 @@ ConfigurePage::ConfigurePage( Document* document, TQWidget* view, KConfig* confi // hlBox = new TQGroupBox( i18n( "Highlight Colors" ), box ); // hlBox->setColumnLayout( 0, Qt::Horizontal ); -// grid = new TQGridLayout( hlBox->tqlayout(), 5, 2 ); +// grid = new TQGridLayout( hlBox->layout(), 5, 2 ); // grid->setSpacing( KDialog::spacingHint() ); // TQLabel* defaultLabel = new TQLabel( hlBox, "defaultLabel" ); @@ -168,7 +168,7 @@ ConfigurePage::ConfigurePage( Document* document, TQWidget* view, KConfig* confi TQPushButton* ConfigurePage::buildFontLine( TQWidget* parent, - TQGridLayout* tqlayout, int number, TQFont font, TQString name, + TQGridLayout* layout, int number, TQFont font, TQString name, TQLabel*& fontName ) { TQLabel* fontTitle = new TQLabel( name, parent ); @@ -180,9 +180,9 @@ TQPushButton* ConfigurePage::buildFontLine( TQWidget* parent, TQPushButton* chooseButton = new TQPushButton( i18n( "Choose..." ), parent ); - tqlayout->addWidget( fontTitle, number, 0 ); - tqlayout->addWidget( fontName, number, 1 ); - tqlayout->addWidget( chooseButton, number, 2 ); + layout->addWidget( fontTitle, number, 0 ); + layout->addWidget( fontName, number, 1 ); + layout->addWidget( chooseButton, number, 2 ); return chooseButton; } diff --git a/lib/kformula/kformulaconfigpage.h b/lib/kformula/kformulaconfigpage.h index e3ff716a..2649ffa3 100644 --- a/lib/kformula/kformulaconfigpage.h +++ b/lib/kformula/kformulaconfigpage.h @@ -76,7 +76,7 @@ protected slots: private: - TQPushButton* buildFontLine( TQWidget* fontWidget, TQGridLayout* tqlayout, int number, + TQPushButton* buildFontLine( TQWidget* fontWidget, TQGridLayout* layout, int number, TQFont font, TQString name, TQLabel*& fontName ); void updateFontLabel( TQFont font, TQLabel* label ); diff --git a/lib/kformula/kformulacontainer.cc b/lib/kformula/kformulacontainer.cc index 774c7e79..46f3415a 100644 --- a/lib/kformula/kformulacontainer.cc +++ b/lib/kformula/kformulacontainer.cc @@ -25,7 +25,7 @@ #include <tqpainter.h> #include <tqpixmap.h> #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> #include <klocale.h> @@ -339,10 +339,10 @@ void Container::paste() { if (!hasValidCursor()) return; - TQClipboard* clipboard = TQApplication::tqclipboard(); + TQClipboard* clipboard = TQApplication::clipboard(); const TQMimeSource* source = clipboard->data(); if (source->provides( MimeSource::selectionMimeType() )) { - TQByteArray data = source->tqencodedData( MimeSource::selectionMimeType() ); + TQByteArray data = source->encodedData( MimeSource::selectionMimeType() ); TQDomDocument formula; formula.setContent(data); paste( formula, i18n("Paste") ); @@ -374,7 +374,7 @@ void Container::copy() if (cursor != 0) { TQDomDocument formula = document()->createMathMLDomDocument(); cursor->copy( formula ); - TQClipboard* clipboard = TQApplication::tqclipboard(); + TQClipboard* clipboard = TQApplication::clipboard(); clipboard->setData(new MimeSource(document(), formula)); } } diff --git a/lib/kformula/kformulacontainer.h b/lib/kformula/kformulacontainer.h index d87e8184..0b25ae00 100644 --- a/lib/kformula/kformulacontainer.h +++ b/lib/kformula/kformulacontainer.h @@ -21,7 +21,7 @@ #ifndef KFORMULACONTAINER_H #define KFORMULACONTAINER_H -#include <tqclipboard.h> +#include <clipboard.h> #include <tqdom.h> #include <tqimage.h> #include <tqptrlist.h> @@ -347,7 +347,7 @@ signals: void errorMsg( const TQString& ); /** - * The element is going to leave the formula with and all its tqchildren. + * The element is going to leave the formula with and all its children. */ void elementWillVanish(BasicElement* element); diff --git a/lib/kformula/kformuladefs.h b/lib/kformula/kformuladefs.h index 80879f98..855121c7 100644 --- a/lib/kformula/kformuladefs.h +++ b/lib/kformula/kformuladefs.h @@ -163,7 +163,7 @@ enum TokenElementType { * The struct used to store static font data. */ struct InternFontTable { - short tqunicode; + short unicode; TQChar pos; CharClass cl; CharStyle style; diff --git a/lib/kformula/kformuladocument.cc b/lib/kformula/kformuladocument.cc index 17d163f0..ecd621ee 100644 --- a/lib/kformula/kformuladocument.cc +++ b/lib/kformula/kformuladocument.cc @@ -200,7 +200,7 @@ TQDomDocument Document::createDomDocument() } /** - * Create a MathML Dom Document, deprecates KFO Dom Document for internal tqlayout + * Create a MathML Dom Document, deprecates KFO Dom Document for internal layout * TODO: Shouldn't this go to KoDocument ? */ TQDomDocument Document::createMathMLDomDocument() @@ -969,7 +969,7 @@ void DocumentWrapper::insertSymbol() { if ( hasFormula() && m_document->m_contextStyle->symbolTable().contains( m_selectedName ) ) { - TQChar ch = m_document->m_contextStyle->symbolTable().tqunicode( m_selectedName ); + TQChar ch = m_document->m_contextStyle->symbolTable().unicode( m_selectedName ); if ( ch != TQChar::null ) { TextCharRequest r( ch, true ); formula()->performRequest( &r ); @@ -985,7 +985,7 @@ void DocumentWrapper::insertSymbol( TQString name ) { if ( hasFormula() ) { if ( m_document->m_contextStyle->symbolTable().contains( name ) ) { - TQChar ch = m_document->m_contextStyle->symbolTable().tqunicode( name ); + TQChar ch = m_document->m_contextStyle->symbolTable().unicode( name ); if ( ch != TQChar::null ) { TextCharRequest r( ch, true ); formula()->performRequest( &r ); @@ -1075,7 +1075,7 @@ void DocumentWrapper::textItalic() void DocumentWrapper::delimiterLeft() { TQString left = m_leftBracket->currentText(); - switch ( left.tqat(0).latin1() ) { + switch ( left.at(0).latin1() ) { case '[': case ']': case '{': @@ -1086,7 +1086,7 @@ void DocumentWrapper::delimiterLeft() case ')': case '/': case '\\': - m_leftBracketChar = static_cast<SymbolType>( left.tqat(0).latin1() ); + m_leftBracketChar = static_cast<SymbolType>( left.at(0).latin1() ); break; case '|': m_leftBracketChar = LeftLineBracket; @@ -1100,7 +1100,7 @@ void DocumentWrapper::delimiterLeft() void DocumentWrapper::delimiterRight() { TQString right = m_rightBracket->currentText(); - switch ( right.tqat(0).latin1() ) { + switch ( right.at(0).latin1() ) { case '[': case ']': case '{': @@ -1111,7 +1111,7 @@ void DocumentWrapper::delimiterRight() case ')': case '/': case '\\': - m_rightBracketChar = static_cast<SymbolType>( right.tqat(0).latin1() ); + m_rightBracketChar = static_cast<SymbolType>( right.at(0).latin1() ); break; case '|': m_rightBracketChar = RightLineBracket; @@ -1174,7 +1174,7 @@ void DocumentWrapper::initSymbolNamesAction() for ( TQStringList::Iterator it = names.begin(); it != names.end(); ++it, ++i ) { - chars[ i ] = st.tqunicode( *it ); + chars[ i ] = st.unicode( *it ); } m_symbolNamesAction->setSymbols( names, m_document->m_contextStyle->getMathFont(), chars ); m_selectedName = names[0]; diff --git a/lib/kformula/kformuladocument.h b/lib/kformula/kformuladocument.h index 46de5774..4d757262 100644 --- a/lib/kformula/kformuladocument.h +++ b/lib/kformula/kformuladocument.h @@ -188,7 +188,7 @@ public: static TQDomDocument createDomDocument(); /** - * Create a MathML Dom Document, deprecates KFO Dom Document for internal tqlayout + * Create a MathML Dom Document, deprecates KFO Dom Document for internal layout * TODO: Shouldn't this go to KoDocument ? */ TQDomDocument createMathMLDomDocument(); diff --git a/lib/kformula/kformulamimesource.cc b/lib/kformula/kformulamimesource.cc index 58a6ad35..4c7df0c7 100644 --- a/lib/kformula/kformulamimesource.cc +++ b/lib/kformula/kformulamimesource.cc @@ -99,7 +99,7 @@ bool MimeSource::provides( const char * format) const return false; } -TQByteArray MimeSource::tqencodedData ( const char *format ) const +TQByteArray MimeSource::encodedData ( const char *format ) const { TQString fmt=format; //case sensitive? diff --git a/lib/kformula/kformulamimesource.h b/lib/kformula/kformulamimesource.h index a58255eb..3a94eaef 100644 --- a/lib/kformula/kformulamimesource.h +++ b/lib/kformula/kformulamimesource.h @@ -39,7 +39,7 @@ public: virtual const char* format ( int n = 0 ) const; virtual bool provides ( const char * ) const; - virtual TQByteArray tqencodedData ( const char * ) const; + virtual TQByteArray encodedData ( const char * ) const; virtual const SymbolTable& getSymbolTable() const; diff --git a/lib/kformula/kformulaview.h b/lib/kformula/kformulaview.h index 9562bbfe..cb9c715b 100644 --- a/lib/kformula/kformulaview.h +++ b/lib/kformula/kformulaview.h @@ -141,7 +141,7 @@ protected slots: /** * The cursor has been moved by the container. - * We need to tqrepaint if it was ours. + * We need to repaint if it was ours. */ void slotCursorMoved(FormulaCursor* cursor); diff --git a/lib/kformula/kformulawidget.cc b/lib/kformula/kformulawidget.cc index ef5e09a3..1014a66e 100644 --- a/lib/kformula/kformulawidget.cc +++ b/lib/kformula/kformulawidget.cc @@ -69,11 +69,11 @@ void KFormulaWidget::setReadOnly(bool ro) void KFormulaWidget::paintEvent(TQPaintEvent* event) { - // Always tqrepaint the buffer. This is not so much more work - // than it seems to be as each cursor movement requires a tqrepaint. + // Always repaint the buffer. This is not so much more work + // than it seems to be as each cursor movement requires a repaint. TQPainter p( &buffer ); //p.translate( -fr.x(), -fr.y() ); - formulaView.draw( p, event->rect(), tqcolorGroup() ); + formulaView.draw( p, event->rect(), colorGroup() ); TQPainter painter; painter.begin(this); @@ -128,7 +128,7 @@ void KFormulaWidget::slotFormulaChanged(int width, int height) // Magic numbers just to see the cursor. resize(width + 5, height + 5); buffer.resize(width + 5, height + 5); - // tqrepaint is needed even if the size doesn't change. + // repaint is needed even if the size doesn't change. //update(); } diff --git a/lib/kformula/main.cc b/lib/kformula/main.cc index 57344739..4d80e1c8 100644 --- a/lib/kformula/main.cc +++ b/lib/kformula/main.cc @@ -5,12 +5,12 @@ #include <tqaccel.h> #include <tqdom.h> #include <tqfile.h> -#include <tqlayout.h> +#include <layout.h> #include <tqptrlist.h> #include <tqmainwindow.h> #include <tqpainter.h> #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqwidget.h> #include <tqfileinfo.h> @@ -277,7 +277,7 @@ int main(int argc, char** argv) // Make sure there are no elements in the clipboard. // Okey for a debug app. - TQApplication::tqclipboard()->clear(); + TQApplication::clipboard()->clear(); int destruct = BasicElement::getEvilDestructionCount(); if (destruct != 0) { diff --git a/lib/kformula/matrixelement.cc b/lib/kformula/matrixelement.cc index 6b5a5898..7371113f 100644 --- a/lib/kformula/matrixelement.cc +++ b/lib/kformula/matrixelement.cc @@ -430,7 +430,7 @@ BasicElement* MatrixElement::goToPos( FormulaCursor* cursor, bool& handled, /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ void MatrixElement::calcSizes( const ContextStyle& context, ContextStyle::TextStyle tstyle, @@ -508,7 +508,7 @@ void MatrixElement::calcSizes( const ContextStyle& context, } /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ @@ -1260,7 +1260,7 @@ void MatrixElement::writeMathMLAttributes( TQDomElement& element ) const { TQString rownumber; if ( m_rowNumber ) { - rownumber = TQString( " %1" ).tqarg( m_rowNumber ); + rownumber = TQString( " %1" ).arg( m_rowNumber ); } switch ( m_align ) { case TopAlign: @@ -1352,15 +1352,15 @@ void MatrixElement::writeMathMLAttributes( TQDomElement& element ) const columnwidth.append( "fit " ); break; case AbsoluteSize: - columnwidth.append( TQString( "%1pt " ).tqarg( *lengthIt ) ); + columnwidth.append( TQString( "%1pt " ).arg( *lengthIt ) ); lengthIt++; break; case RelativeSize: - columnwidth.append( TQString( "%1% " ).tqarg( *lengthIt * 100.0 ) ); + columnwidth.append( TQString( "%1% " ).arg( *lengthIt * 100.0 ) ); lengthIt++; break; case PixelSize: - columnwidth.append( TQString( "%1px " ).tqarg( *lengthIt ) ); + columnwidth.append( TQString( "%1px " ).arg( *lengthIt ) ); lengthIt++; break; case NegativeVeryVeryThinMathSpace: @@ -1417,13 +1417,13 @@ void MatrixElement::writeMathMLAttributes( TQDomElement& element ) const element.setAttribute( "width", "auto" ); break; case AbsoluteSize: - element.setAttribute( "width", TQString( "%1pt" ).tqarg( m_width ) ); + element.setAttribute( "width", TQString( "%1pt" ).arg( m_width ) ); break; case RelativeSize: - element.setAttribute( "width", TQString( "%1% " ).tqarg( m_width * 100.0 ) ); + element.setAttribute( "width", TQString( "%1% " ).arg( m_width * 100.0 ) ); break; case PixelSize: - element.setAttribute( "width", TQString( "%1px " ).tqarg( m_width ) ); + element.setAttribute( "width", TQString( "%1px " ).arg( m_width ) ); break; default: break; @@ -1434,13 +1434,13 @@ void MatrixElement::writeMathMLAttributes( TQDomElement& element ) const typeIt != m_rowSpacingType.end(); typeIt++, lengthIt++ ) { switch ( *typeIt ) { case AbsoluteSize: - rowspacing.append( TQString( "%1pt " ).tqarg( *lengthIt ) ); + rowspacing.append( TQString( "%1pt " ).arg( *lengthIt ) ); break; case RelativeSize: - rowspacing.append( TQString( "%1% " ).tqarg( *lengthIt * 100.0 ) ); + rowspacing.append( TQString( "%1% " ).arg( *lengthIt * 100.0 ) ); break; case PixelSize: - rowspacing.append( TQString( "%1px " ).tqarg( *lengthIt ) ); + rowspacing.append( TQString( "%1px " ).arg( *lengthIt ) ); break; default: break; @@ -1455,15 +1455,15 @@ void MatrixElement::writeMathMLAttributes( TQDomElement& element ) const typeIt != m_columnSpacingType.end(); typeIt++ ) { switch ( *typeIt ) { case AbsoluteSize: - columnspacing.append( TQString( "%1pt " ).tqarg( *lengthIt ) ); + columnspacing.append( TQString( "%1pt " ).arg( *lengthIt ) ); lengthIt++; break; case RelativeSize: - columnspacing.append( TQString( "%1% " ).tqarg( *lengthIt * 100.0 ) ); + columnspacing.append( TQString( "%1% " ).arg( *lengthIt * 100.0 ) ); lengthIt++; break; case PixelSize: - columnspacing.append( TQString( "%1px " ).tqarg( *lengthIt ) ); + columnspacing.append( TQString( "%1px " ).arg( *lengthIt ) ); lengthIt++; break; case NegativeVeryVeryThinMathSpace: @@ -1571,13 +1571,13 @@ void MatrixElement::writeMathMLAttributes( TQDomElement& element ) const TQString framespacing; switch ( m_frameHSpacingType ) { case AbsoluteSize: - framespacing.append( TQString( "%1pt " ).tqarg( m_frameHSpacing ) ); + framespacing.append( TQString( "%1pt " ).arg( m_frameHSpacing ) ); break; case RelativeSize: - framespacing.append( TQString( "%1% " ).tqarg( m_frameHSpacing * 100.0 ) ); + framespacing.append( TQString( "%1% " ).arg( m_frameHSpacing * 100.0 ) ); break; case PixelSize: - framespacing.append( TQString( "%1px " ).tqarg( m_frameHSpacing ) ); + framespacing.append( TQString( "%1px " ).arg( m_frameHSpacing ) ); break; case NegativeVeryVeryThinMathSpace: framespacing.append( "negativeveryverythinmathspace " ); @@ -1626,13 +1626,13 @@ void MatrixElement::writeMathMLAttributes( TQDomElement& element ) const } switch ( m_frameVSpacingType ) { case AbsoluteSize: - framespacing.append( TQString( "%1pt " ).tqarg( m_frameVSpacing ) ); + framespacing.append( TQString( "%1pt " ).arg( m_frameVSpacing ) ); break; case RelativeSize: - framespacing.append( TQString( "%1% " ).tqarg( m_frameVSpacing * 100.0 ) ); + framespacing.append( TQString( "%1% " ).arg( m_frameVSpacing * 100.0 ) ); break; case PixelSize: - framespacing.append( TQString( "%1px " ).tqarg( m_frameVSpacing ) ); + framespacing.append( TQString( "%1px " ).arg( m_frameVSpacing ) ); break; case NegativeVeryVeryThinMathSpace: framespacing.append( "negativeveryverythinmathspace " ); @@ -1709,13 +1709,13 @@ void MatrixElement::writeMathMLAttributes( TQDomElement& element ) const } switch ( m_minLabelSpacingType ) { case AbsoluteSize: - element.setAttribute( "minlabelspacing", TQString( "%1pt" ).tqarg( m_minLabelSpacing ) ); + element.setAttribute( "minlabelspacing", TQString( "%1pt" ).arg( m_minLabelSpacing ) ); break; case RelativeSize: - element.setAttribute( "minlabelspacing", TQString( "%1%" ).tqarg( m_minLabelSpacing * 100.0 ) ); + element.setAttribute( "minlabelspacing", TQString( "%1%" ).arg( m_minLabelSpacing * 100.0 ) ); break; case PixelSize: - element.setAttribute( "minlabelspacing", TQString( "%1px" ).tqarg( m_minLabelSpacing ) ); + element.setAttribute( "minlabelspacing", TQString( "%1px" ).arg( m_minLabelSpacing ) ); break; case NegativeVeryVeryThinMathSpace: element.setAttribute( "minlabelspacing", "negativeveryverythinmathspace" ); @@ -1810,7 +1810,7 @@ public: /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ virtual void calcSizes( const ContextStyle& context, ContextStyle::TextStyle tstyle, @@ -1894,7 +1894,7 @@ void KFCNewLine::execute() int linePos = parent->content.find( m_line ); parent->content.insert( linePos+1, m_newline ); - // If there are tqchildren to be moved. + // If there are children to be moved. if ( m_line->countChildren() > static_cast<int>( m_pos ) ) { // Remove anything after position pos from the current line @@ -1935,7 +1935,7 @@ void KFCNewLine::unexecute() FormulaElement* formula = m_line->formula(); formula->elementRemoval( m_newline ); - // If there are tqchildren to be moved. + // If there are children to be moved. if ( m_newline->countChildren() > 0 ) { // Remove anything from the line to be deleted @@ -2129,7 +2129,7 @@ void MultilineSequenceElement::writeMathML( TQDomDocument& doc, // The mrow, if it exists. TQDomNode n = tmp.firstChild().firstChild(); while ( !n.isNull() ) { - // the illegal TabMarkers are tqchildren of the mrow, child of tmp. + // the illegal TabMarkers are children of the mrow, child of tmp. if ( n.isElement() && n.toElement().tagName() == "TAB" ) { parent.appendChild( mtd ); mtd = doc.createElement( oasisFormat ? "math:mtd" : "mtd" ); diff --git a/lib/kformula/matrixelement.h b/lib/kformula/matrixelement.h index 89426659..7320bf2b 100644 --- a/lib/kformula/matrixelement.h +++ b/lib/kformula/matrixelement.h @@ -80,7 +80,7 @@ public: /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ virtual void calcSizes( const ContextStyle& cstyle, ContextStyle::TextStyle tstyle, @@ -88,7 +88,7 @@ public: StyleAttributes& style ); /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ @@ -100,7 +100,7 @@ public: const LuPixelPoint& parentOrigin ); /** - * Dispatch this FontCommand to all our TextElement tqchildren. + * Dispatch this FontCommand to all our TextElement children. */ virtual void dispatchFontCommand( FontCommand* cmd ); @@ -153,14 +153,14 @@ public: virtual SequenceElement* getMainChild(); /** - * Inserts all new tqchildren at the cursor position. Places the + * Inserts all new children at the cursor position. Places the * cursor according to the direction. */ //virtual void insert(FormulaCursor*, TQPtrList<BasicElement>&, Direction); /** - * Removes all selected tqchildren and returns them. Places the - * cursor to where the tqchildren have been. + * Removes all selected children and returns them. Places the + * cursor to where the children have been. */ //virtual void remove(FormulaCursor*, TQPtrList<BasicElement>&, Direction); @@ -184,14 +184,14 @@ public: /** * Returns wether the element has no more useful - * tqchildren (except its main child) and should therefore + * children (except its main child) and should therefore * be replaced by its main child's content. */ //virtual bool isSenseless(); /** * @returns the latex representation of the element and - * of the element's tqchildren + * of the element's children */ virtual TQString toLatex(); @@ -375,7 +375,7 @@ public: /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ virtual void calcSizes( const ContextStyle& cstyle, ContextStyle::TextStyle tstyle, @@ -383,7 +383,7 @@ public: StyleAttributes& style ); /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ @@ -395,7 +395,7 @@ public: const LuPixelPoint& parentOrigin ); /** - * Dispatch this FontCommand to all our TextElement tqchildren. + * Dispatch this FontCommand to all our TextElement children. */ virtual void dispatchFontCommand( FontCommand* cmd ); @@ -414,7 +414,7 @@ public: /** * @returns the latex representation of the element and - * of the element's tqchildren + * of the element's children */ virtual TQString toLatex(); diff --git a/lib/kformula/operatorelement.cc b/lib/kformula/operatorelement.cc index 66c1fcdc..27dbbdd6 100644 --- a/lib/kformula/operatorelement.cc +++ b/lib/kformula/operatorelement.cc @@ -488,13 +488,13 @@ void OperatorElement::writeSizeAttribute( TQDomElement& element, const TQString element.setAttribute( attr, "infinity" ); break; case AbsoluteSize: - element.setAttribute( attr, TQString( "%1pt" ).tqarg( length ) ); + element.setAttribute( attr, TQString( "%1pt" ).arg( length ) ); break; case RelativeSize: - element.setAttribute( attr, TQString( "%1% " ).tqarg( length * 100.0 ) ); + element.setAttribute( attr, TQString( "%1% " ).arg( length * 100.0 ) ); break; case PixelSize: - element.setAttribute( attr, TQString( "%1px " ).tqarg( length ) ); + element.setAttribute( attr, TQString( "%1px " ).arg( length ) ); break; case NegativeVeryVeryThinMathSpace: element.setAttribute( attr, "negativeveryverythinmathspace" ); diff --git a/lib/kformula/paddedelement.cc b/lib/kformula/paddedelement.cc index f153a339..e4f28ce7 100644 --- a/lib/kformula/paddedelement.cc +++ b/lib/kformula/paddedelement.cc @@ -36,7 +36,7 @@ PaddedElement::PaddedElement( BasicElement* parent ) : SequenceElement( parent ) /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ void PaddedElement::calcSizes( const ContextStyle& context, ContextStyle::TextStyle tstyle, @@ -233,18 +233,18 @@ void PaddedElement::writeSizeAttribute( TQDomElement element, const TQString& st } switch ( st ) { case WidthRelativeSize: - element.setAttribute( str, prefix + TQString( "%1 width" ).tqarg( s ) ); + element.setAttribute( str, prefix + TQString( "%1 width" ).arg( s ) ); break; case HeightRelativeSize: - element.setAttribute( str, prefix + TQString( "%1 height" ).tqarg( s ) ); + element.setAttribute( str, prefix + TQString( "%1 height" ).arg( s ) ); case AbsoluteSize: - element.setAttribute( str, prefix + TQString( "%1pt" ).tqarg( s ) ); + element.setAttribute( str, prefix + TQString( "%1pt" ).arg( s ) ); break; case RelativeSize: - element.setAttribute( str, prefix + TQString( "%1%" ).tqarg( s * 100.0 ) ); + element.setAttribute( str, prefix + TQString( "%1%" ).arg( s * 100.0 ) ); break; case PixelSize: - element.setAttribute( str, prefix + TQString( "%1px" ).tqarg( s ) ); + element.setAttribute( str, prefix + TQString( "%1px" ).arg( s ) ); break; default: break; diff --git a/lib/kformula/paddedelement.h b/lib/kformula/paddedelement.h index 5df95b74..f50489c8 100644 --- a/lib/kformula/paddedelement.h +++ b/lib/kformula/paddedelement.h @@ -32,7 +32,7 @@ public: /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ virtual void calcSizes( const ContextStyle& cstyle, ContextStyle::TextStyle tstyle, diff --git a/lib/kformula/phantomelement.cc b/lib/kformula/phantomelement.cc index e2a07fc6..78b0a1cb 100644 --- a/lib/kformula/phantomelement.cc +++ b/lib/kformula/phantomelement.cc @@ -26,7 +26,7 @@ PhantomElement::PhantomElement( BasicElement* parent ) : SequenceElement( parent } /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ diff --git a/lib/kformula/phantomelement.h b/lib/kformula/phantomelement.h index 373c3545..6fe9a953 100644 --- a/lib/kformula/phantomelement.h +++ b/lib/kformula/phantomelement.h @@ -30,7 +30,7 @@ public: PhantomElement( BasicElement* parent = 0 ); /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ diff --git a/lib/kformula/prototype/engine.py b/lib/kformula/prototype/engine.py index a2a94487..f1391069 100644 --- a/lib/kformula/prototype/engine.py +++ b/lib/kformula/prototype/engine.py @@ -82,7 +82,7 @@ class BasicElement: return self.parent.formula() def draw(self, painter, styleContext, startPoint): - """Draws the whole thing. Including its tqchildren.""" + """Draws the whole thing. Including its children.""" pass def calcSizes(self, styleContext): @@ -91,7 +91,7 @@ class BasicElement: will be stored in self.size, the midline offset in self.midline. - Please note: It's up to a parent to store its tqchildren's position.""" + Please note: It's up to a parent to store its children's position.""" pass def mainChild(self): @@ -116,22 +116,22 @@ class BasicElement: class SequenceElement (BasicElement): - """The element that contains a number of tqchildren. - The tqchildren are aligned in one line.""" + """The element that contains a number of children. + The children are aligned in one line.""" def __init__(self, parent): BasicElement.__init__(self, parent) - self.tqchildren = [] + self.children = [] def elementAtCursor(self, cursor): """Returns the element before the cursor.""" if cursor.pos() > 0: - return self.tqchildren[cursor.pos()-1] + return self.children[cursor.pos()-1] def elementAt(self, point, startPoint): r = BasicElement.elementAt(self, point, startPoint) if r != None: - for child in self.tqchildren: + for child in self.children: r = child.elementAt(point, QPoint(startPoint.x()+child.x(), startPoint.y()+child.y())) if r != None: @@ -143,7 +143,7 @@ class SequenceElement (BasicElement): # Our parent asks us for a cursor position. Found. if fromElement == self.parent: - cursor.set(self, len(self.tqchildren)) + cursor.set(self, len(self.children)) # We already owned the cursor. Ask next child then. elif fromElement == self: @@ -151,16 +151,16 @@ class SequenceElement (BasicElement): if cursor.isSelection(): cursor.set (self, cursor.pos()-1) else: - self.tqchildren[cursor.pos()-1].moveLeft(cursor, self) + self.children[cursor.pos()-1].moveLeft(cursor, self) else: # Needed because FormulaElement derives this. if self.parent != None: self.parent.moveLeft(cursor, self) - # The cursor came from one of our tqchildren or + # The cursor came from one of our children or # something is wrong. else: - fromPos = self.tqchildren.index(fromElement) + fromPos = self.children.index(fromElement) cursor.set(self, fromPos) if cursor.isSelection(): if not cursor.mouseMark(): @@ -175,20 +175,20 @@ class SequenceElement (BasicElement): # We already owned the cursor. Ask next child then. elif fromElement == self: - if cursor.pos() < len(self.tqchildren): + if cursor.pos() < len(self.children): if cursor.isSelection(): cursor.set (self, cursor.pos()+1) else: - self.tqchildren[cursor.pos()].moveRight(cursor, self) + self.children[cursor.pos()].moveRight(cursor, self) else: # Needed because FormulaElement derives this. if self.parent != None: self.parent.moveRight(cursor, self) - # The cursor came from one of our tqchildren or + # The cursor came from one of our children or # something is wrong. else: - fromPos = self.tqchildren.index(fromElement) + fromPos = self.children.index(fromElement) cursor.set(self, fromPos+1) if cursor.isSelection(): if not cursor.mouseMark(): @@ -217,7 +217,7 @@ class SequenceElement (BasicElement): if element != self: while element.parent != self: element = element.parent - cursor.setMarkPos(self.tqchildren.index(element)+1) + cursor.setMarkPos(self.children.index(element)+1) cursor.set(self, 0) def moveEnd(self, cursor): @@ -226,14 +226,14 @@ class SequenceElement (BasicElement): if element != self: while element.parent != self: element = element.parent - cursor.setMarkPos(self.tqchildren.index(element)) - cursor.set(self, len(self.tqchildren)) + cursor.setMarkPos(self.children.index(element)) + cursor.set(self, len(self.children)) def draw(self, painter, styleContext, startPoint): x, y = startPoint.x(), startPoint.y() - if len(self.tqchildren) > 0: - for child in self.tqchildren: + if len(self.children) > 0: + for child in self.children: cX = child.x() cY = child.y() child.draw(painter, styleContext, QPoint(x+cX, y+cY)) @@ -246,11 +246,11 @@ class SequenceElement (BasicElement): painter.drawRect(x, y, self.width(), self.height()) def calcSizes(self, styleContext): - if len(self.tqchildren) > 0: + if len(self.children) > 0: x = self.x() y = self.y() width = toMidline = fromMidline = 0 - for child in self.tqchildren: + for child in self.children: child.calcSizes(styleContext) child.setX(width) width += child.width() @@ -263,7 +263,7 @@ class SequenceElement (BasicElement): self.setHeight(toMidline+fromMidline) self.midline = toMidline - for child in self.tqchildren: + for child in self.children: child.setY(self.midline - child.midline) else: @@ -272,13 +272,13 @@ class SequenceElement (BasicElement): self.midline = 5 def mainChild(self): - if len(self.tqchildren) > 0: - return self.tqchildren[0] + if len(self.children) > 0: + return self.children[0] return None def setMainChild(self, sequenceElement): - if len(self.tqchildren) > 0: - self.tqchildren[0] = sequenceElement + if len(self.children) > 0: + self.children[0] = sequenceElement sequenceElement.parent = self else: self.addChild(sequenceElement) @@ -301,14 +301,14 @@ class SequenceElement (BasicElement): f = min(cursor.pos(), cursor.markPos()) t = max(cursor.pos(), cursor.markPos()) for i in range(f, t): - child = self.tqchildren.pop(f) + child = self.children.pop(f) self.formula().elementRemoved(child) seq.addChild(child) - self.tqchildren.insert(f, element) + self.children.insert(f, element) cursor.setMarkPos(-1) cursor.set(self, f+1) elif cursor.pos() > 0: - seq.addChild(self.tqchildren[cursor.pos()-1]) + seq.addChild(self.children[cursor.pos()-1]) self.replaceChild(cursor, element) else: self.insertChild(cursor, element) @@ -323,10 +323,10 @@ class SequenceElement (BasicElement): self.formula().elementRemoved(element) seq = element.mainChild() - pos = self.tqchildren.index(element) - self.tqchildren.remove(element) - for child in seq.tqchildren: - self.tqchildren.insert(pos, child) + pos = self.children.index(element) + self.children.remove(element) + for child in seq.children: + self.children.insert(pos, child) child.parent = self pos += 1 cursor.set(self, pos) @@ -334,7 +334,7 @@ class SequenceElement (BasicElement): def addChild(self, element): - self.tqchildren.append(element) + self.children.append(element) element.parent = self self.formula().changed() @@ -342,7 +342,7 @@ class SequenceElement (BasicElement): """Inserts the new element at the cursor position. The cursor is placed behind the new element.""" pos = cursor.pos() - self.tqchildren.insert(pos, element) + self.children.insert(pos, element) element.parent = self cursor.set(self, pos+1) self.formula().changed() @@ -350,15 +350,15 @@ class SequenceElement (BasicElement): def replaceChild(self, cursor, element): """Replaces the element before the cursor with the new one. No range checking. Be careful.""" - self.tqchildren[cursor.pos()-1] = element + self.children[cursor.pos()-1] = element element.parent = self self.formula().changed() def removeChild(self, cursor, element): self.formula().elementRemoved(element) - cursor.set(self, self.tqchildren.index(element)) - self.tqchildren.remove(element) - if len(self.tqchildren) == 0: + cursor.set(self, self.children.index(element)) + self.children.remove(element) + if len(self.children) == 0: if self.parent != None: self.parent.removeChild(cursor, self) return @@ -370,16 +370,16 @@ class SequenceElement (BasicElement): f = min(cursor.pos(), cursor.markPos()) t = max(cursor.pos(), cursor.markPos()) for i in range(f, t): - child = self.tqchildren.pop(f) + child = self.children.pop(f) self.formula().elementRemoved(child) cursor.setMarkPos(-1) cursor.set(self, f) self.formula().changed() - elif pos < len(self.tqchildren): - self.tqchildren.pop(pos) + elif pos < len(self.children): + self.children.pop(pos) self.formula().changed() else: - if len(self.tqchildren) == 0: + if len(self.children) == 0: if self.parent != None: self.parent.removeChild(cursor, self) @@ -389,17 +389,17 @@ class SequenceElement (BasicElement): f = min(cursor.pos(), cursor.markPos()) t = max(cursor.pos(), cursor.markPos()) for i in range(f, t): - child = self.tqchildren.pop(f) + child = self.children.pop(f) self.formula().elementRemoved(child) cursor.setMarkPos(-1) cursor.set(self, f) self.formula().changed() elif pos >= 0: - self.tqchildren.pop(pos) + self.children.pop(pos) cursor.set(self, pos) self.formula().changed() else: - if len(self.tqchildren) == 0: + if len(self.children) == 0: if self.parent != None: self.parent.removeChild(cursor, self) @@ -408,10 +408,10 @@ class SequenceElement (BasicElement): """Returns the position after the child at the position in global Coords.""" point = self.globalPos() - if pos < len(self.tqchildren): - d = self.tqchildren[pos].x() + if pos < len(self.children): + d = self.children[pos].x() else: - if len(self.tqchildren) > 0: + if len(self.children) > 0: d = self.width() else: d = 2 @@ -420,12 +420,12 @@ class SequenceElement (BasicElement): return point def countChildren(self): - return len(self.tqchildren) + return len(self.children) class FormulaElement (SequenceElement): """The main element. - A formula consists of a FormulaElement and its tqchildren. + A formula consists of a FormulaElement and its children. The only element that has no parent.""" def __init__(self, document): @@ -436,7 +436,7 @@ class FormulaElement (SequenceElement): return self def changed(self): - """Is called by its tqchildren if the formula changed in any way.""" + """Is called by its children if the formula changed in any way.""" self.document.changed() def elementRemoved(self, element): diff --git a/lib/kformula/prototype/gensymbolfontmap.py b/lib/kformula/prototype/gensymbolfontmap.py index 0f9f3a11..a1373815 100644 --- a/lib/kformula/prototype/gensymbolfontmap.py +++ b/lib/kformula/prototype/gensymbolfontmap.py @@ -3,7 +3,7 @@ import time from xml.sax import saxutils, handler, make_parser -tqunicodetable = { "normal":{}, "bold":{}, "italic":{}, +unicodetable = { "normal":{}, "bold":{}, "italic":{}, "slant":{}, "boldItalic":{} } fonttable = {} @@ -14,7 +14,7 @@ class ContentGenerator(handler.ContentHandler): self.font = None def startElement(self, name, attrs): - if name == 'tqunicodetable': + if name == 'unicodetable': self.font = None for (name, value) in attrs.items(): if name == "font" and value: @@ -31,7 +31,7 @@ class ContentGenerator(handler.ContentHandler): elif name == "style": style = value if number != '': - tqunicodetable[style][number] = (latexName, charClass) + unicodetable[style][number] = (latexName, charClass) fonttable[self.font].append((key, number, style)) def fontkey(font, style, number): @@ -43,9 +43,9 @@ def fontkey(font, style, number): def writeFontTable(fontname, f): f.write('\n\nstatic InternFontTable ' + fontname + 'Map[] = {\n') - for style in tqunicodetable: - for key in tqunicodetable[style]: - latexName, charClass = tqunicodetable[style][key] + for style in unicodetable: + for key in unicodetable[style]: + latexName, charClass = unicodetable[style][key] pos = fontkey(fontname, style, key) if pos: f.write(' { ' + key + ', ' + hex(pos) + ', ' + charClass + ', ' + style + 'Char },\n') @@ -107,14 +107,14 @@ def main(): writeFontTable(fn, f) f.close() - f = open('../tqunicodenames.cc', 'w') + f = open('../unicodenames.cc', 'w') write_header(f) - print >>f, 'struct UnicodeNameTable { short tqunicode; const char* name; };' + print >>f, 'struct UnicodeNameTable { short unicode; const char* name; };' print >>f, 'static UnicodeNameTable nameTable[] = {' nameDir = {} table = {} - for style in tqunicodetable: - table.update(tqunicodetable[style]) + for style in unicodetable: + table.update(unicodetable[style]) for key in table: latexName, charClass = table[key] @@ -128,10 +128,10 @@ def main(): -def make_tqunicode_table(): +def make_unicode_table(): header = [] codes = {} - f = open('../config/tqunicode.tbl', 'r') + f = open('../config/unicode.tbl', 'r') for line in f.xreadlines(): if line[0] == '#': header.append(line.strip()) @@ -142,14 +142,14 @@ def make_tqunicode_table(): codes[line.split(',')[0].strip()] = line f.close() - for key in tqunicodetable: - latexName, charClass = tqunicodetable[key] + for key in unicodetable: + latexName, charClass = unicodetable[key] if len(latexName) > 0: codes[key] = key + ', ' + charClass + ', ' + latexName.replace('\\', '') else: codes[key] = key + ', ' + charClass - f = open('../config/tqunicode.tbl', 'w') + f = open('../config/unicode.tbl', 'w') for line in header: print >> f, line for key in codes: @@ -174,8 +174,8 @@ def make_font_table(font): ## for line in header: ## print >> f, line #print >> f, "name = " + font - for key in tqunicodetable: - latexName, charClass = tqunicodetable[key] + for key in unicodetable: + latexName, charClass = unicodetable[key] pos = fontkey(font, key) if pos: print >> f, str(pos), key, charClass, latexName @@ -186,30 +186,30 @@ def make_all_font_tables(): make_font_table(font) -def symbol_entry(pos, tqunicode, charClass, name): +def symbol_entry(pos, unicode, charClass, name): return ' <entry key="%d" number="%s" name="%s" class="%s"/>' % \ - (pos, tqunicode, name, charClass) + (pos, unicode, name, charClass) def compare_font(font): for line in file(font+".font"): list = line.split() pos = int(list[0]) - tqunicode = list[1] + unicode = list[1] charClass = list[2] if len(list)>3: name = list[3] else: name = "" - if (pos, tqunicode) not in fonttable[font]: - print "not in font", font, (pos, tqunicode) - print symbol_entry(pos, tqunicode, charClass, name) - if tqunicode not in tqunicodetable: - print font, tqunicode, (name, charClass) - print symbol_entry(pos, tqunicode, charClass, name) - elif tqunicodetable[tqunicode] != (name, charClass): - print font, tqunicode, pos, tqunicodetable[tqunicode], "!=", (name, charClass) + if (pos, unicode) not in fonttable[font]: + print "not in font", font, (pos, unicode) + print symbol_entry(pos, unicode, charClass, name) + if unicode not in unicodetable: + print font, unicode, (name, charClass) + print symbol_entry(pos, unicode, charClass, name) + elif unicodetable[unicode] != (name, charClass): + print font, unicode, pos, unicodetable[unicode], "!=", (name, charClass) def compare(): fontnames = [ "symbol", @@ -241,10 +241,10 @@ if __name__ == '__main__': parser.parse("symbol.xml") #print fonttable - #print tqunicodetable + #print unicodetable #compare() main() - #make_tqunicode_table() + #make_unicode_table() #make_all_font_tables() diff --git a/lib/kformula/prototype/unicode.py b/lib/kformula/prototype/unicode.py index 585574cf..3559711d 100755 --- a/lib/kformula/prototype/unicode.py +++ b/lib/kformula/prototype/unicode.py @@ -130,7 +130,7 @@ class Widget(QWidget): print >> f, '<?xml version="1.0" encoding="iso-8859-1"?>' print >> f, '<table>' for font in self.fonts: - print >> f, ' <tqunicodetable font="' + font + '">' + print >> f, ' <unicodetable font="' + font + '">' for (key, number, latexName, charClass) in self.fonts[font]: if not charClass or charClass == '': charClass = 'ORDINARY' @@ -140,7 +140,7 @@ class Widget(QWidget): '" class="' + str(charClass) + \ '"/>' - print >> f, ' </tqunicodetable>' + print >> f, ' </unicodetable>' print >> f, '</table>' f.close() @@ -152,7 +152,7 @@ class ContentGenerator(handler.ContentHandler): self.currentFont = None def startElement(self, name, attrs): - if name == 'tqunicodetable': + if name == 'unicodetable': for (name, value) in attrs.items(): if name == "font": self.currentFont = value diff --git a/lib/kformula/rootelement.cc b/lib/kformula/rootelement.cc index 5adeb51c..82a5870c 100644 --- a/lib/kformula/rootelement.cc +++ b/lib/kformula/rootelement.cc @@ -176,7 +176,7 @@ BasicElement* RootElement::goToPos( FormulaCursor* cursor, bool& handled, /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ void RootElement::calcSizes( const ContextStyle& context, ContextStyle::TextStyle tstyle, @@ -234,7 +234,7 @@ void RootElement::calcSizes( const ContextStyle& context, } /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ @@ -434,8 +434,8 @@ void RootElement::insert(FormulaCursor* cursor, } /** - * Removes all selected tqchildren and returns them. Places the - * cursor to where the tqchildren have been. + * Removes all selected children and returns them. Places the + * cursor to where the children have been. * * We remove ourselve if we are requested to remove our content. */ @@ -476,7 +476,7 @@ void RootElement::normalize(FormulaCursor* cursor, Direction direction) // main child // -// If an element has tqchildren one has to become the main one. +// If an element has children one has to become the main one. SequenceElement* RootElement::getMainChild() { diff --git a/lib/kformula/rootelement.h b/lib/kformula/rootelement.h index 1eacf4d4..f4286ab4 100644 --- a/lib/kformula/rootelement.h +++ b/lib/kformula/rootelement.h @@ -66,7 +66,7 @@ public: /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ virtual void calcSizes( const ContextStyle& cstyle, ContextStyle::TextStyle tstyle, @@ -74,7 +74,7 @@ public: StyleAttributes& style ); /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ @@ -86,7 +86,7 @@ public: const LuPixelPoint& parentOrigin ); /** - * Dispatch this FontCommand to all our TextElement tqchildren. + * Dispatch this FontCommand to all our TextElement children. */ virtual void dispatchFontCommand( FontCommand* cmd ); @@ -124,8 +124,8 @@ public: virtual void insert(FormulaCursor*, TQPtrList<BasicElement>&, Direction); /** - * Removes all selected tqchildren and returns them. Places the - * cursor to where the tqchildren have been. + * Removes all selected children and returns them. Places the + * cursor to where the children have been. * * We remove ourselve if we are requested to remove our content. */ @@ -139,7 +139,7 @@ public: // main child // - // If an element has tqchildren one has to become the main one. + // If an element has children one has to become the main one. virtual SequenceElement* getMainChild(); SequenceElement* getRadiant() { return index; } @@ -175,7 +175,7 @@ public: /** * @returns the latex representation of the element and - * of the element's tqchildren + * of the element's children */ virtual TQString toLatex(); diff --git a/lib/kformula/scripts/bycodes.py b/lib/kformula/scripts/bycodes.py index 35b79a55..16d71959 100755 --- a/lib/kformula/scripts/bycodes.py +++ b/lib/kformula/scripts/bycodes.py @@ -25,11 +25,11 @@ import qt def decode( fd, font, line ): begin = string.find( line, '"' ) end = string.find( line, '"', begin + 1) - tqunicode = line[begin + 2:end] # Remove 'U' from string aswell + unicode = line[begin + 2:end] # Remove 'U' from string aswell char_list = [] - separation = string.find( tqunicode, '-' ) + separation = string.find( unicode, '-' ) if separation != -1: - second = tqunicode + second = unicode while separation != -1: first = second[0:separation] second = second[separation + 2:] @@ -38,13 +38,13 @@ def decode( fd, font, line ): if separation == -1: char_list.append( string.atoi( second, 16 ) ) else: - char_list.append( string.atoi ( tqunicode, 16 ) ) + char_list.append( string.atoi ( unicode, 16 ) ) fm = qt.QFontMetrics( qt.QFont( font ) ) in_font = True for c in char_list: if not fm.inFont( qt.QChar( c ) ): in_font = False - fd.write( tqunicode + ' ' + str( in_font ) + '\n') + fd.write( unicode + ' ' + str( in_font ) + '\n') def parse( file, font ): fd = open( file ) diff --git a/lib/kformula/scripts/bynames.py b/lib/kformula/scripts/bynames.py index 0829cf90..afb9ece5 100755 --- a/lib/kformula/scripts/bynames.py +++ b/lib/kformula/scripts/bynames.py @@ -66,7 +66,7 @@ struct entityMap { return qstrcmp( name, right ) < 0; } const char* name; - const uint tqunicode; + const uint unicode; }; extern const entityMap entities[]; diff --git a/lib/kformula/sequenceelement.cc b/lib/kformula/sequenceelement.cc index 93293db7..e3573174 100644 --- a/lib/kformula/sequenceelement.cc +++ b/lib/kformula/sequenceelement.cc @@ -76,7 +76,7 @@ SequenceElement::SequenceElement(BasicElement* parent) : BasicElement(parent), parseTree(0), textSequence(true),singlePipe(true), style(0) { assert( creationStrategy != 0 ); - tqchildren.setAutoDelete(true); + children.setAutoDelete(true); } @@ -88,12 +88,12 @@ SequenceElement::~SequenceElement() SequenceElement::SequenceElement( const SequenceElement& other ) : BasicElement( other ) { - tqchildren.setAutoDelete(true); - uint count = other.tqchildren.count(); + children.setAutoDelete(true); + uint count = other.children.count(); for (uint i = 0; i < count; i++) { - BasicElement* child = tqchildren.at(i)->clone(); + BasicElement* child = children.at(i)->clone(); child->setParent( this ); - tqchildren.append( child ); + children.append( child ); } } @@ -121,18 +121,18 @@ BasicElement* SequenceElement::goToPos( FormulaCursor* cursor, bool& handled, LuPixelPoint myPos(parentOrigin.x() + getX(), parentOrigin.y() + getY()); - uint count = tqchildren.count(); + uint count = children.count(); for (uint i = 0; i < count; i++) { - BasicElement* child = tqchildren.at(i); + BasicElement* child = children.at(i); e = child->goToPos(cursor, handled, point, myPos); if (e != 0) { if (!handled) { handled = true; if ((point.x() - myPos.x()) < (e->getX() + e->getWidth()*2/3)) { - cursor->setTo(this, tqchildren.find(e)); + cursor->setTo(this, children.find(e)); } else { - cursor->setTo(this, tqchildren.find(e)+1); + cursor->setTo(this, children.find(e)+1); } } return e; @@ -143,11 +143,11 @@ BasicElement* SequenceElement::goToPos( FormulaCursor* cursor, bool& handled, //int dy = point.y() - myPos.y(); for (uint i = 0; i < count; i++) { - BasicElement* child = tqchildren.at(i); + BasicElement* child = children.at(i); if (dx < child->getX()) { cursor->setTo( this, i ); handled = true; - return tqchildren.at( i ); + return children.at( i ); } } @@ -161,9 +161,9 @@ BasicElement* SequenceElement::goToPos( FormulaCursor* cursor, bool& handled, bool SequenceElement::isEmpty() { - uint count = tqchildren.count(); + uint count = children.count(); for (uint i = 0; i < count; i++) { - BasicElement* child = tqchildren.at(i); + BasicElement* child = children.at(i); if (!child->isInvisible()) { return false; } @@ -174,7 +174,7 @@ bool SequenceElement::isEmpty() /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ void SequenceElement::calcSizes( const ContextStyle& context, ContextStyle::TextStyle tstyle, @@ -190,7 +190,7 @@ void SequenceElement::calcSizes( const ContextStyle& context, width += context.ptToPixelX( getSpaceBefore( context, tstyle, factor ) ); // Let's do all normal elements that have a base line. - TQPtrListIterator<BasicElement> it( tqchildren ); + TQPtrListIterator<BasicElement> it( children ); for ( ; it.current(); ++it ) { BasicElement* child = it.current(); @@ -237,7 +237,7 @@ void SequenceElement::calcSizes( const ContextStyle& context, void SequenceElement::setChildrenPositions() { - TQPtrListIterator<BasicElement> it( tqchildren ); + TQPtrListIterator<BasicElement> it( children ); for ( ; it.current(); ++it ) { BasicElement* child = it.current(); child->setY(getBaseline() - child->getBaseline()); @@ -246,7 +246,7 @@ void SequenceElement::setChildrenPositions() /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ @@ -264,7 +264,7 @@ void SequenceElement::draw( TQPainter& painter, const LuPixelRect& r, // return; if (!isEmpty()) { - TQPtrListIterator<BasicElement> it( tqchildren ); + TQPtrListIterator<BasicElement> it( children ); for (int i = 0 ; it.current(); i++) { BasicElement* child = it.current(); if (!child->isInvisible()) { @@ -308,7 +308,7 @@ void SequenceElement::draw( TQPainter& painter, const LuPixelRect& r, void SequenceElement::dispatchFontCommand( FontCommand* cmd ) { - TQPtrListIterator<BasicElement> it( tqchildren ); + TQPtrListIterator<BasicElement> it( children ); for ( ; it.current(); ++it ) { BasicElement* child = it.current(); child->dispatchFontCommand( cmd ); @@ -420,12 +420,12 @@ void SequenceElement::drawCursor( TQPainter& painter, const ContextStyle& contex luPixel SequenceElement::getChildPosition( const ContextStyle& context, uint child ) { - if (child < tqchildren.count()) { - return tqchildren.at(child)->getX(); + if (child < children.count()) { + return children.at(child)->getX(); } else { - if (tqchildren.count() > 0) { - return tqchildren.at(child-1)->getX() + tqchildren.at(child-1)->getWidth(); + if (children.count() > 0) { + return children.at(child-1)->getX() + children.at(child-1)->getWidth(); } else { return context.ptToLayoutUnitPixX( 2 ); @@ -451,9 +451,9 @@ void SequenceElement::moveLeft(FormulaCursor* cursor, BasicElement* from) { // Our parent asks us for a cursor position. Found. if (from == getParent()) { - cursor->setTo(this, tqchildren.count()); + cursor->setTo(this, children.count()); if ( cursor->isSelectionMode() ) { - cursor->setMark( tqchildren.count() ); + cursor->setMark( children.count() ); } from->entered( this ); } @@ -464,7 +464,7 @@ void SequenceElement::moveLeft(FormulaCursor* cursor, BasicElement* from) cursor->setTo(this, cursor->getPos()-1); // invisible elements are not visible so we move on. - if (tqchildren.at(cursor->getPos())->isInvisible()) { + if (children.at(cursor->getPos())->isInvisible()) { moveLeft(cursor, this); } } @@ -479,12 +479,12 @@ void SequenceElement::moveLeft(FormulaCursor* cursor, BasicElement* from) } } - // The cursor came from one of our tqchildren or + // The cursor came from one of our children or // something is wrong. else { - int fromPos = tqchildren.find(from); + int fromPos = children.find(from); if ( fromPos > 0 ) { - tqchildren.at( fromPos - 1)->moveLeft( cursor, this ); + children.at( fromPos - 1)->moveLeft( cursor, this ); } // invisible elements are not visible so we move on. @@ -511,11 +511,11 @@ void SequenceElement::moveRight(FormulaCursor* cursor, BasicElement* from) // We already owned the cursor. Ask next child then. else if (from == this) { uint pos = cursor->getPos(); - if (pos < tqchildren.count()) { + if (pos < children.count()) { cursor->setTo(this, pos+1); // invisible elements are not visible so we move on. - if (tqchildren.at(pos)->isInvisible()) { + if (children.at(pos)->isInvisible()) { moveRight(cursor, this); } } @@ -530,12 +530,12 @@ void SequenceElement::moveRight(FormulaCursor* cursor, BasicElement* from) } } - // The cursor came from one of our tqchildren or + // The cursor came from one of our children or // something is wrong. else { - int fromPos = tqchildren.find(from); - if ( fromPos < tqchildren.count() - 1 ) { - tqchildren.at( fromPos + 1 )->moveDown( cursor, this ); + int fromPos = children.find(from); + if ( fromPos < children.count() - 1 ) { + children.at( fromPos + 1 )->moveDown( cursor, this ); } else { cursor->setTo(this, fromPos+1); @@ -557,7 +557,7 @@ void SequenceElement::moveWordLeft(FormulaCursor* cursor) { uint pos = cursor->getPos(); if (pos > 0) { - ElementType* type = tqchildren.at(pos-1)->getElementType(); + ElementType* type = children.at(pos-1)->getElementType(); if (type != 0) { cursor->setTo(this, type->start()); } @@ -571,8 +571,8 @@ void SequenceElement::moveWordLeft(FormulaCursor* cursor) void SequenceElement::moveWordRight(FormulaCursor* cursor) { uint pos = cursor->getPos(); - if (pos < tqchildren.count()) { - ElementType* type = tqchildren.at(pos)->getElementType(); + if (pos < children.count()) { + ElementType* type = children.at(pos)->getElementType(); if (type != 0) { cursor->setTo(this, type->end()); } @@ -596,7 +596,7 @@ void SequenceElement::moveUp(FormulaCursor* cursor, BasicElement* from) else if ( from == this ) { if ( getParent() != 0 ) { uint pos = cursor->getPos(); - if ( pos < (tqchildren.count() - 1) / 2 ) { + if ( pos < (children.count() - 1) / 2 ) { getParent()->moveLeft( cursor, this ); } else { @@ -630,8 +630,8 @@ void SequenceElement::moveDown(FormulaCursor* cursor, BasicElement* from) } else if (from == this) { uint pos = cursor->getPos(); - if (pos < tqchildren.count()) { - tqchildren.at(pos)->moveDown(cursor, this); + if (pos < children.count()) { + children.at(pos)->moveDown(cursor, this); } } else { @@ -639,7 +639,7 @@ void SequenceElement::moveDown(FormulaCursor* cursor, BasicElement* from) getParent()->moveDown(cursor, this); } else { - cursor->setTo( this, tqchildren.count() ); + cursor->setTo( this, children.count() ); from->entered( this ); // formula()->moveOutBelow( cursor ); } @@ -658,7 +658,7 @@ void SequenceElement::moveHome(FormulaCursor* cursor) while (element->getParent() != this) { element = element->getParent(); } - cursor->setMark(tqchildren.find(element)+1); + cursor->setMark(children.find(element)+1); } } cursor->setTo(this, 0); @@ -676,16 +676,16 @@ void SequenceElement::moveEnd(FormulaCursor* cursor) while (element->getParent() != this) { element = element->getParent(); if (element == 0) { - cursor->setMark(tqchildren.count()); + cursor->setMark(children.count()); break; } } if (element != 0) { - cursor->setMark(tqchildren.find(element)); + cursor->setMark(children.find(element)); } } } - cursor->setTo(this, tqchildren.count()); + cursor->setTo(this, children.count()); } /** @@ -705,11 +705,11 @@ void SequenceElement::goInside(FormulaCursor* cursor) void SequenceElement::goInsideLast(FormulaCursor* cursor) { cursor->setSelection(false); - cursor->setTo(this, tqchildren.count()); + cursor->setTo(this, children.count()); } -// tqchildren +// children /** * Insert a new child in the sequence @@ -723,7 +723,7 @@ void SequenceElement::goInsideLast(FormulaCursor* cursor) bool SequenceElement::insert( uint index, BasicElement *child ) { - return tqchildren.insert( index, child ); + return children.insert( index, child ); } /** @@ -735,12 +735,12 @@ bool SequenceElement::insert( uint index, BasicElement *child ) */ // void SequenceElement::removeChild(FormulaCursor* cursor, BasicElement* child) // { -// int pos = tqchildren.find(child); +// int pos = children.find(child); // formula()->elementRemoval(child, pos); // cursor->setTo(this, pos); -// tqchildren.remove(pos); +// children.remove(pos); // /* -// if len(self.tqchildren) == 0: +// if len(self.children) == 0: // if self.parent != None: // self.parent.removeChild(cursor, self) // return @@ -750,7 +750,7 @@ bool SequenceElement::insert( uint index, BasicElement *child ) /** - * Inserts all new tqchildren at the cursor position. Places the + * Inserts all new children at the cursor position. Places the * cursor according to the direction. The inserted elements will * be selected. * @@ -765,7 +765,7 @@ void SequenceElement::insert(FormulaCursor* cursor, for (uint i = 0; i < count; i++) { BasicElement* child = newChildren.take(0); child->setParent(this); - tqchildren.insert(pos+i, child); + children.insert(pos+i, child); } if (direction == beforeCursor) { cursor->setTo(this, pos+count, pos); @@ -780,8 +780,8 @@ void SequenceElement::insert(FormulaCursor* cursor, /** - * Removes all selected tqchildren and returns them. Places the - * cursor to where the tqchildren have been. + * Removes all selected children and returns them. Places the + * cursor to where the children have been. * * The ownership of the list is passed to the caller. */ @@ -803,9 +803,9 @@ void SequenceElement::remove(FormulaCursor* cursor, int pos = cursor->getPos() - 1; if (pos >= 0) { while (pos >= 0) { - BasicElement* child = tqchildren.at(pos); + BasicElement* child = children.at(pos); formula()->elementRemoval(child); - tqchildren.take(pos); + children.take(pos); removedChildren.prepend(child); if (!child->isInvisible()) { break; @@ -818,11 +818,11 @@ void SequenceElement::remove(FormulaCursor* cursor, } else { uint pos = cursor->getPos(); - if (pos < tqchildren.count()) { - while (pos < tqchildren.count()) { - BasicElement* child = tqchildren.at(pos); + if (pos < children.count()) { + while (pos < children.count()) { + BasicElement* child = children.at(pos); formula()->elementRemoval(child); - tqchildren.take(pos); + children.take(pos); removedChildren.append(child); if (!child->isInvisible()) { break; @@ -841,13 +841,13 @@ void SequenceElement::remove(FormulaCursor* cursor, /** - * Removes the tqchildren at pos and appends it to the list. + * Removes the children at pos and appends it to the list. */ void SequenceElement::removeChild(TQPtrList<BasicElement>& removedChildren, int pos) { - BasicElement* child = tqchildren.at(pos); + BasicElement* child = children.at(pos); formula()->elementRemoval(child); - tqchildren.take(pos); + children.take(pos); removedChildren.append(child); //cerr << *removedChildren.at(0) << endl; formula()->changed(); @@ -872,12 +872,12 @@ BasicElement* SequenceElement::getChild( FormulaCursor* cursor, Direction direct { if ( direction == beforeCursor ) { if ( cursor->getPos() > 0 ) { - return tqchildren.at( cursor->getPos() - 1 ); + return children.at( cursor->getPos() - 1 ); } } else { - if ( cursor->getPos() < tqRound( tqchildren.count() ) ) { - return tqchildren.at( cursor->getPos() ); + if ( cursor->getPos() < tqRound( children.count() ) ) { + return children.at( cursor->getPos() ); } } return 0; @@ -890,7 +890,7 @@ BasicElement* SequenceElement::getChild( FormulaCursor* cursor, Direction direct */ void SequenceElement::selectChild(FormulaCursor* cursor, BasicElement* child) { - int pos = tqchildren.find(child); + int pos = children.find(child); if (pos > -1) { cursor->setTo(this, pos+1, pos); } @@ -898,7 +898,7 @@ void SequenceElement::selectChild(FormulaCursor* cursor, BasicElement* child) void SequenceElement::childWillVanish(FormulaCursor* cursor, BasicElement* child) { - int childPos = tqchildren.find(child); + int childPos = children.find(child); if (childPos > -1) { int pos = cursor->getPos(); if (pos > childPos) { @@ -914,11 +914,11 @@ void SequenceElement::childWillVanish(FormulaCursor* cursor, BasicElement* child /** - * Selects all tqchildren. The cursor is put behind, the mark before them. + * Selects all children. The cursor is put behind, the mark before them. */ void SequenceElement::selectAllChildren(FormulaCursor* cursor) { - cursor->setTo(this, tqchildren.count(), 0); + cursor->setTo(this, children.count(), 0); } bool SequenceElement::onlyTextSelected( FormulaCursor* cursor ) @@ -1116,7 +1116,7 @@ KCommand* SequenceElement::buildCommand( Container* container, Request* request case req_addIndex: { if ( cursor->getPos() > 0 && !cursor->isSelection() ) { IndexElement* element = - dynamic_cast<IndexElement*>( tqchildren.at( cursor->getPos()-1 ) ); + dynamic_cast<IndexElement*>( children.at( cursor->getPos()-1 ) ); if ( element != 0 ) { element->goInside( cursor ); return element->buildCommand( container, request ); @@ -1184,7 +1184,7 @@ KCommand* SequenceElement::buildCommand( Container* container, Request* request const SymbolTable& table = container->document()->getSymbolTable(); if (table.greekLetters().find(element->getCharacter()) != -1) { KFCReplace* command = new KFCReplace( i18n( "Change Char to Symbol" ), container ); - TextElement* symbol = creationStrategy->createTextElement( table.tqunicodeFromSymbolFont( element->getCharacter() ), true ); + TextElement* symbol = creationStrategy->createTextElement( table.unicodeFromSymbolFont( element->getCharacter() ), true ); command->addElement( symbol ); return command; } @@ -1206,7 +1206,7 @@ KCommand* SequenceElement::buildCommand( Container* container, Request* request CharStyleCommand* cmd = new CharStyleCommand( cs, i18n( "Change Char Style" ), container ); int end = cursor->getSelectionEnd(); for ( int i = cursor->getSelectionStart(); i<end; ++i ) { - cmd->addElement( tqchildren.at( i ) ); + cmd->addElement( children.at( i ) ); } return cmd; } @@ -1219,7 +1219,7 @@ KCommand* SequenceElement::buildCommand( Container* container, Request* request CharFamilyCommand* cmd = new CharFamilyCommand( cf, i18n( "Change Char Family" ), container ); int end = cursor->getSelectionEnd(); for ( int i = cursor->getSelectionStart(); i<end; ++i ) { - cmd->addElement( tqchildren.at( i ) ); + cmd->addElement( children.at( i ) ); } return cmd; } @@ -1311,8 +1311,8 @@ KCommand* SequenceElement::input( Container* container, TQKeyEvent* event ) KCommand* SequenceElement::input( Container* container, TQChar ch ) { - int tqunicode = ch.tqunicode(); - switch (tqunicode) { + int unicode = ch.unicode(); + switch (unicode) { case '(': { BracketRequest r( container->document()->leftBracketChar(), container->document()->rightBracketChar() ); @@ -1397,25 +1397,25 @@ KCommand* SequenceElement::input( Container* container, TQChar ch ) } /** - * Stores the given tqchildrens dom in the element. + * Stores the given childrens dom in the element. */ void SequenceElement::getChildrenDom( TQDomDocument& doc, TQDomElement elem, uint from, uint to) { for (uint i = from; i < to; i++) { - TQDomElement tmpEleDom=tqchildren.at(i)->getElementDom(doc); + TQDomElement tmpEleDom=children.at(i)->getElementDom(doc); elem.appendChild(tmpEleDom); } } /** - * Stores the given tqchildrens MathML dom in the element. + * Stores the given childrens MathML dom in the element. */ void SequenceElement::getChildrenMathMLDom( TQDomDocument& doc, TQDomNode& parent, uint from, uint to) { for ( uint i = from; i < to; i++ ) { - tqchildren.at( i )->writeMathML( doc, parent, false ); + children.at( i )->writeMathML( doc, parent, false ); } } @@ -1467,7 +1467,7 @@ void SequenceElement::writeDom(TQDomElement element) { BasicElement::writeDom(element); - uint count = tqchildren.count(); + uint count = children.count(); TQDomDocument doc = element.ownerDocument(); getChildrenDom(doc, element, 0, count); } @@ -1495,7 +1495,7 @@ bool SequenceElement::readContentFromDom(TQDomNode& node) return false; } - return buildChildrenFromDom(tqchildren, node); + return buildChildrenFromDom(children, node); } @@ -1504,9 +1504,9 @@ void SequenceElement::parse() delete parseTree; textSequence = true; - for (BasicElement* element = tqchildren.first(); + for (BasicElement* element = children.first(); element != 0; - element = tqchildren.next()) { + element = children.next()) { // Those types are gone. Make sure they won't // be used. @@ -1519,7 +1519,7 @@ void SequenceElement::parse() const SymbolTable& symbols = formula()->getSymbolTable(); SequenceParser parser(symbols); - parseTree = parser.parse(tqchildren); + parseTree = parser.parse(children); // With the IndexElement dynamically changing its text/non-text // behaviour we need to reparse your parent, too. Hacky! @@ -1544,9 +1544,9 @@ bool SequenceElement::isFirstOfToken( BasicElement* child ) TQString SequenceElement::toLatex() { TQString content; - uint count = tqchildren.count(); + uint count = children.count(); for ( uint i = 0; i < count; i++ ) { - BasicElement* child = tqchildren.at( i ); + BasicElement* child = children.at( i ); // if ( isFirstOfToken( child ) ) { // content += ""; // } @@ -1559,9 +1559,9 @@ TQString SequenceElement::toLatex() TQString SequenceElement::formulaString() { TQString content; - uint count = tqchildren.count(); + uint count = children.count(); for ( uint i = 0; i < count; i++ ) { - BasicElement* child = tqchildren.at( i ); + BasicElement* child = children.at( i ); //if ( isFirstOfToken( child ) ) { // content += " "; //} @@ -1573,7 +1573,7 @@ TQString SequenceElement::formulaString() void SequenceElement::writeMathMLContent( TQDomDocument& doc, TQDomElement& element, bool oasisFormat ) const { - for ( TQPtrListIterator<BasicElement> it( tqchildren ); it.current(); ++it ) { + for ( TQPtrListIterator<BasicElement> it( children ); it.current(); ++it ) { it.current()->writeMathML( doc, element, oasisFormat ); } } @@ -1581,7 +1581,7 @@ void SequenceElement::writeMathMLContent( TQDomDocument& doc, TQDomElement& elem const BasicElement* SequenceElement::getChild( uint i ) const { - TQPtrListIterator<BasicElement> it( tqchildren ); + TQPtrListIterator<BasicElement> it( children ); it += i; return it.current(); } @@ -1589,7 +1589,7 @@ const BasicElement* SequenceElement::getChild( uint i ) const int SequenceElement::childPos( const BasicElement* child ) const { - TQPtrListIterator<BasicElement> it( tqchildren ); + TQPtrListIterator<BasicElement> it( children ); uint count = it.count(); for ( uint i=0; i<count; ++i, ++it ) { if ( it.current() == child ) { @@ -1700,8 +1700,8 @@ KCommand* NameSequence::buildCommand( Container* container, Request* request ) KCommand* NameSequence::input( Container* container, TQChar ch ) { - int tqunicode = ch.tqunicode(); - switch (tqunicode) { + int unicode = ch.unicode(); + switch (unicode) { case '(': case '[': case '|': @@ -1746,12 +1746,12 @@ void NameSequence::setElementType( ElementType* t ) BasicElement* NameSequence::replaceElement( const SymbolTable& table ) { TQString name = buildName(); - TQChar ch = table.tqunicode( name ); + TQChar ch = table.unicode( name ); if ( !ch.isNull() ) { return new TextElement( ch, true ); } else { - ch = table.tqunicode( i18n( name.latin1() ) ); + ch = table.unicode( i18n( name.latin1() ) ); if ( !ch.isNull() ) { return new TextElement( ch, true ); } @@ -1782,7 +1782,7 @@ BasicElement* NameSequence::createElement( TQString type ) // void NameSequence::parse() // { -// // A name sequence is known as name and so are its tqchildren. +// // A name sequence is known as name and so are its children. // // Caution: this is fake! // for ( int i = 0; i < countChildren(); i++ ) { // getChild( i )->setElementType( getElementType() ); @@ -1891,7 +1891,7 @@ int SequenceElement::readContentFromMathMLDom(TQDomNode& node) return -1; } - return buildChildrenFromMathMLDom(tqchildren, node); + return buildChildrenFromMathMLDom(children, node); } int SequenceElement::buildMathMLChild( TQDomNode node ) @@ -1915,7 +1915,7 @@ int SequenceElement::buildMathMLChild( TQDomNode node ) child->setStyle(style); } if (child->buildFromMathMLDom(e) != -1) { - tqchildren.append(child); + children.append(child); } else { delete child; diff --git a/lib/kformula/sequenceelement.h b/lib/kformula/sequenceelement.h index 4d32153c..f9fb2ce6 100644 --- a/lib/kformula/sequenceelement.h +++ b/lib/kformula/sequenceelement.h @@ -34,8 +34,8 @@ class SymbolTable; class ElementCreationStrategy; /** - * The element that contains a number of tqchildren. - * The tqchildren are aligned in one line. + * The element that contains a number of children. + * The children are aligned in one line. */ class SequenceElement : public BasicElement { SequenceElement& operator=( const SequenceElement& ) { return *this; } @@ -92,7 +92,7 @@ public: /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ virtual void calcSizes( const ContextStyle& cstyle, ContextStyle::TextStyle tstyle, @@ -100,7 +100,7 @@ public: StyleAttributes& style ); /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ @@ -112,7 +112,7 @@ public: const LuPixelPoint& parentOrigin ); /** - * Dispatch this FontCommand to all our TextElement tqchildren. + * Dispatch this FontCommand to all our TextElement children. */ virtual void dispatchFontCommand( FontCommand* cmd ); @@ -202,10 +202,10 @@ public: virtual void goInsideLast(FormulaCursor* cursor); - // tqchildren + // children /** - * Inserts all new tqchildren at the cursor position. Places the + * Inserts all new children at the cursor position. Places the * cursor according to the direction. The inserted elements will * be selected. * @@ -214,8 +214,8 @@ public: virtual void insert(FormulaCursor*, TQPtrList<BasicElement>&, Direction); /** - * Removes all selected tqchildren and returns them. Places the - * cursor to where the tqchildren have been. + * Removes all selected children and returns them. Places the + * cursor to where the children have been. */ virtual void remove(FormulaCursor*, TQPtrList<BasicElement>&, Direction); @@ -244,18 +244,18 @@ public: virtual void childWillVanish(FormulaCursor* cursor, BasicElement* child); /** - * @returns the number of tqchildren we have. + * @returns the number of children we have. */ - uint countChildren() const { return tqchildren.count(); } + uint countChildren() const { return children.count(); } /** * @returns whether the child has the given number. */ bool isChildNumber( uint pos, BasicElement* child ) - { return tqchildren.at( pos ) == child; } + { return children.at( pos ) == child; } /** - * Selects all tqchildren. The cursor is put behind, the mark before them. + * Selects all children. The cursor is put behind, the mark before them. */ void selectAllChildren(FormulaCursor* cursor); @@ -288,12 +288,12 @@ public: virtual void parse(); /** - * Stores the given tqchildrens dom in the element. + * Stores the given childrens dom in the element. */ void getChildrenDom( TQDomDocument& doc, TQDomElement elem, uint from, uint to); /** - * Stores the given tqchildrens MathML dom in the element. + * Stores the given childrens MathML dom in the element. */ void getChildrenMathMLDom( TQDomDocument& doc, TQDomNode& elem, uint from, uint to ); @@ -306,7 +306,7 @@ public: /** * @returns the latex representation of the element and - * of the element's tqchildren + * of the element's children */ virtual TQString toLatex(); @@ -315,10 +315,10 @@ public: /** * @returns the child at position i. */ - BasicElement* getChild(uint i) { return tqchildren.at(i); } + BasicElement* getChild(uint i) { return children.at(i); } const BasicElement* getChild(uint i) const; - int childPos( BasicElement* child ) { return tqchildren.find( child ); } + int childPos( BasicElement* child ) { return children.find( child ); } int childPos( const BasicElement* child ) const; class ChildIterator { @@ -407,7 +407,7 @@ protected: virtual bool readContentFromDom(TQDomNode& node); /** - * Sets the tqchildrens' positions after their size has been + * Sets the childrens' positions after their size has been * calculated. * * @see #calcSizes @@ -458,16 +458,16 @@ protected: private: /** - * Removes the tqchildren at pos and appends it to the list. + * Removes the children at pos and appends it to the list. */ void removeChild(TQPtrList<BasicElement>& removedChildren, int pos); /** - * Our tqchildren. Be sure to notify the rootElement before + * Our children. Be sure to notify the rootElement before * you remove any. */ - TQPtrList<BasicElement> tqchildren; + TQPtrList<BasicElement> children; /** * the syntax tree of the sequence @@ -603,7 +603,7 @@ protected: /** * @returns whether the child is the first element of its token. - * This can never happen here. Our tqchildren reuse our own + * This can never happen here. Our children reuse our own * element type. */ virtual bool isFirstOfToken( BasicElement* ) { return false; } diff --git a/lib/kformula/spaceelement.cc b/lib/kformula/spaceelement.cc index a7e23464..1fb4f553 100644 --- a/lib/kformula/spaceelement.cc +++ b/lib/kformula/spaceelement.cc @@ -288,13 +288,13 @@ void SpaceElement::writeMathMLAttributes( TQDomElement& element ) const { switch ( m_widthType ) { case AbsoluteSize: - element.setAttribute( "width", TQString( "%1pt" ).tqarg( m_width ) ); + element.setAttribute( "width", TQString( "%1pt" ).arg( m_width ) ); break; case RelativeSize: - element.setAttribute( "width", TQString( "%1%" ).tqarg( m_width * 100.0 ) ); + element.setAttribute( "width", TQString( "%1%" ).arg( m_width * 100.0 ) ); break; case PixelSize: - element.setAttribute( "width", TQString( "%1px" ).tqarg( m_width ) ); + element.setAttribute( "width", TQString( "%1px" ).arg( m_width ) ); break; case NegativeVeryVeryThinMathSpace: element.setAttribute( "width", "negativeveryverythinmathspace" ); @@ -343,26 +343,26 @@ void SpaceElement::writeMathMLAttributes( TQDomElement& element ) const } switch ( m_heightType ) { case AbsoluteSize: - element.setAttribute( "height", TQString( "%1pt" ).tqarg( m_height ) ); + element.setAttribute( "height", TQString( "%1pt" ).arg( m_height ) ); break; case RelativeSize: - element.setAttribute( "height", TQString( "%1%" ).tqarg( m_height * 100.0 ) ); + element.setAttribute( "height", TQString( "%1%" ).arg( m_height * 100.0 ) ); break; case PixelSize: - element.setAttribute( "height", TQString( "%1px" ).tqarg( m_height ) ); + element.setAttribute( "height", TQString( "%1px" ).arg( m_height ) ); break; default: break; } switch ( m_depthType ) { case AbsoluteSize: - element.setAttribute( "depth", TQString( "%1pt" ).tqarg( m_depth ) ); + element.setAttribute( "depth", TQString( "%1pt" ).arg( m_depth ) ); break; case RelativeSize: - element.setAttribute( "depth", TQString( "%1%" ).tqarg( m_depth * 100.0 ) ); + element.setAttribute( "depth", TQString( "%1%" ).arg( m_depth * 100.0 ) ); break; case PixelSize: - element.setAttribute( "depth", TQString( "%1px" ).tqarg( m_depth ) ); + element.setAttribute( "depth", TQString( "%1px" ).arg( m_depth ) ); break; default: break; diff --git a/lib/kformula/spaceelement.h b/lib/kformula/spaceelement.h index a8c5ec9a..46397509 100644 --- a/lib/kformula/spaceelement.h +++ b/lib/kformula/spaceelement.h @@ -78,7 +78,7 @@ public: /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ virtual void calcSizes( const ContextStyle& cstyle, ContextStyle::TextStyle tstyle, @@ -86,7 +86,7 @@ public: StyleAttributes& style ); /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ @@ -105,7 +105,7 @@ public: /** * @returns the latex representation of the element and - * of the element's tqchildren + * of the element's children */ virtual TQString toLatex(); diff --git a/lib/kformula/styleelement.cc b/lib/kformula/styleelement.cc index 3bb6b6b1..de760453 100644 --- a/lib/kformula/styleelement.cc +++ b/lib/kformula/styleelement.cc @@ -135,13 +135,13 @@ void StyleElement::writeMathMLAttributes( TQDomElement& element ) const if ( m_relativeScriptLevel && m_scriptLevel >= 0 ) { prefix = "+"; } - element.setAttribute( "scriptlevel", prefix + TQString( "%1" ).tqarg( m_scriptLevel ) ); + element.setAttribute( "scriptlevel", prefix + TQString( "%1" ).arg( m_scriptLevel ) ); } if ( m_customDisplayStyle ) { element.setAttribute( "displaystyle", m_displayStyle ? "true" : "false" ); } if ( m_customScriptSizeMultiplier ) { - element.setAttribute( "scriptsizemultiplier", TQString( "%1" ).tqarg( m_scriptSizeMultiplier ) ); + element.setAttribute( "scriptsizemultiplier", TQString( "%1" ).arg( m_scriptSizeMultiplier ) ); } writeSizeAttribute( element, "scriptminsize", m_scriptMinSizeType, m_scriptMinSize ); if ( m_customBackground ) { @@ -373,13 +373,13 @@ void StyleElement::writeSizeAttribute( TQDomElement element, const TQString& str { switch ( st ) { case AbsoluteSize: - element.setAttribute( str, TQString( "%1pt" ).tqarg( s ) ); + element.setAttribute( str, TQString( "%1pt" ).arg( s ) ); break; case RelativeSize: - element.setAttribute( str, TQString( "%1%" ).tqarg( s * 100.0 ) ); + element.setAttribute( str, TQString( "%1%" ).arg( s * 100.0 ) ); break; case PixelSize: - element.setAttribute( str, TQString( "%1px" ).tqarg( s ) ); + element.setAttribute( str, TQString( "%1px" ).arg( s ) ); break; default: break; diff --git a/lib/kformula/symbolaction.cc b/lib/kformula/symbolaction.cc index d5aa3176..e26f3fef 100644 --- a/lib/kformula/symbolaction.cc +++ b/lib/kformula/symbolaction.cc @@ -91,7 +91,7 @@ void SymbolComboItem::paint( TQPainter *p ) p->setFont( m_font ); TQFontMetrics fm( p->fontMetrics() ); p->drawText( 3, fm.ascent() + fm.leading() / 2, - TQString( "%1" ).tqarg( TQChar( m_symbol ) ) ); + TQString( "%1" ).arg( TQChar( m_symbol ) ) ); p->setFont( KGlobalSettings::generalFont() ); fm = p->fontMetrics(); @@ -128,7 +128,7 @@ int SymbolAction::plug( TQWidget* w, int index ) TQT_SLOT( slotActivated( const TQString & ) ) ); cb->setEnabled( isEnabled() ); bar->insertWidget( id_, comboWidth(), cb, index ); - cb->setMinimumWidth( cb->tqsizeHint().width() ); + cb->setMinimumWidth( cb->sizeHint().width() ); addContainer( bar, id_ ); @@ -166,7 +166,7 @@ void SymbolAction::updateItems( int id ) for( uint i = 0; i < items().count(); ++i ) { new SymbolComboItem( *items().at( i ), m_font, m_chars.at( i ), cb ); } - cb->setMinimumWidth( cb->tqsizeHint().width() ); + cb->setMinimumWidth( cb->sizeHint().width() ); } } } diff --git a/lib/kformula/symbolelement.cc b/lib/kformula/symbolelement.cc index a601cea4..31787b16 100644 --- a/lib/kformula/symbolelement.cc +++ b/lib/kformula/symbolelement.cc @@ -192,7 +192,7 @@ BasicElement* SymbolElement::goToPos( FormulaCursor* cursor, bool& handled, /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ void SymbolElement::calcSizes( const ContextStyle& context, ContextStyle::TextStyle tstyle, @@ -299,7 +299,7 @@ void SymbolElement::calcSizes( const ContextStyle& context, } /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ @@ -502,11 +502,11 @@ void SymbolElement::moveDown(FormulaCursor* cursor, BasicElement* from) } } -// tqchildren +// children // main child // -// If an element has tqchildren one has to become the main one. +// If an element has children one has to become the main one. // void SymbolElement::setMainChild(SequenceElement* child) // { @@ -518,7 +518,7 @@ void SymbolElement::moveDown(FormulaCursor* cursor, BasicElement* from) /** - * Inserts all new tqchildren at the cursor position. Places the + * Inserts all new children at the cursor position. Places the * cursor according to the direction. * * You only can insert one index at a time. So the list must contain @@ -557,8 +557,8 @@ void SymbolElement::insert(FormulaCursor* cursor, } /** - * Removes all selected tqchildren and returns them. Places the - * cursor to where the tqchildren have been. + * Removes all selected children and returns them. Places the + * cursor to where the children have been. * * The cursor has to be inside one of our indexes which is supposed * to be empty. The index will be removed and the cursor will diff --git a/lib/kformula/symbolelement.h b/lib/kformula/symbolelement.h index 0133258e..ab9b5d89 100644 --- a/lib/kformula/symbolelement.h +++ b/lib/kformula/symbolelement.h @@ -65,7 +65,7 @@ public: /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ virtual void calcSizes( const ContextStyle& cstyle, ContextStyle::TextStyle tstyle, @@ -73,7 +73,7 @@ public: StyleAttributes& style ); /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ @@ -85,7 +85,7 @@ public: const LuPixelPoint& parentOrigin ); /** - * Dispatch this FontCommand to all our TextElement tqchildren. + * Dispatch this FontCommand to all our TextElement children. */ virtual void dispatchFontCommand( FontCommand* cmd ); @@ -125,7 +125,7 @@ public: */ virtual void moveDown(FormulaCursor* cursor, BasicElement* from); - // tqchildren + // children /** * Removes the child. If this was the main child this element might @@ -139,14 +139,14 @@ public: // main child // - // If an element has tqchildren one has to become the main one. + // If an element has children one has to become the main one. virtual SequenceElement* getMainChild() { return content; } //virtual void setMainChild(SequenceElement*); /** - * Inserts all new tqchildren at the cursor position. Places the + * Inserts all new children at the cursor position. Places the * cursor according to the direction. * * You only can insert one index at a time. So the list must contain @@ -158,8 +158,8 @@ public: virtual void insert(FormulaCursor*, TQPtrList<BasicElement>&, Direction); /** - * Removes all selected tqchildren and returns them. Places the - * cursor to where the tqchildren have been. + * Removes all selected children and returns them. Places the + * cursor to where the children have been. * * The cursor has to be inside one of our indexes which is supposed * to be empty. The index will be removed and the cursor will @@ -221,7 +221,7 @@ public: /** * @returns the latex representation of the element and - * of the element's tqchildren + * of the element's children */ virtual TQString toLatex(); diff --git a/lib/kformula/symboltable.cc b/lib/kformula/symboltable.cc index 42c4a8e6..369cf6c3 100644 --- a/lib/kformula/symboltable.cc +++ b/lib/kformula/symboltable.cc @@ -23,7 +23,7 @@ #include <tqregexp.h> #include <tqstring.h> #include <tqstringlist.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfontmetrics.h> #include <kconfig.h> @@ -44,12 +44,12 @@ KFORMULA_NAMESPACE_BEGIN SymbolFontHelper::SymbolFontHelper() : greek("abgdezhqiklmnxpvrstufjcywGDTQLXPSUFYVW") { - for ( uint i = 0; symbolMap[ i ].tqunicode != 0; i++ ) { - compatibility[ symbolMap[ i ].pos ] = symbolMap[ i ].tqunicode; + for ( uint i = 0; symbolMap[ i ].unicode != 0; i++ ) { + compatibility[ symbolMap[ i ].pos ] = symbolMap[ i ].unicode; } } -TQChar SymbolFontHelper::tqunicodeFromSymbolFont( TQChar pos ) const +TQChar SymbolFontHelper::unicodeFromSymbolFont( TQChar pos ) const { if ( compatibility.contains( pos ) ) { return compatibility[ pos.latin1() ]; @@ -66,17 +66,17 @@ SymbolTable::SymbolTable() void SymbolTable::init( const TQFont& font ) { backupFont = font; - for ( int i=0; operatorTable[i].tqunicode != 0; ++i ) { - names[TQChar( operatorTable[i].tqunicode )] = get_name( operatorTable[i] ); - entries[get_name( operatorTable[i] )] = TQChar( operatorTable[i].tqunicode ); + for ( int i=0; operatorTable[i].unicode != 0; ++i ) { + names[TQChar( operatorTable[i].unicode )] = get_name( operatorTable[i] ); + entries[get_name( operatorTable[i] )] = TQChar( operatorTable[i].unicode ); } - for ( int i=0; arrowTable[i].tqunicode != 0; ++i ) { - names[TQChar( arrowTable[i].tqunicode )] = get_name( arrowTable[i] ); - entries[get_name( arrowTable[i] )] = TQChar( arrowTable[i].tqunicode ); + for ( int i=0; arrowTable[i].unicode != 0; ++i ) { + names[TQChar( arrowTable[i].unicode )] = get_name( arrowTable[i] ); + entries[get_name( arrowTable[i] )] = TQChar( arrowTable[i].unicode ); } - for ( int i=0; greekTable[i].tqunicode != 0; ++i ) { - names[TQChar( greekTable[i].tqunicode )] = get_name( greekTable[i] ); - entries[get_name( greekTable[i] )] = TQChar( greekTable[i].tqunicode ); + for ( int i=0; greekTable[i].unicode != 0; ++i ) { + names[TQChar( greekTable[i].unicode )] = get_name( greekTable[i] ); + entries[get_name( greekTable[i] )] = TQChar( greekTable[i].unicode ); } } @@ -85,7 +85,7 @@ bool SymbolTable::contains(TQString name) const return entries.find( name ) != entries.end(); } -TQChar SymbolTable::tqunicode(TQString name) const +TQChar SymbolTable::unicode(TQString name) const { return entries[ name ]; } @@ -112,9 +112,9 @@ CharClass SymbolTable::charClass( TQChar symbol ) const } -TQChar SymbolTable::tqunicodeFromSymbolFont( TQChar pos ) const +TQChar SymbolTable::unicodeFromSymbolFont( TQChar pos ) const { - return symbolFontHelper.tqunicodeFromSymbolFont( pos ); + return symbolFontHelper.unicodeFromSymbolFont( pos ); } @@ -128,13 +128,13 @@ TQStringList SymbolTable::allNames() const { TQStringList list; - for ( int i=0; operatorTable[i].tqunicode != 0; ++i ) { + for ( int i=0; operatorTable[i].unicode != 0; ++i ) { list.append( get_name( operatorTable[i] )); } - for ( int i=0; arrowTable[i].tqunicode != 0; ++i ) { + for ( int i=0; arrowTable[i].unicode != 0; ++i ) { list.append( get_name( arrowTable[i] )); } - for ( int i=0; greekTable[i].tqunicode != 0; ++i ) { + for ( int i=0; greekTable[i].unicode != 0; ++i ) { list.append( get_name( greekTable[i] ) ); } return list; @@ -144,7 +144,7 @@ TQStringList SymbolTable::allNames() const TQString SymbolTable::get_name( struct UnicodeNameTable entry ) const { if ( !*entry.name ) { - return "U" + TQString( "%1" ).tqarg( entry.tqunicode, 4, 16 ).upper(); + return "U" + TQString( "%1" ).arg( entry.unicode, 4, 16 ).upper(); } return entry.name; } diff --git a/lib/kformula/symboltable.h b/lib/kformula/symboltable.h index d4a19f03..7820af81 100644 --- a/lib/kformula/symboltable.h +++ b/lib/kformula/symboltable.h @@ -51,14 +51,14 @@ public: TQString greekLetters() const { return greek; } /** - * @returns the tqunicode value of the symbol font char. + * @returns the unicode value of the symbol font char. */ - TQChar tqunicodeFromSymbolFont( TQChar pos ) const; + TQChar unicodeFromSymbolFont( TQChar pos ) const; private: /** - * symbol font char -> tqunicode mapping. + * symbol font char -> unicode mapping. */ TQMap<TQChar, TQChar> compatibility; @@ -91,7 +91,7 @@ public: * @returns the char in the symbol font that belongs to * the given name. */ - TQChar tqunicode( TQString name ) const; + TQChar unicode( TQString name ) const; TQString name( TQChar symbol ) const; TQFont font( TQChar symbol, const TQFont& f ) const; @@ -104,9 +104,9 @@ public: TQString greekLetters() const; /** - * @returns the tqunicode value of the symbol font char. + * @returns the unicode value of the symbol font char. */ - TQChar tqunicodeFromSymbolFont( TQChar pos ) const; + TQChar unicodeFromSymbolFont( TQChar pos ) const; /** * @returns all known names as strings. @@ -121,12 +121,12 @@ private: TQString get_name( UnicodeNameTable entry ) const; /** - * tqunicode -> name mapping. + * unicode -> name mapping. */ NameTable names; /** - * Name -> tqunicode mapping. + * Name -> unicode mapping. */ EntryTable entries; diff --git a/lib/kformula/textelement.cc b/lib/kformula/textelement.cc index c9826429..7f146b49 100644 --- a/lib/kformula/textelement.cc +++ b/lib/kformula/textelement.cc @@ -66,7 +66,7 @@ TokenType TextElement::getTokenType() const return getSymbolTable().charClass( character ); } - switch ( character.tqunicode() ) { + switch ( character.unicode() ) { case '+': case '-': case '*': @@ -106,7 +106,7 @@ bool TextElement::isInvisible() const /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ void TextElement::calcSizes( const ContextStyle& context, ContextStyle::TextStyle tstyle, @@ -155,7 +155,7 @@ void TextElement::calcSizes( const ContextStyle& context, } /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ @@ -202,7 +202,7 @@ void TextElement::draw( TQPainter& painter, const LuPixelRect& /*r*/, ElementType* token = getElementType(); if ( ( token != 0 ) && !symbol ) { TQString text = token->text( static_cast<SequenceElement*>( getParent() ) ); -// kdDebug() << "draw text: " << text[0].tqunicode() +// kdDebug() << "draw text: " << text[0].unicode() // << " " << painter.font().family().latin1() // << endl; painter.fillRect( context.layoutUnitToPixelX( parentOrigin.x() ), @@ -401,10 +401,10 @@ bool TextElement::readAttributesFromDom(TQDomElement element) if(!symbolStr.isNull()) { int symbolInt = symbolStr.toInt(); if ( symbolInt == 1 ) { - character = getSymbolTable().tqunicodeFromSymbolFont(character); + character = getSymbolTable().unicodeFromSymbolFont(character); } if ( symbolInt == 2 ) { - switch ( character.tqunicode() ) { + switch ( character.unicode() ) { case 0x03D5: character = 0x03C6; break; case 0x03C6: character = 0x03D5; break; case 0x03Ba: character = 0x03BA; break; diff --git a/lib/kformula/textelement.h b/lib/kformula/textelement.h index 99b6e63a..1a64ce80 100644 --- a/lib/kformula/textelement.h +++ b/lib/kformula/textelement.h @@ -73,7 +73,7 @@ public: /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ virtual void calcSizes( const ContextStyle& cstyle, ContextStyle::TextStyle tstyle, @@ -81,7 +81,7 @@ public: StyleAttributes& style ); /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ @@ -93,7 +93,7 @@ public: const LuPixelPoint& parentOrigin ); /** - * Dispatch this FontCommand to all our TextElement tqchildren. + * Dispatch this FontCommand to all our TextElement children. */ virtual void dispatchFontCommand( FontCommand* cmd ); @@ -123,7 +123,7 @@ public: /** * @returns the latex representation of the element and - * of the element's tqchildren + * of the element's children */ virtual TQString toLatex(); @@ -244,7 +244,7 @@ public: /** * Calculates our width and height and - * our tqchildren's parentPosition. + * our children's parentPosition. */ virtual void calcSizes( const ContextStyle& cstyle, ContextStyle::TextStyle tstyle, @@ -252,7 +252,7 @@ public: StyleAttributes& style ); /** - * Draws the whole element including its tqchildren. + * Draws the whole element including its children. * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ @@ -266,7 +266,7 @@ public: /** * @returns the latex representation of the element and - * of the element's tqchildren + * of the element's children */ virtual TQString toLatex(); diff --git a/lib/kformula/tokenelement.cc b/lib/kformula/tokenelement.cc index 272af51f..6addc385 100644 --- a/lib/kformula/tokenelement.cc +++ b/lib/kformula/tokenelement.cc @@ -67,7 +67,7 @@ int TokenElement::buildChildrenFromMathMLDom(TQPtrList<BasicElement>& list, TQDo kdWarning() << "Invalid entity refererence: " << entity << endl; } else { - TextElement* child = new TextElement( TQChar( pos->tqunicode ) ); + TextElement* child = new TextElement( TQChar( pos->unicode ) ); child->setParent(this); child->setCharFamily( charFamily() ); child->setCharStyle( charStyle() ); @@ -97,7 +97,7 @@ int TokenElement::buildChildrenFromMathMLDom(TQPtrList<BasicElement>& list, TQDo n = n.nextSibling(); } // parse(); - kdWarning() << "Num of tqchildren " << list.count() << endl; + kdWarning() << "Num of children " << list.count() << endl; return 1; } diff --git a/lib/kformula/tokenstyleelement.cc b/lib/kformula/tokenstyleelement.cc index c8e4799f..fcce16e7 100644 --- a/lib/kformula/tokenstyleelement.cc +++ b/lib/kformula/tokenstyleelement.cc @@ -344,13 +344,13 @@ void TokenStyleElement::writeMathMLAttributes( TQDomElement& element ) const // mathsize attribute switch ( m_mathSizeType ) { case AbsoluteSize: - element.setAttribute( "mathsize", TQString( "%1pt" ).tqarg( m_mathSize ) ); + element.setAttribute( "mathsize", TQString( "%1pt" ).arg( m_mathSize ) ); break; case RelativeSize: - element.setAttribute( "mathsize", TQString( "%1%" ).tqarg( m_mathSize * 100.0 ) ); + element.setAttribute( "mathsize", TQString( "%1%" ).arg( m_mathSize * 100.0 ) ); break; case PixelSize: - element.setAttribute( "mathsize", TQString( "%1px" ).tqarg( m_mathSize ) ); + element.setAttribute( "mathsize", TQString( "%1px" ).arg( m_mathSize ) ); break; default: break; @@ -370,13 +370,13 @@ void TokenStyleElement::writeMathMLAttributes( TQDomElement& element ) const // fontsize attribute switch ( m_fontSizeType ) { case AbsoluteSize: - element.setAttribute( "fontsize", TQString( "%1pt" ).tqarg( m_fontSize ) ); + element.setAttribute( "fontsize", TQString( "%1pt" ).arg( m_fontSize ) ); break; case RelativeSize: - element.setAttribute( "fontsize", TQString( "%1%" ).tqarg( m_fontSize * 100.0 ) ); + element.setAttribute( "fontsize", TQString( "%1%" ).arg( m_fontSize * 100.0 ) ); break; case PixelSize: - element.setAttribute( "fontsize", TQString( "%3px" ).tqarg( m_fontSize ) ); + element.setAttribute( "fontsize", TQString( "%3px" ).arg( m_fontSize ) ); break; default: break; diff --git a/lib/kformula/unicodetable.cc b/lib/kformula/unicodetable.cc index ad9a7f74..23dc8636 100644 --- a/lib/kformula/unicodetable.cc +++ b/lib/kformula/unicodetable.cc @@ -19,7 +19,7 @@ KFORMULA_NAMESPACE_BEGIN -struct UnicodeNameTable { short tqunicode; const char* name; }; +struct UnicodeNameTable { short unicode; const char* name; }; static UnicodeNameTable greekTable[] = { { 0x03B1, "alpha" }, diff --git a/lib/kofficecore/KoApplication.cpp b/lib/kofficecore/KoApplication.cpp index d127f444..a4cfcc14 100644 --- a/lib/kofficecore/KoApplication.cpp +++ b/lib/kofficecore/KoApplication.cpp @@ -180,10 +180,10 @@ bool KoApplication::start() paths = KGlobal::dirs()->findAllResources("data", appName +"/templates/" + desktopName ); } if ( paths.isEmpty()) { - KMessageBox::error(0L, i18n("No template found for: %1 ").tqarg(desktopName) ); + KMessageBox::error(0L, i18n("No template found for: %1 ").arg(desktopName) ); delete shell; } else if ( paths.count() > 1 ) { - KMessageBox::error(0L, i18n("Too many templates found for: %1").tqarg(desktopName) ); + KMessageBox::error(0L, i18n("Too many templates found for: %1").arg(desktopName) ); delete shell; } } @@ -203,7 +203,7 @@ bool KoApplication::start() kdDebug(30003) << "Template loaded..." << endl; n++; } else { - KMessageBox::error(0L, i18n("Template %1 failed to load.").tqarg(templateURL.prettyURL()) ); + KMessageBox::error(0L, i18n("Template %1 failed to load.").arg(templateURL.prettyURL()) ); delete shell; } } diff --git a/lib/kofficecore/KoApplicationIface.cc b/lib/kofficecore/KoApplicationIface.cc index 042a39a8..3348e873 100644 --- a/lib/kofficecore/KoApplicationIface.cc +++ b/lib/kofficecore/KoApplicationIface.cc @@ -45,7 +45,7 @@ DCOPRef KoApplicationIface::createDocument( const TQString &nativeFormat ) KoDocumentEntry entry = KoDocumentEntry::queryByMimeType( nativeFormat ); if ( entry.isEmpty() ) { - KMessageBox::questionYesNo( 0, i18n( "Unknown KOffice MimeType %s. Check your installation." ).tqarg( nativeFormat ) ); + KMessageBox::questionYesNo( 0, i18n( "Unknown KOffice MimeType %s. Check your installation." ).arg( nativeFormat ) ); return DCOPRef(); } KoDocument* doc = entry.createDoc( 0 ); diff --git a/lib/kofficecore/KoChild.cpp b/lib/kofficecore/KoChild.cpp index 41dfee8f..c78ee70f 100644 --- a/lib/kofficecore/KoChild.cpp +++ b/lib/kofficecore/KoChild.cpp @@ -34,7 +34,7 @@ public: { } - TQRect m_tqgeometry; + TQRect m_geometry; double m_rotation; double m_shearX; @@ -74,14 +74,14 @@ void KoChild::setGeometry( const TQRect &rect, bool noEmit ) if ( !d->m_lock ) d->m_old = framePointArray(); - d->m_tqgeometry = rect; + d->m_geometry = rect; // Embedded objects should have a minimum size of 3, so they can be selected - if( d->m_tqgeometry.width() < 3 ) - d->m_tqgeometry.setWidth( 3 ); + if( d->m_geometry.width() < 3 ) + d->m_geometry.setWidth( 3 ); - if( d->m_tqgeometry.height() < 3 ) - d->m_tqgeometry.setHeight( 3 ); + if( d->m_geometry.height() < 3 ) + d->m_geometry.setHeight( 3 ); updateMatrix(); @@ -89,9 +89,9 @@ void KoChild::setGeometry( const TQRect &rect, bool noEmit ) emit changed( this ); } -TQRect KoChild::tqgeometry() const +TQRect KoChild::geometry() const { - return d->m_tqgeometry; + return d->m_geometry; } TQRegion KoChild::region( const TQWMatrix &matrix ) const @@ -101,7 +101,7 @@ TQRegion KoChild::region( const TQWMatrix &matrix ) const TQPointArray KoChild::pointArray( const TQWMatrix &matrix ) const { - return pointArray( TQRect( 0, 0, d->m_tqgeometry.width(), d->m_tqgeometry.height() ), matrix ); + return pointArray( TQRect( 0, 0, d->m_geometry.width(), d->m_geometry.height() ), matrix ); } //bool KoChild::contains( const TQPoint &point ) const @@ -123,9 +123,9 @@ void KoChild::setClipRegion( TQPainter &painter, bool combine ) { painter.setClipping( true ); if ( combine && !painter.clipRegion().isEmpty() ) - painter.setClipRegion( region( painter.tqworldMatrix() ).intersect( painter.clipRegion() ) ); + painter.setClipRegion( region( painter.worldMatrix() ).intersect( painter.clipRegion() ) ); else - painter.setClipRegion( region( painter.tqworldMatrix() ) ); + painter.setClipRegion( region( painter.worldMatrix() ) ); } void KoChild::setScaling( double x, double y ) @@ -218,7 +218,7 @@ void KoChild::transform( TQPainter &painter ) { setClipRegion( painter, true ); - TQWMatrix m = painter.tqworldMatrix(); + TQWMatrix m = painter.worldMatrix(); m = d->m_matrix * m; m.scale( d->m_scaleX, d->m_scaleY ); painter.setWorldMatrix( m ); @@ -232,13 +232,13 @@ void KoChild::setContentsPos( int x, int y ) TQRect KoChild::contentRect() const { - return TQRect( d->m_contentsX, d->m_contentsY, int(d->m_tqgeometry.width() / d->m_scaleX), - int(d->m_tqgeometry.height() / d->m_scaleY) ); + return TQRect( d->m_contentsX, d->m_contentsY, int(d->m_geometry.width() / d->m_scaleX), + int(d->m_geometry.height() / d->m_scaleY) ); } TQPointArray KoChild::framePointArray( const TQWMatrix &matrix ) const { - return pointArray( TQRect( -6, -6, d->m_tqgeometry.width() + 12, d->m_tqgeometry.height() + 12 ), matrix ); + return pointArray( TQRect( -6, -6, d->m_geometry.width() + 12, d->m_geometry.height() + 12 ), matrix ); } TQRegion KoChild::frameRegion( const TQWMatrix &matrix, bool solid ) const @@ -281,7 +281,7 @@ void KoChild::updateMatrix() TQWMatrix m; m.rotate( d->m_rotation ); - m.translate( -d->m_rotationPoint.x() + d->m_tqgeometry.x(), -d->m_rotationPoint.y() + d->m_tqgeometry.y() ); + m.translate( -d->m_rotationPoint.x() + d->m_geometry.x(), -d->m_rotationPoint.y() + d->m_geometry.y() ); m.translate( p.x(), p.y() ); m.shear( d->m_shearX, d->m_shearY ); @@ -343,21 +343,21 @@ KoChild::Gadget KoChild::gadgetHitTest( const TQPoint &p ) if ( TQRegion( pointArray( TQRect( -5, -5, 5, 5 ) ) ).contains( p ) ) return TopLeft; - if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width() / 2 - 3, -5, 5, 5 ) ) ).contains( p ) ) + if ( TQRegion( pointArray( TQRect( d->m_geometry.width() / 2 - 3, -5, 5, 5 ) ) ).contains( p ) ) return TopMid; - if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width(), -5, 5, 5 ) ) ).contains( p ) ) + if ( TQRegion( pointArray( TQRect( d->m_geometry.width(), -5, 5, 5 ) ) ).contains( p ) ) return TopRight; - if ( TQRegion( pointArray( TQRect( -5, d->m_tqgeometry.height() / 2 - 3, 5, 5 ) ) ).contains( p ) ) + if ( TQRegion( pointArray( TQRect( -5, d->m_geometry.height() / 2 - 3, 5, 5 ) ) ).contains( p ) ) return MidLeft; - if ( TQRegion( pointArray( TQRect( -5, d->m_tqgeometry.height(), 5, 5 ) ) ).contains( p ) ) + if ( TQRegion( pointArray( TQRect( -5, d->m_geometry.height(), 5, 5 ) ) ).contains( p ) ) return BottomLeft; - if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width() / 2 - 3, - d->m_tqgeometry.height(), 5, 5 ) ) ).contains( p ) ) + if ( TQRegion( pointArray( TQRect( d->m_geometry.width() / 2 - 3, + d->m_geometry.height(), 5, 5 ) ) ).contains( p ) ) return BottomMid; - if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width(), d->m_tqgeometry.height(), 5, 5 ) ) ).contains( p ) ) + if ( TQRegion( pointArray( TQRect( d->m_geometry.width(), d->m_geometry.height(), 5, 5 ) ) ).contains( p ) ) return BottomRight; - if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width(), - d->m_tqgeometry.height() / 2 - 3, 5, 5 ) ) ).contains( p ) ) + if ( TQRegion( pointArray( TQRect( d->m_geometry.width(), + d->m_geometry.height() / 2 - 3, 5, 5 ) ) ).contains( p ) ) return MidRight; return Move; diff --git a/lib/kofficecore/KoChild.h b/lib/kofficecore/KoChild.h index b7285deb..fe345e2e 100644 --- a/lib/kofficecore/KoChild.h +++ b/lib/kofficecore/KoChild.h @@ -24,7 +24,7 @@ #include <koffice_export.h> /** - * KoChild is an abstract base class that represents the tqgeometry + * KoChild is an abstract base class that represents the geometry * associated with an embedded document. In general it handles its position * relative to the embedded document's parent. * @@ -60,7 +60,7 @@ public: virtual ~KoChild(); /** - * Sets a new tqgeometry for this child document. + * Sets a new geometry for this child document. * Use noEmit = true if you do not want the 'changed'-signal to be emitted */ void setGeometry( const TQRect &rect, bool noEmit = false ); @@ -74,7 +74,7 @@ public: * * @see #setGeometry */ - TQRect tqgeometry() const; + TQRect geometry() const; /** * @return the region of this child part relative to the @@ -189,10 +189,10 @@ public: /** * @return the contents rectangle that is visible. - * This value depends on the scaling and the tqgeometry. + * This value depends on the scaling and the geometry. * This is the value that is passed to KoDocument::paintContent. * - * @see #xScaling #tqgeometry + * @see #xScaling #geometry */ virtual TQRect contentRect() const; @@ -204,7 +204,7 @@ public: virtual TQRegion frameRegion( const TQWMatrix& matrix = TQWMatrix(), bool solid = false ) const; /** - * @return the frame tqgeometry including a border (6 pixels) as a point + * @return the frame geometry including a border (6 pixels) as a point * array with 4 points, one for each corner, transformed by given matrix. */ virtual TQPointArray framePointArray( const TQWMatrix &matrix = TQWMatrix() ) const; @@ -234,11 +234,11 @@ public: void unlock(); /** - * If the child is locked, tqgeometry changes + * If the child is locked, geometry changes * (including scaling, rotation, ...) are not backed up. * * As long as this child is locked, the backed up - * tqgeometry state can be recovered with oldPointArray. + * geometry state can be recovered with oldPointArray. * * @return true when this child is locked. * @@ -247,7 +247,7 @@ public: bool locked() const; /** - * @return the backed up tqgeometry transformed by given matrix. + * @return the backed up geometry transformed by given matrix. */ virtual TQPointArray oldPointArray( const TQWMatrix &matrix ); diff --git a/lib/kofficecore/KoContainerHandler.cpp b/lib/kofficecore/KoContainerHandler.cpp index bd4bb489..ae4dbeab 100644 --- a/lib/kofficecore/KoContainerHandler.cpp +++ b/lib/kofficecore/KoContainerHandler.cpp @@ -47,7 +47,7 @@ public: KoChild::Gadget gadget, const TQPoint& point ) : m_gadget(gadget), m_view(view), m_child(child), m_parentMatrix(matrix) { - m_geometryStart = child->tqgeometry(); + m_geometryStart = child->geometry(); m_matrix = child->matrix() * matrix; m_invertParentMatrix = matrix.invert(); @@ -84,11 +84,11 @@ KoPartResizeHandler::~KoPartResizeHandler() d=0L; } -void KoPartResizeHandler::tqrepaint(TQRegion &rgn) +void KoPartResizeHandler::repaint(TQRegion &rgn) { rgn = rgn.unite( d->m_child->frameRegion( d->m_parentMatrix, true ) ); // rgn.translate(- d->m_view->canvasXOffset(), - d->m_view->canvasYOffset()); - ((TQWidget*)target())->tqrepaint( rgn ); + ((TQWidget*)target())->repaint( rgn ); } bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev ) @@ -128,7 +128,7 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev ) d->m_child->setGeometry( TQRect( d->m_geometryStart.x() + x, d->m_geometryStart.y() + y, d->m_geometryStart.width() - x, d->m_geometryStart.height() - y ) ); - tqrepaint(rgn); + repaint(rgn); } break; case KoChild::TopMid: @@ -137,7 +137,7 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev ) d->m_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y() + y, d->m_geometryStart.width(), d->m_geometryStart.height() - y ) ); - tqrepaint(rgn); + repaint(rgn); } break; case KoChild::TopRight: @@ -147,7 +147,7 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev ) d->m_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y() + y, d->m_geometryStart.width() + x, d->m_geometryStart.height() - y ) ); - tqrepaint(rgn); + repaint(rgn); } break; case KoChild::MidLeft: @@ -156,7 +156,7 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev ) d->m_child->setGeometry( TQRect( d->m_geometryStart.x() + x, d->m_geometryStart.y(), d->m_geometryStart.width() - x, d->m_geometryStart.height() ) ); - tqrepaint(rgn); + repaint(rgn); } break; case KoChild::MidRight: @@ -165,7 +165,7 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev ) d->m_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y(), d->m_geometryStart.width() + x, d->m_geometryStart.height() ) ); - tqrepaint(rgn); + repaint(rgn); } break; case KoChild::BottomLeft: @@ -175,7 +175,7 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev ) d->m_child->setGeometry( TQRect( d->m_geometryStart.x() + x, d->m_geometryStart.y(), d->m_geometryStart.width() - x, d->m_geometryStart.height() + y ) ); - tqrepaint(rgn); + repaint(rgn); } break; case KoChild::BottomMid: @@ -184,7 +184,7 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev ) d->m_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y(), d->m_geometryStart.width(), d->m_geometryStart.height() + y ) ); - tqrepaint(rgn); + repaint(rgn); } break; case KoChild::BottomRight: @@ -194,7 +194,7 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev ) d->m_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y(), d->m_geometryStart.width() + x, d->m_geometryStart.height() + y ) ); - tqrepaint(rgn); + repaint(rgn); } break; default: @@ -214,7 +214,7 @@ public: m_parentMatrix(matrix) { m_invertParentMatrix = matrix.invert(); m_mouseDragStart = m_invertParentMatrix.map( point ); - m_geometryDragStart = m_dragChild->tqgeometry(); + m_geometryDragStart = m_dragChild->geometry(); m_rotationDragStart = m_dragChild->rotationPoint(); } ~KoPartMoveHandlerPrivate() {} @@ -263,7 +263,7 @@ bool KoPartMoveHandler::eventFilter( TQObject*, TQEvent* ev ) d->m_rotationDragStart.y() + pos.y() - d->m_mouseDragStart.y() ) ); bound = bound.unite( d->m_dragChild->frameRegion( d->m_parentMatrix, false ) ); // bound.translate(- d->m_view->canvasXOffset(), - d->m_view->canvasYOffset()); - ((TQWidget*)target())->tqrepaint( bound ); + ((TQWidget*)target())->repaint( bound ); return true; } diff --git a/lib/kofficecore/KoContainerHandler.h b/lib/kofficecore/KoContainerHandler.h index 0ea9ba35..0187128d 100644 --- a/lib/kofficecore/KoContainerHandler.h +++ b/lib/kofficecore/KoContainerHandler.h @@ -68,7 +68,7 @@ public: ~KoPartResizeHandler(); protected: - void tqrepaint(TQRegion &rgn); + void repaint(TQRegion &rgn); bool eventFilter( TQObject*, TQEvent* ); private: diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp index ecbd496f..51fd1111 100644 --- a/lib/kofficecore/KoDetailsPane.cpp +++ b/lib/kofficecore/KoDetailsPane.cpp @@ -24,7 +24,7 @@ #include <tqimage.h> #include <tqheader.h> #include <tqrect.h> -#include <tqbrush.h> +#include <brush.h> #include <tqpainter.h> #include <tqsimplerichtext.h> #include <tqevent.h> @@ -296,7 +296,7 @@ KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, KInstance* instan fileList.setAutoDelete(false); do { - TQString key = TQString("File%1").tqarg(i); + TQString key = TQString("File%1").arg(i); value = instance->config()->readPathEntry(key); if(!value.isEmpty()) { @@ -369,9 +369,9 @@ void KoRecentDocumentsPane::selectionChanged(TQListViewItem* item) KFileItem* fileItem = static_cast<KoFileListItem*>(item)->fileItem(); TQString details = "<center><table border=\"0\">"; details += i18n("File modification date and time. %1 is date time", "<tr><td><b>Modified:</b></td><td>%1</td></tr>") - .tqarg(fileItem->timeString(KIO::UDS_MODIFICATION_TIME)); + .arg(fileItem->timeString(KIO::UDS_MODIFICATION_TIME)); details += i18n("File access date and time. %1 is date time", "<tr><td><b>Accessed:</b></td><td>%1</td></tr>") - .tqarg(fileItem->timeString(KIO::UDS_ACCESS_TIME)); + .arg(fileItem->timeString(KIO::UDS_ACCESS_TIME)); details += "</table></center>"; m_detailsLabel->setText(details); } else { diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index ba3c9d54..eab229e3 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -59,7 +59,7 @@ #include <tqpainter.h> #include <tqtimer.h> #include <tqxml.h> -#include <tqlayout.h> +#include <layout.h> #include <config.h> #include <assert.h> @@ -120,7 +120,7 @@ public: } TQPtrList<KoView> m_views; - TQPtrList<KoDocumentChild> m_tqchildren; + TQPtrList<KoDocumentChild> m_children; TQPtrList<KoMainWindow> m_shells; TQValueList<TQDomDocument> m_viewBuildDocuments; @@ -271,7 +271,7 @@ KoDocument::~KoDocument() { d->m_autoSaveTimer.stop(); - TQPtrListIterator<KoDocumentChild> childIt( d->m_tqchildren ); + TQPtrListIterator<KoDocumentChild> childIt( d->m_children ); for (; childIt.current(); ++childIt ) disconnect( childIt.current(), TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotChildDestroyed() ) ); @@ -285,8 +285,8 @@ KoDocument::~KoDocument() delete d->m_startUpWidget; d->m_startUpWidget = 0; - d->m_tqchildren.setAutoDelete( true ); - d->m_tqchildren.clear(); + d->m_children.setAutoDelete( true ); + d->m_children.clear(); d->m_shells.setAutoDelete( true ); d->m_shells.clear(); @@ -401,7 +401,7 @@ bool KoDocument::saveFile() backup = url(); else backup = d->m_backupPath +"/"+url().fileName(); - backup.setPath( backup.path() + TQString::tqfromLatin1("~") ); + backup.setPath( backup.path() + TQString::fromLatin1("~") ); KFileItem item( entry, url() ); Q_ASSERT( item.name() == url().fileName() ); KIO::NetAccess::file_copy( url(), backup, item.permissions(), true /*overwrite*/, false /*resume*/, shells().current() ); @@ -418,7 +418,7 @@ bool KoDocument::saveFile() if ( !d->filterManager ) d->filterManager = new KoFilterManager( this ); - KoFilter::ConversiontqStatus status = d->filterManager->exp0rt( m_file, outputMimeType ); + KoFilter::ConversionStatus status = d->filterManager->exp0rt( m_file, outputMimeType ); ret = status == KoFilter::OK; suppressErrorDialog = (status == KoFilter::UserCancelled || status == KoFilter::BadConversionGraph ); } else { @@ -591,7 +591,7 @@ void KoDocument::setManager( KParts::PartManager *manager ) if ( manager ) { - TQPtrListIterator<KoDocumentChild> it( d->m_tqchildren ); + TQPtrListIterator<KoDocumentChild> it( d->m_children ); for (; it.current(); ++it ) if ( it.current()->document() ) manager->addPart( it.current()->document(), false ); @@ -606,7 +606,7 @@ void KoDocument::setReadWrite( bool readwrite ) for (; vIt.current(); ++vIt ) vIt.current()->updateReadWrite( readwrite ); - TQPtrListIterator<KoDocumentChild> dIt( d->m_tqchildren ); + TQPtrListIterator<KoDocumentChild> dIt( d->m_children ); for (; dIt.current(); ++dIt ) if ( dIt.current()->document() ) dIt.current()->document()->setReadWrite( readwrite ); @@ -651,7 +651,7 @@ void KoDocument::insertChild( KoDocumentChild *child ) { setModified( true ); - d->m_tqchildren.append( child ); + d->m_children.append( child ); connect( child, TQT_SIGNAL( changed( KoChild * ) ), this, TQT_SLOT( slotChildChanged( KoChild * ) ) ); @@ -681,12 +681,12 @@ void KoDocument::slotChildDestroyed() setModified( true ); const KoDocumentChild *child = static_cast<const KoDocumentChild *>( sender() ); - d->m_tqchildren.removeRef( child ); + d->m_children.removeRef( child ); } -const TQPtrList<KoDocumentChild>& KoDocument::tqchildren() const +const TQPtrList<KoDocumentChild>& KoDocument::children() const { - return d->m_tqchildren; + return d->m_children; } KParts::Part *KoDocument::hitTest( TQWidget *widget, const TQPoint &globalPos ) @@ -718,7 +718,7 @@ KoView* KoDocument::hitTestView() KoDocument* KoDocument::hitTest( const TQPoint &pos, const TQWMatrix &matrix ) { // Call KoDocumentChild::hitTest for any child document - TQPtrListIterator<KoDocumentChild> it( d->m_tqchildren ); + TQPtrListIterator<KoDocumentChild> it( d->m_children ); for (; it.current(); ++it ) { KoDocument *doc = it.current()->hitTest( pos, matrix ); @@ -732,7 +732,7 @@ KoDocument* KoDocument::hitTest( const TQPoint &pos, const TQWMatrix &matrix ) KoDocumentChild *KoDocument::child( KoDocument *doc ) { - TQPtrListIterator<KoDocumentChild> it( d->m_tqchildren ); + TQPtrListIterator<KoDocumentChild> it( d->m_children ); for (; it.current(); ++it ) if ( it.current()->document() == doc ) return it.current(); @@ -786,7 +786,7 @@ void KoDocument::paintEverything( TQPainter &painter, const TQRect &rect, bool t void KoDocument::paintChildren( TQPainter &painter, const TQRect &/*rect*/, KoView *view, double zoomX, double zoomY ) { - TQPtrListIterator<KoDocumentChild> it( d->m_tqchildren ); + TQPtrListIterator<KoDocumentChild> it( d->m_children ); for (; it.current(); ++it ) { // #### todo: paint only if child is visible inside rect @@ -863,8 +863,8 @@ bool KoDocument::isModified() const //kdDebug(30003)<<k_funcinfo<<" Modified doc='"<<url().url()<<"' extern="<<isStoredExtern()<<endl; return true; } - // Then go through internally stored tqchildren (considered to be part of this doc) - TQPtrListIterator<KoDocumentChild> it = tqchildren(); + // Then go through internally stored children (considered to be part of this doc) + TQPtrListIterator<KoDocumentChild> it = children(); for (; it.current(); ++it ) { KoDocument *doc = it.current()->document(); @@ -876,9 +876,9 @@ bool KoDocument::isModified() const bool KoDocument::saveChildren( KoStore* _store ) { - //kdDebug(30003)<<k_funcinfo<<" checking tqchildren of doc='"<<url().url()<<"'"<<endl; + //kdDebug(30003)<<k_funcinfo<<" checking children of doc='"<<url().url()<<"'"<<endl; int i = 0; - TQPtrListIterator<KoDocumentChild> it( tqchildren() ); + TQPtrListIterator<KoDocumentChild> it( children() ); for( ; it.current(); ++it ) { KoDocument* childDoc = it.current()->document(); if (childDoc && !it.current()->isDeleted()) @@ -900,8 +900,8 @@ bool KoDocument::saveChildren( KoStore* _store ) bool KoDocument::saveChildrenOasis( KoStore* store, KoXmlWriter* manifestWriter ) { - //kdDebug(30003)<<k_funcinfo<<" checking tqchildren of doc='"<<url().url()<<"'"<<endl; - TQPtrListIterator<KoDocumentChild> it( tqchildren() ); + //kdDebug(30003)<<k_funcinfo<<" checking children of doc='"<<url().url()<<"'"<<endl; + TQPtrListIterator<KoDocumentChild> it( children() ); for( ; it.current(); ++it ) { KoDocument* childDoc = it.current()->document(); if ( childDoc && !it.current()->isDeleted() ) @@ -924,9 +924,9 @@ bool KoDocument::saveExternalChildren() return true; } - //kdDebug(30003)<<k_funcinfo<<" checking tqchildren of doc='"<<url().url()<<"'"<<endl; + //kdDebug(30003)<<k_funcinfo<<" checking children of doc='"<<url().url()<<"'"<<endl; KoDocumentChild *ch; - TQPtrListIterator<KoDocumentChild> it = tqchildren(); + TQPtrListIterator<KoDocumentChild> it = children(); for (; (ch = it.current()); ++it ) { if ( !ch->isDeleted() ) @@ -935,7 +935,7 @@ bool KoDocument::saveExternalChildren() if ( doc && doc->isStoredExtern() && doc->isModified() ) { kdDebug(30003)<<" save external doc='"<<url().url()<<"'"<<endl; - doc->setDoNotSaveExtDoc(); // Only save doc + it's internal tqchildren + doc->setDoNotSaveExtDoc(); // Only save doc + it's internal children if ( !doc->save() ) return false; // error } @@ -1031,7 +1031,7 @@ bool KoDocument::saveNativeFormat( const TQString & file ) } else { - d->lastErrorMessage = i18n( "Not able to write '%1'. Partition full?" ).tqarg( "meta.xml" ); + d->lastErrorMessage = i18n( "Not able to write '%1'. Partition full?" ).arg( "meta.xml" ); delete store; return false; } @@ -1039,7 +1039,7 @@ bool KoDocument::saveNativeFormat( const TQString & file ) if ( store->open( "Thumbnails/thumbnail.png" ) ) { if ( !saveOasisPreview( store, manifestWriter ) || !store->close() ) { - d->lastErrorMessage = i18n( "Error while trying to write '%1'. Partition full?" ).tqarg( "Thumbnails/thumbnail.png" ); + d->lastErrorMessage = i18n( "Error while trying to write '%1'. Partition full?" ).arg( "Thumbnails/thumbnail.png" ); delete store; return false; } @@ -1047,7 +1047,7 @@ bool KoDocument::saveNativeFormat( const TQString & file ) } else { - d->lastErrorMessage = i18n( "Not able to write '%1'. Partition full?" ).tqarg( "Thumbnails/thumbnail.png" ); + d->lastErrorMessage = i18n( "Not able to write '%1'. Partition full?" ).arg( "Thumbnails/thumbnail.png" ); delete store; return false; } @@ -1055,7 +1055,7 @@ bool KoDocument::saveNativeFormat( const TQString & file ) // Write out manifest file if ( !oasisStore.closeManifestWriter() ) { - d->lastErrorMessage = i18n( "Error while trying to write '%1'. Partition full?" ).tqarg( "META-INF/manifest.xml" ); + d->lastErrorMessage = i18n( "Error while trying to write '%1'. Partition full?" ).arg( "META-INF/manifest.xml" ); delete store; return false; } @@ -1064,7 +1064,7 @@ bool KoDocument::saveNativeFormat( const TQString & file ) } else { - // Save internal tqchildren first since they might get a new url + // Save internal children first since they might get a new url if ( !saveChildren( store ) && !oasis ) { if ( d->lastErrorMessage.isEmpty() ) @@ -1086,7 +1086,7 @@ bool KoDocument::saveNativeFormat( const TQString & file ) } else { - d->lastErrorMessage = i18n( "Not able to write '%1'. Partition full?" ).tqarg( "maindoc.xml" ); + d->lastErrorMessage = i18n( "Not able to write '%1'. Partition full?" ).arg( "maindoc.xml" ); delete store; return false; } @@ -1146,7 +1146,7 @@ bool KoDocument::saveToStore( KoStore* _store, const TQString & _path ) else // ugly hack to pass a relative URI m_url = KURL( INTERNAL_PREFIX + _path ); - // To make the tqchildren happy cd to the correct directory + // To make the children happy cd to the correct directory _store->pushDirectory(); _store->enterDirectory( _path ); @@ -1222,7 +1222,7 @@ TQPixmap KoDocument::generatePreview( const TQSize& size ) docHeight = m_pageLayout.ptHeight / 72 * KoGlobal::dpiY(); } else { - // If we don't have a page tqlayout, just draw the top left hand corner + // If we don't have a page layout, just draw the top left hand corner docWidth = 500.0; docHeight = 500.0; } @@ -1274,7 +1274,7 @@ TQString KoDocument::autoSaveFile( const TQString & path ) const // Never saved? Use a temp file in $HOME then // Yes, two open unnamed docs will overwrite each other's autosave file, // but hmm, we can only do something if that's in the same process anyway... - TQString ret = TQDir::homeDirPath() + "/." + TQString::tqfromLatin1(instance()->instanceName()) + ".autosave" + extension; + TQString ret = TQDir::homeDirPath() + "/." + TQString::fromLatin1(instance()->instanceName()) + ".autosave" + extension; return ret; } else @@ -1297,7 +1297,7 @@ bool KoDocument::checkAutoSaveFile() TQString dateStr = date.toString(Qt::LocalDate); int res = KMessageBox::warningYesNoCancel( 0, i18n( "An autosaved file for an unnamed document exists in %1.\nThis file is dated %2\nDo you want to open it?" ) - .tqarg(asf, dateStr) ); + .arg(asf, dateStr) ); switch(res) { case KMessageBox::Yes : { KURL url; @@ -1349,7 +1349,7 @@ bool KoDocument::openURL( const KURL & _url ) // Reimplemented, to add a check for autosave files and to improve error reporting if ( !_url.isValid() ) { - d->lastErrorMessage = i18n( "Malformed URL\n%1" ).tqarg( _url.url() ); // ## used anywhere ? + d->lastErrorMessage = i18n( "Malformed URL\n%1" ).arg( _url.url() ); // ## used anywhere ? return false; } if ( !closeURL() ) @@ -1408,7 +1408,7 @@ bool KoDocument::openFile() TQApplication::restoreOverrideCursor(); if ( d->m_autoErrorHandlingEnabled ) // Maybe offer to create a new document with that name ? - KMessageBox::error(0L, i18n("The file %1 does not exist.").tqarg(m_file) ); + KMessageBox::error(0L, i18n("The file %1 does not exist.").arg(m_file) ); d->m_bLoading = false; return false; } @@ -1456,7 +1456,7 @@ bool KoDocument::openFile() if ( !isNativeFormat( typeName.latin1() ) ) { if ( !d->filterManager ) d->filterManager = new KoFilterManager( this ); - KoFilter::ConversiontqStatus status; + KoFilter::ConversionStatus status; importedFile = d->filterManager->import( m_file, status ); if ( status != KoFilter::OK ) { @@ -1516,7 +1516,7 @@ bool KoDocument::openFile() { TQString errorMsg( i18n( "Could not open\n%2.\nReason: %1" ) ); TQString docUrl = url().prettyURL( 0, KURL::StripFileProtocol ); - KMessageBox::error( 0L, errorMsg.tqarg(msg).tqarg(docUrl) ); + KMessageBox::error( 0L, errorMsg.arg(msg).arg(docUrl) ); } d->m_bLoading = false; @@ -1623,7 +1623,7 @@ bool KoDocument::oldLoadAndParse(KoStore* store, const TQString& filename, TQDom if (!store->open(filename)) { kdWarning(30003) << "Entry " << filename << " not found!" << endl; - d->lastErrorMessage = i18n( "Could not find %1" ).tqarg( filename ); + d->lastErrorMessage = i18n( "Could not find %1" ).arg( filename ); return false; } // Error variables for TQDomDocument::setContent @@ -1636,8 +1636,8 @@ bool KoDocument::oldLoadAndParse(KoStore* store, const TQString& filename, TQDom << " In line: " << errorLine << ", column: " << errorColumn << endl << " Error message: " << errorMsg << endl; d->lastErrorMessage = i18n( "Parsing error in %1 at line %2, column %3\nError message: %4" ) - .tqarg( filename ).tqarg( errorLine ).tqarg( errorColumn ) - .tqarg( i18n ( "TQXml", errorMsg.utf8() ) ); + .arg( filename ).arg( errorLine ).arg( errorColumn ) + .arg( i18n ( "TQXml", errorMsg.utf8() ) ); store->close(); return false; } @@ -1650,12 +1650,12 @@ bool KoDocument::loadNativeFormat( const TQString & file ) TQFileInfo fileInfo( file ); if ( !fileInfo.exists() ) // check duplicated from openURL, but this is useful for templates { - d->lastErrorMessage = i18n("The file %1 does not exist.").tqarg(file); + d->lastErrorMessage = i18n("The file %1 does not exist.").arg(file); return false; } if ( !fileInfo.isFile() ) { - d->lastErrorMessage = i18n( "%1 is not a file." ).tqarg(file); + d->lastErrorMessage = i18n( "%1 is not a file." ).arg(file); return false; } @@ -1733,7 +1733,7 @@ bool KoDocument::loadNativeFormat( const TQString & file ) << " Line: " << errorLine << " Column: " << errorColumn << endl << " Message: " << errorMsg << endl; d->lastErrorMessage = i18n( "parsing error in the main document at line %1, column %2\nError message: %3" ) - .tqarg( errorLine ).tqarg( errorColumn ).tqarg( i18n ( errorMsg.utf8() ) ); + .arg( errorLine ).arg( errorColumn ).arg( i18n ( errorMsg.utf8() ) ); res=false; } @@ -1756,7 +1756,7 @@ bool KoDocument::loadNativeFormatFromStore( const TQString& file ) if ( store->bad() ) { - d->lastErrorMessage = i18n( "Not a valid KOffice file: %1" ).tqarg( file ); + d->lastErrorMessage = i18n( "Not a valid KOffice file: %1" ).arg( file ); delete store; TQApplication::restoreOverrideCursor(); return false; @@ -1795,7 +1795,7 @@ bool KoDocument::loadNativeFormatFromStore( const TQString& file ) if ( !loadChildren( store ) ) { - kdError(30003) << "ERROR: Could not load tqchildren" << endl; + kdError(30003) << "ERROR: Could not load children" << endl; // Don't abort, proceed nonetheless } @@ -1865,7 +1865,7 @@ bool KoDocument::loadFromStore( KoStore* _store, const TQString& url ) if ( !loadChildren( _store ) ) { - kdError(30003) << "ERROR: Could not load tqchildren" << endl; + kdError(30003) << "ERROR: Could not load children" << endl; #if 0 return false; #endif @@ -1967,7 +1967,7 @@ void KoDocument::setModified( bool mod ) m_bEmpty = FALSE; } else { // When saving this document, all non-external child documents get saved too. - TQPtrListIterator<KoDocumentChild> it = tqchildren(); + TQPtrListIterator<KoDocumentChild> it = children(); for (; it.current(); ++it ) { KoDocument *doc = it.current()->document(); @@ -2002,7 +2002,7 @@ int KoDocument::queryCloseDia() name = i18n( "Untitled" ); int res = KMessageBox::warningYesNoCancel( 0L, - i18n( "<p>The document <b>'%1'</b> has been modified.</p><p>Do you want to save it?</p>" ).tqarg(name)); + i18n( "<p>The document <b>'%1'</b> has been modified.</p><p>Do you want to save it?</p>" ).arg(name)); switch(res) { @@ -2023,9 +2023,9 @@ int KoDocument::queryCloseDia() int KoDocument::queryCloseExternalChildren() { - //kdDebug(30003)<<k_funcinfo<<" checking for tqchildren in: "<<url().url()<<endl; + //kdDebug(30003)<<k_funcinfo<<" checking for children in: "<<url().url()<<endl; setDoNotSaveExtDoc(false); - TQPtrListIterator<KoDocumentChild> it( tqchildren() ); + TQPtrListIterator<KoDocumentChild> it( children() ); for (; it.current(); ++it ) { if ( !it.current()->isDeleted() ) @@ -2082,7 +2082,7 @@ void KoDocument::setTitleModified() // Get caption from document info (title(), in about page) if ( documentInfo() ) { - KoDocumentInfoPage * page = documentInfo()->page( TQString::tqfromLatin1("about") ); + KoDocumentInfoPage * page = documentInfo()->page( TQString::fromLatin1("about") ); if (page) caption = static_cast<KoDocumentInfoAbout *>(page)->title(); } @@ -2133,12 +2133,12 @@ TQDomDocument KoDocument::createDomDocument( const TQString& tagName, const TQSt TQDomDocument KoDocument::createDomDocument( const TQString& appName, const TQString& tagName, const TQString& version ) { TQDomImplementation impl; - TQString url = TQString("http://www.koffice.org/DTD/%1-%1.dtd").tqarg(appName).tqarg(version); + TQString url = TQString("http://www.koffice.org/DTD/%1-%1.dtd").arg(appName).arg(version); TQDomDocumentType dtype = impl.createDocumentType( tagName, - TQString("-//KDE//DTD %1 %1//EN").tqarg(appName).tqarg(version), + TQString("-//KDE//DTD %1 %1//EN").arg(appName).arg(version), url ); // The namespace URN doesn't need to include the version number. - TQString namespaceURN = TQString("http://www.koffice.org/DTD/%1").tqarg(appName); + TQString namespaceURN = TQString("http://www.koffice.org/DTD/%1").arg(appName); TQDomDocument doc = impl.createDocument( namespaceURN, tagName, dtype ); doc.insertBefore( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ), doc.documentElement() ); return doc; @@ -2233,7 +2233,7 @@ KService::Ptr KoDocument::readNativeService( KInstance *instance ) // Try by path first, so that we find the global one (which has the native mimetype) // even if the user created a kword.desktop in ~/.kde/share/applnk or any subdir of it. // If he created it under ~/.kde/share/applnk/Office/ then no problem anyway. - service = KService::serviceByDesktopPath( TQString::tqfromLatin1("Office/%1.desktop").tqarg(instname) ); + service = KService::serviceByDesktopPath( TQString::fromLatin1("Office/%1.desktop").arg(instname) ); } if ( !service ) service = KService::serviceByDesktopName( instname ); @@ -2364,11 +2364,11 @@ void KoDocument::showSavingErrorDialog() { if ( d->lastErrorMessage.isEmpty() ) { - KMessageBox::error( 0L, i18n( "Could not save\n%1" ).tqarg( m_file ) ); + KMessageBox::error( 0L, i18n( "Could not save\n%1" ).arg( m_file ) ); } else if ( d->lastErrorMessage != "USER_CANCELED" ) { - KMessageBox::error( 0L, i18n( "Could not save %1\nReason: %2" ).tqarg( m_file, d->lastErrorMessage ) ); + KMessageBox::error( 0L, i18n( "Could not save %1\nReason: %2" ).arg( m_file, d->lastErrorMessage ) ); } } @@ -2376,11 +2376,11 @@ void KoDocument::showLoadingErrorDialog() { if ( d->lastErrorMessage.isEmpty() ) { - KMessageBox::error( 0L, i18n( "Could not open\n%1" ).tqarg( url().prettyURL( 0, KURL::StripFileProtocol ) ) ); + KMessageBox::error( 0L, i18n( "Could not open\n%1" ).arg( url().prettyURL( 0, KURL::StripFileProtocol ) ) ); } else if ( d->lastErrorMessage != "USER_CANCELED" ) { - KMessageBox::error( 0L, i18n( "Could not open %1\nReason: %2" ).tqarg( url().prettyURL( 0, KURL::StripFileProtocol ), d->lastErrorMessage ) ); + KMessageBox::error( 0L, i18n( "Could not open %1\nReason: %2" ).arg( url().prettyURL( 0, KURL::StripFileProtocol ), d->lastErrorMessage ) ); } } @@ -2656,7 +2656,7 @@ bool KoDocument::showEmbedInitDialog(TQWidget* parent) { KDialogBase dlg(parent, "EmbedInitDialog", true, i18n("Embedding Object"), 0, KDialogBase::NoDefault); KoOpenPane* pane = createOpenPane(&dlg, instance(), templateType()); - pane->tqlayout()->setMargin(0); + pane->layout()->setMargin(0); dlg.setMainWidget(pane); dlg.setInitialSize(dlg.configDialogSize("EmbedInitDialog")); connect(this, TQT_SIGNAL(closeEmbedInitDialog()), &dlg, TQT_SLOT(slotOk())); diff --git a/lib/kofficecore/KoDocument.h b/lib/kofficecore/KoDocument.h index ac6de7e8..1a5d0805 100644 --- a/lib/kofficecore/KoDocument.h +++ b/lib/kofficecore/KoDocument.h @@ -385,7 +385,7 @@ public: * @param painter The painter object onto which will be drawn. * @param rect The rect that should be used in the painter object. * @param transparent If true then the entire rectangle is erased before painting. - * @param view The KoView is needed to fiddle about with the active widget, when painting tqchildren. + * @param view The KoView is needed to fiddle about with the active widget, when painting children. * @param zoomX The zoom value to be applied to X coordinates when painting. * @param zoomY The zoom value to be applied to Y coordinates when painting. */ @@ -399,7 +399,7 @@ public: virtual TQPixmap generatePreview( const TQSize& size ); /** - * Paints all of the documents tqchildren into the given painter object. + * Paints all of the documents children into the given painter object. * * @param painter The painter object onto which will be drawn. * @param rect The rect that should be used in the painter object. @@ -427,7 +427,7 @@ public: /** * Paints the data itself. Normally called by paintEverything(). It does not - * paint the tqchildren. + * paint the children. * It's this method that %KOffice Parts have to implement. * * @param painter The painter object onto which will be drawn. @@ -659,17 +659,17 @@ public: static int defaultAutoSave() { return s_defaultAutoSave; } /** - * @return the list of all tqchildren. Do not modify the + * @return the list of all children. Do not modify the * returned list. */ - const TQPtrList<KoDocumentChild>& tqchildren() const; + const TQPtrList<KoDocumentChild>& children() const; /** * @return the KoDocumentChild associated with the given Document, but only if * @p doc is a direct child of this document. * * This is a convenience function. You could get the same result - * by traversing the list returned by tqchildren(). + * by traversing the list returned by children(). */ KoDocumentChild *child( KoDocument *doc ); @@ -741,7 +741,7 @@ public: virtual bool isStoredExtern() const; /** - * @return the page tqlayout associated with this document (margins, pageSize, etc). + * @return the page layout associated with this document (margins, pageSize, etc). * Override this if you want to provide different sized pages. * * @see KoPageLayout @@ -771,14 +771,14 @@ public: int queryCloseDia(); /** - * @brief Set when we do not want to save external tqchildren when saving our 'main' doc. + * @brief Set when we do not want to save external children when saving our 'main' doc. * - * This makes it possible to save 'main' doc + all its internal tqchildren first, then - * go on to save external tqchildren. Typically used by query close. + * This makes it possible to save 'main' doc + all its internal children first, then + * go on to save external children. Typically used by query close. * Use: * @code * doc->setDoNotSaveExtDoc(); - * doc->save(); // saves doc and its internal tqchildren, + * doc->save(); // saves doc and its internal children, * //also calls saveExternalChildren() which sets setDoNotSaveExtDoc(false) * doc->saveExternalChildren(); * @endcode @@ -1029,7 +1029,7 @@ protected: * * An example implementation may look like this: * @code - * TQPtrListIterator<KoDocumentChild> it( tqchildren() ); + * TQPtrListIterator<KoDocumentChild> it( children() ); * for( ; it.current(); ++it ) * { * if ( !it.current()->loadDocument( _store ) ) @@ -1043,16 +1043,16 @@ protected: virtual bool loadChildren( KoStore* ); /** - * Saves all internal tqchildren (only!). - * @see saveExternalChildren if you have external tqchildren. + * Saves all internal children (only!). + * @see saveExternalChildren if you have external children. * Returns true on success. */ virtual bool saveChildren( KoStore* store ); /** - * Saves all internal tqchildren (only!), to the store, using the OASIS format. + * Saves all internal children (only!), to the store, using the OASIS format. * This is called automatically during saveNativeFormat. - * @see saveExternalChildren if you have external tqchildren. + * @see saveExternalChildren if you have external children. * Returns true on success. */ virtual bool saveChildrenOasis( KoStore* store, KoXmlWriter* manifestWriter ); @@ -1077,7 +1077,7 @@ protected: virtual bool completeSaving( KoStore* store ); /** - * Inserts the new child in the list of tqchildren and emits the + * Inserts the new child in the list of children and emits the * childChanged() signal. * * At the same time this method marks this document as modified. @@ -1098,9 +1098,9 @@ protected: KoPageLayout m_pageLayout; /** - * Saves all externally stored tqchildren. + * Saves all externally stored children. * Returns true on success. - * @see #saveChildren for internal tqchildren + * @see #saveChildren for internal children */ virtual bool saveExternalChildren(); diff --git a/lib/kofficecore/KoDocumentChild.cpp b/lib/kofficecore/KoDocumentChild.cpp index 0767ab04..c71c7609 100644 --- a/lib/kofficecore/KoDocumentChild.cpp +++ b/lib/kofficecore/KoDocumentChild.cpp @@ -67,13 +67,13 @@ public: bool m_deleted; }; -KoDocumentChild::KoDocumentChild( KoDocument* parent, KoDocument* doc, const TQRect& tqgeometry ) +KoDocumentChild::KoDocumentChild( KoDocument* parent, KoDocument* doc, const TQRect& geometry ) : KoChild( parent ) { d = new KoDocumentChildPrivate; d->m_parent = parent; d->m_doc = doc; - setGeometry( tqgeometry ); + setGeometry( geometry ); d->m_deleted = false; if ( doc ) doc->setStoreInternal( !doc->hasExternURL() ); @@ -88,11 +88,11 @@ KoDocumentChild::KoDocumentChild( KoDocument* parent ) d->m_deleted = false; } -void KoDocumentChild::setDocument( KoDocument *doc, const TQRect &tqgeometry ) +void KoDocumentChild::setDocument( KoDocument *doc, const TQRect &geometry ) { kdDebug()<<k_funcinfo<<"doc: "<<doc->url().url()<<endl; d->m_doc = doc; - setGeometry( tqgeometry ); + setGeometry( geometry ); updateMatrix(); } @@ -213,7 +213,7 @@ bool KoDocumentChild::loadDocument( KoStore* store ) KMimeType::Ptr mime = KMimeType::mimeType( m_tmpMimeType ); if ( mime->name() != KMimeType::defaultMimeType() ) mimeName = mime->comment(); - d->m_doc->setProperty( "unavailReason", i18n( "No handler found for %1" ).tqarg( mimeName ) ); + d->m_doc->setProperty( "unavailReason", i18n( "No handler found for %1" ).arg( mimeName ) ); } return res; } @@ -252,7 +252,7 @@ bool KoDocumentChild::loadOasisDocument( KoStore* store, const TQDomDocument& ma KMimeType::Ptr mime = KMimeType::mimeType( mimeType ); if ( mime->name() != KMimeType::defaultMimeType() ) mimeName = mime->comment(); - d->m_doc->setProperty( "unavailReason", i18n( "No handler found for %1" ).tqarg( mimeName ) ); + d->m_doc->setProperty( "unavailReason", i18n( "No handler found for %1" ).arg( mimeName ) ); } return res; } @@ -306,7 +306,7 @@ bool KoDocumentChild::loadDocumentInternal( KoStore* store, const KoDocumentEntr TQApplication::restoreOverrideCursor(); // For security reasons we need to ask confirmation if the url is remote int result = KMessageBox::warningYesNoCancel( - 0, i18n( "This document contains an external link to a remote document\n%1").tqarg(m_tmpURL), + 0, i18n( "This document contains an external link to a remote document\n%1").arg(m_tmpURL), i18n( "Confirmation Required" ), i18n( "Download" ), i18n( "Skip" ) ); if ( result == KMessageBox::Cancel ) @@ -335,9 +335,9 @@ bool KoDocumentChild::loadDocumentInternal( KoStore* store, const KoDocumentEntr d->m_doc->setProperty( "realURL", tmpURL ); // so that it gets saved correctly d->m_doc->setStoreInternal( true ); if ( internalURL ) - d->m_doc->setProperty( "unavailReason", i18n( "Could not load embedded object:\n%1" ).tqarg( errorMessage ) ); + d->m_doc->setProperty( "unavailReason", i18n( "Could not load embedded object:\n%1" ).arg( errorMessage ) ); else - d->m_doc->setProperty( "unavailReason", i18n( "Could not load external document %1:\n%2" ).tqarg( tmpURL, errorMessage ) ); + d->m_doc->setProperty( "unavailReason", i18n( "Could not load external document %1:\n%2" ).arg( tmpURL, errorMessage ) ); } return res; } @@ -409,7 +409,7 @@ bool KoDocumentChild::saveOasis( KoStore* store, KoXmlWriter* manifestWriter ) } else { - // To make the tqchildren happy cd to the correct directory + // To make the children happy cd to the correct directory store->pushDirectory(); store->enterDirectory( name ); @@ -454,7 +454,7 @@ void KoDocumentChild::saveOasisAttributes( KoXmlWriter &xmlWriter, const TQStrin d->m_doc->setURL( u ); } - //<draw:object draw:style-name="standard" draw:id="1" draw:layer="tqlayout" svg:width="14.973cm" svg:height="4.478cm" svg:x="11.641cm" svg:y="14.613cm" xlink:href="#./Object 1" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/> + //<draw:object draw:style-name="standard" draw:id="1" draw:layer="layout" svg:width="14.973cm" svg:height="4.478cm" svg:x="11.641cm" svg:y="14.613cm" xlink:href="#./Object 1" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/> xmlWriter.addAttribute( "xlink:type", "simple" ); xmlWriter.addAttribute( "xlink:show", "embed" ); xmlWriter.addAttribute( "xlink:actuate", "onLoad" ); @@ -480,10 +480,10 @@ TQDomElement KoDocumentChild::save( TQDomDocument& doc, bool uppercase ) e.setAttribute( "mime", d->m_doc->nativeFormatMimeType().data() ); kdDebug() << "KoDocumentChild::save mime=" << d->m_doc->nativeFormatMimeType() << endl; TQDomElement rect = doc.createElement( ( uppercase ? "RECT" : "rect" ) ); - rect.setAttribute( "x", tqgeometry().left() ); - rect.setAttribute( "y", tqgeometry().top() ); - rect.setAttribute( "w", tqgeometry().width() ); - rect.setAttribute( "h", tqgeometry().height() ); + rect.setAttribute( "x", geometry().left() ); + rect.setAttribute( "y", geometry().top() ); + rect.setAttribute( "w", geometry().width() ); + rect.setAttribute( "h", geometry().height() ); e.appendChild(rect); return e; } diff --git a/lib/kofficecore/KoDocumentChild.h b/lib/kofficecore/KoDocumentChild.h index de3704c0..50029cee 100644 --- a/lib/kofficecore/KoDocumentChild.h +++ b/lib/kofficecore/KoDocumentChild.h @@ -45,7 +45,7 @@ class KOFFICECORE_EXPORT KoDocumentChild : public KoChild Q_OBJECT TQ_OBJECT public: - KoDocumentChild( KoDocument* parent, KoDocument* doc, const TQRect& tqgeometry ); + KoDocumentChild( KoDocument* parent, KoDocument* doc, const TQRect& geometry ); /** * When using this constructor you must call @ref #setDocument before @@ -59,7 +59,7 @@ public: * Call this function only directly after calling the constructor * that takes only a parent as argument. */ - virtual void setDocument( KoDocument *doc, const TQRect &tqgeometry ); + virtual void setDocument( KoDocument *doc, const TQRect &geometry ); /** * @return document contained in this child diff --git a/lib/kofficecore/KoDocumentInfo.cpp b/lib/kofficecore/KoDocumentInfo.cpp index cd4ecbaf..1c9400c6 100644 --- a/lib/kofficecore/KoDocumentInfo.cpp +++ b/lib/kofficecore/KoDocumentInfo.cpp @@ -122,7 +122,7 @@ bool KoDocumentInfo::saveOasis( KoStore* store ) xmlWriter->startElement( "office:meta" ); xmlWriter->startElement( "meta:generator"); - xmlWriter->addTextNode( TQString( "KOffice/%1" ).tqarg( KOFFICE_VERSION_STRING ) ); + xmlWriter->addTextNode( TQString( "KOffice/%1" ).arg( KOFFICE_VERSION_STRING ) ); xmlWriter->endElement(); TQStringList lst = pages(); TQStringList::ConstIterator it = lst.begin(); @@ -232,7 +232,7 @@ void KoDocumentInfoAuthor::initParameters() m_emailCfg = new KConfig( "emaildefaults", true ); m_emailCfg->setGroup( "Defaults" ); TQString group = m_emailCfg->readEntry("Profile","Default"); - m_emailCfg->setGroup(TQString("PROFILE_%1").tqarg(group)); + m_emailCfg->setGroup(TQString("PROFILE_%1").arg(group)); if ( m_fullName.isNull() ) // only if null. Empty means the user made it explicitly empty. { @@ -629,7 +629,7 @@ KoDocumentInfoAbout::KoDocumentInfoAbout( KoDocumentInfo* info ) m_docInfo = info; m_editingCycles = 0; m_initialCreator = m_docInfo->creator(); - m_creationDate = TQDateTime::tqcurrentDateTime(); + m_creationDate = TQDateTime::currentDateTime(); } void KoDocumentInfoAbout::saveParameters() @@ -637,7 +637,7 @@ void KoDocumentInfoAbout::saveParameters() KoDocument* doc = dynamic_cast< KoDocument* >( m_docInfo->parent() ); if ( m_firstSave && doc && !doc->isAutosaving() ) m_editingCycles++; - m_modificationDate = TQDateTime::tqcurrentDateTime(); + m_modificationDate = TQDateTime::currentDateTime(); m_firstSave = false; } @@ -878,7 +878,7 @@ void KoDocumentInfoAbout::resetMetaData() { m_editingCycles = 0; m_initialCreator = m_docInfo->creator(); - m_creationDate = TQDateTime::tqcurrentDateTime(); + m_creationDate = TQDateTime::currentDateTime(); m_modificationDate = TQDateTime(); } diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp index 5973dbb4..a4aa21fc 100644 --- a/lib/kofficecore/KoDocumentInfoDlg.cpp +++ b/lib/kofficecore/KoDocumentInfoDlg.cpp @@ -49,7 +49,7 @@ #include <kdebug.h> #include <ktempfile.h> #include <kmimetype.h> -#include <tqlayout.h> +#include <layout.h> #include <klistview.h> #include <tqgrid.h> #include <tqmap.h> @@ -191,7 +191,7 @@ void KoDocumentInfoDlg::deleteInfo() void KoDocumentInfoDlg::resetMetaData() { - TQString s = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ); + TQString s = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ); d->m_aboutWidget->labelCreated->setText( s + ", " + d->m_info->creator() ); d->m_aboutWidget->labelModified->setText( "" ); d->m_aboutWidget->labelRevision->setText( "0" ); diff --git a/lib/kofficecore/KoFileDialog.cpp b/lib/kofficecore/KoFileDialog.cpp index 2a7bd315..1c3a7fcb 100644 --- a/lib/kofficecore/KoFileDialog.cpp +++ b/lib/kofficecore/KoFileDialog.cpp @@ -90,9 +90,9 @@ void KoFileDialog::setSpecialMimeFilter( TQStringList& mimeFilter, int idx = 1; // 0 is the native format if ( addUncompressed ) - filterWidget->changeItem( i18n("%1 (Uncompressed XML Files)").tqarg( type->comment() ), idx++ ); + filterWidget->changeItem( i18n("%1 (Uncompressed XML Files)").arg( type->comment() ), idx++ ); if ( addFlatXML ) - filterWidget->changeItem( i18n("%1 (Flat XML File)").tqarg( type->comment() ), idx++ ); + filterWidget->changeItem( i18n("%1 (Flat XML File)").arg( type->comment() ), idx++ ); // if you add an entry here, update numSpecialEntries above and specialEntrySelected() below // For native format... @@ -109,7 +109,7 @@ void KoFileDialog::setSpecialMimeFilter( TQStringList& mimeFilter, KMimeType::Ptr mime = KMimeType::mimeType (*mimeFilterIt); TQString compatString = mime->property ("X-KDE-CompatibleApplication").toString (); if (!compatString.isEmpty ()) - filterWidget->changeItem (i18n ("%1 (%2 Compatible)").tqarg (mime->comment ()).tqarg (compatString), i); + filterWidget->changeItem (i18n ("%1 (%2 Compatible)").arg (mime->comment ()).arg (compatString), i); } } diff --git a/lib/kofficecore/KoFilter.cpp b/lib/kofficecore/KoFilter.cpp index 628d5f17..1e5beb47 100644 --- a/lib/kofficecore/KoFilter.cpp +++ b/lib/kofficecore/KoFilter.cpp @@ -54,7 +54,7 @@ TQString KoEmbeddingFilter::mimeTypeByExtension( const TQString& extension ) // We need to resort to an ugly hack to determine the mimetype // from the extension, as kservicetypefactory.h isn't installed KURL url; - url.setPath( TQString( "dummy.%1" ).tqarg( extension ) ); + url.setPath( TQString( "dummy.%1" ).arg( extension ) ); KMimeType::Ptr m( KMimeType::findByURL( url, 0, true, true ) ); return m->name(); } @@ -65,7 +65,7 @@ KoEmbeddingFilter::KoEmbeddingFilter() : KoFilter() } int KoEmbeddingFilter::embedPart( const TQCString& from, TQCString& to, - KoFilter::ConversiontqStatus& status, const TQString& key ) + KoFilter::ConversionStatus& status, const TQString& key ) { ++( m_partStack.top()->m_lruPartIndex ); diff --git a/lib/kofficecore/KoFilter.h b/lib/kofficecore/KoFilter.h index 77439648..cafad774 100644 --- a/lib/kofficecore/KoFilter.h +++ b/lib/kofficecore/KoFilter.h @@ -61,7 +61,7 @@ public: * Feel free to add some more error conditions @em before the last item * if it's needed. */ - enum ConversiontqStatus { OK, StupidError, UsageError, CreationError, FileNotFound, + enum ConversionStatus { OK, StupidError, UsageError, CreationError, FileNotFound, StorageCreationError, BadMimeType, BadConversionGraph, EmbeddedDocError, WrongFormat, NotImplemented, ParsingError, InternalError, UnexpectedEOF, @@ -79,10 +79,10 @@ public: * * @param from The mimetype of the source file/document * @param to The mimetype of the destination file/document - * @return The error status, see the @ref #ConversiontqStatus enum. + * @return The error status, see the @ref #ConversionStatus enum. * KoFilter::OK means that everything is alright. */ - virtual ConversiontqStatus convert( const TQCString& from, const TQCString& to ) = 0; + virtual ConversionStatus convert( const TQCString& from, const TQCString& to ) = 0; signals: /** @@ -201,7 +201,7 @@ protected: * within the embedding filter). */ int embedPart( const TQCString& from, TQCString& to, - KoFilter::ConversiontqStatus& status, + KoFilter::ConversionStatus& status, const TQString& key = TQString() ); /** @@ -262,7 +262,7 @@ private: /** * This struct keeps track of the last used index for a - * child part and all references to existing tqchildren + * child part and all references to existing children * We use it to build a whole stack, one PartState per * embedding level. * @internal diff --git a/lib/kofficecore/KoFilterChain.cpp b/lib/kofficecore/KoFilterChain.cpp index 471d6098..62d93aa5 100644 --- a/lib/kofficecore/KoFilterChain.cpp +++ b/lib/kofficecore/KoFilterChain.cpp @@ -46,7 +46,7 @@ KoFilterChain::ChainLink::ChainLink( KoFilterChain* chain, KoFilterEntry::Ptr fi { } -KoFilter::ConversiontqStatus KoFilterChain::ChainLink::invokeFilter( const ChainLink* const parentChainLink ) +KoFilter::ConversionStatus KoFilterChain::ChainLink::invokeFilter( const ChainLink* const parentChainLink ) { if ( !m_filterEntry ) { kdError( 30500 ) << "This filter entry is null. Strange stuff going on." << endl; @@ -63,7 +63,7 @@ KoFilter::ConversiontqStatus KoFilterChain::ChainLink::invokeFilter( const Chain if ( parentChainLink ) setupCommunication( parentChainLink->m_filter ); - KoFilter::ConversiontqStatus status = m_filter->convert( m_from, m_to ); + KoFilter::ConversionStatus status = m_filter->convert( m_from, m_to ); delete m_filter; m_filter=0; return status; @@ -90,8 +90,8 @@ void KoFilterChain::ChainLink::setupCommunication( const KoFilter* const parentF if ( !parentFilter ) return; - const TQMetaObject* const parent = parentFilter->tqmetaObject(); - const TQMetaObject* const child = m_filter->tqmetaObject(); + const TQMetaObject* const parent = parentFilter->metaObject(); + const TQMetaObject* const child = m_filter->metaObject(); if ( !parent || !child ) return; @@ -131,9 +131,9 @@ KoFilterChain::~KoFilterChain() manageIO(); // Called for the 2nd time in a row -> clean up } -KoFilter::ConversiontqStatus KoFilterChain::invokeChain() +KoFilter::ConversionStatus KoFilterChain::invokeChain() { - KoFilter::ConversiontqStatus status = KoFilter::OK; + KoFilter::ConversionStatus status = KoFilter::OK; m_state = Beginning; int count = m_chainLinks.count(); @@ -568,7 +568,7 @@ KoStoreDevice* KoFilterChain::storageInitEmbedding( const TQString& name ) return storageCleanupHelper( &m_outputStorage ); } - if ( !m_outputStorage->enterDirectory( TQString( "part%1" ).tqarg( lruPartIndex ) ) ) + if ( !m_outputStorage->enterDirectory( TQString( "part%1" ).arg( lruPartIndex ) ) ) return storageCleanupHelper( &m_outputStorage ); return storageCreateFirstStream( name, &m_outputStorage, &m_outputStorageDevice ); diff --git a/lib/kofficecore/KoFilterChain.h b/lib/kofficecore/KoFilterChain.h index d926c613..a044eebe 100644 --- a/lib/kofficecore/KoFilterChain.h +++ b/lib/kofficecore/KoFilterChain.h @@ -69,7 +69,7 @@ public: * @return The return status of the conversion. KoFilter::OK * if everything is alright. */ - KoFilter::ConversiontqStatus invokeChain(); + KoFilter::ConversionStatus invokeChain(); /** * Tells the @ref KoFilterManager the output file of the @@ -182,7 +182,7 @@ private: ChainLink( KoFilterChain* chain, KoFilterEntry::Ptr filterEntry, const TQCString& from, const TQCString& to ); - KoFilter::ConversiontqStatus invokeFilter( const ChainLink* const parentChainLink ); + KoFilter::ConversionStatus invokeFilter( const ChainLink* const parentChainLink ); TQCString from() const { return m_from; } TQCString to() const { return m_to; } diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp index 31a1e43e..2b44459c 100644 --- a/lib/kofficecore/KoFilterManager.cpp +++ b/lib/kofficecore/KoFilterManager.cpp @@ -25,7 +25,7 @@ #include <tqfile.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqptrlist.h> #include <tqapplication.h> @@ -59,13 +59,13 @@ KoFilterChooser::KoFilterChooser (TQWidget *parent, const TQStringList &mimeType setMainWidget (page); // looks too squashed together without * 2 - TQVBoxLayout *tqlayout = new TQVBoxLayout (page, marginHint (), spacingHint () * 2); + TQVBoxLayout *layout = new TQVBoxLayout (page, marginHint (), spacingHint () * 2); TQLabel *filterLabel = new TQLabel (i18n ("Select a filter:"), page, "filterlabel"); - tqlayout->addWidget (filterLabel); + layout->addWidget (filterLabel); m_filterList = new KListBox (page, "filterlist"); - tqlayout->addWidget (m_filterList); + layout->addWidget (m_filterList); Q_ASSERT (!m_mimeTypes.isEmpty ()); for (TQStringList::ConstIterator it = m_mimeTypes.begin (); @@ -138,7 +138,7 @@ KoFilterManager::~KoFilterManager() delete d; } -TQString KoFilterManager::import( const TQString& url, KoFilter::ConversiontqStatus& status ) +TQString KoFilterManager::import( const TQString& url, KoFilter::ConversionStatus& status ) { // Find the mime type for the file to be imported. KURL u; @@ -231,7 +231,7 @@ TQString KoFilterManager::import( const TQString& url, KoFilter::ConversiontqSta return TQString(); } -KoFilter::ConversiontqStatus KoFilterManager::exp0rt( const TQString& url, TQCString& mimeType ) +KoFilter::ConversionStatus KoFilterManager::exp0rt( const TQString& url, TQCString& mimeType ) { bool userCancelled = false; @@ -482,7 +482,7 @@ TQStringList KoFilterManager::mimeFilter( const TQCString& mimetype, Direction d // TODO maybe use the fake vertex trick from the method below, to make the search faster? TQStringList nativeMimeTypes; - nativeMimeTypes.append( TQString::tqfromLatin1( mimetype ) ); + nativeMimeTypes.append( TQString::fromLatin1( mimetype ) ); nativeMimeTypes += extraNativeMimeTypes; // Add the native mimetypes first so that they are on top. @@ -583,7 +583,7 @@ bool KoFilterManager::filterAvailable( KoFilterEntry::Ptr entry ) void KoFilterManager::importErrorHelper( const TQString& mimeType, const bool suppressDialog ) { - TQString tmp = i18n("Could not import file of type\n%1").tqarg( mimeType ); + TQString tmp = i18n("Could not import file of type\n%1").arg( mimeType ); // ###### FIXME: use KLibLoader::lastErrorMessage() here if (!suppressDialog) KMessageBox::error( 0L, tmp, i18n("Missing Import Filter") ); } diff --git a/lib/kofficecore/KoFilterManager.h b/lib/kofficecore/KoFilterManager.h index 5f0641f4..11158012 100644 --- a/lib/kofficecore/KoFilterManager.h +++ b/lib/kofficecore/KoFilterManager.h @@ -81,7 +81,7 @@ public: * If the TQString which is returned isEmpty() and the status is OK, * then we imported the file directly into the document. */ - TQString import( const TQString& url, KoFilter::ConversiontqStatus& status ); + TQString import( const TQString& url, KoFilter::ConversionStatus& status ); /** * @brief Exports the given file/document to the specified URL/mimetype. * @@ -89,7 +89,7 @@ public: * and when the method returns @p mimeType contains this mimetype. * Oh, well, export is a C++ keyword ;) */ - KoFilter::ConversiontqStatus exp0rt( const TQString& url, TQCString& mimeType ); + KoFilter::ConversionStatus exp0rt( const TQString& url, TQCString& mimeType ); diff --git a/lib/kofficecore/KoFrame.cpp b/lib/kofficecore/KoFrame.cpp index 4909e1e0..f9b3930e 100644 --- a/lib/kofficecore/KoFrame.cpp +++ b/lib/kofficecore/KoFrame.cpp @@ -254,7 +254,7 @@ void KoFrame::mouseMoveEvent( TQMouseEvent* ev ) TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() ); move( TQPoint( p.x() + d->m_framePos.x() - d->m_mousePressPos.x(), p.y() + d->m_framePos.y() - d->m_mousePressPos.y() ) ); - // The other modes change the tqgeometry so they call resizeEvent. + // The other modes change the geometry so they call resizeEvent. // This one doesn't, so it has to emit geometryChangedby itself. emit geometryChanged(); //kdDebug() << "KoFrame::mouseMoveEvent koFrame position is " << x() << "," << y() << endl; diff --git a/lib/kofficecore/KoGenStyles.cpp b/lib/kofficecore/KoGenStyles.cpp index 5c8f680f..e140ac50 100644 --- a/lib/kofficecore/KoGenStyles.cpp +++ b/lib/kofficecore/KoGenStyles.cpp @@ -225,7 +225,7 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha } if ( !m_familyName.isEmpty() ) const_cast<KoGenStyle *>( this )-> - addAttribute( "style:family", TQString::tqfromLatin1( m_familyName ) ); + addAttribute( "style:family", TQString::fromLatin1( m_familyName ) ); else { if ( qstrcmp( elementName, "style:style" ) == 0 ) kdWarning(30003) << "User style " << name << " is without family - invalid. m_type=" << m_type << endl; diff --git a/lib/kofficecore/KoGenStyles.h b/lib/kofficecore/KoGenStyles.h index 2a54f944..d7516732 100644 --- a/lib/kofficecore/KoGenStyles.h +++ b/lib/kofficecore/KoGenStyles.h @@ -274,7 +274,7 @@ public: { /** * DefaultType depends on family: e.g. paragraph-properties if family=paragraph - * or on the type of style (e.g. page-tqlayout -> page-tqlayout-properties). + * or on the type of style (e.g. page-layout -> page-layout-properties). * (In fact that tag name is the one passed to writeStyle) */ DefaultType = 0, diff --git a/lib/kofficecore/KoGlobal.cpp b/lib/kofficecore/KoGlobal.cpp index 8ba1c077..3c979f93 100644 --- a/lib/kofficecore/KoGlobal.cpp +++ b/lib/kofficecore/KoGlobal.cpp @@ -136,7 +136,7 @@ void KoGlobal::createListOfLanguages() // currently have en_GB or en_US etc. const TQStringList translationList = KGlobal::dirs()->findAllResources("locale", - TQString::tqfromLatin1("*/entry.desktop")); + TQString::fromLatin1("*/entry.desktop")); for ( TQStringList::ConstIterator it = translationList.begin(); it != translationList.end(); ++it ) { diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index 1219bf09..248d3ed3 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -499,19 +499,19 @@ void KoMainWindow::updateCaption() // Get caption from document info (title(), in about page) if ( rootDocument()->documentInfo() ) { - KoDocumentInfoPage * page = rootDocument()->documentInfo()->page( TQString::tqfromLatin1("about") ); + KoDocumentInfoPage * page = rootDocument()->documentInfo()->page( TQString::fromLatin1("about") ); if (page) caption = static_cast<KoDocumentInfoAbout *>(page)->title(); } const TQString url = rootDocument()->url().prettyURL( 0, KURL::StripFileProtocol ); if ( !caption.isEmpty() && !url.isEmpty() ) - caption = TQString( "%1 - %2" ).tqarg( caption ).tqarg( url ); + caption = TQString( "%1 - %2" ).arg( caption ).arg( url ); else if ( caption.isEmpty() ) caption = url; setCaption( caption, rootDocument()->isModified() ); if ( !rootDocument()->url().fileName(false).isEmpty() ) - d->m_paSave->setToolTip( i18n("Save as %1").tqarg(rootDocument()->url().fileName(false)) ); + d->m_paSave->setToolTip( i18n("Save as %1").arg(rootDocument()->url().fileName(false)) ); else d->m_paSave->setToolTip( i18n("Save") ); } @@ -544,7 +544,7 @@ bool KoMainWindow::openDocument( const KURL & url ) { if ( !KIO::NetAccess::exists(url,true,0) ) { - KMessageBox::error(0L, i18n("The file %1 does not exist.").tqarg(url.url()) ); + KMessageBox::error(0L, i18n("The file %1 does not exist.").arg(url.url()) ); m_recent->removeURL(url); //remove the file from the recent-opened-file-list saveRecentFiles(); return false; @@ -677,7 +677,7 @@ bool KoMainWindow::exportConfirmation( const TQCString &outputFormat ) const bool neverHeardOfIt = ( mime->name() == KMimeType::defaultMimeType() ); TQString comment = neverHeardOfIt ? - i18n( "%1 (unknown file type)" ).tqarg( outputFormat.data() ) + i18n( "%1 (unknown file type)" ).arg( outputFormat.data() ) : mime->comment(); // Warn the user @@ -689,7 +689,7 @@ bool KoMainWindow::exportConfirmation( const TQCString &outputFormat ) this, i18n( "<qt>Saving as a %1 may result in some loss of formatting." "<p>Do you still want to save in this format?</qt>" ) - .tqarg( TQString( "<b>%1</b>" ).tqarg( comment ) ), // in case we want to remove the bold later + .arg( TQString( "<b>%1</b>" ).arg( comment ) ), // in case we want to remove the bold later i18n( "Confirm Save" ), KStdGuiItem::save (), "NonNativeSaveConfirmation", @@ -703,7 +703,7 @@ bool KoMainWindow::exportConfirmation( const TQCString &outputFormat ) this, i18n( "<qt>Exporting as a %1 may result in some loss of formatting." "<p>Do you still want to export to this format?</qt>" ) - .tqarg( TQString( "<b>%1</b>" ).tqarg( comment ) ), // in case we want to remove the bold later + .arg( TQString( "<b>%1</b>" ).arg( comment ) ), // in case we want to remove the bold later i18n( "Confirm Export" ), i18n ("Export"), "NonNativeExportConfirmation", // different to the one used for Save (above) @@ -1039,7 +1039,7 @@ bool KoMainWindow::queryClose() name = i18n( "Untitled" ); int res = KMessageBox::warningYesNoCancel( this, - i18n( "<p>The document <b>'%1'</b> has been modified.</p><p>Do you want to save it?</p>" ).tqarg(name), + i18n( "<p>The document <b>'%1'</b> has been modified.</p><p>Do you want to save it?</p>" ).arg(name), TQString(), KStdGuiItem::save(), KStdGuiItem::discard()); @@ -1212,7 +1212,7 @@ void KoMainWindow::print(bool quick) { if ( title.isEmpty() ) { // #139905 - breaks message freeze though //const TQString programName = instance()->aboutData() ? instance()->aboutData()->programName() : instance()->instanceName(); - //title = i18n("%1 unsaved document (%2)").tqarg(programName).tqarg(KGlobal::locale()->formatDate(TQDate::tqcurrentDate(), true/*short*/)); + //title = i18n("%1 unsaved document (%2)").arg(programName).arg(KGlobal::locale()->formatDate(TQDate::currentDate(), true/*short*/)); } printer.setDocName( title ); printer.setDocFileName( fileName ); @@ -1529,9 +1529,9 @@ void KoMainWindow::slotActivePartChanged( KParts::Part *newPart ) if ( it.current()->inherits("KToolBar") ) { KToolBar * tb = static_cast<KToolBar *>(it.current()); - KToggleAction * act = new KToggleAction( i18n("Show %1 Toolbar").tqarg( tb->text() ), 0, + KToggleAction * act = new KToggleAction( i18n("Show %1 Toolbar").arg( tb->text() ), 0, actionCollection(), tb->name() ); - act->setCheckedState(i18n("Hide %1 Toolbar").tqarg( tb->text() )); + act->setCheckedState(i18n("Hide %1 Toolbar").arg( tb->text() )); connect( act, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(this), TQT_SLOT( slotToolbarToggled( bool ) ) ); act->setChecked ( !tb->isHidden() ); d->m_toolbarList.append( act ); @@ -1618,7 +1618,7 @@ void KoMainWindow::slotEmailFile() else { fileURL = rootDocument()->url().url(); - theSubject = i18n("Document - %1").tqarg(rootDocument()->url().fileName(false)); + theSubject = i18n("Document - %1").arg(rootDocument()->url().fileName(false)); urls.append( fileURL ); } diff --git a/lib/kofficecore/KoOasisStore.cpp b/lib/kofficecore/KoOasisStore.cpp index ea99ce8a..fa1642e7 100644 --- a/lib/kofficecore/KoOasisStore.cpp +++ b/lib/kofficecore/KoOasisStore.cpp @@ -145,7 +145,7 @@ bool KoOasisStore::loadAndParse( const TQString& fileName, TQDomDocument& doc, T if (!m_store->open(fileName)) { kdWarning(30003) << "Entry " << fileName << " not found!" << endl; - errorMessage = i18n( "Could not find %1" ).tqarg( fileName ); + errorMessage = i18n( "Could not find %1" ).arg( fileName ); return false; } // Error variables for TQDomDocument::setContent @@ -168,7 +168,7 @@ bool KoOasisStore::loadAndParse( const TQString& fileName, TQDomDocument& doc, T << " In line: " << errorLine << ", column: " << errorColumn << endl << " Error message: " << errorMsg << endl; errorMessage = i18n( "Parsing error in the main document at line %1, column %2\nError message: %3" ) - .tqarg( errorLine ).tqarg( errorColumn ).tqarg( i18n ( "TQXml", errorMsg.utf8() ) ); + .arg( errorLine ).arg( errorColumn ).arg( i18n ( "TQXml", errorMsg.utf8() ) ); } else { diff --git a/lib/kofficecore/KoOasisStyles.cpp b/lib/kofficecore/KoOasisStyles.cpp index fe88a11b..04a0eb20 100644 --- a/lib/kofficecore/KoOasisStyles.cpp +++ b/lib/kofficecore/KoOasisStyles.cpp @@ -26,7 +26,7 @@ #include <tqbuffer.h> #include <kglobal.h> #include <klocale.h> -#include <tqbrush.h> +#include <brush.h> #include <KoStyleStack.h> class KoOasisStyles::Private @@ -194,9 +194,9 @@ void KoOasisStyles::insertStyle( const TQDomElement& e, bool styleAutoStyles ) //kdDebug(30003) << "Style: '" << name << "' loaded " << endl; } } else if ( ns == KoXmlNS::style && ( - localName == "page-tqlayout" + localName == "page-layout" || localName == "font-decl" - || localName == "presentation-page-tqlayout" ) ) + || localName == "presentation-page-layout" ) ) { if ( m_styles.find( name ) != 0 ) kdDebug(30003) << "Style: '" << name << "' already exists" << endl; diff --git a/lib/kofficecore/KoOasisStyles.h b/lib/kofficecore/KoOasisStyles.h index dfa9e468..e73eab0e 100644 --- a/lib/kofficecore/KoOasisStyles.h +++ b/lib/kofficecore/KoOasisStyles.h @@ -47,8 +47,8 @@ public: /** * Look up a style by name. - * This method can find styles defined by the tags "style:page-tqlayout", - * "style:presentation-page-tqlayout", or "style:font-decl". + * This method can find styles defined by the tags "style:page-layout", + * "style:presentation-page-layout", or "style:font-decl". * Do NOT use this method for style:style styles. * * @param name the style name @@ -148,7 +148,7 @@ private: KoOasisStyles& operator=( const KoOasisStyles & ); // forbidden private: - TQDict<TQDomElement> m_styles; // page-tqlayout, font-decl etc. + TQDict<TQDomElement> m_styles; // page-layout, font-decl etc. TQDict<TQDomElement> m_defaultStyle; TQDomElement m_officeStyle; diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp index 83978239..15da9151 100644 --- a/lib/kofficecore/KoOpenPane.cpp +++ b/lib/kofficecore/KoOpenPane.cpp @@ -20,7 +20,7 @@ #include "KoOpenPane.h" #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqheader.h> #include <tqwidgetstack.h> #include <tqlabel.h> diff --git a/lib/kofficecore/KoPageLayout.cpp b/lib/kofficecore/KoPageLayout.cpp index 05eff10b..c3965d45 100644 --- a/lib/kofficecore/KoPageLayout.cpp +++ b/lib/kofficecore/KoPageLayout.cpp @@ -59,7 +59,7 @@ KoGenStyle KoPageLayout::saveOasis() const void KoPageLayout::loadOasis(const TQDomElement &style) { - TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-tqlayout-properties" ) ); + TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-layout-properties" ) ); if ( !properties.isNull() ) { ptWidth = KoUnit::parseValue(properties.attributeNS( KoXmlNS::fo, "page-width", TQString() ) ); @@ -82,18 +82,18 @@ void KoPageLayout::loadOasis(const TQDomElement &style) KoPageLayout KoPageLayout::standardLayout() { - KoPageLayout tqlayout; - tqlayout.format = KoPageFormat::defaultFormat(); - tqlayout.orientation = PG_PORTRAIT; - tqlayout.ptWidth = MM_TO_POINT( KoPageFormat::width( tqlayout.format, tqlayout.orientation ) ); - tqlayout.ptHeight = MM_TO_POINT( KoPageFormat::height( tqlayout.format, tqlayout.orientation ) ); - tqlayout.ptLeft = MM_TO_POINT( 20.0 ); - tqlayout.ptRight = MM_TO_POINT( 20.0 ); - tqlayout.ptTop = MM_TO_POINT( 20.0 ); - tqlayout.ptBottom = MM_TO_POINT( 20.0 ); - tqlayout.ptPageEdge = -1; - tqlayout.ptBindingSide = -1; - return tqlayout; + KoPageLayout layout; + layout.format = KoPageFormat::defaultFormat(); + layout.orientation = PG_PORTRAIT; + layout.ptWidth = MM_TO_POINT( KoPageFormat::width( layout.format, layout.orientation ) ); + layout.ptHeight = MM_TO_POINT( KoPageFormat::height( layout.format, layout.orientation ) ); + layout.ptLeft = MM_TO_POINT( 20.0 ); + layout.ptRight = MM_TO_POINT( 20.0 ); + layout.ptTop = MM_TO_POINT( 20.0 ); + layout.ptBottom = MM_TO_POINT( 20.0 ); + layout.ptPageEdge = -1; + layout.ptBindingSide = -1; + return layout; } struct PageFormatInfo @@ -149,12 +149,12 @@ int KoPageFormat::printerPageSize( KoFormat format ) { if ( format == PG_SCREEN ) { - kdWarning() << "You use the page tqlayout SCREEN. Printing in DIN A4 LANDSCAPE." << endl; + kdWarning() << "You use the page layout SCREEN. Printing in DIN A4 LANDSCAPE." << endl; return KPrinter::A4; } else if ( format == PG_CUSTOM ) { - kdWarning() << "The used page tqlayout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl; + kdWarning() << "The used page layout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl; return KPrinter::A4; } else if ( format <= PG_LAST_FORMAT ) @@ -198,15 +198,15 @@ KoFormat KoPageFormat::guessFormat( double width, double height ) TQString KoPageFormat::formatString( KoFormat format ) { if ( format <= PG_LAST_FORMAT ) - return TQString::tqfromLatin1( pageFormatInfo[ format ].shortName ); - return TQString::tqfromLatin1( "A4" ); + return TQString::fromLatin1( pageFormatInfo[ format ].shortName ); + return TQString::fromLatin1( "A4" ); } KoFormat KoPageFormat::formatFromString( const TQString & string ) { for ( int i = 0 ; i <= PG_LAST_FORMAT ; ++i ) { - if (string == TQString::tqfromLatin1( pageFormatInfo[ i ].shortName )) + if (string == TQString::fromLatin1( pageFormatInfo[ i ].shortName )) return pageFormatInfo[ i ].format; } // We do not know the format name, so we have a custom format diff --git a/lib/kofficecore/KoPageLayout.h b/lib/kofficecore/KoPageLayout.h index 4d4dc6cc..f854b1eb 100644 --- a/lib/kofficecore/KoPageLayout.h +++ b/lib/kofficecore/KoPageLayout.h @@ -154,7 +154,7 @@ enum KoHFType { }; /** - * This structure defines the page tqlayout, including + * This structure defines the page layout, including * its size in pt, its format (e.g. A4), orientation, unit, margins etc. */ struct KoPageLayout @@ -194,17 +194,17 @@ struct KoPageLayout } /** - * Save this page tqlayout to OASIS. + * Save this page layout to OASIS. */ KOFFICECORE_EXPORT KoGenStyle saveOasis() const; /** - * Load this page tqlayout from OASIS + * Load this page layout from OASIS */ KOFFICECORE_EXPORT void loadOasis(const TQDomElement &style); /** - * @return a page tqlayout with the default page size depending on the locale settings, + * @return a page layout with the default page size depending on the locale settings, * default margins (2 cm), and portrait orientation. * @since 1.4 */ diff --git a/lib/kofficecore/KoPictureEps.cpp b/lib/kofficecore/KoPictureEps.cpp index 9edbc981..62269f05 100644 --- a/lib/kofficecore/KoPictureEps.cpp +++ b/lib/kofficecore/KoPictureEps.cpp @@ -25,7 +25,7 @@ #include <tqpainter.h> #include <tqpaintdevicemetrics.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqregexp.h> #include <tqimage.h> #include <tqpixmap.h> @@ -244,7 +244,7 @@ void KoPictureEps::draw(TQPainter& painter, int x, int y, int width, int height, TQPaintDeviceMetrics metrics (painter.device()); kdDebug(30003) << "Metrics: X: " << metrics.logicalDpiX() << " x Y: " << metrics.logicalDpiX() << " (in KoPictureEps::draw)" << endl; - if ( painter.tqdevice()->isExtDev() ) // Is it an external device (i.e. printer) + if ( painter.device()->isExtDev() ) // Is it an external device (i.e. printer) { kdDebug(30003) << "Drawing for a printer (in KoPictureEps::draw)" << endl; // For printing, always re-sample the image, as a printer has never the same resolution than a display. @@ -399,7 +399,7 @@ bool KoPictureEps::loadData(const TQByteArray& array, const TQString& /* extensi kdError(30003) << "Not standard bounding box: " << line << endl; return false; } - kdDebug(30003) << "Reg. Exp. Found: " << exp.tqcapturedTexts() << endl; + kdDebug(30003) << "Reg. Exp. Found: " << exp.capturedTexts() << endl; rect.setLeft((int)exp.cap(1).toDouble()); rect.setTop((int)exp.cap(2).toDouble()); rect.setRight((int)exp.cap(3).toDouble()); diff --git a/lib/kofficecore/KoPictureImage.cpp b/lib/kofficecore/KoPictureImage.cpp index c0775ac7..b0b28ff3 100644 --- a/lib/kofficecore/KoPictureImage.cpp +++ b/lib/kofficecore/KoPictureImage.cpp @@ -95,7 +95,7 @@ void KoPictureImage::draw(TQPainter& painter, int x, int y, int width, int heigh if ( !width || !height ) return; TQSize origSize = getOriginalSize(); - const bool scaleImage = painter.tqdevice()->isExtDev() // we are printing + const bool scaleImage = painter.device()->isExtDev() // we are printing && ((width <= origSize.width()) || (height <= origSize.height())); if( scaleImage ) { diff --git a/lib/kofficecore/KoPictureKey.cpp b/lib/kofficecore/KoPictureKey.cpp index 0badb429..ea2869a9 100644 --- a/lib/kofficecore/KoPictureKey.cpp +++ b/lib/kofficecore/KoPictureKey.cpp @@ -139,8 +139,8 @@ void KoPictureKey::loadAttributes( const TQDomElement &elem ) TQString KoPictureKey::toString() const { // We do not use the default TQDateTime::toString has it does not show microseconds - return TQString::tqfromLatin1( "%1 %2" ) - .tqarg( m_filename, m_lastModified.toString("yyyy-MM-dd hh:mm:ss.zzz") ); + return TQString::fromLatin1( "%1 %2" ) + .arg( m_filename, m_lastModified.toString("yyyy-MM-dd hh:mm:ss.zzz") ); } void KoPictureKey::setKeyFromFile (const TQString& filename) diff --git a/lib/kofficecore/KoQueryTrader.cpp b/lib/kofficecore/KoQueryTrader.cpp index 0003d00d..84a1be4b 100644 --- a/lib/kofficecore/KoQueryTrader.cpp +++ b/lib/kofficecore/KoQueryTrader.cpp @@ -76,14 +76,14 @@ KoDocument* KoDocumentEntry::createDoc( KoDocument* parent, const char* name ) c KoDocumentEntry KoDocumentEntry::queryByMimeType( const TQString & mimetype ) { - TQString constr = TQString::tqfromLatin1( "[X-KDE-NativeMimeType] == '%1' or '%2' in [X-KDE-ExtraNativeMimeTypes]" ).tqarg( mimetype ).tqarg( mimetype ); + TQString constr = TQString::fromLatin1( "[X-KDE-NativeMimeType] == '%1' or '%2' in [X-KDE-ExtraNativeMimeTypes]" ).arg( mimetype ).arg( mimetype ); TQValueList<KoDocumentEntry> vec = query( false,constr ); if ( vec.isEmpty() ) { kdWarning(30003) << "Got no results with " << constr << endl; // Fallback to the old way (which was probably wrong, but better be safe) - TQString constr = TQString::tqfromLatin1( "'%1' in ServiceTypes" ).tqarg( mimetype ); + TQString constr = TQString::fromLatin1( "'%1' in ServiceTypes" ).arg( mimetype ); vec = query( constr ); if ( vec.isEmpty() ) { diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp index 75c8fec8..e309cc7e 100644 --- a/lib/kofficecore/KoSpeaker.cpp +++ b/lib/kofficecore/KoSpeaker.cpp @@ -33,14 +33,14 @@ #include <tqtabbar.h> #include <tqgroupbox.h> #include <tqlineedit.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqlistview.h> #include <tqlistbox.h> #include <tqiconview.h> #include <tqtable.h> #include <tqgridview.h> #include <tqregexp.h> -#include <tqstylesheet.h> +#include <stylesheet.h> // KDE includes. #include <kapplication.h> @@ -136,7 +136,7 @@ void KoSpeaker::probe() TQPoint pos; bool spoke = false; if ( d->m_speakFlags & SpeakFocusWidget ) { - w = kapp->tqfocusWidget(); + w = kapp->focusWidget(); if (w) { spoke = maybeSayWidget(w); if (!spoke) diff --git a/lib/kofficecore/KoTemplates.h b/lib/kofficecore/KoTemplates.h index 98c3ef72..d65fab44 100644 --- a/lib/kofficecore/KoTemplates.h +++ b/lib/kofficecore/KoTemplates.h @@ -80,9 +80,9 @@ public: void addDir(const TQString &dir) { m_dirs.append(dir); m_touched=true; } int sortingWeight() const { return m_sortingWeight; } void setSortingWeight(int weight) { m_sortingWeight = weight; } - /// If all tqchildren are hidden, we are hidden too + /// If all children are hidden, we are hidden too bool isHidden() const; - /// if we should hide, we hide all the tqchildren + /// if we should hide, we hide all the children void setHidden(bool hidden=true) const; KoTemplate *first() { return m_templates.first(); } diff --git a/lib/kofficecore/KoUnit.cpp b/lib/kofficecore/KoUnit.cpp index cc882345..3ba89f24 100644 --- a/lib/kofficecore/KoUnit.cpp +++ b/lib/kofficecore/KoUnit.cpp @@ -183,15 +183,15 @@ KoUnit::Unit KoUnit::unit( const TQString &_unitName, bool* ok ) { if ( ok ) *ok = true; - if ( _unitName == TQString::tqfromLatin1( "mm" ) ) return U_MM; - if ( _unitName == TQString::tqfromLatin1( "cm" ) ) return U_CM; - if ( _unitName == TQString::tqfromLatin1( "dm" ) ) return U_DM; - if ( _unitName == TQString::tqfromLatin1( "in" ) - || _unitName == TQString::tqfromLatin1("inch") /*compat*/ ) return U_INCH; - if ( _unitName == TQString::tqfromLatin1( "pi" ) ) return U_PI; - if ( _unitName == TQString::tqfromLatin1( "dd" ) ) return U_DD; - if ( _unitName == TQString::tqfromLatin1( "cc" ) ) return U_CC; - if ( _unitName == TQString::tqfromLatin1( "pt" ) ) return U_PT; + if ( _unitName == TQString::fromLatin1( "mm" ) ) return U_MM; + if ( _unitName == TQString::fromLatin1( "cm" ) ) return U_CM; + if ( _unitName == TQString::fromLatin1( "dm" ) ) return U_DM; + if ( _unitName == TQString::fromLatin1( "in" ) + || _unitName == TQString::fromLatin1("inch") /*compat*/ ) return U_INCH; + if ( _unitName == TQString::fromLatin1( "pi" ) ) return U_PI; + if ( _unitName == TQString::fromLatin1( "dd" ) ) return U_DD; + if ( _unitName == TQString::fromLatin1( "cc" ) ) return U_CC; + if ( _unitName == TQString::fromLatin1( "pt" ) ) return U_PT; if ( ok ) *ok = false; return U_PT; @@ -199,14 +199,14 @@ KoUnit::Unit KoUnit::unit( const TQString &_unitName, bool* ok ) TQString KoUnit::unitName( Unit _unit ) { - if ( _unit == U_MM ) return TQString::tqfromLatin1( "mm" ); - if ( _unit == U_CM ) return TQString::tqfromLatin1( "cm" ); - if ( _unit == U_DM ) return TQString::tqfromLatin1( "dm" ); - if ( _unit == U_INCH ) return TQString::tqfromLatin1( "in" ); - if ( _unit == U_PI ) return TQString::tqfromLatin1( "pi" ); - if ( _unit == U_DD ) return TQString::tqfromLatin1( "dd" ); - if ( _unit == U_CC ) return TQString::tqfromLatin1( "cc" ); - return TQString::tqfromLatin1( "pt" ); + if ( _unit == U_MM ) return TQString::fromLatin1( "mm" ); + if ( _unit == U_CM ) return TQString::fromLatin1( "cm" ); + if ( _unit == U_DM ) return TQString::fromLatin1( "dm" ); + if ( _unit == U_INCH ) return TQString::fromLatin1( "in" ); + if ( _unit == U_PI ) return TQString::fromLatin1( "pi" ); + if ( _unit == U_DD ) return TQString::fromLatin1( "dd" ); + if ( _unit == U_CC ) return TQString::fromLatin1( "cc" ); + return TQString::fromLatin1( "pt" ); } void KoUnit::saveOasis(KoXmlWriter* settingsWriter, Unit _unit) diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp index debb9f7c..634a1393 100644 --- a/lib/kofficecore/KoView.cpp +++ b/lib/kofficecore/KoView.cpp @@ -42,7 +42,7 @@ public: { m_inOperation = false; m_zoom = 1.0; - m_tqchildren.setAutoDelete( true ); + m_children.setAutoDelete( true ); m_manager = 0L; m_tempActiveWidget = 0L; m_dcopObject = 0; @@ -56,7 +56,7 @@ public: TQGuardedPtr<KoDocument> m_doc; // our KoDocument TQGuardedPtr<KParts::PartManager> m_manager; double m_zoom; - TQPtrList<KoViewChild> m_tqchildren; + TQPtrList<KoViewChild> m_children; TQWidget *m_tempActiveWidget; KoViewIface *m_dcopObject; bool m_registered; // are we registered at the part manager? @@ -339,10 +339,10 @@ void KoView::partActivateEvent( KParts::PartActivateEvent *event ) if ( child->isRectangle() && !child->isTransparent() ) { KoViewChild *viewChild = new KoViewChild( child, this ); - d->m_tqchildren.append( viewChild ); + d->m_children.append( viewChild ); TQApplication::setOverrideCursor(waitCursor); - // This is the long operation (due to toolbar tqlayout stuff) + // This is the long operation (due to toolbar layout stuff) d->m_manager->setActivePart( child->document(), viewChild->frame()->view() ); TQApplication::restoreOverrideCursor(); @@ -484,7 +484,7 @@ void KoView::paintEverything( TQPainter &painter, const TQRect &rect, bool trans KoViewChild *KoView::child( KoView *view ) { - TQPtrListIterator<KoViewChild> it( d->m_tqchildren ); + TQPtrListIterator<KoViewChild> it( d->m_children ); for (; it.current(); ++it ) if ( it.current()->frame()->view() == view ) return it.current(); @@ -494,7 +494,7 @@ KoViewChild *KoView::child( KoView *view ) KoViewChild *KoView::child( KoDocument *doc ) { - TQPtrListIterator<KoViewChild> it( d->m_tqchildren ); + TQPtrListIterator<KoViewChild> it( d->m_children ); for (; it.current(); ++it ) if ( it.current()->documentChild()->document() == doc ) return it.current(); @@ -554,7 +554,7 @@ void KoView::slotChildActivated( bool a ) docChild->document()->setViewBuildDocument( chFrame->view(), chFrame->view()->xmlguiBuildDocument() ); } - d->m_tqchildren.remove( ch ); + d->m_children.remove( ch ); d->m_manager->addPart( docChild->document(), false ); // the destruction of the view removed the part from the partmanager. re-add it :) @@ -671,12 +671,12 @@ void KoView::endOperation() KoMainWindow * KoView::shell() const { - return dynamic_cast<KoMainWindow *>( tqtopLevelWidget() ); + return dynamic_cast<KoMainWindow *>( topLevelWidget() ); } KMainWindow * KoView::mainWindow() const { - return dynamic_cast<KMainWindow *>( tqtopLevelWidget() ); + return dynamic_cast<KMainWindow *>( topLevelWidget() ); } KStatusBar * KoView::statusBar() const @@ -741,11 +741,11 @@ KoViewChild::KoViewChild( KoDocumentChild *child, KoView *_parentView ) /* KoViewChild has basically three geometries to keep in sync. - - The KoDocumentChild tqgeometry (i.e. the embedded object's tqgeometry, unzoomed) - - Its own tqgeometry (used for hit-test etc.) - - The KoFrame tqgeometry (the graphical widget for moving the object when active) + - The KoDocumentChild geometry (i.e. the embedded object's geometry, unzoomed) + - Its own geometry (used for hit-test etc.) + - The KoFrame geometry (the graphical widget for moving the object when active) - So we need to subtract the scrollview's offset for the frame tqgeometry, since it's a widget. + So we need to subtract the scrollview's offset for the frame geometry, since it's a widget. The rules are (R1) frameGeometry = viewGeometry(childGeometry) "+" m_frame->{left|right|top|bottom}Border() - scrollview offset, @@ -779,8 +779,8 @@ KoViewChild::~KoViewChild() void KoViewChild::slotFrameGeometryChanged() { - // Set our tqgeometry from the frame tqgeometry (R2 reversed) - TQRect geom = m_frame->tqgeometry(); + // Set our geometry from the frame geometry (R2 reversed) + TQRect geom = m_frame->geometry(); int b = m_frame->border(); TQRect borderRect( geom.x() + b + parentView()->canvasXOffset(), geom.y() + b + parentView()->canvasYOffset(), @@ -790,7 +790,7 @@ void KoViewChild::slotFrameGeometryChanged() if(m_child) { - // Set the child tqgeometry from the frame tqgeometry (R1 reversed) + // Set the child geometry from the frame geometry (R1 reversed) TQRect borderLessRect( geom.x() + m_frame->leftBorder() + parentView()->canvasXOffset(), geom.y() + m_frame->topBorder() + parentView()->canvasYOffset(), geom.width() - m_frame->leftBorder() - m_frame->rightBorder(), @@ -799,8 +799,8 @@ void KoViewChild::slotFrameGeometryChanged() // We don't want to trigger slotDocGeometryChanged again lock(); TQRect childGeom = parentView()->reverseViewTransformations( borderLessRect ); - kdDebug() << "KoChild::slotFrameGeometryChanged child tqgeometry " - << ( tqgeometry() == childGeom ? "already " : "set to " ) + kdDebug() << "KoChild::slotFrameGeometryChanged child geometry " + << ( geometry() == childGeom ? "already " : "set to " ) << childGeom << endl; m_child->setGeometry( childGeom ); unlock(); @@ -811,15 +811,15 @@ void KoViewChild::slotDocGeometryChanged() { if ( locked() ) return; - // Set frame tqgeometry from child tqgeometry (R1) + // Set frame geometry from child geometry (R1) // The frame's resizeEvent will call slotFrameGeometryChanged. - TQRect geom = parentView()->applyViewTransformations( m_child->tqgeometry() ); + TQRect geom = parentView()->applyViewTransformations( m_child->geometry() ); TQRect borderRect( geom.x() - m_frame->leftBorder() - parentView()->canvasXOffset(), geom.y() - m_frame->topBorder() - parentView()->canvasYOffset(), geom.width() + m_frame->leftBorder() + m_frame->rightBorder(), geom.height() + m_frame->topBorder() + m_frame->bottomBorder() ); - kdDebug() << "KoViewChild::slotDocGeometryChanged frame tqgeometry " - << ( m_frame->tqgeometry() == borderRect ? "already " : "set to " ) + kdDebug() << "KoViewChild::slotDocGeometryChanged frame geometry " + << ( m_frame->geometry() == borderRect ? "already " : "set to " ) << borderRect << endl; m_frame->setGeometry( borderRect ); diff --git a/lib/kofficecore/KoXmlReader.cpp b/lib/kofficecore/KoXmlReader.cpp index 3b2d3efb..16a08f0c 100644 --- a/lib/kofficecore/KoXmlReader.cpp +++ b/lib/kofficecore/KoXmlReader.cpp @@ -305,7 +305,7 @@ KoXmlNodeData::KoXmlNodeData() fastLoading = false; // assume true, it will be set to false by XML parser when this node - // apparently has tqchildren AND the tqchildren are not loaded + // apparently has children AND the children are not loaded loaded = true; } @@ -534,7 +534,7 @@ void KoXmlNodeData::loadChildren( int depth ) !doc->xmlReader->feature( "http://xml.org/sax/features/namespace-prefixes" ); - // XML snippet for the tqchildren, including this element + // XML snippet for the children, including this element TQString snippet = doc->buffer.mid( startPos, endPos-startPos+1 ); // now parse all subnodes diff --git a/lib/kofficecore/Koversiondialog.cpp b/lib/kofficecore/Koversiondialog.cpp index 188d5888..f55d4abb 100644 --- a/lib/kofficecore/Koversiondialog.cpp +++ b/lib/kofficecore/Koversiondialog.cpp @@ -19,12 +19,12 @@ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqmultilineedit.h> #include <tqpushbutton.h> #include <tqtoolbutton.h> #include <tqapplication.h> -#include <tqlayout.h> +#include <layout.h> #include <kiconloader.h> #include <kbuttonbox.h> #include <kdebug.h> diff --git a/lib/kofficecore/THOUGHTS b/lib/kofficecore/THOUGHTS index fc936fdc..f0121aa9 100644 --- a/lib/kofficecore/THOUGHTS +++ b/lib/kofficecore/THOUGHTS @@ -30,7 +30,7 @@ solve zooming and "scrolling" problems. One ugly problem also is what we will do about performance problems on repainting a part. Some time ago we got a mail on KOffice where some guy asked what to do about making that embedded painting faster. The reason is -that we *always* tqrepaint the whole area, no matter what. This can easily be +that we *always* repaint the whole area, no matter what. This can easily be optimized to a WNorthWestGravity like behavior, because you can't edit those embedded parts anyway, so even kchart and other non-WNG apps support that. ( we have to translate the painter, of course). @@ -44,7 +44,7 @@ whether they are the root views (not embedded), or they are *active* embedded views. There only has to be a KoView object. There is *one* zoom factor for both axes (x/y) and the whole -content (text, objects, tqchildren,...) is zoomed accordingly. +content (text, objects, children,...) is zoomed accordingly. This kind of zooming is like the zoom support you know from other applications. diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp index 9535c14a..a9a1cb2a 100644 --- a/lib/kofficecore/kkbdaccessextensions.cpp +++ b/lib/kofficecore/kkbdaccessextensions.cpp @@ -77,7 +77,7 @@ class KPanelKbdSizerIcon : public TQCursor void setShape(int shayp) { - if (shayp != tqshape()) { + if (shayp != shape()) { // Must restore and override to get the icon to refresh. if (isActive) kapp->restoreOverrideCursor(); TQCursor::setShape((Qt::CursorShape)shayp); @@ -274,7 +274,7 @@ bool KKbdAccessExtensions::eventFilter( TQObject *o, TQEvent *e ) TQWidgetList* KKbdAccessExtensions::getAllPanels() { - TQWidgetList* allWidgets = kapp->tqallWidgets(); + TQWidgetList* allWidgets = kapp->allWidgets(); TQWidgetList* allPanels = new TQWidgetList; TQWidget* widget = allWidgets->first(); while (widget) { @@ -390,7 +390,7 @@ void KKbdAccessExtensions::showIcon() { if (!d->panel) return; TQPoint p; - // kdDebug() << "KKbdAccessExtensions::showIcon: tqtopLevelWidget = " << d->panel->tqtopLevelWidget()->name() << endl; + // kdDebug() << "KKbdAccessExtensions::showIcon: topLevelWidget = " << d->panel->topLevelWidget()->name() << endl; if (::tqqt_cast<TQSplitter*>( d->panel )) { TQSplitter* splitter = dynamic_cast<TQSplitter *>(d->panel); int handleNdx = d->handleNdx - 1; @@ -413,8 +413,8 @@ void KKbdAccessExtensions::showIcon() p = dockWindow->pos(); if (dockWindow->area()) { // kdDebug() << "KKbdAccessExtensions::showIcon: pos = " << p << " of window = " << dockWindow->parentWidget()->name() << endl; - p = dockWindow->parentWidget()->mapTo(dockWindow->tqtopLevelWidget(), p); - // kdDebug() << "KKbdAccessExtensions::showIcon: mapTo = " << p << " of window = " << dockWindow->tqtopLevelWidget()->name() << endl; + p = dockWindow->parentWidget()->mapTo(dockWindow->topLevelWidget(), p); + // kdDebug() << "KKbdAccessExtensions::showIcon: mapTo = " << p << " of window = " << dockWindow->topLevelWidget()->name() << endl; // TODO: How to get the handle width? if (d->handleNdx == 1) { d->icon->setShape(TQt::SizeHorCursor); @@ -440,7 +440,7 @@ void KKbdAccessExtensions::showIcon() // else Handle is above the dock window. } } - p = dockWindow->tqtopLevelWidget()->mapToGlobal(p); + p = dockWindow->topLevelWidget()->mapToGlobal(p); } else { d->icon->setShape(TQt::SizeAllCursor); p = TQPoint(dockWindow->width() / 2, dockWindow->height() / 2); @@ -571,7 +571,7 @@ void KKbdAccessExtensions::displayAccessKeys() } // Find all visible, focusable widgets and create a TQLabel for each. Don't exceed // available list of access keys. - TQWidgetList* allWidgets = kapp->tqallWidgets(); + TQWidgetList* allWidgets = kapp->allWidgets(); TQWidget* widget = allWidgets->first(); int accessCount = 0; int maxAccessCount = availableAccessKeys.length(); diff --git a/lib/kofficecore/koDetailsPaneBase.ui b/lib/kofficecore/koDetailsPaneBase.ui index c29e4a46..0b64d5eb 100644 --- a/lib/kofficecore/koDetailsPaneBase.ui +++ b/lib/kofficecore/koDetailsPaneBase.ui @@ -58,7 +58,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> @@ -82,7 +82,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -96,7 +96,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -158,7 +158,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -177,7 +177,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -191,7 +191,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -208,7 +208,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> diff --git a/lib/kofficecore/koDocumentInfoAboutWidget.ui b/lib/kofficecore/koDocumentInfoAboutWidget.ui index cf65eb81..9e100ed2 100644 --- a/lib/kofficecore/koDocumentInfoAboutWidget.ui +++ b/lib/kofficecore/koDocumentInfoAboutWidget.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -31,7 +31,7 @@ <property name="name"> <cstring>pixmapLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>56</width> <height>56</height> @@ -67,7 +67,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -96,7 +96,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <vbox> <property name="name"> @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -173,7 +173,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <grid> <property name="name"> @@ -189,7 +189,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>70</height> @@ -206,7 +206,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -277,13 +277,13 @@ <property name="name"> <cstring>pbReset</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>24</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>24</height> @@ -321,7 +321,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>16</height> diff --git a/lib/kofficecore/koDocumentInfoAuthorWidget.ui b/lib/kofficecore/koDocumentInfoAuthorWidget.ui index 60353b91..bce29446 100644 --- a/lib/kofficecore/koDocumentInfoAuthorWidget.ui +++ b/lib/kofficecore/koDocumentInfoAuthorWidget.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -31,7 +31,7 @@ <property name="name"> <cstring>labelAuthor</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>56</width> <height>56</height> @@ -61,7 +61,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <grid> <property name="name"> @@ -227,7 +227,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -264,7 +264,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui index 2a8a531e..bc650f10 100644 --- a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui +++ b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui @@ -26,7 +26,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -36,7 +36,7 @@ <property name="name"> <cstring>kPushButton2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>130</width> <height>0</height> @@ -64,7 +64,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>101</height> diff --git a/lib/kofficecore/koOpenPaneBase.ui b/lib/kofficecore/koOpenPaneBase.ui index a85ecb38..c0076afa 100644 --- a/lib/kofficecore/koOpenPaneBase.ui +++ b/lib/kofficecore/koOpenPaneBase.ui @@ -25,7 +25,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -71,7 +71,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> diff --git a/lib/kofficecore/tests/filter_graph.cpp b/lib/kofficecore/tests/filter_graph.cpp index baead627..7ce1ed77 100644 --- a/lib/kofficecore/tests/filter_graph.cpp +++ b/lib/kofficecore/tests/filter_graph.cpp @@ -52,7 +52,7 @@ int main( int /*argc*/, char ** /*argv*/ ) if ( !key.isEmpty() ) { output += " \""; output += key.latin1(); - output += "\" [tqshape=box, style=filled, fillcolor=lightblue];\n"; + output += "\" [shape=box, style=filled, fillcolor=lightblue];\n"; if ( vertices.find( key ) == vertices.end() ) vertices.append( key ); } diff --git a/lib/kofficecore/tests/koxmlreadertest.cpp b/lib/kofficecore/tests/koxmlreadertest.cpp index 5056e416..a298bd50 100644 --- a/lib/kofficecore/tests/koxmlreadertest.cpp +++ b/lib/kofficecore/tests/koxmlreadertest.cpp @@ -22,7 +22,7 @@ #include <tqstring.h> #include <tqcstring.h> #include <tqbuffer.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdatetime.h> #include <tqfile.h> @@ -639,7 +639,7 @@ void testDocument() CHECK( doc.previousSibling().isNull(), true ); CHECK( doc.nextSibling().isNull(), true ); - // make sure its tqchildren are fine + // make sure its children are fine KoXmlElement rootElement; rootElement = doc.firstChild().toElement(); CHECK( rootElement.isNull(), false ); @@ -1419,9 +1419,9 @@ void testSimpleOpenDocumentPresentation() xmlstream << " <office:presentation>"; xmlstream << " <draw:page draw:name=\"Title\" draw:style-name=\"dp1\" "; xmlstream << " draw:master-page-name=\"lyt-cool\" "; - xmlstream << " presentation:presentation-page-tqlayout-name=\"AL1T0\">"; + xmlstream << " presentation:presentation-page-layout-name=\"AL1T0\">"; xmlstream << " <draw:frame presentation:style-name=\"pr1\" "; - xmlstream << " draw:text-style-name=\"P2\" draw:layer=\"tqlayout\" "; + xmlstream << " draw:text-style-name=\"P2\" draw:layer=\"layout\" "; xmlstream << " svg:width=\"23.912cm\" svg:height=\"3.508cm\" "; xmlstream << " svg:x=\"2.058cm\" svg:y=\"1.543cm\" "; xmlstream << " presentation:class=\"title\" "; @@ -1431,7 +1431,7 @@ void testSimpleOpenDocumentPresentation() xmlstream << " </draw:text-box>"; xmlstream << " </draw:frame>"; xmlstream << " <draw:frame presentation:style-name=\"pr2\" "; - xmlstream << " draw:text-style-name=\"P3\" draw:layer=\"tqlayout\""; + xmlstream << " draw:text-style-name=\"P3\" draw:layer=\"layout\""; xmlstream << " svg:width=\"23.912cm\" svg:height=\"13.231cm\""; xmlstream << " svg:x=\"2.058cm\" svg:y=\"5.838cm\" "; xmlstream << " presentation:class=\"subtitle\">"; @@ -1440,8 +1440,8 @@ void testSimpleOpenDocumentPresentation() xmlstream << " </draw:text-box>"; xmlstream << " </draw:frame>"; xmlstream << " <presentation:notes draw:style-name=\"dp2\">"; - xmlstream << " <draw:page-thumbnail draw:style-name=\"gr1\" draw:layer=\"tqlayout\" svg:width=\"13.706cm\" svg:height=\"10.28cm\" svg:x=\"3.647cm\" svg:y=\"2.853cm\" draw:page-number=\"1\" presentation:class=\"page\"/>"; - xmlstream << " <draw:frame presentation:style-name=\"pr3\" draw:text-style-name=\"P1\" draw:layer=\"tqlayout\" svg:width=\"14.518cm\" svg:height=\"11.411cm\" svg:x=\"3.249cm\" svg:y=\"14.13cm\" presentation:class=\"notes\" presentation:placeholder=\"true\">"; + xmlstream << " <draw:page-thumbnail draw:style-name=\"gr1\" draw:layer=\"layout\" svg:width=\"13.706cm\" svg:height=\"10.28cm\" svg:x=\"3.647cm\" svg:y=\"2.853cm\" draw:page-number=\"1\" presentation:class=\"page\"/>"; + xmlstream << " <draw:frame presentation:style-name=\"pr3\" draw:text-style-name=\"P1\" draw:layer=\"layout\" svg:width=\"14.518cm\" svg:height=\"11.411cm\" svg:x=\"3.249cm\" svg:y=\"14.13cm\" presentation:class=\"notes\" presentation:placeholder=\"true\">"; xmlstream << " <draw:text-box/>"; xmlstream << " </draw:frame>"; xmlstream << " </presentation:notes>"; @@ -1587,7 +1587,7 @@ void testSimpleOpenDocumentPresentation() CHECK( titlePageElement.attributeNS(drawNS,"style-name",""), TQString("dp1") ); CHECK( titlePageElement.attributeNS(drawNS,"master-page-name",""), TQString("lyt-cool") ); CHECK( titlePageElement.attributeNS(presentationNS, - "presentation-page-tqlayout-name",""), TQString("AL1T0") ); + "presentation-page-layout-name",""), TQString("AL1T0") ); // <draw:frame> for the title frame KoXmlElement titleFrameElement; @@ -1605,7 +1605,7 @@ void testSimpleOpenDocumentPresentation() CHECK( titleFrameElement.attributeNS(presentationNS,"class",""), TQString("title") ); CHECK( titleFrameElement.attributeNS(presentationNS,"user-transformed",""), TQString("true") ); CHECK( titleFrameElement.attributeNS(drawNS,"text-style-name",""), TQString("P2") ); - CHECK( titleFrameElement.attributeNS(drawNS,"layer",""), TQString("tqlayout") ); + CHECK( titleFrameElement.attributeNS(drawNS,"layer",""), TQString("layout") ); CHECK( titleFrameElement.attributeNS(svgNS,"width",""), TQString("23.912cm") ); CHECK( titleFrameElement.attributeNS(svgNS,"height",""), TQString("3.508cm") ); CHECK( titleFrameElement.attributeNS(svgNS,"x",""), TQString("2.058cm") ); @@ -1655,7 +1655,7 @@ void testSimpleOpenDocumentPresentation() CHECK( subtitleFrameElement.attributeNS(presentationNS,"class",""), TQString("subtitle") ); CHECK( subtitleFrameElement.hasAttributeNS(presentationNS,"user-transformed"), false ); CHECK( subtitleFrameElement.attributeNS(drawNS,"text-style-name",""), TQString("P3") ); - CHECK( subtitleFrameElement.attributeNS(drawNS,"layer",""), TQString("tqlayout") ); + CHECK( subtitleFrameElement.attributeNS(drawNS,"layer",""), TQString("layout") ); CHECK( subtitleFrameElement.attributeNS(svgNS,"width",""), TQString("23.912cm") ); CHECK( subtitleFrameElement.attributeNS(svgNS,"height",""), TQString("13.231cm") ); CHECK( subtitleFrameElement.attributeNS(svgNS,"x",""), TQString("2.058cm") ); @@ -1887,7 +1887,7 @@ void testLargeOpenDocumentSpreadsheet() xmlstream << "<office:spreadsheet>"; for( int i = 0; i < sheetCount; i++ ) { - TQString sheetName = TQString("Sheet%1").tqarg(i+1); + TQString sheetName = TQString("Sheet%1").arg(i+1); xmlstream << "<table:table table:name=\"" << sheetName; xmlstream << "\" table:print=\"false\">"; for( int j = 0; j < rowCount; j++ ) @@ -1981,7 +1981,7 @@ void testLargeOpenDocumentSpreadsheet() tableElement = spreadsheetElement.firstChild().toElement(); for( int table=0; table < sheetCount; table++ ) { - TQString tableName = TQString("Sheet%1").tqarg(table+1); + TQString tableName = TQString("Sheet%1").arg(table+1); CHECK( tableElement.isNull(), false ); CHECK( tableElement.isElement(), true ); CHECK( tableElement.localName(), TQString("table") ); diff --git a/lib/kofficeui/KoBrush.h b/lib/kofficeui/KoBrush.h index 1134b05e..7314649a 100644 --- a/lib/kofficeui/KoBrush.h +++ b/lib/kofficeui/KoBrush.h @@ -21,7 +21,7 @@ #ifndef KOBRUSH_H #define KOBRUSH_H -#include <tqbrush.h> +#include <brush.h> class KoGenStyle; class KoGenStyles; diff --git a/lib/kofficeui/KoCharSelectDia.cpp b/lib/kofficeui/KoCharSelectDia.cpp index c8b104a9..422e4e66 100644 --- a/lib/kofficeui/KoCharSelectDia.cpp +++ b/lib/kofficeui/KoCharSelectDia.cpp @@ -20,7 +20,7 @@ #include "KoCharSelectDia.h" #include "KoCharSelectDia.moc" -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kcharselect.h> @@ -58,7 +58,7 @@ void KoCharSelectDia::initDialog(const TQChar &_chr, const TQString &_font, bool charSelect = new KCharSelect( page, "", _font, _chr ); connect(charSelect, TQT_SIGNAL(doubleClicked()),this, TQT_SLOT(slotDoubleClicked())); - charSelect->resize( charSelect->tqsizeHint() ); + charSelect->resize( charSelect->sizeHint() ); charSelect->enableFontCombo( true ); grid->addWidget( charSelect, 0, 0 ); diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp index 27c51e79..8d4284da 100644 --- a/lib/kofficeui/KoCommandHistory.cpp +++ b/lib/kofficeui/KoCommandHistory.cpp @@ -19,7 +19,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <kaction.h> @@ -53,7 +53,7 @@ void KoListBox::contentsMouseMoveEvent ( TQMouseEvent * e) } } -TQSize KoListBox::tqsizeHint() const +TQSize KoListBox::sizeHint() const { return TQSize(TQMIN(maxItemWidth() + verticalScrollBar()->width() + 4, 400), TQMIN(count() * itemHeight() + horizontalScrollBar()->height() + 4,300)); @@ -188,7 +188,7 @@ void KoCommandHistory::addCommand(KCommand *command, bool execute) { m_first=false; if (m_undo != 0) { m_undo->setEnabled(true); - m_undo->setText(i18n("&Undo: %1").tqarg(d->m_present->name())); + m_undo->setText(i18n("&Undo: %1").arg(d->m_present->name())); } if((m_redo != 0) && m_redo->isEnabled()) { m_redo->setEnabled(false); @@ -203,7 +203,7 @@ void KoCommandHistory::addCommand(KCommand *command, bool execute) { d->m_present=command; if (m_undo != 0) { m_undo->setEnabled(true); - m_undo->setText(i18n("&Undo: %1").tqarg(d->m_present->name())); + m_undo->setText(i18n("&Undo: %1").arg(d->m_present->name())); } if (m_redo != 0) { m_redo->setEnabled(false); @@ -229,7 +229,7 @@ void KoCommandHistory::undo() { if (m_redo != 0) { m_redo->setEnabled(true); - m_redo->setText(i18n("&Redo: %1").tqarg(d->m_present->name())); + m_redo->setText(i18n("&Redo: %1").arg(d->m_present->name())); } int index; if((index=m_commands.findRef(d->m_present))!=-1 && m_commands.prev()!=0) { @@ -238,7 +238,7 @@ void KoCommandHistory::undo() { emit commandExecuted(commandUndone); if (m_undo != 0) { m_undo->setEnabled(true); - m_undo->setText(i18n("&Undo: %1").tqarg(d->m_present->name())); + m_undo->setText(i18n("&Undo: %1").arg(d->m_present->name())); } --index; if(index==d->m_savedAt) @@ -282,13 +282,13 @@ void KoCommandHistory::redo() { if (m_undo != 0) { m_undo->setEnabled(true); - m_undo->setText(i18n("&Undo: %1").tqarg(d->m_present->name())); + m_undo->setText(i18n("&Undo: %1").arg(d->m_present->name())); } if(m_commands.next()!=0) { if (m_redo != 0) { m_redo->setEnabled(true); - m_redo->setText(i18n("&Redo: %1").tqarg(m_commands.current()->name())); + m_redo->setText(i18n("&Redo: %1").arg(m_commands.current()->name())); } } else { @@ -365,7 +365,7 @@ void KoCommandHistory::slotUndoAboutToShow() if (m_commands.findRef(d->m_present)!=-1) while ( m_commands.current() && i<10 ) // TODO make number of items configurable ? { - lst.append(i18n("Undo: %1").tqarg(m_commands.current()->name())); + lst.append(i18n("Undo: %1").arg(m_commands.current()->name())); m_commands.prev(); } d->m_undoListBox->insertStringList( lst ); @@ -411,12 +411,12 @@ void KoCommandHistory::slotRedoAboutToShow() if (m_first) { d->m_present = m_commands.first(); - lst.append(i18n("Redo: %1").tqarg(d->m_present->name())); + lst.append(i18n("Redo: %1").arg(d->m_present->name())); } if (m_commands.findRef(d->m_present)!=-1 && m_commands.next()) while ( m_commands.current() && i<10 ) // TODO make number of items configurable ? { - lst.append(i18n("Redo: %1").tqarg(m_commands.current()->name())); + lst.append(i18n("Redo: %1").arg(m_commands.current()->name())); m_commands.next(); } d->m_redoListBox->insertStringList( lst ); diff --git a/lib/kofficeui/KoCommandHistory.h b/lib/kofficeui/KoCommandHistory.h index 8522da3b..89b83744 100644 --- a/lib/kofficeui/KoCommandHistory.h +++ b/lib/kofficeui/KoCommandHistory.h @@ -39,7 +39,7 @@ public: KoListBox( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); protected: virtual void contentsMouseMoveEvent ( TQMouseEvent * ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; signals: void changeNumberOfSelectedItem( int ); }; diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp index 82f786e8..b893037c 100644 --- a/lib/kofficeui/KoContextCelp.cpp +++ b/lib/kofficeui/KoContextCelp.cpp @@ -23,7 +23,7 @@ #include <tqregion.h> #include <tqfont.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqsimplerichtext.h> #include <kpixmap.h> @@ -61,7 +61,7 @@ void KoVerticalLabel::paintEvent( TQPaintEvent* ) KPixmap pm; pm.resize( height(), width() ); TQPainter p( &pm ); - p.fillRect( 0, 0, height(), width(), tqcolorGroup().background() ); + p.fillRect( 0, 0, height(), width(), colorGroup().background() ); p.setFont( font() ); p.drawText( 0, 0, height(), width(), AlignCenter, m_text ); p.end(); @@ -90,9 +90,9 @@ void KoHelpNavButton::paintEvent( TQPaintEvent* ) if ( isEnabled() ) { if ( m_pressed ) - p.setPen( tqcolorGroup().highlight() ); + p.setPen( colorGroup().highlight() ); else - p.setPen( tqcolorGroup().text() ); + p.setPen( colorGroup().text() ); p.drawPixmap( 1, 1, m_bitmap ); } } // KoHelpNavButton::paintEvent @@ -142,9 +142,9 @@ void KoTinyButton::paintEvent( TQPaintEvent* ) if ( isEnabled() ) { if ( m_pressed ) - p.setPen( tqcolorGroup().highlight() ); + p.setPen( colorGroup().highlight() ); else - p.setPen( tqcolorGroup().text() ); + p.setPen( colorGroup().text() ); p.drawPixmap( width() / 2 - 2, 1, m_bitmap ); } } // KoTinyButton::paintEvent @@ -265,20 +265,20 @@ bool KoHelpView::eventFilter( TQObject*, TQEvent* e ) void KoHelpView::paintEvent( TQPaintEvent* ) { TQPainter p( this ); - currentText->draw( &p, 0, 0, TQRect(), tqcolorGroup() ); + currentText->draw( &p, 0, 0, TQRect(), colorGroup() ); } // KoHelpView::paintEvent KoHelpWidget::KoHelpWidget( TQString help, TQWidget* parent ) : TQWidget( parent ) { - TQGridLayout* tqlayout = new TQGridLayout( this, 3, 3 ); - tqlayout->setMargin( 2 ); - tqlayout->addWidget( m_upButton = new KoHelpNavButton( KoHelpNavButton::Up, this ), 0, 1, AlignHCenter ); - tqlayout->addWidget( m_helpViewport = new TQWidget( this ), 1, 1 ); - tqlayout->addWidget( m_downButton = new KoHelpNavButton( KoHelpNavButton::Down, this ), 2, 1, AlignHCenter ); - tqlayout->addColSpacing( 0, 5 ); - tqlayout->addColSpacing( 2, 5 ); - tqlayout->setColStretch( 1, 1 ); + TQGridLayout* layout = new TQGridLayout( this, 3, 3 ); + layout->setMargin( 2 ); + layout->addWidget( m_upButton = new KoHelpNavButton( KoHelpNavButton::Up, this ), 0, 1, AlignHCenter ); + layout->addWidget( m_helpViewport = new TQWidget( this ), 1, 1 ); + layout->addWidget( m_downButton = new KoHelpNavButton( KoHelpNavButton::Down, this ), 2, 1, AlignHCenter ); + layout->addColSpacing( 0, 5 ); + layout->addColSpacing( 2, 5 ); + layout->setColStretch( 1, 1 ); m_helpView = new KoHelpView( m_helpViewport ); m_helpViewport->setBackgroundMode( PaletteLight ); @@ -370,20 +370,20 @@ void KoHelpWidget::stopScrolling() KoContextHelpPopup::KoContextHelpPopup( TQWidget* parent ) : TQWidget( parent, "", WType_Dialog | WStyle_Customize | WStyle_NoBorder ) { - TQGridLayout* tqlayout = new TQGridLayout( this ); + TQGridLayout* layout = new TQGridLayout( this ); TQHBoxLayout* buttonLayout; - tqlayout->addWidget( m_helpIcon = new TQLabel( this ), 0, 0 ); - tqlayout->addWidget( m_helpTitle = new KoVerticalLabel( this ), 1, 0 ); - buttonLayout = new TQHBoxLayout( tqlayout ); - //tqlayout->addLayout( buttonLayout, 2, 0 ); - tqlayout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", this ), 0, 2, 1, 1 ); + layout->addWidget( m_helpIcon = new TQLabel( this ), 0, 0 ); + layout->addWidget( m_helpTitle = new KoVerticalLabel( this ), 1, 0 ); + buttonLayout = new TQHBoxLayout( layout ); + //layout->addLayout( buttonLayout, 2, 0 ); + layout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", this ), 0, 2, 1, 1 ); buttonLayout->add( m_close = new KoTinyButton( KoTinyButton::Close, this ) ); buttonLayout->add( m_sticky = new KoTinyButton( KoTinyButton::Sticky, this ) ); - tqlayout->addColSpacing( 2, 2 ); - tqlayout->addRowSpacing( 3, 2 ); - tqlayout->setMargin( 3 ); - tqlayout->setSpacing( 1 ); - tqlayout->setRowStretch( 1, 1 ); + layout->addColSpacing( 2, 2 ); + layout->addRowSpacing( 3, 2 ); + layout->setMargin( 3 ); + layout->setSpacing( 1 ); + layout->setRowStretch( 1, 1 ); buttonLayout->setSpacing( 1 ); setMinimumSize( 180, 180 ); @@ -450,7 +450,7 @@ void KoContextHelpPopup::resizeEvent( TQResizeEvent* ) void KoContextHelpPopup::paintEvent( TQPaintEvent* ) { TQPainter p( this ); - p.fillRect( 0, 0, width(), height(), tqcolorGroup().light() ); + p.fillRect( 0, 0, width(), height(), colorGroup().light() ); p.setPen( black ); p.drawRect( 0, 0, width(), height() ); p.fillRect( width() - 3, 0, width() - 1, height() - 1, black ); @@ -537,13 +537,13 @@ KoContextHelpWidget::KoContextHelpWidget( TQWidget* parent, const char* name ) : TQWidget( parent, name ) { setCaption( i18n( "Context Help" ) ); - TQGridLayout* tqlayout = new TQGridLayout( this ); - tqlayout->addWidget( m_helpIcon = new TQLabel( this ), 0, 0 ); - tqlayout->addWidget( m_helpTitle = new KoVerticalLabel( this ), 1, 0 ); - tqlayout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", this ), 0, 1, 1, 1 ); - tqlayout->setMargin( 2 ); - tqlayout->setSpacing( 1 ); - tqlayout->setRowStretch( 1, 1 ); + TQGridLayout* layout = new TQGridLayout( this ); + layout->addWidget( m_helpIcon = new TQLabel( this ), 0, 0 ); + layout->addWidget( m_helpTitle = new KoVerticalLabel( this ), 1, 0 ); + layout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", this ), 0, 1, 1, 1 ); + layout->setMargin( 2 ); + layout->setSpacing( 1 ); + layout->setRowStretch( 1, 1 ); this->setMinimumSize( 180, 120 ); this->show(); setContextHelp( i18n( "Context Help" ), i18n( "Here will be shown help according to your actions" ), 0 ); @@ -567,13 +567,13 @@ KoContextHelpDocker::KoContextHelpDocker( TQWidget* parent, const char* name ) { setCaption( i18n( "Context Help" ) ); TQWidget* mainWidget = new TQWidget( this ); - TQGridLayout* tqlayout = new TQGridLayout( mainWidget ); - tqlayout->addWidget( m_helpIcon = new TQLabel( mainWidget ), 0, 0 ); - tqlayout->addWidget( m_helpTitle = new KoVerticalLabel( mainWidget ), 1, 0 ); - tqlayout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", mainWidget ), 0, 1, 1, 1 ); - tqlayout->setMargin( 2 ); - tqlayout->setSpacing( 1 ); - tqlayout->setRowStretch( 1, 1 ); + TQGridLayout* layout = new TQGridLayout( mainWidget ); + layout->addWidget( m_helpIcon = new TQLabel( mainWidget ), 0, 0 ); + layout->addWidget( m_helpTitle = new KoVerticalLabel( mainWidget ), 1, 0 ); + layout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", mainWidget ), 0, 1, 1, 1 ); + layout->setMargin( 2 ); + layout->setSpacing( 1 ); + layout->setRowStretch( 1, 1 ); mainWidget->setMinimumSize( 180, 120 ); mainWidget->show(); setWidget( mainWidget ); diff --git a/lib/kofficeui/KoEditPath.cpp b/lib/kofficeui/KoEditPath.cpp index 19fd8c92..3870ede4 100644 --- a/lib/kofficeui/KoEditPath.cpp +++ b/lib/kofficeui/KoEditPath.cpp @@ -19,7 +19,7 @@ #include <tdeversion.h> #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqlistbox.h> #include "KoEditPath.h" @@ -75,7 +75,7 @@ KoChangePathDia::KoChangePathDia( const TQString & _path, TQWidget *parent, cons TQVBox *page =makeVBoxMainWidget(); new TQLabel( i18n("Location:"), page); m_urlReq = new KURLRequester(page); - m_urlReq->setMinimumWidth( m_urlReq->tqsizeHint().width() * 3 ); + m_urlReq->setMinimumWidth( m_urlReq->sizeHint().width() * 3 ); m_urlReq->lineEdit()->setText( _path ); m_urlReq->fileDialog()->setMode(KFile::Directory | KFile::LocalOnly); diff --git a/lib/kofficeui/KoGeneralPropertyUi.ui b/lib/kofficeui/KoGeneralPropertyUi.ui index 688688c2..399bc900 100644 --- a/lib/kofficeui/KoGeneralPropertyUi.ui +++ b/lib/kofficeui/KoGeneralPropertyUi.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/lib/kofficeui/KoGuideLineDia.cpp b/lib/kofficeui/KoGuideLineDia.cpp index a889b3d8..1f0fcff0 100644 --- a/lib/kofficeui/KoGuideLineDia.cpp +++ b/lib/kofficeui/KoGuideLineDia.cpp @@ -25,7 +25,7 @@ #include <tqhbox.h> #include <tqvbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <klocale.h> @@ -60,7 +60,7 @@ KoGuideLineDia::KoGuideLineDia( TQWidget *parent, KoPoint &pos, KoRect &rect, TQButtonGroup *group = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Orientation" ), vbox ); group->setRadioButtonExclusive( true ); - //group->tqlayout(); + //group->layout(); m_hButton = new TQRadioButton( i18n( "Horizontal" ), group ); m_vButton = new TQRadioButton( i18n( "Vertical" ), group ); diff --git a/lib/kofficeui/KoGuides.cpp b/lib/kofficeui/KoGuides.cpp index 01f6e745..870fddc6 100644 --- a/lib/kofficeui/KoGuides.cpp +++ b/lib/kofficeui/KoGuides.cpp @@ -69,10 +69,10 @@ private: int m_pos; }; -const KoGuides::SnaptqStatus KoGuides::SNAP_NONE = 0; -const KoGuides::SnaptqStatus KoGuides::SNAP_HORIZ = 1; -const KoGuides::SnaptqStatus KoGuides::SNAP_VERT = 2; -const KoGuides::SnaptqStatus KoGuides::SNAP_BOTH = 3; +const KoGuides::SnapStatus KoGuides::SNAP_NONE = 0; +const KoGuides::SnapStatus KoGuides::SNAP_HORIZ = 1; +const KoGuides::SnapStatus KoGuides::SNAP_VERT = 2; +const KoGuides::SnapStatus KoGuides::SNAP_BOTH = 3; KoGuides::KoGuides( KoView *view, KoZoomHandler *zoomHandler ) : m_view( view ) @@ -365,11 +365,11 @@ void KoGuides::getGuideLines( TQValueList<double> &horizontalPos, TQValueList<do } -void KoGuides::snapToGuideLines( KoRect &rect, int snap, SnaptqStatus &snaptqStatus, KoPoint &diff ) +void KoGuides::snapToGuideLines( KoRect &rect, int snap, SnapStatus &snapStatus, KoPoint &diff ) { - if( !(snaptqStatus & SNAP_VERT)) + if( !(snapStatus & SNAP_VERT)) diff.setX(10000); - if( !(snaptqStatus & SNAP_HORIZ)) + if( !(snapStatus & SNAP_HORIZ)) diff.setY(10000); for ( int i = 0; i < GL_END; ++i ) @@ -380,60 +380,60 @@ void KoGuides::snapToGuideLines( KoRect &rect, int snap, SnaptqStatus &snaptqSta if ( ( *it )->orientation == Qt::Horizontal ) { double tmp = (*it)->position - rect.top(); - if ( snaptqStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) ) + if ( snapStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) ) { if(TQABS( tmp ) < TQABS(diff.y())) { diff.setY( tmp ); - snaptqStatus |= SNAP_HORIZ; + snapStatus |= SNAP_HORIZ; } } tmp = (*it)->position - rect.bottom(); - if ( snaptqStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) ) + if ( snapStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) ) { if(TQABS( tmp ) < TQABS(diff.y())) { diff.setY( tmp ); - snaptqStatus |= SNAP_HORIZ; + snapStatus |= SNAP_HORIZ; } } } else { double tmp = (*it)->position - rect.left(); - if ( snaptqStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) ) + if ( snapStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) ) { if(TQABS( tmp ) < TQABS(diff.x())) { diff.setX( tmp ); - snaptqStatus |= SNAP_VERT; + snapStatus |= SNAP_VERT; } } tmp = (*it)->position - rect.right(); - if ( snaptqStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) ) + if ( snapStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) ) { if(TQABS( tmp ) < TQABS(diff.x())) { diff.setX( tmp ); - snaptqStatus |= SNAP_VERT; + snapStatus |= SNAP_VERT; } } } } } - if(!(snaptqStatus & SNAP_VERT)) + if(!(snapStatus & SNAP_VERT)) diff.setX( 0 ); - if(!(snaptqStatus & SNAP_HORIZ)) + if(!(snapStatus & SNAP_HORIZ)) diff.setY( 0 ); } -void KoGuides::snapToGuideLines( KoPoint &pos, int snap, SnaptqStatus &snaptqStatus, KoPoint &diff ) +void KoGuides::snapToGuideLines( KoPoint &pos, int snap, SnapStatus &snapStatus, KoPoint &diff ) { - if( !(snaptqStatus & SNAP_VERT)) + if( !(snapStatus & SNAP_VERT)) diff.setX(10000); - if( !(snaptqStatus & SNAP_HORIZ)) + if( !(snapStatus & SNAP_HORIZ)) diff.setY(10000); for ( int i = 0; i < GL_END; ++i ) @@ -444,34 +444,34 @@ void KoGuides::snapToGuideLines( KoPoint &pos, int snap, SnaptqStatus &snaptqSta if ( ( *it )->orientation == Qt::Horizontal ) { double tmp = (*it)->position - pos.y(); - if ( snaptqStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) ) + if ( snapStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) ) { if(TQABS( tmp ) < TQABS(diff.y())) { diff.setY( tmp ); - snaptqStatus |= SNAP_HORIZ; + snapStatus |= SNAP_HORIZ; } } } else { double tmp = (*it)->position - pos.x(); - if ( snaptqStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) ) + if ( snapStatus & SNAP_VERT || TQABS( tmp ) < m_zoomHandler->unzoomItX( snap ) ) { if(TQABS( tmp ) < TQABS(diff.x())) { diff.setX( tmp ); - snaptqStatus |= SNAP_VERT; + snapStatus |= SNAP_VERT; } } } } } - if(!(snaptqStatus & SNAP_VERT)) + if(!(snapStatus & SNAP_VERT)) diff.setX( 0 ); - if(!(snaptqStatus & SNAP_HORIZ)) + if(!(snapStatus & SNAP_HORIZ)) diff.setY( 0 ); } @@ -530,7 +530,7 @@ void KoGuides::repaintSnapping( const KoRect &snappedRect ) } -void KoGuides::repaintSnapping( const KoPoint &snappedPoint, SnaptqStatus snaptqStatus ) +void KoGuides::repaintSnapping( const KoPoint &snappedPoint, SnapStatus snapStatus ) { bool needRepaint = false; for ( int i = 0; i < GL_END; ++i ) @@ -538,7 +538,7 @@ void KoGuides::repaintSnapping( const KoPoint &snappedPoint, SnaptqStatus snaptq TQValueList<KoGuideLine *>::const_iterator it = m_guideLines[i].begin(); for ( ; it != m_guideLines[i].end(); ++it ) { - if ( ( *it )->orientation == Qt::Horizontal && ( snaptqStatus & SNAP_HORIZ ) ) + if ( ( *it )->orientation == Qt::Horizontal && ( snapStatus & SNAP_HORIZ ) ) { if( virtuallyEqual( snappedPoint.y(), (*it)->position ) ) { @@ -556,7 +556,7 @@ void KoGuides::repaintSnapping( const KoPoint &snappedPoint, SnaptqStatus snaptq } else { - if ( snaptqStatus & SNAP_VERT ) + if ( snapStatus & SNAP_VERT ) { if( virtuallyEqual( snappedPoint.x(), (*it)->position ) ) { @@ -754,7 +754,7 @@ void KoGuides::slotRemove() void KoGuides::paint() { - m_view->canvas()->tqrepaint( false ); + m_view->canvas()->repaint( false ); } diff --git a/lib/kofficeui/KoGuides.h b/lib/kofficeui/KoGuides.h index b98b0472..c1f66138 100644 --- a/lib/kofficeui/KoGuides.h +++ b/lib/kofficeui/KoGuides.h @@ -58,8 +58,8 @@ public: */ void paintGuides( TQPainter &painter ); - typedef int SnaptqStatus; - static const SnaptqStatus SNAP_NONE, SNAP_HORIZ, SNAP_VERT, SNAP_BOTH; + typedef int SnapStatus; + static const SnapStatus SNAP_NONE, SNAP_HORIZ, SNAP_VERT, SNAP_BOTH; /** * @brief Handle mousePressEvent @@ -148,17 +148,17 @@ public: * @brief Snap rect to guidelines * * This looks for a guide which is in reach for the guide as defined in snap. - * This method has the abillity to combine more calls. The snaptqStatus and diff args are both input and - * output. On first call you should set snaptqStatus to 0. The return value would then show in which + * This method has the abillity to combine more calls. The snapStatus and diff args are both input and + * output. On first call you should set snapStatus to 0. The return value would then show in which * directions it has snapped. If you combine several KoGuides you can let these output arguments * be input for the next koGuide. That way you'll always catch the nearest guide. * * @param rect the rect which should be snapped * @param snap the distance within the guide should snap - but always snap if already snapped - * @param snaptqStatus if horiz,vert or both directions are snapped (both in and out param). + * @param snapStatus if horiz,vert or both directions are snapped (both in and out param). * @param diff distance away from guide. Only valid if status is snapping (both in and out param) */ - void snapToGuideLines( KoRect &rect, int snap, SnaptqStatus &snaptqStatus, KoPoint &diff ); + void snapToGuideLines( KoRect &rect, int snap, SnapStatus &snapStatus, KoPoint &diff ); /** * @brief Snap rect to guidelines @@ -167,13 +167,13 @@ public: * * @param pos the position which should be snapped * @param snap the distance wherein the guide should snap - but always snap if already snapped - * @param snaptqStatus if horiz,vert or both directions are snapped (both in and out param) + * @param snapStatus if horiz,vert or both directions are snapped (both in and out param) * @param diff distance away from guide. Only valid if status is snapping (both in and out param) */ - void snapToGuideLines( KoPoint &pos, int snap, SnaptqStatus &snaptqStatus, KoPoint &diff ); + void snapToGuideLines( KoPoint &pos, int snap, SnapStatus &snapStatus, KoPoint &diff ); /** - * @brief tqrepaint guides if any changed snapping status + * @brief repaint guides if any changed snapping status * * This issues a paint request if any guides have changed snapping status. * @@ -182,16 +182,16 @@ public: void repaintSnapping( const KoRect &snappedRect ); /** - * @brief tqrepaint guides if any changed snapping status + * @brief repaint guides if any changed snapping status * * This issues a paint request if any guides have changed snapping status. * * @param snappedPoint the point after it has been snapped */ - void repaintSnapping( const KoPoint &snappedPoint, SnaptqStatus snaptqStatus ); + void repaintSnapping( const KoPoint &snappedPoint, SnapStatus snapStatus ); /** - * @brief tqrepaint guides so none is snapped + * @brief repaint guides so none is snapped * * This issues a paint request if any guides have changed snapping status. * It also effectively un-snaps all since it doesn't take an argument @@ -253,9 +253,9 @@ signals: /** * @brief This signal is emitted when guides start/stop painting. * - * With this signal it is possible to only tqrepaint the guides in the paint + * With this signal it is possible to only repaint the guides in the paint * method of the canvas. Just set/unset a flag when this signal is emmited. - * This signal is emitted before and after a tqrepaint is done. + * This signal is emitted before and after a repaint is done. * * @param state true when starting painting guides, false when stopping. */ diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp index 342889c4..50b04c60 100644 --- a/lib/kofficeui/KoInsertLink.cpp +++ b/lib/kofficeui/KoInsertLink.cpp @@ -20,7 +20,7 @@ #include <kapplication.h> #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <kdebug.h> #include <tqlabel.h> @@ -484,7 +484,7 @@ fileLinkPage::fileLinkPage( TQWidget *parent , char *name ) else recentFile->insertStringList( lst); - recentFile->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + recentFile->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); connect( recentFile , TQT_SIGNAL(highlighted ( const TQString &)), this, TQT_SLOT( slotSelectRecentFile( const TQString & ))); diff --git a/lib/kofficeui/KoKoolBar.cpp b/lib/kofficeui/KoKoolBar.cpp index 5f42caae..1db0ee9b 100644 --- a/lib/kofficeui/KoKoolBar.cpp +++ b/lib/kofficeui/KoKoolBar.cpp @@ -218,7 +218,7 @@ KoKoolBarBox::KoKoolBarBox( KoKoolBar *_bar ) : setFrameShape( StyledPanel ); setFrameShadow( Sunken ); // setBackgroundMode( PaletteBase ); - setBackgroundColor( tqcolorGroup().background() ); + setBackgroundColor( colorGroup().background() ); } void KoKoolBarBox::setActiveGroup( KoKoolBarGroup *_grp ) diff --git a/lib/kofficeui/KoPageLayoutColumns.cpp b/lib/kofficeui/KoPageLayoutColumns.cpp index 8ea3b0b9..be51e60e 100644 --- a/lib/kofficeui/KoPageLayoutColumns.cpp +++ b/lib/kofficeui/KoPageLayoutColumns.cpp @@ -23,20 +23,20 @@ #include <KoUnitWidgets.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> -KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout) +KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& layout) : KoPageLayoutColumnsBase(parent) { m_columns = columns; TQHBoxLayout *lay = new TQHBoxLayout(previewPane); - m_preview = new KoPagePreview( previewPane, "Preview", tqlayout ); + m_preview = new KoPagePreview( previewPane, "Preview", layout ); lay->addWidget(m_preview); lay = new TQHBoxLayout(columnSpacingPane); m_spacing = new KoUnitDoubleSpinBox( columnSpacingPane ); m_spacing->setValue( m_columns.ptColumnSpacing ); m_spacing->setUnit( unit ); double dStep = KoUnit::fromUserValue( 0.2, unit ); - m_spacing->setMinMaxStep( 0, tqlayout.ptWidth/2, dStep ); + m_spacing->setMinMaxStep( 0, layout.ptWidth/2, dStep ); lay->addWidget(m_spacing); labelSpacing->setBuddy( m_spacing ); nColumns->setValue( m_columns.columns ); @@ -63,8 +63,8 @@ void KoPageLayoutColumns::nSpaceChanged( double spacing ) { emit propertyChange(m_columns); } -void KoPageLayoutColumns::setLayout(KoPageLayout &tqlayout) { - m_preview->setPageLayout( tqlayout ); +void KoPageLayoutColumns::setLayout(KoPageLayout &layout) { + m_preview->setPageLayout( layout ); } #include <KoPageLayoutColumns.moc> diff --git a/lib/kofficeui/KoPageLayoutColumns.h b/lib/kofficeui/KoPageLayoutColumns.h index 8ebac1b2..b9dcd6c2 100644 --- a/lib/kofficeui/KoPageLayoutColumns.h +++ b/lib/kofficeui/KoPageLayoutColumns.h @@ -43,15 +43,15 @@ public: * @param parent the parent widget * @param columns the KoColumns data structure that this dialog should be initialzed with * @param unit the unit-type (mm/cm/inch) that the dialog should show - * @param tqlayout the page tqlayout that the preview should be initialzed with. + * @param layout the page layout that the preview should be initialzed with. */ - KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout); + KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& layout); /** - * Update the page preview widget with the param tqlayout. - * @param tqlayout the new tqlayout + * Update the page preview widget with the param layout. + * @param layout the new layout */ - void setLayout(KoPageLayout &tqlayout); + void setLayout(KoPageLayout &layout); public slots: /** diff --git a/lib/kofficeui/KoPageLayoutColumnsBase.ui b/lib/kofficeui/KoPageLayoutColumnsBase.ui index 325fe45e..07cced25 100644 --- a/lib/kofficeui/KoPageLayoutColumnsBase.ui +++ b/lib/kofficeui/KoPageLayoutColumnsBase.ui @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/lib/kofficeui/KoPageLayoutDia.cpp b/lib/kofficeui/KoPageLayoutDia.cpp index 0b410bf1..24e32a7a 100644 --- a/lib/kofficeui/KoPageLayoutDia.cpp +++ b/lib/kofficeui/KoPageLayoutDia.cpp @@ -34,7 +34,7 @@ #include <kmessagebox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqlineedit.h> #include <tqbuttongroup.h> @@ -49,10 +49,10 @@ /******************************************************************/ /*===================== constrcutor ==============================*/ -KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& tqlayout ) +KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& layout ) : TQGroupBox( i18n( "Page Preview" ), parent, name ) { - setPageLayout( tqlayout ); + setPageLayout( layout ); columns = 1; setMinimumSize( 150, 150 ); } @@ -62,15 +62,15 @@ KoPagePreview::~KoPagePreview() { } -/*=================== set tqlayout =================================*/ -void KoPagePreview::setPageLayout( const KoPageLayout &tqlayout ) +/*=================== set layout =================================*/ +void KoPagePreview::setPageLayout( const KoPageLayout &layout ) { // resolution[XY] is in pixel per pt double resolutionX = POINT_TO_INCH( static_cast<double>(KoGlobal::dpiX()) ); double resolutionY = POINT_TO_INCH( static_cast<double>(KoGlobal::dpiY()) ); - m_pageWidth = tqlayout.ptWidth * resolutionX; - m_pageHeight = tqlayout.ptHeight * resolutionY; + m_pageWidth = layout.ptWidth * resolutionX; + m_pageHeight = layout.ptHeight * resolutionY; double zh = 110.0 / m_pageHeight; double zw = 110.0 / m_pageWidth; @@ -79,19 +79,19 @@ void KoPagePreview::setPageLayout( const KoPageLayout &tqlayout ) m_pageWidth *= z; m_pageHeight *= z; - m_textFrameX = tqlayout.ptLeft * resolutionX * z; - m_textFrameY = tqlayout.ptTop * resolutionY * z; - m_textFrameWidth = m_pageWidth - ( tqlayout.ptLeft + tqlayout.ptRight ) * resolutionX * z; - m_textFrameHeight = m_pageHeight - ( tqlayout.ptTop + tqlayout.ptBottom ) * resolutionY * z; + m_textFrameX = layout.ptLeft * resolutionX * z; + m_textFrameY = layout.ptTop * resolutionY * z; + m_textFrameWidth = m_pageWidth - ( layout.ptLeft + layout.ptRight ) * resolutionX * z; + m_textFrameHeight = m_pageHeight - ( layout.ptTop + layout.ptBottom ) * resolutionY * z; - tqrepaint( true ); + repaint( true ); } -/*=================== set tqlayout =================================*/ +/*=================== set layout =================================*/ void KoPagePreview::setPageColumns( const KoColumns &_columns ) { columns = _columns.columns; - tqrepaint( true ); + repaint( true ); } /*======================== draw contents =========================*/ @@ -129,7 +129,7 @@ void KoPagePreview::drawContents( TQPainter *painter ) /*==================== constructor ===============================*/ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, - const KoPageLayout& tqlayout, + const KoPageLayout& layout, const KoHeadFoot& hf, int tabs, KoUnit::Unit unit, bool modal ) : KDialogBase( KDialogBase::Tabbed, i18n("Page Layout"), KDialogBase::Ok | KDialogBase::Cancel, @@ -137,7 +137,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, { flags = tabs; - m_layout = tqlayout; + m_layout = layout; m_unit = unit; m_pageSizeTab = 0; m_columnsTab = 0; @@ -154,7 +154,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, /*==================== constructor ===============================*/ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, - const KoPageLayout& tqlayout, + const KoPageLayout& layout, const KoHeadFoot& hf, const KoColumns& columns, const KoKWHeaderFooter& kwhf, @@ -164,7 +164,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, { flags = tabs; - m_layout = tqlayout; + m_layout = layout; m_column = columns; m_unit = unit; m_pageSizeTab = 0; @@ -186,14 +186,14 @@ KoPageLayoutDia::~KoPageLayoutDia() } /*======================= show dialog ============================*/ -bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent ) +bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent ) { bool res = false; - KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, tabs, unit ); + KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", layout, hf, tabs, unit ); if ( dlg->exec() == TQDialog::Accepted ) { res = true; - if ( tabs & FORMAT_AND_BORDERS ) tqlayout = dlg->tqlayout(); + if ( tabs & FORMAT_AND_BORDERS ) layout = dlg->layout(); if ( tabs & HEADER_AND_FOOTER ) hf = dlg->headFoot(); unit = dlg->unit(); } @@ -204,15 +204,15 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int ta } /*======================= show dialog ============================*/ -bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColumns& columns, +bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, KoColumns& columns, KoKWHeaderFooter &_kwhf, int tabs, KoUnit::Unit& unit, TQWidget* parent ) { bool res = false; - KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, columns, _kwhf, tabs, unit ); + KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", layout, hf, columns, _kwhf, tabs, unit ); if ( dlg->exec() == TQDialog::Accepted ) { res = true; - if ( tabs & FORMAT_AND_BORDERS ) tqlayout = dlg->tqlayout(); + if ( tabs & FORMAT_AND_BORDERS ) layout = dlg->layout(); if ( tabs & HEADER_AND_FOOTER ) hf = dlg->headFoot(); if ( tabs & COLUMNS ) columns = dlg->columns(); if ( tabs & KW_HEADER_AND_FOOTER ) _kwhf = dlg->headerFooter(); @@ -224,7 +224,7 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColu return res; } -/*===================== get a standard page tqlayout ===============*/ +/*===================== get a standard page layout ===============*/ KoPageLayout KoPageLayoutDia::standardLayout() { return KoPageLayout::standardLayout(); @@ -261,17 +261,17 @@ void KoPageLayoutDia::setupTab1( bool enableBorders ) this, TQT_SLOT (sizeUpdated( KoPageLayout&))); } -void KoPageLayoutDia::sizeUpdated(KoPageLayout &tqlayout) { - m_layout.ptWidth = tqlayout.ptWidth; - m_layout.ptHeight = tqlayout.ptHeight; - m_layout.ptLeft = tqlayout.ptLeft; - m_layout.ptRight = tqlayout.ptRight; - m_layout.ptTop = tqlayout.ptTop; - m_layout.ptBottom = tqlayout.ptBottom; - m_layout.format = tqlayout.format; - m_layout.orientation = tqlayout.orientation; +void KoPageLayoutDia::sizeUpdated(KoPageLayout &layout) { + m_layout.ptWidth = layout.ptWidth; + m_layout.ptHeight = layout.ptHeight; + m_layout.ptLeft = layout.ptLeft; + m_layout.ptRight = layout.ptRight; + m_layout.ptTop = layout.ptTop; + m_layout.ptBottom = layout.ptBottom; + m_layout.format = layout.format; + m_layout.orientation = layout.orientation; if(m_columnsTab) - m_columnsTab->setLayout(tqlayout); + m_columnsTab->setLayout(layout); } /*================ setup header and footer tab ===================*/ @@ -282,9 +282,9 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf ) // ------------- header --------------- TQGroupBox *gHead = new TQGroupBox( 0, Qt::Vertical, i18n( "Head Line" ), tab2 ); - gHead->tqlayout()->setSpacing(KDialog::spacingHint()); - gHead->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *headGrid = new TQGridLayout( gHead->tqlayout(), 2, 3 ); + gHead->layout()->setSpacing(KDialog::spacingHint()); + gHead->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *headGrid = new TQGridLayout( gHead->layout(), 2, 3 ); TQLabel *lHeadLeft = new TQLabel( i18n( "Left:" ), gHead ); headGrid->addWidget( lHeadLeft, 0, 0 ); @@ -311,9 +311,9 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf ) // ------------- footer --------------- TQGroupBox *gFoot = new TQGroupBox( 0, Qt::Vertical, i18n( "Foot Line" ), tab2 ); - gFoot->tqlayout()->setSpacing(KDialog::spacingHint()); - gFoot->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *footGrid = new TQGridLayout( gFoot->tqlayout(), 2, 3 ); + gFoot->layout()->setSpacing(KDialog::spacingHint()); + gFoot->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *footGrid = new TQGridLayout( gFoot->layout(), 2, 3 ); TQLabel *lFootLeft = new TQLabel( i18n( "Left:" ), gFoot ); footGrid->addWidget( lFootLeft, 0, 0 ); @@ -362,7 +362,7 @@ void KoPageLayoutDia::setupTab3() TQWidget *tab3 = addPage(i18n( "Col&umns" )); TQHBoxLayout *lay = new TQHBoxLayout(tab3); m_columnsTab = new KoPageLayoutColumns(tab3, m_column, m_unit, m_layout); - m_columnsTab->tqlayout()->setMargin(0); + m_columnsTab->layout()->setMargin(0); lay->addWidget(m_columnsTab); m_columnsTab->show(); connect (m_columnsTab, TQT_SIGNAL( propertyChange(KoColumns&)), @@ -382,7 +382,7 @@ void KoPageLayoutDia::setupTab4(const KoKWHeaderFooter kwhf ) TQWidget *tab4 = addPage(i18n( "H&eader && Footer" )); TQHBoxLayout *lay = new TQHBoxLayout(tab4); m_headerTab = new KoPageLayoutHeader(tab4, m_unit, kwhf); - m_headerTab->tqlayout()->setMargin(0); + m_headerTab->layout()->setMargin(0); lay->addWidget(m_headerTab); m_headerTab->show(); diff --git a/lib/kofficeui/KoPageLayoutDia.h b/lib/kofficeui/KoPageLayoutDia.h index 21fe7df3..1ed23ec5 100644 --- a/lib/kofficeui/KoPageLayoutDia.h +++ b/lib/kofficeui/KoPageLayoutDia.h @@ -61,7 +61,7 @@ public: ~KoPagePreview(); /** - * set page tqlayout + * set page layout */ void setPageLayout( const KoPageLayout& ); void setPageColumns( const KoColumns& ); @@ -78,7 +78,7 @@ protected: class KoPageLayoutDiaPrivate; /** - * With this dialog the user can specify the tqlayout of the paper during printing. + * With this dialog the user can specify the layout of the paper during printing. */ class KOFFICEUI_EXPORT KoPageLayoutDia : public KDialogBase { @@ -92,14 +92,14 @@ public: * * @param parent The parent of the dialog. * @param name The name of the dialog. - * @param tqlayout The tqlayout. + * @param layout The layout. * @param headfoot The header and the footer. * @param flags a variable with all features this dialog should show. * @param unit The unit to use for displaying the values to the user. * @param modal Whether the dialog is modal or not. */ KoPageLayoutDia( TQWidget* parent, const char* name, - const KoPageLayout& tqlayout, + const KoPageLayout& layout, const KoHeadFoot& headfoot, int flags, KoUnit::Unit unit, bool modal=true ); @@ -108,7 +108,7 @@ public: * * @param parent The parent of the dialog. * @param name The name of the dialog. - * @param tqlayout The tqlayout. + * @param layout The layout. * @param headfoot The header and the footer. * @param columns The number of columns on the page. * @param kwheadfoot The KWord header and footer. @@ -116,7 +116,7 @@ public: * @param unit The unit to use for displaying the values to the user */ KoPageLayoutDia( TQWidget* parent, const char* name, - const KoPageLayout& tqlayout, + const KoPageLayout& layout, const KoHeadFoot& headfoot, const KoColumns& columns, const KoKWHeaderFooter& kwheadfoot, @@ -128,26 +128,26 @@ public: ~KoPageLayoutDia(); /** - * Show page tqlayout dialog. + * Show page layout dialog. * See constructor for documentation on the parameters */ static bool pageLayout( KoPageLayout&, KoHeadFoot&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 ); /** - * Show page tqlayout dialog. + * Show page layout dialog. * See constructor for documentation on the parameters */ static bool pageLayout( KoPageLayout&, KoHeadFoot&, KoColumns&, KoKWHeaderFooter&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 ); /** - * Retrieves a standard page tqlayout. + * Retrieves a standard page layout. * Deprecated: better use KoPageLayout::standardLayout() */ static KDE_DEPRECATED KoPageLayout standardLayout(); /** - * Returns the tqlayout + * Returns the layout */ - const KoPageLayout& tqlayout() const { return m_layout; } + const KoPageLayout& layout() const { return m_layout; } /** * Returns the header and footer information @@ -177,7 +177,7 @@ private: TQLineEdit *eFootMid; TQLineEdit *eFootRight; - // tqlayout + // layout KoPageLayout m_layout; KoColumns m_column; @@ -189,7 +189,7 @@ protected slots: virtual void slotOk(); private slots: - void sizeUpdated(KoPageLayout &tqlayout); + void sizeUpdated(KoPageLayout &layout); void columnsUpdated(KoColumns &columns); private: diff --git a/lib/kofficeui/KoPageLayoutHeader.cpp b/lib/kofficeui/KoPageLayoutHeader.cpp index 00296957..5878ead5 100644 --- a/lib/kofficeui/KoPageLayoutHeader.cpp +++ b/lib/kofficeui/KoPageLayoutHeader.cpp @@ -20,7 +20,7 @@ #include <KoPageLayoutHeader.moc> #include <KoUnitWidgets.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> KoPageLayoutHeader::KoPageLayoutHeader(TQWidget *parent, KoUnit::Unit unit, const KoKWHeaderFooter &kwhf) diff --git a/lib/kofficeui/KoPageLayoutHeaderBase.ui b/lib/kofficeui/KoPageLayoutHeaderBase.ui index b3bd7978..7f36378e 100644 --- a/lib/kofficeui/KoPageLayoutHeaderBase.ui +++ b/lib/kofficeui/KoPageLayoutHeaderBase.ui @@ -45,7 +45,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -120,7 +120,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -187,7 +187,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/lib/kofficeui/KoPageLayoutSize.cpp b/lib/kofficeui/KoPageLayoutSize.cpp index 6ddf9409..0e8e034c 100644 --- a/lib/kofficeui/KoPageLayoutSize.cpp +++ b/lib/kofficeui/KoPageLayoutSize.cpp @@ -28,15 +28,15 @@ #include <kdebug.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqhbox.h> #include <tqvgroupbox.h> #include <tqhbuttongroup.h> -KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,const KoColumns& columns, bool unitChooser, bool enableBorders) +KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, KoUnit::Unit unit,const KoColumns& columns, bool unitChooser, bool enableBorders) : TQWidget(parent), m_blockSignals(false) { - m_layout = tqlayout; + m_layout = layout; m_unit = unit; TQGridLayout *grid1 = new TQGridLayout( this, 5, 2, 0, KDialog::spacingHint() ); @@ -61,7 +61,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayou else { TQString str=KoUnit::unitDescription(unit); - TQLabel *lpgUnit = new TQLabel( i18n("All values are given in %1.").tqarg(str), this ); + TQLabel *lpgUnit = new TQLabel( i18n("All values are given in %1.").arg(str), this ); grid1->addWidget( lpgUnit, 0, 0, TQt::AlignLeft ); } @@ -130,7 +130,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayou marginsFrame->setMargin( KDialog::marginHint() ); grid1->addWidget( marginsFrame, 3, 0 ); - TQGridLayout *marginsLayout = new TQGridLayout( marginsFrame->tqlayout(), 3, 3, + TQGridLayout *marginsLayout = new TQGridLayout( marginsFrame->layout(), 3, 3, KDialog::spacingHint() ); // left margin @@ -160,9 +160,9 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayou // ------------- spacers ----------- TQWidget* spacer1 = new TQWidget( this ); TQWidget* spacer2 = new TQWidget( this ); - spacer1->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, + spacer1->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); - spacer2->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, + spacer2->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); grid1->addWidget( spacer1, 4, 0 ); grid1->addWidget( spacer2, 4, 1 ); diff --git a/lib/kofficeui/KoPageLayoutSize.h b/lib/kofficeui/KoPageLayoutSize.h index d917b349..6d50e014 100644 --- a/lib/kofficeui/KoPageLayoutSize.h +++ b/lib/kofficeui/KoPageLayoutSize.h @@ -42,13 +42,13 @@ public: /** * Contructor * @param parent the parent widget - * @param tqlayout the page tqlayout that this widget should be initialzed with. + * @param layout the page layout that this widget should be initialzed with. * @param unit the unit-type (mm/cm/inch) that the dialog should show * @param columns the KoColumns (amout of columns) that the preview should be initialized with * @param unitChooser if true a combobox with the unit-type is shown for the user to change * @param enableBorders if true enable the user to change the margins (aka borders) of the page */ - KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit, + KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, KoUnit::Unit unit, const KoColumns& columns, bool unitChooser, bool enableBorders); /** @@ -78,11 +78,11 @@ public slots: signals: /** * Emitted whenever the user changed something in the dialog. - * @param tqlayout the update tqlayout structure with currently displayed info. + * @param layout the update layout structure with currently displayed info. * Note that the info may not be fully correct and physically possible (in which * case queryClose will return false) */ - void propertyChange(KoPageLayout &tqlayout); + void propertyChange(KoPageLayout &layout); protected: TQComboBox *cpgFormat; diff --git a/lib/kofficeui/KoPartSelectAction.cpp b/lib/kofficeui/KoPartSelectAction.cpp index ca24b89a..17bda1e3 100644 --- a/lib/kofficeui/KoPartSelectAction.cpp +++ b/lib/kofficeui/KoPartSelectAction.cpp @@ -64,7 +64,7 @@ void KoPartSelectAction::init() // Called when selecting a part void KoPartSelectAction::slotActionActivated() { - TQString servName = TQString::tqfromLatin1( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() ); + TQString servName = TQString::fromLatin1( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() ); KService::Ptr serv = KService::serviceByName( servName ); m_documentEntry = KoDocumentEntry( serv ); emit activated(); diff --git a/lib/kofficeui/KoPartSelectDia.cpp b/lib/kofficeui/KoPartSelectDia.cpp index b5271b97..144b8a08 100644 --- a/lib/kofficeui/KoPartSelectDia.cpp +++ b/lib/kofficeui/KoPartSelectDia.cpp @@ -56,7 +56,7 @@ KoPartSelectDia::KoPartSelectDia( TQWidget* parent, const char* name ) : selectionChanged( 0 ); setFocus(); - resize( listview->tqsizeHint().width() + 20, 300 ); + resize( listview->sizeHint().width() + 20, 300 ); } void KoPartSelectDia::selectionChanged( TQListViewItem *item ) diff --git a/lib/kofficeui/KoPictureFilePreview.cpp b/lib/kofficeui/KoPictureFilePreview.cpp index 7baed8f9..e06f2127 100644 --- a/lib/kofficeui/KoPictureFilePreview.cpp +++ b/lib/kofficeui/KoPictureFilePreview.cpp @@ -24,7 +24,7 @@ #include <klocale.h> #include <kurl.h> #include <tqbitmap.h> -#include <tqlayout.h> +#include <layout.h> #include <tqfileinfo.h> #include <tqpainter.h> #include <tqscrollview.h> diff --git a/lib/kofficeui/KoRuler.cpp b/lib/kofficeui/KoRuler.cpp index 212becd7..b11b0604 100644 --- a/lib/kofficeui/KoRuler.cpp +++ b/lib/kofficeui/KoRuler.cpp @@ -44,7 +44,7 @@ public: bool whileMovingBorderLeft, whileMovingBorderRight; bool whileMovingBorderTop, whileMovingBorderBottom; TQPixmap pmFirst, pmLeft; - KoPageLayout tqlayout; + KoPageLayout layout; KoTabChooser *tabChooser; KoTabulatorList tabList; // Do we have to remove a certain tab in the DC Event? @@ -93,7 +93,7 @@ KoRuler::KoRuler( TQWidget *_parent, TQWidget *_canvas, Qt::Orientation _orienta d->canvas = _canvas; orientation = _orientation; - d->tqlayout = _layout; + d->layout = _layout; d->flags = _flags; d->m_bReadWrite=true; @@ -125,11 +125,11 @@ KoRuler::KoRuler( TQWidget *_parent, TQWidget *_canvas, Qt::Orientation _orienta d->removeTab.type = T_INVALID; if ( orientation == Qt::Horizontal ) { - frameStart = tqRound( zoomIt(d->tqlayout.ptLeft) ); - d->frameEnd = tqRound( zoomIt(d->tqlayout.ptWidth - d->tqlayout.ptRight) ); + frameStart = tqRound( zoomIt(d->layout.ptLeft) ); + d->frameEnd = tqRound( zoomIt(d->layout.ptWidth - d->layout.ptRight) ); } else { - frameStart = tqRound( zoomIt(d->tqlayout.ptTop) ); - d->frameEnd = tqRound( zoomIt(d->tqlayout.ptHeight - d->tqlayout.ptBottom) ); + frameStart = tqRound( zoomIt(d->layout.ptTop) ); + d->frameEnd = tqRound( zoomIt(d->layout.ptHeight - d->layout.ptBottom) ); } m_bFrameStartSet = false; @@ -209,12 +209,12 @@ void KoRuler::drawHorizontal( TQPainter *_painter ) // Use a double-buffer pixmap TQPainter p( &buffer ); - p.fillRect( 0, 0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) ); + p.fillRect( 0, 0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) ); - int totalw = tqRound( zoomIt(d->tqlayout.ptWidth) ); + int totalw = tqRound( zoomIt(d->layout.ptWidth) ); TQString str; - p.setBrush( tqcolorGroup().brush( TQColorGroup::Base ) ); + p.setBrush( colorGroup().brush( TQColorGroup::Base ) ); // Draw white rect TQRect r; @@ -279,13 +279,13 @@ void KoRuler::drawHorizontal( TQPainter *_painter ) // Draw ending bar (at page width) //int constant=zoomIt(1); //p.drawLine( totalw - diffx + constant, 1, totalw - diffx + constant, height() - 1 ); - //p.setPen( tqcolorGroup().color( TQColorGroup::Base ) ); + //p.setPen( colorGroup().color( TQColorGroup::Base ) ); //p.drawLine( totalw - diffx, 1, totalw - diffx, height() - 1 ); // Draw starting bar (at 0) - //p.setPen( tqcolorGroup().color( TQColorGroup::Text ) ); + //p.setPen( colorGroup().color( TQColorGroup::Text ) ); //p.drawLine( -diffx, 1, -diffx, height() - 1 ); - //p.setPen( tqcolorGroup().color( TQColorGroup::Base ) ); + //p.setPen( colorGroup().color( TQColorGroup::Base ) ); //p.drawLine( -diffx - constant, 1, -diffx - constant, height() - 1 ); // Draw the indents triangles @@ -307,7 +307,7 @@ void KoRuler::drawHorizontal( TQPainter *_painter ) // Show the mouse position if ( d->action == A_NONE && showMPos ) { - p.setPen( tqcolorGroup().color( TQColorGroup::Text ) ); + p.setPen( colorGroup().color( TQColorGroup::Text ) ); p.drawLine( mposX, 1, mposX, height() - 1 ); } hasToDelete = false; @@ -325,7 +325,7 @@ void KoRuler::drawTabs( TQPainter &_painter ) { int ptPos = 0; - _painter.setPen( TQPen( tqcolorGroup().color( TQColorGroup::Text ), 2, SolidLine ) ); + _painter.setPen( TQPen( colorGroup().color( TQColorGroup::Text ), 2, SolidLine ) ); // Check if we're in a mousemove event, removing a tab. // In that case, we'll have to skip drawing that one. bool willRemove = d->mousePressed && willRemoveTab( d->oldMy ) && d->currTab.type != T_INVALID; @@ -356,7 +356,7 @@ void KoRuler::drawTabs( TQPainter &_painter ) _painter.drawLine( ptPos + 4, height() - 4, ptPos + 20 - 4, height() - 4 ); _painter.drawLine( ptPos + 20 / 2, 4, ptPos + 20 / 2, height() - 4 ); _painter.fillRect( ptPos + 20 / 2 + 2, height() - 9, 3, 3, - tqcolorGroup().color( TQColorGroup::Text ) ); + colorGroup().color( TQColorGroup::Text ) ); } break; default: break; } @@ -371,9 +371,9 @@ void KoRuler::drawVertical( TQPainter *_painter ) resize( TQMAX( fm.height() + 4, 20 ), height() ); TQPainter p( &buffer ); - p.fillRect( 0, 0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) ); + p.fillRect( 0, 0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) ); - int totalh = tqRound( zoomIt(d->tqlayout.ptHeight) ); + int totalh = tqRound( zoomIt(d->layout.ptHeight) ); // Clip rect - this gives basically always a rect like (2,2,width-2,height-2) TQRect paintRect = _painter->clipRegion( TQPainter::CoordPainter ).boundingRect(); // Ruler rect @@ -382,7 +382,7 @@ void KoRuler::drawVertical( TQPainter *_painter ) if ( paintRect.intersects( rulerRect ) ) { TQString str; - p.setBrush( tqcolorGroup().brush( TQColorGroup::Base ) ); + p.setBrush( colorGroup().brush( TQColorGroup::Base ) ); // Draw white rect TQRect r; @@ -454,19 +454,19 @@ void KoRuler::drawVertical( TQPainter *_painter ) // Draw ending bar (at page height) //p.drawLine( 1, totalh - diffy + 1, width() - 1, totalh - diffy + 1 ); - //p.setPen( tqcolorGroup().color( TQColorGroup::Base ) ); + //p.setPen( colorGroup().color( TQColorGroup::Base ) ); //p.drawLine( 1, totalh - diffy, width() - 1, totalh - diffy ); // Draw starting bar (at 0) - //p.setPen( tqcolorGroup().color( TQColorGroup::Text ) ); + //p.setPen( colorGroup().color( TQColorGroup::Text ) ); //p.drawLine( 1, -diffy, width() - 1, -diffy ); - //p.setPen( tqcolorGroup().color( TQColorGroup::Base ) ); + //p.setPen( colorGroup().color( TQColorGroup::Base ) ); //p.drawLine( 1, -diffy - 1, width() - 1, -diffy - 1 ); } // Show the mouse position if ( d->action == A_NONE && showMPos ) { - p.setPen( tqcolorGroup().color( TQColorGroup::Text ) ); + p.setPen( colorGroup().color( TQColorGroup::Text ) ); p.drawLine( 1, mposY, width() - 1, mposY ); } hasToDelete = false; @@ -598,7 +598,7 @@ void KoRuler::mouseReleaseEvent( TQMouseEvent *e ) if ( d->canvas ) drawLine(d->oldMx, -1); update(); - emit newPageLayout( d->tqlayout ); + emit newPageLayout( d->layout ); } else if ( d->action == A_BR_TOP || d->action == A_BR_BOTTOM ) { d->whileMovingBorderTop = false; d->whileMovingBorderBottom = false; @@ -610,7 +610,7 @@ void KoRuler::mouseReleaseEvent( TQMouseEvent *e ) p.end(); } update(); - emit newPageLayout( d->tqlayout ); + emit newPageLayout( d->layout ); } else if ( d->action == A_FIRST_INDENT ) { if ( d->canvas ) drawLine(d->oldMx, -1); @@ -667,12 +667,12 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e ) hasToDelete = false; int pw = d->frameEnd - frameStart; - int ph = tqRound(zoomIt(d->tqlayout.ptHeight)); + int ph = tqRound(zoomIt(d->layout.ptHeight)); int left = frameStart - diffx; - int top = tqRound(zoomIt(d->tqlayout.ptTop)); + int top = tqRound(zoomIt(d->layout.ptTop)); top -= diffy; int right = d->frameEnd - diffx; - int bottom = tqRound(zoomIt(d->tqlayout.ptBottom)); + int bottom = tqRound(zoomIt(d->layout.ptBottom)); bottom = ph - bottom - diffy; // Cumulate first-line-indent int ip_first = tqRound( zoomIt( i_first + ( d->rtl ? d->i_right : i_left) ) ); @@ -693,13 +693,13 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e ) /////// ###### // At the moment, moving the left and right border indicators // is disabled when setFrameStartEnd has been called (i.e. in KWord) - // Changing the tqlayout margins directly from it would be utterly wrong + // Changing the layout margins directly from it would be utterly wrong // (just try the 2-columns modes...). What needs to be done is: // emitting a signal frameResized in mouseReleaseEvent, when a left/right // border has been moved, and in kword we need to update the margins from // there, if the left border of the 1st column or the right border of the // last column was moved... and find what to do with the other borders. - // And for normal frames, resize the frame without touching the page tqlayout. + // And for normal frames, resize the frame without touching the page layout. // All that is too much for now -> disabling. if ( !m_bFrameStartSet ) { @@ -747,7 +747,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e ) case A_BR_LEFT: { if ( d->canvas && mx < right-10 && mx+diffx-2 > 0) { drawLine( d->oldMx, mx ); - d->tqlayout.ptLeft = unZoomIt(static_cast<double>(mx + diffx)); + d->layout.ptLeft = unZoomIt(static_cast<double>(mx + diffx)); if( ip_left > right-left-15 ) { ip_left=right-left-15; ip_left=ip_left<0 ? 0 : ip_left; @@ -770,7 +770,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e ) case A_BR_RIGHT: { if ( d->canvas && mx > left+10 && mx+diffx <= pw-2) { drawLine( d->oldMx, mx ); - d->tqlayout.ptRight = unZoomIt(static_cast<double>(pw - ( mx + diffx ))); + d->layout.ptRight = unZoomIt(static_cast<double>(pw - ( mx + diffx ))); if( ip_left > right-left-15 ) { ip_left=right-left-15; ip_left=ip_left<0 ? 0 : ip_left; @@ -895,7 +895,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e ) p.drawLine( 0, d->oldMy, d->canvas->width(), d->oldMy ); p.drawLine( 0, my, d->canvas->width(), my ); p.end(); - d->tqlayout.ptTop = unZoomIt(static_cast<double>(my + diffy)); + d->layout.ptTop = unZoomIt(static_cast<double>(my + diffy)); d->oldMx = mx; d->oldMy = my; update(); @@ -910,7 +910,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e ) p.drawLine( 0, d->oldMy, d->canvas->width(), d->oldMy ); p.drawLine( 0, my, d->canvas->width(), my ); p.end(); - d->tqlayout.ptBottom = unZoomIt(static_cast<double>(ph - ( my + diffy ))); + d->layout.ptBottom = unZoomIt(static_cast<double>(ph - ( my + diffy ))); d->oldMx = mx; d->oldMy = my; update(); @@ -984,7 +984,7 @@ void KoRuler::handleDoubleClick() // Double-clicked nothing d->action = A_NONE; - emit doubleClicked(); // usually page tqlayout dialog + emit doubleClicked(); // usually page layout dialog } void KoRuler::setTabList( const KoTabulatorList & _tabList ) @@ -1176,7 +1176,7 @@ void KoRuler::slotMenuActivated( int i ) } } -TQSize KoRuler::tqminimumSizeHint() const +TQSize KoRuler::minimumSizeHint() const { TQSize size; TQFont font = KGlobalSettings::toolBarFont(); @@ -1188,14 +1188,14 @@ TQSize KoRuler::tqminimumSizeHint() const return size; } -TQSize KoRuler::tqsizeHint() const +TQSize KoRuler::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } void KoRuler::setPageLayout( const KoPageLayout& _layout ) { - d->tqlayout = _layout; + d->layout = _layout; update(); } diff --git a/lib/kofficeui/KoRuler.h b/lib/kofficeui/KoRuler.h index 5cea5678..352e6820 100644 --- a/lib/kofficeui/KoRuler.h +++ b/lib/kofficeui/KoRuler.h @@ -96,7 +96,7 @@ class KoRulerPrivate; * and supports zooming, tabulators, paragraph indents, showing the mouse position, etc. * * It also offers a popupmenu upon right-clicking, for changing the unit, - * the page tqlayout, or removing a tab. + * the page layout, or removing a tab. */ class KOFFICEUI_EXPORT KoRuler : public TQFrame { @@ -139,7 +139,7 @@ public: const double& zoom() const { return m_zoom; } /** - * Set the page tqlayout, see @ref KoPageLayout. + * Set the page layout, see @ref KoPageLayout. * This defines the size of the page and the margins, * from which the size of the ruler is deducted. */ @@ -246,12 +246,12 @@ public: /** * Reimplemented from TQWidget */ - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; /** * Reimplemented from TQWidget */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; signals: void newPageLayout( const KoPageLayout & ); diff --git a/lib/kofficeui/KoTabBar.cpp b/lib/kofficeui/KoTabBar.cpp index e33ce12c..02c34f2d 100644 --- a/lib/kofficeui/KoTabBar.cpp +++ b/lib/kofficeui/KoTabBar.cpp @@ -37,7 +37,7 @@ // TODO // improvement possibilities // - use offscreen buffer to reduce flicker even more -// - keep track of tabs, only (re)tqlayout when necessary +// - keep track of tabs, only (re)layout when necessary // - paint all tabs to buffer, show only by shifting // - customizable button pixmaps // - use TQStyle to paint the tabs & buttons (is it good/possible?) @@ -57,7 +57,7 @@ public: // read-only: no mouse drag, double-click, right-click bool readOnly; - // if true, tqlayout is from right to left + // if true, layout is from right to left bool reverseLayout; // list of all tabs, in order of appearance @@ -273,20 +273,20 @@ void KoTabBarPrivate::drawTab( TQPainter& painter, TQRect& rect, const TQString& painter.save(); // fill it first - TQBrush bg = tabbar->tqcolorGroup().background(); - if( active ) bg = TQBrush(tabbar->tqcolorGroup().base()); + TQBrush bg = tabbar->colorGroup().background(); + if( active ) bg = TQBrush(tabbar->colorGroup().base()); painter.setBrush( bg ); painter.setPen( TQPen( TQt::NoPen ) ); painter.drawPolygon( polygon ); // draw the lines - painter.setPen( tabbar->tqcolorGroup().dark() ); + painter.setPen( tabbar->colorGroup().dark() ); if( !active ) painter.drawLine( rect.x()-25, rect.y(), rect.right()+25, rect.top() ); // TQt4: painter.setRenderHint( TQPainter::Antialiasing ); painter.drawPolyline( polygon ); - painter.setPen( tabbar->tqcolorGroup().buttonText() ); + painter.setPen( tabbar->colorGroup().buttonText() ); TQFont f = painter.font(); if( active ) f.setBold( true ); painter.setFont( f ); @@ -660,10 +660,10 @@ void KoTabBar::paintEvent( TQPaintEvent* ) TQPainter painter; TQPixmap pm( size() ); - pm.fill( tqcolorGroup().background() ); - painter.tqbegin( TQT_TQPAINTDEVICE(&pm), this ); + pm.fill( colorGroup().background() ); + painter.begin( TQT_TQPAINTDEVICE(&pm), this ); - painter.setPen( tqcolorGroup().dark() ); + painter.setPen( colorGroup().dark() ); painter.drawLine( 0, 0, width(), 0 ); if( !d->reverseLayout ) @@ -722,9 +722,9 @@ void KoTabBar::resizeEvent( TQResizeEvent* ) update(); } -TQSize KoTabBar::tqsizeHint() const +TQSize KoTabBar::sizeHint() const { - return TQSize( 40, tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent, this ) ); + return TQSize( 40, tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, this ) ); } void KoTabBar::renameTab( const TQString& old_name, const TQString& new_name ) diff --git a/lib/kofficeui/KoTabBar.h b/lib/kofficeui/KoTabBar.h index 39cf03b8..0c4233b4 100644 --- a/lib/kofficeui/KoTabBar.h +++ b/lib/kofficeui/KoTabBar.h @@ -219,7 +219,7 @@ public slots: */ void clear(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; signals: diff --git a/lib/kofficeui/KoTabChooser.cpp b/lib/kofficeui/KoTabChooser.cpp index ed891e89..19d93764 100644 --- a/lib/kofficeui/KoTabChooser.cpp +++ b/lib/kofficeui/KoTabChooser.cpp @@ -94,7 +94,7 @@ void KoTabChooser::mousePressEvent( TQMouseEvent *e ) else if ( flags & TAB_RIGHT ) currType = TAB_RIGHT; } break; } - tqrepaint( true ); + repaint( true ); } break; case Qt::RightButton: { TQPoint pnt( TQCursor::pos() ); diff --git a/lib/kofficeui/KoTabChooser.h b/lib/kofficeui/KoTabChooser.h index 31ad0f85..fb9a0591 100644 --- a/lib/kofficeui/KoTabChooser.h +++ b/lib/kofficeui/KoTabChooser.h @@ -71,10 +71,10 @@ protected: KoTabChooserPrivate *d; protected slots: - void rbLeft() { currType = TAB_LEFT; tqrepaint( true ); } - void rbCenter() { currType = TAB_CENTER; tqrepaint( true ); } - void rbRight() { currType = TAB_RIGHT; tqrepaint( true ); } - void rbDecPoint() { currType = TAB_DEC_PNT; tqrepaint( true ); } + void rbLeft() { currType = TAB_LEFT; repaint( true ); } + void rbCenter() { currType = TAB_CENTER; repaint( true ); } + void rbRight() { currType = TAB_RIGHT; repaint( true ); } + void rbDecPoint() { currType = TAB_DEC_PNT; repaint( true ); } }; diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp index 1e526133..6fe4f550 100644 --- a/lib/kofficeui/KoTemplateChooseDia.cpp +++ b/lib/kofficeui/KoTemplateChooseDia.cpp @@ -47,7 +47,7 @@ #include <kaboutdata.h> #include <tqapplication.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtabwidget.h> #include <tqcombobox.h> #include <tqcheckbox.h> @@ -84,7 +84,7 @@ class MyFileDialog : public KFileDialog ok = TQFile::exists( url.path() ); if ( !ok ) { // Maybe offer to create a new document with that name? (see alos KoDocument::openFile) - KMessageBox::error( this, i18n( "The file %1 does not exist." ).tqarg( url.path() ) ); + KMessageBox::error( this, i18n( "The file %1 does not exist." ).arg( url.path() ) ); } } return ok; @@ -165,7 +165,7 @@ class KoTemplateChooseDiaPrivate { // choose a file MyFileDialog *m_filedialog; - // for the tqlayout + // for the layout TQTabWidget* tabWidget; TQWidget* newTab; TQWidget* existingTab; @@ -298,13 +298,13 @@ KoTemplateChooseDia::DialogType KoTemplateChooseDia::getDialogType() const { /*================================================================*/ // private -void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout * tqlayout) +void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout * layout) { d->m_recent = new KoTCDRecentFilesIconView(widgetbase, "recent files"); // I prefer the icons to be in "most recent first" order (DF) d->m_recent->setSorting( static_cast<TQDir::SortSpec>( TQDir::Time | TQDir::Reversed ) ); - tqlayout->addWidget(d->m_recent,0,0); + layout->addWidget(d->m_recent,0,0); TQString oldGroup = d->m_instance->config()->group(); d->m_instance->config()->setGroup( "RecentFiles" ); @@ -312,7 +312,7 @@ void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout int i = 0; TQString value; do { - TQString key=TQString( "File%1" ).tqarg( i ); + TQString key=TQString( "File%1" ).arg( i ); value=d->m_instance->config()->readPathEntry( key ); if ( !value.isEmpty() ) { // Support for tdelibs-3.5's new RecentFiles format: name[url] @@ -342,7 +342,7 @@ void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout /*================================================================*/ // private -void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout * tqlayout) +void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout * layout) { TQString dir = TQString(); TQPoint point( 0, 0 ); @@ -353,7 +353,7 @@ void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout * "file dialog", false); - tqlayout->addWidget(d->m_filedialog,0,0); + layout->addWidget(d->m_filedialog,0,0); d->m_filedialog->reparent( widgetbase , point ); //d->m_filedialog->setOperationMode( KFileDialog::Opening); @@ -387,20 +387,20 @@ void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout * /*================================================================*/ // private -void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayout * tqlayout) +void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayout * layout) { d->m_jwidget = new KJanusWidget( widgetbase, "kjanuswidget", KJanusWidget::IconList); - tqlayout->addWidget(d->m_jwidget,0,0); + layout->addWidget(d->m_jwidget,0,0); d->boxdescription = new TQVGroupBox( i18n("Selected Template"), widgetbase, "boxdescription"); - tqlayout->addWidget(d->boxdescription, 1, 0 ); + layout->addWidget(d->boxdescription, 1, 0 ); // config KConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" ); @@ -429,11 +429,11 @@ void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayou group->name(), group->first()->loadPicture(d->m_instance)); - TQGridLayout * tqlayout = new TQGridLayout(frame); + TQGridLayout * layout = new TQGridLayout(frame); KoTCDIconCanvas *canvas = new KoTCDIconCanvas( frame ); - tqlayout->addWidget(canvas,0,0); + layout->addWidget(canvas,0,0); - canvas->setBackgroundColor( tqcolorGroup().base() ); + canvas->setBackgroundColor( colorGroup().base() ); canvas->setResizeMode(TQIconView::Adjust); canvas->setWordWrapIconText( true ); canvas->show(); @@ -478,10 +478,10 @@ void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayou currentChanged(itemtoselect); // setup the checkbox - TQString translatedstring = i18n("Always start %1 with the selected template").tqarg(d->m_nativeName); + TQString translatedstring = i18n("Always start %1 with the selected template").arg(d->m_nativeName); d->m_nodiag = new TQCheckBox ( translatedstring , widgetbase); - tqlayout->addWidget(d->m_nodiag, 2, 0); + layout->addWidget(d->m_nodiag, 2, 0); TQString startwithoutdialog = grp.readEntry( "NoStartDlg" ); bool ischecked = startwithoutdialog == TQString("yes"); @@ -642,7 +642,7 @@ void KoTemplateChooseDia::slotOk() static const char* const s_returnTypes[] = { 0 /*Cancel ;)*/, "Template", "File", "Empty" }; if ( d->m_returnType <= Empty ) { - grp.writeEntry( "LastReturnType", TQString::tqfromLatin1(s_returnTypes[d->m_returnType]) ); + grp.writeEntry( "LastReturnType", TQString::fromLatin1(s_returnTypes[d->m_returnType]) ); if (d->m_returnType == Template) { grp.writeEntry( "TemplateTab", d->m_jwidget->activePageIndex() ); @@ -706,7 +706,7 @@ bool KoTemplateChooseDia::collectInfo() KURL url = item->url(); if(url.isLocalFile() && !TQFile::exists(url.path())) { - KMessageBox::error( this, i18n( "The file %1 does not exist." ).tqarg( url.path() ) ); + KMessageBox::error( this, i18n( "The file %1 does not exist." ).arg( url.path() ) ); return false; } d->m_fullTemplateName = url.url(); @@ -793,12 +793,12 @@ void KoTCDRecentFilesIconView::showToolTip( TQIconViewItem* item ) // and another one for deciding what's the text of the tooltip... const KFileItem *fi = ( (KFileIconViewItem*)item )->fileInfo(); TQString toolTipText = fi->url().prettyURL( 0, KURL::StripFileProtocol ); - toolTip = new TQLabel( TQString::tqfromLatin1(" %1 ").tqarg(toolTipText), 0, + toolTip = new TQLabel( TQString::fromLatin1(" %1 ").arg(toolTipText), 0, "myToolTip", WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM ); toolTip->setFrameStyle( TQFrame::Plain | TQFrame::Box ); toolTip->setLineWidth( 1 ); - toolTip->tqsetAlignment( AlignLeft | AlignTop ); + toolTip->setAlignment( AlignLeft | AlignTop ); toolTip->move( TQCursor::pos() + TQPoint( 14, 14 ) ); toolTip->adjustSize(); TQRect screen = TQApplication::desktop()->screenGeometry( @@ -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->tqsetPalette( TQToolTip::palette(), TRUE ); + toolTip->setPalette( TQToolTip::palette(), TRUE ); toolTip->show(); } diff --git a/lib/kofficeui/KoTemplateChooseDia.h b/lib/kofficeui/KoTemplateChooseDia.h index 677c11b1..9363477d 100644 --- a/lib/kofficeui/KoTemplateChooseDia.h +++ b/lib/kofficeui/KoTemplateChooseDia.h @@ -236,9 +236,9 @@ private: TQString descriptionText(const TQString &name, const TQString &description); void setupDialog(); - void setupTemplateDialog(TQWidget * widgetbase, TQGridLayout * tqlayout); - void setupFileDialog(TQWidget * widgetbase, TQGridLayout * tqlayout); - void setupRecentDialog(TQWidget * widgetbase, TQGridLayout * tqlayout); + void setupTemplateDialog(TQWidget * widgetbase, TQGridLayout * layout); + void setupFileDialog(TQWidget * widgetbase, TQGridLayout * layout); + void setupRecentDialog(TQWidget * widgetbase, TQGridLayout * layout); bool collectInfo(); bool noStartupDlg() const; diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp index 6243b9dc..53770a42 100644 --- a/lib/kofficeui/KoTemplateCreateDia.cpp +++ b/lib/kofficeui/KoTemplateCreateDia.cpp @@ -23,7 +23,7 @@ #include <KoTemplateCreateDia.h> #include <tqfile.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqgroupbox.h> #include <tqradiobutton.h> @@ -142,15 +142,15 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, KInstan TQVBoxLayout *rightbox=new TQVBoxLayout(mbox); TQGroupBox *pixbox=new TQGroupBox(i18n("Picture"), mainwidget); rightbox->addWidget(pixbox); - TQVBoxLayout *pixtqlayout=new TQVBoxLayout(pixbox, KDialogBase::marginHint(), + TQVBoxLayout *pixlayout=new TQVBoxLayout(pixbox, KDialogBase::marginHint(), KDialogBase::spacingHint()); - pixtqlayout->addSpacing(pixbox->fontMetrics().height()/2); - pixtqlayout->addStretch(1); + pixlayout->addSpacing(pixbox->fontMetrics().height()/2); + pixlayout->addStretch(1); d->m_default=new TQRadioButton(i18n("&Default"), pixbox); d->m_default->setChecked(true); connect(d->m_default, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDefault())); - pixtqlayout->addWidget(d->m_default); - TQHBoxLayout *custombox=new TQHBoxLayout(pixtqlayout); + pixlayout->addWidget(d->m_default); + TQHBoxLayout *custombox=new TQHBoxLayout(pixlayout); d->m_custom=new TQRadioButton(i18n("Custom"), pixbox); d->m_custom->setChecked(false); connect(d->m_custom, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustom())); @@ -159,19 +159,19 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, KInstan connect(d->m_select, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelect())); custombox->addWidget(d->m_select, 1); custombox->addStretch(1); - pixtqlayout->addStretch(1); + pixlayout->addStretch(1); label=new TQLabel(i18n("Preview:"), pixbox); - pixtqlayout->addWidget(label); - TQHBoxLayout *previewbox=new TQHBoxLayout(pixtqlayout); + pixlayout->addWidget(label); + TQHBoxLayout *previewbox=new TQHBoxLayout(pixlayout); previewbox->addStretch(10); d->m_preview=new TQLabel(pixbox); // setPixmap() -> auto resize? previewbox->addWidget(d->m_preview); previewbox->addStretch(10); - pixtqlayout->addStretch(8); + pixlayout->addStretch(8); d->m_defaultTemplate = new TQCheckBox( i18n("Use the new template as default"), mainwidget ); d->m_defaultTemplate->setChecked( true ); - TQToolTip::add( d->m_defaultTemplate, i18n("Use the new template every time %1 starts").tqarg(instance->aboutData()->programName() ) ); + TQToolTip::add( d->m_defaultTemplate, i18n("Use the new template every time %1 starts").arg(instance->aboutData()->programName() ) ); rightbox->addWidget( d->m_defaultTemplate ); enableButtonOK(false); diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp index db4d6467..556dce02 100644 --- a/lib/kofficeui/KoToolBox.cpp +++ b/lib/kofficeui/KoToolBox.cpp @@ -22,7 +22,7 @@ #include <tqtoolbutton.h> #include <tqlabel.h> #include <tqtooltip.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpixmap.h> #include <tqtoolbar.h> #include <tqdockwindow.h> diff --git a/lib/kofficeui/KoToolBox.h b/lib/kofficeui/KoToolBox.h index 764ce4c1..7b31d847 100644 --- a/lib/kofficeui/KoToolBox.h +++ b/lib/kofficeui/KoToolBox.h @@ -104,7 +104,7 @@ public: TQWidget* getNextParent(); private: - TQPtrList<TQWidget> m_tqchildren; + TQPtrList<TQWidget> m_children; TQBoxLayout *m_layout; TQWidget *m_leftRow; diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp index 7260bbea..abe449b2 100644 --- a/lib/kofficeui/KoTooluButton.cpp +++ b/lib/kofficeui/KoTooluButton.cpp @@ -53,12 +53,12 @@ KoColorPanel::~KoColorPanel() { } -TQSize KoColorPanel::tqsizeHint() const +TQSize KoColorPanel::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } -TQSize KoColorPanel::tqminimumSizeHint() const +TQSize KoColorPanel::minimumSizeHint() const { return TQSize( COLS << 4, lines() << 4 ); } @@ -109,7 +109,7 @@ void KoColorPanel::clear() if ( m_colorMap.isEmpty() ) return; - TQSize area( tqminimumSizeHint() ); + TQSize area( minimumSizeHint() ); m_colorMap.clear(); init(); updateGeometry(); @@ -136,7 +136,7 @@ void KoColorPanel::insertDefaultColors() return; m_defaultsAdded = true; - int currentRow = m_nextPosition.y; // we have to tqrepaint this row below + int currentRow = m_nextPosition.y; // we have to repaint this row below // Note: No checking for duplicates, so take care when you modify that list insertColor(TQColor( 255 , 0 , 0 ), i18n( "color", "Red" ), false); @@ -294,9 +294,9 @@ void KoColorPanel::insertDefaultColors() insertColor(TQColor( 0 , 0 , 205 ), i18n( "color", "MediumBlue" ), false); insertColor(TQColor( 0 , 0 , 128 ), i18n( "color", "Navy" ), false); - finalizeInsertion( m_nextPosition ); // with a no-op paint() call as we tqrepaint anyway + finalizeInsertion( m_nextPosition ); // with a no-op paint() call as we repaint anyway updateGeometry(); - // we have to tqrepaint the "old" current row explicitly due + // we have to repaint the "old" current row explicitly due // to WStaticContents update( 0, currentRow << 4, COLS << 4, 16 ); } @@ -369,7 +369,7 @@ void KoColorPanel::paintEvent( TQPaintEvent* e ) if ( hasFocus() && m_focusPosition.x != -1 && m_focusPosition.y != -1 && mapFromPosition( m_focusPosition ).intersects( e->rect() ) ) tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ), - tqcolorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled ); + colorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled ); --lns; // Attention: We just avoid some lns - 1 statements @@ -580,7 +580,7 @@ void KoColorPanel::updateFocusPosition( const Position& newPosition ) if ( it != m_colorMap.end() ) { // draw at the new focus position tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ), - tqcolorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled ); + colorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled ); p.fillRect( ( m_focusPosition.x << 4 ) + 2, ( m_focusPosition.y << 4 ) + 2, 12, 12, it.data() ); } @@ -663,21 +663,21 @@ KoToolButton::~KoToolButton() { } -TQSize KoToolButton::tqsizeHint() const +TQSize KoToolButton::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } -TQSize KoToolButton::tqminimumSizeHint() const +TQSize KoToolButton::minimumSizeHint() const { - TQSize size = KToolBarButton::tqminimumSizeHint(); + TQSize size = KToolBarButton::minimumSizeHint(); size.setWidth( size.width() + ARROW_WIDTH ); return size; } -TQSize KoToolButton::tqminimumSize() const +TQSize KoToolButton::minimumSize() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } void KoToolButton::colorSelected( const TQColor& color ) @@ -691,7 +691,7 @@ void KoToolButton::drawButton(TQPainter *_painter) TQStyle::SCFlags active = TQStyle::SC_None; TQStyle::SCFlags arrowActive = TQStyle::SC_None; TQStyleOption opt; - TQColorGroup cg( tqcolorGroup() ); + TQColorGroup cg( colorGroup() ); if ( isEnabled() ) { flags |= TQStyle::Style_Enabled; @@ -712,10 +712,10 @@ void KoToolButton::drawButton(TQPainter *_painter) // Draw styled toolbuttons _painter->setClipRect( 0, 0, width() - ARROW_WIDTH, height() ); - tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( 0, 0, width() - ARROW_WIDTH, height() ), cg, + tqstyle().drawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( 0, 0, width() - ARROW_WIDTH, height() ), cg, flags, TQStyle::SC_ToolButton, active, opt ); _painter->setClipRect( width() - ARROW_WIDTH, 0, ARROW_WIDTH, height() ); - tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( width(), 0, ARROW_WIDTH, height() ), cg, + tqstyle().drawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( width(), 0, ARROW_WIDTH, height() ), cg, arrowFlags, TQStyle::SC_ToolButton, arrowActive, opt ); _painter->setClipping( false ); @@ -724,7 +724,7 @@ void KoToolButton::drawButton(TQPainter *_painter) cg, flags, opt ); if ( KToolBarButton::isRaised() || m_arrowPressed ) - qDrawShadeLine( _painter, width() - ARROW_WIDTH - 1, 0, width() - ARROW_WIDTH - 1, height() - 1, tqcolorGroup(), true ); + qDrawShadeLine( _painter, width() - ARROW_WIDTH - 1, 0, width() - ARROW_WIDTH - 1, height() - 1, colorGroup(), true ); int dx, dy; TQFont tmp_font( KGlobalSettings::toolBarFont() ); @@ -798,11 +798,11 @@ void KoToolButton::drawButton(TQPainter *_painter) if (!textLabel().isNull() && !textRect.isNull()) { _painter->setFont( KGlobalSettings::toolBarFont() ); if ( !isEnabled() ) - _painter->setPen( tqpalette().disabled().dark() ); + _painter->setPen( palette().disabled().dark() ); else if( KToolBarButton::isRaised() ) _painter->setPen( KGlobalSettings::toolBarHighlightColor() ); else - _painter->setPen( tqcolorGroup().buttonText() ); + _painter->setPen( colorGroup().buttonText() ); _painter->drawText( textRect, textFlags, textLabel() ); } } @@ -838,15 +838,15 @@ void KoToolButton::init() // We are interested in the mouse clicks on the arrow button m_popup->installEventFilter( this ); - ARROW_WIDTH = tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator) + 4; + ARROW_WIDTH = tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator) + 4; kdDebug() << "##################### Arrow: " << ARROW_WIDTH << endl; } void KoToolButton::buttonShift( int& dx, int& dy ) { if ( isDown() && !m_arrowPressed ) { - dx += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal ); - dy += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical ); + dx += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal ); + dy += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical ); } } diff --git a/lib/kofficeui/KoTooluButton.h b/lib/kofficeui/KoTooluButton.h index 1374f6d2..804b270b 100644 --- a/lib/kofficeui/KoTooluButton.h +++ b/lib/kofficeui/KoTooluButton.h @@ -34,8 +34,8 @@ public: KoColorPanel( TQWidget* parent = 0, const char* name = 0 ); virtual ~KoColorPanel(); - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; enum MenuStyle { Plain, CustomColors }; static TQPopupMenu* createColorPopup( MenuStyle style, const TQColor& defaultColor, @@ -163,9 +163,9 @@ public: virtual ~KoToolButton(); - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; - virtual TQSize tqminimumSize() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; + virtual TQSize minimumSize() const; public slots: void colorSelected( const TQColor& color ); diff --git a/lib/kofficeui/KoUnitWidgets.cpp b/lib/kofficeui/KoUnitWidgets.cpp index 476e35b3..a5af7bdf 100644 --- a/lib/kofficeui/KoUnitWidgets.cpp +++ b/lib/kofficeui/KoUnitWidgets.cpp @@ -24,7 +24,7 @@ #include <kglobal.h> #include <klocale.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> // ---------------------------------------------------------------- @@ -90,7 +90,7 @@ KoUnitDoubleValidator::validate( TQString &s, int &pos ) const TQString KoUnitDoubleBase::getVisibleText( double value ) const { - const TQString num ( TQString( "%1%2").tqarg( KGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) ); + const TQString num ( TQString( "%1%2").arg( KGlobal::locale()->formatNumber( value, m_precision ), KoUnit::unitName( m_unit ) ) ); kdDebug(30004) << "getVisibleText: " << TQString::number( value, 'f', 12 ) << " => " << num << endl; return num; } @@ -223,7 +223,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, const char *name ) : KLineEdit( parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 ) { - tqsetAlignment( TQt::AlignRight ); + setAlignment( TQt::AlignRight ); m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) ); setValidator( m_validator ); setUnit( KoUnit::U_PT ); @@ -235,7 +235,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, double lower, doub : KLineEdit( parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ), m_lowerInPoints( lower ), m_upperInPoints( upper ) { - tqsetAlignment( TQt::AlignRight ); + setAlignment( TQt::AlignRight ); m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) ); setValidator( m_validator ); setUnit( unit ); @@ -287,7 +287,7 @@ double KoUnitDoubleLineEdit::value( void ) const KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, const char *name ) : KComboBox( true, parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 ) { - lineEdit()->tqsetAlignment( TQt::AlignRight ); + lineEdit()->setAlignment( TQt::AlignRight ); m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) ); lineEdit()->setValidator( m_validator ); setUnit( KoUnit::U_PT ); @@ -300,7 +300,7 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, doub : KComboBox( true, parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ), m_lowerInPoints( lower ), m_upperInPoints( upper ) { - lineEdit()->tqsetAlignment( TQt::AlignRight ); + lineEdit()->setAlignment( TQt::AlignRight ); m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) ); lineEdit()->setValidator( m_validator ); setUnit( unit ); @@ -379,48 +379,48 @@ double KoUnitDoubleComboBox::value( void ) const KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, const char *name ) : TQWidget( parent ), m_step( 1.0 ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 ); - //tqlayout->setMargin( 2 ); + TQGridLayout *layout = new TQGridLayout( this, 2, 3 ); + //layout->setMargin( 2 ); TQPushButton *up = new TQPushButton( "+", this ); //up->setFlat( true ); up->setMaximumHeight( 15 ); up->setMaximumWidth( 15 ); - tqlayout->addWidget( up, 0, 0 ); + layout->addWidget( up, 0, 0 ); connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) ); TQPushButton *down = new TQPushButton( "-", this ); down->setMaximumHeight( 15 ); down->setMaximumWidth( 15 ); - tqlayout->addWidget( down, 1, 0 ); + layout->addWidget( down, 1, 0 ); connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) ); m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( 0.0, KoUnit::U_PT ), KoUnit::ptToUnit( 9999.99, KoUnit::U_PT ), 0.0, KoUnit::U_PT, 2, name ); connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) ); - tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 ); + layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 ); } KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, double lower, double upper, double step, double value, KoUnit::Unit unit, unsigned int precision, const char *name ) : TQWidget( parent ), m_step( step )//, m_lowerInPoints( lower ), m_upperInPoints( upper ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 ); - //tqlayout->setMargin( 2 ); + TQGridLayout *layout = new TQGridLayout( this, 2, 3 ); + //layout->setMargin( 2 ); TQPushButton *up = new TQPushButton( "+", this ); //up->setFlat( true ); up->setMaximumHeight( 15 ); up->setMaximumWidth( 15 ); - tqlayout->addWidget( up, 0, 0 ); + layout->addWidget( up, 0, 0 ); connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) ); TQPushButton *down = new TQPushButton( "-", this ); down->setMaximumHeight( 15 ); down->setMaximumWidth( 15 ); - tqlayout->addWidget( down, 1, 0 ); + layout->addWidget( down, 1, 0 ); connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) ); m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( lower, unit ), KoUnit::ptToUnit( upper, unit ), value, unit, precision, name ); connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) ); - tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 ); + layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 ); } void diff --git a/lib/kofficeui/KoZoomAction.cpp b/lib/kofficeui/KoZoomAction.cpp index 7f9e4139..df1bac4d 100644 --- a/lib/kofficeui/KoZoomAction.cpp +++ b/lib/kofficeui/KoZoomAction.cpp @@ -69,10 +69,10 @@ void KoZoomAction::setZoom( const TQString& text ) // update items with new sorted zoom values TQStringList values; for (TQValueList<int>::Iterator it = list.begin(); it != list.end(); ++it ) - values.append( i18n("%1%").tqarg(*it) ); + values.append( i18n("%1%").arg(*it) ); setItems( values ); - TQString zoomStr = i18n("%1%").tqarg( zoom ); + TQString zoomStr = i18n("%1%").arg( zoom ); setCurrentItem( values.findIndex( zoomStr ) ); } @@ -92,21 +92,21 @@ void KoZoomAction::init() setEditable( true ); TQStringList values; - values << i18n("%1%").tqarg("33"); - values << i18n("%1%").tqarg("50"); - values << i18n("%1%").tqarg("75"); - values << i18n("%1%").tqarg("100"); - values << i18n("%1%").tqarg("125"); - values << i18n("%1%").tqarg("150"); - values << i18n("%1%").tqarg("200"); - values << i18n("%1%").tqarg("250"); - values << i18n("%1%").tqarg("350"); - values << i18n("%1%").tqarg("400"); - values << i18n("%1%").tqarg("450"); - values << i18n("%1%").tqarg("500"); + values << i18n("%1%").arg("33"); + values << i18n("%1%").arg("50"); + values << i18n("%1%").arg("75"); + values << i18n("%1%").arg("100"); + values << i18n("%1%").arg("125"); + values << i18n("%1%").arg("150"); + values << i18n("%1%").arg("200"); + values << i18n("%1%").arg("250"); + values << i18n("%1%").arg("350"); + values << i18n("%1%").arg("400"); + values << i18n("%1%").arg("450"); + values << i18n("%1%").arg("500"); setItems( values ); - setCurrentItem( values.findIndex( i18n("%1%").tqarg( 100 ) ) ); + setCurrentItem( values.findIndex( i18n("%1%").arg( 100 ) ) ); connect( this, TQT_SIGNAL( activated( const TQString& ) ), TQT_SLOT( activated( const TQString& ) ) ); diff --git a/lib/kofficeui/Kolinewidthaction.cpp b/lib/kofficeui/Kolinewidthaction.cpp index c812c1c6..c2d86aa6 100644 --- a/lib/kofficeui/Kolinewidthaction.cpp +++ b/lib/kofficeui/Kolinewidthaction.cpp @@ -24,7 +24,7 @@ #include <tqbitmap.h> #include <tqwhatsthis.h> #include <tqmenubar.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <kpopupmenu.h> diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp index c0da86e9..e09ef63d 100644 --- a/lib/kofficeui/kcoloractions.cpp +++ b/lib/kofficeui/kcoloractions.cpp @@ -266,7 +266,7 @@ int KSelectColorAction::plug( TQWidget* w, int index ) menu->setItemEnabled( id, false ); if ( !whatsThis().isEmpty() ) - menu->tqsetWhatsThis( id, whatsThisWithIcon() ); + menu->setWhatsThis( id, whatsThisWithIcon() ); addContainer( menu, id ); connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); @@ -341,7 +341,7 @@ TQString KSelectColorAction::whatsThisWithIcon() const { TQString text = whatsThis(); if (!icon().isEmpty()) - return TQString::tqfromLatin1("<img source=\"small|%1\"> %2").tqarg(icon()).tqarg(text); + return TQString::fromLatin1("<img source=\"small|%1\"> %2").arg(icon()).arg(text); return text; } diff --git a/lib/kofficeui/tests/coloraction_test.cpp b/lib/kofficeui/tests/coloraction_test.cpp index 729285bb..4739ee81 100644 --- a/lib/kofficeui/tests/coloraction_test.cpp +++ b/lib/kofficeui/tests/coloraction_test.cpp @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <tqvgroupbox.h> #include <tqpopupmenu.h> #include <tqmenubar.h> @@ -36,19 +36,19 @@ TopLevel::TopLevel( TQWidget* parent, const char* name) : TQMainWindow( parent, name ) { - setCaption( TQString::tqfromLatin1( "KColorAction test application" ) ); + setCaption( TQString::fromLatin1( "KColorAction test application" ) ); TQWidget *w = new TQWidget( this ); setCentralWidget( w ); TQBoxLayout* l = new TQHBoxLayout( w, KDialog::marginHint(), KDialog::spacingHint() ); - TQGroupBox* b1 = new TQVGroupBox( TQString::tqfromLatin1( "KoColorPanel 1" ), w ); + TQGroupBox* b1 = new TQVGroupBox( TQString::fromLatin1( "KoColorPanel 1" ), w ); panel = new KoColorPanel( b1, "panel1" ); connect( panel, TQT_SIGNAL( colorSelected( const TQColor& ) ), TQT_SLOT( slotColorSelected( const TQColor& ) ) ); //panel->insertDefaultColors(); l->addWidget( b1 ); - b1 = new TQVGroupBox( TQString::tqfromLatin1( "KoColorPanel 2" ), w ); + b1 = new TQVGroupBox( TQString::fromLatin1( "KoColorPanel 2" ), w ); ( void ) new KoColorPanel( b1, "panel2" ); l->addWidget( b1 ); diff --git a/lib/kofficeui/tkaction.cpp b/lib/kofficeui/tkaction.cpp index 6a7d198a..c62b7745 100644 --- a/lib/kofficeui/tkaction.cpp +++ b/lib/kofficeui/tkaction.cpp @@ -22,7 +22,7 @@ #include "tkcombobox.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <ktoolbar.h> #include <kiconloader.h> @@ -120,19 +120,19 @@ void TKAction::updateLayout() } } -TQWidget* TKAction::createLayout(TQWidget* parent, TQWidget* tqchildren) +TQWidget* TKAction::createLayout(TQWidget* parent, TQWidget* children) { TQWidget* base = new TQWidget(parent,"KTToolBarLayout"); TQLabel* textLabel = new TQLabel(base,"text"); textLabel->setMinimumHeight(1); TQLabel* pixLabel = new TQLabel(base,"pixmap"); - tqchildren->reparent(base,TQPoint(0,0)); - tqchildren->setName("widget"); - TQHBoxLayout* tqlayout = new TQHBoxLayout(base,0,3); - tqlayout->setResizeMode(TQLayout::Minimum); - tqlayout->addWidget(textLabel); - tqlayout->addWidget(pixLabel); - tqlayout->addWidget(tqchildren,1); + children->reparent(base,TQPoint(0,0)); + children->setName("widget"); + TQHBoxLayout* layout = new TQHBoxLayout(base,0,3); + layout->setResizeMode(TQLayout::Minimum); + layout->addWidget(textLabel); + layout->addWidget(pixLabel); + layout->addWidget(children,1); updateLayout(base); return base; @@ -166,9 +166,9 @@ void TKAction::updateLayout(TQWidget* base) } else pixLabel->hide(); - base->setFixedWidth( w->tqsizeHint().width() + - (textLabel->isVisible() ? textLabel->tqsizeHint().width():0) + - (pixLabel->isVisible() ? pixLabel->tqsizeHint().width():0) ); + base->setFixedWidth( w->sizeHint().width() + + (textLabel->isVisible() ? textLabel->sizeHint().width():0) + + (pixLabel->isVisible() ? pixLabel->sizeHint().width():0) ); } /******************************************************************************/ TKBaseSelectAction::TKBaseSelectAction( TQObject* parent, const char* name ) @@ -191,7 +191,7 @@ int TKBaseSelectAction::plug(TQWidget* widget, int index) TKComboBox* cb = new TKComboBox(m_editable,bar); initComboBox(cb); - cb->setMinimumWidth( cb->tqsizeHint().width() ); + cb->setMinimumWidth( cb->sizeHint().width() ); TQWidget* base = createLayout(bar,cb); bar->insertWidget( id_, 100, base, index ); diff --git a/lib/kofficeui/tkaction.h b/lib/kofficeui/tkaction.h index 26b4069d..b9a84a41 100644 --- a/lib/kofficeui/tkaction.h +++ b/lib/kofficeui/tkaction.h @@ -44,7 +44,7 @@ public: protected: virtual void initToolBarButton(TKToolBarButton*); - TQWidget* createLayout(TQWidget* parent, TQWidget* tqchildren); + TQWidget* createLayout(TQWidget* parent, TQWidget* children); void updateLayout(); virtual void updateLayout(TQWidget*); diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp index 1449d0fb..a425421c 100644 --- a/lib/kofficeui/tkcoloractions.cpp +++ b/lib/kofficeui/tkcoloractions.cpp @@ -22,7 +22,7 @@ #include "tkcoloractions.h" #include "tktoolbarbutton.h" -#include <tqlayout.h> +#include <layout.h> #include <kcolordialog.h> #include <ktoolbar.h> #include <tqpainter.h> diff --git a/lib/kofficeui/tkcombobox.cpp b/lib/kofficeui/tkcombobox.cpp index d1cb7ac2..cd20f790 100644 --- a/lib/kofficeui/tkcombobox.cpp +++ b/lib/kofficeui/tkcombobox.cpp @@ -59,7 +59,7 @@ void TKComboBox::paintEvent(TQPaintEvent*) int bh = height()-4; TQPainter p( this ); - const TQColorGroup& g = tqcolorGroup(); + const TQColorGroup& g = colorGroup(); TQRect fr(2,2,width()-4,height()-4); @@ -87,8 +87,8 @@ void TKComboBox::paintEvent(TQPaintEvent*) TQPixmap pixmap(arrow_down); - tqstyle().tqdrawControl( TQStyle::CE_PushButton, &p, this, TQRect( bx, by, bw, bh ), tqcolorGroup() ); - tqstyle().drawItem( &p, TQRect( bx, by, bw, bh), AlignCenter, tqcolorGroup(), isEnabled(), &pixmap, TQString() ); + tqstyle().drawControl( TQStyle::CE_PushButton, &p, this, TQRect( bx, by, bw, bh ), colorGroup() ); + tqstyle().drawItem( &p, TQRect( bx, by, bw, bh), AlignCenter, colorGroup(), isEnabled(), &pixmap, TQString() ); if ( hasFocus()) { tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, fr, g ); diff --git a/lib/kofficeui/tktoolbarbutton.cpp b/lib/kofficeui/tktoolbarbutton.cpp index b0520a2c..5f829589 100644 --- a/lib/kofficeui/tktoolbarbutton.cpp +++ b/lib/kofficeui/tktoolbarbutton.cpp @@ -182,7 +182,7 @@ void TKToolBarButton::setEnabled( bool enabled ) void TKToolBarButton::setText( const TQString& text) { d->m_text = text; - tqrepaint(false); + repaint(false); } void TKToolBarButton::setIcon( const TQString& icon ) @@ -281,7 +281,7 @@ void TKToolBarButton::setDelayedPopup (TQPopupMenu *p, bool toggle ) void TKToolBarButton::setRaised(bool f) { d->m_isRaised = f; - tqrepaint(false); + repaint(false); } void TKToolBarButton::setAutoRaised(bool f) @@ -308,7 +308,7 @@ void TKToolBarButton::enterEvent(TQEvent *) } else { TQToolButton::setPixmap(disabledPixmap); } - tqrepaint(false); + repaint(false); } } @@ -332,7 +332,7 @@ bool TKToolBarButton::eventFilter(TQObject *o, TQEvent *ev) case TQEvent::Hide: on(false); setDown(false); - if ( !tqgeometry().contains(parentWidget()->mapFromGlobal(TQCursor::pos())) ) + if ( !geometry().contains(parentWidget()->mapFromGlobal(TQCursor::pos())) ) leaveEvent(0L); return false; break; @@ -353,14 +353,14 @@ void TKToolBarButton::drawButton( TQPainter* p ) #define DRAW_PIXMAP_AND_TEXT \ int x = 3;\ if (pixmap()) {\ - tqstyle().drawItem( p, TQRect( x, 0, pixmap()->width(), height() ), AlignCenter, tqcolorGroup(), isEnabled(), pixmap(), TQString() );\ + tqstyle().drawItem( p, TQRect( x, 0, pixmap()->width(), height() ), AlignCenter, colorGroup(), isEnabled(), pixmap(), TQString() );\ if (d->m_iconMode==TK::IconAndText && !d->m_text.isEmpty()) {\ x += pixmap()->width() + 3;\ }\ }\ if ((d->m_iconMode==TK::IconAndText||d->m_iconMode==TK::TextOnly) && !d->m_text.isEmpty()) {\ TQFontMetrics fm(KGlobalSettings::toolBarFont());\ - tqstyle().drawItem( p, TQRect( x, 0, fm.width(d->m_text), height() ), AlignCenter, tqcolorGroup(), isEnabled(), 0, d->m_text );\ + tqstyle().drawItem( p, TQRect( x, 0, fm.width(d->m_text), height() ), AlignCenter, colorGroup(), isEnabled(), 0, d->m_text );\ } const char* arrow[] = { @@ -384,20 +384,20 @@ void TKToolBarButton::drawButton( TQPainter* p ) if (d->m_isRaised) flags |= TQStyle::Style_Raised; if (hasFocus()) flags |= TQStyle::Style_HasFocus; - tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( 0, 0, width()-12, height() ), tqcolorGroup(), flags, TQStyle::SC_ToolButton ); - tqstyle().tqdrawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( width()-13, 0, 13, height() ), tqcolorGroup(), flags, TQStyle::SC_ToolButton ); - tqstyle().drawItem( p, TQRect( width()-13, 0, 13, height() ), AlignCenter, tqcolorGroup(), isEnabled(), &arrow_pix, TQString() ); + tqstyle().drawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( 0, 0, width()-12, height() ), colorGroup(), flags, TQStyle::SC_ToolButton ); + tqstyle().drawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( width()-13, 0, 13, height() ), colorGroup(), flags, TQStyle::SC_ToolButton ); + tqstyle().drawItem( p, TQRect( width()-13, 0, 13, height() ), AlignCenter, colorGroup(), isEnabled(), &arrow_pix, TQString() ); if ( d->m_isRaised ) - qDrawShadeLine( p, width()-12, 0, width()-12, height(), tqcolorGroup(), true ); + qDrawShadeLine( p, width()-12, 0, width()-12, height(), colorGroup(), true ); DRAW_PIXMAP_AND_TEXT } else { - tqstyle().tqdrawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? tqcolorGroup() : tqpalette().disabled(), f ); + tqstyle().drawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? colorGroup() : palette().disabled(), f ); DRAW_PIXMAP_AND_TEXT int z = f ? 1:0; p->drawPixmap(width()-11+z,(height()-4)/2+z ,arrow_pix); } } else { - tqstyle().tqdrawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? tqcolorGroup() : tqpalette().disabled(), f ); + tqstyle().drawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? colorGroup() : palette().disabled(), f ); DRAW_PIXMAP_AND_TEXT } } @@ -409,7 +409,7 @@ void TKToolBarButton::paletteChange(const TQPalette &) TQToolButton::setPixmap( disabledPixmap ); else TQToolButton::setPixmap( defaultPixmap ); - tqrepaint(false); + repaint(false); } void TKToolBarButton::makeDefaultPixmap() @@ -430,14 +430,14 @@ void TKToolBarButton::makeDisabledPixmap() disabledPixmap = effect.apply(activePixmap, KIcon::Toolbar, KIcon::DisabledState); } -TQSize TKToolBarButton::tqsizeHint() const +TQSize TKToolBarButton::sizeHint() const { - return tqminimumSize(); + return minimumSize(); } -TQSize TKToolBarButton::tqminimumSizeHint() const +TQSize TKToolBarButton::minimumSizeHint() const { - return tqminimumSize(); + return minimumSize(); } void TKToolBarButton::showMenu() @@ -502,7 +502,7 @@ void TKToolBarButton::slotToggled() void TKToolBarButton::on(bool flag) { d->m_isOn = flag; - tqrepaint(); + repaint(); } void TKToolBarButton::toggle() @@ -519,14 +519,14 @@ void TKToolBarButton::setToggle(bool flag) disconnect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled())); modeChange(); - tqrepaint(); + repaint(); } void TKToolBarButton::setIconMode( TK::IconMode m ) { d->m_iconMode = m; modeChange(); - tqrepaint(); + repaint(); } #include <tktoolbarbutton.moc> diff --git a/lib/kofficeui/tktoolbarbutton.h b/lib/kofficeui/tktoolbarbutton.h index 3cec2f57..883d7811 100644 --- a/lib/kofficeui/tktoolbarbutton.h +++ b/lib/kofficeui/tktoolbarbutton.h @@ -180,8 +180,8 @@ public: TQPixmap getActivePixmap() const; - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; signals: void buttonClicked(); diff --git a/lib/kopainter/koColorChooser.cc b/lib/kopainter/koColorChooser.cc index e2406a79..dc70b921 100644 --- a/lib/kopainter/koColorChooser.cc +++ b/lib/kopainter/koColorChooser.cc @@ -21,7 +21,7 @@ #include "koColorChooser.h" #include <tqcolor.h> -#include <tqlayout.h> +#include <layout.h> #include <tqspinbox.h> #include <tqtabwidget.h> diff --git a/lib/kopainter/koColorSlider.cc b/lib/kopainter/koColorSlider.cc index 6c1f8230..6e7c0239 100644 --- a/lib/kopainter/koColorSlider.cc +++ b/lib/kopainter/koColorSlider.cc @@ -60,14 +60,14 @@ void KoColorFrame::slotSetColor1(const TQColor &c) mC1 = c; mColorChanged = true; mPixChanged = true; - tqrepaint(); + repaint(); } void KoColorFrame::slotSetColor2(const TQColor &c) { mC2 = c; mColorChanged = true; - tqrepaint(); + repaint(); } void KoColorFrame::drawContents(TQPainter *p) diff --git a/lib/kopainter/koFrameButton.cc b/lib/kopainter/koFrameButton.cc index c87fe230..d5f2dada 100644 --- a/lib/kopainter/koFrameButton.cc +++ b/lib/kopainter/koFrameButton.cc @@ -37,7 +37,7 @@ TQLabel(parent, name) setFrameStyle(Panel | Raised); setLineWidth(1); setText(text); - tqsetAlignment(AlignHCenter | AlignVCenter); + setAlignment(AlignHCenter | AlignVCenter); mActive = false; mToggle = false; } diff --git a/lib/kopainter/koIconChooser.cc b/lib/kopainter/koIconChooser.cc index 4604bbbd..6d122592 100644 --- a/lib/kopainter/koIconChooser.cc +++ b/lib/kopainter/koIconChooser.cc @@ -26,7 +26,7 @@ #include <tqcursor.h> #include <tqapplication.h> #include <tqhbox.h> -#include <tqlayout.h> +#include <layout.h> #include <kdebug.h> KoPixmapWidget::KoPixmapWidget(const TQPixmap &aPixmap, TQWidget *parent, const char *name): @@ -166,7 +166,7 @@ void KoIconChooser::setCurrentItem(KoIconItem *item) mCurRow = index / mNCols; mCurCol = index % mNCols; - // tqrepaint the old and the new item + // repaint the old and the new item repaintCell(oldRow, oldCol); repaintCell(mCurRow, mCurCol); @@ -446,7 +446,7 @@ KoPatternChooser::KoPatternChooser( const TQPtrList<KoIconItem> &list, TQWidget for( itr.toFirst(); itr.current(); ++itr ) chooser->addItem( itr.current() ); - TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 1, -1, "main tqlayout" ); + TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 1, -1, "main layout" ); mainLayout->addWidget( chooser, 10 ); } diff --git a/lib/kopainter/ko_cmyk_widget.cc b/lib/kopainter/ko_cmyk_widget.cc index 1eb9eece..01c71d84 100644 --- a/lib/kopainter/ko_cmyk_widget.cc +++ b/lib/kopainter/ko_cmyk_widget.cc @@ -22,7 +22,7 @@ #include "ko_cmyk_widget.h" -#include <tqlayout.h> +#include <layout.h> #include <tqhbox.h> #include <tqlabel.h> #include <tqspinbox.h> @@ -41,7 +41,7 @@ KoCMYKWidget::KoCMYKWidget(TQWidget *parent, const char *name) : super(parent, name) { m_ColorButton = new KDualColorButton(this); - m_ColorButton -> setFixedSize(m_ColorButton->tqsizeHint()); + m_ColorButton -> setFixedSize(m_ColorButton->sizeHint()); TQGridLayout *mGrid = new TQGridLayout(this, 4, 5, 5, 2); /* setup color sliders */ diff --git a/lib/kopainter/ko_color_wheel.cc b/lib/kopainter/ko_color_wheel.cc index 0c268849..f309125c 100644 --- a/lib/kopainter/ko_color_wheel.cc +++ b/lib/kopainter/ko_color_wheel.cc @@ -49,7 +49,7 @@ void KoColorWheel::drawWheel( TQPixmap *pixmap ) TQPoint center(size/2, size/2); TQImage image( size, size, 32 ); - image.fill(tqcolorGroup ().background().pixel()); + image.fill(colorGroup ().background().pixel()); TQColor col; int a, b, h, s; diff --git a/lib/kopainter/ko_gray_widget.cc b/lib/kopainter/ko_gray_widget.cc index e40031b5..fb59947e 100644 --- a/lib/kopainter/ko_gray_widget.cc +++ b/lib/kopainter/ko_gray_widget.cc @@ -19,7 +19,7 @@ #include "ko_gray_widget.h" -#include <tqlayout.h> +#include <layout.h> #include <tqhbox.h> #include <tqlabel.h> #include <tqspinbox.h> @@ -36,7 +36,7 @@ KoGrayWidget::KoGrayWidget(TQWidget *parent, const char *name) : super(parent, n m_ColorButton = new KDualColorButton(this); Q_CHECK_PTR(m_ColorButton); - m_ColorButton -> setFixedSize(m_ColorButton->tqsizeHint()); + m_ColorButton -> setFixedSize(m_ColorButton->sizeHint()); TQGridLayout *mGrid = new TQGridLayout(this, 3, 5, 5, 2); /* setup color sliders */ diff --git a/lib/kopainter/ko_hsv_widget.cc b/lib/kopainter/ko_hsv_widget.cc index c870248a..840c0b2d 100644 --- a/lib/kopainter/ko_hsv_widget.cc +++ b/lib/kopainter/ko_hsv_widget.cc @@ -21,7 +21,7 @@ #include "ko_color_wheel.h" #include <kselect.h> -#include <tqlayout.h> +#include <layout.h> #include <tqhbox.h> #include <tqlabel.h> #include <tqspinbox.h> @@ -37,7 +37,7 @@ KoHSVWidget::KoHSVWidget(TQWidget *parent, const char *name) : super(parent, name) { m_ColorButton = new KDualColorButton(this); - m_ColorButton -> setFixedSize(m_ColorButton->tqsizeHint()); + m_ColorButton -> setFixedSize(m_ColorButton->sizeHint()); TQGridLayout *mGrid = new TQGridLayout(this, 5, 7, 5, 2); m_colorwheel = new KoColorWheel(this); @@ -96,7 +96,7 @@ KoHSVWidget::KoHSVWidget(TQWidget *parent, const char *name) : super(parent, nam connect(mSIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSChanged(int))); connect(mVIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotVChanged(int))); - //setFixedSize(mGrid -> tqminimumSize()); + //setFixedSize(mGrid -> minimumSize()); m_autovalue = true; // So on the initial selection of h or v, s gets set to 255. update(TQt::black, TQt::white); @@ -236,7 +236,7 @@ void KoHSVWidget::update(const KoColor & fgColor, const KoColor & bgColor) mSIn->blockSignals(false); mVIn->blockSignals(false); m_VSelector->blockSignals(false); - m_VSelector->tqrepaint(false); + m_VSelector->repaint(false); m_colorwheel->blockSignals(false); } diff --git a/lib/kopainter/ko_rgb_widget.cc b/lib/kopainter/ko_rgb_widget.cc index 5eaef38e..1eadfc96 100644 --- a/lib/kopainter/ko_rgb_widget.cc +++ b/lib/kopainter/ko_rgb_widget.cc @@ -21,7 +21,7 @@ #include "ko_rgb_widget.h" -#include <tqlayout.h> +#include <layout.h> #include <tqhbox.h> #include <tqlabel.h> #include <tqspinbox.h> @@ -38,7 +38,7 @@ KoRGBWidget::KoRGBWidget(TQWidget *parent, const char *name) : super(parent, name) { m_ColorButton = new KDualColorButton(this); - m_ColorButton -> setFixedSize(m_ColorButton->tqsizeHint()); + m_ColorButton -> setFixedSize(m_ColorButton->sizeHint()); TQGridLayout *mGrid = new TQGridLayout(this, 3, 5, 5, 2); /* setup color sliders */ diff --git a/lib/kopainter/kogradientmanager.cc b/lib/kopainter/kogradientmanager.cc index c95a5671..a2265d59 100644 --- a/lib/kopainter/kogradientmanager.cc +++ b/lib/kopainter/kogradientmanager.cc @@ -21,7 +21,7 @@ #include "svgnamedcolors.h" -#include <tqtextstream.h> +#include <textstream.h> #include <tqcstring.h> #include <kdebug.h> diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc index 600dad1c..ed9df8e6 100644 --- a/lib/kopalette/kopalette.cc +++ b/lib/kopalette/kopalette.cc @@ -21,12 +21,12 @@ #include <tqlabel.h> #include <tqtoolbutton.h> #include <tqtabwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqimage.h> #include <tqpixmap.h> -#include <tqlayout.h> +#include <layout.h> #include <kdebug.h> #include <kglobal.h> @@ -54,8 +54,8 @@ KoPalette::KoPalette(TQWidget * parent, const char * name) setHorizontallyStretchable(false); setNewLine(true); - tqlayout() -> setSpacing(0); - tqlayout() -> setMargin(0); + layout() -> setSpacing(0); + layout() -> setMargin(0); resetFont(); } @@ -82,7 +82,7 @@ KoPalette::~KoPalette() void KoPalette::setMainWidget(TQWidget * widget) { setWidget(widget); - resize( TQSize(285, 233).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(285, 233).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); widget->setFont(m_font); m_page = widget; diff --git a/lib/kopalette/kopalette.h b/lib/kopalette/kopalette.h index 48d9cb3c..3ea6c475 100644 --- a/lib/kopalette/kopalette.h +++ b/lib/kopalette/kopalette.h @@ -25,7 +25,7 @@ #include <tqpixmap.h> #include <tqstring.h> #include <tqfont.h> -#include <tqlayout.h> +#include <layout.h> #include <koffice_export.h> #include "kopalettemanager.h" diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cc index 94ea8d4d..91d237a3 100644 --- a/lib/kopalette/kopalettemanager.cc +++ b/lib/kopalette/kopalettemanager.cc @@ -165,8 +165,8 @@ void KoPaletteManager::addWidget(TQWidget * widget, } KToggleAction * a; - a = new KToggleAction(i18n("Show %1").tqarg(widget->caption()), 0, m_mapper, TQT_SLOT(map()), m_actionCollection); - a->setCheckedState(i18n("Hide %1").tqarg(widget->caption())); + a = new KToggleAction(i18n("Show %1").arg(widget->caption()), 0, m_mapper, TQT_SLOT(map()), m_actionCollection); + a->setCheckedState(i18n("Hide %1").arg(widget->caption())); m_mapper->setMapping(a, m_widgetNames->count()); // This is the position at which we'll insert the action m_actions->insert( name, a ); diff --git a/lib/kopalette/kopalettemanager.h b/lib/kopalette/kopalettemanager.h index be9e7126..dd8f1686 100644 --- a/lib/kopalette/kopalettemanager.h +++ b/lib/kopalette/kopalettemanager.h @@ -172,7 +172,7 @@ public slots: void showAllPalettes(bool shown); /** - * Restores the palette configuration to the default tqlayout, i.e, the tqlayout + * Restores the palette configuration to the default layout, i.e, the layout * preferred by each docker. */ virtual void slotReset(); diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp index 6ffdcf5c..59983222 100644 --- a/lib/koproperty/editor.cpp +++ b/lib/koproperty/editor.cpp @@ -27,7 +27,7 @@ #include "widget.h" #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqmap.h> #include <tqguardedptr.h> #include <tqheader.h> @@ -233,7 +233,7 @@ Editor::fill() } } -// tqrepaint(); +// repaint(); if (firstChild()) { @@ -271,12 +271,12 @@ Editor::addItem(const TQCString &name, EditorItem *parent) // Create child items item->setOpen(true); - if(!property->tqchildren()) + if(!property->children()) return; last = 0; - TQValueList<Property*>::ConstIterator endIt = property->tqchildren()->constEnd(); - for(TQValueList<Property*>::ConstIterator it = property->tqchildren()->constBegin(); it != endIt; ++it) { + TQValueList<Property*>::ConstIterator endIt = property->children()->constEnd(); + for(TQValueList<Property*>::ConstIterator it = property->children()->constBegin(); it != endIt; ++it) { //! \todo allow to have child prop with child items too if( *it && (*it)->isVisible() ) last = new EditorItem(this, item, *it, last); @@ -366,7 +366,7 @@ Editor::changeSetInternal(Set *set, bool preservePrevSelection, const TQCString& if (item) { d->itemToSelectLater = item; TQTimer::singleShot(10, this, TQT_SLOT(selectItemLater())); - //d->doNotSetFocusOnSelection = !hasParent(this, tqfocusWidget()); + //d->doNotSetFocusOnSelection = !hasParent(this, focusWidget()); //setSelected(item, true); //d->doNotSetFocusOnSelection = false; // ensureItemVisible(item); @@ -590,7 +590,7 @@ Editor::slotClicked(TQListViewItem *it) if (d->currentWidget) { if (d->currentWidget->visibleFlag()) { d->currentWidget->show(); - if (hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(kapp->tqfocusWidget()) )) + if (hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(kapp->focusWidget()) )) d->currentWidget->setFocus(); } } @@ -652,7 +652,7 @@ Editor::createWidgetForProperty(Property *property, bool changeWidgetProperty) this, TQT_SLOT(slotWidgetRejectInput(Widget*)) ); } - //update tqgeometry earlier, because Widget::setValue() can depend on widget's tqgeometry + //update geometry earlier, because Widget::setValue() can depend on widget's geometry updateEditorGeometry(d->currentItem, widget); if(widget && (!widget->property() || changeWidgetProperty)) @@ -720,10 +720,10 @@ Editor::updateGroupLabelsPosition() EditorGroupItem *group = dynamic_cast<EditorGroupItem*>(d->topItem->firstChild()); while(group) { - TQRect r = tqitemRect((TQListViewItem*) group); + TQRect r = itemRect((TQListViewItem*) group); if(group->label()) { group->label()->setGeometry(r); - group->label()->tqrepaint(); + group->label()->repaint(); } group = dynamic_cast<EditorGroupItem*>(group->nextSibling()); } @@ -747,8 +747,8 @@ Editor::showUndoButton( bool show ) if (!d->currentItem || !d->currentWidget || (d->currentWidget && d->currentWidget->isReadOnly())) return; - int y = viewportToContents(TQPoint(0, tqitemRect(d->currentItem).y())).y(); - TQRect tqgeometry(columnWidth(0), y, columnWidth(1) + 1, d->currentItem->height()); + int y = viewportToContents(TQPoint(0, itemRect(d->currentItem).y())).y(); + TQRect geometry(columnWidth(0), y, columnWidth(1) + 1, d->currentItem->height()); d->undoButton->resize(d->baseRowHeight, d->currentItem->height()); updateEditorGeometry(true, show); @@ -756,21 +756,21 @@ Editor::showUndoButton( bool show ) if (!show) { /* if (d->currentWidget) { if (d->currentWidget->leavesTheSpaceForRevertButton()) { - tqgeometry.setWidth(tqgeometry.width()-d->undoButton->width()); + geometry.setWidth(geometry.width()-d->undoButton->width()); } - d->currentWidget->resize(tqgeometry.width(), tqgeometry.height()); + d->currentWidget->resize(geometry.width(), geometry.height()); }*/ d->undoButton->hide(); return; } - TQPoint p = contentsToViewport(TQPoint(0, tqgeometry.y())); - d->undoButton->move(tqgeometry.x() + tqgeometry.width() + TQPoint p = contentsToViewport(TQPoint(0, geometry.y())); + d->undoButton->move(geometry.x() + geometry.width() -((d->currentWidget && d->currentWidget->hasBorders())?1:0)/*editor is moved by 1 to left*/ - d->undoButton->width(), p.y()); // if (d->currentWidget) { // d->currentWidget->move(d->currentWidget->x(), p.y()); -// d->currentWidget->resize(tqgeometry.width()-d->undoButton->width(), tqgeometry.height()); +// d->currentWidget->resize(geometry.width()-d->undoButton->width(), geometry.height()); // } d->undoButton->show(); } @@ -791,7 +791,7 @@ Editor::slotExpanded(TQListViewItem *item) updateEditorGeometry(); updateGroupLabelsPosition(); repaintContents(); - tqrepaint(); + repaint(); } void @@ -815,7 +815,7 @@ Editor::slotCollapsed(TQListViewItem *item) updateEditorGeometry(); updateGroupLabelsPosition(); repaintContents(); - tqrepaint(); + repaint(); } void @@ -826,7 +826,7 @@ Editor::slotColumnSizeChanged(int section, int oldSize, int newSize) Q_UNUSED(newSize); /*for (TQListViewItemIterator it(this); it.current(); ++it) { if (section == 0 && dynamic_cast<EditorGroupItem*>(it.current())) { - it.current()->tqrepaint(); + it.current()->repaint(); } }*/ /* @@ -843,7 +843,7 @@ Editor::slotColumnSizeChanged(int section, int oldSize, int newSize) } }*/ // repaintContents(); -// tqrepaint(); +// repaint(); updateEditorGeometry(); update(); } @@ -869,10 +869,10 @@ Editor::slotColumnSizeChanged(int section) } TQSize -Editor::tqsizeHint() const +Editor::sizeHint() const { return TQSize( TQFontMetrics(font()).width(columnText(0)+columnText(1)+" "), - KListView::tqsizeHint().height()); + KListView::sizeHint().height()); } void @@ -1021,7 +1021,7 @@ Editor::setSorting( int column, bool ascending ) updateEditorGeometry(); updateGroupLabelsPosition(); repaintContents(); - tqrepaint(); + repaint(); } #include "editor.moc" diff --git a/lib/koproperty/editor.h b/lib/koproperty/editor.h index c3ab0c2e..05725529 100644 --- a/lib/koproperty/editor.h +++ b/lib/koproperty/editor.h @@ -77,7 +77,7 @@ class KOPROPERTY_EXPORT Editor : public KListView virtual ~Editor(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual void setFocus(); virtual void setSorting( int column, bool ascending = true ); diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp index 653cbe0a..dc1bb19e 100644 --- a/lib/koproperty/editoritem.cpp +++ b/lib/koproperty/editoritem.cpp @@ -31,7 +31,7 @@ #include <tqheader.h> #include <tqstyle.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <kdebug.h> #include <kiconloader.h> @@ -98,7 +98,7 @@ class GroupWidgetBase : public TQWidget , m_isOpen(true) , m_mouseDown(false) { - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 1)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 1)); } void setText( const TQString &text ) @@ -121,9 +121,9 @@ class GroupWidgetBase : public TQWidget m_isOpen = set; } - virtual TQSize tqsizeHint () const + virtual TQSize sizeHint () const { - TQSize s( TQWidget::tqsizeHint() ); + TQSize s( TQWidget::sizeHint() ); s.setHeight(fontMetrics().height()*2); return s; } @@ -133,9 +133,9 @@ class GroupWidgetBase : public TQWidget TQRect r(rect()); TQPainter p(this); TQStyle::StyleFlags flags = m_mouseDown ? TQStyle::Style_Down : TQStyle::Style_Default; - kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_HeaderSection, &p, r, tqpalette().active(), flags); + kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_HeaderSection, &p, r, palette().active(), flags); - paintListViewExpander(&p, this, r.height()+2, tqpalette().active(), isOpen()); + paintListViewExpander(&p, this, r.height()+2, palette().active(), isOpen()); if (!m_miniicon.isNull()) { p.drawPixmap(24, (r.height()-m_miniicon.height())/2, m_miniicon); } @@ -143,7 +143,7 @@ class GroupWidgetBase : public TQWidget if (!m_titleStr.isNull()) { int indent = 16 + (m_miniicon.isNull() ? 0 : (m_miniicon.width()+4)); - p.setPen(tqpalette().active().text()); + p.setPen(palette().active().text()); TQFont f = p.font(); f.setBold(true); p.setFont(f); @@ -208,7 +208,7 @@ GroupContainer::GroupContainer(const TQString& title, TQWidget* parent) : TQWidget(parent) , d(new Private()) { - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 1)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 1)); d->lyr = new TQVBoxLayout(this); d->groupWidget = new GroupWidgetBase(this); d->groupWidget->setText( title ); @@ -245,7 +245,7 @@ bool GroupContainer::event( TQEvent * e ) { d->contents->show(); else d->contents->hide(); - d->lyr->tqinvalidate(); + d->lyr->invalidate(); update(); } } @@ -563,7 +563,7 @@ EditorGroupItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column, in // return; /*p->setPen( KPROPEDITOR_ITEM_BORDER_COLOR ); //! \todo custom color? - p->setClipRect(listView()->tqitemRect(this)); + p->setClipRect(listView()->itemRect(this)); if(column == 1) p->translate(-listView()->columnWidth(0) + 20, 0); int totalWidth = listView()->columnWidth(0) + listView()->columnWidth(1) - 20; diff --git a/lib/koproperty/editoritem.h b/lib/koproperty/editoritem.h index 9f2c75c2..fc703239 100644 --- a/lib/koproperty/editoritem.h +++ b/lib/koproperty/editoritem.h @@ -72,7 +72,7 @@ class EditorItem : public KListViewItem virtual void paintCell(TQPainter *p, const TQColorGroup & cg, int column, int width, int align); /*! Reimplemented from KListViewItem to draw custom contents. It takes care of drawing the [+] and [-] - signs only if the item has tqchildren. + signs only if the item has children. */ virtual void paintBranches(TQPainter *p, const TQColorGroup &cg, int w, int y, int h); diff --git a/lib/koproperty/editors/booledit.cpp b/lib/koproperty/editors/booledit.cpp index 886f20d8..09d55e94 100644 --- a/lib/koproperty/editors/booledit.cpp +++ b/lib/koproperty/editors/booledit.cpp @@ -30,7 +30,7 @@ #include <tqtoolbutton.h> #include <tqpainter.h> #include <tqvariant.h> -#include <tqlayout.h> +#include <layout.h> #include <tqbitmap.h> using namespace KoProperty; @@ -45,8 +45,8 @@ BoolEdit::BoolEdit(Property *property, TQWidget *parent, const char *name) m_toggle->setFocusPolicy(TQ_WheelFocus); m_toggle->setUsesTextLabel(true); m_toggle->setTextPosition(TQToolButton::Right); - m_toggle->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); - //we're not using tqlayout to because of problems with button size + m_toggle->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + //we're not using layout to because of problems with button size m_toggle->move(0, 0); m_toggle->resize(width(), height()); setFocusWidget(m_toggle); diff --git a/lib/koproperty/editors/coloredit.cpp b/lib/koproperty/editors/coloredit.cpp index a9ab1f1a..f72009e3 100644 --- a/lib/koproperty/editors/coloredit.cpp +++ b/lib/koproperty/editors/coloredit.cpp @@ -21,7 +21,7 @@ #include "coloredit.h" #include <tqvariant.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcolor.h> #include <tqpainter.h> @@ -36,7 +36,7 @@ ColorButton::ColorButton(Property *property, TQWidget *parent, const char *name) m_edit = new KColorCombo(this); m_edit->setFocusPolicy(TQ_NoFocus); connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotValueChanged(int))); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); setFocusWidget(m_edit); diff --git a/lib/koproperty/editors/combobox.cpp b/lib/koproperty/editors/combobox.cpp index 343a9ed9..1dd35a8d 100644 --- a/lib/koproperty/editors/combobox.cpp +++ b/lib/koproperty/editors/combobox.cpp @@ -19,7 +19,7 @@ */ #include "combobox.h" -#include <tqlayout.h> +#include <layout.h> #include <tqmap.h> #include <tqvariant.h> #include <tqpainter.h> @@ -37,7 +37,7 @@ ComboBox::ComboBox(Property *property, TQWidget *parent, const char *name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KComboBox(this); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); diff --git a/lib/koproperty/editors/cursoredit.cpp b/lib/koproperty/editors/cursoredit.cpp index 61d44499..5ff0bb34 100644 --- a/lib/koproperty/editors/cursoredit.cpp +++ b/lib/koproperty/editors/cursoredit.cpp @@ -118,13 +118,13 @@ CursorEdit::value() const void CursorEdit::setValue(const TQVariant &value, bool emitChange) { - ComboBox::setValue(value.toCursor().tqshape(), emitChange); + ComboBox::setValue(value.toCursor().shape(), emitChange); } void CursorEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value) { - ComboBox::drawViewer(p, cg, r, value.toCursor().tqshape()); + ComboBox::drawViewer(p, cg, r, value.toCursor().shape()); } void diff --git a/lib/koproperty/editors/dateedit.cpp b/lib/koproperty/editors/dateedit.cpp index 0df8532a..d6e5c751 100644 --- a/lib/koproperty/editors/dateedit.cpp +++ b/lib/koproperty/editors/dateedit.cpp @@ -23,7 +23,7 @@ #include <tqdatetimeedit.h> #include <tqrangecontrol.h> #include <tqobjectlist.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvariant.h> #include <tqpainter.h> @@ -37,7 +37,7 @@ DateEdit::DateEdit(Property *property, TQWidget *parent, const char *name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQDateEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); diff --git a/lib/koproperty/editors/datetimeedit.cpp b/lib/koproperty/editors/datetimeedit.cpp index 6e12641a..9355f934 100644 --- a/lib/koproperty/editors/datetimeedit.cpp +++ b/lib/koproperty/editors/datetimeedit.cpp @@ -23,7 +23,7 @@ #include <tqdatetimeedit.h> #include <tqrangecontrol.h> #include <tqobjectlist.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqvariant.h> @@ -37,7 +37,7 @@ DateTimeEdit::DateTimeEdit(Property *property, TQWidget *parent, const char *nam { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQDateTimeEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp index 634641b8..09cd7388 100644 --- a/lib/koproperty/editors/fontedit.cpp +++ b/lib/koproperty/editors/fontedit.cpp @@ -24,7 +24,7 @@ #include <tqpushbutton.h> #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvariant.h> #include <tqfont.h> #include <tqfontmetrics.h> @@ -47,7 +47,7 @@ class FontEditRequester : public KFontRequester FontEditRequester(TQWidget* parent) : KFontRequester(parent) { - label()->setPaletteBackgroundColor(tqpalette().active().base()); + label()->setPaletteBackgroundColor(palette().active().base()); label()->setMinimumWidth(0); label()->setFrameShape(TQFrame::Box); label()->setIndent(-1); @@ -55,13 +55,13 @@ class FontEditRequester : public KFontRequester label()->setFocusPolicy(TQ_ClickFocus); KAcceleratorManager::setNoAccel(label()); #endif - tqlayout()->remove(label()); - tqlayout()->remove(button());//->reparent(this, 0, TQPoint(0,0)); - delete tqlayout(); + layout()->remove(label()); + layout()->remove(button());//->reparent(this, 0, TQPoint(0,0)); + delete layout(); button()->setText(i18n("...")); TQToolTip::add(button(), i18n("Change font")); button()->setFocusPolicy(TQ_NoFocus); - button()->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + button()->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); TQFontMetrics fm(button()->font()); button()->setFixedWidth(fm.width(button()->text()+' ')); } diff --git a/lib/koproperty/editors/linestyledit.cpp b/lib/koproperty/editors/linestyledit.cpp index e7f5b2f8..5c3c5b51 100644 --- a/lib/koproperty/editors/linestyledit.cpp +++ b/lib/koproperty/editors/linestyledit.cpp @@ -24,7 +24,7 @@ #include <tqpainter.h> #include <tqpixmap.h> #include <tqcombobox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvariant.h> using namespace KoProperty; @@ -140,7 +140,7 @@ LineStyleEdit::LineStyleEdit(Property *property, TQWidget *parent, const char *n { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQComboBox(this); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp index 92ab746d..3742ae03 100644 --- a/lib/koproperty/editors/pixmapedit.cpp +++ b/lib/koproperty/editors/pixmapedit.cpp @@ -23,7 +23,7 @@ #include "editoritem.h" #include "property.h" -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqlabel.h> #include <tqcursor.h> @@ -58,22 +58,22 @@ PixmapEdit::PixmapEdit(Property *property, TQWidget *parent, const char *name) m_edit = new TQLabel(this, "m_edit"); TQToolTip::add(m_edit, i18n("Click to show image preview")); - m_edit->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + m_edit->setAlignment(TQt::AlignLeft | TQt::AlignVCenter); m_edit->setMinimumHeight(5); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); m_edit->setBackgroundMode(TQt::PaletteBase); m_edit->setMouseTracking(true); setBackgroundMode(TQt::PaletteBase); m_button = new TQPushButton(i18n("..."), this, "m_button"); TQToolTip::add(m_button, i18n("Insert image from file")); - m_button->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_button->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); TQFontMetrics fm(m_button->font()); m_button->setFixedWidth(fm.width(m_button->text()+' ')); m_button->setFocusPolicy(TQ_NoFocus); m_popup = new TQLabel(0, "m_popup", TQt::WStyle_Customize|TQt::WStyle_NoBorder|TQt::WX11BypassWM|WStyle_StaysOnTop); - m_popup->setPaletteBackgroundColor(m_popup->tqpalette().active().base()); + m_popup->setPaletteBackgroundColor(m_popup->palette().active().base()); m_popup->setFrameStyle(TQFrame::Plain|TQFrame::Box); m_popup->setMargin(2); m_popup->setLineWidth(1); @@ -153,7 +153,7 @@ PixmapEdit::selectPixmapFileName() emit valueChanged(this); } #endif*/ - TQString caption( i18n("Insert Image From File (for \"%1\" property)").tqarg(property()->caption()) ); + TQString caption( i18n("Insert Image From File (for \"%1\" property)").arg(property()->caption()) ); #ifdef TQ_WS_WIN TQString recentDir; TQString fileName = TQFileDialog::getOpenFileName( diff --git a/lib/koproperty/editors/pointedit.cpp b/lib/koproperty/editors/pointedit.cpp index 6983dd68..30d3c7d6 100644 --- a/lib/koproperty/editors/pointedit.cpp +++ b/lib/koproperty/editors/pointedit.cpp @@ -22,7 +22,7 @@ #include "editoritem.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqtooltip.h> @@ -41,10 +41,10 @@ PointEdit::PointEdit(Property *property, TQWidget *parent, const char *name) m_edit = new KActiveLabel(this); m_edit->setFocusPolicy(TQ_NoFocus); // m_edit->setIndent(KPROPEDITOR_ITEM_MARGIN); - m_edit->setPaletteBackgroundColor(tqpalette().active().base()); + m_edit->setPaletteBackgroundColor(palette().active().base()); m_edit->setWordWrap( TQTextEdit::NoWrap ); // m_edit->setBackgroundMode(TQt::PaletteBase); -// m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); +// m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); setEditor(m_edit); // setFocusWidget(m_edit); @@ -64,8 +64,8 @@ PointEdit::setValue(const TQVariant &value, bool emitChange) { m_value = value; m_edit->selectAll(false); - m_edit->setText(TQString(POINTEDIT_MASK).tqarg(value.toPoint().x()).tqarg(value.toPoint().y())); - TQToolTip::add(this, TQString("%1, %2").tqarg(value.toPoint().x()).tqarg(value.toPoint().y())); + m_edit->setText(TQString(POINTEDIT_MASK).arg(value.toPoint().x()).arg(value.toPoint().y())); + TQToolTip::add(this, TQString("%1, %2").arg(value.toPoint().x()).arg(value.toPoint().y())); if (emitChange) emit valueChanged(this); @@ -76,10 +76,10 @@ PointEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, con { TQRect rect(r); rect.setBottom(r.bottom()+1); - Widget::drawViewer(p, cg, rect, TQString(POINTEDIT_MASK).tqarg(value.toPoint().x()).tqarg(value.toPoint().y())); + Widget::drawViewer(p, cg, rect, TQString(POINTEDIT_MASK).arg(value.toPoint().x()).arg(value.toPoint().y())); // p->eraseRect(r); // p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, -// TQString("[ %1, %2 ]").tqarg(value.toPoint().x()).tqarg(value.toPoint().y())); +// TQString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y())); } void diff --git a/lib/koproperty/editors/rectedit.cpp b/lib/koproperty/editors/rectedit.cpp index ba6fec49..c97451ea 100644 --- a/lib/koproperty/editors/rectedit.cpp +++ b/lib/koproperty/editors/rectedit.cpp @@ -21,7 +21,7 @@ #include "editoritem.h" #include <tqvariant.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqtooltip.h> @@ -39,7 +39,7 @@ RectEdit::RectEdit(Property *property, TQWidget *parent, const char *name) setHasBorders(false); m_edit = new KActiveLabel(this); m_edit->setFocusPolicy(TQ_NoFocus); - m_edit->setPaletteBackgroundColor(tqpalette().active().base()); + m_edit->setPaletteBackgroundColor(palette().active().base()); m_edit->setWordWrap( TQTextEdit::NoWrap ); m_edit->setMinimumHeight(5); setEditor(m_edit); @@ -60,10 +60,10 @@ RectEdit::setValue(const TQVariant &value, bool emitChange) { m_value = value; m_edit->selectAll(false); - m_edit->setText(TQString(RECTEDIT_MASK).tqarg(value.toRect().x()). - tqarg(value.toRect().y()).tqarg(value.toRect().width()).tqarg(value.toRect().height())); - TQToolTip::add(this, i18n("Position: %1, %2\nSize: %3 x %4").tqarg(value.toRect().x()). - tqarg(value.toRect().y()).tqarg(value.toRect().width()).tqarg(value.toRect().height())); + m_edit->setText(TQString(RECTEDIT_MASK).arg(value.toRect().x()). + arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height())); + TQToolTip::add(this, i18n("Position: %1, %2\nSize: %3 x %4").arg(value.toRect().x()). + arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height())); if (emitChange) emit valueChanged(this); @@ -75,12 +75,12 @@ RectEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, cons TQRect rect(r); rect.setBottom(r.bottom()+1); Widget::drawViewer(p, cg, rect, - TQString(RECTEDIT_MASK).tqarg(value.toRect().x()).tqarg(value.toRect().y()) - .tqarg(value.toRect().width()).tqarg(value.toRect().height())); + TQString(RECTEDIT_MASK).arg(value.toRect().x()).arg(value.toRect().y()) + .arg(value.toRect().width()).arg(value.toRect().height())); // p->eraseRect(r); // p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, -// TQString("[ %1, %2, %3, %4 ]").tqarg(value.toRect().x()).tqarg(value.toRect().y()) -// .tqarg(value.toRect().width()).tqarg(value.toRect().height())); +// TQString("[ %1, %2, %3, %4 ]").arg(value.toRect().x()).arg(value.toRect().y()) +// .arg(value.toRect().width()).arg(value.toRect().height())); } void diff --git a/lib/koproperty/editors/sizeedit.cpp b/lib/koproperty/editors/sizeedit.cpp index 05422119..b5dd6be5 100644 --- a/lib/koproperty/editors/sizeedit.cpp +++ b/lib/koproperty/editors/sizeedit.cpp @@ -22,7 +22,7 @@ #include "editoritem.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqtooltip.h> @@ -41,9 +41,9 @@ SizeEdit::SizeEdit(Property *property, TQWidget *parent, const char *name) m_edit = new KActiveLabel(this); m_edit->setFocusPolicy(TQ_NoFocus); // m_edit->setIndent(KPROPEDITOR_ITEM_MARGIN); - m_edit->setPaletteBackgroundColor(tqpalette().active().base()); + m_edit->setPaletteBackgroundColor(palette().active().base()); // m_edit->setBackgroundMode(TQt::PaletteBase); -// m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); +// m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); setEditor(m_edit); // setFocusWidget(m_edit); @@ -63,8 +63,8 @@ SizeEdit::setValue(const TQVariant &value, bool emitChange) { m_value = value; m_edit->selectAll(false); - m_edit->setText(TQString(SIZEEDIT_MASK).tqarg(value.toSize().width()).tqarg(value.toSize().height())); - TQToolTip::add(this, TQString("%1 x %2").tqarg(value.toSize().width()).tqarg(value.toSize().height())); + m_edit->setText(TQString(SIZEEDIT_MASK).arg(value.toSize().width()).arg(value.toSize().height())); + TQToolTip::add(this, TQString("%1 x %2").arg(value.toSize().width()).arg(value.toSize().height())); if (emitChange) emit valueChanged(this); @@ -76,10 +76,10 @@ SizeEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, cons TQRect rect(r); rect.setBottom(r.bottom()+1); Widget::drawViewer(p, cg, rect, - TQString(SIZEEDIT_MASK).tqarg(value.toSize().width()).tqarg(value.toSize().height())); + TQString(SIZEEDIT_MASK).arg(value.toSize().width()).arg(value.toSize().height())); // p->eraseRect(r); // p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, -// TQString("[ %1, %2 ]").tqarg(value.toSize().width()).tqarg(value.toSize().height())); +// TQString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height())); } void diff --git a/lib/koproperty/editors/sizepolicyedit.cpp b/lib/koproperty/editors/sizepolicyedit.cpp index 125e0a26..0b13292b 100644 --- a/lib/koproperty/editors/sizepolicyedit.cpp +++ b/lib/koproperty/editors/sizepolicyedit.cpp @@ -22,7 +22,7 @@ #include "editoritem.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqsizepolicy.h> #include <tqmap.h> @@ -42,7 +42,7 @@ SizePolicyEdit::SizePolicyEdit(Property *property, TQWidget *parent, const char m_edit = new TQLabel(this); m_edit->setIndent(KPROPEDITOR_ITEM_MARGIN); m_edit->setBackgroundMode(TQt::PaletteBase); -// m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); +// m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); setEditor(m_edit); // l->addWidget(m_edit); @@ -77,9 +77,9 @@ void SizePolicyEdit::setValue(const TQVariant &value, bool emitChange) { m_value = value; - m_edit->setText(TQString("%1/%2/%3/%4").tqarg(findDescription(value.toSizePolicy().horData())). - tqarg(findDescription(value.toSizePolicy().verData())). - tqarg(value.toSizePolicy().horStretch()).tqarg(value.toSizePolicy().verStretch())); + m_edit->setText(TQString("%1/%2/%3/%4").arg(findDescription(value.toSizePolicy().horData())). + arg(findDescription(value.toSizePolicy().verData())). + arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch())); TQToolTip::add(this, m_edit->text()); if (emitChange) @@ -94,9 +94,9 @@ SizePolicyEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r TQRect rect(r); rect.setBottom(r.bottom()+1); Widget::drawViewer(p, cg, rect, - TQString("%1/%2/%3/%4").tqarg(findDescription(value.toSizePolicy().horData())). - tqarg(findDescription(value.toSizePolicy().verData())). - tqarg(value.toSizePolicy().horStretch()).tqarg(value.toSizePolicy().verStretch())); + TQString("%1/%2/%3/%4").arg(findDescription(value.toSizePolicy().horData())). + arg(findDescription(value.toSizePolicy().verData())). + arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch())); } TQString diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp index 8e890419..d2020d2c 100644 --- a/lib/koproperty/editors/spinbox.cpp +++ b/lib/koproperty/editors/spinbox.cpp @@ -22,7 +22,7 @@ #include "property.h" -#include <tqlayout.h> +#include <layout.h> #include <tqobjectlist.h> #include <tqvariant.h> #include <tqpainter.h> @@ -36,7 +36,7 @@ using namespace KoProperty; IntSpinBox::IntSpinBox(int lower, int upper, int step, int value, int base, IntEdit *parent, const char *name) : KIntSpinBox(lower, upper, step, value, base, parent, name) { - editor()->tqsetAlignment(TQt::AlignLeft); + editor()->setAlignment(TQt::AlignLeft); installEventFilter(editor()); installEventFilter(this); TQObjectList *spinwidgets = queryList( TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true ); @@ -179,7 +179,7 @@ IntEdit::setReadOnlyInternal(bool readOnly) DoubleSpinBox::DoubleSpinBox (double lower, double upper, double step, double value, int precision, DoubleEdit *parent) : KDoubleSpinBox(lower, upper, step, value, precision, parent) { - editor()->tqsetAlignment(TQt::AlignLeft); + editor()->setAlignment(TQt::AlignLeft); installEventFilter(editor()); installEventFilter(this); TQObjectList *spinwidgets = queryList( TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true ); @@ -247,7 +247,7 @@ DoubleEdit::DoubleEdit(Property *property, TQWidget *parent, const char *name) 0, precision.toInt(), this); if (!minValueText.isNull()) m_edit->setSpecialValueText(minValueText.toString()); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); setEditor(m_edit); diff --git a/lib/koproperty/editors/stringedit.cpp b/lib/koproperty/editors/stringedit.cpp index 55d8b3ed..c78b6edb 100644 --- a/lib/koproperty/editors/stringedit.cpp +++ b/lib/koproperty/editors/stringedit.cpp @@ -20,7 +20,7 @@ #include "stringedit.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqvariant.h> @@ -31,7 +31,7 @@ StringEdit::StringEdit(Property *property, TQWidget *parent, const char *name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQLineEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMargin(1); m_edit->setMinimumHeight(5); l->addWidget(m_edit); diff --git a/lib/koproperty/editors/stringlistedit.cpp b/lib/koproperty/editors/stringlistedit.cpp index 56bf1145..f5a1de39 100644 --- a/lib/koproperty/editors/stringlistedit.cpp +++ b/lib/koproperty/editors/stringlistedit.cpp @@ -21,7 +21,7 @@ #include "stringlistedit.h" #include <tqlineedit.h> -#include <tqlayout.h> +#include <layout.h> #include <tqdialog.h> #include <tqpainter.h> #include <tqvariant.h> @@ -46,12 +46,12 @@ StringListEdit::StringListEdit(Property *property, TQWidget *parent, const char m_edit = new TQLineEdit(this); m_edit->setLineWidth(0); m_edit->setReadOnly(true); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); m_selectButton = new TQPushButton("...", this); - m_selectButton->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding); + m_selectButton->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding); l->addWidget(m_selectButton); setFocusWidget(m_selectButton); @@ -87,10 +87,10 @@ StringListEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r void StringListEdit::showEditor() { - KDialogBase dialog(this->tqtopLevelWidget(), "stringlist_dialog", true, i18n("Edit List of Items"), + KDialogBase dialog(this->topLevelWidget(), "stringlist_dialog", true, i18n("Edit List of Items"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, false); - KEditListBox *edit = new KEditListBox(i18n("Contents of %1").tqarg(property()->caption()), &dialog, "editlist"); + KEditListBox *edit = new KEditListBox(i18n("Contents of %1").arg(property()->caption()), &dialog, "editlist"); dialog.setMainWidget(edit); edit->insertStringList(m_list); diff --git a/lib/koproperty/editors/symbolcombo.cpp b/lib/koproperty/editors/symbolcombo.cpp index 53394d54..9bb503d9 100644 --- a/lib/koproperty/editors/symbolcombo.cpp +++ b/lib/koproperty/editors/symbolcombo.cpp @@ -20,7 +20,7 @@ #include <tqlineedit.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqvariant.h> @@ -41,12 +41,12 @@ SymbolCombo::SymbolCombo(Property *property, TQWidget *parent, const char *name) m_edit = new TQLineEdit(this); m_edit->setLineWidth(0); m_edit->setReadOnly(true); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); m_edit->setMaxLength(1); l->addWidget(m_edit); m_select = new TQPushButton("...", this); - m_select->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); + m_select->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); m_select->setMinimumHeight(5); l->addWidget(m_select); @@ -61,7 +61,7 @@ TQVariant SymbolCombo::value() const { if (!(m_edit->text().isNull())) - return m_edit->text().tqat(0).tqunicode(); + return m_edit->text().at(0).unicode(); else return 0; } @@ -90,7 +90,7 @@ SymbolCombo::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, c void SymbolCombo::selectChar() { - KDialogBase dialog(this->tqtopLevelWidget(), "charselect_dialog", true, i18n("Select Char"), + KDialogBase dialog(this->topLevelWidget(), "charselect_dialog", true, i18n("Select Char"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, false); KCharSelect *select = new KCharSelect(&dialog, "select_char"); diff --git a/lib/koproperty/editors/timeedit.cpp b/lib/koproperty/editors/timeedit.cpp index 674d2c89..a6ede613 100644 --- a/lib/koproperty/editors/timeedit.cpp +++ b/lib/koproperty/editors/timeedit.cpp @@ -24,7 +24,7 @@ #include <tqrangecontrol.h> #include <tqobjectlist.h> #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvariant.h> #include <tqdatetime.h> @@ -38,7 +38,7 @@ TimeEdit::TimeEdit(Property *property, TQWidget *parent, const char *name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQTimeEdit(this); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); diff --git a/lib/koproperty/editors/urledit.cpp b/lib/koproperty/editors/urledit.cpp index 8c150de2..02734776 100644 --- a/lib/koproperty/editors/urledit.cpp +++ b/lib/koproperty/editors/urledit.cpp @@ -20,7 +20,7 @@ #include "urledit.h" -#include <tqlayout.h> +#include <layout.h> #include <tqvariant.h> #include <kurlrequester.h> @@ -36,14 +36,14 @@ URLEdit::URLEdit(Property *property, TQWidget *parent, const char *name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KURLRequester(this); - m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); setProperty(property); connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotValueChanged(const TQString&))); - m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); } URLEdit::~URLEdit() diff --git a/lib/koproperty/factory.h b/lib/koproperty/factory.h index 8aca5538..f4b0cf36 100644 --- a/lib/koproperty/factory.h +++ b/lib/koproperty/factory.h @@ -81,7 +81,7 @@ class KOPROPERTY_EXPORT CustomPropertyFactory : public TQObject \section custom_prop_composed Using Custom Properties to create composed properties Use a composed property when you need more than one editor for a property. Examples are rect, size or point properties. - If you create a composed property, both parent and tqchildren properties must have custom + If you create a composed property, both parent and children properties must have custom (different) types. Child properties are created in CustomProperty constructor of the <b>parent</b> type, by adding CustomProperty::property() as parent in Property constructor.\n @@ -89,7 +89,7 @@ class KOPROPERTY_EXPORT CustomPropertyFactory : public TQObject parent's Property::setValue() should be called, making sure that useCustomProperty argument is set to false.\n Parent's handleValue() should be set to false, unless you cannot store the property in a TQVariant. - You just need to update tqchildren's value, making sure that useCustomProperty argument is set + You just need to update children's value, making sure that useCustomProperty argument is set to false. \section custom_editor Using Custom Editors @@ -105,7 +105,7 @@ class KOPROPERTY_EXPORT CustomPropertyFactory : public TQObject \section custom_prop_composed Using Custom Properties with value that cannot be stored in a TQVariant You then need to set handleValue() to true. The Widget you create also have to call directly CustomProperty member to store the value. just make sure you call emitPropertyChanged() - when the proerty value changes. Also make sure to avoid infinite recursion if you use tqchildren properties. + when the proerty value changes. Also make sure to avoid infinite recursion if you use children properties. \author Cedric Pasteur <cedric.pasteur@free.fr> \author Alexander Dymo <cloudtemple@mskat.net> diff --git a/lib/koproperty/property.cpp b/lib/koproperty/property.cpp index 49ca2b6c..6c4fa246 100644 --- a/lib/koproperty/property.cpp +++ b/lib/koproperty/property.cpp @@ -43,7 +43,7 @@ class PropertyPrivate : caption(0), listData(0), changed(false), storable(true), readOnly(false), visible(true), autosync(-1), custom(0), useCustomProperty(true), - sets(0), parent(0), tqchildren(0), relatedProperties(0), + sets(0), parent(0), children(0), relatedProperties(0), sortingKey(0) { } @@ -63,7 +63,7 @@ class PropertyPrivate delete caption; caption = 0; delete listData; - delete tqchildren; + delete children; delete relatedProperties; delete custom; delete sets; @@ -99,7 +99,7 @@ class PropertyPrivate // TQValueList<Set*> sets; Property *parent; - TQValueList<Property*> *tqchildren; + TQValueList<Property*> *children; //! list of properties with the same name (when intersecting buffers) TQValueList<Property*> *relatedProperties; @@ -564,9 +564,9 @@ Property::operator= (const Property &property) delete d->listData; d->listData = 0; } - if(d->tqchildren) { - delete d->tqchildren; - d->tqchildren = 0; + if(d->children) { + delete d->children; + d->children = 0; } if(d->relatedProperties) { delete d->relatedProperties; @@ -594,16 +594,16 @@ Property::operator= (const Property &property) } if(property.d->custom) { d->custom = FactoryManager::self()->createCustomProperty(this); - // updates all tqchildren value, using CustomProperty + // updates all children value, using CustomProperty setValue(property.value()); } else { d->value = property.d->value; - if(property.d->tqchildren) { - // no CustomProperty (should never happen), simply copy all tqchildren - d->tqchildren = new TQValueList<Property*>(); - TQValueList<Property*>::ConstIterator endIt = property.d->tqchildren->constEnd(); - for(TQValueList<Property*>::ConstIterator it = property.d->tqchildren->constBegin(); it != endIt; ++it) { + if(property.d->children) { + // no CustomProperty (should never happen), simply copy all children + d->children = new TQValueList<Property*>(); + TQValueList<Property*>::ConstIterator endIt = property.d->children->constEnd(); + for(TQValueList<Property*>::ConstIterator it = property.d->children->constBegin(); it != endIt; ++it) { Property *child = new Property( *(*it) ); addChild(child); } @@ -614,7 +614,7 @@ Property::operator= (const Property &property) d->relatedProperties = new TQValueList<Property*>( *(property.d->relatedProperties)); } - // update these later because they may have been changed when creating tqchildren + // update these later because they may have been changed when creating children d->oldValue = property.d->oldValue; d->changed = property.d->changed; d->sortingKey = property.d->sortingKey; @@ -631,16 +631,16 @@ Property::operator ==(const Property &prop) const ///////////////////////////////////////////////////////////////// const TQValueList<Property*>* -Property::tqchildren() const +Property::children() const { - return d->tqchildren; + return d->children; } Property* Property::child(const TQCString &name) { - TQValueList<Property*>::ConstIterator endIt = d->tqchildren->constEnd(); - for(TQValueList<Property*>::ConstIterator it = d->tqchildren->constBegin(); it != endIt; ++it) { + TQValueList<Property*>::ConstIterator endIt = d->children->constEnd(); + for(TQValueList<Property*>::ConstIterator it = d->children->constBegin(); it != endIt; ++it) { if((*it)->name() == name) return *it; } @@ -659,11 +659,11 @@ Property::addChild(Property *prop) if (!prop) return; - if(!d->tqchildren || tqFind( d->tqchildren->begin(), d->tqchildren->end(), prop) == d->tqchildren->end()) { // not in our list - if(!d->tqchildren) - d->tqchildren = new TQValueList<Property*>(); - d->tqchildren->append(prop); - prop->setSortingKey(d->tqchildren->count()); + if(!d->children || tqFind( d->children->begin(), d->children->end(), prop) == d->children->end()) { // not in our list + if(!d->children) + d->children = new TQValueList<Property*>(); + d->children->append(prop); + prop->setSortingKey(d->children->count()); prop->d->parent = this; } else { diff --git a/lib/koproperty/property.h b/lib/koproperty/property.h index bc8a503e..9f097c61 100644 --- a/lib/koproperty/property.h +++ b/lib/koproperty/property.h @@ -104,7 +104,7 @@ enum PropertyType { //predefined custom types ValueFromList = 2000 /**<string value from a list*/, - Symbol = 2001 /**<tqunicode symbol code*/, + Symbol = 2001 /**<unicode symbol code*/, FontName /**<font name, e.g. "times new roman"*/, FileURL /**<url of a file*/, PictureFileURL /**<url of a pixmap*/, @@ -306,9 +306,9 @@ class KOPROPERTY_EXPORT Property /*! \return property icon's string. Can be empty. */ TQString icon() const; - /*! \return a list of all tqchildren for this property, or NULL of there - is no tqchildren for this property */ - const TQValueList<Property*>* tqchildren() const; + /*! \return a list of all children for this property, or NULL of there + is no children for this property */ + const TQValueList<Property*>* children() const; /*! \return a child property for \a name, or NULL if there is no property with that name. */ Property* child(const TQCString &name); @@ -407,7 +407,7 @@ class KOPROPERTY_EXPORT Property protected: /*! Adds \a prop as a child of this property. - The tqchildren will be owned by this property. */ + The children will be owned by this property. */ void addChild(Property *prop); /*! Adds \a set to this property. */ diff --git a/lib/koproperty/test/test.cpp b/lib/koproperty/test/test.cpp index df0ec956..1c4678c9 100644 --- a/lib/koproperty/test/test.cpp +++ b/lib/koproperty/test/test.cpp @@ -65,10 +65,10 @@ Test::Test() m_set->addProperty(new Property("Bool", TQVariant(true, 4), "Bool"), group); m_set->addProperty(p = new Property("3 States", TQVariant(), "3 States", "", Boolean), group); p->setOption("3rdState", "None"); - m_set->addProperty(p = new Property("Date", TQDate::tqcurrentDate(),"Date"), group); + m_set->addProperty(p = new Property("Date", TQDate::currentDate(),"Date"), group); p->setIcon("date"); m_set->addProperty(new Property("Time", TQTime::currentTime(),"Time"), group); - m_set->addProperty(new Property("DateTime", TQDateTime::tqcurrentDateTime(),"Date/Time"), group); + m_set->addProperty(new Property("DateTime", TQDateTime::currentDateTime(),"Date/Time"), group); TQStringList list;//keys list << "myitem" << "otheritem" << "3rditem"; @@ -89,7 +89,7 @@ Test::Test() group = "ComplexGroup"; m_set->setGroupDescription(group, "Complex Group"); } - m_set->addProperty(new Property("Rect", this->tqgeometry(),"Rect"), group); + m_set->addProperty(new Property("Rect", this->geometry(),"Rect"), group); m_set->addProperty(new Property("Point", TQPoint(3,4), "Point"), group); m_set->addProperty(new Property("Size", TQPoint(3,4), "Size"), group); @@ -107,7 +107,7 @@ Test::Test() p->setIcon("fonts"); m_set->addProperty(new Property("Cursor", TQCursor(TQt::WaitCursor),"Cursor"), group); m_set->addProperty(new Property("LineStyle", 3, "Line Style", "", LineStyle), group); - m_set->addProperty(new Property("SizePolicy", tqsizePolicy(), "Size Policy"), group); + m_set->addProperty(new Property("SizePolicy", sizePolicy(), "Size Policy"), group); // kdDebug() << m_set->groupNames() << endl; diff --git a/lib/koproperty/widget.cpp b/lib/koproperty/widget.cpp index b0169a96..3d6153ae 100644 --- a/lib/koproperty/widget.cpp +++ b/lib/koproperty/widget.cpp @@ -192,7 +192,7 @@ Widget::setEditor(TQWidget* editor) d->editor = editor; if (!d->editor) return; - d->editor->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + d->editor->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); d->editor->move(0,0); } diff --git a/lib/koproperty/widgetproxy.cpp b/lib/koproperty/widgetproxy.cpp index a4558319..1a4ba02b 100644 --- a/lib/koproperty/widgetproxy.cpp +++ b/lib/koproperty/widgetproxy.cpp @@ -22,7 +22,7 @@ #include "widget.h" #include "factory.h" -#include <tqlayout.h> +#include <layout.h> #include <tqvariant.h> namespace KoProperty { @@ -30,7 +30,7 @@ class WidgetProxyPrivate { public: WidgetProxyPrivate() - : property(0), widget(0), type(Invalid), tqlayout(0) + : property(0), widget(0), type(Invalid), layout(0) {} ~WidgetProxyPrivate() {} @@ -38,7 +38,7 @@ class WidgetProxyPrivate Widget *widget; PropertyType type; - TQHBoxLayout *tqlayout; + TQHBoxLayout *layout; }; } @@ -49,7 +49,7 @@ WidgetProxy::WidgetProxy(TQWidget *parent, const char *name) { d = new WidgetProxyPrivate(); d->property = new Property(); - d->tqlayout = new TQHBoxLayout(this, 0, 0); + d->layout = new TQHBoxLayout(this, 0, 0); } WidgetProxy::~WidgetProxy() @@ -118,7 +118,7 @@ WidgetProxy::setWidget() if (d->widget) { d->widget->reparent(this, TQPoint(0,0), true); - d->tqlayout->addWidget(d->widget); + d->layout->addWidget(d->widget); } } diff --git a/lib/kotext/DESIGN b/lib/kotext/DESIGN index 4fd1e479..12bc2940 100644 --- a/lib/kotext/DESIGN +++ b/lib/kotext/DESIGN @@ -26,17 +26,17 @@ Zoomed: (aka Normal) Internal: The former two were mostly for objects like frames etc, not for text. Text (the individual - words and characters) are positioned with the tqlayout coordinates. Layout is similar to the + words and characters) are positioned with the layout coordinates. Layout is similar to the Zoomed system, but always uses the same resolution. This resolution is sufficiently high to - do the tqlayout in integers, and not really lose info. + do the layout in integers, and not really lose info. - This is the high-resolution unit in which the text tqlayout is done, + This is the high-resolution unit in which the text layout is done, currently set to 1440 DPI. Everything known the QRT classes will be in this coordinate system (including the QTextFormats). When painting, we apply the current zoom and resolution to find the right font size to use, and we have to catch up with rounding differences. However the position of the words - (i.e. tqlayout) is the one determined previously in tqlayout units. KoZoomHandler - offers methods for converting between tqlayout units and zoom-dependent points + (i.e. layout) is the one determined previously in layout units. KoZoomHandler + offers methods for converting between layout units and zoom-dependent points and pixels. Note that the Internal coordinate system starts at the topleft corner of @@ -73,14 +73,14 @@ Document (pt values, in double, KoPoint, KoRect.) | |--KWTextFrameSet::documentToInternal V -Internal coordinates (the coordinates given to QRT - in "tqlayout units") -Note that there are pixels and pts in the tqlayout unit system too ! +Internal coordinates (the coordinates given to QRT - in "layout units") +Note that there are pixels and pts in the layout unit system too ! There are conversions between LU points and document points, but also direct conversions between LU pixels and view pixels. Font sizes ========== -A 12pt font will lead to a tqlayout font of ptToLayoutUnit(12)=20*12=240pt - +A 12pt font will lead to a layout font of ptToLayoutUnit(12)=20*12=240pt - that's the value stored in the QTextFormat. However font metrics are calculated from the 100%-zoom-level font (e.g. 12pt for a 12pt font) diff --git a/lib/kotext/DateFormatWidget.cpp b/lib/kotext/DateFormatWidget.cpp index c93807a3..49749f91 100644 --- a/lib/kotext/DateFormatWidget.cpp +++ b/lib/kotext/DateFormatWidget.cpp @@ -147,7 +147,7 @@ void DateFormatWidget::updateLabel() { KoVariableDateFormat format; format.setFormatProperties( resultString() ); - TQDateTime ct = TQDateTime::tqcurrentDateTime().addDays( correctValue() ); + TQDateTime ct = TQDateTime::currentDateTime().addDays( correctValue() ); label->setText( format.convert( ct ) ); } diff --git a/lib/kotext/IsoDuration.h b/lib/kotext/IsoDuration.h index 6ccb2891..ee1cdfb9 100644 --- a/lib/kotext/IsoDuration.h +++ b/lib/kotext/IsoDuration.h @@ -31,7 +31,7 @@ static TQString minutesToISODuration( int mn ) { bool neg = mn < 0; // PT == period of time - see ISO8601 - TQString str = TQString::tqfromLatin1( "PT00H%1M00S" ).tqarg( TQABS( mn ) ); + TQString str = TQString::fromLatin1( "PT00H%1M00S" ).arg( TQABS( mn ) ); if ( neg ) str.prepend( '-' ); return str; @@ -41,7 +41,7 @@ static TQString daysToISODuration( int days ) { bool neg = days < 0; // P == period, time is ommitted - see ISO8601 - TQString str = TQString::tqfromLatin1( "P%1D" ).tqarg( TQABS( days ) ); + TQString str = TQString::fromLatin1( "P%1D" ).arg( TQABS( days ) ); if ( neg ) str.prepend( '-' ); return str; diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/KFontDialog_local.cpp index beaeb9f9..7afeb354 100644 --- a/lib/kotext/KFontDialog_local.cpp +++ b/lib/kotext/KFontDialog_local.cpp @@ -34,7 +34,7 @@ #include <tqfont.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqscrollbar.h> #include <tqstringlist.h> #include <tqfontdatabase.h> @@ -69,7 +69,7 @@ static int minimumListWidth( const TQListBox *list ) } if( w == 0 ) { w = 40; } w += list->frameWidth() * 2; - w += list->verticalScrollBar()->tqsizeHint().width(); + w += list->verticalScrollBar()->sizeHint().width(); return w; } @@ -297,7 +297,7 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, sampleEdit->setFont(tmpFont); sampleEdit->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog")); sampleEdit->setMinimumHeight( sampleEdit->fontMetrics().lineSpacing() ); - sampleEdit->tqsetAlignment(TQt::AlignCenter); + sampleEdit->setAlignment(TQt::AlignCenter); gridLayout->addMultiCellWidget(sampleEdit, 4, 4, 0, 2); TQString sampleEditWhatsThisText = i18n("This sample text illustrates the current settings. " @@ -333,8 +333,8 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, setSizeIsRelative( *sizeIsRelativeState ); KConfig *config = KGlobal::config(); - KConfigGroupSaver saver(config, TQString::tqfromLatin1("General")); - showXLFDArea(config->readBoolEntry(TQString::tqfromLatin1("fontSelectorShowXLFD"), false)); + KConfigGroupSaver saver(config, TQString::fromLatin1("General")); + showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false)); } KFontChooser_local::~KFontChooser_local() @@ -405,9 +405,9 @@ TQButton::ToggleState KFontChooser_local::sizeIsRelative() const : TQButton::NoChange; } -TQSize KFontChooser_local::tqsizeHint( void ) const +TQSize KFontChooser_local::sizeHint( void ) const { - return tqminimumSizeHint(); + return minimumSizeHint(); } @@ -473,7 +473,7 @@ void KFontChooser_local::family_chosen_slot(const TQString& family) TQFontDatabase dbase; - TQStringList styles = TQStringList(dbase.tqstyles(currentFamily)); + TQStringList styles = TQStringList(dbase.styles(currentFamily)); styleListBox->clear(); currentStyles.clear(); for ( TQStringList::Iterator it = styles.begin(); it != styles.end(); ++it ) { @@ -539,7 +539,7 @@ void KFontChooser_local::style_chosen_slot(const TQString& style) fillSizeList(); } else { // is bitmap font. //sampleEdit->setPaletteBackgroundPixmap( BitmapPixmap ); // TODO - TQValueList<int> sizes = dbase.tqsmoothSizes(familyListBox->currentText(), currentStyles[currentStyle]); + TQValueList<int> sizes = dbase.smoothSizes(familyListBox->currentText(), currentStyles[currentStyle]); if(sizes.count() > 0) { TQValueList<int>::iterator it; diff=1000; @@ -654,7 +654,7 @@ void KFontChooser_local::setupDisplay() void KFontChooser_local::getFontList( TQStringList &list, uint fontListCriteria) { TQFontDatabase dbase; - TQStringList lstSys(dbase.tqfamilies()); + TQStringList lstSys(dbase.families()); // if we have criteria; then check fonts before adding if (fontListCriteria) @@ -694,13 +694,13 @@ void KFontChooser_local::addFont( TQStringList &list, const char *xfont ) if ( !ptr ) return; - TQString font = TQString::tqfromLatin1(ptr + 1); + TQString font = TQString::fromLatin1(ptr + 1); int pos; if ( ( pos = font.find( '-' ) ) > 0 ) { font.truncate( pos ); - if ( font.find( TQString::tqfromLatin1("open look"), 0, false ) >= 0 ) + if ( font.find( TQString::fromLatin1("open look"), 0, false ) >= 0 ) return; TQStringList::Iterator it = list.begin(); diff --git a/lib/kotext/KFontDialog_local.h b/lib/kotext/KFontDialog_local.h index b9d4853c..943ce724 100644 --- a/lib/kotext/KFontDialog_local.h +++ b/lib/kotext/KFontDialog_local.h @@ -263,7 +263,7 @@ public: /** * Reimplemented for internal reasons. */ - virtual TQSize tqsizeHint( void ) const; + virtual TQSize sizeHint( void ) const; signals: /** diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp index c859d26c..7ca6f1a7 100644 --- a/lib/kotext/KoAutoFormat.cpp +++ b/lib/kotext/KoAutoFormat.cpp @@ -932,7 +932,7 @@ bool KoAutoFormat::doCompletion( KoTextCursor* textEditCursor, KoTextParag *para uint maxlength = 0; for ( TQStringList::ConstIterator it = wordlist.begin(); it != wordlist.end(); ++it ) // several completion words were found { - if ( (*it).tqstartsWith( lastWord, false ) && new_wordlist.find(*it) == new_wordlist.end() ) //the completion words that begin with lastWord + if ( (*it).startsWith( lastWord, false ) && new_wordlist.find(*it) == new_wordlist.end() ) //the completion words that begin with lastWord { if ( (*it).length() > maxlength ) maxlength = (*it).length(); @@ -952,7 +952,7 @@ bool KoAutoFormat::doCompletion( KoTextCursor* textEditCursor, KoTextParag *para TQChar ch = new_wordlist.first().at(i); for (TQStringList::ConstIterator it = new_wordlist.begin(); it != new_wordlist.end(); ++it ) { - if ( (*it).tqat(i).lower() != ch.lower() ) + if ( (*it).at(i).lower() != ch.lower() ) { word = (*it).left(i); //the completion word is truncated here //kdDebug() << "set the word completion to:" << word << endl; @@ -1063,7 +1063,7 @@ void KoAutoFormat::showToolTipBox(KoTextParag *parag, int index, TQWidget *widg m_completionBox->setText(word); m_completionBox->setLastWord(lastWord); m_completionBox->adjustSize(); - int const height = m_completionBox->tqsizeHint().height(); + int const height = m_completionBox->sizeHint().height(); m_completionBox->move( show_pos.x(), show_pos.y() - height ); if (!m_completionBox->isShown() ) @@ -1778,7 +1778,7 @@ void KoAutoFormat::doAutoDetectUrl( KoTextCursor *textEditCursor, KoTextParag *p txtObj->insert( textEditCursor, lastFormat, KoTextObject::customItemChar(), i18n("Insert Variable"), KoTextDocument::HighlightSelection, KoTextObject::DefaultInsertFlags, customItemsMap ); var->recalc(); - parag->tqinvalidate(0); + parag->invalidate(0); parag->setChanged( true ); // adjust index @@ -1819,7 +1819,7 @@ void KoAutoFormat::doAutoIncludeUpperUpper(KoTextCursor* /*textEditCursor*/, KoT break; word.append( ch ); } - if( word.length() > 2 && word.left(2)==word.left(2).upper() && word.tqat(3)!=word.tqat(3).upper() ) + if( word.length() > 2 && word.left(2)==word.left(2).upper() && word.at(3)!=word.at(3).upper() ) { if ( m_twoUpperLetterException.findIndex(word )==-1) m_twoUpperLetterException.append( word); @@ -1856,7 +1856,7 @@ void KoAutoFormat::doAutoIncludeAbbreviation(KoTextCursor* /*textEditCursor*/, K break; wordAfter.append( ch ); } - if( word.length()>1 && !wordAfter.isEmpty() && wordAfter.tqat(0)==wordAfter.tqat(0).lower()) + if( word.length()>1 && !wordAfter.isEmpty() && wordAfter.at(0)==wordAfter.at(0).lower()) { if ( m_upperCaseExceptions.findIndex(word )==-1) m_upperCaseExceptions.append( word ); @@ -2158,14 +2158,14 @@ KCommand *KoAutoFormat::doCapitalizeNameOfDays( KoTextCursor* textEditCursor, Ko TQString replaceStr= m_cacheNameOfDays[pos]; int start = index - replaceStr.length(); int length = replaceStr.length(); - if( word.tqat(0).isLetter() && word.tqat(0)==word.tqat(0).lower() ) + if( word.at(0).isLetter() && word.at(0)==word.at(0).lower() ) { KoTextCursor cursor( parag->document() ); cursor.setParag( parag ); cursor.setIndex( start ); textdoc->setSelectionStart( KoTextDocument::HighlightSelection, &cursor ); cursor.setIndex( start + length ); - TQString replacement = replaceStr.tqat(0).upper() + replaceStr.right( length-1 ); + TQString replacement = replaceStr.at(0).upper() + replaceStr.right( length-1 ); textdoc->setSelectionEnd( KoTextDocument::HighlightSelection, &cursor ); TQString cmdName=i18n("Capitalize Name of Days"); KCommand *cmd =txtObj->replaceSelectionCommand( textEditCursor, replacement, diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp index e6dce371..30a110a0 100644 --- a/lib/kotext/KoAutoFormatDia.cpp +++ b/lib/kotext/KoAutoFormatDia.cpp @@ -28,7 +28,7 @@ #include <klistview.h> #include <kstandarddirs.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwhatsthis.h> #include <tqcheckbox.h> #include <tqpushbutton.h> @@ -286,7 +286,7 @@ void KoAutoFormatDia::setupTab1() cbAutoReplaceNumber=new TQCheckBox( tab1 ); cbAutoReplaceNumber->setText( i18n( "We add the 1/2 char at the %1", "Re&place 1/2... with %1..." ) - .tqarg( TQString( "�" ) ) ); + .arg( TQString( "�" ) ) ); TQWhatsThis::add( cbAutoReplaceNumber, i18n( "Most standard fraction notations will be converted when available" ) ); @@ -331,11 +331,11 @@ void KoAutoFormatDia::setupTab1() hbox->addSpacing( 20 ); hbox->setSpacing(KDialog::spacingHint()); pbBulletStyle = new TQPushButton( tab1 ); - pbBulletStyle->setFixedSize( pbBulletStyle->tqsizeHint() ); + pbBulletStyle->setFixedSize( pbBulletStyle->sizeHint() ); hbox->addWidget( pbBulletStyle ); pbDefaultBulletStyle = new TQPushButton( tab1 ); pbDefaultBulletStyle->setText(i18n("Default")); - pbDefaultBulletStyle->setFixedSize( pbDefaultBulletStyle->tqsizeHint() ); + pbDefaultBulletStyle->setFixedSize( pbDefaultBulletStyle->sizeHint() ); hbox->addWidget( pbDefaultBulletStyle ); hbox->addStretch( 1 ); @@ -393,10 +393,10 @@ void KoAutoFormatDia::setupTab2() hbox->addSpacing( 20 ); pbDoubleQuote1 = new TQPushButton( tab2 ); - pbDoubleQuote1->setFixedSize( pbDoubleQuote1->tqsizeHint() ); + pbDoubleQuote1->setFixedSize( pbDoubleQuote1->sizeHint() ); pbDoubleQuote2 = new TQPushButton( tab2 ); - pbDoubleQuote2->setFixedSize( pbDoubleQuote2->tqsizeHint() ); + pbDoubleQuote2->setFixedSize( pbDoubleQuote2->sizeHint() ); if (TQApplication::reverseLayout()) { hbox->addWidget( pbDoubleQuote2 ); @@ -410,7 +410,7 @@ void KoAutoFormatDia::setupTab2() pbDoubleDefault = new TQPushButton( tab2 ); pbDoubleDefault->setText(i18n("Default")); - pbDoubleDefault->setFixedSize( pbDoubleDefault->tqsizeHint() ); + pbDoubleDefault->setFixedSize( pbDoubleDefault->sizeHint() ); hbox->addWidget( pbDoubleDefault ); hbox->addStretch( 1 ); @@ -434,10 +434,10 @@ void KoAutoFormatDia::setupTab2() hbox->addSpacing( 20 ); pbSimpleQuote1 = new TQPushButton( tab2 ); - pbSimpleQuote1->setFixedSize( pbSimpleQuote1->tqsizeHint() ); + pbSimpleQuote1->setFixedSize( pbSimpleQuote1->sizeHint() ); pbSimpleQuote2 = new TQPushButton( tab2 ); - pbSimpleQuote2->setFixedSize( pbSimpleQuote2->tqsizeHint() ); + pbSimpleQuote2->setFixedSize( pbSimpleQuote2->sizeHint() ); if (TQApplication::reverseLayout()) { hbox->addWidget( pbSimpleQuote2 ); @@ -451,7 +451,7 @@ void KoAutoFormatDia::setupTab2() pbSimpleDefault = new TQPushButton( tab2 ); pbSimpleDefault->setText(i18n("Default")); - pbSimpleDefault->setFixedSize( pbSimpleDefault->tqsizeHint() ); + pbSimpleDefault->setFixedSize( pbSimpleDefault->sizeHint() ); hbox->addWidget( pbSimpleDefault ); hbox->addStretch( 1 ); diff --git a/lib/kotext/KoBgSpellCheck.cpp b/lib/kotext/KoBgSpellCheck.cpp index f3b8928b..612f0be7 100644 --- a/lib/kotext/KoBgSpellCheck.cpp +++ b/lib/kotext/KoBgSpellCheck.cpp @@ -135,7 +135,7 @@ void KoBgSpellCheck::spellCheckerMisspelling( const TQString &old, int pos ) #endif markWord( parag, pos, old.length(), true ); // Repaint immediately, since the checking is timer-based (slow), it looks - // slow (chunky) if we only tqrepaint once a paragraph is completely done. + // slow (chunky) if we only repaint once a paragraph is completely done. parag->document()->emitRepaintChanged(); if ( d->startupChecking && d->marked > delayAfterMarked ) { @@ -171,7 +171,7 @@ void KoBgSpellCheck::markWord( KoTextParag* parag, int pos, int length, bool mis #endif parag->setFormat( pos, length, &format, true, KoTextFormat::Misspelled ); parag->setChanged( true ); - // don't tqrepaint here, in the slotParagraphModified case we want to tqrepaint only once at the end + // don't repaint here, in the slotParagraphModified case we want to repaint only once at the end } void KoBgSpellCheck::checkerContinue() diff --git a/lib/kotext/KoChangeCaseDia.cpp b/lib/kotext/KoChangeCaseDia.cpp index 8f7c2515..cde58f0a 100644 --- a/lib/kotext/KoChangeCaseDia.cpp +++ b/lib/kotext/KoChangeCaseDia.cpp @@ -36,7 +36,7 @@ KoChangeCaseDia::KoChangeCaseDia( TQWidget *parent, const char *name ) TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Case" ),page ); grp->setRadioButtonExclusive( TRUE ); - grp->tqlayout(); + grp->layout(); m_upperCase=new TQRadioButton( i18n("&Uppercase"), grp ); m_lowerCase=new TQRadioButton( i18n("&Lowercase"), grp ); diff --git a/lib/kotext/KoCommentDia.cpp b/lib/kotext/KoCommentDia.cpp index a6c8b2bb..370befe8 100644 --- a/lib/kotext/KoCommentDia.cpp +++ b/lib/kotext/KoCommentDia.cpp @@ -21,7 +21,7 @@ #include <tqvbox.h> #include <tqmultilineedit.h> #include "KoCommentDia.h" -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <kglobal.h> #include <tqdatetime.h> @@ -64,9 +64,9 @@ TQString KoCommentDia::commentText() void KoCommentDia::slotAddAuthorName() { - TQString date = KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ); + TQString date = KGlobal::locale()->formatDate( TQDate::currentDate() ); TQString time = KGlobal::locale()->formatTime( TQTime::currentTime() ); - TQString result = TQString("--------%1 ,%2, %3------\n").tqarg(authorName).tqarg(date).tqarg(time); + TQString result = TQString("--------%1 ,%2, %3------\n").arg(authorName).arg(date).arg(time); m_multiLine->insertLine( result, m_multiLine->numLines() ); } diff --git a/lib/kotext/KoCompletionBase.ui b/lib/kotext/KoCompletionBase.ui index 12ae9d5d..babc467c 100644 --- a/lib/kotext/KoCompletionBase.ui +++ b/lib/kotext/KoCompletionBase.ui @@ -29,7 +29,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -45,7 +45,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -83,7 +83,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -129,7 +129,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <grid> <property name="name"> @@ -254,7 +254,7 @@ This option is most important when Automatically add words to completion list is </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -289,7 +289,7 @@ This option is most important when Automatically add words to completion list is <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>101</width> <height>20</height> @@ -302,7 +302,7 @@ This option is most important when Automatically add words to completion list is </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -329,7 +329,7 @@ This option is most important when Automatically add words to completion list is <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>101</width> <height>20</height> diff --git a/lib/kotext/KoCompletionDia.cpp b/lib/kotext/KoCompletionDia.cpp index 66d8d374..2f5729b2 100644 --- a/lib/kotext/KoCompletionDia.cpp +++ b/lib/kotext/KoCompletionDia.cpp @@ -25,7 +25,7 @@ #include <kcompletion.h> #include <kconfig.h> #include <kdebug.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <tqcheckbox.h> #include <tqpushbutton.h> @@ -40,7 +40,7 @@ KoCompletionDia::KoCompletionDia( TQWidget *parent, const char *name, KoAutoForm { TQVBox *page = makeVBoxMainWidget(); m_widget = new KoCompletion(page, autoFormat); - m_widget->tqlayout()->setMargin(0); + m_widget->layout()->setMargin(0); connect( this, TQT_SIGNAL( user1Clicked() ), m_widget, TQT_SLOT(slotResetConf())); setButtonWhatsThis(Ok,i18n("This will save your options.")); setButtonWhatsThis(Cancel,i18n("This will abort all changes.")); @@ -57,7 +57,7 @@ KoCompletion::KoCompletion(TQWidget *parent, KoAutoFormat *autoFormat) : KoCompl m_autoFormat( *autoFormat ), m_docAutoFormat( autoFormat ) { - connect(cbAllowCompletion, TQT_SIGNAL(toggled ( bool )), this, TQT_SLOT( changeButtontqStatus())); + connect(cbAllowCompletion, TQT_SIGNAL(toggled ( bool )), this, TQT_SLOT( changeButtonStatus())); TQStringList lst; lst << i18n( "Enter" ); lst << i18n( "Tab" ); @@ -74,10 +74,10 @@ KoCompletion::KoCompletion(TQWidget *parent, KoAutoFormat *autoFormat) : KoCompl connect( pbSaveCompletionEntry, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSaveCompletionEntry())); slotResetConf(); // aka load config - changeButtontqStatus(); + changeButtonStatus(); } -void KoCompletion::changeButtontqStatus() { +void KoCompletion::changeButtonStatus() { bool state = cbAllowCompletion->isChecked(); completionBox->setEnabled( state); @@ -122,7 +122,7 @@ void KoCompletion::slotResetConf() { default: m_completionKeyAction->setCurrentItem( 0 ); } - changeButtontqStatus(); + changeButtonStatus(); } void KoCompletion::slotAddCompletionEntry() { diff --git a/lib/kotext/KoCompletionDia.h b/lib/kotext/KoCompletionDia.h index 1aefb39a..98927e0b 100644 --- a/lib/kotext/KoCompletionDia.h +++ b/lib/kotext/KoCompletionDia.h @@ -35,7 +35,7 @@ public: void saveSettings(); protected slots: - void changeButtontqStatus(); + void changeButtonStatus(); void slotResetConf(); void slotAddCompletionEntry(); void slotRemoveCompletionEntry(); diff --git a/lib/kotext/KoComplexText.cpp b/lib/kotext/KoComplexText.cpp index 54599d07..475f439d 100644 --- a/lib/kotext/KoComplexText.cpp +++ b/lib/kotext/KoComplexText.cpp @@ -65,14 +65,14 @@ KoBidiContext::~KoBidiContext() delete parent; } -static TQChar *tqshapeBuffer = 0; -static int tqshapeBufSize = 0; +static TQChar *shapeBuffer = 0; +static int shapeBufSize = 0; /* Arabic shaping obeys a number of rules according to the joining classes (see Unicode book, section on arabic). - Each tqunicode char has a joining class (right, dual (left&right), center (joincausing) or transparent). + Each unicode char has a joining class (right, dual (left&right), center (joincausing) or transparent). transparent joining is not encoded in TQChar::joining(), but applies to all combining marks and format marks. Right join-causing: dual + center @@ -103,7 +103,7 @@ static int tqshapeBufSize = 0; */ /* - Two small helper functions for arabic shaping. They get the next tqshape causing character on either + Two small helper functions for arabic shaping. They get the next shape causing character on either side of the char in question. Implements rule R1. leftChar() returns true if the char to the left is a left join-causing char @@ -113,7 +113,7 @@ static inline const TQChar *prevChar( const TQString &str, int pos ) { //kdDebug() << "leftChar: pos=" << pos << endl; pos--; - const TQChar *ch = str.tqunicode() + pos; + const TQChar *ch = str.unicode() + pos; while( pos > -1 ) { if( !ch->isMark() ) return ch; @@ -127,7 +127,7 @@ static inline const TQChar *nextChar( const TQString &str, int pos) { pos++; int len = str.length(); - const TQChar *ch = str.tqunicode() + pos; + const TQChar *ch = str.unicode() + pos; while( pos < len ) { //kdDebug() << "rightChar: " << pos << " isLetter=" << ch.isLetter() << ", joining=" << ch.joining() << endl; if( !ch->isMark() ) @@ -155,11 +155,11 @@ KoComplexText::Shape KoComplexText::glyphVariant( const TQString &str, int pos) { // ignores L1 - L3, done in the codec TQChar::Joining joining = str[pos].joining(); - //kdDebug() << "checking " << str[pos].tqunicode() << ", joining=" << joining << endl; + //kdDebug() << "checking " << str[pos].unicode() << ", joining=" << joining << endl; switch ( joining ) { case TQChar::OtherJoining: case TQChar::Center: - // these don't change tqshape + // these don't change shape return XIsolated; case TQChar::Right: // only rule R2 applies @@ -200,11 +200,11 @@ KoComplexText::Shape KoComplexText::glyphVariantLogical( const TQString &str, in { // ignores L1 - L3, ligatures are job of the codec TQChar::Joining joining = str[pos].joining(); - //kdDebug() << "checking " << str[pos].tqunicode() << ", joining=" << joining << endl; + //kdDebug() << "checking " << str[pos].unicode() << ", joining=" << joining << endl; switch ( joining ) { case TQChar::OtherJoining: case TQChar::Center: - // these don't change tqshape + // these don't change shape return XIsolated; case TQChar::Right: // only rule R2 applies @@ -229,11 +229,11 @@ KoComplexText::Shape KoComplexText::glyphVariantLogical( const TQString &str, in // ------------------------------------------------------------- -// The tqunicode to tqunicode shaping codec. +// The unicode to unicode shaping codec. // does only presentation forms B at the moment, but that should be enough for // simple display static const ushort arabicUnicodeMapping[256][2] = { - // base of tqshaped forms, and number-1 of them ( 0 for non shaping, + // base of shaped forms, and number-1 of them ( 0 for non shaping, // 1 for right binding and 3 for dual binding { 0x0600, 0 }, // 0x600 { 0x0601, 0 }, // 0x601 @@ -355,7 +355,7 @@ static const ushort arabicUnicodeMapping[256][2] = { { 0x066e, 0 }, // 0x66e { 0x066f, 0 }, // 0x66f - // ### some glyphs do not have tqshaped mappings in the presentation forms A. + // ### some glyphs do not have shaped mappings in the presentation forms A. // these have the shaping set to 0 for the moment. Will have to find out better mappings for them. { 0x0670, 0 }, // 0x670 { 0xfb50, 1 }, // 0x671 R Alef Wasla @@ -512,7 +512,7 @@ static const ushort arabicUnicodeMapping[256][2] = { }; -// this is a bit tricky. Alef always binds to the right, so the second parameter descibing the tqshape +// this is a bit tricky. Alef always binds to the right, so the second parameter descibing the shape // of the lam can be either initial of medial. So initial maps to the isolated form of the ligature, // medial to the final form static const ushort arabicUnicodeLamAlefMapping[6][4] = { @@ -524,14 +524,14 @@ static const ushort arabicUnicodeLamAlefMapping[6][4] = { { 0xfffd, 0xfffd, 0xfefb, 0xfefc } // 0x627 R Alef }; -static inline int getShape( const TQChar * /* base */, uchar cell, int tqshape, +static inline int getShape( const TQChar * /* base */, uchar cell, int shape, const TQFontMetrics * /* fm */ ) { - uint ch = arabicUnicodeMapping[cell][0] + tqshape; + uint ch = arabicUnicodeMapping[cell][0] + shape; /* - // we revert to the untqshaped glyph in case the tqshaped version doesn't exist + // we revert to the unshaped glyph in case the shaped version doesn't exist if ( fm && !fm->inFont( ch ) ) { - switch( tqshape ) { + switch( shape ) { case KoComplexText::XIsolated: break; // try base form case KoComplexText::XFinal: @@ -551,7 +551,7 @@ static inline int getShape( const TQChar * /* base */, uchar cell, int tqshape, return ch; } -TQString KoComplexText::tqshapedString(const TQString& uc, int from, int len, TQPainter::TextDirection dir, const TQFontMetrics *fm ) +TQString KoComplexText::shapedString(const TQString& uc, int from, int len, TQPainter::TextDirection dir, const TQFontMetrics *fm ) { if( len < 0 ) len = uc.length() - from; @@ -561,13 +561,13 @@ TQString KoComplexText::tqshapedString(const TQString& uc, int from, int len, TQ // we have to ignore NSMs at the beginning and add at the end. int num = uc.length() - from - len; - const TQChar *ch = uc.tqunicode() + from + len; + const TQChar *ch = uc.unicode() + from + len; while ( num > 0 && ch->combiningClass() != 0 ) { ch++; num--; len++; } - ch = uc.tqunicode() + from; + ch = uc.unicode() + from; while ( len > 0 && ch->combiningClass() != 0 ) { ch++; len--; @@ -575,16 +575,16 @@ TQString KoComplexText::tqshapedString(const TQString& uc, int from, int len, TQ } if ( len == 0 ) return TQString(); - if( !tqshapeBuffer || len > tqshapeBufSize ) { - if( tqshapeBuffer ) free( (void *) tqshapeBuffer ); - tqshapeBuffer = (TQChar *) malloc( len*sizeof( TQChar ) ); -// delete [] tqshapeBuffer; -// tqshapeBuffer = new TQChar[ len + 1]; - tqshapeBufSize = len; + if( !shapeBuffer || len > shapeBufSize ) { + if( shapeBuffer ) free( (void *) shapeBuffer ); + shapeBuffer = (TQChar *) malloc( len*sizeof( TQChar ) ); +// delete [] shapeBuffer; +// shapeBuffer = new TQChar[ len + 1]; + shapeBufSize = len; } int lenOut = 0; - TQChar *data = tqshapeBuffer; + TQChar *data = shapeBuffer; if ( dir == TQPainter::RTL ) ch += len - 1; for ( int i = 0; i < len; i++ ) { @@ -601,8 +601,8 @@ TQString KoComplexText::tqshapedString(const TQString& uc, int from, int len, TQ int pos = i + from; if ( dir == TQPainter::RTL ) pos = from + len - 1 - i; - int tqshape = glyphVariantLogical( uc, pos ); - //kdDebug() << "mapping U+" << ch->tqunicode() << " to tqshape " << tqshape << " glyph=0x" << arabicUnicodeMapping[ch->cell()][tqshape] << endl; + int shape = glyphVariantLogical( uc, pos ); + //kdDebug() << "mapping U+" << ch->unicode() << " to shape " << shape << " glyph=0x" << arabicUnicodeMapping[ch->cell()][shape] << endl; // take care of lam-alef ligatures (lam right of alef) ushort map; switch ( c ) { @@ -615,7 +615,7 @@ TQString KoComplexText::tqshapedString(const TQString& uc, int from, int len, TQ case 0x25: case 0x27: //kdDebug() << " lam of lam-alef ligature" << endl; - map = arabicUnicodeLamAlefMapping[pch->cell() - 0x22][tqshape]; + map = arabicUnicodeLamAlefMapping[pch->cell() - 0x22][shape]; goto next; default: break; @@ -627,7 +627,7 @@ TQString KoComplexText::tqshapedString(const TQString& uc, int from, int len, TQ case 0x23: // alef with hamza above case 0x25: // alef with hamza below case 0x27: // alef - if ( prevChar( uc, pos )->tqunicode() == 0x0644 ) { + if ( prevChar( uc, pos )->unicode() == 0x0644 ) { // have a lam alef ligature //kdDebug() << " alef of lam-alef ligature" << endl; goto skip; @@ -635,7 +635,7 @@ TQString KoComplexText::tqshapedString(const TQString& uc, int from, int len, TQ default: break; } - map = getShape( ch, c, tqshape, fm ); + map = getShape( ch, c, shape, fm ); next: *data = map; data++; @@ -649,11 +649,11 @@ TQString KoComplexText::tqshapedString(const TQString& uc, int from, int len, TQ } if ( dir == TQPainter::Auto && !uc.simpleText() ) { - return bidiReorderString( TQConstString( tqshapeBuffer, lenOut ).string() ); + return bidiReorderString( TQConstString( shapeBuffer, lenOut ).string() ); } if ( dir == TQPainter::RTL ) { // reverses the non spacing marks to be again after the base char - TQChar *s = tqshapeBuffer; + TQChar *s = shapeBuffer; int i = 0; while ( i < lenOut ) { if ( s->combiningClass() != 0 ) { @@ -684,17 +684,17 @@ TQString KoComplexText::tqshapedString(const TQString& uc, int from, int len, TQ } } - return TQConstString( tqshapeBuffer, lenOut ).string(); + return TQConstString( shapeBuffer, lenOut ).string(); } -TQChar KoComplexText::tqshapedCharacter( const TQString &str, int pos, const TQFontMetrics *fm ) +TQChar KoComplexText::shapedCharacter( const TQString &str, int pos, const TQFontMetrics *fm ) { - const TQChar *ch = str.tqunicode() + pos; + const TQChar *ch = str.unicode() + pos; if ( ch->row() != 0x06 ) return *ch; else { - int tqshape = glyphVariantLogical( str, pos ); - //kdDebug() << "mapping U+" << ch->tqunicode() << " to tqshape " << tqshape << " glyph=0x" << arabicUnicodeMapping[ch->cell()][tqshape] << endl; + int shape = glyphVariantLogical( str, pos ); + //kdDebug() << "mapping U+" << ch->unicode() << " to shape " << shape << " glyph=0x" << arabicUnicodeMapping[ch->cell()][shape] << endl; // lam aleph ligatures switch ( ch->cell() ) { case 0x44: { // lam @@ -705,7 +705,7 @@ TQChar KoComplexText::tqshapedCharacter( const TQString &str, int pos, const TQF case 0x23: case 0x25: case 0x27: - return TQChar(arabicUnicodeLamAlefMapping[nch->cell() - 0x22][tqshape]); + return TQChar(arabicUnicodeLamAlefMapping[nch->cell() - 0x22][shape]); default: break; } @@ -716,13 +716,13 @@ TQChar KoComplexText::tqshapedCharacter( const TQString &str, int pos, const TQF case 0x23: // alef with hamza above case 0x25: // alef with hamza below case 0x27: // alef - if ( prevChar( str, pos )->tqunicode() == 0x0644 ) + if ( prevChar( str, pos )->unicode() == 0x0644 ) // have a lam alef ligature return TQChar(0); default: break; } - return TQChar( getShape( ch, ch->cell(), tqshape, fm ) ); + return TQChar( getShape( ch, ch->cell(), shape, fm ) ); } } @@ -739,7 +739,7 @@ TQPointArray KoComplexText::positionMarks( TQFontPrivate *f, const TQString &str if ( !nmarks ) return TQPointArray(); - TQChar baseChar = KoComplexText::tqshapedCharacter( str, pos ); + TQChar baseChar = KoComplexText::shapedCharacter( str, pos ); TQRect baseRect = f->boundingRect( baseChar ); int baseOffset = f->textWidth( str, pos, 1 ); @@ -842,7 +842,7 @@ TQPointArray KoComplexText::positionMarks( TQFontPrivate *f, const TQString &str default: break; } - //kdDebug() << "char=" << mark.tqunicode() << " combiningClass = " << cmb << " offset=" << p.x() << "/" << p.y() << endl; + //kdDebug() << "char=" << mark.unicode() << " combiningClass = " << cmb << " offset=" << p.x() << "/" << p.y() << endl; markRect.moveBy( p.x(), p.y() ); p += TQPoint( -baseOffset, 0 ); attachmentRect |= markRect; @@ -864,7 +864,7 @@ static TQChar::Direction basicDirection(const TQString &str, int start = 0) { int len = str.length(); int pos = start > len ? len -1 : start; - const TQChar *uc = str.tqunicode() + pos; + const TQChar *uc = str.unicode() + pos; while( pos < len ) { switch( uc->direction() ) { @@ -913,7 +913,7 @@ TQPtrList<KoTextRun> *KoComplexText::bidiReorderLine( KoBidiControl *control, co } } - KoBiditqStatus status = control->status; + KoBidiStatus status = control->status; TQChar::Direction dir = TQChar::DirON; int sor = start; @@ -1406,8 +1406,8 @@ TQString KoComplexText::bidiReorderString( const TQString &str, TQChar::Directio int len = str.length(); TQString visual; visual.setUnicode( 0, len ); - TQChar *vch = (TQChar *)visual.tqunicode(); - const TQChar *ch = str.tqunicode(); + TQChar *vch = (TQChar *)visual.unicode(); + const TQChar *ch = str.unicode(); while( lineStart < len ) { lineEnd = lineStart; while( *ch != '\n' && lineEnd < len ) { diff --git a/lib/kotext/KoComplexText.h b/lib/kotext/KoComplexText.h index 72abfbed..8a22d152 100644 --- a/lib/kotext/KoComplexText.h +++ b/lib/kotext/KoComplexText.h @@ -62,8 +62,8 @@ #ifndef TQT_NO_COMPLEXTEXT // bidi helper classes. Internal to TQt -struct TQ_EXPORT KoBiditqStatus { - KoBiditqStatus() { +struct TQ_EXPORT KoBidiStatus { + KoBidiStatus() { eor = TQChar::DirON; lastStrong = TQChar::DirON; last = TQChar:: DirON; @@ -87,12 +87,12 @@ struct TQ_EXPORT KoBidiContext : public TQShared { struct TQ_EXPORT KoBidiControl { KoBidiControl() { context = 0; } - KoBidiControl( KoBidiContext *c, KoBiditqStatus s) + KoBidiControl( KoBidiContext *c, KoBidiStatus s) { context = c; if( context ) context->ref(); status = s; } ~KoBidiControl() { if ( context && context->deref() ) delete context; } void setContext( KoBidiContext *c ) { if ( context == c ) return; if ( context && context->deref() ) delete context; context = c; context->ref(); } KoBidiContext *context; - KoBiditqStatus status; + KoBidiStatus status; }; struct TQ_EXPORT KoTextRun { @@ -115,8 +115,8 @@ public: static Shape glyphVariant( const TQString &str, int pos); static Shape glyphVariantLogical( const TQString &str, int pos); - static TQString tqshapedString( const TQString &str, int from = 0, int len = -1, TQPainter::TextDirection dir = TQPainter::Auto, const TQFontMetrics *fm = 0); - static TQChar tqshapedCharacter(const TQString &str, int pos, const TQFontMetrics *fm = 0); + static TQString shapedString( const TQString &str, int from = 0, int len = -1, TQPainter::TextDirection dir = TQPainter::Auto, const TQFontMetrics *fm = 0); + static TQChar shapedCharacter(const TQString &str, int pos, const TQFontMetrics *fm = 0); // positions non spacing marks relative to the base character at position pos. //static TQPointArray positionMarks( TQFontPrivate *f, const TQString &str, int pos, TQRect *boundingRect = 0 ); diff --git a/lib/kotext/KoCreateStyleDia.cpp b/lib/kotext/KoCreateStyleDia.cpp index e4b9f339..fb7d9b9d 100644 --- a/lib/kotext/KoCreateStyleDia.cpp +++ b/lib/kotext/KoCreateStyleDia.cpp @@ -33,7 +33,7 @@ KoCreateStyleDia::KoCreateStyleDia( const TQStringList & _list, TQWidget *parent TQVBox *page = makeVBoxMainWidget(); new TQLabel(i18n("Please specify a new style name:"), page); m_styleName = new TQLineEdit( page ); - m_styleName->setMinimumWidth( m_styleName->tqsizeHint().width() * 3 ); + m_styleName->setMinimumWidth( m_styleName->sizeHint().width() * 3 ); connect( m_styleName, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(nameChanged( const TQString &))); m_styleName->setFocus(); diff --git a/lib/kotext/KoCustomVariablesDia.cpp b/lib/kotext/KoCustomVariablesDia.cpp index aa74d133..f3b84121 100644 --- a/lib/kotext/KoCustomVariablesDia.cpp +++ b/lib/kotext/KoCustomVariablesDia.cpp @@ -67,7 +67,7 @@ void KoVariableNameDia::init() row1->setSpacing( KDialog::spacingHint() ); TQLabel *l = new TQLabel( i18n( "Name:" ), row1 ); - l->setFixedSize( l->tqsizeHint() ); + l->setFixedSize( l->sizeHint() ); names = new TQComboBox( TRUE, row1 ); names->setFocus(); @@ -108,9 +108,9 @@ void KoCustomVariablesListItem::setup() { TQListViewItem::setup(); setHeight( TQMAX( listView()->fontMetrics().height(), - editWidget->tqsizeHint().height() ) ); - //if ( listView()->columnWidth( 1 ) < editWidget->tqsizeHint().width() ) - // listView()->setColumnWidth( 1, editWidget->tqsizeHint().width() ); + editWidget->sizeHint().height() ) ); + //if ( listView()->columnWidth( 1 ) < editWidget->sizeHint().width() ) + // listView()->setColumnWidth( 1, editWidget->sizeHint().width() ); } void KoCustomVariablesListItem::update() @@ -297,13 +297,13 @@ void KoCustomVarDialog::init() TQHBox *row1 = new TQHBox( back ); row1->setSpacing( KDialog::spacingHint() ); TQLabel *ln = new TQLabel( i18n( "Name:" ), row1 ); - ln->setFixedSize( ln->tqsizeHint() ); + ln->setFixedSize( ln->sizeHint() ); m_name = new KLineEdit( row1 ); TQHBox *row2 = new TQHBox( back ); row2->setSpacing( KDialog::spacingHint() ); TQLabel *lv = new TQLabel( i18n( "Value:" ), row2 ); - lv->setFixedSize( lv->tqsizeHint() ); + lv->setFixedSize( lv->sizeHint() ); m_value = new KLineEdit( row2 ); } diff --git a/lib/kotext/KoImportStyleDia.cpp b/lib/kotext/KoImportStyleDia.cpp index 327dbe53..1cab9dae 100644 --- a/lib/kotext/KoImportStyleDia.cpp +++ b/lib/kotext/KoImportStyleDia.cpp @@ -19,7 +19,7 @@ #include <klocale.h> #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqlistbox.h> @@ -98,7 +98,7 @@ TQString KoImportStyleDia::generateStyleName( const TQString & templateName ) co int num = 1; bool exists; do { - name = templateName.tqarg( num ); + name = templateName.arg( num ); exists = m_currentCollection->findStyle( name ) != 0; ++num; } while ( exists ); @@ -111,7 +111,7 @@ TQString KoImportStyleDia::generateStyleDisplayName( const TQString & templateNa int num = 1; bool exists; do { - name = templateName.tqarg( num ); + name = templateName.arg( num ); exists = m_currentCollection->findStyleByDisplayName( name ) != 0; ++num; } while ( exists ); diff --git a/lib/kotext/KoParagCounter.cpp b/lib/kotext/KoParagCounter.cpp index 6126d6c5..9810e8b0 100644 --- a/lib/kotext/KoParagCounter.cpp +++ b/lib/kotext/KoParagCounter.cpp @@ -43,7 +43,7 @@ KoParagCounter::KoParagCounter() m_customBulletChar = TQChar( '-' ); m_customBulletFont = TQString(); m_align = TQt::AlignAuto; - tqinvalidate(); + invalidate(); } bool KoParagCounter::operator==( const KoParagCounter & c2 ) const @@ -83,7 +83,7 @@ unsigned int KoParagCounter::depth() const return m_depth; } -void KoParagCounter::tqinvalidate() +void KoParagCounter::invalidate() { m_cache.number = -1; m_cache.text = TQString(); @@ -144,7 +144,7 @@ void KoParagCounter::load( TQDomElement & element ) m_align = element.attribute("align", "0").toInt(); //AlignAuto as defeult TQString restart = element.attribute("restart"); m_restartCounter = (restart == "true") || (restart == "1"); - tqinvalidate(); + invalidate(); } static int importCounterType( TQChar numFormat ) @@ -216,7 +216,7 @@ void KoParagCounter::loadOasisListStyle( const TQDomElement& listStyle, TQString bulletChar = listStyle.attributeNS( KoXmlNS::text, "bullet-char", TQString() ); if ( !bulletChar.isEmpty() ) { // Reverse engineering, I found those codes: - switch( bulletChar[0].tqunicode() ) { + switch( bulletChar[0].unicode() ) { case 0x2022: // small disc -> circle m_style = STYLE_CIRCLEBULLET; break; @@ -235,7 +235,7 @@ void KoParagCounter::loadOasisListStyle( const TQDomElement& listStyle, m_style = STYLE_BOXBULLET; break; default: - kdDebug() << "Unhandled bullet code 0x" << TQString::number( (uint)m_customBulletChar.tqunicode(), 16 ) << endl; + kdDebug() << "Unhandled bullet code 0x" << TQString::number( (uint)m_customBulletChar.unicode(), 16 ) << endl; // fallback case 0x2794: // arrow case 0x2717: // cross @@ -259,7 +259,7 @@ void KoParagCounter::loadOasisListStyle( const TQDomElement& listStyle, m_style = STYLE_DISCBULLET; } } - tqinvalidate(); + invalidate(); } void KoParagCounter::saveOasis( KoGenStyle& listStyle, bool savingStyle ) const @@ -326,7 +326,7 @@ void KoParagCounter::saveOasisListLevel( KoXmlWriter& listLevelWriter, bool incl listLevelWriter.startElement( "style:list-level-properties" ); listLevelWriter.addAttribute( "fo:text-align", KoParagLayout::saveOasisAlignment( (TQt::AlignmentFlags)m_align ) ); // OASIS has other style properties: text:space-before (indent), text:min-label-width (TODO), - // text:min-label-distance, style:font-name (for bullets), image size and vertical tqalignment. + // text:min-label-distance, style:font-name (for bullets), image size and vertical alignment. listLevelWriter.endElement(); // style:list-level-properties } } @@ -504,7 +504,7 @@ void KoParagCounter::save( TQDomElement & element ) element.setAttribute( "depth", m_depth ); if ( (Style)m_style == STYLE_CUSTOMBULLET ) { - element.setAttribute( "bullet", m_customBulletChar.tqunicode() ); + element.setAttribute( "bullet", m_customBulletChar.unicode() ); if ( !m_customBulletFont.isEmpty() ) element.setAttribute( "bulletfont", m_customBulletFont ); } @@ -531,66 +531,66 @@ void KoParagCounter::save( TQDomElement & element ) void KoParagCounter::setCustom( TQString c ) { m_custom = c; - tqinvalidate(); + invalidate(); } void KoParagCounter::setCustomBulletCharacter( TQChar c ) { m_customBulletChar = c; - tqinvalidate(); + invalidate(); } void KoParagCounter::setCustomBulletFont( TQString f ) { m_customBulletFont = f; - tqinvalidate(); + invalidate(); } void KoParagCounter::setDepth( unsigned int d ) { m_depth = d; - tqinvalidate(); + invalidate(); } void KoParagCounter::setNumbering( Numbering n ) { m_numbering = n; - tqinvalidate(); + invalidate(); } void KoParagCounter::setPrefix( TQString p ) { m_prefix = p; - tqinvalidate(); + invalidate(); } void KoParagCounter::setStartNumber( int s ) { m_startNumber = s; - tqinvalidate(); + invalidate(); } void KoParagCounter::setDisplayLevels( int l ) { m_displayLevels = l; - tqinvalidate(); + invalidate(); } -void KoParagCounter::tqsetAlignment( int a ) +void KoParagCounter::setAlignment( int a ) { m_align = a; - tqinvalidate(); + invalidate(); } void KoParagCounter::setStyle( Style s ) { m_style = s; - tqinvalidate(); + invalidate(); } void KoParagCounter::setSuffix( TQString s ) { m_suffix = s; - tqinvalidate(); + invalidate(); } int KoParagCounter::startNumber() const @@ -603,7 +603,7 @@ int KoParagCounter::displayLevels() const return m_displayLevels; } -int KoParagCounter::tqalignment() const +int KoParagCounter::alignment() const { return m_align; } @@ -626,7 +626,7 @@ bool KoParagCounter::restartCounter() const void KoParagCounter::setRestartCounter( bool restart ) { m_restartCounter = restart; - tqinvalidate(); + invalidate(); } // Return the text for that level only @@ -839,7 +839,7 @@ const TQCString RNThousands[] = {"", "m", "mm", "mmm"}; TQString KoParagCounter::makeRomanNumber( int n ) { if ( n >= 0 ) - return TQString::tqfromLatin1( RNThousands[ ( n / 1000 ) ] + + return TQString::fromLatin1( RNThousands[ ( n / 1000 ) ] + RNHundreds[ ( n / 100 ) % 10 ] + RNTens[ ( n / 10 ) % 10 ] + RNUnits[ ( n ) % 10 ] ); @@ -973,7 +973,7 @@ void KoParagCounter::printRTDebug( KoTextParag* parag ) if ( restartCounter() ) additionalInfo = "[restartCounter]"; if ( m_style == STYLE_CUSTOMBULLET ) - additionalInfo += " [customBullet: " + TQString::number( m_customBulletChar.tqunicode() ) + additionalInfo += " [customBullet: " + TQString::number( m_customBulletChar.unicode() ) + " in font '" + m_customBulletFont + "']"; static const char * const s_numbering[] = { "List", "Chapter", "None", "Footnote" }; kdDebug(32500) << " Counter style=" << style() diff --git a/lib/kotext/KoParagCounter.h b/lib/kotext/KoParagCounter.h index dbedb3e8..d45b2435 100644 --- a/lib/kotext/KoParagCounter.h +++ b/lib/kotext/KoParagCounter.h @@ -40,7 +40,7 @@ public: /** Invalidate the internal cache. Use it whenever the number associated with this * counter may have changed. */ - void tqinvalidate(); + void invalidate(); /** Return the current value of the counter as a number. */ @@ -172,10 +172,10 @@ public: TQString custom() const; void setCustom( TQString c ); - /** Counter tqalignment + /** Counter alignment */ - int tqalignment() const; - void tqsetAlignment( int a ); + int alignment() const; + void setAlignment( int a ); /** * Return the format to use for the counter. diff --git a/lib/kotext/KoParagDecorationTab.ui b/lib/kotext/KoParagDecorationTab.ui index 4c93c261..131e1b0c 100644 --- a/lib/kotext/KoParagDecorationTab.ui +++ b/lib/kotext/KoParagDecorationTab.ui @@ -131,7 +131,7 @@ modified in the preview.</p></string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>200</height> @@ -361,7 +361,7 @@ regardless of the style of the preceeding and subsequent paragraphs.</p></ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>250</width> <height>21</height> diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp index 2bc0262d..ed7700e2 100644 --- a/lib/kotext/KoParagDia.cpp +++ b/lib/kotext/KoParagDia.cpp @@ -50,7 +50,7 @@ #include <tqvbox.h> #include <tqhbox.h> #include <tqtooltip.h> -#include <tqlayout.h> +#include <layout.h> #include <tqapplication.h> #include <tqwidgetstack.h> @@ -129,7 +129,7 @@ KoCounterStyleWidget::KoCounterStyleWidget( bool displayDepth, bool onlyStyleTyp grid->addWidget( spnStart, 2, 2); lAlignment = new TQLabel( gStyle, "lAlignment" ); - lAlignment->setText( i18n( "Counter tqalignment:" ) ); + lAlignment->setText( i18n( "Counter alignment:" ) ); grid->addWidget( lAlignment, 2, 3 ); cbAlignment = new KComboBox( gStyle, "cbAlignment" ); @@ -205,7 +205,7 @@ void KoCounterStyleWidget::alignmentChanged(const TQString& s) kdError()<<"Not Implemented"<<endl; return; } - m_counter.tqsetAlignment(a); + m_counter.setAlignment(a); emit sig_alignmentChanged(a); } @@ -296,11 +296,11 @@ void KoCounterStyleWidget::displayStyle( KoParagCounter::Style style ) spnStart->setValue( m_counter.startNumber() ); cbRestart->setChecked( m_counter.restartCounter() ); - if(m_counter.tqalignment()==TQt::AlignLeft) + if(m_counter.alignment()==TQt::AlignLeft) cbAlignment->setCurrentText(i18n("Align Left")); - else if(m_counter.tqalignment()==TQt::AlignRight) + else if(m_counter.alignment()==TQt::AlignRight) cbAlignment->setCurrentText(i18n("Align Right")); - else if(m_counter.tqalignment()==TQt::AlignAuto) + else if(m_counter.alignment()==TQt::AlignAuto) cbAlignment->setCurrentText(i18n("Align Auto")); else kdError()<<"Not Implemented"<<endl; @@ -812,14 +812,14 @@ void KoStylePreview::setCounter( const KoParagCounter & counter ) { KoTextParag * parag = m_textdoc->firstParag(); parag->setCounter( counter ); - tqrepaint( true ); + repaint( true ); } void KoStylePreview::setStyle( KoParagStyle * style ) { KoTextParag * parag = m_textdoc->firstParag(); parag->applyStyle( style ); - tqrepaint(true); + repaint(true); } void KoStylePreview::drawContents( TQPainter *painter ) @@ -830,7 +830,7 @@ void KoStylePreview::drawContents( TQPainter *painter ) TQRect whiteRect( r.x() + 10, r.y() + 10, r.width() - 20, r.height() - 20 ); - TQColorGroup cg = TQApplication::tqpalette().active(); + TQColorGroup cg = TQApplication::palette().active(); painter->fillRect( whiteRect, cg.brush( TQColorGroup::Base ) ); KoTextParag * parag = m_textdoc->firstParag(); @@ -839,13 +839,13 @@ void KoStylePreview::drawContents( TQPainter *painter ) { // For centering to work, and to even get word wrapping when the thing is too big :) m_textdoc->setWidth( widthLU ); - parag->tqinvalidate(0); + parag->invalidate(0); } parag->format(); TQRect textRect = parag->pixelRect( m_zoomHandler ); - // Center vertically, but not horizontally, to keep the parag tqalignment working, + // Center vertically, but not horizontally, to keep the parag alignment working, textRect.moveTopLeft( TQPoint( whiteRect.x(), whiteRect.y() + ( whiteRect.height() - textRect.height() ) / 2 ) ); // Move it from the left border a little @@ -879,8 +879,8 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW frameWidth=9999; } else { length=i18n("Frame width: %1 %2") - .tqarg(KoUnit::toUserStringValue(frameWidth,m_unit)) - .tqarg(KoUnit::unitName(m_unit)); + .arg(KoUnit::toUserStringValue(frameWidth,m_unit)) + .arg(KoUnit::unitName(m_unit)); frameWidth=KoUnit::toUserValue(frameWidth,m_unit); } @@ -890,12 +890,12 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW TQLabel * lLimit = new TQLabel(length , indentFrame ); if(frameWidth!=-1) { - lLimit->tqsetAlignment( AlignRight ); + lLimit->setAlignment( AlignRight ); indentGrid->addWidget( lLimit, 1,0 ); } TQLabel * lLeft = new TQLabel( i18n("&Left:"), indentFrame ); - lLeft->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + lLeft->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); indentGrid->addWidget( lLeft, 1, 0 ); eLeft = new KoUnitDoubleSpinBox( indentFrame, 0, 9999, 1, 0.0, m_unit ); @@ -904,7 +904,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW connect( eLeft, TQT_SIGNAL( valueChangedPt(double ) ), this, TQT_SLOT( leftChanged( double ) ) ); TQLabel * lRight = new TQLabel( i18n("&Right:"), indentFrame ); - lRight->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + lRight->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); indentGrid->addWidget( lRight, 2, 0 ); eRight = new KoUnitDoubleSpinBox( indentFrame, 0, 9999, 1, 0.0, m_unit ); @@ -913,7 +913,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW connect( eRight, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( rightChanged( double ) ) ); TQLabel * lFirstLine = new TQLabel( i18n("&First line:"), indentFrame ); - lFirstLine->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + lFirstLine->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); indentGrid->addWidget( lFirstLine, 3, 0 ); eFirstLine = new KoUnitDoubleSpinBox( indentFrame, -9999, 9999, 1, 0.0, m_unit ); @@ -938,9 +938,9 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW cSpacing->insertItem( i18n( "Line spacing value", "1.5 Lines" ) ); cSpacing->insertItem( i18n( "Line spacing value", "Double" ) ); cSpacing->insertItem( i18n( "Proportional") ); // LS_MULTIPLE, called Proportional like in OO - cSpacing->insertItem( i18n( "Line Distance (%1)" ).tqarg(unitName) ); // LS_CUSTOM - cSpacing->insertItem( i18n( "At Least (%1)" ).tqarg(unitName) ); - cSpacing->insertItem( i18n( "Fixed (%1)").tqarg(unitName) ); // LS_FIXED + cSpacing->insertItem( i18n( "Line Distance (%1)" ).arg(unitName) ); // LS_CUSTOM + cSpacing->insertItem( i18n( "At Least (%1)" ).arg(unitName) ); + cSpacing->insertItem( i18n( "Fixed (%1)").arg(unitName) ); // LS_FIXED connect( cSpacing, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( spacingActivated( int ) ) ); spacingGrid->addWidget( cSpacing, 1, 0 ); @@ -974,7 +974,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW KDialog::marginHint(), KDialog::spacingHint() ); TQLabel * lBefore = new TQLabel( i18n("Before:"), pSpaceFrame ); - lBefore->tqsetAlignment( AlignRight ); + lBefore->setAlignment( AlignRight ); pSpaceGrid->addWidget( lBefore, 1, 0 ); eBefore = new KoUnitDoubleSpinBox( pSpaceFrame, 0, 9999, CM_TO_POINT(1), 0.0, m_unit ); @@ -983,7 +983,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW pSpaceGrid->addWidget( eBefore, 1, 1 ); TQLabel * lAfter = new TQLabel( i18n("After:"), pSpaceFrame ); - lAfter->tqsetAlignment( AlignRight ); + lAfter->setAlignment( AlignRight ); pSpaceGrid->addWidget( lAfter, 2, 0 ); eAfter = new KoUnitDoubleSpinBox( pSpaceFrame, 0, 9999, 1, 0.0, m_unit ); @@ -1273,7 +1273,7 @@ int KoParagAlignWidget::pageBreaking() const void KoParagAlignWidget::display( const KoParagLayout & lay ) { - int align = lay.tqalignment; + int align = lay.alignment; prev2->setAlign( align ); clearAligns(); @@ -1302,7 +1302,7 @@ void KoParagAlignWidget::display( const KoParagLayout & lay ) void KoParagAlignWidget::save( KoParagLayout & lay ) { - lay.tqalignment = align(); + lay.alignment = align(); lay.pageBreaking = pageBreaking(); } @@ -1605,10 +1605,10 @@ KoParagCounterWidget::KoParagCounterWidget( bool disableAll, TQWidget * parent, gNumbering = new TQButtonGroup( this, "numberingGroup" ); gNumbering->setTitle( i18n( "Numbering" ) ); gNumbering->setColumnLayout(0, Qt::Vertical ); - gNumbering->tqlayout()->setSpacing( 0 ); - gNumbering->tqlayout()->setMargin( 0 ); - TQHBoxLayout *numberingGroupLayout = new TQHBoxLayout( gNumbering->tqlayout() ); - numberingGroupLayout->tqsetAlignment( TQt::AlignTop ); + gNumbering->layout()->setSpacing( 0 ); + gNumbering->layout()->setMargin( 0 ); + TQHBoxLayout *numberingGroupLayout = new TQHBoxLayout( gNumbering->layout() ); + numberingGroupLayout->setAlignment( TQt::AlignTop ); numberingGroupLayout->setSpacing( KDialog::spacingHint() ); numberingGroupLayout->setMargin( KDialog::marginHint() ); @@ -1705,7 +1705,7 @@ void KoParagCounterWidget::display( const KoParagLayout & lay ) { void KoParagCounterWidget::updatePreview() { preview->setCounter(m_counter); - preview->tqrepaint(true); + preview->repaint(true); } void KoParagCounterWidget::save( KoParagLayout & lay ) { @@ -1746,8 +1746,8 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram } else { m_toplimit=frameWidth; length=i18n("Frame width: %1 %2") - .tqarg(KoUnit::toUserStringValue(frameWidth,m_unit)) - .tqarg(KoUnit::unitName(m_unit)); + .arg(KoUnit::toUserStringValue(frameWidth,m_unit)) + .arg(KoUnit::unitName(m_unit)); frameWidth=KoUnit::toUserValue(frameWidth,m_unit); } TQVBoxLayout* Form1Layout = new TQVBoxLayout( this ); @@ -1770,10 +1770,10 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram gPosition = new TQGroupBox( this, "gPosition" ); gPosition->setTitle( i18n( "Po&sition" ) ); gPosition->setColumnLayout(0, Qt::Vertical ); - gPosition->tqlayout()->setSpacing( 0 ); - gPosition->tqlayout()->setMargin( 0 ); - TQVBoxLayout* GroupBox2Layout = new TQVBoxLayout( gPosition->tqlayout() ); - GroupBox2Layout->tqsetAlignment( TQt::AlignTop ); + gPosition->layout()->setSpacing( 0 ); + gPosition->layout()->setMargin( 0 ); + TQVBoxLayout* GroupBox2Layout = new TQVBoxLayout( gPosition->layout() ); + GroupBox2Layout->setAlignment( TQt::AlignTop ); GroupBox2Layout->setSpacing( KDialog::spacingHint() ); GroupBox2Layout->setMargin( KDialog::marginHint() ); @@ -1798,10 +1798,10 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram bgAlign = new TQButtonGroup( this ); bgAlign->setTitle( i18n( "Alignment" ) ); bgAlign->setColumnLayout(0, Qt::Vertical ); - bgAlign->tqlayout()->setSpacing( 0 ); - bgAlign->tqlayout()->setMargin( 0 ); - TQVBoxLayout* ButtonGroup1Layout = new TQVBoxLayout( bgAlign->tqlayout() ); - ButtonGroup1Layout->tqsetAlignment( TQt::AlignTop ); + bgAlign->layout()->setSpacing( 0 ); + bgAlign->layout()->setMargin( 0 ); + TQVBoxLayout* ButtonGroup1Layout = new TQVBoxLayout( bgAlign->layout() ); + ButtonGroup1Layout->setAlignment( TQt::AlignTop ); ButtonGroup1Layout->setSpacing( KDialog::spacingHint() ); ButtonGroup1Layout->setMargin( KDialog::marginHint() ); @@ -1837,7 +1837,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram gTabLeader = new TQGroupBox( this, "gTabLeader" ); gTabLeader->setTitle( i18n( "Tab Leader" ) ); TQVBoxLayout* GroupBox5Layout = new TQVBoxLayout( gTabLeader ); - GroupBox5Layout->tqsetAlignment( TQt::AlignTop ); + GroupBox5Layout->setAlignment( TQt::AlignTop ); GroupBox5Layout->setSpacing( KDialog::spacingHint() ); GroupBox5Layout->setMargin( KDialog::marginHint() ); GroupBox5Layout->addSpacing( fontMetrics().height() / 2 ); // groupbox title @@ -1850,7 +1850,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram TQLabel* TextLabel2 = new TQLabel( gTabLeader); TextLabel2->setText( i18n( "&Filling:" ) ); - TextLabel2->tqsetAlignment( AlignRight ); + TextLabel2->setAlignment( AlignRight ); fillingGrid->addWidget( TextLabel2, 0, 0 ); cFilling = new TQComboBox( FALSE, gTabLeader); @@ -1864,7 +1864,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram fillingGrid->addWidget( cFilling, 0, 1 ); TQLabel * TextLabel3 = new TQLabel( i18n("&Width:"), gTabLeader ); - TextLabel3->tqsetAlignment( AlignRight ); + TextLabel3->setAlignment( AlignRight ); fillingGrid->addWidget( TextLabel3, 1, 0 ); eWidth = new KoUnitDoubleSpinBox( gTabLeader ); @@ -2159,31 +2159,31 @@ KoParagDia::KoParagDia( TQWidget* parent, const char* name, { TQVBox * page = addVBoxPage( i18n( "Indent && S&pacing" ) ); m_indentSpacingWidget = new KoIndentSpacingWidget( unit,_frameWidth,page, "indent-spacing" ); - m_indentSpacingWidget->tqlayout()->setMargin(0); + m_indentSpacingWidget->layout()->setMargin(0); } if ( m_flags & PD_ALIGN ) { TQVBox * page = addVBoxPage( i18n( "General &Layout" ) ); m_alignWidget = new KoParagAlignWidget( breakLine, page, "align" ); - m_alignWidget->tqlayout()->setMargin(0); + m_alignWidget->layout()->setMargin(0); } if ( m_flags & PD_DECORATION ) { TQVBox * page = addVBoxPage( i18n( "D&ecorations" ) ); m_decorationsWidget = new KoParagDecorationWidget( page, "decorations"); - m_decorationsWidget->tqlayout()->setMargin(0); + m_decorationsWidget->layout()->setMargin(0); } if ( m_flags & PD_NUMBERING ) { TQVBox * page = addVBoxPage( i18n( "B&ullets/Numbers" ) ); m_counterWidget = new KoParagCounterWidget( disableAll , page, "numbers" ); - m_counterWidget->tqlayout()->setMargin(0); + m_counterWidget->layout()->setMargin(0); } if ( m_flags & PD_TABS ) { TQVBox * page = addVBoxPage( i18n( "&Tabulators" ) ); m_tabulatorsWidget = new KoParagTabulatorsWidget( unit,_frameWidth, page, "tabs"); - m_tabulatorsWidget->tqlayout()->setMargin(0); + m_tabulatorsWidget->layout()->setMargin(0); } connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT(slotReset())); @@ -2272,7 +2272,7 @@ KoParagLayout KoParagDia::paragLayout() const newLayout.setLineSpacingValue( lineSpacing() ); newLayout.lineSpacingType = lineSpacingType(); newLayout.setTabList( tabListTabulator() ); - newLayout.tqalignment = align(); + newLayout.alignment = align(); newLayout.margins[TQStyleSheetItem::MarginFirstLine] = firstLineIndent(); newLayout.margins[TQStyleSheetItem::MarginLeft] = leftIndent(); newLayout.margins[TQStyleSheetItem::MarginRight] = rightIndent(); diff --git a/lib/kotext/KoParagDia.h b/lib/kotext/KoParagDia.h index c4bbed92..2f3cc751 100644 --- a/lib/kotext/KoParagDia.h +++ b/lib/kotext/KoParagDia.h @@ -24,7 +24,7 @@ #include <kdialogbase.h> #include <tqstringlist.h> #include <tqptrlist.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <KoRuler.h> #include <KoUnit.h> #include <KoUnitWidgets.h> @@ -95,7 +95,7 @@ public: /** return the (i18n-ed) name of the tab */ virtual TQString tabName() = 0; - // Return the part of the paragtqlayout that this widget cares about + // Return the part of the paraglayout that this widget cares about int flag() const { return m_flag; } private: @@ -147,7 +147,7 @@ private: }; /** - * The widget for editing paragraph tqalignment (tab 2) + * The widget for editing paragraph alignment (tab 2) */ class KOTEXT_EXPORT KoParagAlignWidget : public KoParagLayoutWidget { @@ -369,7 +369,7 @@ protected slots: void restartChanged(bool b) {m_counter.setRestartCounter(b); } void depthChanged(int i) {m_counter.setDepth(i); updatePreview();} void displayLevelsChanged(int i) {m_counter.setDisplayLevels(i); updatePreview();} - void alignmentChanged(int i) {m_counter.tqsetAlignment(i); updatePreview();} + void alignmentChanged(int i) {m_counter.setAlignment(i); updatePreview();} void slotChangeCustomBullet( const TQString & f, TQChar c); void styleChanged (KoParagCounter::Style st ); @@ -549,7 +549,7 @@ public: TQColor backgroundColor() const { return m_decorationsWidget->backgroundColor(); } // Support for "what has changed?" - bool isAlignChanged() const {return oldLayout.tqalignment!=align();} + bool isAlignChanged() const {return oldLayout.alignment!=align();} bool isLineSpacingChanged() const { return (oldLayout.lineSpacingValue() !=lineSpacing() || oldLayout.lineSpacingType != lineSpacingType()); diff --git a/lib/kotext/KoParagDia_p.h b/lib/kotext/KoParagDia_p.h index a1ca5737..48f77ea1 100644 --- a/lib/kotext/KoParagDia_p.h +++ b/lib/kotext/KoParagDia_p.h @@ -66,17 +66,17 @@ public: ~KPagePreview() {} void setLeft( double _left ) - { left = _left; tqrepaint( false ); } + { left = _left; repaint( false ); } void setRight( double _right ) - { right = _right; tqrepaint( false ); } + { right = _right; repaint( false ); } void setFirst( double _first ) - { first = _first; tqrepaint( false ); } + { first = _first; repaint( false ); } void setSpacing( double _spacing ) - { spacing = _spacing; tqrepaint( false ); } + { spacing = _spacing; repaint( false ); } void setBefore( double _before ) - { before = _before; tqrepaint( false ); } + { before = _before; repaint( false ); } void setAfter( double _after ) - { after = _after; tqrepaint( false ); } + { after = _after; repaint( false ); } protected: void drawContents( TQPainter* ); @@ -100,7 +100,7 @@ public: ~KPagePreview2() {} void setAlign( int _align ) - { align = _align; tqrepaint( false ); } + { align = _align; repaint( false ); } protected: void drawContents( TQPainter* ); @@ -124,16 +124,16 @@ public: KoBorder leftBorder()const { return m_leftBorder; } void setLeftBorder( const KoBorder& _leftBorder ) - { m_leftBorder = _leftBorder; tqrepaint( true ); } + { m_leftBorder = _leftBorder; repaint( true ); } KoBorder rightBorder() const { return m_rightBorder; } void setRightBorder( const KoBorder& _rightBorder ) - { m_rightBorder = _rightBorder; tqrepaint( true ); } + { m_rightBorder = _rightBorder; repaint( true ); } KoBorder topBorder()const { return m_topBorder; } void setTopBorder( const KoBorder& _topBorder ) - { m_topBorder = _topBorder; tqrepaint( true ); } + { m_topBorder = _topBorder; repaint( true ); } KoBorder bottomBorder()const { return m_bottomBorder; } void setBottomBorder( const KoBorder& _bottomBorder ) - { m_bottomBorder = _bottomBorder; tqrepaint( true ); } + { m_bottomBorder = _bottomBorder; repaint( true ); } void setBorder( KoBorder::BorderType which, const KoBorder& border); diff --git a/lib/kotext/KoParagLayout.cpp b/lib/kotext/KoParagLayout.cpp index fd1a9453..37fbbfb5 100644 --- a/lib/kotext/KoParagLayout.cpp +++ b/lib/kotext/KoParagLayout.cpp @@ -44,72 +44,72 @@ KoParagLayout::KoParagLayout() initialise(); } -void KoParagLayout::operator=( const KoParagLayout &tqlayout ) +void KoParagLayout::operator=( const KoParagLayout &layout ) { - tqalignment = tqlayout.tqalignment; + alignment = layout.alignment; for ( int i = 0 ; i < 5 ; ++i ) - margins[i] = tqlayout.margins[i]; - pageBreaking = tqlayout.pageBreaking; - leftBorder = tqlayout.leftBorder; - rightBorder = tqlayout.rightBorder; - topBorder = tqlayout.topBorder; - bottomBorder = tqlayout.bottomBorder; - joinBorder = tqlayout.joinBorder; - backgroundColor = tqlayout.backgroundColor; - if ( tqlayout.counter ) - counter = new KoParagCounter( *tqlayout.counter ); + margins[i] = layout.margins[i]; + pageBreaking = layout.pageBreaking; + leftBorder = layout.leftBorder; + rightBorder = layout.rightBorder; + topBorder = layout.topBorder; + bottomBorder = layout.bottomBorder; + joinBorder = layout.joinBorder; + backgroundColor = layout.backgroundColor; + if ( layout.counter ) + counter = new KoParagCounter( *layout.counter ); else counter = 0L; - lineSpacing = tqlayout.lineSpacing; - lineSpacingType = tqlayout.lineSpacingType; - style = tqlayout.style; - direction = tqlayout.direction; - setTabList( tqlayout.tabList() ); + lineSpacing = layout.lineSpacing; + lineSpacingType = layout.lineSpacingType; + style = layout.style; + direction = layout.direction; + setTabList( layout.tabList() ); } -int KoParagLayout::compare( const KoParagLayout & tqlayout ) const +int KoParagLayout::compare( const KoParagLayout & layout ) const { int flags = 0; - if ( tqalignment != tqlayout.tqalignment ) + if ( alignment != layout.alignment ) flags |= Alignment; for ( int i = 0 ; i < 5 ; ++i ) - if ( margins[i] != tqlayout.margins[i] ) + if ( margins[i] != layout.margins[i] ) { flags |= Margins; break; } - if ( pageBreaking != tqlayout.pageBreaking ) + if ( pageBreaking != layout.pageBreaking ) flags |= PageBreaking; - if ( leftBorder != tqlayout.leftBorder - || rightBorder != tqlayout.rightBorder - || topBorder != tqlayout.topBorder - || bottomBorder != tqlayout.bottomBorder - || joinBorder != tqlayout.joinBorder ) + if ( leftBorder != layout.leftBorder + || rightBorder != layout.rightBorder + || topBorder != layout.topBorder + || bottomBorder != layout.bottomBorder + || joinBorder != layout.joinBorder ) flags |= Borders; - if ( tqlayout.counter ) + if ( layout.counter ) { if ( counter ) { - if ( ! ( *tqlayout.counter == *counter ) ) + if ( ! ( *layout.counter == *counter ) ) flags |= BulletNumber; } else - if ( tqlayout.counter->numbering() != KoParagCounter::NUM_NONE ) + if ( layout.counter->numbering() != KoParagCounter::NUM_NONE ) flags |= BulletNumber; } else if ( counter && counter->numbering() != KoParagCounter::NUM_NONE ) flags |= BulletNumber; - if ( lineSpacing != tqlayout.lineSpacing - || lineSpacingType != tqlayout.lineSpacingType ) + if ( lineSpacing != layout.lineSpacing + || lineSpacingType != layout.lineSpacingType ) flags |= LineSpacing; - //if ( style != tqlayout.style ) + //if ( style != layout.style ) // flags |= Style; - if ( m_tabList != tqlayout.m_tabList ) + if ( m_tabList != layout.m_tabList ) flags |= Tabulator; - if ( backgroundColor != tqlayout.backgroundColor) + if ( backgroundColor != layout.backgroundColor) flags |= BackgroundColor; // This method is used for the GUI stuff only, so we don't have a flag @@ -119,7 +119,7 @@ int KoParagLayout::compare( const KoParagLayout & tqlayout ) const void KoParagLayout::initialise() { - tqalignment = TQt::AlignAuto; + alignment = TQt::AlignAuto; for ( int i = 0 ; i < 5 ; ++i ) // use memset ? margins[i] = 0; lineSpacingType = LS_SINGLE; @@ -141,13 +141,13 @@ KoParagLayout::~KoParagLayout() delete counter; } -void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement& parentElem, int docVersion ) +void KoParagLayout::loadParagLayout( KoParagLayout& layout, const TQDomElement& parentElem, int docVersion ) { - // tqlayout is an input and output parameter + // layout is an input and output parameter // It can have been initialized already, e.g. by copying from a style // (we don't do that anymore though). - // Load the paragraph tabs - we load into a clean list, not mixing with those already in "tqlayout" + // Load the paragraph tabs - we load into a clean list, not mixing with those already in "layout" // We can't apply the 'default comes from the style' in this case, because // there is no way to differentiate between "I want no tabs in the parag" // and "use default from style". @@ -171,15 +171,15 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement } } qHeapSort( tabList ); - tqlayout.setTabList( tabList ); - tqlayout.tqalignment = TQt::AlignAuto; - element = parentElem.namedItem( "FLOW" ).toElement(); // Flow is what is now called tqalignment internally + layout.setTabList( tabList ); + layout.alignment = TQt::AlignAuto; + element = parentElem.namedItem( "FLOW" ).toElement(); // Flow is what is now called alignment internally if ( !element.isNull() ) { TQString flow = element.attribute( "align" ); // KWord-1.0 DTD if ( !flow.isEmpty() ) { - tqlayout.tqalignment = flow=="right" ? TQt::AlignRight : + layout.alignment = flow=="right" ? TQt::AlignRight : flow=="center" ? TQt::AlignHCenter : flow=="justify" ? TQt::AlignJustify : flow=="left" ? TQt::AlignLeft : TQt::AlignAuto; @@ -187,9 +187,9 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement TQString dir = element.attribute( "dir" ); // KWord-1.2 if ( !dir.isEmpty() ) { if ( dir == "L" ) - tqlayout.direction = TQChar::DirL; + layout.direction = TQChar::DirL; else if ( dir == "R" ) - tqlayout.direction = TQChar::DirR; + layout.direction = TQChar::DirR; else kdWarning() << "Unexpected value for paragraph direction: " << dir << endl; } @@ -197,7 +197,7 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement flow = element.attribute( "value" ); // KWord-0.8 static const int flow2align[] = { TQt::AlignAuto, TQt::AlignRight, TQt::AlignHCenter, TQt::AlignJustify }; if ( !flow.isEmpty() && flow.toInt() < 4 ) - tqlayout.tqalignment = flow2align[flow.toInt()]; + layout.alignment = flow2align[flow.toInt()]; } } @@ -205,34 +205,34 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement { element = parentElem.namedItem( "OHEAD" ).toElement(); // used by KWord-0.8 if ( !element.isNull() ) - tqlayout.margins[TQStyleSheetItem::MarginTop] = getAttribute( element, "pt", 0.0 ); + layout.margins[TQStyleSheetItem::MarginTop] = getAttribute( element, "pt", 0.0 ); element = parentElem.namedItem( "OFOOT" ).toElement(); // used by KWord-0.8 if ( !element.isNull() ) - tqlayout.margins[TQStyleSheetItem::MarginBottom] = getAttribute( element, "pt", 0.0 ); + layout.margins[TQStyleSheetItem::MarginBottom] = getAttribute( element, "pt", 0.0 ); element = parentElem.namedItem( "IFIRST" ).toElement(); // used by KWord-0.8 if ( !element.isNull() ) - tqlayout.margins[TQStyleSheetItem::MarginFirstLine] = getAttribute( element, "pt", 0.0 ); + layout.margins[TQStyleSheetItem::MarginFirstLine] = getAttribute( element, "pt", 0.0 ); element = parentElem.namedItem( "ILEFT" ).toElement(); // used by KWord-0.8 if ( !element.isNull() ) - tqlayout.margins[TQStyleSheetItem::MarginLeft] = getAttribute( element, "pt", 0.0 ); + layout.margins[TQStyleSheetItem::MarginLeft] = getAttribute( element, "pt", 0.0 ); } // KWord-1.0 DTD element = parentElem.namedItem( "INDENTS" ).toElement(); if ( !element.isNull() ) { - tqlayout.margins[TQStyleSheetItem::MarginFirstLine] = getAttribute( element, "first", 0.0 ); - tqlayout.margins[TQStyleSheetItem::MarginLeft] = getAttribute( element, "left", 0.0 ); - tqlayout.margins[TQStyleSheetItem::MarginRight] = getAttribute( element, "right", 0.0 ); + layout.margins[TQStyleSheetItem::MarginFirstLine] = getAttribute( element, "first", 0.0 ); + layout.margins[TQStyleSheetItem::MarginLeft] = getAttribute( element, "left", 0.0 ); + layout.margins[TQStyleSheetItem::MarginRight] = getAttribute( element, "right", 0.0 ); } element = parentElem.namedItem( "OFFSETS" ).toElement(); if ( !element.isNull() ) { - tqlayout.margins[TQStyleSheetItem::MarginTop] = getAttribute( element, "before", 0.0 ); - tqlayout.margins[TQStyleSheetItem::MarginBottom] = getAttribute( element, "after", 0.0 ); + layout.margins[TQStyleSheetItem::MarginTop] = getAttribute( element, "before", 0.0 ); + layout.margins[TQStyleSheetItem::MarginBottom] = getAttribute( element, "after", 0.0 ); } if ( docVersion < 2 ) @@ -240,8 +240,8 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement element = parentElem.namedItem( "LINESPACE" ).toElement(); // used by KWord-0.8 if ( !element.isNull() ) { - tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM; - tqlayout.lineSpacing = getAttribute( element, "pt", 0.0 ); + layout.lineSpacingType = KoParagLayout::LS_CUSTOM; + layout.lineSpacing = getAttribute( element, "pt", 0.0 ); } } @@ -254,18 +254,18 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement TQString value = element.attribute( "value" ); if ( value == "oneandhalf" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; - tqlayout.lineSpacing = 0; + layout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; + layout.lineSpacing = 0; } else if ( value == "double" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_DOUBLE; - tqlayout.lineSpacing = 0; + layout.lineSpacingType = KoParagLayout::LS_DOUBLE; + layout.lineSpacing = 0; } else { - tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM; - tqlayout.lineSpacing = value.toDouble(); + layout.lineSpacingType = KoParagLayout::LS_CUSTOM; + layout.lineSpacing = value.toDouble(); } } else @@ -273,36 +273,36 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement TQString type = element.attribute( "type" ); if ( type == "oneandhalf" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; - tqlayout.lineSpacing = 0; + layout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; + layout.lineSpacing = 0; } else if ( type == "double" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_DOUBLE; - tqlayout.lineSpacing = 0; + layout.lineSpacingType = KoParagLayout::LS_DOUBLE; + layout.lineSpacing = 0; } else if ( type == "custom" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM; - tqlayout.lineSpacing = element.attribute( "spacingvalue" ).toDouble(); + layout.lineSpacingType = KoParagLayout::LS_CUSTOM; + layout.lineSpacing = element.attribute( "spacingvalue" ).toDouble(); } else if ( type == "atleast" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_AT_LEAST; - tqlayout.lineSpacing = element.attribute( "spacingvalue" ).toDouble(); + layout.lineSpacingType = KoParagLayout::LS_AT_LEAST; + layout.lineSpacing = element.attribute( "spacingvalue" ).toDouble(); } else if ( type == "multiple" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_MULTIPLE; - tqlayout.lineSpacing = element.attribute( "spacingvalue" ).toDouble(); + layout.lineSpacingType = KoParagLayout::LS_MULTIPLE; + layout.lineSpacing = element.attribute( "spacingvalue" ).toDouble(); } else if ( type == "fixed" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_FIXED; - tqlayout.lineSpacing = element.attribute( "spacingvalue" ).toDouble(); + layout.lineSpacingType = KoParagLayout::LS_FIXED; + layout.lineSpacing = element.attribute( "spacingvalue" ).toDouble(); } else if ( type == "single" ) // not used; just in case future versions use it. - tqlayout.lineSpacingType = KoParagLayout::LS_SINGLE; + layout.lineSpacingType = KoParagLayout::LS_SINGLE; } } @@ -323,37 +323,37 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement if ( !element.isNull() ) pageBreaking |= KoParagLayout::HardFrameBreakBefore; } - tqlayout.pageBreaking = pageBreaking; + layout.pageBreaking = pageBreaking; element = parentElem.namedItem( "LEFTBORDER" ).toElement(); if ( !element.isNull() ) - tqlayout.leftBorder = KoBorder::loadBorder( element ); + layout.leftBorder = KoBorder::loadBorder( element ); else - tqlayout.leftBorder.setPenWidth(0); + layout.leftBorder.setPenWidth(0); element = parentElem.namedItem( "RIGHTBORDER" ).toElement(); if ( !element.isNull() ) - tqlayout.rightBorder = KoBorder::loadBorder( element ); + layout.rightBorder = KoBorder::loadBorder( element ); else - tqlayout.rightBorder.setPenWidth(0); + layout.rightBorder.setPenWidth(0); element = parentElem.namedItem( "TOPBORDER" ).toElement(); if ( !element.isNull() ) - tqlayout.topBorder = KoBorder::loadBorder( element ); + layout.topBorder = KoBorder::loadBorder( element ); else - tqlayout.topBorder.setPenWidth(0); + layout.topBorder.setPenWidth(0); element = parentElem.namedItem( "BOTTOMBORDER" ).toElement(); if ( !element.isNull() ) - tqlayout.bottomBorder = KoBorder::loadBorder( element ); + layout.bottomBorder = KoBorder::loadBorder( element ); else - tqlayout.bottomBorder.setPenWidth(0); + layout.bottomBorder.setPenWidth(0); element = parentElem.namedItem( "COUNTER" ).toElement(); if ( !element.isNull() ) { - tqlayout.counter = new KoParagCounter; - tqlayout.counter->load( element ); + layout.counter = new KoParagCounter; + layout.counter->load( element ); } // Compatibility with KOffice-1.2 @@ -425,38 +425,38 @@ TQt::AlignmentFlags KoParagLayout::loadOasisAlignment( const TQCString& str ) } //static -TQCString KoParagLayout::saveOasisAlignment( TQt::AlignmentFlags tqalignment ) +TQCString KoParagLayout::saveOasisAlignment( TQt::AlignmentFlags alignment ) { - return tqalignment == TQt::AlignLeft ? "left" : - tqalignment == TQt::AlignRight ? "right" : - tqalignment == TQt::AlignHCenter ? "center" : - tqalignment == TQt::AlignJustify ? "justify" : + return alignment == TQt::AlignLeft ? "left" : + alignment == TQt::AlignRight ? "right" : + alignment == TQt::AlignHCenter ? "center" : + alignment == TQt::AlignJustify ? "justify" : "start"; // i.e. direction-dependent } -void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContext& context ) +void KoParagLayout::loadOasisParagLayout( KoParagLayout& layout, KoOasisContext& context ) { context.styleStack().setTypeProperties( "paragraph" ); - // tqlayout is an input and output parameter + // layout is an input and output parameter // It can have been initialized already, e.g. by copying from a style // code from OoWriterImport::writeLayout if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "text-align" ) ) { TQCString align = context.styleStack().attributeNS( KoXmlNS::fo, "text-align" ).latin1(); - tqlayout.tqalignment = loadOasisAlignment( align ); + layout.alignment = loadOasisAlignment( align ); } if ( context.styleStack().hasAttributeNS( KoXmlNS::style, "writing-mode" ) ) { // http://web4.w3.org/TR/xsl/slice7.html#writing-mode // LTR is lr-tb. RTL is rl-tb TQString writingMode = context.styleStack().attributeNS( KoXmlNS::style, "writing-mode" ); - tqlayout.direction = ( writingMode=="rl-tb" || writingMode=="rl" ) ? TQChar::DirR : TQChar::DirL; + layout.direction = ( writingMode=="rl-tb" || writingMode=="rl" ) ? TQChar::DirR : TQChar::DirL; } // Indentation (margins) if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "margin-left" ) || // 3.11.19 context.styleStack().hasAttributeNS( KoXmlNS::fo, "margin-right" ) ) { - tqlayout.margins[TQStyleSheetItem::MarginLeft] = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "margin-left" ) ); - tqlayout.margins[TQStyleSheetItem::MarginRight] = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "margin-right" ) ); + layout.margins[TQStyleSheetItem::MarginLeft] = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "margin-left" ) ); + layout.margins[TQStyleSheetItem::MarginRight] = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "margin-right" ) ); // *text-indent must always be bound to either margin-left or margin-right double first = 0; if ( context.styleStack().attributeNS( KoXmlNS::style, "auto-text-indent") == "true" ) // style:auto-text-indent takes precedence @@ -467,14 +467,14 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex else if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "text-indent") ) first = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "text-indent") ); - tqlayout.margins[TQStyleSheetItem::MarginFirstLine] = first; + layout.margins[TQStyleSheetItem::MarginFirstLine] = first; } // Offset before and after paragraph if( context.styleStack().hasAttributeNS( KoXmlNS::fo, "margin-top") || // 3.11.22 context.styleStack().hasAttributeNS( KoXmlNS::fo, "margin-bottom")) { - tqlayout.margins[TQStyleSheetItem::MarginTop] = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "margin-top" ) ); - tqlayout.margins[TQStyleSheetItem::MarginBottom] = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "margin-bottom" ) ); + layout.margins[TQStyleSheetItem::MarginTop] = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "margin-top" ) ); + layout.margins[TQStyleSheetItem::MarginBottom] = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::fo, "margin-bottom" ) ); } // Line spacing @@ -483,23 +483,23 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex TQString value = context.styleStack().attributeNS( KoXmlNS::fo, "line-height" ); if ( value != "normal" ) { if ( value == "100%" ) - tqlayout.lineSpacingType = KoParagLayout::LS_SINGLE; + layout.lineSpacingType = KoParagLayout::LS_SINGLE; else if( value=="150%") - tqlayout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; + layout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; else if( value=="200%") - tqlayout.lineSpacingType = KoParagLayout::LS_DOUBLE; + layout.lineSpacingType = KoParagLayout::LS_DOUBLE; else if ( value.find('%') > -1 ) { value = value.remove( '%' ); double percent = value.toDouble(); - tqlayout.lineSpacingType = KoParagLayout::LS_MULTIPLE; - tqlayout.lineSpacing = percent / 100.0; - kdDebug(33001) << "line-height =" << percent << ", " << tqlayout.lineSpacing << ", " << percent/100 << endl; + layout.lineSpacingType = KoParagLayout::LS_MULTIPLE; + layout.lineSpacing = percent / 100.0; + kdDebug(33001) << "line-height =" << percent << ", " << layout.lineSpacing << ", " << percent/100 << endl; } else // fixed value { - tqlayout.lineSpacingType = KoParagLayout::LS_FIXED; - tqlayout.lineSpacing = KoUnit::parseValue( value ); + layout.lineSpacingType = KoParagLayout::LS_FIXED; + layout.lineSpacing = KoUnit::parseValue( value ); } } } @@ -512,8 +512,8 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex // Did we make the wrong choice in kotext? //kdWarning() << "Unimplemented support for style:line-height-at-least: " << value << endl; // Well let's see if this makes a big difference. - tqlayout.lineSpacingType = KoParagLayout::LS_AT_LEAST; - tqlayout.lineSpacing = KoUnit::parseValue( value ); + layout.lineSpacingType = KoParagLayout::LS_AT_LEAST; + layout.lineSpacing = KoUnit::parseValue( value ); } // Line-spacing is mutually exclusive with line-height and line-height-at-least else if ( context.styleStack().hasAttributeNS( KoXmlNS::style, "line-spacing") ) // 3.11.3 @@ -521,8 +521,8 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex double value = KoUnit::parseValue( context.styleStack().attributeNS( KoXmlNS::style, "line-spacing" ) ); if ( value != 0.0 ) { - tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM; - tqlayout.lineSpacing = value; + layout.lineSpacingType = KoParagLayout::LS_CUSTOM; + layout.lineSpacing = value; } } @@ -530,7 +530,7 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex KoTabulatorList tabList; if ( context.styleStack().hasChildNodeNS( KoXmlNS::style, "tab-stops" ) ) { // 3.11.10 TQDomElement tabStops = context.styleStack().childNodeNS( KoXmlNS::style, "tab-stops" ); - //kdDebug(30519) << k_funcinfo << tabStops.childNodes().count() << " tab stops in tqlayout." << endl; + //kdDebug(30519) << k_funcinfo << tabStops.childNodes().count() << " tab stops in layout." << endl; TQDomElement tabStop; forEachElement( tabStop, tabStops ) { @@ -540,7 +540,7 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex KoTabulator tab; tab.ptPos = KoUnit::parseValue( tabStop.attributeNS( KoXmlNS::style, "position", TQString() ) ); // Tab stop positions in the XML are relative to the left-margin - tab.ptPos += tqlayout.margins[TQStyleSheetItem::MarginLeft]; + tab.ptPos += layout.margins[TQStyleSheetItem::MarginLeft]; if ( type == "center" ) tab.type = T_CENTER; else if ( type == "right" ) @@ -549,7 +549,7 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex TQString delimiterChar = tabStop.attributeNS( KoXmlNS::style, "char", TQString() ); // single character if ( !delimiterChar.isEmpty() ) tab.alignChar = delimiterChar[0]; - tab.type = T_DEC_PNT; // "tqalignment on decimal point" + tab.type = T_DEC_PNT; // "alignment on decimal point" } else //if ( type == "left" ) tab.type = T_LEFT; @@ -573,7 +573,7 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex } else { - // Fallback: convert leaderChar's tqunicode value + // Fallback: convert leaderChar's unicode value TQString leaderChar = tabStop.attributeNS( KoXmlNS::style, "leader-text", TQString() ); if ( !leaderChar.isEmpty() ) { @@ -594,27 +594,27 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex } //for } qHeapSort( tabList ); - tqlayout.setTabList( tabList ); + layout.setTabList( tabList ); - tqlayout.joinBorder = !( context.styleStack().attributeNS( KoXmlNS::style, "join-border") == "false" ); + layout.joinBorder = !( context.styleStack().attributeNS( KoXmlNS::style, "join-border") == "false" ); // Borders if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "border","left") ) - tqlayout.leftBorder.loadFoBorder( context.styleStack().attributeNS( KoXmlNS::fo, "border","left") ); + layout.leftBorder.loadFoBorder( context.styleStack().attributeNS( KoXmlNS::fo, "border","left") ); else - tqlayout.leftBorder.setPenWidth(0); + layout.leftBorder.setPenWidth(0); if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "border","right") ) - tqlayout.rightBorder.loadFoBorder( context.styleStack().attributeNS( KoXmlNS::fo, "border","right") ); + layout.rightBorder.loadFoBorder( context.styleStack().attributeNS( KoXmlNS::fo, "border","right") ); else - tqlayout.rightBorder.setPenWidth(0); + layout.rightBorder.setPenWidth(0); if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "border","top") ) - tqlayout.topBorder.loadFoBorder( context.styleStack().attributeNS( KoXmlNS::fo, "border","top") ); + layout.topBorder.loadFoBorder( context.styleStack().attributeNS( KoXmlNS::fo, "border","top") ); else - tqlayout.topBorder.setPenWidth(0); + layout.topBorder.setPenWidth(0); if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "border","bottom") ) - tqlayout.bottomBorder.loadFoBorder( context.styleStack().attributeNS( KoXmlNS::fo, "border","bottom") ); + layout.bottomBorder.loadFoBorder( context.styleStack().attributeNS( KoXmlNS::fo, "border","bottom") ); else - tqlayout.bottomBorder.setPenWidth(0); + layout.bottomBorder.setPenWidth(0); // Page breaking @@ -647,148 +647,148 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex pageBreaking |= KoParagLayout::KeepWithNext; } } - tqlayout.pageBreaking = pageBreaking; + layout.pageBreaking = pageBreaking; // Paragraph background color - fo:background-color // The background color for parts of a paragraph that have no text underneath if ( context.styleStack().hasAttributeNS( KoXmlNS::fo, "background-color" ) ) { TQString bgColor = context.styleStack().attributeNS( KoXmlNS::fo, "background-color"); if (bgColor != "transparent") - tqlayout.backgroundColor.setNamedColor( bgColor ); + layout.backgroundColor.setNamedColor( bgColor ); } } -void KoParagLayout::saveParagLayout( TQDomElement & parentElem, int tqalignment ) const +void KoParagLayout::saveParagLayout( TQDomElement & parentElem, int alignment ) const { - const KoParagLayout& tqlayout = *this; // code moved from somewhere else;) + const KoParagLayout& layout = *this; // code moved from somewhere else;) TQDomDocument doc = parentElem.ownerDocument(); TQDomElement element = doc.createElement( "NAME" ); parentElem.appendChild( element ); - if ( tqlayout.style ) - element.setAttribute( "value", tqlayout.style->displayName() ); + if ( layout.style ) + element.setAttribute( "value", layout.style->displayName() ); //else // kdWarning() << "KoParagLayout::saveParagLayout: style==0!" << endl; element = doc.createElement( "FLOW" ); parentElem.appendChild( element ); - element.setAttribute( "align", tqalignment==TQt::AlignRight ? "right" : - tqalignment==TQt::AlignHCenter ? "center" : - tqalignment==TQt::AlignJustify ? "justify" : - tqalignment==TQt::AlignAuto ? "auto" : "left" ); // Note: styles can have AlignAuto. Not paragraphs. + element.setAttribute( "align", alignment==TQt::AlignRight ? "right" : + alignment==TQt::AlignHCenter ? "center" : + alignment==TQt::AlignJustify ? "justify" : + alignment==TQt::AlignAuto ? "auto" : "left" ); // Note: styles can have AlignAuto. Not paragraphs. - if ( static_cast<TQChar::Direction>(tqlayout.direction) == TQChar::DirR ) + if ( static_cast<TQChar::Direction>(layout.direction) == TQChar::DirR ) element.setAttribute( "dir", "R" ); else - if ( static_cast<TQChar::Direction>(tqlayout.direction) == TQChar::DirL ) + if ( static_cast<TQChar::Direction>(layout.direction) == TQChar::DirL ) element.setAttribute( "dir", "L" ); - if ( tqlayout.margins[TQStyleSheetItem::MarginFirstLine] != 0 || - tqlayout.margins[TQStyleSheetItem::MarginLeft] != 0 || - tqlayout.margins[TQStyleSheetItem::MarginRight] != 0 ) + if ( layout.margins[TQStyleSheetItem::MarginFirstLine] != 0 || + layout.margins[TQStyleSheetItem::MarginLeft] != 0 || + layout.margins[TQStyleSheetItem::MarginRight] != 0 ) { element = doc.createElement( "INDENTS" ); parentElem.appendChild( element ); - if ( tqlayout.margins[TQStyleSheetItem::MarginFirstLine] != 0 ) - element.setAttribute( "first", tqlayout.margins[TQStyleSheetItem::MarginFirstLine] ); - if ( tqlayout.margins[TQStyleSheetItem::MarginLeft] != 0 ) - element.setAttribute( "left", tqlayout.margins[TQStyleSheetItem::MarginLeft] ); - if ( tqlayout.margins[TQStyleSheetItem::MarginRight] != 0 ) - element.setAttribute( "right", tqlayout.margins[TQStyleSheetItem::MarginRight] ); + if ( layout.margins[TQStyleSheetItem::MarginFirstLine] != 0 ) + element.setAttribute( "first", layout.margins[TQStyleSheetItem::MarginFirstLine] ); + if ( layout.margins[TQStyleSheetItem::MarginLeft] != 0 ) + element.setAttribute( "left", layout.margins[TQStyleSheetItem::MarginLeft] ); + if ( layout.margins[TQStyleSheetItem::MarginRight] != 0 ) + element.setAttribute( "right", layout.margins[TQStyleSheetItem::MarginRight] ); } - if ( tqlayout.margins[TQStyleSheetItem::MarginTop] != 0 || - tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 ) + if ( layout.margins[TQStyleSheetItem::MarginTop] != 0 || + layout.margins[TQStyleSheetItem::MarginBottom] != 0 ) { element = doc.createElement( "OFFSETS" ); parentElem.appendChild( element ); - if ( tqlayout.margins[TQStyleSheetItem::MarginTop] != 0 ) - element.setAttribute( "before", tqlayout.margins[TQStyleSheetItem::MarginTop] ); - if ( tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 ) - element.setAttribute( "after", tqlayout.margins[TQStyleSheetItem::MarginBottom] ); + if ( layout.margins[TQStyleSheetItem::MarginTop] != 0 ) + element.setAttribute( "before", layout.margins[TQStyleSheetItem::MarginTop] ); + if ( layout.margins[TQStyleSheetItem::MarginBottom] != 0 ) + element.setAttribute( "after", layout.margins[TQStyleSheetItem::MarginBottom] ); } - if ( tqlayout.lineSpacingType != LS_SINGLE ) + if ( layout.lineSpacingType != LS_SINGLE ) { element = doc.createElement( "LINESPACING" ); parentElem.appendChild( element ); - if ( tqlayout.lineSpacingType == KoParagLayout::LS_ONEANDHALF ) { + if ( layout.lineSpacingType == KoParagLayout::LS_ONEANDHALF ) { element.setAttribute( "type", "oneandhalf" ); element.setAttribute( "value", "oneandhalf" ); //compatibility with koffice 1.2 } - else if ( tqlayout.lineSpacingType == KoParagLayout::LS_DOUBLE ) { + else if ( layout.lineSpacingType == KoParagLayout::LS_DOUBLE ) { element.setAttribute( "type", "double" ); element.setAttribute( "value", "double" ); //compatibility with koffice 1.2 } - else if ( tqlayout.lineSpacingType == KoParagLayout::LS_CUSTOM ) + else if ( layout.lineSpacingType == KoParagLayout::LS_CUSTOM ) { element.setAttribute( "type", "custom" ); - element.setAttribute( "spacingvalue", tqlayout.lineSpacing); - element.setAttribute( "value", tqlayout.lineSpacing ); //compatibility with koffice 1.2 + element.setAttribute( "spacingvalue", layout.lineSpacing); + element.setAttribute( "value", layout.lineSpacing ); //compatibility with koffice 1.2 } - else if ( tqlayout.lineSpacingType == KoParagLayout::LS_AT_LEAST ) + else if ( layout.lineSpacingType == KoParagLayout::LS_AT_LEAST ) { element.setAttribute( "type", "atleast" ); - element.setAttribute( "spacingvalue", tqlayout.lineSpacing); + element.setAttribute( "spacingvalue", layout.lineSpacing); } - else if ( tqlayout.lineSpacingType == KoParagLayout::LS_MULTIPLE ) + else if ( layout.lineSpacingType == KoParagLayout::LS_MULTIPLE ) { element.setAttribute( "type", "multiple" ); - element.setAttribute( "spacingvalue", tqlayout.lineSpacing); + element.setAttribute( "spacingvalue", layout.lineSpacing); } - else if ( tqlayout.lineSpacingType == KoParagLayout::LS_FIXED ) + else if ( layout.lineSpacingType == KoParagLayout::LS_FIXED ) { element.setAttribute( "type", "fixed" ); - element.setAttribute( "spacingvalue", tqlayout.lineSpacing); + element.setAttribute( "spacingvalue", layout.lineSpacing); } else kdDebug()<<" error in lineSpacing Type\n"; } - if ( tqlayout.pageBreaking != 0 ) + if ( layout.pageBreaking != 0 ) { element = doc.createElement( "PAGEBREAKING" ); parentElem.appendChild( element ); - if ( tqlayout.pageBreaking & KoParagLayout::KeepLinesTogether ) + if ( layout.pageBreaking & KoParagLayout::KeepLinesTogether ) element.setAttribute( "linesTogether", "true" ); - if ( tqlayout.pageBreaking & KoParagLayout::HardFrameBreakBefore ) + if ( layout.pageBreaking & KoParagLayout::HardFrameBreakBefore ) element.setAttribute( "hardFrameBreak", "true" ); - if ( tqlayout.pageBreaking & KoParagLayout::HardFrameBreakAfter ) + if ( layout.pageBreaking & KoParagLayout::HardFrameBreakAfter ) element.setAttribute( "hardFrameBreakAfter", "true" ); } - if ( tqlayout.leftBorder.penWidth() > 0 ) + if ( layout.leftBorder.penWidth() > 0 ) { element = doc.createElement( "LEFTBORDER" ); parentElem.appendChild( element ); - tqlayout.leftBorder.save( element ); + layout.leftBorder.save( element ); } - if ( tqlayout.rightBorder.penWidth() > 0 ) + if ( layout.rightBorder.penWidth() > 0 ) { element = doc.createElement( "RIGHTBORDER" ); parentElem.appendChild( element ); - tqlayout.rightBorder.save( element ); + layout.rightBorder.save( element ); } - if ( tqlayout.topBorder.penWidth() > 0 ) + if ( layout.topBorder.penWidth() > 0 ) { element = doc.createElement( "TOPBORDER" ); parentElem.appendChild( element ); - tqlayout.topBorder.save( element ); + layout.topBorder.save( element ); } - if ( tqlayout.bottomBorder.penWidth() > 0 ) + if ( layout.bottomBorder.penWidth() > 0 ) { element = doc.createElement( "BOTTOMBORDER" ); parentElem.appendChild( element ); - tqlayout.bottomBorder.save( element ); + layout.bottomBorder.save( element ); } - if ( tqlayout.counter && tqlayout.counter->numbering() != KoParagCounter::NUM_NONE ) + if ( layout.counter && layout.counter->numbering() != KoParagCounter::NUM_NONE ) { element = doc.createElement( "COUNTER" ); parentElem.appendChild( element ); - if ( tqlayout.counter ) - tqlayout.counter->save( element ); + if ( layout.counter ) + layout.counter->save( element ); } - KoTabulatorList tabList = tqlayout.tabList(); + KoTabulatorList tabList = layout.tabList(); KoTabulatorList::ConstIterator it = tabList.begin(); for ( ; it != tabList.end() ; it++ ) { @@ -806,7 +806,7 @@ void KoParagLayout::saveParagLayout( TQDomElement & parentElem, int tqalignment void KoParagLayout::saveOasis( KoGenStyle& gs, KoSavingContext& context, bool savingStyle ) const { - gs.addProperty( "fo:text-align", saveOasisAlignment( (TQt::AlignmentFlags)tqalignment ).data() ); + gs.addProperty( "fo:text-align", saveOasisAlignment( (TQt::AlignmentFlags)alignment ).data() ); // Don't save the direction for a style, if "auto", so that the // auto-determination of direction based on first char, works. if ( !savingStyle || (TQChar::Direction) direction != TQChar::DirON ) @@ -863,7 +863,7 @@ void KoParagLayout::saveOasis( KoGenStyle& gs, KoSavingContext& context, bool sa case T_RIGHT: tabsWriter.addAttribute( "style:type", "right" ); break; - case T_DEC_PNT: // "tqalignment on decimal point" + case T_DEC_PNT: // "alignment on decimal point" tabsWriter.addAttribute( "style:type", "char" ); if ( !(*it).alignChar.isNull() ) tabsWriter.addAttribute( "style:char", TQString( (*it).alignChar ) ); diff --git a/lib/kotext/KoParagLayout.h b/lib/kotext/KoParagLayout.h index 2c9b9dea..975fdaf0 100644 --- a/lib/kotext/KoParagLayout.h +++ b/lib/kotext/KoParagLayout.h @@ -40,7 +40,7 @@ class KOTEXT_EXPORT KoParagLayout { public: KoParagLayout(); - KoParagLayout( const KoParagLayout &tqlayout ) { operator=( tqlayout ); } + KoParagLayout( const KoParagLayout &layout ) { operator=( layout ); } ~KoParagLayout(); @@ -96,7 +96,7 @@ public: char pageBreaking; // Page breaking flags char direction; // TQChar::Direction /// Alignment flag (AlignAuto/AlignLeft/AlignRight/AlignJustify) - char tqalignment; // TQt::AlignmentFlags + char alignment; // TQt::AlignmentFlags KoBorder leftBorder, rightBorder, topBorder, bottomBorder; /// The background color of the paragraph @@ -122,39 +122,39 @@ public: const KoTabulatorList& tabList() const { return m_tabList; } //! Assignment operator for KoParagLayout - /** Copy a paragraph tqlayout. + /** Copy a paragraph layout. * * If you're modifying this, you might also need to modify * KoTextParag::setParagLayout */ void operator=( const KoParagLayout & ); - /** Return a set of flags showing the differences between this and 'tqlayout' */ - int compare( const KoParagLayout & tqlayout ) const; + /** Return a set of flags showing the differences between this and 'layout' */ + int compare( const KoParagLayout & layout ) const; - /** Save this parag tqlayout to XML. + /** Save this parag layout to XML. * This format is used by KWord for paragraphs, and by KPresenter+KWord for styles. */ - void saveParagLayout( TQDomElement & parentElem, int tqalignment ) const; + void saveParagLayout( TQDomElement & parentElem, int alignment ) const; - /** Load this parag tqlayout from XML. + /** Load this parag layout from XML. * This format is used by KWord for paragraphs, and by KPresenter+KWord for styles. */ - static void loadParagLayout( KoParagLayout& tqlayout, const TQDomElement& parentElem, int docVersion = 2 ); + static void loadParagLayout( KoParagLayout& layout, const TQDomElement& parentElem, int docVersion = 2 ); - /// Load this parag tqlayout from Oasis XML - static void loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContext& context ); - /// Save this parag tqlayout to Oasis XML + /// Load this parag layout from Oasis XML + static void loadOasisParagLayout( KoParagLayout& layout, KoOasisContext& context ); + /// Save this parag layout to Oasis XML /// @param savingStyle true if this is saved as part of a user style, /// false when saving a paragraph /// @param gs the style where all the properties will be saved to /// @param context the current context void saveOasis( KoGenStyle& gs, KoSavingContext& context, bool savingStyle ) const; - /// Convert an tqalignment string into an tqalignment flag (load) + /// Convert an alignment string into an alignment flag (load) static TQt::AlignmentFlags loadOasisAlignment( const TQCString& str ); - /// Convert an tqalignment flag into an tqalignment string (save) - static TQCString saveOasisAlignment( TQt::AlignmentFlags tqalignment ); + /// Convert an alignment flag into an alignment string (save) + static TQCString saveOasisAlignment( TQt::AlignmentFlags alignment ); private: static int getAttribute(const TQDomElement &element, const char *attributeName, int defaultValue) { diff --git a/lib/kotext/KoParagStyle.cpp b/lib/kotext/KoParagStyle.cpp index a68c6768..fcae882c 100644 --- a/lib/kotext/KoParagStyle.cpp +++ b/lib/kotext/KoParagStyle.cpp @@ -88,7 +88,7 @@ void KoParagStyle::setFollowingStyle( KoParagStyle *fst ) void KoParagStyle::saveStyle( TQDomElement & parentElem ) { - m_paragLayout.saveParagLayout( parentElem, m_paragLayout.tqalignment ); + m_paragLayout.saveParagLayout( parentElem, m_paragLayout.alignment ); if ( followingStyle() ) { @@ -103,12 +103,12 @@ void KoParagStyle::saveStyle( TQDomElement & parentElem ) void KoParagStyle::loadStyle( TQDomElement & parentElem, int docVersion ) { - KoParagLayout tqlayout; - KoParagLayout::loadParagLayout( tqlayout, parentElem, docVersion ); + KoParagLayout layout; + KoParagLayout::loadParagLayout( layout, parentElem, docVersion ); // This way, KoTextParag::setParagLayout also sets the style pointer, to this style - tqlayout.style = this; - m_paragLayout = tqlayout; + layout.style = this; + m_paragLayout = layout; // Load name TQDomElement nameElem = parentElem.namedItem("NAME").toElement(); @@ -138,8 +138,8 @@ void KoParagStyle::loadStyle( TQDomElement & styleElem, KoOasisContext& context context.styleStack().save(); context.addStyles( &styleElem, "paragraph" ); // Load all parents - only because we don't support inheritance. - KoParagLayout tqlayout; - KoParagLayout::loadOasisParagLayout( tqlayout, context ); + KoParagLayout layout; + KoParagLayout::loadOasisParagLayout( layout, context ); // loadOasisParagLayout doesn't load the counter. It's modelled differently for parags and for styles. int level = 0; @@ -172,15 +172,15 @@ void KoParagStyle::loadStyle( TQDomElement & styleElem, KoOasisContext& context const TQDomElement listStyle = context.listStyleStack().currentListStyle(); // The tag is either text:list-level-style-number or text:list-level-style-bullet const bool ordered = listStyle.localName() == "list-level-style-number"; - Q_ASSERT( !tqlayout.counter ); - tqlayout.counter = new KoParagCounter; - tqlayout.counter->loadOasis( context, -1, ordered, m_bOutline, level, true ); + Q_ASSERT( !layout.counter ); + layout.counter = new KoParagCounter; + layout.counter->loadOasis( context, -1, ordered, m_bOutline, level, true ); context.listStyleStack().pop(); } // This way, KoTextParag::setParagLayout also sets the style pointer, to this style - tqlayout.style = this; - m_paragLayout = tqlayout; + layout.style = this; + m_paragLayout = layout; m_format.load( context ); @@ -207,7 +207,7 @@ TQString KoParagStyle::saveStyle( KoGenStyles& genStyles, int styleType, const T // This display-name will probably look nicer in OO, but this also means // no re-use possible between list styles... listStyle.addAttribute( "style:display-name", - i18n( "Numbering Style for %1" ).tqarg( m_displayName ) ); + i18n( "Numbering Style for %1" ).arg( m_displayName ) ); TQString autoListStyleName = genStyles.lookup( listStyle, "L", KoGenStyles::ForceNumbering ); gs.addAttribute( "style:list-style-name", autoListStyleName ); @@ -245,7 +245,7 @@ void KoParagStyle::propagateChanges( int paragLayoutFlag, int /*formatFlag*/ ) if ( !m_parentStyle ) return; if ( !(paragLayoutFlag & KoParagLayout::Alignment) ) - m_paragLayout.tqalignment = m_parentStyle->paragLayout().tqalignment; + m_paragLayout.alignment = m_parentStyle->paragLayout().alignment; if ( !(paragLayoutFlag & KoParagLayout::Margins) ) for ( int i = 0 ; i < 5 ; ++i ) m_paragLayout.margins[i] = m_parentStyle->paragLayout().margins[i]; @@ -269,9 +269,9 @@ void KoParagStyle::propagateChanges( int paragLayoutFlag, int /*formatFlag*/ ) #if 0 if ( paragLayoutFlag == KoParagLayout::All ) { - setDirection( static_cast<TQChar::Direction>(tqlayout.direction) ); + setDirection( static_cast<TQChar::Direction>(layout.direction) ); // Don't call applyStyle from here, it would overwrite any paragraph-specific settings - setStyle( tqlayout.style ); + setStyle( layout.style ); } #endif // TODO a flag for the "is outline" bool? Otherwise we have no way to inherit diff --git a/lib/kotext/KoParagStyle.h b/lib/kotext/KoParagStyle.h index 190ad345..0e396b64 100644 --- a/lib/kotext/KoParagStyle.h +++ b/lib/kotext/KoParagStyle.h @@ -49,7 +49,7 @@ protected: /** * A paragraph style is a combination of a character style - * and paragraph-tqlayout attributes, all grouped under a name. + * and paragraph-layout attributes, all grouped under a name. */ class KOTEXT_EXPORT KoParagStyle : public KoCharStyle { @@ -71,10 +71,10 @@ public: KoParagStyle *followingStyle() const { return m_followingStyle; } void setFollowingStyle( KoParagStyle *fst ); - /// Saves the name, tqlayout, the following style and the outline bool. Not the format. + /// Saves the name, layout, the following style and the outline bool. Not the format. /// @deprecated (1.3 format) void saveStyle( TQDomElement & parentElem ); - /// Loads the name, tqlayout and the outline bool. Not the "following style" nor the format. + /// Loads the name, layout and the outline bool. Not the "following style" nor the format. /// (1.3 format) void loadStyle( TQDomElement & parentElem, int docVersion = 2 ); diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp index 42e8d2b0..cfce5f31 100644 --- a/lib/kotext/KoRichText.cpp +++ b/lib/kotext/KoRichText.cpp @@ -47,7 +47,7 @@ #include <tdeversion.h> #include <kglobal.h> #include <klocale.h> -#include <tqtextengine_p.h> +#include <textengine_p.h> //#define DEBUG_COLLECTION //#define DEBUG_TABLE_RENDERING @@ -310,7 +310,7 @@ KoTextCursor *KoTextAlignmentCommand::execute( KoTextCursor *c ) if ( !p ) return c; while ( p ) { - p->tqsetAlignment( newAlign ); + p->setAlignment( newAlign ); if ( p->paragId() == lastParag ) break; p = p->next(); @@ -326,7 +326,7 @@ KoTextCursor *KoTextAlignmentCommand::unexecute( KoTextCursor *c ) int i = 0; while ( p ) { if ( i < (int)oldAligns.size() ) - p->tqsetAlignment( oldAligns.at( i ) ); + p->setAlignment( oldAligns.at( i ) ); if ( p->paragId() == lastParag ) break; p = p->next(); @@ -375,7 +375,7 @@ bool KoTextCursor::operator==( const KoTextCursor &c ) const void KoTextCursor::insert( const TQString &str, bool checkNewLine, TQMemArray<KoTextStringChar> *formatting ) { - string->tqinvalidate( idx ); + string->invalidate( idx ); tmpIndex = -1; bool justInsert = TRUE; TQString s( str ); @@ -420,7 +420,7 @@ void KoTextCursor::insert( const TQString &str, bool checkNewLine, TQMemArray<Ko if ( !s.isEmpty() ) string->insert( idx, s ); else - string->tqinvalidate( 0 ); + string->invalidate( 0 ); if ( formatting ) { int len = s.length(); @@ -448,7 +448,7 @@ void KoTextCursor::insert( const TQString &str, bool checkNewLine, TQMemArray<Ko while ( p ) { p->setParagId( p->prev()->paragId() + 1 ); //p->move( dy ); - p->tqinvalidate( 0 ); + p->invalidate( 0 ); p = p->next(); } } @@ -963,7 +963,7 @@ bool KoTextCursor::remove() KoTextParag *p = string->next(); delete string; string = p; - string->tqinvalidate( 0 ); + string->invalidate( 0 ); //// kotext string->invalidateCounters(); //// @@ -1332,7 +1332,7 @@ TQString KoTextString::toString( const TQMemArray<KoTextStringChar> &data ) int l = data.size(); s.setUnicode( 0, l ); KoTextStringChar *c = data.data(); - TQChar *uc = (TQChar *)s.tqunicode(); + TQChar *uc = (TQChar *)s.unicode(); while ( l-- ) { *uc = c->c; uc++; @@ -1348,7 +1348,7 @@ TQString KoTextString::toReverseString() const int l = length(); s.setUnicode(0, l); KoTextStringChar *c = data.data() + (l-1); - TQChar *uc = (TQChar *)s.tqunicode(); + TQChar *uc = (TQChar *)s.unicode(); while ( l-- ) { *uc = c->c; uc++; @@ -1505,7 +1505,7 @@ KoTextParagLineStart *KoTextFormatterBase::bidiReorderLine( KoTextParag * /*para str.setUnicode( 0, last - start + 1 ); // fill string with logically ordered chars. KoTextStringChar *ch = startChar; - TQChar *qch = (TQChar *)str.tqunicode(); + TQChar *qch = (TQChar *)str.unicode(); while ( ch <= lastChar ) { *qch = ch->c; qch++; @@ -1520,7 +1520,7 @@ KoTextParagLineStart *KoTextFormatterBase::bidiReorderLine( KoTextParag * /*para // now construct the reordered string out of the runs... int numSpaces = 0; - // set the correct tqalignment. This is a bit messy.... + // set the correct alignment. This is a bit messy.... if( align == TQt::AlignAuto ) { // align according to directionality of the paragraph... if ( text->isRightToLeft() ) @@ -1562,7 +1562,7 @@ KoTextParagLineStart *KoTextFormatterBase::bidiReorderLine( KoTextParag * /*para c->rightToLeft = TRUE; c->startOfRun = FALSE; int ww = 0; - if ( c->c.tqunicode() >= 32 || c->c == '\t' || c->c == '\n' || c->isCustom() ) { + if ( c->c.unicode() >= 32 || c->c == '\t' || c->c == '\n' || c->isCustom() ) { ww = c->width; } else { ww = c->format()->width( ' ' ); @@ -1589,7 +1589,7 @@ KoTextParagLineStart *KoTextFormatterBase::bidiReorderLine( KoTextParag * /*para c->rightToLeft = FALSE; c->startOfRun = FALSE; int ww = 0; - if ( c->c.tqunicode() >= 32 || c->c == '\t' || c->isCustom() ) { + if ( c->c.unicode() >= 32 || c->c == '\t' || c->isCustom() ) { ww = c->width; } else { ww = c->format()->width( ' ' ); diff --git a/lib/kotext/KoRichText.h b/lib/kotext/KoRichText.h index 44c360d5..8e82bd9c 100644 --- a/lib/kotext/KoRichText.h +++ b/lib/kotext/KoRichText.h @@ -45,7 +45,7 @@ #include <tqsize.h> #include <tqvaluelist.h> #include <tqobject.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <tqpainter.h> #include "KoComplexText.h" @@ -93,7 +93,7 @@ public: // this is the same struct as in qtextengine_p.h. Don't change! uchar softBreak :1; // Potential linebreak point - uchar whiteSpace :1; // A tqunicode whitespace character, except NBSP, ZWNBSP + uchar whiteSpace :1; // A unicode whitespace character, except NBSP, ZWNBSP uchar charStop :1; // Valid cursor position (for left/right arrow) uchar wordStop :1; // Valid cursor position (for ctrl + left/right arrow) (TODO: use) //uchar nobreak :1; @@ -477,13 +477,13 @@ public: KoTextTableCell( KoTextTable* table, int row, int column ); virtual ~KoTextTableCell(); - TQSize tqsizeHint() const ; - TQSize tqminimumSize() const ; - TQSize tqmaximumSize() const ; + TQSize sizeHint() const ; + TQSize minimumSize() const ; + TQSize maximumSize() const ; TQSizePolicy::ExpandData expanding() const; bool isEmpty() const; void setGeometry( const TQRect& ) ; - TQRect tqgeometry() const; + TQRect geometry() const; bool hasHeightForWidth() const; int heightForWidth( int ) const; @@ -502,7 +502,7 @@ public: void draw( int x, int y, int cx, int cy, int cw, int ch, const TQColorGroup& cg, bool selected ); TQBrush *backGround() const { return background; } - virtual void tqinvalidate(); + virtual void invalidate(); int verticalAlignmentOffset() const; int horizontalAlignmentOffset() const; @@ -552,7 +552,7 @@ public: Placement placement() const { return place; } bool isNested() const { return TRUE; } void resize( int nwidth ); - virtual void tqinvalidate(); + 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 ); @@ -564,12 +564,12 @@ public: TQString richText() const; - int minimumWidth() const { return tqlayout ? tqlayout->tqminimumSize().width() : 0; } - int widthHint() const { return ( tqlayout ? tqlayout->tqsizeHint().width() : 0 ) + 2 * outerborder; } + int minimumWidth() const { return layout ? layout->minimumSize().width() : 0; } + int widthHint() const { return ( layout ? layout->sizeHint().width() : 0 ) + 2 * outerborder; } TQPtrList<KoTextTableCell> tableCells() const { return cells; } - TQRect tqgeometry() const { return tqlayout ? tqlayout->tqgeometry() : TQRect(); } + TQRect geometry() const { return layout ? layout->geometry() : TQRect(); } bool isStretching() const { return stretch; } private: @@ -577,7 +577,7 @@ private: void addCell( KoTextTableCell* cell ); private: - TQGridLayout* tqlayout; + TQGridLayout* layout; TQPtrList<KoTextTableCell> cells; TQPainter* painter; int cachewidth; @@ -697,7 +697,7 @@ struct KoTextParagLineStart #endif { } #ifndef TQT_NO_COMPLEXTEXT - KoTextParagLineStart( KoBidiContext *c, KoBiditqStatus s ) : y(0), baseLine(0), h(0), + KoTextParagLineStart( KoBidiContext *c, KoBidiStatus s ) : y(0), baseLine(0), h(0), lineSpacing( 0 ), hyphenated( false ), status( s ), bidicontext( c ) { if ( bidicontext ) bidicontext->ref(); } #endif @@ -728,7 +728,7 @@ public: short lineSpacing; bool hyphenated; #ifndef TQT_NO_COMPLEXTEXT - KoBiditqStatus status; + KoBidiStatus status; #endif int w; diff --git a/lib/kotext/KoSearchDia.cpp b/lib/kotext/KoSearchDia.cpp index a41de932..955b3f1c 100644 --- a/lib/kotext/KoSearchDia.cpp +++ b/lib/kotext/KoSearchDia.cpp @@ -39,7 +39,7 @@ #include <tqradiobutton.h> #include <tqregexp.h> #include <tqspinbox.h> -#include <tqlayout.h> +#include <layout.h> KoSearchContext::KoSearchContext() { @@ -382,8 +382,8 @@ void KoFindReplace::replace( const TQString &text, int matchingIndex, { replaceWithAttribut( &cursor, index ); } - // Don't tqrepaint if we're doing batch changes - bool tqrepaint = options() & KReplaceDialog::PromptOnReplace; + // Don't repaint if we're doing batch changes + bool repaint = options() & KReplaceDialog::PromptOnReplace; // Grab replacement string TQString rep = text.mid( matchingIndex, replacementLength ); @@ -395,7 +395,7 @@ void KoFindReplace::replace( const TQString &text, int matchingIndex, KCommand *cmd = currentTextObj->replaceSelectionCommand( &cursor, rep, TQString(), KoTextDocument::HighlightSelection, - tqrepaint ? KoTextObject::DefaultInsertFlags : KoTextObject::DoNotRepaint ); + repaint ? KoTextObject::DefaultInsertFlags : KoTextObject::DoNotRepaint ); connect( &m_textIterator, TQT_SIGNAL( currentParagraphModified( int, int, int ) ), this, TQT_SLOT( slotCurrentParagraphModified( int, int, int ) ) ); @@ -587,7 +587,7 @@ KoFormatDia::KoFormatDia( TQWidget* parent, const TQString & _caption, KoSearchC m_languageItem->setCurrentText( KoGlobal::languageFromTag( m_ctx->m_language ) ); - m_checkVertAlign = new TQCheckBox( i18n( "Vertical tqalignment:" ), page ); + m_checkVertAlign = new TQCheckBox( i18n( "Vertical alignment:" ), page ); m_familyItem = new KFontCombo(page); m_familyItem->setCurrentFont(m_ctx->m_family); @@ -605,25 +605,25 @@ KoFormatDia::KoFormatDia( TQWidget* parent, const TQString & _caption, KoSearchC TQButtonGroup *grpBold = new TQButtonGroup( 1, Qt::Vertical, page ); grpBold->setRadioButtonExclusive( TRUE ); - grpBold->tqlayout(); + grpBold->layout(); m_boldYes=new TQRadioButton( i18n("Yes"), grpBold ); m_boldNo=new TQRadioButton( i18n("No"), grpBold ); TQButtonGroup *grpItalic = new TQButtonGroup( 1, Qt::Vertical, page ); grpItalic->setRadioButtonExclusive( TRUE ); - grpItalic->tqlayout(); + grpItalic->layout(); m_italicYes=new TQRadioButton( i18n("Yes"), grpItalic ); m_italicNo=new TQRadioButton( i18n("No"), grpItalic ); TQButtonGroup *grpShadow = new TQButtonGroup( 1, Qt::Vertical, page ); grpShadow->setRadioButtonExclusive( TRUE ); - grpShadow->tqlayout(); + grpShadow->layout(); m_shadowYes=new TQRadioButton( i18n("Yes"), grpShadow ); m_shadowNo=new TQRadioButton( i18n("No"), grpShadow ); TQButtonGroup *grpWordByWord = new TQButtonGroup( 1, Qt::Vertical, page ); grpWordByWord->setRadioButtonExclusive( TRUE ); - grpWordByWord->tqlayout(); + grpWordByWord->layout(); m_wordByWordYes=new TQRadioButton( i18n("Yes"), grpWordByWord ); m_wordByWordNo=new TQRadioButton( i18n("No"), grpWordByWord ); diff --git a/lib/kotext/KoStyleCollection.cpp b/lib/kotext/KoStyleCollection.cpp index f8c93f01..fa0818d8 100644 --- a/lib/kotext/KoStyleCollection.cpp +++ b/lib/kotext/KoStyleCollection.cpp @@ -242,7 +242,7 @@ void KoStyleCollection::printDebug() const kdDebug() << "Style " << style << " " << style->name() << " isOutline=" << style->isOutline() << endl; kdDebug() << " format: " << style->format().key() <<endl; static const char * const s_align[] = { "Auto", "Left", "Right", "ERROR", "HCenter", "ERR", "ERR", "ERR", "Justify", }; - kdDebug() << " align: " << s_align[(TQt::AlignmentFlags)style->paragLayout().tqalignment] << endl; + kdDebug() << " align: " << s_align[(TQt::AlignmentFlags)style->paragLayout().alignment] << endl; if ( style->paragLayout().counter ) kdDebug() << " counter level=" << style->paragLayout().counter->depth() << endl; diff --git a/lib/kotext/KoStyleCollection.h b/lib/kotext/KoStyleCollection.h index 66a244e5..811bbaea 100644 --- a/lib/kotext/KoStyleCollection.h +++ b/lib/kotext/KoStyleCollection.h @@ -68,7 +68,7 @@ public: * Overloaded for convenience. */ KoParagStyle* findStyle( const TQString & name ) const { - return static_cast<KoParagStyle*>( KoUserStyleCollection::findStyle( name, TQString::tqfromLatin1( "Standard" ) ) ); + return static_cast<KoParagStyle*>( KoUserStyleCollection::findStyle( name, TQString::fromLatin1( "Standard" ) ) ); } /** diff --git a/lib/kotext/KoStyleManager.cpp b/lib/kotext/KoStyleManager.cpp index e5a7dbfa..871b8f98 100644 --- a/lib/kotext/KoStyleManager.cpp +++ b/lib/kotext/KoStyleManager.cpp @@ -33,7 +33,7 @@ #include <tqlabel.h> #include <tqcombobox.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> /******************************************************************/ /* Class: KoStyleManager */ @@ -86,7 +86,7 @@ KoStyleManager::KoStyleManager( TQWidget *_parent, KoUnit::Unit unit, newTab = new KoStyleParagTab( m_tabs ); KoParagLayoutWidget *decorations = new KoParagDecorationWidget( newTab ); - decorations->tqlayout()->setMargin(KDialog::marginHint()); + decorations->layout()->setMargin(KDialog::marginHint()); newTab->setWidget( decorations ); addTab( newTab ); @@ -122,7 +122,7 @@ void KoStyleManager::addTab( KoStyleManagerTab * tab ) { m_tabsList.append( tab ); m_tabs->insertTab( tab, tab->tabName() ); - tab->tqlayout()->activate(); + tab->layout()->activate(); } void KoStyleManager::setupWidget(const KoStyleCollection& styleCollection) @@ -185,15 +185,15 @@ void KoStyleManager::addGeneralTab( int flags ) { tabLayout->setMargin( KDialog::marginHint() ); m_nameString = new TQLineEdit( tab ); - m_nameString->resize(m_nameString->tqsizeHint() ); + m_nameString->resize(m_nameString->sizeHint() ); connect( m_nameString, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( renameStyle(const TQString &) ) ); tabLayout->addWidget( m_nameString, 0, 1 ); TQLabel *nameLabel = new TQLabel( tab ); nameLabel->setText( i18n( "Name:" ) ); - nameLabel->resize(nameLabel->tqsizeHint()); - nameLabel->tqsetAlignment( AlignRight | AlignVCenter ); + nameLabel->resize(nameLabel->sizeHint()); + nameLabel->setAlignment( AlignRight | AlignVCenter ); tabLayout->addWidget( nameLabel, 0, 0 ); @@ -203,7 +203,7 @@ void KoStyleManager::addGeneralTab( int flags ) { TQLabel *nextStyleLabel = new TQLabel( tab ); nextStyleLabel->setText( i18n( "Next style:" ) ); - nextStyleLabel->tqsetAlignment( AlignRight | AlignVCenter ); + nextStyleLabel->setAlignment( AlignRight | AlignVCenter ); tabLayout->addWidget( nextStyleLabel, 1, 0 ); @@ -212,7 +212,7 @@ void KoStyleManager::addGeneralTab( int flags ) { TQLabel *inheritStyleLabel = new TQLabel( tab ); inheritStyleLabel->setText( i18n( "Inherit style:" ) ); - inheritStyleLabel->tqsetAlignment( AlignRight | AlignVCenter ); + inheritStyleLabel->setAlignment( AlignRight | AlignVCenter ); tabLayout->addWidget( inheritStyleLabel, 2, 0 ); @@ -345,7 +345,7 @@ void KoStyleManager::updateGUI() { void KoStyleManager::updatePreview() { d->preview->setStyle(m_currentStyle); - d->preview->tqrepaint(true); + d->preview->repaint(true); } void KoStyleManager::save() { @@ -408,7 +408,7 @@ TQString KoStyleManager::generateUniqueName() void KoStyleManager::addStyle() { save(); - TQString str = i18n( "New Style Template (%1)" ).tqarg(numStyles++); + TQString str = i18n( "New Style Template (%1)" ).arg(numStyles++); if ( m_currentStyle ) { m_currentStyle = new KoParagStyle( *m_currentStyle ); // Create a new style, initializing from the current one diff --git a/lib/kotext/KoStyleManager.h b/lib/kotext/KoStyleManager.h index af848e1d..b562e1f6 100644 --- a/lib/kotext/KoStyleManager.h +++ b/lib/kotext/KoStyleManager.h @@ -137,7 +137,7 @@ protected: KoParagStyle *m_style; }; -// A tab to edit parts of the parag-tqlayout of the style +// A tab to edit parts of the parag-layout of the style // Acts as a wrapper around KoParagLayoutWidget [which doesn't know about styles]. class KOTEXT_EXPORT KoStyleParagTab : public KoStyleManagerTab { @@ -181,7 +181,7 @@ private: Font simple font dia Color simple color dia Spacing and Indents paragraph spacing dia (KWParagDia) -alignments KoParagDia tqalignment tab +alignments KoParagDia alignment tab borders KoParagDia borders tab numbering KoParagDia tab numbering tabulators KoParagDia tab tabs */ diff --git a/lib/kotext/KoTextCommand.cpp b/lib/kotext/KoTextCommand.cpp index fb496836..875c1e71 100644 --- a/lib/kotext/KoTextCommand.cpp +++ b/lib/kotext/KoTextCommand.cpp @@ -96,7 +96,7 @@ KoTextCursor * KoTextDeleteCommand::unexecute( KoTextCursor *c ) while ( p ) { if ( lit != m_oldParagLayouts.end() ) { - kdDebug(32500) << "KoTextDeleteCommand::unexecute applying paragtqlayout to parag " << p->paragId() << endl; + kdDebug(32500) << "KoTextDeleteCommand::unexecute applying paraglayout to parag " << p->paragId() << endl; p->setParagLayout( *lit ); } else @@ -211,7 +211,7 @@ KoTextCursor * KoParagFormatCommand::execute( KoTextCursor *c ) } while ( p ) { p->setFormat( m_newFormat ); - p->tqinvalidate(0); + p->invalidate(0); if ( p->paragId() == lastParag ) break; p = p->next(); diff --git a/lib/kotext/KoTextCustomItem.h b/lib/kotext/KoTextCustomItem.h index d232bedc..7df4d515 100644 --- a/lib/kotext/KoTextCustomItem.h +++ b/lib/kotext/KoTextCustomItem.h @@ -57,7 +57,7 @@ public: virtual bool ownLine() const { return FALSE; } // Called for "ownline" items virtual void resize( int nwidth ) { width = nwidth; } - virtual void tqinvalidate() {}; + virtual void invalidate() {}; virtual bool isNested() const { return FALSE; } virtual int minimumWidth() const { return 0; } @@ -69,7 +69,7 @@ public: int width; int height; - TQRect tqgeometry() const { return TQRect( xpos, ypos, width, height ); } + 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 enterAt( KoTextCursor *, KoTextDocument *&doc, KoTextParag *¶g, int &idx, int &ox, int &oy, const TQPoint & ); diff --git a/lib/kotext/KoTextDocument.cpp b/lib/kotext/KoTextDocument.cpp index b3f24708..35adf814 100644 --- a/lib/kotext/KoTextDocument.cpp +++ b/lib/kotext/KoTextDocument.cpp @@ -154,13 +154,13 @@ int KoTextDocument::widthUsed() const KoTextParag *p = fParag; int w = 0; while ( p ) { - int a = p->tqalignment(); - p->tqsetAlignment( TQt::AlignLeft ); - p->tqinvalidate( 0 ); + int a = p->alignment(); + p->setAlignment( TQt::AlignLeft ); + p->invalidate( 0 ); p->format(); w = TQMAX( w, p->rect().width() ); - p->tqsetAlignment( a ); - p->tqinvalidate( 0 ); + p->setAlignment( a ); + p->invalidate( 0 ); p = p->next(); } return w; @@ -247,11 +247,11 @@ TQString KoTextDocument::plainText() const return buffer; } -void KoTextDocument::tqinvalidate() +void KoTextDocument::invalidate() { KoTextParag *s = fParag; while ( s ) { - s->tqinvalidate( 0 ); + s->invalidate( 0 ); s = s->next(); } } @@ -729,7 +729,7 @@ void KoTextDocument::setFormat( int id, const KoTextFormat *f, int flags ) if ( !hasSelection( id ) ) return; - TQApplication::tqclipboard()->setText( selectedText( id ) ); + TQApplication::clipboard()->setText( selectedText( id ) ); #endif }*/ @@ -785,9 +785,9 @@ void KoTextDocument::removeSelectedText( int id, KoTextCursor *cursor ) p->move( dy ); //// kotext if ( p->paragLayout().counter ) - p->paragLayout().counter->tqinvalidate(); + p->paragLayout().counter->invalidate(); //// - p->tqinvalidate( 0 ); + p->invalidate( 0 ); //p->setEndState( -1 ); p = p->next(); } @@ -1217,7 +1217,7 @@ void KoTextDocument::drawWithoutDoubleBuffer( TQPainter *p, const TQRect &cr, co TQRect pr( parag->pixelRect( zoomHandler ) ); pr.setLeft( 0 ); pr.setWidth( TQWIDGETSIZE_MAX ); - // The cliprect is checked in tqlayout units, in KoTextParag::paint + // The cliprect is checked in layout units, in KoTextParag::paint TQRect crect_lu( parag->rect() ); if ( !cr.isNull() && !cr.intersects( pr ) ) { @@ -1295,7 +1295,7 @@ void KoTextDocument::drawParagWYSIWYG( TQPainter *p, KoTextParag *parag, int cx, // 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 // of being white. - TQWMatrix mat = p->tqworldMatrix(); + 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; @@ -1350,7 +1350,7 @@ void KoTextDocument::drawParagWYSIWYG( TQPainter *p, KoTextParag *parag, int cx, #endif //painter->setBrushOrigin( painter->brushOrigin() + rect.topLeft() - ir.topLeft() ); - // The cliprect is checked in tqlayout units, in KoTextParag::paint + // The cliprect is checked in layout units, in KoTextParag::paint TQRect crect_lu( zoomHandler->pixelToLayoutUnit( crect ) ); #ifdef DEBUG_PAINTING kdDebug(32500) << "KoTextDocument::drawParagWYSIWYG crect_lu=" << crect_lu << endl; diff --git a/lib/kotext/KoTextDocument.h b/lib/kotext/KoTextDocument.h index 8cdc1b52..8cf9fd4d 100644 --- a/lib/kotext/KoTextDocument.h +++ b/lib/kotext/KoTextDocument.h @@ -94,7 +94,7 @@ public: void setFirstParag( KoTextParag *p ); void setLastParag( KoTextParag *p ); - void tqinvalidate(); + void invalidate(); //void setPreProcessor( KoTextPreProcessor *sh ); //KoTextPreProcessor *preProcessor() const; @@ -189,8 +189,8 @@ public: //bool focusNextPrevChild( bool next ); - int tqalignment() const; - void tqsetAlignment( int a ); + int alignment() const; + void setAlignment( int a ); int *tabArray() const; int tabStopWidth() const; @@ -535,12 +535,12 @@ inline KoTextFormatCollection *KoTextDocument::formatCollection() const return fCollection; } -inline int KoTextDocument::tqalignment() const +inline int KoTextDocument::alignment() const { return align; } -inline void KoTextDocument::tqsetAlignment( int a ) +inline void KoTextDocument::setAlignment( int a ) { align = a; } diff --git a/lib/kotext/KoTextFormat.cpp b/lib/kotext/KoTextFormat.cpp index 24214ae4..2554d4ee 100644 --- a/lib/kotext/KoTextFormat.cpp +++ b/lib/kotext/KoTextFormat.cpp @@ -675,7 +675,7 @@ void KoTextFormat::save( KoGenStyle& gs, KoSavingContext& context, KoTextFormat void KoTextFormat::update() { //kdDebug(32500) << this << " KoTextFormat::update " << fn.family() << " " << pointSize() << endl; - m_key = TQString(); // tqinvalidate key, recalc at the next key() call + m_key = TQString(); // invalidate key, recalc at the next key() call assert( d ); d->clearCache(); // i.e. recalc at the next screenFont[Metrics]() call } @@ -1179,8 +1179,8 @@ TQFont KoTextFormat::smallCapsFont( const KoTextZoomHandler* zh, bool applyZoom int KoTextFormat::charWidth( const KoTextZoomHandler* zh, bool applyZoom, const KoTextStringChar* c, const KoTextParag* parag, int i ) const { - ushort tqunicode = c->c.tqunicode(); - if ( !c->charStop || tqunicode == 0xad || tqunicode == 0x2028 ) + ushort unicode = c->c.unicode(); + if ( !c->charStop || unicode == 0xad || unicode == 0x2028 ) return 0; Q_ASSERT( !c->isCustom() ); // actually it's a bit stupid to call this for custom items if( c->isCustom() ) { @@ -1209,13 +1209,13 @@ int KoTextFormat::charWidth( const KoTextZoomHandler* zh, bool applyZoom, const pixelww = this->screenFontMetrics( zh ).width( displayedChar( c->c ) ); } else { // Use the m_screenWidths[] array when possible, even faster - Q_ASSERT( tqunicode < 256 ); - pixelww = d->m_screenWidths[ tqunicode ]; + Q_ASSERT( unicode < 256 ); + pixelww = d->m_screenWidths[ unicode ]; // Not in cache yet -> calculate if ( pixelww == 0 ) { pixelww = this->screenFontMetrics( zh ).width( displayedChar( c->c ) ); Q_ASSERT( pixelww < 65535 ); - d->m_screenWidths[ tqunicode ] = pixelww; + d->m_screenWidths[ unicode ] = pixelww; } } } @@ -1319,7 +1319,7 @@ TQString KoTextFormat::displayedString( const TQString& str )const TQChar KoTextFormat::displayedChar( TQChar c )const { - if ( c.tqunicode() == 0xa0 ) // nbsp + if ( c.unicode() == 0xa0 ) // nbsp return ' '; switch ( m_attributeFont ) { case ATT_NONE: diff --git a/lib/kotext/KoTextFormat.h b/lib/kotext/KoTextFormat.h index 0e7c1a13..4c155b91 100644 --- a/lib/kotext/KoTextFormat.h +++ b/lib/kotext/KoTextFormat.h @@ -75,7 +75,7 @@ public: // caching for speedup when formatting TQFont* m_screenFont; // font to be used when painting (zoom-dependent) TQFontMetrics* m_screenFontMetrics; // font metrics on screen (zoom-dependent) - TQFont* m_refFont; // font to be used when formatting text for tqlayout units + TQFont* m_refFont; // font to be used when formatting text for layout units TQFontMetrics* m_refFontMetrics; // font metrics for m_refFontMetrics int m_refAscent; int m_refDescent; @@ -308,7 +308,7 @@ public: /** * @return the reference font, i.e. with the size specified by the user. - * This is used at text tqlayout time (e.g. kotextformatter) + * This is used at text layout time (e.g. kotextformatter) */ TQFont refFont() const; diff --git a/lib/kotext/KoTextFormatter.cpp b/lib/kotext/KoTextFormatter.cpp index 7bdfbc0c..552bcf27 100644 --- a/lib/kotext/KoTextFormatter.cpp +++ b/lib/kotext/KoTextFormatter.cpp @@ -131,8 +131,8 @@ int KoTextFormatterCore::leftMargin( bool firstLine, bool includeFirstLineMargin left += parag->firstLineMargin(); // Add the width of the paragraph counter - first line of parag only. if( parag->counter() && - ( parag->counter()->tqalignment() == TQt::AlignLeft || - parag->counter()->tqalignment() == TQt::AlignAuto ) ) + ( parag->counter()->alignment() == TQt::AlignLeft || + parag->counter()->alignment() == TQt::AlignAuto ) ) left += parag->counterWidth(); // in LU pixels } return left; @@ -196,7 +196,7 @@ bool KoTextFormatterCore::format() // but with counters/margins this might be different). This is why // we call determineCharWidth() again from within the loop. TQPair<int, int> widths = determineCharWidth(); - int ww = widths.first; // width in tqlayout units + int ww = widths.first; // width in layout units #ifndef REF_IS_LU int pixelww = widths.second; // width in pixels #endif @@ -251,9 +251,9 @@ bool KoTextFormatterCore::format() bool lastWasNonInlineCustom = FALSE; bool abort = false; - int align = parag->tqalignment(); - if ( align == TQt::AlignAuto && doc && doc->tqalignment() != TQt::AlignAuto ) - align = doc->tqalignment(); + int align = parag->alignment(); + if ( align == TQt::AlignAuto && doc && doc->alignment() != TQt::AlignAuto ) + align = doc->alignment(); int col = 0; @@ -516,11 +516,11 @@ bool KoTextFormatterCore::format() spaceAfterLine -= c->width; //else - if ( c->c.tqunicode() == 0xad || hyphenated ) // soft hyphen or hyphenation + if ( c->c.unicode() == 0xad || hyphenated ) // soft hyphen or hyphenation { // Recalculate its width, the hyphen will appear finally (important for the parag rect) int width = KoTextZoomHandler::ptToLayoutUnitPt( c->format()->refFontMetrics().width( TQChar(0xad) ) ); - if ( c->c.tqunicode() == 0xad ) + if ( c->c.unicode() == 0xad ) c->width = width; spaceAfterLine -= width; } @@ -810,7 +810,7 @@ KoTextParagLineStart *KoTextFormatterCore::koFormatLine( if (space < 0) space = 0; - // do tqalignment Auto == Left in this case + // do alignment Auto == Left in this case if ( align & TQt::AlignHCenter || align & TQt::AlignRight ) { if ( align & TQt::AlignHCenter ) space /= 2; @@ -934,7 +934,7 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine( str.setUnicode( 0, last - start + 1 ); // fill string with logically ordered chars. KoTextStringChar *ch = startChar; - TQChar *qch = (TQChar *)str.tqunicode(); + TQChar *qch = (TQChar *)str.unicode(); while ( ch <= lastChar ) { *qch = ch->c; qch++; @@ -949,7 +949,7 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine( // now construct the reordered string out of the runs... int numSpaces = 0; - // set the correct tqalignment. This is a bit messy.... + // set the correct alignment. This is a bit messy.... if( align == TQt::AlignAuto ) { // align according to directionality of the paragraph... if ( text->isRightToLeft() ) diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp index 30bf6dd3..afd18909 100644 --- a/lib/kotext/KoTextObject.cpp +++ b/lib/kotext/KoTextObject.cpp @@ -564,7 +564,7 @@ void KoTextObject::doKeyboardAction( KoTextCursor * cursor, KoTextFormat * & /*c undoRedoInfo.oldParagLayouts << parag->paragLayout(); } if ( cursor->atParagEnd() ) { - // Get paragtqlayout from next parag (next can't be 0 here) + // Get paraglayout from next parag (next can't be 0 here) KoParagLayout paragLayout = parag->next()->paragLayout(); if ( cursor->remove() ) { @@ -602,10 +602,10 @@ void KoTextObject::insert( KoTextCursor * cursor, KoTextFormat * currentFormat, return; const bool checkNewLine = insertFlags & CheckNewLine; const bool removeSelected = ( insertFlags & DoNotRemoveSelected ) == 0; - const bool tqrepaint = ( insertFlags & DoNotRepaint ) == 0; + const bool repaint = ( insertFlags & DoNotRepaint ) == 0; //kdDebug(32500) << "KoTextObject::insert txt=" << txt << endl; bool tinyRepaint = !checkNewLine; - if ( tqrepaint ) + if ( repaint ) emit hideCursor(); if ( textdoc->hasSelection( selectionId, true ) && removeSelected ) { kdDebug() << k_funcinfo << "removing selection " << selectionId << endl; @@ -673,7 +673,7 @@ void KoTextObject::insert( KoTextCursor * cursor, KoTextFormat * currentFormat, } // Speed optimization: if we only type a char, and it doesn't - // tqinvalidate the next parag, only format the current one + // invalidate the next parag, only format the current one // ### This idea is wrong. E.g. when the last parag grows and must create a new page. #if 0 KoTextParag *parag = cursor->parag(); @@ -687,9 +687,9 @@ void KoTextObject::insert( KoTextCursor * cursor, KoTextFormat * currentFormat, // Doing this here means callers don't have to do it, and cursor can be positionned correctly. ensureFormatted( cursor->parag() ); - // Speed optimization: if we only type a char, only tqrepaint from current line + // Speed optimization: if we only type a char, only repaint from current line // (In fact the one before. When typing a space, a word could move up to the - // line before, we need to tqrepaint it too...) + // line before, we need to repaint it too...) if ( !checkNewLine && tinyRepaint && !wasChanged ) { // insert() called format() which called setChanged(). @@ -703,12 +703,12 @@ void KoTextObject::insert( KoTextCursor * cursor, KoTextFormat * currentFormat, parag->setLineChanged( origLine - 1 ); // if origLine=0, it'll pass -1, which is 'all' } - if ( tqrepaint ) { + if ( repaint ) { emit repaintChanged( this ); emit ensureCursorVisible(); emit showCursor(); - // we typed the first char of a paragraph in AlignAuto mode -> show correct tqalignment in UI - if ( oldCursor.index() == 0 && oldCursor.parag()->tqalignment() == TQt::AlignAuto ) + // we typed the first char of a paragraph in AlignAuto mode -> show correct alignment in UI + if ( oldCursor.index() == 0 && oldCursor.parag()->alignment() == TQt::AlignAuto ) emit updateUI( true ); } @@ -722,8 +722,8 @@ void KoTextObject::insert( KoTextCursor * cursor, KoTextFormat * currentFormat, if ( !removeSelected ) { // ## not sure why we do this. I'd prefer leaving the selection unchanged... // but then it'd need adjustements in the offsets etc. - if ( textdoc->removeSelection( selectionId ) && tqrepaint ) - selectionChangedNotify(); // does the tqrepaint + if ( textdoc->removeSelection( selectionId ) && repaint ) + selectionChangedNotify(); // does the repaint } if ( !customItemsMap.isEmpty() && !commandName.isNull() /* see replace-selection; #139890 */ ) { @@ -748,7 +748,7 @@ void KoTextObject::pasteText( KoTextCursor * cursor, const TQString & text, KoTe kdDebug(32500) << "KoTextObject::pasteText cursor parag=" << cursor->parag()->paragId() << endl; TQString t = text; // Need to convert CRLF to NL - TQRegExp crlf( TQString::tqfromLatin1("\r\n") ); + TQRegExp crlf( TQString::fromLatin1("\r\n") ); t.replace( crlf, TQChar('\n') ); // Convert non-printable chars for ( int i=0; (uint) i<t.length(); i++ ) { @@ -1066,7 +1066,7 @@ KCommand * KoTextObject::setFormatCommand( KoTextCursor * cursor, KoTextFormat * if ( cursor->parag()->length() == 1 ) { newFormat->addRef(); cursor->parag()->setFormat( newFormat ); - cursor->parag()->tqinvalidate(0); + cursor->parag()->invalidate(0); cursor->parag()->format(); emit repaintChanged( this ); } @@ -1146,7 +1146,7 @@ KCommand * KoTextObject::setAlignCommand( KoTextCursor * cursor, int align, KoTe if ( protectContent() ) return 0L; if ( !textdoc->hasSelection( selectionId, true ) && cursor && - (int)cursor->parag()->tqalignment() == align ) + (int)cursor->parag()->alignment() == align ) return 0L; // No change needed. emit hideCursor(); @@ -1165,7 +1165,7 @@ KCommand * KoTextObject::setAlignCommand( KoTextCursor * cursor, int align, KoTe } formatMore( 2 ); emit repaintChanged( this ); - undoRedoInfo.newParagLayout.tqalignment = align; + undoRedoInfo.newParagLayout.alignment = align; KoTextParagCommand *cmd = new KoTextParagCommand( textdoc, undoRedoInfo.id, undoRedoInfo.eid, undoRedoInfo.oldParagLayouts, undoRedoInfo.newParagLayout, @@ -1547,7 +1547,7 @@ void KoTextObject::removeSelectedText( KoTextCursor * cursor, KoTextDocument::Se undoRedoInfo.clear(); } -KCommand * KoTextObject::removeSelectedTextCommand( KoTextCursor * cursor, KoTextDocument::SelectionId selectionId, bool tqrepaint ) +KCommand * KoTextObject::removeSelectedTextCommand( KoTextCursor * cursor, KoTextDocument::SelectionId selectionId, bool repaint ) { if ( protectContent() ) return 0L; @@ -1578,7 +1578,7 @@ KCommand * KoTextObject::removeSelectedTextCommand( KoTextCursor * cursor, KoTex undoRedoInfo.type = UndoRedoInfo::Invalid; // we don't want clear() to create a command undoRedoInfo.clear(); - if ( tqrepaint ) + if ( repaint ) selectionChangedNotify(); return macroCmd; } @@ -1592,8 +1592,8 @@ KCommand* KoTextObject::replaceSelectionCommand( KoTextCursor * cursor, const TQ if ( protectContent() ) return 0L; Q_ASSERT( ( insertFlags & DoNotRemoveSelected ) == 0 ); // nonsensical - const bool tqrepaint = ( insertFlags & DoNotRepaint ) == 0; // DoNotRepaint is set during search/replace - if ( tqrepaint ) + const bool repaint = ( insertFlags & DoNotRepaint ) == 0; // DoNotRepaint is set during search/replace + if ( repaint ) emit hideCursor(); // This could be improved to use a macro command only when there's a selection to remove. KMacroCommand * macroCmd = new KMacroCommand( cmdName ); @@ -1604,7 +1604,7 @@ KCommand* KoTextObject::replaceSelectionCommand( KoTextCursor * cursor, const TQ format->addRef(); // Remove selected text, if any - KCommand* removeSelCmd = removeSelectedTextCommand( cursor, selectionId, tqrepaint ); + KCommand* removeSelCmd = removeSelectedTextCommand( cursor, selectionId, repaint ); if ( removeSelCmd ) macroCmd->addCommand( removeSelCmd ); @@ -1625,7 +1625,7 @@ KCommand* KoTextObject::replaceSelectionCommand( KoTextCursor * cursor, const TQ format->removeRef(); setLastFormattedParag( c1.parag() ); - if ( tqrepaint ) + if ( repaint ) { formatMore( 2 ); emit repaintChanged( this ); @@ -1645,7 +1645,7 @@ KCommand * KoTextObject::insertParagraphCommand( KoTextCursor *cursor ) return replaceSelectionCommand( cursor, "\n", TQString(), KoTextDocument::Standard, CheckNewLine ); } -void KoTextObject::highlightPortion( KoTextParag * parag, int index, int length, bool tqrepaint ) +void KoTextObject::highlightPortion( KoTextParag * parag, int index, int length, bool repaint ) { if ( !m_highlightSelectionAdded ) { @@ -1656,20 +1656,20 @@ void KoTextObject::highlightPortion( KoTextParag * parag, int index, int length, m_highlightSelectionAdded = true; } - removeHighlight(tqrepaint); // remove previous highlighted selection + removeHighlight(repaint); // remove previous highlighted selection KoTextCursor cursor( textdoc ); cursor.setParag( parag ); cursor.setIndex( index ); textdoc->setSelectionStart( KoTextDocument::HighlightSelection, &cursor ); cursor.setIndex( index + length ); textdoc->setSelectionEnd( KoTextDocument::HighlightSelection, &cursor ); - if ( tqrepaint ) { + if ( repaint ) { parag->setChanged( true ); emit repaintChanged( this ); } } -void KoTextObject::removeHighlight(bool tqrepaint) +void KoTextObject::removeHighlight(bool repaint) { if ( textdoc->hasSelection( KoTextDocument::HighlightSelection, true ) ) { @@ -1677,7 +1677,7 @@ void KoTextObject::removeHighlight(bool tqrepaint) oldParag->setChanged( true ); textdoc->removeSelection( KoTextDocument::HighlightSelection ); } - if ( tqrepaint ) + if ( repaint ) emit repaintChanged( this ); } @@ -1831,7 +1831,7 @@ bool KoTextObject::formatMore( int count /* = 10 */, bool emitAfterFormatting /* } #ifdef DEBUG_FORMAT_MORE TQString id; - if ( m_lastFormatted ) id = TQString(" (%1)").tqarg(m_lastFormatted->paragId()); + if ( m_lastFormatted ) id = TQString(" (%1)").arg(m_lastFormatted->paragId()); kdDebug(32500) << "formatMore finished formatting. " << " bottom=" << bottom << " m_lastFormatted=" << m_lastFormatted << id @@ -2041,13 +2041,13 @@ TQString KoTextObject::textChangedCase(const TQString& _text,KoChangeCaseDia::Ty case KoChangeCaseDia::TitleCase: for(uint i=0;i<text.length();i++) { - if(text.tqat(i)!=' ') + if(text.at(i)!=' ') { - TQChar prev = text.tqat(TQMAX(i-1,0)); + TQChar prev = text.at(TQMAX(i-1,0)); if(i==0 || prev == ' ' || prev == '\n' || prev == '\t') - text=text.replace(i, 1, text.tqat(i).upper() ); + text=text.replace(i, 1, text.at(i).upper() ); else - text=text.replace(i, 1, text.tqat(i).lower() ); + text=text.replace(i, 1, text.at(i).lower() ); } } break; @@ -2055,9 +2055,9 @@ TQString KoTextObject::textChangedCase(const TQString& _text,KoChangeCaseDia::Ty for(uint i=0;i<text.length();i++) { TQString repl=TQString(text.at(i)); - if(text.tqat(i)!=text.tqat(i).upper()) + if(text.at(i)!=text.at(i).upper()) repl=repl.upper(); - else if(text.tqat(i).lower()!=text.tqat(i)) + else if(text.at(i).lower()!=text.at(i)) repl=repl.lower(); text=text.replace(i, 1, repl ); } @@ -2069,7 +2069,7 @@ TQString KoTextObject::textChangedCase(const TQString& _text,KoChangeCaseDia::Ty { TQChar prev = text.at(TQMAX(i-1,0)); if(i==0 || prev == '\n' ||prev.isPunct()) - text=text.replace(i, 1, text.tqat(i).upper() ); + text=text.replace(i, 1, text.at(i).upper() ); } } break; @@ -2167,7 +2167,7 @@ KoTextCursor KoTextObject::pasteOasisText( const TQDomElement &bodyElem, KoOasis context.styleStack().restore(); lastParagraph->setChanged( true ); - lastParagraph->tqinvalidate( 0 ); + lastParagraph->invalidate( 0 ); // Now split this parag, to make room for the next paragraphs resultCursor.setParag( lastParagraph ); @@ -2692,7 +2692,7 @@ KCommand *KoTextFormatInterface::setDefaultFormatCommand() KCommand *KoTextFormatInterface::setAlignCommand(int align) { KoParagLayout format( *currentParagLayoutFormat() ); - format.tqalignment=align; + format.alignment=align; return setParagLayoutFormatCommand(&format,KoParagLayout::Alignment); } diff --git a/lib/kotext/KoTextObject.h b/lib/kotext/KoTextObject.h index 15574075..7970a323 100644 --- a/lib/kotext/KoTextObject.h +++ b/lib/kotext/KoTextObject.h @@ -64,11 +64,11 @@ public: */ virtual KCommand *setFormatCommand( const KoTextFormat *format, int flags, bool zoomFont = false ) = 0; - /** Interface for accessing the current parag tqlayout */ + /** Interface for accessing the current parag layout */ virtual const KoParagLayout * currentParagLayoutFormat() const = 0; - /** Interface for changing the paragraph tqlayout. - * @param newLayout pointer to the new tqlayout to apply + /** Interface for changing the paragraph layout. + * @param newLayout pointer to the new layout to apply * @param flags one of the KoParagLayout flags * @param marginIndex type of margin. Only used if flags==KoParagLayout::Margins */ @@ -251,7 +251,7 @@ public: CheckNewLine = 1, /// < if true, the text to be inserted is checked for '\\n' (as a paragraph delimiter) OverwriteMode = 2, DoNotRemoveSelected = 4, ///< whether to remove selected text before - DoNotRepaint = 8 ///< usually we tqrepaint in insert(), this allows to turn it off + DoNotRepaint = 8 ///< usually we repaint in insert(), this allows to turn it off }; /** @@ -286,7 +286,7 @@ public: KoTextDocument::SelectionId selectionId = KoTextDocument::Standard, int insertFlags = DefaultInsertFlags, // KDE4: TODO use TQFlags CustomItemsMap customItemsMap = CustomItemsMap() ); - KCommand * removeSelectedTextCommand( KoTextCursor * cursor, KoTextDocument::SelectionId selectionId, bool tqrepaint = true ); + KCommand * removeSelectedTextCommand( KoTextCursor * cursor, KoTextDocument::SelectionId selectionId, bool repaint = true ); KCommand* insertParagraphCommand( KoTextCursor * cursor ); /** @@ -308,8 +308,8 @@ public: /** Highlighting support (for search/replace, spellchecking etc.). * Don't forget to ensure the paragraph is visible. */ - void highlightPortion( KoTextParag * parag, int index, int length, bool tqrepaint ); - void removeHighlight( bool tqrepaint ); + void highlightPortion( KoTextParag * parag, int index, int length, bool repaint ); + void removeHighlight( bool repaint ); /** Implementation of setFormatCommand from KoTextFormatInterface - apply change to the whole document */ KCommand *setFormatCommand( const KoTextFormat *format, int flags, bool zoomFont = false ); @@ -345,7 +345,7 @@ public: * @param cursor the current cursor; used if there is no selection. Can be 0L if there is one. * @param style the KoParagStyle to apply * @param selectionId the id of the selection, usually Standard or Temp - * @param paragLayoutFlags which settings from the paragraph tqlayout to apply + * @param paragLayoutFlags which settings from the paragraph layout to apply * @param formatFlags which settings from the text format to apply * @param createUndoRedo if true, an undo/redo command will be created and emitted * @param interactive if true, the text will be reformatted/repainted to show the new style @@ -429,7 +429,7 @@ public: /** * Abort the current formatMore() loop, or prevent the next one from starting. * Use with care. This is e.g. for KWFootNoteVariable, so that it can do - * a frame tqlayout before formatting the main text again. + * a frame layout before formatting the main text again. * It is important to make sure that formatMore will be called again ;) */ void abortFormatting(); diff --git a/lib/kotext/KoTextParag.cpp b/lib/kotext/KoTextParag.cpp index 23754c28..cc1aecb9 100644 --- a/lib/kotext/KoTextParag.cpp +++ b/lib/kotext/KoTextParag.cpp @@ -154,7 +154,7 @@ void KoTextParag::setPrev( KoTextParag *s ) doc->setFirstParag( this ); } -void KoTextParag::tqinvalidate( int /*chr, ignored*/ ) +void KoTextParag::invalidate( int /*chr, ignored*/ ) { m_invalid = true; #if 0 @@ -186,7 +186,7 @@ void KoTextParag::setLineChanged( short int line ) void KoTextParag::insert( int index, const TQString &s ) { str->insert( index, s, formatCollection()->defaultFormat() ); - tqinvalidate( index ); + invalidate( index ); //needPreProcess = TRUE; } @@ -209,7 +209,7 @@ void KoTextParag::remove( int index, int len ) } } str->remove( index, len ); - tqinvalidate( 0 ); + invalidate( 0 ); //needPreProcess = TRUE; } @@ -252,7 +252,7 @@ void KoTextParag::join( KoTextParag *s ) extraData()->join( s->extraData() ); }*/ delete s; - tqinvalidate( 0 ); + invalidate( 0 ); //// kotext invalidateCounters(); //// @@ -403,14 +403,14 @@ void KoTextParag::format( int start, bool doMove ) bool makeInvalid = false; //p && p->lastInFrame; //kdDebug(32500) << "might move of dy=" << dy << ". previous's lastInFrame (=makeInvalid): " << makeInvalid << endl; while ( s && dy ) { - if ( s->movedDown ) { // (not in TQRT) : moved down -> tqinvalidate and stop moving down - s->tqinvalidate( 0 ); // (there is no point in moving down a parag that has a frame break...) + if ( s->movedDown ) { // (not in TQRT) : moved down -> invalidate and stop moving down + s->invalidate( 0 ); // (there is no point in moving down a parag that has a frame break...) break; } if ( !s->isFullWidth() ) makeInvalid = TRUE; if ( makeInvalid ) - s->tqinvalidate( 0 ); + s->invalidate( 0 ); s->move( dy ); //if ( s->lastInFrame ) // makeInvalid = TRUE; @@ -600,7 +600,7 @@ void KoTextParag::setFormat( int index, int len, const KoTextFormat *_f, bool us _f->shadowDistanceX() != of->shadowDistanceX() || _f->shadowDistanceY() != of->shadowDistanceY() ) ) { - tqinvalidate( 0 ); + invalidate( 0 ); } if ( flags == -1 || flags == KoTextFormat::Format || !fc ) { #ifdef DEBUG_COLLECTION @@ -690,7 +690,7 @@ void KoTextParag::setDirection( TQChar::Direction d ) { if ( str && str->direction() != d ) { str->setDirection( d ); - tqinvalidate( 0 ); + invalidate( 0 ); //// kotext m_layout.direction = d; invalidateCounters(); // #47178 @@ -837,7 +837,7 @@ void KoTextParag::lineInfo( int l, int &y, int &h, int &bl ) const bl = ( *it )->baseLine; } -uint KoTextParag::tqalignment() const +uint KoTextParag::alignment() const { return align; } @@ -946,66 +946,66 @@ void KoTextParag::setMargin( TQStyleSheetItem::Margin m, double _i ) //kdDebug(32500) << "KoTextParag::setMargin " << m << " margin " << _i << endl; m_layout.margins[m] = _i; if ( m == TQStyleSheetItem::MarginTop && prev() ) - prev()->tqinvalidate(0); // for top margin (post-1.1: remove this, not necessary anymore) - tqinvalidate(0); + prev()->invalidate(0); // for top margin (post-1.1: remove this, not necessary anymore) + invalidate(0); } void KoTextParag::setMargins( const double * margins ) { for ( int i = 0 ; i < 5 ; ++i ) m_layout.margins[i] = margins[i]; - tqinvalidate(0); + invalidate(0); } void KoTextParag::setAlign( int align ) { Q_ASSERT( align <= TQt::AlignJustify ); align &= TQt::AlignHorizontal_Mask; - tqsetAlignment( align ); - m_layout.tqalignment = align; + setAlignment( align ); + m_layout.alignment = align; } int KoTextParag::resolveAlignment() const { - if ( (int)m_layout.tqalignment == TQt::AlignAuto ) + if ( (int)m_layout.alignment == TQt::AlignAuto ) return str->isRightToLeft() ? TQt::AlignRight : TQt::AlignLeft; - return m_layout.tqalignment; + return m_layout.alignment; } void KoTextParag::setLineSpacing( double _i ) { m_layout.setLineSpacingValue(_i); - tqinvalidate(0); + invalidate(0); } void KoTextParag::setLineSpacingType( KoParagLayout::SpacingType _type ) { m_layout.lineSpacingType = _type; - tqinvalidate(0); + invalidate(0); } void KoTextParag::setTopBorder( const KoBorder & _brd ) { m_layout.topBorder = _brd; - tqinvalidate(0); + invalidate(0); } void KoTextParag::setBottomBorder( const KoBorder & _brd ) { m_layout.bottomBorder = _brd; - tqinvalidate(0); + invalidate(0); } void KoTextParag::setJoinBorder( bool join ) { m_layout.joinBorder = join; - tqinvalidate(0); + invalidate(0); } void KoTextParag::setBackgroundColor ( const TQColor& color ) { m_layout.backgroundColor = color; - tqinvalidate(0); + invalidate(0); } void KoTextParag::setNoCounter() @@ -1060,17 +1060,17 @@ void KoTextParag::invalidateCounters() { // Invalidate this paragraph and all the following ones // (Numbering may have changed) - tqinvalidate( 0 ); + invalidate( 0 ); if ( m_layout.counter ) - m_layout.counter->tqinvalidate(); + m_layout.counter->invalidate(); KoTextParag *s = next(); // #### Possible optimization: since any invalidation propagates down, // it's enough to stop at the first paragraph with an already-invalidated counter, isn't it? - // This is only true if nobody else calls counter->tqinvalidate... + // This is only true if nobody else calls counter->invalidate... while ( s ) { if ( s->m_layout.counter ) - s->m_layout.counter->tqinvalidate(); - s->tqinvalidate( 0 ); + s->m_layout.counter->invalidate(); + s->invalidate( 0 ); s = s->next(); } } @@ -1290,13 +1290,13 @@ int KoTextParag::rightMargin() const KoTextZoomHandler * zh = textDocument()->formattingZoomHandler(); int cw=0; if( m_layout.counter && str->isRightToLeft() && - (( m_layout.counter->tqalignment() == TQt::AlignRight ) || ( m_layout.counter->tqalignment() == TQt::AlignAuto ))) + (( m_layout.counter->alignment() == TQt::AlignRight ) || ( m_layout.counter->alignment() == TQt::AlignAuto ))) cw = counterWidth(); return zh->ptToLayoutUnitPixX( m_layout.margins[ TQStyleSheetItem::MarginRight ] + m_layout.rightBorder.width() ) - + cw; /* in tqlayout units already */ + + cw; /* in layout units already */ } int KoTextParag::firstLineMargin() const @@ -1597,13 +1597,13 @@ void KoTextParag::paintLines( TQPainter &painter, const TQColorGroup &cg, KoText // we flush before and after tabs flush = flush || ( chr->c == '\t' || nextchr->c == '\t' ); // we flush on soft hypens - flush = flush || ( chr->c.tqunicode() == 0xad ); + flush = flush || ( chr->c.unicode() == 0xad ); // we flush on custom items flush = flush || chr->isCustom(); // we flush before custom items flush = flush || nextchr->isCustom(); // when painting justified we flush on spaces - if ((tqalignment() & TQt::AlignJustify) == TQt::AlignJustify ) + if ((alignment() & TQt::AlignJustify) == TQt::AlignJustify ) //flush = flush || TQTextFormatter::isBreakable( str, i ); flush = flush || chr->whiteSpace; // when underlining or striking "word by word" we flush before/after spaces @@ -1847,7 +1847,7 @@ void KoTextParag::drawParagStringInternal( TQPainter &painter, const TQString &s // 3) Paint TQString str( s ); - if ( str[ (int)str.length() - 1 ].tqunicode() == 0xad ) + if ( str[ (int)str.length() - 1 ].unicode() == 0xad ) str.remove( str.length() - 1, 1 ); painter.setPen( TQPen( textColor ) ); painter.setFont( font ); @@ -1877,7 +1877,7 @@ void KoTextParag::drawParagStringInternal( TQPainter &painter, const TQString &s } KoTextParag::drawFontEffects( &painter, format, zh, font, textColor, startX, baseLine, bw, lastY, h, str[start] ); - if ( str[ start ] != '\t' && str[ start ].tqunicode() != 0xad ) { + if ( str[ start ] != '\t' && str[ start ].unicode() != 0xad ) { str = format->displayedString( str ); // #### This converts the whole string, instead of from start to start+len! if ( format->vAlign() == KoTextFormat::AlignNormal ) { int posY = lastY + baseLine; @@ -1965,7 +1965,7 @@ void KoTextParag::drawParagStringInternal( TQPainter &painter, const TQString &s #ifdef DEBUG_PAINT //kdDebug(32500) << "we are drawing the end of line " << line << ". Auto-hyphenated: " << lineHyphenated( line ) << endl; #endif - bool drawHyphen = at( start+len-1 )->c.tqunicode() == 0xad; + bool drawHyphen = at( start+len-1 )->c.unicode() == 0xad; drawHyphen = drawHyphen || lineHyphenated( line ); if ( drawHyphen ) { #ifdef DEBUG_PAINT @@ -2059,7 +2059,7 @@ void KoTextParag::copyParagData( KoTextParag *parag ) //else // kdWarning() << "Paragraph has no style " << paragId() << endl; - // No "following style" setting, or same style -> copy tqlayout & format of previous paragraph + // No "following style" setting, or same style -> copy layout & format of previous paragraph if (!styleApplied) { setParagLayout( parag->paragLayout() ); @@ -2082,7 +2082,7 @@ void KoTextParag::copyParagData( KoTextParag *parag ) // Note: we don't call the original KoTextParag::copyParagData on purpose. // We don't want setListStyle to get called - it ruins our stylesheetitems // And we don't care about copying the stylesheetitems directly, - // applying the parag tqlayout will create them + // applying the parag layout will create them } void KoTextParag::setTabList( const KoTabulatorList &tabList ) @@ -2104,7 +2104,7 @@ void KoTextParag::setTabList( const KoTabulatorList &tabList ) { setTabArray( 0 ); } - tqinvalidate( 0 ); + invalidate( 0 ); } /** "Reimplemented" (compared to nextTabDefault) to implement non-left-aligned tabs */ @@ -2240,43 +2240,43 @@ void KoTextParag::applyStyle( KoParagStyle *style ) setFormat( newFormat ); } -void KoTextParag::setParagLayout( const KoParagLayout & tqlayout, int flags, int marginIndex ) +void KoTextParag::setParagLayout( const KoParagLayout & layout, int flags, int marginIndex ) { //kdDebug(32500) << "KoTextParag::setParagLayout flags=" << flags << endl; if ( flags & KoParagLayout::Alignment ) - setAlign( tqlayout.tqalignment ); + setAlign( layout.alignment ); if ( flags & KoParagLayout::Margins ) { if ( marginIndex == -1 ) - setMargins( tqlayout.margins ); + setMargins( layout.margins ); else - setMargin( (TQStyleSheetItem::Margin)marginIndex, tqlayout.margins[marginIndex] ); + setMargin( (TQStyleSheetItem::Margin)marginIndex, layout.margins[marginIndex] ); } if ( flags & KoParagLayout::LineSpacing ) { - setLineSpacingType( tqlayout.lineSpacingType ); - setLineSpacing( tqlayout.lineSpacingValue() ); + setLineSpacingType( layout.lineSpacingType ); + setLineSpacing( layout.lineSpacingValue() ); } if ( flags & KoParagLayout::Borders ) { - setLeftBorder( tqlayout.leftBorder ); - setRightBorder( tqlayout.rightBorder ); - setTopBorder( tqlayout.topBorder ); - setBottomBorder( tqlayout.bottomBorder ); - setJoinBorder( tqlayout.joinBorder ); + setLeftBorder( layout.leftBorder ); + setRightBorder( layout.rightBorder ); + setTopBorder( layout.topBorder ); + setBottomBorder( layout.bottomBorder ); + setJoinBorder( layout.joinBorder ); } if ( flags & KoParagLayout::BackgroundColor ) { - setBackgroundColor( tqlayout.backgroundColor ); + setBackgroundColor( layout.backgroundColor ); } if ( flags & KoParagLayout::BulletNumber ) - setCounter( tqlayout.counter ); + setCounter( layout.counter ); if ( flags & KoParagLayout::Tabulator ) - setTabList( tqlayout.tabList() ); + setTabList( layout.tabList() ); if ( flags == KoParagLayout::All ) { - setDirection( static_cast<TQChar::Direction>(tqlayout.direction) ); + setDirection( static_cast<TQChar::Direction>(layout.direction) ); // Don't call applyStyle from here, it would overwrite any paragraph-specific settings - setStyle( tqlayout.style ); + setStyle( layout.style ); } } @@ -2290,7 +2290,7 @@ void KoTextParag::setCustomItem( int index, KoTextCustomItem * custom, KoTextFor //addCustomItem(); document()->registerCustomItem( custom, this ); custom->recalc(); // calc value (e.g. for variables) and set initial size - tqinvalidate( 0 ); + invalidate( 0 ); setChanged( true ); } @@ -2349,7 +2349,7 @@ void KoTextParag::printRTDebug( int info ) static const char * const s_align[] = { "Auto", "Left", "Right", "ERROR", "HCenter", "ERR", "ERR", "ERR", "Justify", }; static const char * const s_linespacing[] = { "Single", "1.5", "2", "custom", "atLeast", "Multiple", "Fixed" }; static const char * const s_dir[] = { "DirL", "DirR", "DirEN", "DirES", "DirET", "DirAN", "DirCS", "DirB", "DirS", "DirWS", "DirON", "DirLRE", "DirLRO", "DirAL", "DirRLE", "DirRLO", "DirPDF", "DirNSM", "DirBN" }; - kdDebug(32500) << " align: " << s_align[tqalignment()] << " resolveAlignment: " << s_align[resolveAlignment()] + kdDebug(32500) << " align: " << s_align[alignment()] << " resolveAlignment: " << s_align[resolveAlignment()] << " isRTL:" << str->isRightToLeft() << " dir: " << s_dir[direction()] << endl; TQRect pixr = pixelRect( textDocument()->paintingZoomHandler() ); @@ -2421,7 +2421,7 @@ void KoTextParag::printRTDebug( int info ) attrs.truncate( attrs.length() - 1 ); kdDebug(32500) << i << ": '" << TQString(ch.c).rightJustify(2) - << "' (" << TQString::number( ch.c.tqunicode() ).rightJustify(3) << ")" + << "' (" << TQString::number( ch.c.unicode() ).rightJustify(3) << ")" << " x(LU)=" << ch.x << " w(LU)=" << ch.width//s->width(i) << " x(PIX)=" << pixelx @@ -2849,7 +2849,7 @@ void KoTextParag::loadOasisSpan( const TQDomElement& parent, KoOasisContext& con KoParagLayout KoTextParag::loadParagLayout( KoOasisContext& context, KoStyleCollection *styleCollection, bool findStyle ) { - KoParagLayout tqlayout; + KoParagLayout layout; // Only when loading paragraphs, not when loading styles if ( findStyle ) @@ -2877,17 +2877,17 @@ KoParagLayout KoTextParag::loadParagLayout( KoOasisContext& context, KoStyleColl style = styleCollection->findStyle( "Standard" ); } Q_ASSERT(style); - tqlayout.style = style; + layout.style = style; } - KoParagLayout::loadOasisParagLayout( tqlayout, context ); + KoParagLayout::loadOasisParagLayout( layout, context ); - return tqlayout; + return layout; } void KoTextParag::loadOasis( const TQDomElement& parent, KoOasisContext& context, KoStyleCollection *styleCollection, uint& pos ) { - // First load tqlayout from style + // First load layout from style KoParagLayout paragLayout = loadParagLayout( context, styleCollection, true ); setParagLayout( paragLayout ); @@ -2906,7 +2906,7 @@ void KoTextParag::loadOasis( const TQDomElement& parent, KoOasisContext& context setFormat( len - 1, 1, paragFormat(), TRUE ); setChanged( true ); - tqinvalidate( 0 ); + invalidate( 0 ); } void KoTextParag::saveOasis( KoXmlWriter& writer, KoSavingContext& context, @@ -2915,7 +2915,7 @@ void KoTextParag::saveOasis( KoXmlWriter& writer, KoSavingContext& context, { KoGenStyles& mainStyles = context.mainStyles(); - // Write paragtqlayout to styles (with parent == the parag's style) + // Write paraglayout to styles (with parent == the parag's style) TQString parentStyleName; if ( m_layout.style ) parentStyleName = m_layout.style->name(); @@ -2924,11 +2924,11 @@ void KoTextParag::saveOasis( KoXmlWriter& writer, KoSavingContext& context, paragFormat()->save( autoStyle, context ); m_layout.saveOasis( autoStyle, context, false ); - // First paragraph is special, it includes page-tqlayout info (for word-processing at least) + // First paragraph is special, it includes page-layout info (for word-processing at least) if ( !prev() ) { if ( context.variableSettings() ) autoStyle.addProperty( "style:page-number", context.variableSettings()->startingPageNumber() ); - // Well we support only one page tqlayout, so the first parag always points to "Standard". + // Well we support only one page layout, so the first parag always points to "Standard". autoStyle.addAttribute( "style:master-page-name", "Standard" ); } @@ -3212,7 +3212,7 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len, #endif if ( ch.isCustom() ) continue; - if ( (ch.c == ' ' || ch.c.tqunicode() == 0x00a0U) + if ( (ch.c == ' ' || ch.c.unicode() == 0x00a0U) && (whichFormattingChars & FormattingSpace)) { // Don't use ch.pixelwidth here. We want a square with diff --git a/lib/kotext/KoTextParag.h b/lib/kotext/KoTextParag.h index e27a9afc..d8e0c29b 100644 --- a/lib/kotext/KoTextParag.h +++ b/lib/kotext/KoTextParag.h @@ -93,7 +93,7 @@ public: void format( int start = -1, bool doMove = TRUE ); /// Call this to ensure that format() will be called on this paragraph later on - void tqinvalidate( int chr /*ignored*/ = 0 ); + void invalidate( int chr /*ignored*/ = 0 ); /// Returns false if format() needs to be called on this paragraph bool isValid() const; @@ -130,9 +130,9 @@ public: void setFormat( int index, int len, const KoTextFormat *f, bool useCollection = TRUE, int flags = -1 ); - void tqsetAlignment( uint a ); - void tqsetAlignmentDirect( uint a ) { align = a; } - uint tqalignment() const; + void setAlignment( uint a ); + void setAlignmentDirect( uint a ) { align = a; } + uint alignment() const; virtual void paint( TQPainter &painter, const TQColorGroup &cg, KoTextCursor *cursor, bool drawSelections, int clipx, int clipy, int clipw, int cliph ); // kotextparag.cc @@ -214,7 +214,7 @@ public: /** Sets all or some parameters from a paragLayout struct. * @param flags selects which settings to apply, see KoParagLayout's enum. */ - virtual void setParagLayout( const KoParagLayout &tqlayout, int flags = KoParagLayout::All, + virtual void setParagLayout( const KoParagLayout &layout, int flags = KoParagLayout::All, int marginIndex = -1 ); const KoParagLayout & paragLayout() { return m_layout; } @@ -235,9 +235,9 @@ public: void setLineSpacingType( KoParagLayout::SpacingType _type ); - /** Use this to change the paragraph tqalignment, not KoTextParag::tqsetAlignment ! */ + /** Use this to change the paragraph alignment, not KoTextParag::setAlignment ! */ void setAlign( int align ); - /** Return the real tqalignment: Auto is resolved to either Left or Right */ + /** Return the real alignment: Auto is resolved to either Left or Right */ int resolveAlignment() const; /// The part of the top margin that can be broken by a page break @@ -328,7 +328,7 @@ public: /** * Load a section of text from a oasis based xml tree. - * @param parent the xml element that has content as tqchildren. + * @param parent the xml element that has content as children. * @param context the context * @param stripLeadingSpace whether to remove leading literal whitespace */ @@ -336,7 +336,7 @@ public: /** * Load a section of text from a oasis based xml tree. - * @param parent the xml element that has content as tqchildren. + * @param parent the xml element that has content as children. * @param context the context * @param stripLeadingSpace whether to remove leading literal whitespace * @param hasTrailingSpace whether there was trailing literal whitespace in the span's text @@ -520,18 +520,18 @@ inline KoTextDocument *KoTextParag::document() const return doc; } -inline void KoTextParag::tqsetAlignment( uint a ) +inline void KoTextParag::setAlignment( uint a ) { if ( a == align ) return; align = a; - tqinvalidate( 0 ); + invalidate( 0 ); } /*inline void KoTextParag::setListStyle( TQStyleSheetItem::ListStyle ls ) { lstyle = ls; - tqinvalidate( 0 ); + invalidate( 0 ); } inline TQStyleSheetItem::ListStyle KoTextParag::listStyle() const diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp index 32e82b73..aadeff06 100644 --- a/lib/kotext/KoTextView.cpp +++ b/lib/kotext/KoTextView.cpp @@ -41,7 +41,7 @@ #include <tqapplication.h> #include <tqtimer.h> -#include <tqclipboard.h> +#include <clipboard.h> class KoTextView::KoTextViewPrivate { @@ -291,7 +291,7 @@ void KoTextView::handleKeyPressEvent( TQKeyEvent * e, TQWidget *widget, const TQ break; } default: { - //kdDebug(32500) << "KoTextView::keyPressEvent ascii=" << e->ascii() << " text=" << e->text()[0].tqunicode() << " state=" << e->state() << endl; + //kdDebug(32500) << "KoTextView::keyPressEvent ascii=" << e->ascii() << " text=" << e->text()[0].unicode() << " state=" << e->state() << endl; if (e->key() == TQt::Key_Tab) { if (doToolTipCompletion(m_cursor, m_cursor->parag(), m_cursor->index() - 1, e->key()) ) @@ -331,7 +331,7 @@ void KoTextView::handleKeyPressEvent( TQKeyEvent * e, TQWidget *widget, const TQ // Bidi support: need to reverse mirrored chars (e.g. parenthesis) KoTextParag *p = m_cursor->parag(); if ( p && p->string() && p->string()->isRightToLeft() ) { - TQChar *c = (TQChar *)text.tqunicode(); + TQChar *c = (TQChar *)text.unicode(); int l = text.length(); while( l-- ) { if ( c->mirrored() ) @@ -611,7 +611,7 @@ KoTextCursor KoTextView::selectWordUnderCursor( const KoTextCursor& cursor, int const bool isWordDelimiter = ch.isSpace() || ch.category() == TQChar::Punctuation_Open // e.g. '(' || ch.category() == TQChar::Punctuation_Close // e.g. ')' - || ch.category() == TQChar::Punctuation_Other // see http://www.fileformat.info/info/tqunicode/category/Po/list.htm + || ch.category() == TQChar::Punctuation_Other // see http://www.fileformat.info/info/unicode/category/Po/list.htm ; if( !beginFound && !isWordDelimiter ) @@ -643,9 +643,9 @@ KoTextCursor KoTextView::selectParagUnderCursor( const KoTextCursor& cursor, int { textObject()->selectionChangedNotify(); // Copy the selection. - TQApplication::tqclipboard()->setSelectionMode( true ); + TQApplication::clipboard()->setSelectionMode( true ); emit copy(); - TQApplication::tqclipboard()->setSelectionMode( false ); + TQApplication::clipboard()->setSelectionMode( false ); } return c2; } @@ -808,9 +808,9 @@ void KoTextView::handleMouseReleaseEvent() textObject()->selectionChangedNotify(); // Copy the selection. - TQApplication::tqclipboard()->setSelectionMode( true ); + TQApplication::clipboard()->setSelectionMode( true ); emit copy(); - TQApplication::tqclipboard()->setSelectionMode( false ); + TQApplication::clipboard()->setSelectionMode( false ); } inDoubleClick = FALSE; @@ -831,9 +831,9 @@ void KoTextView::handleMouseDoubleClickEvent( TQMouseEvent*ev, const TQPoint& i *m_cursor = selectWordUnderCursor( *m_cursor ); textObject()->selectionChangedNotify(); // Copy the selection. - TQApplication::tqclipboard()->setSelectionMode( true ); + TQApplication::clipboard()->setSelectionMode( true ); emit copy(); - TQApplication::tqclipboard()->setSelectionMode( false ); + TQApplication::clipboard()->setSelectionMode( false ); possibleTripleClick=true; @@ -900,8 +900,8 @@ bool KoTextView::insertParagraph(const TQPoint &pos) if ( pos.x() + f->width(' ') >= textDocument()->width()) { //FIXME me bidi. - //change parag tqalignment => right tqalignment - last->tqsetAlignment( TQt::AlignRight ); + //change parag alignment => right alignment + last->setAlignment( TQt::AlignRight ); } else { @@ -1207,7 +1207,7 @@ bool KoTextView::openLink( KoLinkVariable* variable ) } else { - KMessageBox::sorry( 0, i18n("%1 is not a valid link.").tqarg( variable->url() ) ); + KMessageBox::sorry( 0, i18n("%1 is not a valid link.").arg( variable->url() ) ); return false; } } @@ -1450,10 +1450,10 @@ void KoTextView::copyTextOfComment() { KURL::List lst; lst.append( var->note() ); - TQApplication::tqclipboard()->setSelectionMode(true); - TQApplication::tqclipboard()->setData( new KURLDrag(lst, 0, 0) ); - TQApplication::tqclipboard()->setSelectionMode(false); - TQApplication::tqclipboard()->setData( new KURLDrag(lst, 0, 0) ); + TQApplication::clipboard()->setSelectionMode(true); + TQApplication::clipboard()->setData( new KURLDrag(lst, 0, 0) ); + TQApplication::clipboard()->setSelectionMode(false); + TQApplication::clipboard()->setData( new KURLDrag(lst, 0, 0) ); } } @@ -1476,13 +1476,13 @@ KoParagStyle * KoTextView::createStyleFromSelection(const TQString & name) if ( textDocument()->hasSelection( KoTextDocument::Standard ) ) cursor = textDocument()->selectionStartCursor( KoTextDocument::Standard ); KoParagStyle * style = new KoParagStyle (name); - KoParagLayout tqlayout(cursor.parag()->paragLayout()); - tqlayout.style = style; + KoParagLayout layout(cursor.parag()->paragLayout()); + layout.style = style; style->setFollowingStyle( style ); style->format() = *(cursor.parag()->at(cursor.index())->format()); - style->paragLayout() = tqlayout; - // Select this new style - hmm only the parag tqlayout, we don't want to erase any text-formatting + style->paragLayout() = layout; + // Select this new style - hmm only the parag layout, we don't want to erase any text-formatting cursor.parag()->setParagLayout( style->paragLayout() ); return style; } @@ -1500,7 +1500,7 @@ void KoTextView::updateStyleFromSelection( KoParagStyle* style ) void KoTextView::addBookmarks(const TQString &url) { - TQString filename = locateLocal( "data", TQString::tqfromLatin1("konqueror/bookmarks.xml") ); + TQString filename = locateLocal( "data", TQString::fromLatin1("konqueror/bookmarks.xml") ); KBookmarkManager *bookManager = KBookmarkManager::managerForFile( filename,false ); KBookmarkGroup group = bookManager->root(); group.addBookmark( bookManager, url, KURL( url)); @@ -1515,10 +1515,10 @@ void KoTextView::copyLink() { KURL::List lst; lst.append( var->url() ); - TQApplication::tqclipboard()->setSelectionMode(true); - TQApplication::tqclipboard()->setData( new KURLDrag(lst, 0, 0) ); - TQApplication::tqclipboard()->setSelectionMode(false); - TQApplication::tqclipboard()->setData( new KURLDrag(lst, 0, 0) ); + TQApplication::clipboard()->setSelectionMode(true); + TQApplication::clipboard()->setData( new KURLDrag(lst, 0, 0) ); + TQApplication::clipboard()->setSelectionMode(false); + TQApplication::clipboard()->setData( new KURLDrag(lst, 0, 0) ); } } diff --git a/lib/kotext/KoTextZoomHandler.h b/lib/kotext/KoTextZoomHandler.h index f8c2ef12..d1bc6025 100644 --- a/lib/kotext/KoTextZoomHandler.h +++ b/lib/kotext/KoTextZoomHandler.h @@ -33,7 +33,7 @@ public: //// Support for WYSIWYG text layouting ///// - /** The "[zoomed] view pixel" -> "tqlayout unit pixel" conversions. */ + /** The "[zoomed] view pixel" -> "layout unit pixel" conversions. */ int pixelToLayoutUnitX( int x ) const; int pixelToLayoutUnitY( int y ) const; TQPoint pixelToLayoutUnit( const TQPoint &p ) const @@ -43,7 +43,7 @@ public: { return TQRect( pixelToLayoutUnit( r.topLeft() ), pixelToLayoutUnit( r.bottomRight() ) ); } - /** The "tqlayout unit pixel" -> "[zoomed] view pixel" conversions. */ + /** The "layout unit pixel" -> "[zoomed] view pixel" conversions. */ int layoutUnitToPixelX( int lupix ) const; int layoutUnitToPixelY( int lupix ) const; @@ -89,26 +89,26 @@ public: } /** - * Given the font size for the font in tqlayout units, in pt (use pointSize()) + * Given the font size for the font in layout units, in pt (use pointSize()) * this returns the font size to use on screen the current zoom, in pt (use setPointSizeFloat()), */ double layoutUnitToFontSize( int luSize, bool /*forPrint*/ ) const; - // Note: For converting fontsizes from/to tqlayout units and zoom-independent + // Note: For converting fontsizes from/to layout units and zoom-independent // pt sizes (like the one the user sees, e.g. 12pt), // use ptToLayoutUnit and layoutUnitToPt, not layoutToFontSize. - // The conversions below convert between an internal text tqlayout resolution of + // The conversions below convert between an internal text layout resolution of // ~1440 DPI (by default) and the point-size for the fonts (those known by the user). // Those conversions don't depend on the zoom level. /** Change the factor that converts between pointsizes - * and tqlayout units (by default 20 - for 1440 DPI at 72 DPI) */ + * and layout units (by default 20 - for 1440 DPI at 72 DPI) */ static void setPtToLayoutUnitFactor( int factor ) { m_layoutUnitFactor = factor; } /** Not zoom dependent. Simply convert a pt value (e.g. a frame) - * to high-resolution tqlayout unit coordinates (in pt). */ + * to high-resolution layout unit coordinates (in pt). */ static double ptToLayoutUnitPt( double pt ) { return pt * static_cast<double>( m_layoutUnitFactor ); } /** Same thing for integer values, e.g. a font size in pt */ diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp index fa1b03fe..489752f0 100644 --- a/lib/kotext/KoVariable.cpp +++ b/lib/kotext/KoVariable.cpp @@ -123,7 +123,7 @@ void KoVariableSettings::saveOasis( KoXmlWriter &settingsWriter ) const settingsWriter.addConfigItem( "displayfieldcode", m_displayFieldCode); // m_startingPageNumber isn't saved to OASIS. Applications must use either // style:page-number in the first parag of a page (see KoTextParag), or - // style:first-page-number in style:page-tqlayout, for spreadsheets etc. + // style:first-page-number in style:page-layout, for spreadsheets etc. if ( d->m_lastPrintingDate.isValid()) settingsWriter.addConfigItem("lastPrintingDate", d->m_lastPrintingDate.toString(Qt::ISODate)); @@ -532,7 +532,7 @@ TQValueList<KoVariable *> KoVariableCollection::recalcVariables(int type) if ( parag ) { //kdDebug(32500) << "KoDoc::recalcVariables -> invalidating parag " << parag->paragId() << endl; - parag->tqinvalidate( 0 ); + parag->invalidate( 0 ); parag->setChanged( true ); } } @@ -896,7 +896,7 @@ void KoVariable::recalcAndRepaint() if ( parag ) { //kdDebug(32500) << "KoVariable::recalcAndRepaint -> invalidating parag " << parag->paragId() << endl; - parag->tqinvalidate( 0 ); + parag->invalidate( 0 ); parag->setChanged( true ); } textDocument()->emitRepaintChanged(); @@ -978,7 +978,7 @@ void KoVariable::drawCustomItemHelper( TQPainter* p, int x, int y, int wpix, int //p->drawText( x, posY, str ); // We can't just drawText, it wouldn't use the same kerning as the one // that resize() planned for [which is zoom-independent]. - // We need to do the tqlayout using tqlayout units instead, so for simplicity + // We need to do the layout using layout units instead, so for simplicity // I just draw every char individually (whereas KoTextFormatter/KoTextParag // detect runs of text that can be drawn together) const int len = str.length(); @@ -988,9 +988,9 @@ void KoVariable::drawCustomItemHelper( TQPainter* p, int x, int y, int wpix, int { const TQChar ch = str[i]; p->drawText( x, posY, TQString(ch) ); - // Do like KoTextFormatter: do the tqlayout in tqlayout units. + // Do like KoTextFormatter: do the layout in layout units. xLU += KoTextZoomHandler::ptToLayoutUnitPt( fm.width( ch ) ); - // And then compute the X position in pixels from the tqlayout unit X. + // And then compute the X position in pixels from the layout unit X. x = zh->layoutUnitToPixelX( xLU ); } @@ -1211,7 +1211,7 @@ void KoDateVariable::resize() void KoDateVariable::recalc() { if ( m_subtype == VST_DATE_CURRENT ) - m_varValue = TQDateTime(TQDateTime::tqcurrentDateTime().addDays(m_correctDate)); + m_varValue = TQDateTime(TQDateTime::currentDateTime().addDays(m_correctDate)); else if ( m_subtype == VST_DATE_LAST_PRINTING ) m_varValue = m_varColl->variableSetting()->lastPrintingDate(); else if ( m_subtype == VST_DATE_CREATE_FILE ) @@ -1222,7 +1222,7 @@ void KoDateVariable::recalc() { // Only if never set before (i.e. upon insertion) if ( m_varValue.isNull() ) - m_varValue = TQDateTime(TQDateTime::tqcurrentDateTime().addDays(m_correctDate)); + m_varValue = TQDateTime(TQDateTime::currentDateTime().addDays(m_correctDate)); } resize(); } @@ -1319,9 +1319,9 @@ void KoDateVariable::saveOasis( KoXmlWriter& writer, KoSavingContext& context ) else if ( value.lower() == "localeshort" ) value = KGlobal::locale()->dateFormatShort(); else if ( value.lower() == "localedatetime" ) - value = TQString( "%1 %2" ).tqarg( KGlobal::locale()->dateFormat() ).tqarg( KGlobal::locale()->timeFormat() ); + value = TQString( "%1 %2" ).arg( KGlobal::locale()->dateFormat() ).arg( KGlobal::locale()->timeFormat() ); else if ( value.lower() == "localedatetimeshort" ) - value = TQString( "%1 %2" ).tqarg( KGlobal::locale()->dateFormatShort() ).tqarg( KGlobal::locale()->timeFormat() ); + value = TQString( "%1 %2" ).arg( KGlobal::locale()->dateFormatShort() ).arg( KGlobal::locale()->timeFormat() ); klocaleFormat = true; } writer.addAttribute( "style:data-style-name", KoOasisStyles::saveOasisDateStyle(context.mainStyles(), value, klocaleFormat ) ); @@ -2505,7 +2505,7 @@ void KoLinkVariable::drawCustomItem( TQPainter* p, int x, int y, int wpix, int h /******************************************************************/ KoNoteVariable::KoNoteVariable( KoTextDocument *textdoc, const TQString & _note,KoVariableFormat *varFormat,KoVariableCollection *_varColl ) : KoVariable( textdoc, varFormat,_varColl ) - , m_createdNoteDate( TQDate::tqcurrentDate() ) + , m_createdNoteDate( TQDate::currentDate() ) { m_varValue = TQVariant( _note ); } diff --git a/lib/kotext/KoVariable.h b/lib/kotext/KoVariable.h index 88f17975..fce8fc2d 100644 --- a/lib/kotext/KoVariable.h +++ b/lib/kotext/KoVariable.h @@ -405,7 +405,7 @@ public: TQVariant varValue() const { return m_varValue; } /** - * Ask this variable to recalculate and to tqrepaint itself + * Ask this variable to recalculate and to repaint itself * Only use this if you're working on a single variable (e.g. popupmenu). * Otherwise, better do the repainting all at once. * @see KoVariableCollection::recalcVariables() diff --git a/lib/kotext/kodecorationtabbase.ui b/lib/kotext/kodecorationtabbase.ui index cd8f17f2..7c8896b5 100644 --- a/lib/kotext/kodecorationtabbase.ui +++ b/lib/kotext/kodecorationtabbase.ui @@ -18,7 +18,7 @@ </property> <widget class="TQGroupBox"> <property name="name"> - <cstring>tqcolorGroupBox</cstring> + <cstring>colorGroupBox</cstring> </property> <property name="title"> <string>Colors</string> @@ -126,7 +126,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -143,7 +143,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/lib/kotext/kohighlightingtabbase.ui b/lib/kotext/kohighlightingtabbase.ui index 27be0702..b2b4ce26 100644 --- a/lib/kotext/kohighlightingtabbase.ui +++ b/lib/kotext/kohighlightingtabbase.ui @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> diff --git a/lib/kotext/kohyphen/kohyphen.cpp b/lib/kotext/kohyphen/kohyphen.cpp index d8a0374e..723c50c2 100644 --- a/lib/kotext/kohyphen/kohyphen.cpp +++ b/lib/kotext/kohyphen/kohyphen.cpp @@ -21,7 +21,7 @@ #include <tqdom.h> #include <tqfile.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqstring.h> #include <klocale.h> @@ -177,10 +177,10 @@ HyphenDict *KoHyphenator::dict(const TQString &_lang) const if ( underscore > -1 ) { lang.truncate( underscore ); if (encodings.find(lang) == encodings.end()) - throw KoHyphenatorException( TQString("No dictionary for %1").tqarg(lang) ); + throw KoHyphenatorException( TQString("No dictionary for %1").arg(lang) ); } else - throw KoHyphenatorException( TQString("No dictionary for %1").tqarg(lang) ); + throw KoHyphenatorException( TQString("No dictionary for %1").arg(lang) ); } if (dicts.find(lang) == dicts.end()) { @@ -199,11 +199,11 @@ HyphenDict *KoHyphenator::dict(const TQString &_lang) const #ifdef DEBUG_HYPHENATOR kdDebug() << "No dictionary loaded" << endl; #endif - throw(KoHyphenatorException( TQString("Could not load dictionary for the language: %1").tqarg(lang) )); + throw(KoHyphenatorException( TQString("Could not load dictionary for the language: %1").arg(lang) )); } } else - throw(KoHyphenatorException( TQString("Could not load dictionary for the language: %1").tqarg(lang) )); + throw(KoHyphenatorException( TQString("Could not load dictionary for the language: %1").arg(lang) )); } return dicts[lang]; } diff --git a/lib/kotext/kolanguagetabbase.ui b/lib/kotext/kolanguagetabbase.ui index a9073584..0fbd5442 100644 --- a/lib/kotext/kolanguagetabbase.ui +++ b/lib/kotext/kolanguagetabbase.ui @@ -60,7 +60,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>171</height> diff --git a/lib/kotext/kolayouttabbase.ui b/lib/kotext/kolayouttabbase.ui index 471607d4..646bc795 100644 --- a/lib/kotext/kolayouttabbase.ui +++ b/lib/kotext/kolayouttabbase.ui @@ -40,7 +40,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -94,7 +94,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -103,7 +103,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> @@ -225,7 +225,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/lib/kotext/tests/kobordertest.cpp b/lib/kotext/tests/kobordertest.cpp index 5d5fbe5e..356b0158 100644 --- a/lib/kotext/tests/kobordertest.cpp +++ b/lib/kotext/tests/kobordertest.cpp @@ -11,14 +11,14 @@ class MyWidget : public TQWidget public: MyWidget( KoZoomHandler* _zh, TQWidget* parent ) : TQWidget( parent ), m_zh(_zh) { - tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); } - TQSize tqsizeHint() const { + TQSize sizeHint() const { return TQSize( 150, 150 ); } - TQSize tqminimumSizeHint() const { - return tqsizeHint(); + TQSize minimumSizeHint() const { + return sizeHint(); } KoBorder m_leftBorder; diff --git a/lib/kotext/tests/kotextformattertest.cpp b/lib/kotext/tests/kotextformattertest.cpp index b6138315..6721f771 100644 --- a/lib/kotext/tests/kotextformattertest.cpp +++ b/lib/kotext/tests/kotextformattertest.cpp @@ -89,7 +89,7 @@ void KoTextFormatterTest::speedTest() // Format it 50 times for ( uint i = 0 ; i < 50 ; ++i ) { - parag->tqinvalidate(0); + parag->invalidate(0); parag->format(); } doc->clear(false); @@ -205,8 +205,8 @@ int main (int argc, char ** argv) KApplication app(argc, argv, "KoTextFormatter test"); // Don't let locale settings lead to different hyphenation output - KGlobal::locale()->setLanguage( TQString::tqfromLatin1( "en_US" ) ); - KGlobal::locale()->setCountry( TQString::tqfromLatin1( "C" ) ); + KGlobal::locale()->setLanguage( TQString::fromLatin1( "en_US" ) ); + KGlobal::locale()->setCountry( TQString::fromLatin1( "C" ) ); KoTextFormatterTest test; //test.speedTest(); diff --git a/lib/kotext/timedateformatwidget.ui b/lib/kotext/timedateformatwidget.ui index 830b3bdb..ded1c906 100644 --- a/lib/kotext/timedateformatwidget.ui +++ b/lib/kotext/timedateformatwidget.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -38,7 +38,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> @@ -59,7 +59,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -113,7 +113,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -175,7 +175,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>10</height> diff --git a/lib/kross/api/callable.cpp b/lib/kross/api/callable.cpp index f095f596..b85aa4cd 100644 --- a/lib/kross/api/callable.cpp +++ b/lib/kross/api/callable.cpp @@ -47,26 +47,26 @@ const TQString Callable::getClassName() const bool Callable::hasChild(const TQString& name) const { - return m_tqchildren.contains(name); + return m_children.contains(name); } Object::Ptr Callable::getChild(const TQString& name) const { - return m_tqchildren[name]; + return m_children[name]; } TQMap<TQString, Object::Ptr> Callable::getChildren() const { - return m_tqchildren; + return m_children; } bool Callable::addChild(const TQString& name, Object* object) { #ifdef KROSS_API_OBJECT_ADDCHILD_DEBUG krossdebug( TQString("Kross::Api::Callable::addChild() object.name='%1' object.classname='%2'") - .tqarg(name).tqarg(object->getClassName()) ); + .arg(name).arg(object->getClassName()) ); #endif - m_tqchildren.replace(name, Object::Ptr(object)); + m_children.replace(name, Object::Ptr(object)); return true; } @@ -78,9 +78,9 @@ bool Callable::addChild(Callable* object) void Callable::removeChild(const TQString& name) { #ifdef KROSS_API_OBJECT_REMCHILD_DEBUG - krossdebug( TQString("Kross::Api::Callable::removeChild() name='%1'").tqarg(name) ); + krossdebug( TQString("Kross::Api::Callable::removeChild() name='%1'").arg(name) ); #endif - m_tqchildren.remove(name); + m_children.remove(name); } void Callable::removeAllChildren() @@ -88,13 +88,13 @@ void Callable::removeAllChildren() #ifdef KROSS_API_OBJECT_REMCHILD_DEBUG krossdebug( "Kross::Api::Callable::removeAllChildren()" ); #endif - m_tqchildren.clear(); + m_children.clear(); } Object::Ptr Callable::call(const TQString& name, List::Ptr args) { #ifdef KROSS_API_CALLABLE_CALL_DEBUG - krossdebug( TQString("Kross::Api::Callable::call() name=%1 getName()=%2 arguments=%3").tqarg(name).tqarg(getName()).tqarg(args ? args->toString() : TQString("")) ); + krossdebug( TQString("Kross::Api::Callable::call() name=%1 getName()=%2 arguments=%3").arg(name).arg(getName()).arg(args ? args->toString() : TQString("")) ); #endif if(name.isEmpty()) // return a self-reference if no functionname is defined. @@ -111,7 +111,7 @@ Object::Ptr Callable::call(const TQString& name, List::Ptr args) TQString s = Variant::toString(args->item(0)); Object::Ptr obj = getChild(s); if(! obj) - throw Exception::Ptr( new Exception(TQString("The object '%1' has no child object '%2'").tqarg(getName()).tqarg(s)) ); + throw Exception::Ptr( new Exception(TQString("The object '%1' has no child object '%2'").arg(getName()).arg(s)) ); return obj; } else if(name == "has") { @@ -123,9 +123,9 @@ Object::Ptr Callable::call(const TQString& name, List::Ptr args) } else if(name == "list") { TQStringList list; - TQMap<TQString, Object::Ptr> tqchildren = getChildren(); - TQMap<TQString, Object::Ptr>::Iterator it( tqchildren.begin() ); - for(; it != tqchildren.end(); ++it) + TQMap<TQString, Object::Ptr> children = getChildren(); + TQMap<TQString, Object::Ptr>::Iterator it( children.begin() ); + for(; it != children.end(); ++it) list.append( it.key() ); return new Variant(list); } @@ -134,6 +134,6 @@ Object::Ptr Callable::call(const TQString& name, List::Ptr args) } // If there exists no such object return NULL. - krossdebug( TQString("Object '%1' has no callable object named '%2'.").tqarg(getName()).tqarg(name) ); + krossdebug( TQString("Object '%1' has no callable object named '%2'.").arg(getName()).arg(name) ); return 0; } diff --git a/lib/kross/api/callable.h b/lib/kross/api/callable.h index 63edb067..0e3dd3a6 100644 --- a/lib/kross/api/callable.h +++ b/lib/kross/api/callable.h @@ -92,9 +92,9 @@ namespace Kross { namespace Api { Object::Ptr getChild(const TQString& name) const; /** - * Return all tqchildren. + * Return all children. * - * \return A \a ObjectMap of tqchildren this Object has. + * \return A \a ObjectMap of children this Object has. */ TQMap<TQString, Object::Ptr> getChildren() const; @@ -125,7 +125,7 @@ namespace Kross { namespace Api { void removeChild(const TQString& name); /** - * Remove all tqchildren. + * Remove all children. */ void removeAllChildren(); @@ -138,7 +138,7 @@ namespace Kross { namespace Api { /// Name this callable object has. TQString m_name; /// A list of childobjects. - TQMap<TQString, Object::Ptr> m_tqchildren; + TQMap<TQString, Object::Ptr> m_children; }; }} diff --git a/lib/kross/api/class.h b/lib/kross/api/class.h index de1d898c..6224a61a 100644 --- a/lib/kross/api/class.h +++ b/lib/kross/api/class.h @@ -76,7 +76,7 @@ namespace Kross { namespace Api { /* virtual Object::Ptr call(const TQString& name, List::Ptr arguments) { - krossdebug( TQString("Class::call(%1)").tqarg(name) ); + krossdebug( TQString("Class::call(%1)").arg(name) ); return Event<T>::call(name, arguments); } */ diff --git a/lib/kross/api/event.h b/lib/kross/api/event.h index 26a92117..b75107f7 100644 --- a/lib/kross/api/event.h +++ b/lib/kross/api/event.h @@ -201,13 +201,13 @@ namespace Kross { namespace Api { virtual Object::Ptr call(const TQString& name, List::Ptr arguments) { #ifdef KROSS_API_EVENT_CALL_DEBUG - krossdebug( TQString("Event::call() name='%1' getName()='%2'").tqarg(name).tqarg(getName()) ); + krossdebug( TQString("Event::call() name='%1' getName()='%2'").arg(name).arg(getName()) ); #endif Function* function = m_functions[name]; if(function) { #ifdef KROSS_API_EVENT_CALL_DEBUG - krossdebug( TQString("Event::call() name='%1' is a builtin function.").tqarg(name) ); + krossdebug( TQString("Event::call() name='%1' is a builtin function.").arg(name) ); #endif return function->call(arguments); } diff --git a/lib/kross/api/eventscript.cpp b/lib/kross/api/eventscript.cpp index 43c4c1cb..f9fe9f9a 100644 --- a/lib/kross/api/eventscript.cpp +++ b/lib/kross/api/eventscript.cpp @@ -40,7 +40,7 @@ const TQString EventScript::getClassName() const Object::Ptr EventScript::call(const TQString& name, KSharedPtr<List> arguments) { - krossdebug( TQString("EventScript::call() name=%1 arguments=%2").tqarg(name).tqarg(arguments->toString()) ); + krossdebug( TQString("EventScript::call() name=%1 arguments=%2").arg(name).arg(arguments->toString()) ); //TODO return 0; } diff --git a/lib/kross/api/eventsignal.cpp b/lib/kross/api/eventsignal.cpp index e3a8e54f..8f4d2c50 100644 --- a/lib/kross/api/eventsignal.cpp +++ b/lib/kross/api/eventsignal.cpp @@ -46,7 +46,7 @@ const TQString EventSignal::getClassName() const Object::Ptr EventSignal::call(const TQString& /*name*/, KSharedPtr<List> arguments) { #ifdef KROSS_API_EVENTSIGNAL_CALL_DEBUG - krossdebug( TQString("EventSignal::call() m_signal=%1 arguments=%2").tqarg(m_signal).tqarg(arguments->toString()) ); + krossdebug( TQString("EventSignal::call() m_signal=%1 arguments=%2").arg(m_signal).arg(arguments->toString()) ); #endif TQString n = m_signal; @@ -54,9 +54,9 @@ Object::Ptr EventSignal::call(const TQString& /*name*/, KSharedPtr<List> argumen if(n.startsWith("2")) // Remove prefix of SIGNAL-macros n.remove(0,1); - int signalid = m_sender->tqmetaObject()->findSignal(n.latin1(), false); + int signalid = m_sender->metaObject()->findSignal(n.latin1(), false); if(signalid < 0) - throw new Exception(TQString("No such signal '%1'.").tqarg(n)); + throw new Exception(TQString("No such signal '%1'.").arg(n)); TQUObject* uo = QtObject::toTQUObject(n, arguments); m_sender->qt_emit(signalid, uo); // emit the signal diff --git a/lib/kross/api/eventslot.cpp b/lib/kross/api/eventslot.cpp index fd566d31..3f6482db 100644 --- a/lib/kross/api/eventslot.cpp +++ b/lib/kross/api/eventslot.cpp @@ -46,7 +46,7 @@ const TQString EventSlot::getClassName() const Object::Ptr EventSlot::call(const TQString& /*name*/, List::Ptr arguments) { #ifdef KROSS_API_EVENTSLOT_CALL_DEBUG - krossdebug( TQString("EventSlot::call() m_slot=%1 arguments=%2").tqarg(m_slot).tqarg(arguments->toString()) ); + krossdebug( TQString("EventSlot::call() m_slot=%1 arguments=%2").arg(m_slot).arg(arguments->toString()) ); #endif TQString n = m_slot; //TODO name; //Variant::toString(args->item(0)); @@ -54,9 +54,9 @@ Object::Ptr EventSlot::call(const TQString& /*name*/, List::Ptr arguments) if(n.startsWith("1")) // Remove prefix of SLOT-macros n.remove(0,1); - int slotid = m_receiver->tqmetaObject()->findSlot(n.latin1(), false); + int slotid = m_receiver->metaObject()->findSlot(n.latin1(), false); if(slotid < 0) - throw Exception::Ptr( new Exception(TQString("No such slot '%1'.").tqarg(n)) ); + throw Exception::Ptr( new Exception(TQString("No such slot '%1'.").arg(n)) ); TQUObject* uo = QtObject::toTQUObject(n, arguments); m_receiver->qt_invoke(slotid, uo); // invoke the slot @@ -72,7 +72,7 @@ TQCString EventSlot::getSlot(const TQCString& signal) int startpos = signature.find("("); int endpos = signature.findRev(")"); if(startpos < 0 || startpos > endpos) { - krosswarning( TQString("EventSlot::getSlot(%1) Invalid signal.").tqarg(signal) ); + krosswarning( TQString("EventSlot::getSlot(%1) Invalid signal.").arg(signal) ); return TQCString(); } TQString signalname = signature.left(startpos); @@ -80,16 +80,16 @@ TQCString EventSlot::getSlot(const TQCString& signal) //TQStringList paramlist = TQStringList::split(",", params); TQCString slot = TQString("callback(" + params + ")").latin1(); //normalizeSignalSlot(); - TQMetaObject* mo = tqmetaObject(); + TQMetaObject* mo = metaObject(); int slotid = mo->findSlot(slot, false); if(slotid < 0) { - krossdebug( TQString("EventSlot::getSlot(%1) No such slot '%2' avaiable.").tqarg(signal).tqarg(slot) ); + krossdebug( TQString("EventSlot::getSlot(%1) No such slot '%2' avaiable.").arg(signal).arg(slot) ); return TQCString(); } const TQMetaData* md = mo->slot(slotid, false); if(md->access != TQMetaData::Public) { - krossdebug( TQString("EventSlot::getSlot(%1) The slot '%2' is not public.").tqarg(signal).tqarg(slot) ); + krossdebug( TQString("EventSlot::getSlot(%1) The slot '%2' is not public.").arg(signal).arg(slot) ); return TQCString(); } @@ -97,7 +97,7 @@ TQCString EventSlot::getSlot(const TQCString& signal) //const TQUMethod *method = md->method; krossdebug( TQString("signal=%1 slot=%2 slotid=%3 params=%4 mdname=%5") - .tqarg(signal).tqarg(slot).tqarg(slotid).tqarg(params).tqarg(md->name) ); + .arg(signal).arg(slot).arg(slotid).arg(params).arg(md->name) ); return TQCString("1" + slot); // Emulate the TQT_SLOT(...) macro by adding as first char a "1". } @@ -114,7 +114,7 @@ bool EventSlot::connect(EventManager* eventmanager, TQObject* senderobj, const T EventSlot* eventslot = create(eventmanager); eventslot->connect(eventmanager, senderobj, signal, function, slot); m_slots.append(eventslot); - krossdebug( TQString("EventSlot::connect(%1, %2, %3) added child EventSlot !!!").tqarg(senderobj->name()).tqarg(signal).tqarg(function) ); + krossdebug( TQString("EventSlot::connect(%1, %2, %3) added child EventSlot !!!").arg(senderobj->name()).arg(signal).arg(function) ); } else { m_sender = senderobj; @@ -122,10 +122,10 @@ bool EventSlot::connect(EventManager* eventmanager, TQObject* senderobj, const T m_function = function; m_slot = myslot; if(! TQObject::connect((TQObject*)senderobj, signal, this, myslot)) { - krossdebug( TQString("EventSlot::connect(%1, %2, %3) failed.").tqarg(senderobj->name()).tqarg(signal).tqarg(function) ); + krossdebug( TQString("EventSlot::connect(%1, %2, %3) failed.").arg(senderobj->name()).arg(signal).arg(function) ); return false; } - krossdebug( TQString("EventSlot::connect(%1, %2, %3) successfully connected.").tqarg(senderobj->name()).tqarg(signal).tqarg(function) ); + krossdebug( TQString("EventSlot::connect(%1, %2, %3) successfully connected.").arg(senderobj->name()).arg(signal).arg(function) ); } return true; } @@ -144,7 +144,7 @@ bool EventSlot::disconnect() void EventSlot::call(const TQVariant& variant) { krossdebug( TQString("EventSlot::call() sender='%1' signal='%2' function='%3'") - .tqarg(m_sender->name()).tqarg(m_signal).tqarg(m_function) ); + .arg(m_sender->name()).arg(m_signal).arg(m_function) ); Kross::Api::List* arglist = 0; @@ -159,7 +159,7 @@ void EventSlot::call(const TQVariant& variant) } catch(Exception& e) { //TODO add hadError(), getError() and setError() - krossdebug( TQString("EXCEPTION in EventSlot::call('%1') type='%2' description='%3'").tqarg(variant.toString()).tqarg(e.type()).tqarg(e.description()) ); + krossdebug( TQString("EXCEPTION in EventSlot::call('%1') type='%2' description='%3'").arg(variant.toString()).arg(e.type()).arg(e.description()) ); } } diff --git a/lib/kross/api/exception.cpp b/lib/kross/api/exception.cpp index c6a0198f..cb0125c4 100644 --- a/lib/kross/api/exception.cpp +++ b/lib/kross/api/exception.cpp @@ -30,7 +30,7 @@ Exception::Exception(const TQString& error, long lineno) , m_error(error) , m_lineno(lineno) { - krosswarning( TQString("Kross::Api::Exception error='%1' lineno='%3'").tqarg(m_error).tqarg(m_lineno) ); + krosswarning( TQString("Kross::Api::Exception error='%1' lineno='%3'").arg(m_error).arg(m_lineno) ); } Exception::~Exception() @@ -45,8 +45,8 @@ const TQString Exception::getClassName() const const TQString Exception::toString() { return (m_lineno != -1) - ? TQString("Exception at line %1: %2").tqarg(m_lineno).tqarg(m_error) - : TQString("Exception: %1").tqarg(m_error); + ? TQString("Exception at line %1: %2").arg(m_lineno).arg(m_error) + : TQString("Exception: %1").arg(m_error); } const TQString Exception::getError() const diff --git a/lib/kross/api/interpreter.cpp b/lib/kross/api/interpreter.cpp index 8d266930..86eae479 100644 --- a/lib/kross/api/interpreter.cpp +++ b/lib/kross/api/interpreter.cpp @@ -95,7 +95,7 @@ Interpreter* InterpreterInfo::getInterpreter() if(m_interpreter) // buffered return m_interpreter; - krossdebug( TQString("Loading the interpreter library for %1").tqarg(m_interpretername) ); + krossdebug( TQString("Loading the interpreter library for %1").arg(m_interpretername) ); // Load the krosspython library. KLibLoader *libloader = KLibLoader::self(); @@ -104,10 +104,10 @@ Interpreter* InterpreterInfo::getInterpreter() if(! library) { /* setException( - new Exception( TQString("Could not load library \"%1\" for the \"%2\" interpreter.").tqarg(m_library).tqarg(m_interpretername) ) + new Exception( TQString("Could not load library \"%1\" for the \"%2\" interpreter.").arg(m_library).arg(m_interpretername) ) ); */ - krosswarning( TQString("Could not load library \"%1\" for the \"%2\" interpreter.").tqarg(m_library).tqarg(m_interpretername) ); + krosswarning( TQString("Could not load library \"%1\" for the \"%2\" interpreter.").arg(m_library).arg(m_interpretername) ); return 0; } diff --git a/lib/kross/api/list.cpp b/lib/kross/api/list.cpp index 3d894116..9e2baf52 100644 --- a/lib/kross/api/list.cpp +++ b/lib/kross/api/list.cpp @@ -51,8 +51,8 @@ Object::Ptr List::item(uint idx, Object* defaultobject) if(idx >= list.count()) { if(defaultobject) return defaultobject; - krossdebug( TQString("List::item index=%1 is out of bounds. Raising TypeException.").tqarg(idx) ); - throw Exception::Ptr( new Exception(TQString("List-index %1 out of bounds.").tqarg(idx)) ); + krossdebug( TQString("List::item index=%1 is out of bounds. Raising TypeException.").arg(idx) ); + throw Exception::Ptr( new Exception(TQString("List-index %1 out of bounds.").arg(idx)) ); } return list[idx]; } diff --git a/lib/kross/api/module.h b/lib/kross/api/module.h index 3e58305a..f27bdf5c 100644 --- a/lib/kross/api/module.h +++ b/lib/kross/api/module.h @@ -51,7 +51,7 @@ namespace Kross { namespace Api { explicit Module(const TQString& name) : Class<Module>(name) { - krossdebug( TQString("Kross::Api::Module %1 created").tqarg(name) ); + krossdebug( TQString("Kross::Api::Module %1 created").arg(name) ); } /** @@ -59,7 +59,7 @@ namespace Kross { namespace Api { */ virtual ~Module() { - krossdebug( TQString("Kross::Api::Module %1 destroyed").tqarg(getName()) ); + krossdebug( TQString("Kross::Api::Module %1 destroyed").arg(getName()) ); } /** diff --git a/lib/kross/api/object.cpp b/lib/kross/api/object.cpp index 06ec55d5..43fa8b4b 100644 --- a/lib/kross/api/object.cpp +++ b/lib/kross/api/object.cpp @@ -30,21 +30,21 @@ Object::Object() : KShared() { #ifdef KROSS_API_OBJECT_CTOR_DEBUG - krossdebug( TQString("Kross::Api::Object::Constructor() name='%1' refcount='%2'").tqarg(m_name).tqarg(_KShared_count()) ); + krossdebug( TQString("Kross::Api::Object::Constructor() name='%1' refcount='%2'").arg(m_name).arg(_KShared_count()) ); #endif } Object::~Object() { #ifdef KROSS_API_OBJECT_DTOR_DEBUG - krossdebug( TQString("Kross::Api::Object::Destructor() name='%1' refcount='%2'").tqarg(m_name).tqarg(_KShared_count()) ); + krossdebug( TQString("Kross::Api::Object::Destructor() name='%1' refcount='%2'").arg(m_name).arg(_KShared_count()) ); #endif //removeAllChildren(); // not needed cause we use KShared to handle ref-couting and freeing. } const TQString Object::toString() { - return TQString("%1").tqarg(getClassName()); + return TQString("%1").arg(getClassName()); } Object::Ptr Object::call(const TQString& name, List::Ptr arguments) @@ -52,12 +52,12 @@ Object::Ptr Object::call(const TQString& name, List::Ptr arguments) Q_UNUSED(arguments); #ifdef KROSS_API_OBJECT_CALL_DEBUG - krossdebug( TQString("Kross::Api::Object::call(%1) name=%2 class=%3").tqarg(name).tqarg(getName()).tqarg(getClassName()) ); + krossdebug( TQString("Kross::Api::Object::call(%1) name=%2 class=%3").arg(name).arg(getName()).arg(getClassName()) ); #endif if(name.isEmpty()) // return a self-reference if no functionname is defined. return this; - throw Exception::Ptr( new Exception(TQString("No callable object named '%2'").tqarg(name)) ); + throw Exception::Ptr( new Exception(TQString("No callable object named '%2'").arg(name)) ); } diff --git a/lib/kross/api/object.h b/lib/kross/api/object.h index 87bd2132..f23a6179 100644 --- a/lib/kross/api/object.h +++ b/lib/kross/api/object.h @@ -142,7 +142,7 @@ template<class T> inline T* Object::fromObject(Object::Ptr object) { T* t = (T*) object.data(); if(! t) - throw KSharedPtr<Exception>( new Exception(TQString("Object \"%1\" invalid.").tqarg(object ? object->getClassName() : "")) ); + throw KSharedPtr<Exception>( new Exception(TQString("Object \"%1\" invalid.").arg(object ? object->getClassName() : "")) ); return t; } diff --git a/lib/kross/api/qtobject.cpp b/lib/kross/api/qtobject.cpp index 243f0503..5fc1a36a 100644 --- a/lib/kross/api/qtobject.cpp +++ b/lib/kross/api/qtobject.cpp @@ -42,13 +42,13 @@ QtObject::QtObject(TQObject* object, const TQString& name) // Walk through the signals and slots the TQObject has // and attach them as events to this QtObject. - TQStrList slotnames = m_object->tqmetaObject()->slotNames(false); + TQStrList slotnames = m_object->metaObject()->slotNames(false); for(char* c = slotnames.first(); c; c = slotnames.next()) { TQCString s = c; addChild(s, new EventSlot(s, object, s) ); } - TQStrList signalnames = m_object->tqmetaObject()->signalNames(false); + TQStrList signalnames = m_object->metaObject()->signalNames(false); for(char* c = signalnames.first(); c; c = signalnames.next()) { TQCString s = c; addChild(s, new EventSignal(s, object, s) ); @@ -93,7 +93,7 @@ TQUObject* QtObject::toTQUObject(const TQString& signature, List::Ptr arguments) int startpos = signature.find("("); int endpos = signature.findRev(")"); if(startpos < 0 || startpos > endpos) - throw Exception::Ptr( new Exception(TQString("Invalid TQt signal or slot signature '%1'").tqarg(signature)) ); + throw Exception::Ptr( new Exception(TQString("Invalid TQt signal or slot signature '%1'").arg(signature)) ); //TQString sig = signature.left(startpos); TQString params = signature.mid(startpos + 1, endpos - startpos - 1); @@ -107,19 +107,19 @@ TQUObject* QtObject::toTQUObject(const TQString& signature, List::Ptr arguments) //TQString t; //for(int j=0; j<argcount; j++) t += "'" + Variant::toString(arguments->item(j)) + "' "; -//krossdebug( TQString("1 ---------------------: (%1) %2").tqarg(argcount).tqarg(t) ); +//krossdebug( TQString("1 ---------------------: (%1) %2").arg(argcount).arg(t) ); // Fill parameters. uint argcount = arguments ? arguments->count() : 0; for(uint i = 0; i < paramcount; i++) { if(paramlist[i].find(TQSTRING_OBJECT_NAME_STRING) >= 0) { const TQString s = (argcount > i) ? Variant::toString(arguments->item(i)) : TQString(); - //krossdebug(TQString("EventSlot::toTQUObject s=%1").tqarg(s)); + //krossdebug(TQString("EventSlot::toTQUObject s=%1").arg(s)); static_TQUType_TQString.set( &(uo[i + 1]), s ); } //TODO handle int, long, char*, TQStringList, etc. else { - throw Exception::Ptr( new Exception(TQString("Unknown TQt signal or slot argument '%1' in signature '%2'.").tqarg(paramlist[i]).tqarg(signature)) ); + throw Exception::Ptr( new Exception(TQString("Unknown TQt signal or slot argument '%1' in signature '%2'.").arg(paramlist[i]).arg(signature)) ); } } @@ -129,13 +129,13 @@ TQUObject* QtObject::toTQUObject(const TQString& signature, List::Ptr arguments) Kross::Api::Object::Ptr QtObject::propertyNames(Kross::Api::List::Ptr) { return new Kross::Api::Variant( - TQStringList::fromStrList(m_object->tqmetaObject()->propertyNames(false))); + TQStringList::fromStrList(m_object->metaObject()->propertyNames(false))); } Kross::Api::Object::Ptr QtObject::hasProperty(Kross::Api::List::Ptr args) { return new Kross::Api::Variant( - m_object->tqmetaObject()->findProperty(Kross::Api::Variant::toString(args->item(0)).latin1(), false)); + m_object->metaObject()->findProperty(Kross::Api::Variant::toString(args->item(0)).latin1(), false)); } Kross::Api::Object::Ptr QtObject::getProperty(Kross::Api::List::Ptr args) @@ -158,13 +158,13 @@ Kross::Api::Object::Ptr QtObject::setProperty(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr QtObject::slotNames(Kross::Api::List::Ptr) { return new Kross::Api::Variant( - TQStringList::fromStrList(m_object->tqmetaObject()->slotNames(false))); + TQStringList::fromStrList(m_object->metaObject()->slotNames(false))); } Kross::Api::Object::Ptr QtObject::hasSlot(Kross::Api::List::Ptr args) { return new Kross::Api::Variant( - bool(m_object->tqmetaObject()->slotNames(false).find( + bool(m_object->metaObject()->slotNames(false).find( Kross::Api::Variant::toString(args->item(0)).latin1() ) != -1)); } @@ -173,9 +173,9 @@ Kross::Api::Object::Ptr QtObject::callSlot(Kross::Api::List::Ptr args) { //TODO just call the child event ?! TQString name = Kross::Api::Variant::toString(args->item(0)); - int slotid = m_object->tqmetaObject()->findSlot(name.latin1(), false); + int slotid = m_object->metaObject()->findSlot(name.latin1(), false); if(slotid < 0) - throw Exception::Ptr( new Exception(TQString("No such slot '%1'.").tqarg(name)) ); + throw Exception::Ptr( new Exception(TQString("No such slot '%1'.").arg(name)) ); TQUObject* uo = QtObject::toTQUObject(name, args); m_object->qt_invoke(slotid, uo); @@ -187,13 +187,13 @@ Kross::Api::Object::Ptr QtObject::callSlot(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr QtObject::signalNames(Kross::Api::List::Ptr) { return new Kross::Api::Variant( - TQStringList::fromStrList(m_object->tqmetaObject()->signalNames(false))); + TQStringList::fromStrList(m_object->metaObject()->signalNames(false))); } Kross::Api::Object::Ptr QtObject::hasSignal(Kross::Api::List::Ptr args) { return new Kross::Api::Variant( - bool(m_object->tqmetaObject()->signalNames(false).find( + bool(m_object->metaObject()->signalNames(false).find( Kross::Api::Variant::toString(args->item(0)).latin1() ) != -1)); } @@ -201,9 +201,9 @@ Kross::Api::Object::Ptr QtObject::hasSignal(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr QtObject::emitSignal(Kross::Api::List::Ptr args) { TQString name = Kross::Api::Variant::toString(args->item(0)); - int signalid = m_object->tqmetaObject()->findSignal(name.latin1(), false); + int signalid = m_object->metaObject()->findSignal(name.latin1(), false); if(signalid < 0) - throw Exception::Ptr( new Exception(TQString("No such signal '%1'.").tqarg(name)) ); + throw Exception::Ptr( new Exception(TQString("No such signal '%1'.").arg(name)) ); m_object->qt_invoke(signalid, 0); //TODO convert Kross::Api::List::Ptr => TQUObject* return 0; } @@ -211,16 +211,16 @@ Kross::Api::Object::Ptr QtObject::emitSignal(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr QtObject::connectSignal(Kross::Api::List::Ptr args) { TQString signalname = Kross::Api::Variant::toString(args->item(0)); - TQString signalsignatur = TQString("2%1").tqarg(signalname); + TQString signalsignatur = TQString("2%1").arg(signalname); const char* signalsig = signalsignatur.latin1(); QtObject* obj = Kross::Api::Object::fromObject<Kross::Api::QtObject>(args->item(1)); TQObject* o = obj->getObject(); if(! o) - throw Exception::Ptr( new Exception(TQString("No such TQObject receiver in '%1'.").tqarg(obj->getName())) ); + throw Exception::Ptr( new Exception(TQString("No such TQObject receiver in '%1'.").arg(obj->getName())) ); TQString slotname = Kross::Api::Variant::toString(args->item(2)); - TQString slotsignatur = TQString("1%1").tqarg(slotname); + TQString slotsignatur = TQString("1%1").arg(slotname); const char* slotsig = slotsignatur.latin1(); return new Kross::Api::Variant( diff --git a/lib/kross/api/variant.cpp b/lib/kross/api/variant.cpp index e8d8bc1b..54e8ed7e 100644 --- a/lib/kross/api/variant.cpp +++ b/lib/kross/api/variant.cpp @@ -81,7 +81,7 @@ const TQString Variant::toString(Object::Ptr object) { const TQVariant& variant = toVariant(object); if(! variant.canCast(TQVariant::String)) - throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::String expected, but got %1.").tqarg(variant.typeName()).latin1()) ); + throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::String expected, but got %1.").arg(variant.typeName()).latin1()) ); return variant.toString(); } @@ -89,7 +89,7 @@ int Variant::toInt(Object::Ptr object) { const TQVariant& variant = toVariant(object); if(! variant.canCast(TQVariant::Int)) - throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::Int expected, but got %1.").tqarg(variant.typeName()).latin1()) ); + throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::Int expected, but got %1.").arg(variant.typeName()).latin1()) ); return variant.toInt(); } @@ -97,7 +97,7 @@ uint Variant::toUInt(Object::Ptr object) { const TQVariant& variant = toVariant(object); if(! variant.canCast(TQVariant::UInt)) - throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::UInt expected, but got %1.").tqarg(variant.typeName()).latin1()) ); + throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::UInt expected, but got %1.").arg(variant.typeName()).latin1()) ); return variant.toUInt(); } @@ -105,7 +105,7 @@ double Variant::toDouble(Object::Ptr object) { const TQVariant& variant = toVariant(object); if(! variant.canCast(TQVariant::Double)) - throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::Double expected, but got %1.").tqarg(variant.typeName()).latin1()) ); + throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::Double expected, but got %1.").arg(variant.typeName()).latin1()) ); return variant.toDouble(); } @@ -113,7 +113,7 @@ TQ_LLONG Variant::toLLONG(Object::Ptr object) { const TQVariant& variant = toVariant(object); if(! variant.canCast(TQVariant::LongLong)) - throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::LLONG expected, but got %1.").tqarg(variant.typeName()).latin1()) ); + throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::LLONG expected, but got %1.").arg(variant.typeName()).latin1()) ); return variant.toLongLong(); } @@ -121,7 +121,7 @@ TQ_ULLONG Variant::toULLONG(Object::Ptr object) { const TQVariant& variant = toVariant(object); if(! variant.canCast(TQVariant::ULongLong)) - throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::ULLONG expected, but got %1.").tqarg(variant.typeName()).latin1()) ); + throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::ULLONG expected, but got %1.").arg(variant.typeName()).latin1()) ); return variant.toULongLong(); } @@ -129,7 +129,7 @@ bool Variant::toBool(Object::Ptr object) { const TQVariant& variant = toVariant(object); if(! variant.canCast(TQVariant::Bool)) - throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::Bool expected, but got %1.").tqarg(variant.typeName()).latin1()) ); + throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::Bool expected, but got %1.").arg(variant.typeName()).latin1()) ); return variant.toBool(); } @@ -146,7 +146,7 @@ TQStringList Variant::toStringList(Object::Ptr object) } const TQVariant& variant = toVariant(object); if(! variant.canCast(TQVariant::StringList)) - throw Exception::Ptr( new Exception(TQString("Kross::Api::Variant::StringList expected, but got '%1'.").tqarg(variant.typeName()).latin1()) ); + throw Exception::Ptr( new Exception(TQString("Kross::Api::Variant::StringList expected, but got '%1'.").arg(variant.typeName()).latin1()) ); return variant.toStringList(); } @@ -163,6 +163,6 @@ TQValueList<TQVariant> Variant::toList(Object::Ptr object) } const TQVariant& variant = toVariant(object); if(! variant.canCast(TQVariant::List)) - throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::List expected, but got '%1'.").tqarg(variant.typeName()).latin1()) ); + throw Exception::Ptr( new Exception(i18n("Kross::Api::Variant::List expected, but got '%1'.").arg(variant.typeName()).latin1()) ); return variant.toList(); } diff --git a/lib/kross/main/mainmodule.cpp b/lib/kross/main/mainmodule.cpp index dde74502..8c29180f 100644 --- a/lib/kross/main/mainmodule.cpp +++ b/lib/kross/main/mainmodule.cpp @@ -79,7 +79,7 @@ EventSignal::Ptr MainModule::addSignal(const TQString& name, TQObject* sender, T { EventSignal* event = new EventSignal(name, sender, signal); if(! addChild(name, event)) { - krosswarning( TQString("Failed to add signal name='%1' signature='%2'").tqarg(name).tqarg(signal.data()) ); + krosswarning( TQString("Failed to add signal name='%1' signature='%2'").arg(name).arg(signal.data()) ); return 0; } return event; @@ -89,7 +89,7 @@ EventSlot::Ptr MainModule::addSlot(const TQString& name, TQObject* receiver, TQC { EventSlot* event = new EventSlot(name, receiver, slot); if(! addChild(name, event)) { - krosswarning( TQString("Failed to add slot name='%1' signature='%2'").tqarg(name).tqarg(slot.data()) ); + krosswarning( TQString("Failed to add slot name='%1' signature='%2'").arg(name).arg(slot.data()) ); return 0; } return event; @@ -99,7 +99,7 @@ QtObject::Ptr MainModule::addTQObject(TQObject* object, const TQString& name) { QtObject* qtobject = new QtObject(object, name); if(! addChild(name, qtobject)) { - krosswarning( TQString("Failed to add TQObject name='%1'").tqarg(object->name()) ); + krosswarning( TQString("Failed to add TQObject name='%1'").arg(object->name()) ); return 0; } return qtobject; @@ -109,7 +109,7 @@ EventAction::Ptr MainModule::addKAction(KAction* action, const TQString& name) { EventAction* event = new EventAction(name, action); if(! addChild(name, event)) { - krosswarning( TQString("Failed to add KAction name='%1'").tqarg(action->name()) ); + krosswarning( TQString("Failed to add KAction name='%1'").arg(action->name()) ); return 0; } return event; diff --git a/lib/kross/main/manager.cpp b/lib/kross/main/manager.cpp index 646a8746..156eb2ac 100644 --- a/lib/kross/main/manager.cpp +++ b/lib/kross/main/manager.cpp @@ -169,7 +169,7 @@ Interpreter* Manager::getInterpreter(const TQString& interpretername) setException(0); // clear previous exceptions if(! d->interpreterinfos.contains(interpretername)) { - setException( new Exception(i18n("No such interpreter '%1'").tqarg(interpretername)) ); + setException( new Exception(i18n("No such interpreter '%1'").arg(interpretername)) ); return 0; } @@ -206,22 +206,22 @@ Module::Ptr Manager::loadModule(const TQString& modulename) if(module) return module; else - krossdebug( TQString("Manager::loadModule(%1) =======> Modulename registered, but module is invalid!").tqarg(modulename) ); + krossdebug( TQString("Manager::loadModule(%1) =======> Modulename registered, but module is invalid!").arg(modulename) ); } KLibLoader* loader = KLibLoader::self(); KLibrary* lib = loader->globalLibrary( modulename.latin1() ); if(! lib) { - krosswarning( TQString("Failed to load module '%1': %2").tqarg(modulename).tqarg(loader->lastErrorMessage()) ); + krosswarning( TQString("Failed to load module '%1': %2").arg(modulename).arg(loader->lastErrorMessage()) ); return 0; } - krossdebug( TQString("Successfully loaded module '%1'").tqarg(modulename) ); + krossdebug( TQString("Successfully loaded module '%1'").arg(modulename) ); def_module_func func; func = (def_module_func) lib->symbol("init_module"); if(! func) { - krosswarning( TQString("Failed to determinate init function in module '%1'").tqarg(modulename) ); + krosswarning( TQString("Failed to determinate init function in module '%1'").arg(modulename) ); return 0; } @@ -235,14 +235,14 @@ Module::Ptr Manager::loadModule(const TQString& modulename) lib->unload(); if(! module) { - krosswarning( TQString("Failed to load module '%1'").tqarg(modulename) ); + krosswarning( TQString("Failed to load module '%1'").arg(modulename) ); return 0; } // Don't remember module cause we like to have freeing it handled by the caller. //d->modules.replace(modulename, module); - //krossdebug( TQString("Kross::Api::Manager::loadModule modulename='%1' module='%2'").tqarg(modulename).tqarg(module->toString()) ); + //krossdebug( TQString("Kross::Api::Manager::loadModule modulename='%1' module='%2'").arg(modulename).arg(module->toString()) ); return module; } diff --git a/lib/kross/main/scriptaction.cpp b/lib/kross/main/scriptaction.cpp index b658a0b1..c98cc97c 100644 --- a/lib/kross/main/scriptaction.cpp +++ b/lib/kross/main/scriptaction.cpp @@ -20,7 +20,7 @@ #include "scriptaction.h" #include "manager.h" -#include <tqstylesheet.h> +#include <stylesheet.h> #include <tqdir.h> #include <tqfile.h> #include <tqfileinfo.h> @@ -152,9 +152,9 @@ ScriptAction::ScriptAction(const TQString& scriptconfigfile, const TQDomElement& if(icon.isNull()) icon = KMimeType::iconForURL( KURL(file) ); if(description.isEmpty()) - description = TQString("%1<br>%2").tqarg(text.isEmpty() ? name : text).tqarg(file); + description = TQString("%1<br>%2").arg(text.isEmpty() ? name : text).arg(file); else - description += TQString("<br>%1").tqarg(file); + description += TQString("<br>%1").arg(file); ScriptContainer::setName(file); } @@ -230,8 +230,8 @@ void ScriptAction::activate() TQString errormessage = Kross::Api::ScriptContainer::getException()->getError(); TQString tracedetails = Kross::Api::ScriptContainer::getException()->getTrace(); d->logs << TQString("<b>%1</b><br>%2") - .tqarg( TQStyleSheet::escape(errormessage) ) - .tqarg( TQStyleSheet::escape(tracedetails) ); + .arg( TQStyleSheet::escape(errormessage) ) + .arg( TQStyleSheet::escape(tracedetails) ); emit failed(errormessage, tracedetails); } else { diff --git a/lib/kross/main/scriptcontainer.cpp b/lib/kross/main/scriptcontainer.cpp index a345dd02..7f7f980e 100644 --- a/lib/kross/main/scriptcontainer.cpp +++ b/lib/kross/main/scriptcontainer.cpp @@ -87,7 +87,7 @@ ScriptContainer::ScriptContainer(const TQString& name) : MainModule(name) , d( new ScriptContainerPrivate() ) // initialize d-pointer class { - //krossdebug( TQString("ScriptContainer::ScriptContainer() Ctor name='%1'").tqarg(name) ); + //krossdebug( TQString("ScriptContainer::ScriptContainer() Ctor name='%1'").arg(name) ); d->script = 0; d->name = name; @@ -95,7 +95,7 @@ ScriptContainer::ScriptContainer(const TQString& name) ScriptContainer::~ScriptContainer() { - //krossdebug( TQString("ScriptContainer::~ScriptContainer() Dtor name='%1'").tqarg(d->name) ); + //krossdebug( TQString("ScriptContainer::~ScriptContainer() Dtor name='%1'").arg(d->name) ); finalize(); delete d; @@ -164,8 +164,8 @@ bool ScriptContainer::setOption(const TQString name, const TQVariant& value) if(info->hasOption(name)) { d->options.replace(name, value); return true; - } else krosswarning( TQString("Kross::Api::ScriptContainer::setOption(%1, %2): No such option").tqarg(name).tqarg(value.toString()) ); - } else krosswarning( TQString("Kross::Api::ScriptContainer::setOption(%1, %2): No such interpreterinfo").tqarg(name).tqarg(value.toString()) ); + } else krosswarning( TQString("Kross::Api::ScriptContainer::setOption(%1, %2): No such option").arg(name).arg(value.toString()) ); + } else krosswarning( TQString("Kross::Api::ScriptContainer::setOption(%1, %2): No such interpreterinfo").arg(name).arg(value.toString()) ); return false; } @@ -244,19 +244,19 @@ bool ScriptContainer::initialize() finalize(); if(! d->scriptfile.isNull()) { - krossdebug( TQString("Kross::Api::ScriptContainer::initialize() file=%1").tqarg(d->scriptfile) ); + krossdebug( TQString("Kross::Api::ScriptContainer::initialize() file=%1").arg(d->scriptfile) ); if(d->interpretername.isNull()) { d->interpretername = Manager::scriptManager()->getInterpreternameForFile( d->scriptfile ); if(d->interpretername.isNull()) { - setException( new Exception(i18n("Failed to determinate interpreter for scriptfile '%1'").tqarg(d->scriptfile)) ); + setException( new Exception(i18n("Failed to determinate interpreter for scriptfile '%1'").arg(d->scriptfile)) ); return false; } } TQFile f( d->scriptfile ); if(! f.open(IO_ReadOnly)) { - setException( new Exception(i18n("Failed to open scriptfile '%1'").tqarg(d->scriptfile)) ); + setException( new Exception(i18n("Failed to open scriptfile '%1'").arg(d->scriptfile)) ); return false; } d->code = TQString( f.readAll() ); @@ -265,13 +265,13 @@ bool ScriptContainer::initialize() Interpreter* interpreter = Manager::scriptManager()->getInterpreter(d->interpretername); if(! interpreter) { - setException( new Exception(i18n("Unknown interpreter '%1'").tqarg(d->interpretername)) ); + setException( new Exception(i18n("Unknown interpreter '%1'").arg(d->interpretername)) ); return false; } d->script = interpreter->createScript(this); if(! d->script) { - setException( new Exception(i18n("Failed to create script for interpreter '%1'").tqarg(d->interpretername)) ); + setException( new Exception(i18n("Failed to create script for interpreter '%1'").arg(d->interpretername)) ); return false; } if(d->script->hadException()) { diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp index b3b29bda..88877f5a 100644 --- a/lib/kross/main/scriptguiclient.cpp +++ b/lib/kross/main/scriptguiclient.cpp @@ -147,10 +147,10 @@ void ScriptGUIClient::reloadInstalledScripts() bool ScriptGUIClient::installScriptPackage(const TQString& scriptpackagefile) { - krossdebug( TQString("Install script package: %1").tqarg(scriptpackagefile) ); + krossdebug( TQString("Install script package: %1").arg(scriptpackagefile) ); KTar archive( scriptpackagefile ); if(! archive.open(IO_ReadOnly)) { - KMessageBox::sorry(0, i18n("Could not read the package \"%1\".").tqarg(scriptpackagefile)); + KMessageBox::sorry(0, i18n("Could not read the package \"%1\".").arg(scriptpackagefile)); return false; } @@ -167,17 +167,17 @@ bool ScriptGUIClient::installScriptPackage(const TQString& scriptpackagefile) if( TQDir(destination).exists() ) { if( KMessageBox::warningContinueCancel(0, - i18n("A script package with the name \"%1\" already exists. Replace this package?" ).tqarg(packagename), + i18n("A script package with the name \"%1\" already exists. Replace this package?" ).arg(packagename), i18n("Replace")) != KMessageBox::Continue ) return false; if(! KIO::NetAccess::del(destination, 0) ) { - KMessageBox::sorry(0, i18n("Could not uninstall this script package. You may not have sufficient permissions to delete the folder \"%1\".").tqarg(destination)); + KMessageBox::sorry(0, i18n("Could not uninstall this script package. You may not have sufficient permissions to delete the folder \"%1\".").arg(destination)); return false; } } - krossdebug( TQString("Copy script-package to destination directory: %1").tqarg(destination) ); + krossdebug( TQString("Copy script-package to destination directory: %1").arg(destination) ); const KArchiveDirectory* archivedir = archive.directory(); archivedir->copyTo(destination, true); @@ -188,7 +188,7 @@ bool ScriptGUIClient::installScriptPackage(const TQString& scriptpackagefile) bool ScriptGUIClient::uninstallScriptPackage(const TQString& scriptpackagepath) { if(! KIO::NetAccess::del(scriptpackagepath, 0) ) { - KMessageBox::sorry(0, i18n("Could not uninstall this script package. You may not have sufficient permissions to delete the folder \"%1\".").tqarg(scriptpackagepath)); + KMessageBox::sorry(0, i18n("Could not uninstall this script package. You may not have sufficient permissions to delete the folder \"%1\".").arg(scriptpackagepath)); return false; } reloadInstalledScripts(); @@ -197,18 +197,18 @@ bool ScriptGUIClient::uninstallScriptPackage(const TQString& scriptpackagepath) bool ScriptGUIClient::loadScriptConfigFile(const TQString& scriptconfigfile) { - krossdebug( TQString("ScriptGUIClient::loadScriptConfig file=%1").tqarg(scriptconfigfile) ); + krossdebug( TQString("ScriptGUIClient::loadScriptConfig file=%1").arg(scriptconfigfile) ); TQDomDocument domdoc; TQFile file(scriptconfigfile); if(! file.open(IO_ReadOnly)) { - krosswarning( TQString("ScriptGUIClient::loadScriptConfig(): Failed to read scriptconfigfile: %1").tqarg(scriptconfigfile) ); + krosswarning( TQString("ScriptGUIClient::loadScriptConfig(): Failed to read scriptconfigfile: %1").arg(scriptconfigfile) ); return false; } bool ok = domdoc.setContent(&file); file.close(); if(! ok) { - krosswarning( TQString("ScriptGUIClient::loadScriptConfig(): Failed to parse scriptconfigfile: %1").tqarg(scriptconfigfile) ); + krosswarning( TQString("ScriptGUIClient::loadScriptConfig(): Failed to parse scriptconfigfile: %1").arg(scriptconfigfile) ); return false; } @@ -244,7 +244,7 @@ bool ScriptGUIClient::loadScriptConfigDocument(const TQString& scriptconfigfile, else { // else just print a warning and fall through (so, install the action // and don't care any longer of the duplicated name)... - krosswarning( TQString("Kross::Api::ScriptGUIClient::loadScriptConfigDocument: There exists already a scriptaction with name \"%1\". Added anyway...").tqarg(action->name()) ); + krosswarning( TQString("Kross::Api::ScriptGUIClient::loadScriptConfigDocument: There exists already a scriptaction with name \"%1\". Added anyway...").arg(action->name()) ); } } installedcollection->attach( action ); @@ -353,7 +353,7 @@ bool ScriptGUIClient::executeScriptFile() bool ScriptGUIClient::executeScriptFile(const TQString& file) { - krossdebug( TQString("Kross::Api::ScriptGUIClient::executeScriptFile() file='%1'").tqarg(file) ); + krossdebug( TQString("Kross::Api::ScriptGUIClient::executeScriptFile() file='%1'").arg(file) ); ScriptAction::Ptr action = new ScriptAction(file); return executeScriptAction(action); @@ -377,7 +377,7 @@ void ScriptGUIClient::showScriptManager() KDialogBase* dialog = new KDialogBase(d->parent, "", true, i18n("Scripts Manager"), KDialogBase::Close); WdgScriptsManager* wsm = new WdgScriptsManager(this, dialog); dialog->setMainWidget(wsm); - dialog->resize( TQSize(360, 320).expandedTo(dialog->tqminimumSizeHint()) ); + dialog->resize( TQSize(360, 320).expandedTo(dialog->minimumSizeHint()) ); dialog->show(); } diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp index 488b7409..e521023e 100644 --- a/lib/kross/main/wdgscriptsmanager.cpp +++ b/lib/kross/main/wdgscriptsmanager.cpp @@ -93,9 +93,9 @@ class ToolTip : public TQToolTip virtual void maybeTip(const TQPoint& p) { ListItem* item = dynamic_cast<ListItem*>( m_parent->itemAt(p) ); if(item) { - TQRect r( m_parent->tqitemRect(item) ); + TQRect r( m_parent->itemRect(item) ); if(r.isValid() && item->action()) { - tip(r, TQString("<qt>%1</qt>").tqarg(item->action()->toolTip())); + tip(r, TQString("<qt>%1</qt>").arg(item->action()->toolTip())); } } } @@ -287,7 +287,7 @@ void WdgScriptsManager::slotUninstallScript() if( KMessageBox::warningContinueCancel(0, i18n("Uninstall the script package \"%1\" and delete the package's folder \"%2\"?") - .tqarg(item->action()->text()).tqarg(packagepath), + .arg(item->action()->text()).arg(packagepath), i18n("Uninstall")) != KMessageBox::Continue ) { return; @@ -321,7 +321,7 @@ void WdgScriptsManager::slotGetNewScript() { #ifdef KROSS_SUPPORT_NEWSTUFF const TQString appname = KApplication::kApplication()->name(); - const TQString type = TQString("%1/script").tqarg(appname); + const TQString type = TQString("%1/script").arg(appname); if(! d->newstuff) { d->newstuff = new ScriptNewStuff(d->m_scripguiclient, type); @@ -336,7 +336,7 @@ void WdgScriptsManager::slotGetNewScript() TQObject::connect(p, TQT_SIGNAL(providersLoaded(Provider::List*)), d, TQT_SLOT(slotProviders(Provider::List*))); - p->load(type, TQString("http://download.kde.org/khotnewstuff/%1scripts-providers.xml").tqarg(appname)); + p->load(type, TQString("http://download.kde.org/khotnewstuff/%1scripts-providers.xml").arg(appname)); d->exec(); #endif } diff --git a/lib/kross/main/wdgscriptsmanagerbase.ui b/lib/kross/main/wdgscriptsmanagerbase.ui index 379fb2db..1140e848 100644 --- a/lib/kross/main/wdgscriptsmanagerbase.ui +++ b/lib/kross/main/wdgscriptsmanagerbase.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -56,7 +56,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -66,7 +66,7 @@ <property name="name"> <cstring>btnExec</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -97,7 +97,7 @@ <property name="name"> <cstring>btnLoad</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -114,7 +114,7 @@ <property name="name"> <cstring>btnUnload</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -145,7 +145,7 @@ <property name="name"> <cstring>btnInstall</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -162,7 +162,7 @@ <property name="name"> <cstring>btnUninstall</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -193,7 +193,7 @@ <property name="name"> <cstring>btnNewStuff</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> diff --git a/lib/kross/python/cxx/Objects.hxx b/lib/kross/python/cxx/Objects.hxx index 900a347b..41648320 100644 --- a/lib/kross/python/cxx/Objects.hxx +++ b/lib/kross/python/cxx/Objects.hxx @@ -54,7 +54,7 @@ namespace Py // The purpose of this class is to serve as the most general kind of // Python object, for the purpose of writing C++ extensions in Python // Objects hold a PyObject* which they own. This pointer is always a - // valid pointer to a Python object. In tqchildren we must maintain this behavior. + // valid pointer to a Python object. In children we must maintain this behavior. // // Instructions on how to make your own class MyType descended from Object: // (0) Pick a base class, either Object or perhaps SeqBase<T> or MapBase<T>. @@ -1470,8 +1470,8 @@ namespace Py // Python strings return strings as individual elements. // I'll try having a class Char which is a String of length 1 // - typedef std::basic_string<Py_UNICODE> tqunicodestring; - extern Py_UNICODE tqunicode_null_string[1]; + typedef std::basic_string<Py_UNICODE> unicodestring; + extern Py_UNICODE unicode_null_string[1]; class Char: public Object { @@ -1535,7 +1535,7 @@ namespace Py return *this; } - Char& operator= (const tqunicodestring& v) + Char& operator= (const unicodestring& v) { set(PyUnicode_FromUnicode (const_cast<Py_UNICODE*>(v.data()),1), true); return *this; @@ -1650,7 +1650,7 @@ namespace Py static_cast<int>( v.length() ) ), true ); return *this; } - String& operator= (const tqunicodestring& v) + String& operator= (const unicodestring& v) { set( PyUnicode_FromUnicode( const_cast<Py_UNICODE*>( v.data() ), static_cast<int>( v.length() ) ), true ); @@ -1706,16 +1706,16 @@ namespace Py } } - tqunicodestring as_tqunicodestring() const + unicodestring as_unicodestring() const { if( isUnicode() ) { - return tqunicodestring( PyUnicode_AS_UNICODE( ptr() ), + return unicodestring( PyUnicode_AS_UNICODE( ptr() ), static_cast<size_type>( PyUnicode_GET_SIZE( ptr() ) ) ); } else { - throw TypeError("can only return tqunicodestring from Unicode object"); + throw TypeError("can only return unicodestring from Unicode object"); } } }; diff --git a/lib/kross/python/cxx/PyCXX.html b/lib/kross/python/cxx/PyCXX.html index 7213ad70..46d065bb 100644 --- a/lib/kross/python/cxx/PyCXX.html +++ b/lib/kross/python/cxx/PyCXX.html @@ -62,7 +62,7 @@ integrates Python with C++ in these ways: </p> <p>Download PyCXX from <a href="http://sourceforge.net/projects/cxx/">http://sourceforge.net/projects/cxx/</a>.</p> -<p>The distribution tqlayout is:</p> +<p>The distribution layout is:</p> <table> <tr><th>Directory</th><th>Description</th></tr> <tr><td class=code>.</td><td>Makefile for Unix and Windows, Release documentation</td> @@ -303,7 +303,7 @@ returned by such a function, you need to know if the function returns you an <i> or <i>unowned</i> reference. Unowned references are unusual but there are some cases where unowned references are returned.</p> -<p>Usually, <cite>Object</cite> and its tqchildren acquire a new reference when constructed from a +<p>Usually, <cite>Object</cite> and its children acquire a new reference when constructed from a <cite>PyObject *</cite>. This is usually not the right behavior if the reference comes from one of the Python C API calls.</p> @@ -1188,8 +1188,8 @@ sequence.</p> <td class=code>as_std_string() const</td> </tr> <tr> - <td class=code>tqunicodestring</td> - <td class=code>as_tqunicodestring() const</td> + <td class=code>unicodestring</td> + <td class=code>as_unicodestring() const</td> </tr> </table> @@ -1571,7 +1571,7 @@ converted to a standard string which is passed to std::ostream& operator< <p>The Python exception facility and the C++ exception facility can be merged via the use of try/catch blocks in the bodies of extension objects and module functions.</p> -<h3>Class Exception and its tqchildren</h3> +<h3>Class Exception and its children</h3> <p>A set of classes is provided. Each is derived from class Exception, and represents a particular sort of Python exception, such as IndexError, RuntimeError, ValueError. Each of @@ -1612,7 +1612,7 @@ classes are shown here.</p> </tr> <tr> <td class=code></td> - <td>Constructors for other tqchildren of class Exception</td> + <td>Constructors for other children of class Exception</td> </tr> <tr> <td class=code> </td> diff --git a/lib/kross/python/cxx/cxxsupport.cxx b/lib/kross/python/cxx/cxxsupport.cxx index b7bcaa0a..61329b60 100644 --- a/lib/kross/python/cxx/cxxsupport.cxx +++ b/lib/kross/python/cxx/cxxsupport.cxx @@ -6,7 +6,7 @@ #include "Objects.hxx" namespace Py { -Py_UNICODE tqunicode_null_string[1] = { 0 }; +Py_UNICODE unicode_null_string[1] = { 0 }; Type Object::type () const { diff --git a/lib/kross/python/pythonextension.cpp b/lib/kross/python/pythonextension.cpp index f13cf93a..dbbe9bf6 100644 --- a/lib/kross/python/pythonextension.cpp +++ b/lib/kross/python/pythonextension.cpp @@ -31,7 +31,7 @@ PythonExtension::PythonExtension(Kross::Api::Object::Ptr object) , m_object(object) { #ifdef KROSS_PYTHON_EXTENSION_CTOR_DEBUG - krossdebug( TQString("Kross::Python::PythonExtension::Constructor objectname='%1' objectclass='%2'").tqarg(m_object->getName()).tqarg(m_object->getClassName()) ); + krossdebug( TQString("Kross::Python::PythonExtension::Constructor objectname='%1' objectclass='%2'").arg(m_object->getName()).arg(m_object->getClassName()) ); #endif behaviors().name("KrossPythonExtension"); @@ -55,7 +55,7 @@ PythonExtension::PythonExtension(Kross::Api::Object::Ptr object) PythonExtension::~PythonExtension() { #ifdef KROSS_PYTHON_EXTENSION_DTOR_DEBUG - krossdebug( TQString("Kross::Python::PythonExtension::Destructor objectname='%1' objectclass='%2'").tqarg(m_object->getName()).tqarg(m_object->getClassName()) ); + krossdebug( TQString("Kross::Python::PythonExtension::Destructor objectname='%1' objectclass='%2'").arg(m_object->getName()).arg(m_object->getClassName()) ); #endif delete m_proxymethod; } @@ -77,7 +77,7 @@ Py::Object PythonExtension::repr() Py::Object PythonExtension::getattr(const char* n) { #ifdef KROSS_PYTHON_EXTENSION_GETATTR_DEBUG - krossdebug( TQString("Kross::Python::PythonExtension::getattr name='%1'").tqarg(n) ); + krossdebug( TQString("Kross::Python::PythonExtension::getattr name='%1'").arg(n) ); #endif if(n[0] == '_') { @@ -86,7 +86,7 @@ Py::Object PythonExtension::getattr(const char* n) TQStringList calls = m_object->getCalls(); for(TQStringList::Iterator it = calls.begin(); it != calls.end(); ++it) { #ifdef KROSS_PYTHON_EXTENSION_GETATTR_DEBUG - krossdebug( TQString("Kross::Python::PythonExtension::getattr name='%1' callable='%2'").tqarg(n).tqarg(*it) ); + krossdebug( TQString("Kross::Python::PythonExtension::getattr name='%1' callable='%2'").arg(n).arg(*it) ); #endif methods.append(Py::String( (*it).latin1() )); } @@ -97,11 +97,11 @@ Py::Object PythonExtension::getattr(const char* n) Py::List members; Kross::Api::Callable* callable = dynamic_cast<Kross::Api::Callable*>(m_object.data()); if(callable) { - TQMap<TQString, Kross::Api::Object::Ptr> tqchildren = callable->getChildren(); - TQMap<TQString, Kross::Api::Object::Ptr>::Iterator it( tqchildren.begin() ); - for(; it != tqchildren.end(); ++it) { + TQMap<TQString, Kross::Api::Object::Ptr> children = callable->getChildren(); + TQMap<TQString, Kross::Api::Object::Ptr>::Iterator it( children.begin() ); + for(; it != children.end(); ++it) { #ifdef KROSS_PYTHON_EXTENSION_GETATTR_DEBUG - krossdebug( TQString("Kross::Python::PythonExtension::getattr n='%1' child='%2'").tqarg(n).tqarg(it.key()) ); + krossdebug( TQString("Kross::Python::PythonExtension::getattr n='%1' child='%2'").arg(n).arg(it.key()) ); #endif members.append(Py::String( it.key().latin1() )); } @@ -109,11 +109,11 @@ Py::Object PythonExtension::getattr(const char* n) return members; } - //if(n == "__dict__") { krosswarning( TQString("PythonExtension::getattr(%1) __dict__").tqarg(n) ); return Py::None(); } - //if(n == "__class__") { krosswarning( TQString("PythonExtension::getattr(%1) __class__").tqarg(n) ); return Py::None(); } + //if(n == "__dict__") { krosswarning( TQString("PythonExtension::getattr(%1) __dict__").arg(n) ); return Py::None(); } + //if(n == "__class__") { krosswarning( TQString("PythonExtension::getattr(%1) __class__").arg(n) ); return Py::None(); } #ifdef KROSS_PYTHON_EXTENSION_GETATTR_DEBUG - krossdebug( TQString("Kross::Python::PythonExtension::getattr name='%1' is a internal name.").tqarg(n) ); + krossdebug( TQString("Kross::Python::PythonExtension::getattr name='%1' is a internal name.").arg(n) ); #endif return Py::PythonExtension<PythonExtension>::getattr_methods(n); } @@ -130,7 +130,7 @@ Py::Object PythonExtension::getattr(const char* n) Py::Object PythonExtension::getattr_methods(const char* n) { #ifdef KROSS_PYTHON_EXTENSION_GETATTRMETHOD_DEBUG - krossdebug( TQString("PythonExtension::getattr_methods name=%1").tqarg(n) ); + krossdebug( TQString("PythonExtension::getattr_methods name=%1").arg(n) ); #endif return Py::PythonExtension<PythonExtension>::getattr_methods(n); } @@ -138,7 +138,7 @@ Py::Object PythonExtension::getattr_methods(const char* n) int PythonExtension::setattr(const char* name, const Py::Object& value) { #ifdef KROSS_PYTHON_EXTENSION_SETATTR_DEBUG - krossdebug( TQString("PythonExtension::setattr name=%1 value=%2").tqarg(name).tqarg(value.as_string().c_str()) ); + krossdebug( TQString("PythonExtension::setattr name=%1 value=%2").arg(name).arg(value.as_string().c_str()) ); #endif return Py::PythonExtension<PythonExtension>::setattr(name, value); } @@ -185,13 +185,13 @@ Kross::Api::Dict::Ptr PythonExtension::toObject(const Py::Dict& dict) Kross::Api::Object::Ptr PythonExtension::toObject(const Py::Object& object) { #ifdef KROSS_PYTHON_EXTENSION_TOOBJECT_DEBUG - krossdebug( TQString("Kross::Python::PythonExtension::toObject(Py::Object) object='%1'").tqarg(object.as_string().c_str()) ); + krossdebug( TQString("Kross::Python::PythonExtension::toObject(Py::Object) object='%1'").arg(object.as_string().c_str()) ); #endif if(object == Py::None()) return 0; PyTypeObject *type = (PyTypeObject*) object.type().ptr(); #ifdef KROSS_PYTHON_EXTENSION_TOOBJECT_DEBUG - krossdebug( TQString("Kross::Python::PythonExtension::toObject(Py::Object) type='%1'").tqarg(type->tp_name) ); + krossdebug( TQString("Kross::Python::PythonExtension::toObject(Py::Object) type='%1'").arg(type->tp_name) ); #endif if(type == &PyInt_Type) return new Kross::Api::Variant(int(Py::Int(object))); @@ -206,7 +206,7 @@ Kross::Api::Object::Ptr PythonExtension::toObject(const Py::Object& object) #ifdef Py_USING_UNICODE /* TODO if(type == &PyUnicode_Type) { - Py::tqunicodestring u = Py::String(object).as_tqunicodestring(); + Py::unicodestring u = Py::String(object).as_unicodestring(); std::string s; std::copy(u.begin(), u.end(), std::back_inserter(s)); return new Kross::Api::Variant(s.c_str()); @@ -287,7 +287,7 @@ const Py::List PythonExtension::toPyObject(const TQValueList<TQVariant>& list) const Py::Object PythonExtension::toPyObject(const TQVariant& variant) { #ifdef KROSS_PYTHON_EXTENSION_TOPYOBJECT_DEBUG - krossdebug( TQString("Kross::Python::PythonExtension::toPyObject(TQVariant) typename='%1'").tqarg(variant.typeName()) ); + krossdebug( TQString("Kross::Python::PythonExtension::toPyObject(TQVariant) typename='%1'").arg(variant.typeName()) ); #endif switch(variant.type()) { @@ -331,7 +331,7 @@ const Py::Object PythonExtension::toPyObject(const TQVariant& variant) } break; default: { - krosswarning( TQString("Kross::Python::PythonExtension::toPyObject(TQVariant) Not possible to convert the TQVariant type '%1' to a Py::Object.").tqarg(variant.typeName()) ); + krosswarning( TQString("Kross::Python::PythonExtension::toPyObject(TQVariant) Not possible to convert the TQVariant type '%1' to a Py::Object.").arg(variant.typeName()) ); return Py::None(); } } @@ -350,7 +350,7 @@ const Py::Object PythonExtension::toPyObject(Kross::Api::Object::Ptr object) if(classname == "Kross::Api::Variant") { TQVariant v = static_cast<Kross::Api::Variant*>( object.data() )->getValue(); #ifdef KROSS_PYTHON_EXTENSION_TOPYOBJECT_DEBUG - krossdebug( TQString("Kross::Python::PythonExtension::toPyObject(Kross::Api::Object) is Kross::Api::Variant %1").tqarg(v.toString()) ); + krossdebug( TQString("Kross::Python::PythonExtension::toPyObject(Kross::Api::Object) is Kross::Api::Variant %1").arg(v.toString()) ); #endif return toPyObject(v); } @@ -382,7 +382,7 @@ const Py::Object PythonExtension::toPyObject(Kross::Api::Object::Ptr object) } #ifdef KROSS_PYTHON_EXTENSION_TOPYOBJECT_DEBUG - krossdebug( TQString("Trying to handle PythonExtension::toPyObject(%1) as PythonExtension").tqarg(object->getClassName()) ); + krossdebug( TQString("Trying to handle PythonExtension::toPyObject(%1) as PythonExtension").arg(object->getClassName()) ); #endif return Py::asObject( new PythonExtension(object) ); } @@ -390,7 +390,7 @@ const Py::Object PythonExtension::toPyObject(Kross::Api::Object::Ptr object) const Py::Tuple PythonExtension::toPyTuple(Kross::Api::List::Ptr list) { #ifdef KROSS_PYTHON_EXTENSION_TOPYOBJECT_DEBUG - krossdebug( TQString("Kross::Python::PythonExtension::toPyTuple(Kross::Api::List) name='%1'").tqarg(list ? list->getName() : "NULL") ); + krossdebug( TQString("Kross::Python::PythonExtension::toPyTuple(Kross::Api::List) name='%1'").arg(list ? list->getName() : "NULL") ); #endif uint count = list ? list->count() : 0; Py::Tuple tuple(count); @@ -409,20 +409,20 @@ PyObject* PythonExtension::proxyhandler(PyObject *_self_and_name_tuple, PyObject Kross::Api::List::Ptr arguments = toObject( Py::Tuple(args) ); #ifdef KROSS_PYTHON_EXTENSION_CALL_DEBUG - krossdebug( TQString("Kross::Python::PythonExtension::proxyhandler methodname='%1' arguments='%2'").tqarg(methodname).tqarg(arguments->toString()) ); + krossdebug( TQString("Kross::Python::PythonExtension::proxyhandler methodname='%1' arguments='%2'").arg(methodname).arg(arguments->toString()) ); #endif Kross::Api::Callable* callable = dynamic_cast<Kross::Api::Callable*>(self->m_object.data()); if(callable && callable->hasChild(methodname)) { #ifdef KROSS_PYTHON_EXTENSION_CALL_DEBUG - krossdebug( TQString("Kross::Python::PythonExtension::proxyhandler methodname='%1' is a child object of '%2'.").tqarg(methodname).tqarg(self->m_object->getName()) ); + krossdebug( TQString("Kross::Python::PythonExtension::proxyhandler methodname='%1' is a child object of '%2'.").arg(methodname).arg(self->m_object->getName()) ); #endif Py::Object result = toPyObject( callable->getChild(methodname)->call(TQString(), arguments) ); result.increment_reference_count(); return result.ptr(); } #ifdef KROSS_PYTHON_EXTENSION_CALL_DEBUG - krossdebug( TQString("Kross::Python::PythonExtension::proxyhandler try to call function with methodname '%1' in object '%2'.").tqarg(methodname).tqarg(self->m_object->getName()) ); + krossdebug( TQString("Kross::Python::PythonExtension::proxyhandler try to call function with methodname '%1' in object '%2'.").arg(methodname).arg(self->m_object->getName()) ); #endif Py::Object result = toPyObject( self->m_object->call(methodname, arguments) ); result.increment_reference_count(); @@ -430,12 +430,12 @@ PyObject* PythonExtension::proxyhandler(PyObject *_self_and_name_tuple, PyObject } catch(Py::Exception& e) { const TQString err = Py::value(e).as_string().c_str(); - krosswarning( TQString("Py::Exception in Kross::Python::PythonExtension::proxyhandler %1").tqarg(err) ); + krosswarning( TQString("Py::Exception in Kross::Python::PythonExtension::proxyhandler %1").arg(err) ); //throw e; } catch(Kross::Api::Exception::Ptr e) { const TQString err = e->toString(); - krosswarning( TQString("Kross::Api::Exception in Kross::Python::PythonExtension::proxyhandler %1").tqarg(err) ); + krosswarning( TQString("Kross::Api::Exception in Kross::Python::PythonExtension::proxyhandler %1").arg(err) ); // Don't throw here cause it will end in a crash deep in python. The // error is already handled anyway. //throw Py::Exception( (char*) e->toString().latin1() ); diff --git a/lib/kross/python/pythoninterpreter.cpp b/lib/kross/python/pythoninterpreter.cpp index 23f4b8fb..ded5dbc9 100644 --- a/lib/kross/python/pythoninterpreter.cpp +++ b/lib/kross/python/pythoninterpreter.cpp @@ -122,14 +122,14 @@ PythonInterpreter::PythonInterpreter(Kross::Api::InterpreterInfo* info) // Set the extended sys.path. PySys_SetPath( (char*) path.latin1() ); - krossdebug(TQString("Python ProgramName: %1").tqarg(Py_GetProgramName())); - krossdebug(TQString("Python ProgramFullPath: %1").tqarg(Py_GetProgramFullPath())); - krossdebug(TQString("Python Version: %1").tqarg(Py_GetVersion())); - krossdebug(TQString("Python Platform: %1").tqarg(Py_GetPlatform())); - krossdebug(TQString("Python Prefix: %1").tqarg(Py_GetPrefix())); - krossdebug(TQString("Python ExecPrefix: %1").tqarg(Py_GetExecPrefix())); - krossdebug(TQString("Python Path: %1").tqarg(Py_GetPath())); - krossdebug(TQString("Python System Path: %1").tqarg(path)); + krossdebug(TQString("Python ProgramName: %1").arg(Py_GetProgramName())); + krossdebug(TQString("Python ProgramFullPath: %1").arg(Py_GetProgramFullPath())); + krossdebug(TQString("Python Version: %1").arg(Py_GetVersion())); + krossdebug(TQString("Python Platform: %1").arg(Py_GetPlatform())); + krossdebug(TQString("Python Prefix: %1").arg(Py_GetPrefix())); + krossdebug(TQString("Python ExecPrefix: %1").arg(Py_GetExecPrefix())); + krossdebug(TQString("Python Path: %1").arg(Py_GetPath())); + krossdebug(TQString("Python System Path: %1").arg(path)); // Initialize the main module. d->mainmodule = new PythonModule(this); @@ -179,7 +179,7 @@ PythonInterpreter::PythonInterpreter(Kross::Api::InterpreterInfo* info) PyObject* pyrun = PyRun_String(s.latin1(), Py_file_input, moduledict.ptr(), moduledict.ptr()); if(! pyrun) { Py::Object errobj = Py::value(Py::Exception()); // get last error - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to prepare the __main__ module: %1").tqarg(errobj.as_string().c_str())) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to prepare the __main__ module: %1").arg(errobj.as_string().c_str())) ); } Py_XDECREF(pyrun); // free the reference. diff --git a/lib/kross/python/pythonmodule.cpp b/lib/kross/python/pythonmodule.cpp index 24b43159..48131bb8 100644 --- a/lib/kross/python/pythonmodule.cpp +++ b/lib/kross/python/pythonmodule.cpp @@ -65,7 +65,7 @@ PythonModule::PythonModule(PythonInterpreter* interpreter) PythonModule::~PythonModule() { #ifdef KROSS_PYTHON_MODULE_DEBUG - krossdebug( TQString("Kross::Python::PythonModule::Destructor name='%1'").tqarg(name().c_str()) ); + krossdebug( TQString("Kross::Python::PythonModule::Destructor name='%1'").arg(name().c_str()) ); #endif delete d; @@ -82,16 +82,16 @@ Py::Object PythonModule::import(const Py::Tuple& args) TQString modname = args[0].as_string().c_str(); if(modname.startsWith("kross")) { #ifdef KROSS_PYTHON_MODULE_DEBUG - krossdebug( TQString("Kross::Python::PythonModule::import() module=%1").tqarg(modname) ); + krossdebug( TQString("Kross::Python::PythonModule::import() module=%1").arg(modname) ); #endif if( modname.find( TQRegExp("[^a-zA-Z0-9\\_\\-]") ) >= 0 ) { - krosswarning( TQString("Denied import of Kross module '%1' cause of untrusted chars.").tqarg(modname) ); + krosswarning( TQString("Denied import of Kross module '%1' cause of untrusted chars.").arg(modname) ); } else { Kross::Api::Module::Ptr module = Kross::Api::Manager::scriptManager()->loadModule(modname); if(module) return PythonExtension::toPyObject( Kross::Api::Object::Ptr(module) ); - krosswarning( TQString("Loading of Kross module '%1' failed.").tqarg(modname) ); + krosswarning( TQString("Loading of Kross module '%1' failed.").arg(modname) ); } } diff --git a/lib/kross/python/pythonobject.cpp b/lib/kross/python/pythonobject.cpp index 9689d222..e72ad0bb 100644 --- a/lib/kross/python/pythonobject.cpp +++ b/lib/kross/python/pythonobject.cpp @@ -46,7 +46,7 @@ PythonObject::PythonObject(const Py::Object& object) if(o.isSequence()) t += "isSequence "; if(o.isTrue()) t += "isTrue "; if(o.isInstance()) t += "isInstance "; - krossdebug( TQString("PythonObject::PythonObject() method '%1' (%2)").tqarg( (*i).str().as_string().c_str() ).tqarg(t) ); + krossdebug( TQString("PythonObject::PythonObject() method '%1' (%2)").arg( (*i).str().as_string().c_str() ).arg(t) ); if(o.isCallable()) m_calls.append( (*i).str().as_string().c_str() ); @@ -64,7 +64,7 @@ const TQString PythonObject::getClassName() const Kross::Api::Object::Ptr PythonObject::call(const TQString& name, Kross::Api::List::Ptr arguments) { - krossdebug( TQString("PythonObject::call(%1)").tqarg(name) ); + krossdebug( TQString("PythonObject::call(%1)").arg(name) ); if(m_pyobject.isInstance()) { //if(! m_calls.contains(n)) throw ... @@ -72,11 +72,11 @@ Kross::Api::Object::Ptr PythonObject::call(const TQString& name, Kross::Api::Lis PyObject* r = PyObject_CallMethod(m_pyobject.ptr(), (char*) name.latin1(), 0); if(! r) { //FIXME happens too if e.g. number of arguments doesn't match !!! Py::Object errobj = Py::value(Py::Exception()); // get last error - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to call method '%1': %2").tqarg(name).tqarg(errobj.as_string().c_str())) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to call method '%1': %2").arg(name).arg(errobj.as_string().c_str())) ); } Py::Object result(r, true); - //krossdebug( TQString("PythonObject::call(%1) call return value = '%2'").tqarg(name).tqarg(result.as_string().c_str()) ); + //krossdebug( TQString("PythonObject::call(%1) call return value = '%2'").arg(name).arg(result.as_string().c_str()) ); return PythonExtension::toObject(result); } /*TODO??? ELSE create class instance for class-definitions??? diff --git a/lib/kross/python/pythonscript.cpp b/lib/kross/python/pythonscript.cpp index 2329a1d1..8887e13d 100644 --- a/lib/kross/python/pythonscript.cpp +++ b/lib/kross/python/pythonscript.cpp @@ -88,7 +88,7 @@ void PythonScript::initialize() try { if(m_scriptcontainer->getCode().isNull()) - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Invalid scripting code for script '%1'").tqarg( m_scriptcontainer->getName() )) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Invalid scripting code for script '%1'").arg( m_scriptcontainer->getName() )) ); if(m_scriptcontainer->getName().isNull()) throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Name for the script is invalid!")) ); @@ -96,10 +96,10 @@ void PythonScript::initialize() PyObject* pymod = PyModule_New( (char*) m_scriptcontainer->getName().latin1() ); d->m_module = new Py::Module(pymod, true); if(! d->m_module) - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to initialize local module context for script '%1'").tqarg( m_scriptcontainer->getName() )) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to initialize local module context for script '%1'").arg( m_scriptcontainer->getName() )) ); #ifdef KROSS_PYTHON_SCRIPT_INIT_DEBUG - krossdebug( TQString("PythonScript::initialize() module='%1' refcount='%2'").tqarg(d->m_module->as_string().c_str()).tqarg(d->m_module->reference_count()) ); + krossdebug( TQString("PythonScript::initialize() module='%1' refcount='%2'").arg(d->m_module->as_string().c_str()).arg(d->m_module->reference_count()) ); #endif // Set the "self" variable to point to the ScriptContainer @@ -131,7 +131,7 @@ void PythonScript::initialize() PyObject* code = 0; bool restricted = m_scriptcontainer->getOption("restricted", TQVariant(false,0), true).toBool(); - krossdebug( TQString("PythonScript::initialize() name=%1 restricted=%2").tqarg(m_scriptcontainer->getName()).tqarg(restricted) ); + krossdebug( TQString("PythonScript::initialize() name=%1 restricted=%2").arg(m_scriptcontainer->getName()).arg(restricted) ); if(restricted) { // Use the RestrictedPython module wrapped by the PythonSecurity class. @@ -160,7 +160,7 @@ void PythonScript::initialize() } catch(Py::Exception& e) { TQString err = Py::value(e).as_string().c_str(); - Kross::Api::Exception::Ptr exception = toException( TQString("Failed to compile python code: %1").tqarg(err) ); + Kross::Api::Exception::Ptr exception = toException( TQString("Failed to compile python code: %1").arg(err) ); e.clear(); // exception is handled. clear it now. throw exception; } @@ -170,7 +170,7 @@ void PythonScript::finalize() { #ifdef KROSS_PYTHON_SCRIPT_FINALIZE_DEBUG if(d->m_module) - krossdebug( TQString("PythonScript::finalize() module='%1' refcount='%2'").tqarg(d->m_module->as_string().c_str()).tqarg(d->m_module->reference_count()) ); + krossdebug( TQString("PythonScript::finalize() module='%1' refcount='%2'").arg(d->m_module->as_string().c_str()).arg(d->m_module->reference_count()) ); #endif delete d->m_module; d->m_module = 0; @@ -205,7 +205,7 @@ Kross::Api::Exception::Ptr PythonScript::toException(const TQString& error) catch(Py::Exception& e) { TQString err = Py::value(e).as_string().c_str(); e.clear(); // exception is handled. clear it now. - krosswarning( TQString("Kross::Python::PythonScript::toException() Failed to fetch a traceback: %1").tqarg(err) ); + krosswarning( TQString("Kross::Python::PythonScript::toException() Failed to fetch a traceback: %1").arg(err) ); } PyObject *next; @@ -226,7 +226,7 @@ Kross::Api::Exception::Ptr PythonScript::toException(const TQString& error) //const char* filename = PyString_AsString(frame->f_code->co_filename); //const char* name = PyString_AsString(frame->f_code->co_name); - //errorlist.append( TQString("%1#%2: \"%3\"").tqarg(filename).tqarg(lineno).tqarg(name) ); + //errorlist.append( TQString("%1#%2: \"%3\"").arg(filename).arg(lineno).arg(name) ); next = PyObject_GetAttrString(traceback, "tb_next"); Py_DECREF(traceback); @@ -318,20 +318,20 @@ Kross::Api::Object::Ptr PythonScript::execute() Py::Object result(pyresult, true); #ifdef KROSS_PYTHON_SCRIPT_EXEC_DEBUG - krossdebug( TQString("PythonScript::execute() result=%1").tqarg(result.as_string().c_str()) ); + krossdebug( TQString("PythonScript::execute() result=%1").arg(result.as_string().c_str()) ); #endif for(Py::Dict::iterator it = moduledict.begin(); it != moduledict.end(); ++it) { Py::Dict::value_type vt(*it); if(PyClass_Check( vt.second.ptr() )) { #ifdef KROSS_PYTHON_SCRIPT_EXEC_DEBUG - krossdebug( TQString("PythonScript::execute() class '%1' added.").tqarg(vt.first.as_string().c_str()) ); + krossdebug( TQString("PythonScript::execute() class '%1' added.").arg(vt.first.as_string().c_str()) ); #endif d->m_classes.append( vt.first.as_string().c_str() ); } else if(vt.second.isCallable()) { #ifdef KROSS_PYTHON_SCRIPT_EXEC_DEBUG - krossdebug( TQString("PythonScript::execute() function '%1' added.").tqarg(vt.first.as_string().c_str()) ); + krossdebug( TQString("PythonScript::execute() function '%1' added.").arg(vt.first.as_string().c_str()) ); #endif d->m_functions.append( vt.first.as_string().c_str() ); } @@ -347,13 +347,13 @@ Kross::Api::Object::Ptr PythonScript::execute() errobj = Py::type(e); TQString err = errobj.as_string().c_str(); - Kross::Api::Exception::Ptr exception = toException( TQString("Failed to execute python code: %1").tqarg(err) ); + Kross::Api::Exception::Ptr exception = toException( TQString("Failed to execute python code: %1").arg(err) ); e.clear(); // exception is handled. clear it now. setException( exception ); } catch(Py::Exception& e) { TQString err = Py::value(e).as_string().c_str(); - Kross::Api::Exception::Ptr exception = toException( TQString("Failed to execute python code: %1").tqarg(err) ); + Kross::Api::Exception::Ptr exception = toException( TQString("Failed to execute python code: %1").arg(err) ); e.clear(); // exception is handled. clear it now. setException( exception ); } @@ -369,8 +369,8 @@ Kross::Api::Object::Ptr PythonScript::callFunction(const TQString& name, Kross:: { #ifdef KROSS_PYTHON_SCRIPT_CALLFUNC_DEBUG krossdebug( TQString("PythonScript::callFunction(%1, %2)") - .tqarg(name) - .tqarg(args ? TQString::number(args->count()) : TQString("NULL")) ); + .arg(name) + .arg(args ? TQString::number(args->count()) : TQString("NULL")) ); #endif if(hadException()) return 0; // abort if we had an unresolved exception. @@ -387,7 +387,7 @@ Kross::Api::Object::Ptr PythonScript::callFunction(const TQString& name, Kross:: PyObject* func = PyDict_GetItemString(moduledict.ptr(), name.latin1()); if( (! d->m_functions.contains(name)) || (! func) ) - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("No such function '%1'.").tqarg(name)) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("No such function '%1'.").arg(name)) ); Py::Callable funcobject(func, true); // the funcobject takes care of freeing our func pyobject. @@ -402,7 +402,7 @@ Kross::Api::Object::Ptr PythonScript::callFunction(const TQString& name, Kross:: catch(Py::Exception& e) { TQString err = Py::value(e).as_string().c_str(); e.clear(); // exception is handled. clear it now. - setException( new Kross::Api::Exception(TQString("Python Exception: %1").tqarg(err)) ); + setException( new Kross::Api::Exception(TQString("Python Exception: %1").arg(err)) ); } catch(Kross::Api::Exception::Ptr e) { setException(e); @@ -433,16 +433,16 @@ Kross::Api::Object::Ptr PythonScript::classInstance(const TQString& name) // Try to determinate the class. PyObject* pyclass = PyDict_GetItemString(moduledict.ptr(), name.latin1()); if( (! d->m_classes.contains(name)) || (! pyclass) ) - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("No such class '%1'.").tqarg(name)) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("No such class '%1'.").arg(name)) ); PyObject *pyobj = PyInstance_New(pyclass, 0, 0);//aclarg, 0); if(! pyobj) - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to create instance of class '%1'.").tqarg(name)) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to create instance of class '%1'.").arg(name)) ); Py::Object classobject(pyobj, true); #ifdef KROSS_PYTHON_SCRIPT_CLASSINSTANCE_DEBUG - krossdebug( TQString("PythonScript::classInstance() inst='%1'").tqarg(classobject.as_string().c_str()) ); + krossdebug( TQString("PythonScript::classInstance() inst='%1'").arg(classobject.as_string().c_str()) ); #endif return PythonExtension::toObject(classobject); } diff --git a/lib/kross/python/pythonsecurity.cpp b/lib/kross/python/pythonsecurity.cpp index 941ed0c6..9a7712cb 100644 --- a/lib/kross/python/pythonsecurity.cpp +++ b/lib/kross/python/pythonsecurity.cpp @@ -90,7 +90,7 @@ void PythonSecurity::initRestrictedPython() catch(Py::Exception& e) { TQString err = Py::value(e).as_string().c_str(); e.clear(); - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to initialize PythonSecurity module: %1").tqarg(err) ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Failed to initialize PythonSecurity module: %1").arg(err) ) ); } } @@ -115,12 +115,12 @@ PyObject* PythonSecurity::compile_restricted(const TQString& source, const TQStr PyObject* func = PyDict_GetItemString(m_pymodule->getDict().ptr(), "compile_restricted"); if(! func) - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("No such function '%1'.").tqarg("compile_restricted")) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("No such function '%1'.").arg("compile_restricted")) ); Py::Callable funcobject(func, true); // the funcobject takes care of freeing our func pyobject. if(! funcobject.isCallable()) - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Function '%1' is not callable.").tqarg("compile_restricted")) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Function '%1' is not callable.").arg("compile_restricted")) ); Py::Tuple args(3); args[0] = Py::String(source.utf8()); @@ -140,17 +140,17 @@ PyObject* PythonSecurity::compile_restricted(const TQString& source, const TQStr /* Py::List ml = mainmoduledict; for(Py::List::size_type mi = 0; mi < ml.length(); ++mi) { - krossdebug( TQString("dir() = %1").tqarg( ml[mi].str().as_string().c_str() ) ); - //krossdebug( TQString("dir().dir() = %1").tqarg( Py::Object(ml[mi]).dir().as_string().c_str() ) ); + krossdebug( TQString("dir() = %1").arg( ml[mi].str().as_string().c_str() ) ); + //krossdebug( TQString("dir().dir() = %1").arg( Py::Object(ml[mi]).dir().as_string().c_str() ) ); } */ Py::Object code(pycode); - krossdebug( TQString("%1 callable=%2").tqarg(code.as_string().c_str()).tqarg(PyCallable_Check(code.ptr())) ); + krossdebug( TQString("%1 callable=%2").arg(code.as_string().c_str()).arg(PyCallable_Check(code.ptr())) ); Py::List l = code.dir(); for(Py::List::size_type i = 0; i < l.length(); ++i) { - krossdebug( TQString("dir() = %1").tqarg( l[i].str().as_string().c_str() ) ); - //krossdebug( TQString("dir().dir() = %1").tqarg( Py::Object(l[i]).dir().as_string().c_str() ) ); + krossdebug( TQString("dir() = %1").arg( l[i].str().as_string().c_str() ) ); + //krossdebug( TQString("dir().dir() = %1").arg( Py::Object(l[i]).dir().as_string().c_str() ) ); } return pycode; @@ -158,7 +158,7 @@ PyObject* PythonSecurity::compile_restricted(const TQString& source, const TQStr catch(Py::Exception& e) { TQString err = Py::value(e).as_string().c_str(); e.clear(); - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Function '%1' failed with python exception: %2").tqarg("compile_restricted").tqarg(err) ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("Function '%1' failed with python exception: %2").arg("compile_restricted").arg(err) ) ); } } diff --git a/lib/kross/python/scripts/RestrictedPython/Guards.py b/lib/kross/python/scripts/RestrictedPython/Guards.py index 295ba791..4fbdcad1 100644 --- a/lib/kross/python/scripts/RestrictedPython/Guards.py +++ b/lib/kross/python/scripts/RestrictedPython/Guards.py @@ -24,7 +24,7 @@ for name in ['False', 'None', 'True', 'abs', 'basestring', 'bool', 'callable', 'chr', 'cmp', 'complex', 'divmod', 'float', 'hash', 'hex', 'id', 'int', 'isinstance', 'issubclass', 'len', 'long', 'oct', 'ord', 'pow', 'range', 'repr', 'round', - 'str', 'tuple', 'unichr', 'tqunicode', 'xrange', 'zip']: + 'str', 'tuple', 'unichr', 'unicode', 'xrange', 'zip']: safe_builtins[name] = __builtins__[name] diff --git a/lib/kross/python/scripts/gui.py b/lib/kross/python/scripts/gui.py index 7461447a..9b8e0f8c 100755 --- a/lib/kross/python/scripts/gui.py +++ b/lib/kross/python/scripts/gui.py @@ -190,9 +190,9 @@ class QtDialog: def __init__(self, parent = None, name = None, modal = 0, fl = 0): qt.QDialog.__init__(self, parent, name, modal, fl) qt.QDialog.accept = self.accept - self.tqlayout = qt.QVBoxLayout(self) - self.tqlayout.setSpacing(6) - self.tqlayout.setMargin(11) + self.layout = qt.QVBoxLayout(self) + self.layout.setSpacing(6) + self.layout.setMargin(11) class Label(qt.QLabel): def __init__(self, dialog, parent, caption): @@ -323,7 +323,7 @@ class QtDialog: self.widget = qt.QVBox(self.dialog) self.widget.setSpacing(6) - self.dialog.tqlayout.addWidget(self.widget) + self.dialog.layout.addWidget(self.widget) self.Frame = Frame self.Label = Label diff --git a/lib/kross/ruby/rubyextension.cpp b/lib/kross/ruby/rubyextension.cpp index 6c2cb40f..98474bf6 100644 --- a/lib/kross/ruby/rubyextension.cpp +++ b/lib/kross/ruby/rubyextension.cpp @@ -66,7 +66,7 @@ VALUE RubyExtension::call_method( Kross::Api::Object::Ptr object, int argc, VALU TQString funcname = rb_id2name(SYM2ID(argv[0])); TQValueList<Api::Object::Ptr> argsList; #ifdef KROSS_RUBY_EXTENSION_DEBUG - krossdebug(TQString("Building arguments list for function: %1 there are %2 arguments.").tqarg(funcname).tqarg(argc-1)); + krossdebug(TQString("Building arguments list for function: %1 there are %2 arguments.").arg(funcname).arg(argc-1)); #endif for(int i = 1; i < argc; i++) { @@ -79,13 +79,13 @@ VALUE RubyExtension::call_method( Kross::Api::Object::Ptr object, int argc, VALU Kross::Api::Callable* callable = dynamic_cast<Kross::Api::Callable*>(object.data()); if(callable && callable->hasChild(funcname)) { #ifdef KROSS_RUBY_EXTENSION_DEBUG - krossdebug( TQString("Kross::Ruby::RubyExtension::method_missing name='%1' is a child object of '%2'.").tqarg(funcname).tqarg(object->getName()) ); + krossdebug( TQString("Kross::Ruby::RubyExtension::method_missing name='%1' is a child object of '%2'.").arg(funcname).arg(object->getName()) ); #endif result = callable->getChild(funcname)->call(TQString(), new Api::List(argsList)); } else { #ifdef KROSS_RUBY_EXTENSION_DEBUG - krossdebug( TQString("Kross::Ruby::RubyExtension::method_missing try to call function with name '%1' in object '%2'.").tqarg(funcname).tqarg(object->getName()) ); + krossdebug( TQString("Kross::Ruby::RubyExtension::method_missing try to call function with name '%1' in object '%2'.").arg(funcname).arg(object->getName()) ); #endif result = object->call(funcname, new Api::List(argsList)); } @@ -184,7 +184,7 @@ VALUE RubyExtension::convertFromException(Kross::Api::Exception::Ptr exc) Kross::Api::Object::Ptr RubyExtension::toObject(VALUE value) { #ifdef KROSS_RUBY_EXTENSION_DEBUG - krossdebug(TQString("RubyExtension::toObject of type %1").tqarg(TYPE(value))); + krossdebug(TQString("RubyExtension::toObject of type %1").arg(TYPE(value))); #endif switch( TYPE( value ) ) { @@ -251,7 +251,7 @@ Kross::Api::Object::Ptr RubyExtension::toObject(VALUE value) case T_MODULE: case T_ICLASS: case T_CLASS: - krosswarning(TQString("This ruby type '%1' cannot be converted to a Kross::Api::Object").tqarg(TYPE(value))); + krosswarning(TQString("This ruby type '%1' cannot be converted to a Kross::Api::Object").arg(TYPE(value))); default: case T_NIL: return 0; @@ -329,7 +329,7 @@ VALUE RubyExtension::toVALUE(const TQVariant& variant) case TQVariant::ULongLong: return UINT2NUM((unsigned long)variant.toULongLong()); default: { - krosswarning( TQString("Kross::Ruby::RubyExtension::toVALUE(TQVariant) Not possible to convert the TQVariant type '%1' to a VALUE.").tqarg(variant.typeName()) ); + krosswarning( TQString("Kross::Ruby::RubyExtension::toVALUE(TQVariant) Not possible to convert the TQVariant type '%1' to a VALUE.").arg(variant.typeName()) ); return Qundef; } } diff --git a/lib/kross/ruby/rubyinterpreter.cpp b/lib/kross/ruby/rubyinterpreter.cpp index 4a4df32f..6af8ecbe 100644 --- a/lib/kross/ruby/rubyinterpreter.cpp +++ b/lib/kross/ruby/rubyinterpreter.cpp @@ -121,9 +121,9 @@ VALUE RubyInterpreter::require (VALUE obj, VALUE name) #endif TQString modname = StringValuePtr(name); if(modname.startsWith("kross")) { - krossdebug( TQString("RubyInterpreter::require() module=%1").tqarg(modname) ); + krossdebug( TQString("RubyInterpreter::require() module=%1").arg(modname) ); if( modname.find( TQRegExp("[^a-zA-Z0-9\\_\\-]") ) >= 0 ) { - krosswarning( TQString("Denied import of Kross module '%1' cause of untrusted chars.").tqarg(modname) ); + krosswarning( TQString("Denied import of Kross module '%1' cause of untrusted chars.").arg(modname) ); } else { Kross::Api::Module::Ptr module = Kross::Api::Manager::scriptManager()->loadModule(modname); @@ -136,7 +136,7 @@ VALUE RubyInterpreter::require (VALUE obj, VALUE name) // rb_define_variable( ("$" + modname).ascii(), & RubyInterpreter::d->m_modules.insert( mStrVALUE::value_type( modname, rm) ).first->second ); return Qtrue; } - krosswarning( TQString("Loading of Kross module '%1' failed.").tqarg(modname) ); + krosswarning( TQString("Loading of Kross module '%1' failed.").arg(modname) ); } } else { return rb_f_require(obj, name); diff --git a/lib/kross/ruby/rubymodule.cpp b/lib/kross/ruby/rubymodule.cpp index 73012b89..948a10ee 100644 --- a/lib/kross/ruby/rubymodule.cpp +++ b/lib/kross/ruby/rubymodule.cpp @@ -37,7 +37,7 @@ RubyModule::RubyModule(Kross::Api::Module::Ptr mod, TQString modname) : d(new Ru { d->m_module = mod; modname = modname.left(1).upper() + modname.right(modname.length() - 1 ); - krossdebug(TQString("Module: %1").tqarg(modname)); + krossdebug(TQString("Module: %1").arg(modname)); VALUE rmodule = rb_define_module(modname.ascii()); rb_define_module_function(rmodule,"method_missing", (VALUE (*)(...))RubyModule::method_missing, -1); VALUE rm = RubyExtension::toVALUE( mod.data() ); @@ -52,7 +52,7 @@ VALUE RubyModule::method_missing(int argc, VALUE *argv, VALUE self) { #ifdef KROSS_RUBY_MODULE_DEBUG TQString funcname = rb_id2name(SYM2ID(argv[0])); - krossdebug(TQString("Function %1 missing in a module").tqarg(funcname)); + krossdebug(TQString("Function %1 missing in a module").arg(funcname)); #endif VALUE rubyObjectModule = rb_funcall( self, rb_intern("const_get"), 1, ID2SYM(rb_intern("MODULEOBJ")) ); diff --git a/lib/kross/ruby/rubyscript.cpp b/lib/kross/ruby/rubyscript.cpp index dc0fbb16..370d4aa7 100644 --- a/lib/kross/ruby/rubyscript.cpp +++ b/lib/kross/ruby/rubyscript.cpp @@ -87,7 +87,7 @@ void RubyScript::compile() #ifdef KROSS_RUBY_SCRIPT_DEBUG krossdebug("Compilation has failed"); #endif - setException( new Kross::Api::Exception(TQString("Failed to compile ruby code: %1").tqarg(STR2CSTR( rb_obj_as_string(ruby_errinfo) )), 0) ); // TODO: get the error + setException( new Kross::Api::Exception(TQString("Failed to compile ruby code: %1").arg(STR2CSTR( rb_obj_as_string(ruby_errinfo) )), 0) ); // TODO: get the error d->m_compile = 0; } #ifdef KROSS_RUBY_SCRIPT_DEBUG @@ -133,7 +133,7 @@ Kross::Api::Object::Ptr RubyScript::execute() #endif setException( RubyExtension::convertToException( ruby_errinfo ) ); } else { - setException( new Kross::Api::Exception(TQString("Failed to execute ruby code: %1").tqarg(STR2CSTR( rb_obj_as_string(ruby_errinfo) )), 0) ); // TODO: get the error + setException( new Kross::Api::Exception(TQString("Failed to execute ruby code: %1").arg(STR2CSTR( rb_obj_as_string(ruby_errinfo) )), 0) ); // TODO: get the error } } diff --git a/lib/kross/runner/main.cpp b/lib/kross/runner/main.cpp index 570e2610..1093a47b 100644 --- a/lib/kross/runner/main.cpp +++ b/lib/kross/runner/main.cpp @@ -82,13 +82,13 @@ int runScriptFile(const TQString& scriptfile) // We had an exception. TQString errormessage = scriptcontainer->getException()->getError(); TQString tracedetails = scriptcontainer->getException()->getTrace(); - std::cerr << TQString("%2\n%1").tqarg(tracedetails).tqarg(errormessage).latin1() << std::endl; + std::cerr << TQString("%2\n%1").arg(tracedetails).arg(errormessage).latin1() << std::endl; return ERROR_EXCEPTION; } } catch(Kross::Api::Exception::Ptr e) { // Normaly that shouldn't be the case... - std::cerr << TQString("EXCEPTION %1").tqarg(e->toString()).latin1() << std::endl; + std::cerr << TQString("EXCEPTION %1").arg(e->toString()).latin1() << std::endl; return ERROR_UNHALDEDEXCEPTION; } return ERROR_OK; diff --git a/lib/kross/test/main.cpp b/lib/kross/test/main.cpp index 42198201..7f304ba6 100644 --- a/lib/kross/test/main.cpp +++ b/lib/kross/test/main.cpp @@ -107,7 +107,7 @@ void runInterpreter(const TQString& interpretername, const TQString& scriptcode) if(testclassinstance) { TQValueList<Kross::Api::Object*> ll; Kross::Api::Object* instancecallresult = testclassinstance->call("testClassFunction1", Kross::Api::List::create(ll)); - //krossdebug( TQString("testClass.testClassFunction1 returnvalue => '%1'").tqarg( instancecallresult.toString() ) ); + //krossdebug( TQString("testClass.testClassFunction1 returnvalue => '%1'").arg( instancecallresult.toString() ) ); } */ @@ -121,7 +121,7 @@ void runInterpreter(const TQString& interpretername, const TQString& scriptcode) */ } catch(Kross::Api::Exception::Ptr e) { - std::cout << TQString("EXCEPTION %1").tqarg(e->toString()).latin1() << std::endl; + std::cout << TQString("EXCEPTION %1").arg(e->toString()).latin1() << std::endl; } /*TESTCASE @@ -132,7 +132,7 @@ void runInterpreter(const TQString& interpretername, const TQString& scriptcode) sc2->execute(); } catch(Kross::Api::Exception& e) { - krossdebug( TQString("EXCEPTION type='%1' description='%2'").tqarg(e.type()).tqarg(e.description()) ); + krossdebug( TQString("EXCEPTION type='%1' description='%2'").arg(e.type()).arg(e.description()) ); } //delete sc2; */ @@ -181,7 +181,7 @@ int main(int argc, char **argv) } } else { - Kross::krosswarning( TQString("Failed to load scriptfile: %1").tqarg(scriptfilename) ); + Kross::krosswarning( TQString("Failed to load scriptfile: %1").arg(scriptfilename) ); result = -1; } diff --git a/lib/kross/test/testcase.py b/lib/kross/test/testcase.py index 9fa58bc2..f1540201 100644 --- a/lib/kross/test/testcase.py +++ b/lib/kross/test/testcase.py @@ -79,8 +79,8 @@ class TestPlugin(unittest.TestCase): self.assert_( self.pluginobject1.stringfunc(" Another \n\r Test! $%&\"") == " Another \n\r Test! $%&\"" ) #TODO - #self.assert_( self.pluginobject1.stringfunc( tqunicode(" Unicode test ") ) == " Unicode test " ) - #self.assert_( self.pluginobject1.stringfunc(tqunicode(" Another Test! ")) == tqunicode(" Another Test! ") ) + #self.assert_( self.pluginobject1.stringfunc( unicode(" Unicode test ") ) == " Unicode test " ) + #self.assert_( self.pluginobject1.stringfunc(unicode(" Another Test! ")) == unicode(" Another Test! ") ) self.assert_( self.pluginobject1.stringstringfunc("MyString1", "MyString2") == "MyString1" ) self.assert_( self.pluginobject1.uintdoublestringfunc(8529,285.246,"String") == 8529 ) diff --git a/lib/kross/test/testgui.py b/lib/kross/test/testgui.py index 6a629c66..22b6f04b 100644 --- a/lib/kross/test/testgui.py +++ b/lib/kross/test/testgui.py @@ -89,27 +89,27 @@ class QtTest: qt.QDialog.__init__(self, parent, name, modal, fl) qt.QDialog.accept = self.accept self.setCaption("Export to HTML") - #self.tqlayout() + #self.layout() - self.tqlayout = qt.QVBoxLayout(self) - self.tqlayout.setSpacing(6) - self.tqlayout.setMargin(11) + self.layout = qt.QVBoxLayout(self) + self.layout.setSpacing(6) + self.layout.setMargin(11) infolabel = qt.QLabel("Export the data of a table or a query to a HTML-file.", self) - self.tqlayout.addWidget(infolabel) + self.layout.addWidget(infolabel) source = ComboBox(self, "Datasource:") - self.tqlayout.addWidget(source) + self.layout.addWidget(source) self.exporttype = ComboBox(self, "Style:", ["Plain","Paper","Desert","Blues"]) - self.tqlayout.addWidget(self.exporttype) + self.layout.addWidget(self.exporttype) self.filechooser = FileChooser(self) - self.tqlayout.addWidget(self.filechooser) + self.layout.addWidget(self.filechooser) buttonbox = qt.QHBox(self) buttonbox.setSpacing(6) - self.tqlayout.addWidget(buttonbox) + self.layout.addWidget(buttonbox) savebutton = Button("Save", buttonbox) qt.QObject.connect(savebutton, qt.SIGNAL("clicked()"), self, qt.SLOT("accept()")) diff --git a/lib/kross/test/testobject.cpp b/lib/kross/test/testobject.cpp index eb687d02..884e7e37 100644 --- a/lib/kross/test/testobject.cpp +++ b/lib/kross/test/testobject.cpp @@ -48,24 +48,24 @@ TestObject::~TestObject() uint TestObject::func1(uint i) { - Kross::krossdebug(TQString("CALLED => TestObject::func1 i=%1").tqarg(i) ); + Kross::krossdebug(TQString("CALLED => TestObject::func1 i=%1").arg(i) ); return i; } void TestObject::func2(TQString s, int i) { - Kross::krossdebug(TQString("CALLED => TestObject::func2 s=%1 i=%2").tqarg(s).tqarg(i)); + Kross::krossdebug(TQString("CALLED => TestObject::func2 s=%1 i=%2").arg(s).arg(i)); } TQString TestObject::func3(TQString s, int i) { - Kross::krossdebug(TQString("CALLED => TestObject::func3 s=%1 i=%2").tqarg(s).tqarg(i)); + Kross::krossdebug(TQString("CALLED => TestObject::func3 s=%1 i=%2").arg(s).arg(i)); return s; } const TQString& TestObject::func4(const TQString& s, int i) const { - Kross::krossdebug(TQString("CALLED => TestObject::func4 s=%1 i=%2").tqarg(s).tqarg(i)); + Kross::krossdebug(TQString("CALLED => TestObject::func4 s=%1 i=%2").arg(s).arg(i)); return s; } @@ -83,13 +83,13 @@ void TestObject::testSlot2() void TestObject::stdoutSlot(const TQString& s) { - Kross::krossdebug(TQString("stdout: %1").tqarg(s)); + Kross::krossdebug(TQString("stdout: %1").arg(s)); //std::cout << "<stdout> " << s.latin1() << std::endl; } void TestObject::stderrSlot(const TQString& s) { - Kross::krossdebug(TQString("stderr: %1").tqarg(s)); + Kross::krossdebug(TQString("stderr: %1").arg(s)); //std::cout << "<stderr> " << s.latin1() << std::endl; } diff --git a/lib/kross/test/testwindow.cpp b/lib/kross/test/testwindow.cpp index 5aa33958..ec2960b0 100644 --- a/lib/kross/test/testwindow.cpp +++ b/lib/kross/test/testwindow.cpp @@ -53,7 +53,7 @@ TestWindow::TestWindow(const TQString& interpretername, const TQString& scriptco file = TQDir(TQDir::currentDirPath()).filePath("testscripting.rc"); else Kross::krossdebug("-------------------------222222"); - Kross::krossdebug(TQString("XML-file: %1").tqarg(file)); + Kross::krossdebug(TQString("XML-file: %1").arg(file)); m_scriptextension->setXMLFile(file); //menuFile->insertSeparator(); @@ -99,11 +99,11 @@ void TestWindow::execute() m_scriptcontainer->setCode(m_codeedit->text()); Kross::Api::Object::Ptr result = m_scriptcontainer->execute(); if(m_scriptcontainer->hadException()) { - Kross::krossdebug( TQString("EXCEPTION => %1").tqarg(m_scriptcontainer->getException()->toString()) ); + Kross::krossdebug( TQString("EXCEPTION => %1").arg(m_scriptcontainer->getException()->toString()) ); } else { TQString s = result ? result->toString() : TQString(); - Kross::krossdebug( TQString("DONE => %1").tqarg(s) ); + Kross::krossdebug( TQString("DONE => %1").arg(s) ); } } diff --git a/lib/kwmf/kowmfpaint.cc b/lib/kwmf/kowmfpaint.cc index 97a6e033..43067273 100644 --- a/lib/kwmf/kowmfpaint.cc +++ b/lib/kwmf/kowmfpaint.cc @@ -249,7 +249,7 @@ void KoWmfPaint::drawPolyline( const TQPointArray &pa ) { void KoWmfPaint::drawPolygon( const TQPointArray &pa, bool winding ) { - mPainter.tqdrawPolygon( pa, winding ); + mPainter.drawPolygon( pa, winding ); } @@ -276,7 +276,7 @@ void KoWmfPaint::drawPolyPolygon( TQPtrList<TQPointArray>& listPa, bool winding if ( mPainter.pen().style() != TQt::NoPen ) { mPainter.setBrush( TQt::NoBrush ); for ( pa = listPa.first() ; pa ; pa = listPa.next() ) { - mPainter.tqdrawPolygon( *pa, winding ); + mPainter.drawPolygon( *pa, winding ); } } diff --git a/lib/kwmf/kowmfread.h b/lib/kwmf/kowmfread.h index ff8fa9be..d71af5c6 100644 --- a/lib/kwmf/kowmfread.h +++ b/lib/kwmf/kowmfread.h @@ -19,7 +19,7 @@ #define _KOWMFREAD_H_ #include <tqpen.h> -#include <tqbrush.h> +#include <brush.h> #include <tqfont.h> #include <tqcolor.h> #include <tqrect.h> diff --git a/lib/kwmf/kowmfreadprivate.h b/lib/kwmf/kowmfreadprivate.h index ea95e563..feebe0b3 100644 --- a/lib/kwmf/kowmfreadprivate.h +++ b/lib/kwmf/kowmfreadprivate.h @@ -112,7 +112,7 @@ public: /****************** Text *******************/ /// set text color void setTextColor( TQ_UINT32 size, TQDataStream& stream ); - /// set text tqalignment + /// set text alignment void setTextAlign( TQ_UINT32 size, TQDataStream& stream ); /// draw text void textOut( TQ_UINT32 size, TQDataStream& stream ); diff --git a/lib/kwmf/kowmfstack.h b/lib/kwmf/kowmfstack.h index 876318ab..af906d55 100644 --- a/lib/kwmf/kowmfstack.h +++ b/lib/kwmf/kowmfstack.h @@ -22,7 +22,7 @@ #include <tqpen.h> #include <tqcolor.h> #include <tqfont.h> -#include <tqbrush.h> +#include <brush.h> #include <tqpixmap.h> class KoWmfRead; diff --git a/lib/kwmf/kowmfstruct.h b/lib/kwmf/kowmfstruct.h index d94a9d79..84281f4e 100644 --- a/lib/kwmf/kowmfstruct.h +++ b/lib/kwmf/kowmfstruct.h @@ -57,7 +57,7 @@ struct WmfEnhMetaHeader TQ_UINT16 numHandles; // Number of handles in the handle table // Handle index zero is reserved. TQ_UINT16 reserved; // always 0 - TQ_UINT32 sizeOfDescription; // Number of chars in the tqunicode description string + TQ_UINT32 sizeOfDescription; // Number of chars in the unicode description string // This is 0 if there is no description string TQ_UINT32 offsetOfDescription; // Offset to the metafile description record. // This is 0 if there is no description string diff --git a/lib/kwmf/kowmfwrite.h b/lib/kwmf/kowmfwrite.h index bc3e1411..728566d0 100644 --- a/lib/kwmf/kowmfwrite.h +++ b/lib/kwmf/kowmfwrite.h @@ -19,7 +19,7 @@ #define _KOWMFWRITE_H_ #include <tqpen.h> -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> #include <tqfont.h> #include <tqrect.h> diff --git a/lib/kwmf/kwmf.cc b/lib/kwmf/kwmf.cc index 0a0d2c12..38d520db 100644 --- a/lib/kwmf/kwmf.cc +++ b/lib/kwmf/kwmf.cc @@ -351,7 +351,7 @@ bool KWmf::parse( bool isPlaceable; bool isEnhanced; - startedAt = stream.tqdevice()->at(); + startedAt = stream.device()->at(); stream.setByteOrder(TQDataStream::LittleEndian); // Great, I love TQt ! for (int i = 0; i < s_maxHandles; i++) @@ -400,7 +400,7 @@ bool KWmf::parse( S16 nHandles; // Number of handles in the handle table // Handle index zero is reserved. S16 sReserved; // Reserved. Must be zero. - S32 nDescription; // Number of chars in the tqunicode description string + S32 nDescription; // Number of chars in the unicode description string // This is 0 if there is no description string S32 offDescription; // Offset to the metafile description record. // This is 0 if there is no description string @@ -477,7 +477,7 @@ bool KWmf::parse( } else { - stream.tqdevice()->at(startedAt); + stream.device()->at(startedAt); m_dpi = (unsigned)((double)576 / m_dpi); m_windowOrgX = 0; m_windowOrgY = 0; @@ -487,7 +487,7 @@ bool KWmf::parse( //----- Read as enhanced metafile header - fileAt = stream.tqdevice()->at(); + fileAt = stream.device()->at(); stream >> eheader.iType; stream >> eheader.nSize; stream >> eheader.rclBounds.left; @@ -539,7 +539,7 @@ bool KWmf::parse( { // debug("WMF Header"); //----- Read as standard metafile header - stream.tqdevice()->at(fileAt); + stream.device()->at(fileAt); stream >> header.mtType; stream >> header.mtHeaderSize; stream >> header.mtVersion; @@ -558,7 +558,7 @@ bool KWmf::parse( */ } - walk((size - (stream.tqdevice()->at() - startedAt)) / 2, stream); + walk((size - (stream.device()->at() - startedAt)) / 2, stream); return true; } diff --git a/lib/kwmf/qwmf.cc b/lib/kwmf/qwmf.cc index a7451b46..aabe4021 100644 --- a/lib/kwmf/qwmf.cc +++ b/lib/kwmf/qwmf.cc @@ -348,7 +348,7 @@ bool QWinMetaFile::paint( const TQPaintDevice* aTarget, bool absolute ) mWinding = false; mAbsoluteCoord = absolute; - mPainter.tqbegin( const_cast<TQPaintDevice*>(aTarget) ); + mPainter.begin( const_cast<TQPaintDevice*>(aTarget) ); if ( TQWMF_DEBUG ) { kdDebug() << "Bounding box : " << mBBox.left() << " " << mBBox.top() << " " << mBBox.right() << " " << mBBox.bottom() << endl; @@ -482,7 +482,7 @@ void QWinMetaFile::polygon( long, short* parm ) TQPointArray* pa; pa = pointArray( parm[ 0 ], &parm[ 1 ] ); - mPainter.tqdrawPolygon( *pa, mWinding ); + mPainter.drawPolygon( *pa, mWinding ); } @@ -762,7 +762,7 @@ void QWinMetaFile::extTextOut( long num, short* parm ) mPainter.translate( -parm[ 1 ], -parm[ 0 ] ); } - // tqalignment + // alignment if ( mTextAlign & 0x06 ) x -= ( width / 2 ); if ( mTextAlign & 0x08 ) diff --git a/lib/kwmf/qwmf.h b/lib/kwmf/qwmf.h index 3bc668c9..cf05d617 100644 --- a/lib/kwmf/qwmf.h +++ b/lib/kwmf/qwmf.h @@ -139,7 +139,7 @@ public: // should be protected but cannot /****************** Text *******************/ /** set text color */ void setTextColor( long num, short* parms ); - /** set text tqalignment */ + /** set text alignment */ void setTextAlign( long num, short* parms ); /** draw text */ void textOut( long num, short* parms ); diff --git a/lib/kwmf/wmfstruct.h b/lib/kwmf/wmfstruct.h index 33a4a67c..7400e896 100644 --- a/lib/kwmf/wmfstruct.h +++ b/lib/kwmf/wmfstruct.h @@ -53,7 +53,7 @@ struct WmfEnhMetaHeader WORD nHandles; // Number of handles in the handle table // Handle index zero is reserved. WORD sReserved; // Reserved. Must be zero. - DWORD nDescription; // Number of chars in the tqunicode description string + DWORD nDescription; // Number of chars in the unicode description string // This is 0 if there is no description string DWORD offDescription; // Offset to the metafile description record. // This is 0 if there is no description string diff --git a/lib/store/KoDirectoryStore.cpp b/lib/store/KoDirectoryStore.cpp index 76e5aa72..894a7b39 100644 --- a/lib/store/KoDirectoryStore.cpp +++ b/lib/store/KoDirectoryStore.cpp @@ -72,7 +72,7 @@ bool KoDirectoryStore::openReadOrWrite( const TQString& name, int iomode ) return false; } m_stream = TQT_TQIODEVICE(new TQFile( m_basePath + name )); - if ( !m_stream->tqopen( iomode ) ) + if ( !m_stream->open( iomode ) ) { delete m_stream; m_stream = 0L; diff --git a/lib/store/KoStoreDrag.h b/lib/store/KoStoreDrag.h index cbd8c40d..e35709e7 100644 --- a/lib/store/KoStoreDrag.h +++ b/lib/store/KoStoreDrag.h @@ -27,7 +27,7 @@ * This allows to drag-n-drop and copy-paste complex koffice objects. * As per usual with dragobjects, an instance of KoStoreDrag must be * created on the "sending" side (dragging or copying). The "receiving" - * side (dropping or pasting) only uses provides()/canDecode() and tqencodedData(). + * side (dropping or pasting) only uses provides()/canDecode() and encodedData(). * * To create the data in memory, create a TQBuffer, * then KoStore::createStore( theBuffer, .... ), save the diff --git a/lib/store/KoXmlWriter.cpp b/lib/store/KoXmlWriter.cpp index f3568606..6c3459f4 100644 --- a/lib/store/KoXmlWriter.cpp +++ b/lib/store/KoXmlWriter.cpp @@ -104,7 +104,7 @@ void KoXmlWriter::startElement( const char* tagName, bool indentInside ) { Q_ASSERT( tagName != 0 ); - // Tell parent that it has tqchildren + // Tell parent that it has children bool parentIndent = prepareForChild(); m_tags.push( Tag( tagName, parentIndent && indentInside ) ); @@ -387,7 +387,7 @@ void KoXmlWriter::addTextSpan( const TQString& text, const TQMap<int, int>& tabC nrSpaces = 0; leadingSpace = false; } - switch ( ch.tqunicode() ) { + switch ( ch.unicode() ) { case '\t': if ( !str.isEmpty() ) addTextNode( str ); diff --git a/lib/store/KoXmlWriter.h b/lib/store/KoXmlWriter.h index 5261dd5f..eaf453d2 100644 --- a/lib/store/KoXmlWriter.h +++ b/lib/store/KoXmlWriter.h @@ -226,7 +226,7 @@ private: : tagName( t ), hasChildren( false ), lastChildIsText( false ), openingTagClosed( false ), indentInside( ind ) {} const char* tagName; - bool hasChildren; ///< element or text tqchildren + bool hasChildren; ///< element or text children bool lastChildIsText; ///< last child is a text node bool openingTagClosed; ///< true once the '\>' in \<tag a="b"\> is written out bool indentInside; ///< whether to indent the contents of this tag diff --git a/lib/store/tests/storedroptest.cpp b/lib/store/tests/storedroptest.cpp index 9da8d2d8..f4b215ba 100644 --- a/lib/store/tests/storedroptest.cpp +++ b/lib/store/tests/storedroptest.cpp @@ -1,10 +1,10 @@ #include <kapplication.h> #include <kcmdlineargs.h> #include <KoStore.h> -#include <tqtextbrowser.h> +#include <textbrowser.h> #include <tqstringlist.h> #include <tqbuffer.h> -#include <tqclipboard.h> +#include <clipboard.h> class StoreDropTest : public TQTextBrowser { @@ -65,7 +65,7 @@ void StoreDropTest::keyPressEvent( TQKeyEvent * e ) void StoreDropTest::paste() { qDebug( "paste" ); - TQMimeSource* m = TQApplication::tqclipboard()->data(); + TQMimeSource* m = TQApplication::clipboard()->data(); if ( !m ) return; processMimeSource( m ); @@ -88,7 +88,7 @@ bool StoreDropTest::processMimeSource( TQMimeSource* ev ) formats += fmt; bool oasis = TQString( fmt ).startsWith( acceptMimeType ); if ( oasis || TQString( fmt ) == "application/x-kpresenter" ) { - TQByteArray data = ev->tqencodedData( fmt ); + TQByteArray data = ev->encodedData( fmt ); showZipContents( data, fmt, oasis ); return true; } @@ -127,11 +127,11 @@ void StoreDropTest::showZipContents( TQByteArray data, const char* mimeType, boo TQString StoreDropTest::loadTextFile( KoStore* store, const TQString& fileName ) { if ( !store->open( fileName ) ) - return TQString( "%1 not found\n" ).tqarg( fileName ); + return TQString( "%1 not found\n" ).arg( fileName ); TQByteArray data = store->device()->readAll(); store->close(); - TQString txt = TQString( "Found %1: \n" ).tqarg( fileName ); + TQString txt = TQString( "Found %1: \n" ).arg( fileName ); txt += TQString::fromUtf8( data.data(), data.size() ); txt += "\n"; return txt; diff --git a/lib/store/tests/xmlwritertest.cpp b/lib/store/tests/xmlwritertest.cpp index 28bd3b08..e4280cec 100644 --- a/lib/store/tests/xmlwritertest.cpp +++ b/lib/store/tests/xmlwritertest.cpp @@ -14,7 +14,7 @@ void speedTest() TQString paragText = TQString::fromUtf8( "This is the text of the paragraph. I'm including a euro sign to test encoding issues: €" ); TQCString styleName = "Heading 1"; - TQFile out( TQString::tqfromLatin1( "out5.xml" ) ); + TQFile out( TQString::fromLatin1( "out5.xml" ) ); if ( out.open(IO_WriteOnly) ) { KoXmlWriter writer( &out ); @@ -78,7 +78,7 @@ int main( int argc, char** argv ) { TEST_BEGIN( 0, 0 ); writer.startElement( "p", false /*no indent*/ ); - writer.addTextSpan( TQString::tqfromLatin1( " \t\n foo " ) ); + writer.addTextSpan( TQString::fromLatin1( " \t\n foo " ) ); writer.endElement(); TEST_END( "textspan test", "<r>\n" " <p><text:s text:c=\"3\"/><text:tab/><text:line-break/> foo<text:s text:c=\"2\"/></p>\n" @@ -97,14 +97,14 @@ int main( int argc, char** argv ) { TEST_BEGIN( 0, 0 ); writer.startElement( "p", false /*no indent*/ ); writer.addProcessingInstruction( "opendocument foobar" ); - writer.addTextSpan( TQString::tqfromLatin1( "foo" ) ); + writer.addTextSpan( TQString::fromLatin1( "foo" ) ); writer.endElement(); TEST_END( "processinginstruction test", "<r>\n" " <p><?opendocument foobar?>foo</p>\n" "</r>\n" ); TEST_BEGIN( 0, 0 ); - writer.addManifestEntry( TQString::tqfromLatin1( "foo/bar/blah" ), TQString::tqfromLatin1( "mime/type" ) ); + writer.addManifestEntry( TQString::fromLatin1( "foo/bar/blah" ), TQString::fromLatin1( "mime/type" ) ); TEST_END( "addManifestEntry", "<r>\n <manifest:file-entry manifest:media-type=\"mime/type\" manifest:full-path=\"foo/bar/blah\"/>\n</r>\n" ); int sz = 15000; // must be more than KoXmlWriter::s_escapeBufferLen @@ -119,7 +119,7 @@ int main( int argc, char** argv ) { TQString longPath; for ( uint i = 0 ; i < 1000 ; ++i ) - longPath += TQString::tqfromLatin1( "M10 10L20 20 " ); + longPath += TQString::fromLatin1( "M10 10L20 20 " ); expected = "<r a=\""; expected += longPath.utf8() + "\"/>\n"; TEST_BEGIN( 0, 0 ); @@ -131,9 +131,9 @@ int main( int argc, char** argv ) { bool val = true; int num = 1; double numdouble = 5.0; - writer.addConfigItem( TQString::tqfromLatin1( "TestConfigBool" ), val ); - writer.addConfigItem( TQString::tqfromLatin1( "TestConfigInt" ), num ); - writer.addConfigItem( TQString::tqfromLatin1( "TestConfigDouble" ), numdouble ); + writer.addConfigItem( TQString::fromLatin1( "TestConfigBool" ), val ); + writer.addConfigItem( TQString::fromLatin1( "TestConfigInt" ), num ); + writer.addConfigItem( TQString::fromLatin1( "TestConfigDouble" ), numdouble ); TEST_END( "test config", "<r>\n" " <config:config-item config:name=\"TestConfigBool\" config:type=\"boolean\">true</config:config-item>\n" " <config:config-item config:name=\"TestConfigInt\" config:type=\"int\">1</config:config-item>\n" diff --git a/lib/store/tests/xmlwritertest.h b/lib/store/tests/xmlwritertest.h index cdafe8a5..12011c03 100644 --- a/lib/store/tests/xmlwritertest.h +++ b/lib/store/tests/xmlwritertest.h @@ -34,8 +34,8 @@ TQCString s2 = expectedFull; \ if ( s1.length() != s2.length() ) \ qDebug( "got length %d, expected %d", s1.length(), s2.length() ); \ - s1.replace( TQRegExp( TQString::tqfromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \ - s2.replace( TQRegExp( TQString::tqfromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \ + s1.replace( TQRegExp( TQString::fromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \ + s2.replace( TQRegExp( TQString::fromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \ qDebug( "%s", s1.data() ); \ qDebug( "Expected:\n%s", s2.data() ); \ return 1; /*exit*/ \ diff --git a/tools/converter/koconverter.cpp b/tools/converter/koconverter.cpp index 2639301e..27e91426 100644 --- a/tools/converter/koconverter.cpp +++ b/tools/converter/koconverter.cpp @@ -56,7 +56,7 @@ bool convert( const KURL & uIn, const TQString & /*inputFormat*/, const KURL & u manager->setBatchMode( batch ); TQCString mime( outputFormat.latin1() ); - KoFilter::ConversiontqStatus status = manager->exp0rt( uOut.path(), mime ); + KoFilter::ConversionStatus status = manager->exp0rt( uOut.path(), mime ); progressObj.slotProgress(-1); delete manager; @@ -117,17 +117,17 @@ int main( int argc, char **argv ) KMimeType::Ptr inputMimetype = KMimeType::findByURL( uIn ); if ( inputMimetype->name() == KMimeType::defaultMimeType() ) { - kdError() << i18n("Mimetype for input file %1 not found!").tqarg(uIn.prettyURL()) << endl; + kdError() << i18n("Mimetype for input file %1 not found!").arg(uIn.prettyURL()) << endl; return 1; } KMimeType::Ptr outputMimetype; if ( args->isSet("mimetype") ) { - TQString mime = TQString::tqfromLatin1( args->getOption("mimetype") ); + TQString mime = TQString::fromLatin1( args->getOption("mimetype") ); outputMimetype = KMimeType::mimeType( mime ); if ( outputMimetype->name() == KMimeType::defaultMimeType() ) { - kdError() << i18n("Mimetype not found %1").tqarg(mime) << endl; + kdError() << i18n("Mimetype not found %1").arg(mime) << endl; return 1; } } diff --git a/tools/kfile-plugins/ooo/kfile_ooo.cpp b/tools/kfile-plugins/ooo/kfile_ooo.cpp index fc6ca9c3..b5c3d5d0 100644 --- a/tools/kfile-plugins/ooo/kfile_ooo.cpp +++ b/tools/kfile-plugins/ooo/kfile_ooo.cpp @@ -241,7 +241,7 @@ void KOfficePlugin::getEditingTime(KFileMetaInfoGroup group1, int res = getNumber(txt, &pos); if (pos >= len) return; - switch (txt.tqat(pos).latin1()) { + switch (txt.at(pos).latin1()) { case 'H': hours = res; break; @@ -259,7 +259,7 @@ void KOfficePlugin::getEditingTime(KFileMetaInfoGroup group1, } hours += days * 24; appendItem(group1, labelid, - i18n("%1:%2.%3").tqarg(hours).tqarg(minutes, 2).tqarg(seconds,2 )); + i18n("%1:%2.%3").arg(hours).arg(minutes, 2).arg(seconds,2 )); } void KOfficePlugin::getDateTime(KFileMetaInfoGroup group1, @@ -336,7 +336,7 @@ bool KOfficePlugin::readInfo( KFileMetaInfo& info, uint /*what*/) if (node.isElement()){ appendItem(groupuser, node.toElement().attribute(metaname, - TQString("User %1").tqarg(i)), + TQString("User %1").arg(i)), node.toElement().text()); } } diff --git a/tools/kthesaurus/main.cc b/tools/kthesaurus/main.cc index a7e74822..bc1f4c06 100644 --- a/tools/kthesaurus/main.cc +++ b/tools/kthesaurus/main.cc @@ -59,7 +59,7 @@ extern "C" KOFFICETOOLS_EXPORT int kdemain(int argc, char **argv) } /* TODO: get selection(), not only clipboard! - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); TQString text = cb->text(); if( text.isNull() || text.length() > 50 ) { // long texts are probably not supposed to be searched for diff --git a/tools/spell/main.cc b/tools/spell/main.cc index db6e3fa1..4489aa4f 100644 --- a/tools/spell/main.cc +++ b/tools/spell/main.cc @@ -81,7 +81,7 @@ bool SpellChecker::run( const TQString& command, void* data, const TQString& dat KConfig * config = instance()->config(); TQCString gn( "KSpell " ); gn += instance()->instanceName(); // for compat reasons, and to avoid finding the group in kdeglobals (hmm...) - TQString groupName = TQString::tqfromLatin1( gn ); + TQString groupName = TQString::fromLatin1( gn ); //kdDebug() << "Group: " << groupName << endl; if ( config->hasGroup( groupName ) ) { @@ -114,7 +114,7 @@ bool SpellChecker::run( const TQString& command, void* data, const TQString& dat #endif #if 0 //fixme // Call the spell checker - KSpell::spelltqStatus status=(KSpell::spelltqStatus)KSpell::modalCheck( buffer, &ksconfig ); + KSpell::spellStatus status=(KSpell::spellStatus)KSpell::modalCheck( buffer, &ksconfig ); if (status == KSpell::Error) { diff --git a/tools/thesaurus/main.cc b/tools/thesaurus/main.cc index 573b907c..32271af8 100644 --- a/tools/thesaurus/main.cc +++ b/tools/thesaurus/main.cc @@ -97,11 +97,11 @@ Thesaurus::Thesaurus(TQObject* parent, const char* name, const TQStringList &) row1->addWidget(m_edit, 1); row1->addWidget(m_search, 0); m_back = new TQToolButton(m_page); - m_back->setIconSet(BarIconSet(TQString::tqfromLatin1("back"))); + m_back->setIconSet(BarIconSet(TQString::fromLatin1("back"))); TQToolTip::add(m_back, i18n("Back")); row1->addWidget(m_back, 0); m_forward = new TQToolButton(m_page); - m_forward->setIconSet(BarIconSet(TQString::tqfromLatin1("forward"))); + m_forward->setIconSet(BarIconSet(TQString::fromLatin1("forward"))); TQToolTip::add(m_forward, i18n("Forward")); row1->addWidget(m_forward, 0); m_lang = new KPushButton(i18n("Change Language..."), m_page); @@ -302,7 +302,7 @@ void Thesaurus::setCaption() { KURL url = KURL(); url.setPath(m_data_file); - m_dialog->setCaption(i18n("Related Words - %1").tqarg(url.fileName())); + m_dialog->setCaption(i18n("Related Words - %1").arg(url.fileName())); } // Enbale or disable back and forward button @@ -429,7 +429,7 @@ void Thesaurus::thesExited(KProcess *) if( !m_thesproc_stderr.isEmpty() ) { KMessageBox::error(0, i18n("<b>Error:</b> Failed to execute grep. " - "Output:<br>%1").tqarg(m_thesproc_stderr)); + "Output:<br>%1").arg(m_thesproc_stderr)); TQApplication::restoreOverrideCursor(); return; } @@ -590,10 +590,10 @@ void Thesaurus::findTermWordnet(const TQString &term) m_combobox->insertItem(i18n("Synonyms/Hypernyms - Ordered by Frequency")); m_combobox->insertItem(i18n("Synonyms - Ordered by Similarity of Meaning (verbs only)")); m_combobox->insertItem(i18n("Antonyms - Words with Opposite Meanings")); - m_combobox->insertItem(i18n("Hyponyms - ... is a (kind of) %1").tqarg(m_edit->currentText())); - m_combobox->insertItem(i18n("Meronyms - %1 has a ...").tqarg(m_edit->currentText())); + m_combobox->insertItem(i18n("Hyponyms - ... is a (kind of) %1").arg(m_edit->currentText())); + m_combobox->insertItem(i18n("Meronyms - %1 has a ...").arg(m_edit->currentText())); // 5: - m_combobox->insertItem(i18n("Holonyms - ... has a %1").tqarg(m_edit->currentText())); + m_combobox->insertItem(i18n("Holonyms - ... has a %1").arg(m_edit->currentText())); m_combobox->insertItem(i18n("Attributes")); m_combobox->insertItem(i18n("Cause To (for some verbs only)")); m_combobox->insertItem(i18n("Verb Entailment (for some verbs only)")); @@ -604,7 +604,7 @@ void Thesaurus::findTermWordnet(const TQString &term) m_combobox->insertItem(i18n("Overview of Senses")); /** NOT todo: - * -Hypernym tree: tqlayout is difficult, you can get the same information + * -Hypernym tree: layout is difficult, you can get the same information * by following links * -Coordinate terms (sisters): just go to synset and then use hyponyms * -Has Part Meronyms, Has Substance Meronyms, Has Member Meronyms, @@ -648,13 +648,13 @@ void Thesaurus::wnExited(KProcess *) if( !m_wnproc_stderr.isEmpty() ) { m_resultbox->setText(i18n("<b>Error:</b> Failed to execute WordNet program 'wn'. " - "Output:<br>%1").tqarg(m_wnproc_stderr)); + "Output:<br>%1").arg(m_wnproc_stderr)); TQApplication::restoreOverrideCursor(); return; } if( m_wnproc_stdout.isEmpty() ) { - m_resultbox->setText(i18n("No match for '%1'.").tqarg(m_edit->currentText())); + m_resultbox->setText(i18n("No match for '%1'.").arg(m_edit->currentText())); } else { // render in a table, each line one row: TQStringList lines = lines.split(TQChar('\n'), m_wnproc_stdout, false); @@ -677,7 +677,7 @@ void Thesaurus::wnExited(KProcess *) // TODO?: // move "=>" in own column? l = formatLine(l); - // Table tqlayout: + // Table layout: result += "<tr>"; if( l.startsWith(" ") ) { result += "\t<td width=\"15\"></td>"; diff --git a/tools/thesaurus/main.h b/tools/thesaurus/main.h index 01c27621..da01b2f2 100644 --- a/tools/thesaurus/main.h +++ b/tools/thesaurus/main.h @@ -27,7 +27,7 @@ #include <tqcombobox.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <tqobject.h> #include <tqregexp.h> @@ -35,7 +35,7 @@ #include <tqstringlist.h> #include <tqtabdialog.h> #include <tqtabwidget.h> -#include <tqtextbrowser.h> +#include <textbrowser.h> #include <tqtooltip.h> #include <tqwidget.h> #include <tqvbox.h> diff --git a/tools/thesaurus/thesaurus.txt b/tools/thesaurus/thesaurus.txt index 17cefdf7..6f2f47ed 100644 --- a/tools/thesaurus/thesaurus.txt +++ b/tools/thesaurus/thesaurus.txt @@ -1877,9 +1877,9 @@ ;hushed;muted;subdued;quiet;#;soft; ;little;small;#;soft; ;low;low-toned;#;soft; -;full;#;booming;stentorian;grumbling;rumbling;plangent;rich;orotund;rotund;round;pear-tqshaped;sounding;heavy;sonorous; +;full;#;booming;stentorian;grumbling;rumbling;plangent;rich;orotund;rotund;round;pear-shaped;sounding;heavy;sonorous; ;rich;#;full; -;orotund;rotund;round;pear-tqshaped;#;full; +;orotund;rotund;round;pear-shaped;#;full; ;heavy;sonorous;#;full; ;thin;#;pale; ;pale;#;thin; @@ -2701,10 +2701,10 @@ ;sinful;unholy;wicked;#;unrighteous; ;cast-iron;iron;#;robust; ;decrepit;feeble;infirm;sapless;weak;weakly;#;frail; -;round;circular;#;ball-tqshaped;global;globose;globular;orbicular;spheric;spherical;bulblike;bulbous;capitate;discoid;discoidal;disklike;moonlike;moon-round;ringlike;roundish;coccoid;nutlike;pear-tqshaped;orbiculate;orbicular; -;ball-tqshaped;global;globose;globular;orbicular;spheric;spherical;#;round;circular; +;round;circular;#;ball-shaped;global;globose;globular;orbicular;spheric;spherical;bulblike;bulbous;capitate;discoid;discoidal;disklike;moonlike;moon-round;ringlike;roundish;coccoid;nutlike;pear-shaped;orbiculate;orbicular; +;ball-shaped;global;globose;globular;orbicular;spheric;spherical;#;round;circular; ;square;#;quadrate;right-angled;squared;squarish; -;annular;annulate;annulated;circinate;circular;ringed;ring-tqshaped;#;rounded; +;annular;annulate;annulated;circinate;circular;ringed;ring-shaped;#;rounded; ;rural;#;agrarian;agricultural;farming;agrestic;rustic;arcadian;bucolic;pastoral;rustic;campestral;countrified;countryfied;rustic;country;country-bred;country-style;country;cracker-barrel;folksy;homespun;frontier;hick;hobnailed;farm; ;agrarian;agricultural;farming;#;rural; ;urban;#;citified;cityfied;city-bred;city-born;urbanized;urbanised; @@ -2853,9 +2853,9 @@ ;noteworthy;remarkable;#;significant;important; ;operative;key;#;significant;important; ;light;#;insignificant;unimportant; -;simple;unsubdivided;#;acerate;acerose;acicular;needle-tqshaped;needlelike;acuminate;apiculate;caudate;cordate;heart-tqshaped;cuneate;wedge-tqshaped;deltoid;dolabriform;dolabrate;elliptic;ensiform;sword-tqshaped;swordlike;bladelike;hastate;spearhead-tqshaped;lanceolate;lancelike;linear;elongate;lyrate;obtuse;oblanceolate;oblong;obovate;orbiculate;orbicular;ovate;pandurate;panduriform;fiddle-tqshaped;peltate;shield-tqshaped;perfoliate;reniform;kidney-tqshaped;sagittate;sagittiform;arrow-tqshaped;spatulate;spatula-tqshaped;unlobed; +;simple;unsubdivided;#;acerate;acerose;acicular;needle-shaped;needlelike;acuminate;apiculate;caudate;cordate;heart-shaped;cuneate;wedge-shaped;deltoid;dolabriform;dolabrate;elliptic;ensiform;sword-shaped;swordlike;bladelike;hastate;spearhead-shaped;lanceolate;lancelike;linear;elongate;lyrate;obtuse;oblanceolate;oblong;obovate;orbiculate;orbicular;ovate;pandurate;panduriform;fiddle-shaped;peltate;shield-shaped;perfoliate;reniform;kidney-shaped;sagittate;sagittiform;arrow-shaped;spatulate;spatula-shaped;unlobed; ;linear;elongate;#;simple;unsubdivided; -;compound;#;bilobate;bilobated;bilobed;binate;bipinnate;cleft;dissected;conjugate;decompound;even-pinnate;abruptly-pinnate;paripinnate;incised;lobed;lobate;odd-pinnate;imparipinnate;parted;palmate;palm-tqshaped;pedate;pinnate;pinnated;pinnatifid;pinnatisect;quinquefoliate;ternate;trifoliate;trifoliolate;trifoliated;trilobate;trilobated;trilobed;bipartite;bipinnatifid;palmatifid;tripinnate;tripinnated;tripinnatifid; +;compound;#;bilobate;bilobated;bilobed;binate;bipinnate;cleft;dissected;conjugate;decompound;even-pinnate;abruptly-pinnate;paripinnate;incised;lobed;lobate;odd-pinnate;imparipinnate;parted;palmate;palm-shaped;pedate;pinnate;pinnated;pinnatifid;pinnatisect;quinquefoliate;ternate;trifoliate;trifoliolate;trifoliated;trilobate;trilobated;trilobed;bipartite;bipinnatifid;palmatifid;tripinnate;tripinnated;tripinnatifid; ;simple;#;elemental;ultimate;oversimplified;simplistic;simplex;simplified;unanalyzable;undecomposable;uncomplicated;unsophisticated; ;elemental;ultimate;#;simple; ;complex;#;analyzable;decomposable;Byzantine;convoluted;intricate;involved;knotty;labyrinthine;tangled;tortuous;colonial;compound;complicated;composite;compound;gordian;interlacing;interlinking;interlocking;interwoven;labyrinthine;labyrinthian;mazy;multifactorial;multiplex;thickening; @@ -3897,7 +3897,7 @@ ;motivation;motive;need;#;psychological feature; ;feeling;#;psychological feature; ;location;#;breathe;take a breath;respire; -;tqshape;form;#;attribute; +;shape;form;#;attribute; ;time;#;abstraction; ;space;#;abstraction; ;act;human action;human activity;# @@ -4427,8 +4427,8 @@ ;damage;harm;hurt;scathe;#;change of integrity; ;wound;wounding;#;damage;harm;hurt;scathe; ;burn;#;damage;harm;hurt;scathe; -;fold;folding;#;change of tqshape; -;protrusion;projection;jut;jutting;#;change of tqshape; +;fold;folding;#;change of shape; +;protrusion;projection;jut;jutting;#;change of shape; ;activity;#;act;human action;human activity; ;operation;#;activity; ;practice;pattern;#;activity; @@ -4976,7 +4976,7 @@ ;organization;organisation;arrangement;#;activity; ;order;ordering;#;organization;organisation;arrangement; ;succession;sequence;#;order;ordering; -;tqlayout;#;order;ordering; +;layout;#;order;ordering; ;listing;itemization;itemisation;#;organization;organisation;arrangement; ;grouping;#;activity; ;categorization;categorisation;classification;compartmentalization;compartmentalisation;#;grouping; @@ -6268,7 +6268,7 @@ ;horn;#;noisemaker; ;horror;#;thing; ;horse;#;gymnastic apparatus;exerciser; -;horseshoe;shoe;U-tqshaped plate;#;plate;scale;shell; +;horseshoe;shoe;U-shaped plate;#;plate;scale;shell; ;hospital;infirmary;#;medical building;health facility; ;hostel;hostelry;inn;lodge;#;hotel; ;hotel;#;building;edifice; @@ -6471,7 +6471,7 @@ ;microphone;mike;#;electro-acoustic transducer; ;military post;post;#;military installation; ;mill;grinder;#;machine; -;miller;milling machine;#;tqshaper;shaping machine; +;miller;milling machine;#;shaper;shaping machine; ;mine;#;explosive device; ;mine;#;excavation;hole in the ground; ;miniature;toy;#;copy; @@ -7239,7 +7239,7 @@ ;perspective;linear perspective;#;appearance;visual aspect; ;phase;#;appearance;visual aspect; ;format;#;appearance;visual aspect; -;form;tqshape;cast;#;appearance;visual aspect; +;form;shape;cast;#;appearance;visual aspect; ;persona;image;#;appearance;visual aspect; ;semblance;color;colour;#;appearance;visual aspect; ;face;#;appearance;visual aspect; @@ -7569,7 +7569,7 @@ ;beat;#;pace;rate; ;dispatch;despatch;expedition;expeditiousness;#;celerity;quickness;rapidity; ;haste;hastiness;hurry;hurriedness;#;speed;swiftness;fastness; -;tqshape;form;configuration;contour;#;spatial property;spatiality; +;shape;form;configuration;contour;#;spatial property;spatiality; ;symmetry;symmetricalness;correspondence;balance;#;spatial property;spatiality; ;tilt;list;inclination;lean;leaning;#;position;spatial relation; ;gradient;grade;slope;#;position;spatial relation; @@ -7577,12 +7577,12 @@ ;upgrade;rise;rising slope;#;grade; ;pitch;rake;slant;#;gradient;grade;slope; ;point;pointedness;#;taper; -;curvature;curve;#;tqshape;form;configuration;contour; +;curvature;curve;#;shape;form;configuration;contour; ;position;spatial relation;#;relation; ;placement;arrangement;#;position;spatial relation; ;composition;composing;#;placement;arrangement; ;proportion;balance;#;placement;arrangement; -;true;#;tqalignment; +;true;#;alignment; ;position;posture;attitude;#;bodily property; ;presentation;#;position;posture;attitude; ;guard;#;position;posture;attitude; @@ -7779,8 +7779,8 @@ ;tone;#;quality; ;resistance;#;unresponsiveness; ;body;organic structure;physical structure;#;natural object; -;human body;physical body;material body;soma;build;figure;physique;anatomy;tqshape;bod;chassis;frame;form;flesh;#;body;organic structure;physical structure; -;person;#;human body;physical body;material body;soma;build;figure;physique;anatomy;tqshape;bod;chassis;frame;form;flesh; +;human body;physical body;material body;soma;build;figure;physique;anatomy;shape;bod;chassis;frame;form;flesh;#;body;organic structure;physical structure; +;person;#;human body;physical body;material body;soma;build;figure;physique;anatomy;shape;bod;chassis;frame;form;flesh; ;body;dead body;#;natural object; ;cadaver;corpse;stiff;clay;remains;#;body;dead body; ;mummy;#;body;dead body; @@ -7794,7 +7794,7 @@ ;system;#;body part; ;sheath;case;#;covering;natural covering;cover; ;skin;tegument;cutis;#;connective tissue;body covering; -;tube;tube-tqshaped structure;#;structure;anatomical structure;complex body part;bodily structure;body structure; +;tube;tube-shaped structure;#;structure;anatomical structure;complex body part;bodily structure;body structure; ;passage;passageway;#;structure;anatomical structure;complex body part;bodily structure;body structure; ;orifice;opening;porta;#;passage;passageway; ;duct;canal;channel;#;passage;passageway; @@ -7845,7 +7845,7 @@ ;chamber;#;cavity;bodily cavity;cavum; ;valve;#;structure;anatomical structure;complex body part;bodily structure;body structure; ;stomach;tummy;tum;breadbasket;#;internal organ;viscus; -;vessel;vas;#;tube;tube-tqshaped structure; +;vessel;vas;#;tube;tube-shaped structure; ;liquid body substance;bodily fluid;body fluid;humor;humour;#;body substance; ;juice;succus;#;liquid body substance;bodily fluid;body fluid;humor;humour; ;milk;#;liquid body substance;bodily fluid;body fluid;humor;humour;nutriment;nourishment;nutrition;sustenance;aliment;alimentation;victuals; @@ -8314,7 +8314,7 @@ ;concept;conception;construct;#;idea;thought; ;perception;#;conceptualization;conceptualisation;conceptuality; ;notion;#;concept;conception;construct; -;tqlayout;#;design;plan; +;layout;#;design;plan; ;redundancy;#;configuration;constellation; ;trap;snare;#;design;plan; ;idea;#;opinion;sentiment;persuasion;view;thought; @@ -8457,9 +8457,9 @@ ;percept;perception;perceptual experience;#;representation;mental representation;internal representation; ;figure;#;percept;perception;perceptual experience; ;ground;#;percept;perception;perceptual experience; -;form;tqshape;pattern;#;structure; -;mosaic;#;form;tqshape;pattern; -;strand;#;form;tqshape;pattern; +;form;shape;pattern;#;structure; +;mosaic;#;form;shape;pattern; +;strand;#;form;shape;pattern; ;sight;#;visual percept;visual image; ;view;aspect;prospect;scene;vista;panorama;#;visual percept;visual image; ;background;ground;#;view;aspect;prospect;scene;vista;panorama; @@ -8479,7 +8479,7 @@ ;appearance;#;representation;mental representation;internal representation; ;illusion;semblance;#;appearance; ;front;#;appearance; -;tqshape;embodiment;#;concretism;concrete representation; +;shape;embodiment;#;concretism;concrete representation; ;belief;#;content;cognitive content;mental object; ;conviction;strong belief;article of faith;#;belief; ;faith;trust;#;belief; @@ -10440,7 +10440,7 @@ ;shock;#;mass; ;shock;#;pile;heap;mound;cumulus; ;combination;#;collection;aggregation;accumulation;assemblage; -;combination;#;alliance;coalition;tqalignment;alinement; +;combination;#;alliance;coalition;alignment;alinement; ;body;#;gathering;assemblage; ;public;#;body; ;world;domain;#;class;social class;socio-economic class; @@ -10605,7 +10605,7 @@ ;tribe;federation of tribes;#;nation; ;state;nation;country;land;commonwealth;res publica;body politic;#;political unit; ;member;#;unit;social unit; -;bloc;axis;#;alliance;coalition;tqalignment;alinement; +;bloc;axis;#;alliance;coalition;alignment;alinement; ;Europe;#;collection;aggregation;accumulation;assemblage; ;Asia;#;collection;aggregation;accumulation;assemblage; ;European Union;EU;European Community;EC;European Economic Community;EEC;Common Market;Europe;#;world organization;international organization; @@ -10766,7 +10766,7 @@ ;fleet;#;steamship company;steamship line; ;fleet;#;collection;aggregation;accumulation;assemblage; ;fleet;#;collection;aggregation;accumulation;assemblage; -;alliance;coalition;tqalignment;alinement;#;organization;organisation; +;alliance;coalition;alignment;alinement;#;organization;organisation; ;United Nations;UN;#;world organization;international organization; ;International Monetary Fund;IMF;#;United Nations agency;UN agency; ;World Health Organization;WHO;#;United Nations agency;UN agency; @@ -12048,7 +12048,7 @@ ;general practitioner;GP;#;doctor;doc;physician;MD;Dr.;medico; ;geezer;bloke;#;man;adult male; ;general;full general;#;general officer; -;generator;source;author;#;maker;tqshaper; +;generator;source;author;#;maker;shaper; ;genius;mastermind;brain;#;intellectual;intellect; ;gentleman;#;man;adult male; ;ghostwriter;ghost;#;writer;author; @@ -12170,7 +12170,7 @@ ;mailman;postman;mail carrier;letter carrier;carrier;#;deliveryman;delivery boy;deliverer; ;major;#;commissioned military officer; ;major;#;student;pupil;educatee; -;maker;tqshaper;#;creator; +;maker;shaper;#;creator; ;male child;boy;#;male;male person; ;man;adult male;#;male;male person; ;man;#;male;male person;lover; @@ -12178,7 +12178,7 @@ ;man;#;person;individual;someone;somebody;mortal;human;soul; ;man;#;subordinate;subsidiary;underling; ;mannequin;manikin;mannikin;manakin;fashion model;model;#;assistant;helper;help;supporter; -;manufacturer;producer;#;maker;tqshaper; +;manufacturer;producer;#;maker;shaper; ;marauder;predator;vulture;#;attacker;aggressor;assailant;assaulter; ;Marine;devil dog;leatherneck;shipboard soldier;#;serviceman;military man;man;military personnel; ;marshal;marshall;#;lawman;law officer;peace officer; @@ -13922,62 +13922,62 @@ ;change;#;relation; ;difference;#;change; ;implication;logical implication;conditional relation;#;logical relation; -;solid;#;tqshape;form; -;plane;sheet;#;tqshape;form; -;figure;#;tqshape;form; -;line;#;tqshape;form; +;solid;#;shape;form; +;plane;sheet;#;shape;form; +;figure;#;shape;form; +;line;#;shape;form; ;cylinder;#;solid; ;heart;#;plane figure;two-dimensional figure; -;curve;curved tqshape;#;line; -;wave;#;curve;curved tqshape; -;bend;crook;turn;#;curve;curved tqshape; -;hook;crotchet;#;curve;curved tqshape; -;envelope;#;curve;curved tqshape; -;connection;connexion;link;#;tqshape;form; +;curve;curved shape;#;line; +;wave;#;curve;curved shape; +;bend;crook;turn;#;curve;curved shape; +;hook;crotchet;#;curve;curved shape; +;envelope;#;curve;curved shape; +;connection;connexion;link;#;shape;form; ;diameter;#;straight line; -;pit;fossa;#;concave tqshape;concavity;cavity;bodily cavity;cavum; -;recess;recession;niche;corner;#;concave tqshape;concavity; +;pit;fossa;#;concave shape;concavity;cavity;bodily cavity;cavum; +;recess;recession;niche;corner;#;concave shape;concavity; ;circle;#;ellipse;oval; -;circle;#;tqshape;form; +;circle;#;shape;form; ;chord;#;straight line; ;sector;#;plane figure;two-dimensional figure; -;disk;disc;saucer;#;round tqshape; +;disk;disc;saucer;#;round shape; ;ring;halo;annulus;anulus;doughnut;anchor ring;#;toroid; -;loop;#;round tqshape; -;coil;whorl;roll;curl;curlicue;ringlet;gyre;scroll;#;round tqshape; +;loop;#;round shape; +;coil;whorl;roll;curl;curlicue;ringlet;gyre;scroll;#;round shape; ;element;#;straight line; ;kink;twist;twirl;#;fold;crease;plication;flexure;crimp;bend; ;square;foursquare;#;rectangle; -;triangle;trigon;trilateral;#;polygon;polygonal tqshape; +;triangle;trigon;trilateral;#;polygon;polygonal shape; ;star;#;plane figure;two-dimensional figure; ;box;#;rectangle; -;knot;gnarl;#;distorted tqshape;distortion; -;arch;#;curve;curved tqshape; -;bell;bell tqshape;campana;#;curve;curved tqshape; +;knot;gnarl;#;distorted shape;distortion; +;arch;#;curve;curved shape; +;bell;bell shape;campana;#;curve;curved shape; ;angle;#;space; ;hour angle;HA;#;angular distance; ;dip;angle of dip;magnetic dip;magnetic inclination;inclination;#;angle; ;lead;#;angle; -;bowl;trough;#;concave tqshape;concavity; +;bowl;trough;#;concave shape;concavity; ;groove;channel;#;depression;impression;imprint; -;scoop;pocket;#;concave tqshape;concavity; -;node;knob;thickening;#;convex tqshape;convexity; -;bow;arc;#;curve;curved tqshape; -;depression;impression;imprint;#;concave tqshape;concavity; +;scoop;pocket;#;concave shape;concavity; +;node;knob;thickening;#;convex shape;convexity; +;bow;arc;#;curve;curved shape; +;depression;impression;imprint;#;concave shape;concavity; ;base;#;flank; ;balance;equilibrium;equipoise;counterbalance;#;structure;construction; ;symmetry;proportion;#;balance;equilibrium;equipoise;counterbalance; -;sphere;#;round tqshape; +;sphere;#;round shape; ;hemisphere;#;subfigure; -;sphere;#;round tqshape; +;sphere;#;round shape; ;ball;globe;orb;#;sphere; -;cylinder;#;round tqshape; -;column;tower;pillar;#;tqshape;form; +;cylinder;#;round shape; +;column;tower;pillar;#;shape;form; ;barrel;drum;#;cylinder; ;pipe;tube;#;cylinder; -;drop;bead;pearl;#;round tqshape; -;ridge;#;convex tqshape;convexity; -;point;tip;peak;#;convex tqshape;convexity; +;drop;bead;pearl;#;round shape; +;ridge;#;convex shape;convexity; +;point;tip;peak;#;convex shape;convexity; ;boundary;edge;bound;#;line; ;margin;border;perimeter;#;boundary;edge;bound; ;periphery;fringe;outer boundary;#;boundary;edge;bound; @@ -13985,13 +13985,13 @@ ;crown;peak;summit;#;upper bound; ;diagonal;bias;#;straight line; ;dip;#;depression;impression;imprint; -;cup;#;concave tqshape;concavity; +;cup;#;concave shape;concavity; ;incision;scratch;prick;slit;dent;#;depression;impression;imprint; ;score;scotch;#;incision;scratch;prick;slit;dent; ;wrinkle;furrow;crease;crinkle;seam;line;#;depression;impression;imprint; ;crevice;cranny;crack;fissure;chap;#;depression;impression;imprint; -;fold;crease;plication;flexure;crimp;bend;#;angular tqshape;angularity; -;space;#;amorphous tqshape; +;fold;crease;plication;flexure;crimp;bend;#;angular shape;angularity; +;space;#;amorphous shape; ;node;#;connection;connexion;link; ;articulation;join;joint;juncture;junction;#;connection;connexion;link; ;hole;#;space; @@ -14005,7 +14005,7 @@ ;block;cube;#;solid; ;tail;tail end;#;projection; ;tongue;knife;#;projection; -;projection;#;convex tqshape;convexity; +;projection;#;convex shape;convexity; ;medium;#;state; ;condition;#;state; ;condition;status;#;state; @@ -14445,11 +14445,11 @@ ;vulnerability;exposure;#;danger; ;tension;tensity;tenseness;tautness;#;condition;status; ;tonicity;tonus;tone;#;tension;tensity;tenseness;tautness; -;condition;tqshape;#;good health;healthiness; -;fitness;physical fitness;good tqshape;good condition;#;condition;tqshape; +;condition;shape;#;good health;healthiness; +;fitness;physical fitness;good shape;good condition;#;condition;shape; ;repair;#;condition;status; ;seaworthiness;fitness;#;soundness; -;disability;disablement;handicap;impairment;#;unfitness;poor tqshape;bad condition; +;disability;disablement;handicap;impairment;#;unfitness;poor shape;bad condition; ;putrescence;putridness;rottenness;corruption;#;putrefaction;rot; ;devastation;desolation;ruin;#;deterioration;impairment; ;wear;#;deterioration;impairment; @@ -15115,20 +15115,20 @@ ;affect;impact;bear upon;bear on;touch on;touch;#;change;alter; ;change by reversal;turn;reverse;#;change; ;switch over;switch;exchange;#;change by reversal;turn;reverse; -;granulate;grain;#;change tqshape;change form;deform; -;tie;#;tqshape;form; -;terrace;#;tqshape;form; -;fork;#;tqshape;form; -;tqshape;form;#;change;alter; -;dimension;#;tqshape;form; -;roll;#;tqshape;form; -;draw;#;tqshape;form; -;strike;#;tqshape;form; -;twist;#;tqshape;form; -;granulate;grain;#;tqshape;form; -;ridge;#;tqshape;form; -;round;round out;round off;#;tqshape;form; -;square;square up;#;tqshape;form; +;granulate;grain;#;change shape;change form;deform; +;tie;#;shape;form; +;terrace;#;shape;form; +;fork;#;shape;form; +;shape;form;#;change;alter; +;dimension;#;shape;form; +;roll;#;shape;form; +;draw;#;shape;form; +;strike;#;shape;form; +;twist;#;shape;form; +;granulate;grain;#;shape;form; +;ridge;#;shape;form; +;round;round out;round off;#;shape;form; +;square;square up;#;shape;form; ;round off;round down;round out;round;#;change;alter; ;change state;turn;#;change; ;fall;#;change state;turn; @@ -15315,8 +15315,8 @@ ;age;get on;mature;maturate;#;develop; ;turn;#;age;get on;mature;maturate; ;age;#;develop; -;progress;come on;come along;advance;get on;get along;tqshape up;#;develop; -;climb;#;progress;come on;come along;advance;get on;get along;tqshape up; +;progress;come on;come along;advance;get on;get along;shape up;#;develop; +;climb;#;progress;come on;come along;advance;get on;get along;shape up; ;age;#;change;alter; ;mature;maturate;grow;#;develop; ;grow;#;change; @@ -15346,7 +15346,7 @@ ;piece;patch;#;repair;mend;fix;bushel;doctor;furbish up;restore;touch on; ;point;repoint;#;repair;mend;fix;bushel;doctor;furbish up;restore;touch on; ;patch;patch up;#;repair;mend;fix;bushel;doctor;furbish up;restore;touch on; -;dish;#;tqshape;form; +;dish;#;shape;form; ;bulk;#;bulge;pouch;protrude; ;inflate;blow up;expand;amplify;#;increase; ;reform;#;better;improve;amend;ameliorate;meliorate; @@ -15413,7 +15413,7 @@ ;regulate;modulate;#;adjust;set; ;adapt;accommodate;#;change;alter;vary; ;fit;#;adapt;accommodate; -;fit;#;tqshape;form; +;fit;#;shape;form; ;qualify;dispose;#;prepare;groom;train; ;temper;harden;#;modify; ;anneal;temper;#;toughen; @@ -15584,7 +15584,7 @@ ;dull;#;weaken; ;cloud;#;dull; ;dull;#;change; -;sharpen;taper;point;#;change tqshape;change form;deform; +;sharpen;taper;point;#;change shape;change form;deform; ;flatten;drop;#;change;alter; ;phase;#;synchronize;synchronise;sync; ;blend;flux;mix;conflate;commingle;immix;fuse;coalesce;meld;combine;merge;#;change integrity; @@ -15724,12 +15724,12 @@ ;perfect;hone;#;better;improve;amend;ameliorate;meliorate; ;polish;round;round off;polish up;brush up;#;perfect;hone; ;polish;refine;fine-tune;down;#;better;improve;amend;ameliorate;meliorate; -;deform;distort;strain;#;tqshape;form; -;draw;#;change tqshape;change form;deform; -;blow;#;tqshape;form; -;block;#;tqshape;form; -;block;#;tqshape;form; -;cup;#;tqshape;form; +;deform;distort;strain;#;shape;form; +;draw;#;change shape;change form;deform; +;blow;#;shape;form; +;block;#;shape;form; +;block;#;shape;form; +;cup;#;shape;form; ;mar;impair;spoil;deflower;vitiate;#;damage; ;stamp;#;snuff out;extinguish; ;kill;obliterate;wipe out;#;take away;take out; @@ -16156,11 +16156,11 @@ ;format;#;determine;set; ;charge;#;determine;set; ;determine;#;specify;define;delineate;delimit;delimitate; -;determine;tqshape;mold;influence;regulate;#;cause;do;make; -;decide;#;determine;tqshape;mold;influence;regulate; -;time;#;determine;tqshape;mold;influence;regulate; -;index;#;determine;tqshape;mold;influence;regulate; -;pace;#;determine;tqshape;mold;influence;regulate; +;determine;shape;mold;influence;regulate;#;cause;do;make; +;decide;#;determine;shape;mold;influence;regulate; +;time;#;determine;shape;mold;influence;regulate; +;index;#;determine;shape;mold;influence;regulate; +;pace;#;determine;shape;mold;influence;regulate; ;deliberate;cogitate;#;chew over;think over;meditate;ponder;excogotate;contemplate;muse;reflect;mull;mull over;ruminate;speculate; ;see;#;deliberate;cogitate; ;contemplate;#;consider;take;deal;look at; @@ -16403,7 +16403,7 @@ ;swallow;take back;unsay;withdraw;#;renounce;repudiate; ;retreat;pull back;back out;back away;crawfish;crawfish out;pull in one's horns;withdraw;# ;revoke;annul;lift;countermand;reverse;repeal;overturn;rescind;vacate;#;cancel;strike down; -;cancel;tqinvalidate;#;score;mark; +;cancel;invalidate;#;score;mark; ;bracket;bracket out;#;edit;redact; ;cross off;cross out;strike out;strike off;mark;#;take away;take out; ;dismiss;disregard;brush aside;brush off;discount;push aside;ignore;#;reject; @@ -17342,7 +17342,7 @@ ;cling to;hold close;hold tight;clutch;#;hold;take hold; ;cling;cleave;adhere;stick;cohere;#;touch;adjoin;meet;contact; ;twist;#;turn; -;twist;twine;distort;#;change tqshape;change form;deform; +;twist;twine;distort;#;change shape;change form;deform; ;curl;wave;#;twist; ;grip;#;seize;prehend;clutch; ;wield;handle;#;manipulate; @@ -17419,8 +17419,8 @@ ;slice;slice up;#;cut; ;pink;#;cut; ;carve;cut up;#;cut; -;carve;#;cut;tqshape;form;work;mold;mould;forge; -;swage;upset;#;tqshape;form;work;mold;mould;forge; +;carve;#;cut;shape;form;work;mold;mould;forge; +;swage;upset;#;shape;form;work;mold;mould;forge; ;carve;chip at;#;cut; ;chop;hack;#;cut; ;chop;chop up;#;cut; @@ -17430,7 +17430,7 @@ ;nick;snick;#;cut; ;chip;knap;cut off;break off;#;cut; ;chip;chip off;come off;break away;break off;#;separate;divide;part; -;chip;#;tqshape;form;work;mold;mould;forge; +;chip;#;shape;form;work;mold;mould;forge; ;skim;skim off;cream off;cream;#;remove;take;take away;withdraw; ;egg;#;coat;surface; ;flour;#;dredge; @@ -17467,7 +17467,7 @@ ;fold;fold up;turn up;#;change surface; ;pucker;rumple;cockle;crumple;knit;#;wrinkle;ruckle;crease;crinkle;scrunch;scrunch up;crisp; ;contract;#;shrink;reduce; -;bend;deform;twist;turn;#;change tqshape;change form;deform; +;bend;deform;twist;turn;#;change shape;change form;deform; ;hole;#;hollow;hollow out;core out; ;rout;root;rootle;#;dig;delve;cut into;turn over; ;cave;undermine;#;hollow;hollow out;core out; @@ -17954,7 +17954,7 @@ ;thread;#;guide;run;draw;pass; ;wind;wind up;#;tighten;fasten; ;wind;wrap;roll;twine;#;move;displace; -;encircle;circle;#;tqshape;form; +;encircle;circle;#;shape;form; ;cheese;#;spool; ;ball;#;wind;wrap;roll;twine; ;clue;clew;#;wind;wrap;roll;twine; @@ -18158,9 +18158,9 @@ ;output;#;produce;make;create; ;pulse;pulsate;#;produce;make;create; ;machine;#;produce;make;create; -;machine;#;tqshape;form;work;mold;mould;forge; -;stamp;#;tqshape;form;work;mold;mould;forge; -;beat;#;tqshape;form;work;mold;mould;forge; +;machine;#;shape;form;work;mold;mould;forge; +;stamp;#;shape;form;work;mold;mould;forge; +;beat;#;shape;form;work;mold;mould;forge; ;elaborate;#;produce;make;create; ;compose;compile;#;make; ;catalogue;catalog;#;compose;compile; @@ -18247,14 +18247,14 @@ ;tie;#;fashion;forge; ;craft;#;fashion;forge; ;cooper;#;make; -;tqshape;form;work;mold;mould;forge;#;create from raw material;create from raw stuff; -;hill;#;tqshape;form;work;mold;mould;forge; +;shape;form;work;mold;mould;forge;#;create from raw material;create from raw stuff; +;hill;#;shape;form;work;mold;mould;forge; ;dip;#;create from raw material;create from raw stuff; ;raise;erect;rear;set up;put up;#;construct;build;make; ;level;raze;rase;dismantle;tear down;take down;pull down;#;destroy;destruct; ;press;press out;#;cast;mold;mould; -;cast;mold;mould;#;tqshape;form;work;mold;mould;forge; -;throw;#;tqshape;form;work;mold;mould;forge; +;cast;mold;mould;#;shape;form;work;mold;mould;forge; +;throw;#;shape;form;work;mold;mould;forge; ;cook;fix;ready;make;prepare;#;create from raw material;create from raw stuff; ;sandwich;#;organize;organise;prepare;devise;get up;machinate; ;devil;#;cook;fix;ready;make;prepare; @@ -18290,7 +18290,7 @@ ;gloss;polish;#;decorate;adorn;grace;ornament;embellish;beautify; ;japan;#;lacquer; ;blueprint;draft;draught;#;design;plan; -;sculpt;sculpture;#;tqshape;form;work;mold;mould;forge; +;sculpt;sculpture;#;shape;form;work;mold;mould;forge; ;paint;#;represent;interpret; ;paint;#;create; ;create;#;act;move; @@ -18320,7 +18320,7 @@ ;shade;fill in;#;draw;paint; ;vein;#;stain; ;color;colour;emblazon;#;decorate;adorn;grace;ornament;embellish;beautify; -;model;mold;mould;#;tqshape;form;work;mold;mould;forge; +;model;mold;mould;#;shape;form;work;mold;mould;forge; ;model;tqmock up;#;represent;interpret; ;sketch;outline;chalk out;#;draw; ;coin;#;create verbally; @@ -19016,7 +19016,7 @@ ;crook;curve;#;bend;flex; ;arch;curve;arc;#;bend;flex; ;straighten;unbend;#;change posture; -;bend;flex;#;change tqshape;change form;deform; +;bend;flex;#;change shape;change form;deform; ;dress;line up;#;position; ;line up;queue up;queue;#;stand;stand up; ;slope;incline;pitch;#;lean;tilt;tip;slant;angle; @@ -19062,7 +19062,7 @@ ;close;#;approach;near;come on;go up;draw near;draw close;come near; ;close;come together;#;move; ;push;crowd;#;approach;near;come on;go up;draw near;draw close;come near; -;unfold;stretch;stretch out;extend;#;change tqshape;change form;deform; +;unfold;stretch;stretch out;extend;#;change shape;change form;deform; ;tear;shoot;shoot down;charge;buck;#;rush;hotfoot;hasten;hie;speed;race;pelt along;rush along;cannonball along;bucket along;belt along; ;travel rapidly;speed;hurry;zip;#;travel;go;move;locomote; ;speed;#;travel;go;move;locomote; @@ -19124,7 +19124,7 @@ ;conduct;transmit;convey;carry;channel;#;bring;convey;take; ;clear;top;#;pass;overtake;overhaul; ;outdistance;outstrip;distance;#;leave behind; -;protrude;pop;pop out;bulge;bulge out;bug out;come out;#;change tqshape;change form;deform; +;protrude;pop;pop out;bulge;bulge out;bug out;come out;#;change shape;change form;deform; ;career;#;travel;go;move;locomote; ;circuit;#;travel;go;move;locomote; ;spread;scatter;spread out;#;circulate;pass around;pass on;distribute; @@ -20038,8 +20038,8 @@ ;cancel;strike down;#;declare;adjudge;hold; ;cancel;call off;# ;break;#;cancel;call off; -;tqinvalidate;annul;quash;void;avoid;nullify;#;cancel;strike down; -;break;#;tqinvalidate;annul;quash;void;avoid;nullify; +;invalidate;annul;quash;void;avoid;nullify;#;cancel;strike down; +;break;#;invalidate;annul;quash;void;avoid;nullify; ;sanction;#;authorize;authorise;pass;clear; ;issue;supply;#;distribute; ;distribute;#;transfer; @@ -20369,7 +20369,7 @@ ;connect;link;link up;join;unite;# ;bridge;bridge over;#;connect;link;tie;link up; ;root;#;become; -;form;take form;take tqshape;spring;#;become; +;form;take form;take shape;spring;#;become; ;originate;arise;rise;develop;uprise;spring up;grow;#;become; ;come forth;emerge;#;originate;arise;rise;develop;uprise;spring up;grow; ;break;#;come forth;emerge; |