diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
| commit | b6edfe41c9395f2e20784cbf0e630af6426950a3 (patch) | |
| tree | 56ed9b871d4296e6c15949c24e16420be1b28697 | |
| parent | ef39e8e4178a8f98cf5f154916ba0f03e4855206 (diff) | |
| download | koffice-b6edfe41c9395f2e20784cbf0e630af6426950a3.tar.gz koffice-b6edfe41c9395f2e20784cbf0e630af6426950a3.zip | |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
686 files changed, 3211 insertions, 3211 deletions
diff --git a/chalk/chalkcolor/kis_abstract_colorspace.cc b/chalk/chalkcolor/kis_abstract_colorspace.cc index 66b8e1ad..f532f18e 100644 --- a/chalk/chalkcolor/kis_abstract_colorspace.cc +++ b/chalk/chalkcolor/kis_abstract_colorspace.cc @@ -232,7 +232,7 @@ bool KisAbstractColorSpace::convertPixelsTo(const TQ_UINT8 * src, if (!tf && m_profile && dstColorSpace->getProfile()) { - if (!m_transforms.tqcontains(dstColorSpace)) { + if (!m_transforms.contains(dstColorSpace)) { tf = createTransform(dstColorSpace, m_profile, dstColorSpace->getProfile(), diff --git a/chalk/chalkcolor/kis_colorspace_factory_registry.cc b/chalk/chalkcolor/kis_colorspace_factory_registry.cc index 6758f7d5..424e346d 100644 --- a/chalk/chalkcolor/kis_colorspace_factory_registry.cc +++ b/chalk/chalkcolor/kis_colorspace_factory_registry.cc @@ -100,7 +100,7 @@ KisColorSpaceFactoryRegistry::~KisColorSpaceFactoryRegistry() KisProfile * KisColorSpaceFactoryRegistry::getProfileByName(const TQString & name) { - if (m_profileMap.tqfind(name) == m_profileMap.end()) { + if (m_profileMap.find(name) == m_profileMap.end()) { return 0; } @@ -160,7 +160,7 @@ KisColorSpace * KisColorSpaceFactoryRegistry::getColorSpace(const KisID & csID, TQString name = csID.id() + "<comb>" + profileName; - if (m_csMap.tqfind(name) == m_csMap.end()) { + if (m_csMap.find(name) == m_csMap.end()) { KisColorSpaceFactory *csf = get(csID); if(!csf) return 0; @@ -175,7 +175,7 @@ KisColorSpace * KisColorSpaceFactoryRegistry::getColorSpace(const KisID & csID, m_csMap[name] = cs; } - if(m_csMap.tqcontains(name)) + if(m_csMap.contains(name)) return m_csMap[name]; else return 0; diff --git a/chalk/chalkcolor/kis_colorspace_factory_registry.h b/chalk/chalkcolor/kis_colorspace_factory_registry.h index 104c99aa..1ecff87a 100644 --- a/chalk/chalkcolor/kis_colorspace_factory_registry.h +++ b/chalk/chalkcolor/kis_colorspace_factory_registry.h @@ -27,7 +27,7 @@ class TQStringList; class KisPaintDeviceAction; /** - * This class tqcontains: + * This class contains: * - a registry of colorspace instantiated with specific profiles. * - a registry of singleton colorspace factories. * - a registry of icc profiles diff --git a/chalk/colorspaces/wet/kis_wet_colorspace.cc b/chalk/colorspaces/wet/kis_wet_colorspace.cc index edb09289..7d8d84ab 100644 --- a/chalk/colorspaces/wet/kis_wet_colorspace.cc +++ b/chalk/colorspaces/wet/kis_wet_colorspace.cc @@ -190,7 +190,7 @@ void KisWetColorSpace::fromTQColor(const TQColor& c, TQ_UINT8 *dst, KisProfile * } // Translate the special TQCOlors from our paintbox to wetpaint paints. - if (m_conversionMap.tqcontains(key)) { + if (m_conversionMap.contains(key)) { (*p).paint = m_conversionMap[key]; (*p).adsorb = m_conversionMap[key]; // or maybe best add water here? } else { diff --git a/chalk/colorspaces/wetsticky/ws/GNU Public Licence.txt b/chalk/colorspaces/wetsticky/ws/GNU Public Licence.txt index 5e79907b..a3f2100e 100644 --- a/chalk/colorspaces/wetsticky/ws/GNU Public Licence.txt +++ b/chalk/colorspaces/wetsticky/ws/GNU Public Licence.txt @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/chalk/core/createdcop.py b/chalk/core/createdcop.py index bac48f33..de773270 100755 --- a/chalk/core/createdcop.py +++ b/chalk/core/createdcop.py @@ -84,10 +84,10 @@ dcopiface_template = """/* def parseHeader(headerfile, classname): # parse the source class header to get a list of functions we're going to wrap functions = [] - if (headerfile.tqfind("private:") > -1): - lines = headerfile[headerfile.tqfind(classname):headerfile.tqfind("private")].splitlines() + if (headerfile.find("private:") > -1): + lines = headerfile[headerfile.find(classname):headerfile.find("private")].splitlines() else: - lines = headerfile[headerfile.tqfind(classname):headerfile.tqfind("#endif")].splitlines() + lines = headerfile[headerfile.find(classname):headerfile.find("#endif")].splitlines() i = 0 while i < len(lines): line = lines[i].strip() @@ -100,7 +100,7 @@ def parseHeader(headerfile, classname): line.startswith("#") or line.startswith("}") or line.startswith("public Q_SLOTS:") or - line.tqfind("~") != -1 or + line.find("~") != -1 or len(line) == 0 ): i+=1 @@ -112,17 +112,17 @@ def parseHeader(headerfile, classname): function = line complete = 0 # strip the inline implementation - if (line.tqfind("{") > -1): - function = line[:line.tqfind("{")] - if function.tqfind("}") > -1: - function += line[line.tqfind("}") + 1:] + if (line.find("{") > -1): + function = line[:line.find("{")] + if function.find("}") > -1: + function += line[line.find("}") + 1:] complete = 1 else: i += 1 # search for the missing } on the next lines while i < len(lines): - if (lines[i].tqfind("}") > -1): - function += lines[i][lines[i].tqfind("}") + 1:] + if (lines[i].find("}") > -1): + function += lines[i][lines[i].find("}") + 1:] complete = 1 i += 1 else: diff --git a/chalk/core/kis_exif_info.h b/chalk/core/kis_exif_info.h index d3fa3428..090d58c6 100644 --- a/chalk/core/kis_exif_info.h +++ b/chalk/core/kis_exif_info.h @@ -36,7 +36,7 @@ class KisExifInfo bool getValue(TQString name, ExifValue& value) { - if ( m_values.tqfind( name ) == m_values.end() ) { + if ( m_values.find( name ) == m_values.end() ) { return false; } else { diff --git a/chalk/core/kis_filter_configuration.cc b/chalk/core/kis_filter_configuration.cc index b25dcb24..c1dec978 100644 --- a/chalk/core/kis_filter_configuration.cc +++ b/chalk/core/kis_filter_configuration.cc @@ -109,7 +109,7 @@ TQ_INT32 KisFilterConfiguration::version() const void KisFilterConfiguration::setProperty(const TQString & name, const TQVariant & value) { - if ( m_properties.tqfind( name ) == m_properties.end() ) { + if ( m_properties.find( name ) == m_properties.end() ) { m_properties.insert( name, value ); } else { @@ -119,7 +119,7 @@ void KisFilterConfiguration::setProperty(const TQString & name, const TQVariant bool KisFilterConfiguration::getProperty(const TQString & name, TQVariant & value) { - if ( m_properties.tqfind( name ) == m_properties.end() ) { + if ( m_properties.find( name ) == m_properties.end() ) { return false; } else { @@ -130,7 +130,7 @@ bool KisFilterConfiguration::getProperty(const TQString & name, TQVariant & valu TQVariant KisFilterConfiguration::getProperty(const TQString & name) { - if ( m_properties.tqfind( name ) == m_properties.end() ) { + if ( m_properties.find( name ) == m_properties.end() ) { return TQVariant(); } else { diff --git a/chalk/core/kis_group_layer.cc b/chalk/core/kis_group_layer.cc index a3a35339..ea8d0213 100644 --- a/chalk/core/kis_group_layer.cc +++ b/chalk/core/kis_group_layer.cc @@ -163,7 +163,7 @@ void KisGroupLayer::setIndex(KisLayerSP layer, int index) bool KisGroupLayer::addLayer(KisLayerSP newLayer, int x) { if (x < 0 || kClamp(uint(x), uint(0), childCount()) != uint(x) || - newLayer->tqparent() || m_layers.tqcontains(newLayer)) + newLayer->tqparent() || m_layers.contains(newLayer)) { kdWarning() << "invalid input to KisGroupLayer::addLayer(KisLayerSP newLayer, int x)!" << endl; return false; diff --git a/chalk/core/kis_imagepipe_brush.cc b/chalk/core/kis_imagepipe_brush.cc index 5cef04d6..9b71c83d 100644 --- a/chalk/core/kis_imagepipe_brush.cc +++ b/chalk/core/kis_imagepipe_brush.cc @@ -228,8 +228,8 @@ bool KisImagePipeBrush::init() } TQString paramline = TQString::fromUtf8((&line2[0]), line2.size()); - TQ_UINT32 m_numOfBrushes = paramline.left(paramline.tqfind(' ')).toUInt(); - m_parasite = paramline.mid(paramline.tqfind(' ') + 1); + TQ_UINT32 m_numOfBrushes = paramline.left(paramline.find(' ')).toUInt(); + m_parasite = paramline.mid(paramline.find(' ') + 1); i++; // Skip past the second newline TQ_UINT32 numOfBrushes = 0; diff --git a/chalk/core/kis_layer.cc b/chalk/core/kis_layer.cc index cac178e5..752159c0 100644 --- a/chalk/core/kis_layer.cc +++ b/chalk/core/kis_layer.cc @@ -311,7 +311,7 @@ void KisLayer::setClean(const TQRect & rect) // XXX: We should only set the parts clean that were actually cleaned. However, extent and exactBounds conspire // to make that very hard atm. - //if (rect.tqcontains(m_dirtyRect)) m_dirtyRect = TQRect(); + //if (rect.contains(m_dirtyRect)) m_dirtyRect = TQRect(); m_dirtyRect = TQRect(); } diff --git a/chalk/core/kis_paint_device.h b/chalk/core/kis_paint_device.h index 6c8d7331..7fe6250b 100644 --- a/chalk/core/kis_paint_device.h +++ b/chalk/core/kis_paint_device.h @@ -137,12 +137,12 @@ public: /** * Returns true of x,y is within the extent of this paint device */ - bool tqcontains(TQ_INT32 x, TQ_INT32 y) const; + bool contains(TQ_INT32 x, TQ_INT32 y) const; /** * Convenience method for the above */ - bool tqcontains(const TQPoint& pt) const; + bool contains(const TQPoint& pt) const; /** * Retrieve the bounds of the paint device. The size is not exact, diff --git a/chalk/core/kis_palette.cc b/chalk/core/kis_palette.cc index daf8d84d..161a4ff8 100644 --- a/chalk/core/kis_palette.cc +++ b/chalk/core/kis_palette.cc @@ -238,7 +238,7 @@ bool KisPalette::init() } else if (!lines[i].isEmpty()) { - TQStringList a = TQStringList::split(" ", lines[i].tqreplace(TQChar('\t'), " ")); + TQStringList a = TQStringList::split(" ", lines[i].replace(TQChar('\t'), " ")); if (a.count() < 3) { diff --git a/chalk/core/kis_pattern.cc b/chalk/core/kis_pattern.cc index 516d3d8b..72130db6 100644 --- a/chalk/core/kis_pattern.cc +++ b/chalk/core/kis_pattern.cc @@ -277,7 +277,7 @@ bool KisPattern::init() KisPaintDeviceSP KisPattern::image(KisColorSpace * colorSpace) { // Check if there's already a pattern prepared for this colorspace - TQMap<TQString, KisPaintDeviceSP>::const_iterator it = m_colorspaces.tqfind(colorSpace->id().id()); + TQMap<TQString, KisPaintDeviceSP>::const_iterator it = m_colorspaces.find(colorSpace->id().id()); if (it != m_colorspaces.end()) return (*it); diff --git a/chalk/core/kis_perspective_grid.cpp b/chalk/core/kis_perspective_grid.cpp index 6eb5fbe8..597f1d40 100644 --- a/chalk/core/kis_perspective_grid.cpp +++ b/chalk/core/kis_perspective_grid.cpp @@ -27,7 +27,7 @@ KisSubPerspectiveGrid::KisSubPerspectiveGrid(KisPerspectiveGridNodeSP topLeft, K } -bool KisSubPerspectiveGrid::tqcontains(const KisPoint p) const +bool KisSubPerspectiveGrid::contains(const KisPoint p) const { return true; KisPerspectiveMath::LineEquation d1 = KisPerspectiveMath::computeLineEquation( topLeft(), topRight() ); @@ -90,7 +90,7 @@ KisSubPerspectiveGrid* KisPerspectiveGrid::gridAt(KisPoint p) { for( TQValueList<KisSubPerspectiveGrid*>::const_iterator it = begin(); it != end(); ++it) { - if( (*it)->tqcontains(p) ) + if( (*it)->contains(p) ) { return *it; } diff --git a/chalk/core/kis_perspective_grid.h b/chalk/core/kis_perspective_grid.h index 4bd22815..81ec2966 100644 --- a/chalk/core/kis_perspective_grid.h +++ b/chalk/core/kis_perspective_grid.h @@ -67,7 +67,7 @@ class KisSubPerspectiveGrid { /** * @return true if the point p is contain by the grid */ - bool tqcontains(const KisPoint p) const; + bool contains(const KisPoint p) const; private: inline KisPoint computeVanishingPoint(KisPerspectiveGridNodeSP p11, KisPerspectiveGridNodeSP p12, KisPerspectiveGridNodeSP p21, KisPerspectiveGridNodeSP p22) { diff --git a/chalk/core/kis_selection.cc b/chalk/core/kis_selection.cc index 10e96a05..b5cd8e6e 100644 --- a/chalk/core/kis_selection.cc +++ b/chalk/core/kis_selection.cc @@ -204,9 +204,9 @@ void KisSelection::startCachingExactRect() void KisSelection::paintUniformSelectionRegion(TQImage img, const TQRect& imageRect, const TQRegion& uniformRegion) { Q_ASSERT(img.size() == imageRect.size()); - Q_ASSERT(imageRect.tqcontains(uniformRegion.boundingRect())); + Q_ASSERT(imageRect.contains(uniformRegion.boundingRect())); - if (img.isNull() || img.size() != imageRect.size() || !imageRect.tqcontains(uniformRegion.boundingRect())) { + if (img.isNull() || img.size() != imageRect.size() || !imageRect.contains(uniformRegion.boundingRect())) { return; } diff --git a/chalk/core/kis_thread_pool.cc b/chalk/core/kis_thread_pool.cc index e617c8cb..2f80a0ae 100644 --- a/chalk/core/kis_thread_pool.cc +++ b/chalk/core/kis_thread_pool.cc @@ -115,18 +115,18 @@ void KisThreadPool::dequeue(KisThread * thread) m_poolMutex.lock(); - int i = m_threads.tqfindRef(thread); + int i = m_threads.findRef(thread); if (i >= 0) { t = m_threads.take(i); m_numberOfQueuedThreads--; } else { - i = m_runningThreads.tqfindRef(thread); + i = m_runningThreads.findRef(thread); if (i >= 0) { t = m_runningThreads.take(i); m_numberOfRunningThreads--; } else { - i = m_oldThreads.tqfindRef(thread); + i = m_oldThreads.findRef(thread); if (i >= 0) { t = m_oldThreads.take(i); } diff --git a/chalk/core/tiles/kis_tile.h b/chalk/core/tiles/kis_tile.h index f2d6f1e9..2a0b3a22 100644 --- a/chalk/core/tiles/kis_tile.h +++ b/chalk/core/tiles/kis_tile.h @@ -25,7 +25,7 @@ class KisTiledDataManager; class KisTiledIterator; /** - * Provides abstraction to a tile. A tile tqcontains + * Provides abstraction to a tile. A tile contains * a part of a PaintDevice, but only the individual pixels * are accesable and that only via iterators. */ diff --git a/chalk/core/tiles/kis_tileddatamanager.cc b/chalk/core/tiles/kis_tileddatamanager.cc index 629b1b38..2dd633fd 100644 --- a/chalk/core/tiles/kis_tileddatamanager.cc +++ b/chalk/core/tiles/kis_tileddatamanager.cc @@ -245,7 +245,7 @@ void KisTiledDataManager::setExtent(TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32 //printRect("oldRect", oldRect); // Do nothing if the desired size is bigger than we currently are: that is handled by the autoextending automatically - if (newRect.tqcontains(oldRect)) return; + if (newRect.contains(oldRect)) return; // Loop through all tiles, if a tile is wholly outside the extent, add to the memento, then delete it, // if the tile is partially outside the extent, clear the outside pixels to the default pixel. @@ -259,7 +259,7 @@ void KisTiledDataManager::setExtent(TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32 TQRect tileRect = TQRect(tile->getCol() * KisTile::WIDTH, tile->getRow() * KisTile::HEIGHT, KisTile::WIDTH, KisTile::HEIGHT); //printRect("tileRect", tileRect); - if (newRect.tqcontains(tileRect)) { + if (newRect.contains(tileRect)) { // Completely inside, do nothing previousTile = tile; tile = tile->getNext(); @@ -279,7 +279,7 @@ void KisTiledDataManager::setExtent(TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32 tile->addReader(); for (int y = 0; y < KisTile::HEIGHT; ++y) { for (int x = 0; x < KisTile::WIDTH; ++x) { - if (!intersection.tqcontains(x,y)) { + if (!intersection.contains(x,y)) { TQ_UINT8 * ptr = tile->data(x, y); memcpy(ptr, m_defPixel, m_pixelSize); } diff --git a/chalk/core/tiles/kis_tilemanager.cc b/chalk/core/tiles/kis_tilemanager.cc index dc9811e9..2c3fed8e 100644 --- a/chalk/core/tiles/kis_tilemanager.cc +++ b/chalk/core/tiles/kis_tilemanager.cc @@ -157,11 +157,11 @@ void KisTileManager::deregisterTile(KisTile* tile) { m_swapMutex->lock(); - if (!m_tileMap.tqcontains(tile)) { + if (!m_tileMap.contains(tile)) { m_swapMutex->unlock(); return; } - // Q_ASSERT(m_tileMap.tqcontains(tile)); + // Q_ASSERT(m_tileMap.contains(tile)); TileInfo* info = m_tileMap[tile]; diff --git a/chalk/doc/brush.txt b/chalk/doc/brush.txt index 17df4b48..739194c7 100644 --- a/chalk/doc/brush.txt +++ b/chalk/doc/brush.txt @@ -6,7 +6,7 @@ sources: * The old Chalk brush code (http://webcvs.kde.org/cgi-bin/cvsweb.cgi/koffice/chalk/tools/kis_tool_brush.cc?rev=1.58&content-type=text/x-cvsweb-markup) * Peter Jodda's Perico (http://software.jodda.de/perico.html) -* The source of the Gimp (both current and 0.99.11 -- the oldest version I could tqfind) (http://www.gimp.org) +* The source of the Gimp (both current and 0.99.11 -- the oldest version I could find) (http://www.gimp.org) * David Hodson's article on Gimp brushes (http://members.ozemail.com.au/~hodsond/gimpbrush.html) * Raph Levien's article on Gimp brushes (http://www.levien.com/gimp/brush-arch.html) diff --git a/chalk/doc/chalk.xmi b/chalk/doc/chalk.xmi index ec204a76..df763e02 100644 --- a/chalk/doc/chalk.xmi +++ b/chalk/doc/chalk.xmi @@ -342,7 +342,7 @@ data to rbg for screen rendering." visibility="public" xmi.id="259" name="CMYK" <UML:Operation visibility="public" xmi.id="271" type="virtual KisStrategyColorSpaceSP" name="create" > <UML:Parameter visibility="private" xmi.id="272" value="" type="enumImgType" name="imgType" /> </UML:Operation> - <UML:Operation visibility="protected" xmi.id="273" type="KisStrategyColorSpaceSP" name="tqfind" > + <UML:Operation visibility="protected" xmi.id="273" type="KisStrategyColorSpaceSP" name="find" > <UML:Parameter visibility="private" xmi.id="274" value="" type="enumImgType" name="imgType" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="275" type="virtual " name="~KisColorSpaceFactoryFlyweight" /> @@ -650,7 +650,7 @@ of tile in x and y." visibility="public" xmi.id="408" type="void" name="tileCoor </UML:Operation> <UML:Operation visibility="public" xmi.id="480" type="virtual " name="~KisTileCacheInterface" /> </UML:Class> - <UML:Class stereotype="class" comment="Provides abstraction to a tile. A tile tqcontains + <UML:Class stereotype="class" comment="Provides abstraction to a tile. A tile contains a part of a layer. Layers form an image." visibility="public" xmi.id="481" name="KisTile" > <UML:Operation visibility="protected" xmi.id="496" type="KisTile &" name="=" > <UML:Parameter visibility="private" xmi.id="497" value="" type="const KisTile &" /> @@ -1059,7 +1059,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas <UML:Parameter visibility="private" xmi.id="810" value="" type="Q_INT32" name="yOffset" /> <UML:Parameter visibility="private" xmi.id="811" value="" type="double" name="zoom" /> </UML:Operation> - <UML:Operation visibility="public" xmi.id="812" type="KisGuideSP" name="tqfind" > + <UML:Operation visibility="public" xmi.id="812" type="KisGuideSP" name="find" > <UML:Parameter visibility="private" xmi.id="813" value="" type="double" name="x" /> <UML:Parameter visibility="private" xmi.id="814" value="" type="double" name="y" /> <UML:Parameter visibility="private" xmi.id="815" value="" type="double" name="d" /> @@ -1208,7 +1208,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas <UML:Operation visibility="public" xmi.id="929" type="virtual bool" name="completeSaving" > <UML:Parameter visibility="private" xmi.id="930" value="" type="KoStore *" /> </UML:Operation> - <UML:Operation visibility="public" xmi.id="931" type="bool" name="tqcontains" > + <UML:Operation visibility="public" xmi.id="931" type="bool" name="contains" > <UML:Parameter visibility="private" xmi.id="932" value="" type="KisImageSP" name="img" /> </UML:Operation> <UML:Operation visibility="protected" xmi.id="933" type="virtual KoView *" name="createViewInstance" > @@ -1906,11 +1906,11 @@ cannot be abstract, because otherwise this class would be abstract." visibility= <UML:Parameter visibility="private" xmi.id="1511" value="" type="const QString &" name="name" /> <UML:Parameter visibility="private" xmi.id="1512" value="" type="CompositeOp" name="compositeOp" /> </UML:Operation> - <UML:Operation visibility="public" xmi.id="1513" type="bool" name="tqcontains" > + <UML:Operation visibility="public" xmi.id="1513" type="bool" name="contains" > <UML:Parameter visibility="private" xmi.id="1514" value="" type="Q_INT32" name="x" /> <UML:Parameter visibility="private" xmi.id="1515" value="" type="Q_INT32" name="y" /> </UML:Operation> - <UML:Operation visibility="public" xmi.id="1516" type="bool" name="tqcontains" > + <UML:Operation visibility="public" xmi.id="1516" type="bool" name="contains" > <UML:Parameter visibility="private" xmi.id="1517" value="" type="const QPoint &" name="pt" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="1518" type="virtual const KisTileMgrSP" name="data" /> @@ -3629,7 +3629,7 @@ in the constructor, you have to call loadAsync. <listitem open="0" type="815" id="268" label="KisColorSpaceFactoryFlyweight" /> <listitem open="0" type="815" id="269" label="create" /> <listitem open="0" type="815" id="271" label="create" /> - <listitem open="0" type="815" id="273" label="tqfind" /> + <listitem open="0" type="815" id="273" label="find" /> <listitem open="0" type="815" id="275" label="~KisColorSpaceFactoryFlyweight" /> </listitem> <listitem open="0" type="813" id="193" label="KisColorSpaceFactoryInterface" > @@ -3714,7 +3714,7 @@ in the constructor, you have to call loadAsync. <listitem open="0" type="815" id="926" label="clipboardSelection" /> <listitem open="0" type="815" id="927" label="completeLoading" /> <listitem open="0" type="815" id="929" label="completeSaving" /> - <listitem open="0" type="815" id="931" label="tqcontains" /> + <listitem open="0" type="815" id="931" label="contains" /> <listitem open="0" type="815" id="933" label="createViewInstance" /> <listitem open="0" type="815" id="936" label="dcopObject" /> <listitem open="0" type="815" id="937" label="empty" /> @@ -3838,7 +3838,7 @@ in the constructor, you have to call loadAsync. <listitem open="0" type="815" id="802" label="KisGuideMgr" /> <listitem open="0" type="815" id="803" label="add" /> <listitem open="0" type="815" id="806" label="erase" /> - <listitem open="0" type="815" id="812" label="tqfind" /> + <listitem open="0" type="815" id="812" label="find" /> <listitem open="0" type="815" id="816" label="findHorizontal" /> <listitem open="0" type="815" id="819" label="findVertical" /> <listitem open="0" type="815" id="822" label="hasSelected" /> @@ -4116,8 +4116,8 @@ in the constructor, you have to call loadAsync. <listitem open="0" type="815" id="1504" label="colorAt" /> <listitem open="0" type="815" id="1505" label="compositeOp" /> <listitem open="0" type="815" id="1506" label="configure" /> - <listitem open="0" type="815" id="1513" label="tqcontains" /> - <listitem open="0" type="815" id="1516" label="tqcontains" /> + <listitem open="0" type="815" id="1513" label="contains" /> + <listitem open="0" type="815" id="1516" label="contains" /> <listitem open="0" type="815" id="1519" label="data" /> <listitem open="0" type="815" id="1518" label="data" /> <listitem open="0" type="815" id="1524" label="expand" /> @@ -29680,7 +29680,7 @@ in the constructor, you have to call loadAsync. </codeblockwithcomments> <cppheaderclassdeclarationblock parent_id="481" tag="classDeclarationBlock" canDelete="false" role_id="-1" > <header> - <cppcodecomment tag="" text="Class KisTile&#010;Provides abstraction to a tile. A tile tqcontains&#010;a part of a layer. Layers form an image." /> + <cppcodecomment tag="" text="Class KisTile&#010;Provides abstraction to a tile. A tile contains&#010;a part of a layer. Layers form an image." /> </header> <textblocks> <hierarchicalcodeblock tag="publicBlock" canDelete="false" > diff --git a/chalk/doc/controller.xmi b/chalk/doc/controller.xmi index 18ac49f0..2f64556e 100644 --- a/chalk/doc/controller.xmi +++ b/chalk/doc/controller.xmi @@ -933,14 +933,14 @@ below this layer, remove the specified layer." isSpecification="false" isLeaf="f <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1469" isRoot="false" value="" type="558" isAbstract="false" name="v" /> </UML:BehavioralFeature.parameter> </UML:Operation> - <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1470" isRoot="false" isAbstract="false" name="tqcontains" > + <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1470" isRoot="false" isAbstract="false" name="contains" > <UML:BehavioralFeature.parameter> <UML:Parameter kind="return" xmi.id="5372" type="558" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1471" isRoot="false" value="" type="463" isAbstract="false" name="x" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1472" isRoot="false" value="" type="463" isAbstract="false" name="y" /> </UML:BehavioralFeature.parameter> </UML:Operation> - <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1473" isRoot="false" isAbstract="false" name="tqcontains" > + <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1473" isRoot="false" isAbstract="false" name="contains" > <UML:BehavioralFeature.parameter> <UML:Parameter kind="return" xmi.id="5373" type="558" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1474" isRoot="false" value="" type="498" isAbstract="false" name="pt" /> @@ -2243,7 +2243,7 @@ and the clipboard." isSpecification="false" isLeaf="false" visibility="public" x <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="700" isRoot="false" value="" type="430" isAbstract="false" name="gd" /> </UML:BehavioralFeature.parameter> </UML:Operation> - <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="701" isRoot="false" isAbstract="false" name="tqfind" > + <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="701" isRoot="false" isAbstract="false" name="find" > <UML:BehavioralFeature.parameter> <UML:Parameter kind="return" xmi.id="5458" type="430" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="702" isRoot="false" value="" type="7" isAbstract="false" name="x" /> diff --git a/chalk/doc/histograms.xmi b/chalk/doc/histograms.xmi index 209a795d..5cd0f484 100644 --- a/chalk/doc/histograms.xmi +++ b/chalk/doc/histograms.xmi @@ -1208,14 +1208,14 @@ there is no guarantee that the iterator will work scanline by scanline." isSpeci <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1187" isRoot="false" value="" type="5" isAbstract="false" name="visible" /> </UML:BehavioralFeature.parameter> </UML:Operation> - <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1188" isRoot="false" isAbstract="false" name="tqcontains" > + <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1188" isRoot="false" isAbstract="false" name="contains" > <UML:BehavioralFeature.parameter> <UML:Parameter kind="return" xmi.id="17100" type="5" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1189" isRoot="false" value="" type="43" isAbstract="false" name="x" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1190" isRoot="false" value="" type="43" isAbstract="false" name="y" /> </UML:BehavioralFeature.parameter> </UML:Operation> - <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1191" isRoot="false" isAbstract="false" name="tqcontains" > + <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1191" isRoot="false" isAbstract="false" name="contains" > <UML:BehavioralFeature.parameter> <UML:Parameter kind="return" xmi.id="17101" type="5" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1192" isRoot="false" value="" type="1176" isAbstract="false" name="pt" /> @@ -2699,7 +2699,7 @@ Doubles are in the 0-1 range, use the producer's positionToString function to di <UML:EnumerationLiteral isSpecification="false" isLeaf="false" visibility="public" xmi.id="486" isRoot="false" isAbstract="false" name="LOGARITHMIC" /> </UML:Enumeration> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="497" isRoot="false" isAbstract="false" name="Q_UINT32" /> - <UML:Class comment="Provides abstraction to a tile. A tile tqcontains + <UML:Class comment="Provides abstraction to a tile. A tile contains a part of a PaintDevice, but only the individual pixels are accesable and that only via iterators." isSpecification="false" isLeaf="false" visibility="public" xmi.id="558" isRoot="false" isAbstract="false" name="KisTile" > <UML:Classifier.feature> diff --git a/chalk/plugins/filters/cimg/CImg.h b/chalk/plugins/filters/cimg/CImg.h index f69fe2a1..8d6a24f6 100644 --- a/chalk/plugins/filters/cimg/CImg.h +++ b/chalk/plugins/filters/cimg/CImg.h @@ -5144,7 +5144,7 @@ namespace cimg_library { \par Image structure - The \ref CImg<\c T> structure tqcontains \a five fields : + The \ref CImg<\c T> structure contains \a five fields : - \ref width defines the number of \a columns of the image (size along the X-axis). - \ref height defines the number of \a rows of the image (size along the Y-axis). - \ref depth defines the number of \a slices of the image (size along the Z-axis). diff --git a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc index d89db6ae..e9280425 100644 --- a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc +++ b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc @@ -87,7 +87,7 @@ void KisBrightnessContrastFilterConfiguration::fromXML( const TQString& s ) curve.clear(); // XXX TQPtrList, sure I won't leak stuff here? for (TQStringList::Iterator it = pairStart; it != pairEnd; ++it) { TQString pair = * it; - if (pair.tqfind(",") > -1) { + if (pair.find(",") > -1) { TQPair<double,double> *p = new TQPair<double,double>; p->first = pair.section(",", 0, 0).toDouble(); p->second = pair.section(",", 1, 1).toDouble(); diff --git a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc index 5c5a1b2c..1eaa1417 100644 --- a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc +++ b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc @@ -86,7 +86,7 @@ curvesElement.text() ); TQStringList::Iterator pairEnd = data.end(); for (TQStringList::Iterator it = pairStart; it != pairEnd; ++it) { TQString pair = * it; - if (pair.tqfind(",") > -1) { + if (pair.find(",") > -1) { TQPair<double,double> *p = new TQPair<double,double>; p->first = pair.section(",", 0, 0).toDouble(); p->second = pair.section(",", 1, 1).toDouble(); diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc index fc96b991..a658b863 100644 --- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc +++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc @@ -159,7 +159,7 @@ uint KisOilPaintFilter::MostFrequentColor (KisPaintDeviceSP src, const TQRect& b while (!it.isDone()) { - if (bounds.tqcontains(it.x(), it.y())) { + if (bounds.contains(it.x(), it.y())) { // XXX: COLORSPACE_INDEPENDENCE diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc index 32dbcf9d..b238e746 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc @@ -104,7 +104,7 @@ void KisToolColorPicker::buttonPress(KisButtonPressEvent *e) TQPoint pos = TQPoint(e->pos().floorX(), e->pos().floorY()); - if (!img->bounds().tqcontains(pos)) { + if (!img->bounds().contains(pos)) { return; } diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc index 1e2b82c5..5a919771 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc @@ -151,7 +151,7 @@ void KisToolFill::buttonRelease(KisButtonReleaseEvent *e) int x, y; x = m_startPos.floorX(); y = m_startPos.floorY(); - if (!m_currentImage->bounds().tqcontains(x, y)) { + if (!m_currentImage->bounds().contains(x, y)) { return; } flood(x, y); diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc index 30709fd7..0d7d9728 100644 --- a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc +++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc @@ -818,7 +818,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint) endy=start.y(); } - if ( toTQRect ( startx - m_handleSize / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) ) + if ( toTQRect ( startx - m_handleSize / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) ) { if( !m_selecting ) { @@ -827,7 +827,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint) } return UpperLeft; } - else if ( toTQRect ( startx - m_handleSize / 2.0, endy - m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) ) + else if ( toTQRect ( startx - m_handleSize / 2.0, endy - m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) ) { if( !m_selecting ) { @@ -836,7 +836,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint) } return LowerLeft; } - else if ( toTQRect ( endx - m_handleSize / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) ) + else if ( toTQRect ( endx - m_handleSize / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) ) { if( !m_selecting ) { @@ -845,7 +845,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint) } return UpperRight; } - else if ( toTQRect ( endx - m_handleSize / 2.0, endy - m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) ) + else if ( toTQRect ( endx - m_handleSize / 2.0, endy - m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) ) { if( !m_selecting ) { @@ -854,7 +854,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint) } return LowerRight; } - else if ( toTQRect ( startx + ( endx - startx - m_handleSize ) / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) ) + else if ( toTQRect ( startx + ( endx - startx - m_handleSize ) / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) ) { if( !m_selecting ) { @@ -862,7 +862,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint) } return Upper; } - else if ( toTQRect ( startx + ( endx - startx - m_handleSize ) / 2.0, endy - m_handleSize / 2, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) ) + else if ( toTQRect ( startx + ( endx - startx - m_handleSize ) / 2.0, endy - m_handleSize / 2, m_handleSize, m_handleSize ).contains( currentViewPoint ) ) { if( !m_selecting ) { @@ -870,7 +870,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint) } return Lower; } - else if ( toTQRect ( startx - m_handleSize / 2.0, starty + ( endy - starty - m_handleSize ) / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) ) + else if ( toTQRect ( startx - m_handleSize / 2.0, starty + ( endy - starty - m_handleSize ) / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) ) { if( !m_selecting ) { @@ -878,7 +878,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint) } return Left; } - else if ( toTQRect ( endx - m_handleSize / 2.0 , starty + ( endy - starty - m_handleSize ) / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) ) + else if ( toTQRect ( endx - m_handleSize / 2.0 , starty + ( endy - starty - m_handleSize ) / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) ) { if( !m_selecting ) { @@ -886,7 +886,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint) } return Right; } - else if ( toTQRect ( startx , starty, endx - startx , endy - starty ).tqcontains( currentViewPoint ) ) + else if ( toTQRect ( startx , starty, endx - startx , endy - starty ).contains( currentViewPoint ) ) { return Inside; } diff --git a/chalk/plugins/tools/tool_curves/kis_curve_framework.cc b/chalk/plugins/tools/tool_curves/kis_curve_framework.cc index 416d3bfd..8a9b4c88 100644 --- a/chalk/plugins/tools/tool_curves/kis_curve_framework.cc +++ b/chalk/plugins/tools/tool_curves/kis_curve_framework.cc @@ -79,12 +79,12 @@ KisCurve KisCurve::selectedPivots(bool selected) KisCurve KisCurve::subCurve(const KisPoint& tend) { - return subCurve(tqfind(tend).previousPivot(),tqfind(tend)); + return subCurve(find(tend).previousPivot(),find(tend)); } KisCurve KisCurve::subCurve(const CurvePoint& tend) { - return subCurve(tqfind(tend).previousPivot(),tqfind(tend)); + return subCurve(find(tend).previousPivot(),find(tend)); } KisCurve KisCurve::subCurve(iterator tend) @@ -94,12 +94,12 @@ KisCurve KisCurve::subCurve(iterator tend) KisCurve KisCurve::subCurve(const KisPoint& tstart, const KisPoint& tend) { - return subCurve(tqfind(tstart),tqfind(tend)); + return subCurve(find(tstart),find(tend)); } KisCurve KisCurve::subCurve(const CurvePoint& tstart, const CurvePoint& tend) { - return subCurve(tqfind(tstart),tqfind(tend)); + return subCurve(find(tstart),find(tend)); } KisCurve KisCurve::subCurve(iterator tstart, iterator tend) @@ -137,7 +137,7 @@ KisCurve::iterator KisCurve::deleteCurve (const KisPoint& pos1, const KisPoint& KisCurve::iterator KisCurve::deleteCurve (const CurvePoint& pos1, const CurvePoint& pos2) { - return deleteCurve (tqfind(pos1),tqfind(pos2)); + return deleteCurve (find(pos1),find(pos2)); } KisCurve::iterator KisCurve::deleteCurve (KisCurve::iterator pos1, KisCurve::iterator pos2) @@ -154,12 +154,12 @@ KisCurve::iterator KisCurve::deleteCurve (KisCurve::iterator pos1, KisCurve::ite KisCurve::iterator KisCurve::selectPivot(const KisPoint& pt, bool isSelected) { - return selectPivot(tqfind(CurvePoint(pt,true)),isSelected); + return selectPivot(find(CurvePoint(pt,true)),isSelected); } KisCurve::iterator KisCurve::selectPivot(const CurvePoint& pt, bool isSelected) { - return selectPivot(tqfind(pt),isSelected); + return selectPivot(find(pt),isSelected); } KisCurve::iterator KisCurve::selectPivot(KisCurve::iterator it, bool isSelected) @@ -171,7 +171,7 @@ KisCurve::iterator KisCurve::selectPivot(KisCurve::iterator it, bool isSelected) } KisCurve selected = pivots(); for (iterator i = selected.begin(); i != selected.end(); i++) - (*tqfind((*i))).setSelected(sel); + (*find((*i))).setSelected(sel); (*it).setSelected(isSelected); return it; @@ -184,7 +184,7 @@ KisCurve::iterator KisCurve::movePivot(const KisPoint& oldPt, const KisPoint& ne KisCurve::iterator KisCurve::movePivot(const CurvePoint& oldPt, const KisPoint& newPt) { - return movePivot(tqfind(oldPt), newPt); + return movePivot(find(oldPt), newPt); } KisCurve::iterator KisCurve::movePivot(KisCurve::iterator it, const KisPoint& newPt) @@ -213,7 +213,7 @@ void KisCurve::deletePivot (const KisPoint& pt) void KisCurve::deletePivot (const CurvePoint& pt) { - deletePivot(tqfind(pt)); + deletePivot(find(pt)); } void KisCurve::deletePivot (KisCurve::iterator it) diff --git a/chalk/plugins/tools/tool_curves/kis_curve_framework.h b/chalk/plugins/tools/tool_curves/kis_curve_framework.h index c27369aa..614d51ff 100644 --- a/chalk/plugins/tools/tool_curves/kis_curve_framework.h +++ b/chalk/plugins/tools/tool_curves/kis_curve_framework.h @@ -130,10 +130,10 @@ public: iterator begin() const; iterator lastIterator() const; iterator end() const; - iterator tqfind(const CurvePoint& pt); - iterator tqfind(const KisPoint& pt); - iterator tqfind(iterator it, const CurvePoint& pt); - iterator tqfind(iterator it, const KisPoint& pt); + iterator find(const CurvePoint& pt); + iterator find(const KisPoint& pt); + iterator find(iterator it, const CurvePoint& pt); + iterator find(iterator it, const KisPoint& pt); KisCurve pivots(); KisCurve selectedPivots(bool = true); @@ -312,34 +312,34 @@ inline KisCurve::iterator KisCurve::end() const return iterator(*this,m_curve.end()); } -inline KisCurve::iterator KisCurve::tqfind (const CurvePoint& pt) +inline KisCurve::iterator KisCurve::find (const CurvePoint& pt) { - return iterator(*this,m_curve.tqfind(pt)); + return iterator(*this,m_curve.find(pt)); } -inline KisCurve::iterator KisCurve::tqfind (const KisPoint& pt) +inline KisCurve::iterator KisCurve::find (const KisPoint& pt) { - return iterator(*this,m_curve.tqfind(CurvePoint(pt))); + return iterator(*this,m_curve.find(CurvePoint(pt))); } -inline KisCurve::iterator KisCurve::tqfind (KisCurve::iterator it, const CurvePoint& pt) +inline KisCurve::iterator KisCurve::find (KisCurve::iterator it, const CurvePoint& pt) { - return iterator(*this,m_curve.tqfind(it.position(),pt)); + return iterator(*this,m_curve.find(it.position(),pt)); } -inline KisCurve::iterator KisCurve::tqfind (iterator it, const KisPoint& pt) +inline KisCurve::iterator KisCurve::find (iterator it, const KisPoint& pt) { - return iterator(*this,m_curve.tqfind(it.position(),CurvePoint(pt))); + return iterator(*this,m_curve.find(it.position(),CurvePoint(pt))); } inline void KisCurve::calculateCurve(const KisPoint& start, const KisPoint& end, KisCurve::iterator it) { - calculateCurve(tqfind(CurvePoint(start)),tqfind(CurvePoint(end)),it); + calculateCurve(find(CurvePoint(start)),find(CurvePoint(end)),it); } inline void KisCurve::calculateCurve(const CurvePoint& start, const CurvePoint& end, KisCurve::iterator it) { - calculateCurve(tqfind(start),tqfind(end),it); + calculateCurve(find(start),find(end),it); } inline void KisCurve::calculateCurve(KisCurve::iterator, KisCurve::iterator, KisCurve::iterator) diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc index e3baf49c..e18b096c 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc @@ -289,7 +289,7 @@ KisCurve::iterator KisToolBezier::handleUnderMouse(const TQPoint& pos) continue; if (hint == BEZIERENDHINT && (m_actionOptions & SHIFTOPTION)) continue; - if (pivotRect(qpos).tqcontains(pos)) { + if (pivotRect(qpos).contains(pos)) { inHandle.pushPoint((*it)); if (hint == BEZIERENDHINT && !(m_actionOptions & SHIFTOPTION)) break; @@ -300,7 +300,7 @@ KisCurve::iterator KisToolBezier::handleUnderMouse(const TQPoint& pos) if (inHandle.isEmpty()) return m_curve->end(); - return m_curve->tqfind(inHandle.last()); + return m_curve->find(inHandle.last()); } KisCurve::iterator KisToolBezier::drawPoint (KisCanvasPainter& gc, KisCurve::iterator point) diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc index f98d2c72..08becf67 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc @@ -124,7 +124,7 @@ void KisToolCurve::buttonPress(KisButtonPressEvent *event) m_curve->selectAll(false); draw(true, true); draw(m_curve->end()); - m_previous = m_curve->tqfind(m_curve->last()); + m_previous = m_curve->find(m_curve->last()); m_current = m_curve->pushPivot(event->pos()); if (m_curve->pivots().count() > 1) m_curve->calculateCurve(m_previous,m_current,m_current); @@ -158,7 +158,7 @@ void KisToolCurve::keyPress(TQKeyEvent *event) draw(false); m_dragging = false; m_curve->deleteSelected(); - m_current = m_curve->tqfind(m_curve->last()); + m_current = m_curve->find(m_curve->last()); m_previous = m_curve->selectPivot(m_current); draw(false); } @@ -250,12 +250,12 @@ KisCurve::iterator KisToolCurve::handleUnderMouse(const TQPoint& pos) KisCurve pivs = m_curve->pivots(), inHandle; KisCurve::iterator it; for (it = pivs.begin(); it != pivs.end(); it++) { - if (pivotRect(m_subject->canvasController()->windowToView((*it).point().toTQPoint())).tqcontains(pos)) + if (pivotRect(m_subject->canvasController()->windowToView((*it).point().toTQPoint())).contains(pos)) inHandle.pushPoint((*it)); } if (inHandle.isEmpty()) return m_curve->end(); - return m_curve->tqfind(inHandle.last()); + return m_curve->find(inHandle.last()); } KisCurve::iterator KisToolCurve::selectByMouse(KisCurve::iterator it) @@ -344,8 +344,8 @@ void KisToolCurve::draw(KisCurve::iterator inf, bool pivotonly, bool minimal) return; } for (KisCurve::iterator i = sel.begin(); i != sel.end(); i++) { - it = m_curve->tqfind(*i).previousPivot(); - finish = m_curve->tqfind(*i).nextPivot(); + it = m_curve->find(*i).previousPivot(); + finish = m_curve->find(*i).nextPivot(); if ((*finish).isSelected()) finish = finish.previousPivot(); while (it != finish) { diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc index 3a21e72e..061db881 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc +++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc @@ -97,7 +97,7 @@ void KisToolPerspectiveGrid::update (KisCanvasSubject *subject) bool KisToolPerspectiveGrid::mouseNear(const TQPoint& mousep, const TQPoint point) { - return (TQRect( (point.x() - m_handleHalfSize), (point.y() - m_handleHalfSize), m_handleSize, m_handleSize).tqcontains(mousep) ); + return (TQRect( (point.x() - m_handleHalfSize), (point.y() - m_handleHalfSize), m_handleSize, m_handleSize).contains(mousep) ); } void KisToolPerspectiveGrid::buttonPress(KisButtonPressEvent *event) diff --git a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc index 809d1a7d..dbcfd74c 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc +++ b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc @@ -240,7 +240,7 @@ void KisToolPerspectiveTransform::paint(KisCanvasPainter& gc, const TQRect& rc) bool KisToolPerspectiveTransform::mouseNear(const TQPoint& mousep, const TQPoint point) { - return (TQRect( (point.x() - m_handleHalfSize), (point.y() - m_handleHalfSize), m_handleSize, m_handleSize).tqcontains(mousep) ); + return (TQRect( (point.x() - m_handleHalfSize), (point.y() - m_handleHalfSize), m_handleSize, m_handleSize).contains(mousep) ); } void KisToolPerspectiveTransform::buttonPress(KisButtonPressEvent *event) diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc index 207c86c3..15e21400 100644 --- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc +++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc @@ -133,7 +133,7 @@ void KisDropshadow::dropshadow(KisProgressDisplayInterface * progress, TQ_INT32 { TQRect shadowBounds = shadowDev->exactBounds(); - if (!image->bounds().tqcontains(shadowBounds)) { + if (!image->bounds().contains(shadowBounds)) { TQRect newImageSize = image->bounds() | shadowBounds; image->resize(newImageSize.width(), newImageSize.height()); diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp index 1d3a451d..f4511554 100644 --- a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp +++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp @@ -60,7 +60,7 @@ void SizeTip::positionTip( const TQRect &rect ) TQRect deskR = KGlobalSettings::desktopGeometry( TQPoint( 0, 0 ) ); tipRect.moveCenter( TQPoint( deskR.width()/2, deskR.height()/2 ) ); - if ( !rect.tqcontains( tipRect, true ) && rect.intersects( tipRect ) ) + if ( !rect.contains( tipRect, true ) && rect.intersects( tipRect ) ) tipRect.moveBottomRight( tqgeometry().bottomRight() ); } diff --git a/chalk/sdk/kis_shared_ptr_vector.h b/chalk/sdk/kis_shared_ptr_vector.h index 679bdd9f..ee7961ae 100644 --- a/chalk/sdk/kis_shared_ptr_vector.h +++ b/chalk/sdk/kis_shared_ptr_vector.h @@ -57,7 +57,7 @@ public: return super::erase(first, last); } - bool tqcontains(KSharedPtr<T> ptr) const + bool contains(KSharedPtr<T> ptr) const { for (int i = 0, n = super::count(); i < n; ++i) if (super::at(i) == ptr) diff --git a/chalk/ui/kis_cmb_composite.cc b/chalk/ui/kis_cmb_composite.cc index 54c4b643..754e69da 100644 --- a/chalk/ui/kis_cmb_composite.cc +++ b/chalk/ui/kis_cmb_composite.cc @@ -55,7 +55,7 @@ KisCompositeOp KisCmbComposite::currentItem() const void KisCmbComposite::setCurrentItem(const KisCompositeOp& op) { - if (m_list.tqfind(op) != m_list.end()) { + if (m_list.find(op) != m_list.end()) { super::setCurrentText(op.id().name()); } } diff --git a/chalk/ui/kis_cmb_idlist.cc b/chalk/ui/kis_cmb_idlist.cc index bdd6f09b..0936350e 100644 --- a/chalk/ui/kis_cmb_idlist.cc +++ b/chalk/ui/kis_cmb_idlist.cc @@ -57,7 +57,7 @@ KisID KisCmbIDList::currentItem() const void KisCmbIDList::setCurrent(const KisID id) { - if (m_list.tqfind(id) != m_list.end()) + if (m_list.find(id) != m_list.end()) super::setCurrentText(id.name()); else { m_list.push_back(id); diff --git a/chalk/ui/kis_dlg_image_properties.cc b/chalk/ui/kis_dlg_image_properties.cc index 72c26ec5..29d221a0 100644 --- a/chalk/ui/kis_dlg_image_properties.cc +++ b/chalk/ui/kis_dlg_image_properties.cc @@ -72,7 +72,7 @@ KisDlgImageProperties::KisDlgImageProperties(KisImageSP image, TQWidget *tqparen //m_page->cmbColorSpaces->hide(); //m_page->lblColorSpaces->setText(image->colorSpace()->id().name()); KisIDList colorSpaces = KisMetaRegistry::instance()->csRegistry()->listKeys(); - KisIDList::iterator i = colorSpaces.tqfind(KisID("WET","")); + KisIDList::iterator i = colorSpaces.find(KisID("WET","")); if (i != colorSpaces.end()) { colorSpaces.remove(i); } diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc index 9f82c0d7..941e033e 100644 --- a/chalk/ui/kis_dlg_preferences.cc +++ b/chalk/ui/kis_dlg_preferences.cc @@ -130,7 +130,7 @@ ColorSettingsTab::ColorSettingsTab(TQWidget *tqparent, const char *name ) refillMonitorProfiles(KisID("RGBA", "")); refillPrintProfiles(KisID(cfg.printerColorSpace(), "")); - if(m_page->cmbMonitorProfile->tqcontains(cfg.monitorProfile())) + if(m_page->cmbMonitorProfile->contains(cfg.monitorProfile())) m_page->cmbMonitorProfile->setCurrentText(cfg.monitorProfile()); if(m_page->cmbPrintProfile->contains(cfg.printerProfile())) m_page->cmbPrintProfile->setCurrentText(cfg.printerProfile()); diff --git a/chalk/ui/kis_filter_manager.cc b/chalk/ui/kis_filter_manager.cc index a5b145da..e8bf5ba8 100644 --- a/chalk/ui/kis_filter_manager.cc +++ b/chalk/ui/kis_filter_manager.cc @@ -95,57 +95,57 @@ void KisFilterManager::setup(KActionCollection * ac) if (!f) break; TQString s = f->menuCategory(); - if (s == "adjust" && !m_filterActionMenus.tqfind("adjust")) { + if (s == "adjust" && !m_filterActionMenus.find("adjust")) { am = new KActionMenu(i18n("Adjust"), ac, "adjust_filters"); m_filterActionMenus.insert("adjust", am); } - else if (s == "artistic" && !m_filterActionMenus.tqfind("artistic")) { + else if (s == "artistic" && !m_filterActionMenus.find("artistic")) { am = new KActionMenu(i18n("Artistic"), ac, "artistic_filters"); m_filterActionMenus.insert("artistic", am); } - else if (s == "blur" && !m_filterActionMenus.tqfind("blur")) { + else if (s == "blur" && !m_filterActionMenus.find("blur")) { am = new KActionMenu(i18n("Blur"), ac, "blur_filters"); m_filterActionMenus.insert("blur", am); } - else if (s == "colors" && !m_filterActionMenus.tqfind("colors")) { + else if (s == "colors" && !m_filterActionMenus.find("colors")) { am = new KActionMenu(i18n("Colors"), ac, "color_filters"); m_filterActionMenus.insert("colors", am); } - else if (s == "decor" && !m_filterActionMenus.tqfind("decor")) { + else if (s == "decor" && !m_filterActionMenus.find("decor")) { am = new KActionMenu(i18n("Decor"), ac, "decor_filters"); m_filterActionMenus.insert("decor", am); } - else if (s == "edge" && !m_filterActionMenus.tqfind("edge")) { + else if (s == "edge" && !m_filterActionMenus.find("edge")) { am = new KActionMenu(i18n("Edge Detection"), ac, "edge_filters"); m_filterActionMenus.insert("edge", am); } - else if (s == "emboss" && !m_filterActionMenus.tqfind("emboss")) { + else if (s == "emboss" && !m_filterActionMenus.find("emboss")) { am = new KActionMenu(i18n("Emboss"), ac, "emboss_filters"); m_filterActionMenus.insert("emboss", am); } - else if (s == "enhance" && !m_filterActionMenus.tqfind("enhance")) { + else if (s == "enhance" && !m_filterActionMenus.find("enhance")) { am = new KActionMenu(i18n("Enhance"), ac, "enhance_filters"); m_filterActionMenus.insert("enhance", am); } - else if (s == "map" && !m_filterActionMenus.tqfind("map")) { + else if (s == "map" && !m_filterActionMenus.find("map")) { am = new KActionMenu(i18n("Map"), ac, "map_filters"); m_filterActionMenus.insert("map", am); } - else if (s == "nonphotorealistic" && !m_filterActionMenus.tqfind("nonphotorealistic")) { + else if (s == "nonphotorealistic" && !m_filterActionMenus.find("nonphotorealistic")) { am = new KActionMenu(i18n("Non-photorealistic"), ac, "nonphotorealistic_filters"); m_filterActionMenus.insert("nonphotorealistic", am); } - else if (s == "other" && !m_filterActionMenus.tqfind("other")) { + else if (s == "other" && !m_filterActionMenus.find("other")) { other = new KActionMenu(i18n("Other"), ac, "misc_filters"); m_filterActionMenus.insert("other", other); } @@ -171,7 +171,7 @@ void KisFilterManager::setup(KActionCollection * ac) TQString("chalk_filter_%1").tqarg((*it) . id()).ascii()); // Add action to the right submenu - KActionMenu * m = m_filterActionMenus.tqfind( f->menuCategory() ); + KActionMenu * m = m_filterActionMenus.find( f->menuCategory() ); if (m) { m->insert(a); } diff --git a/chalk/ui/kis_filters_listview.cc b/chalk/ui/kis_filters_listview.cc index 788a787d..163c88a4 100644 --- a/chalk/ui/kis_filters_listview.cc +++ b/chalk/ui/kis_filters_listview.cc @@ -173,7 +173,7 @@ void KisFiltersListView::setLayer(KisLayerSP layer) { void KisFiltersListView::setCurrentFilter(KisID filter) { - setCurrentItem(tqfindItem(filter.name())); + setCurrentItem(findItem(filter.name())); } void KisFiltersListView::buildPreview() diff --git a/chalk/ui/kis_gradient_slider_widget.cc b/chalk/ui/kis_gradient_slider_widget.cc index 3777a214..0547bdb5 100644 --- a/chalk/ui/kis_gradient_slider_widget.cc +++ b/chalk/ui/kis_gradient_slider_widget.cc @@ -132,20 +132,20 @@ void KisGradientSliderWidget::mousePressEvent( TQMouseEvent * e ) // Change the activation order of the handles to avoid deadlocks if( t > 0.5 ) { - if( leftHandle.tqcontains( e->pos() ) ) + if( leftHandle.contains( e->pos() ) ) m_drag = LEFT_DRAG; - else if( middleHandle.tqcontains( e->pos() ) ) + else if( middleHandle.contains( e->pos() ) ) m_drag = MIDDLE_DRAG; - else if( rightHandle.tqcontains( e->pos() ) ) + else if( rightHandle.contains( e->pos() ) ) m_drag = RIGHT_DRAG; } else { - if( rightHandle.tqcontains( e->pos() ) ) + if( rightHandle.contains( e->pos() ) ) m_drag = RIGHT_DRAG; - else if( middleHandle.tqcontains( e->pos() ) ) + else if( middleHandle.contains( e->pos() ) ) m_drag = MIDDLE_DRAG; - else if( leftHandle.tqcontains( e->pos() ) ) + else if( leftHandle.contains( e->pos() ) ) m_drag = LEFT_DRAG; } diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc index e257e2b0..cfdc6acd 100644 --- a/chalk/ui/kis_layerbox.cc +++ b/chalk/ui/kis_layerbox.cc @@ -499,7 +499,7 @@ void KisLayerBox::slotAddMenuActivated(int type) void KisLayerBox::slotRmClicked() { TQValueList<int> l = list()->selectedLayerIDs(); - if (l.count() < 2 && list()->activeLayer() && !l.tqcontains(list()->activeLayer()->id())) + if (l.count() < 2 && list()->activeLayer() && !l.contains(list()->activeLayer()->id())) { l.clear(); l.append(list()->activeLayer()->id()); @@ -515,7 +515,7 @@ void KisLayerBox::slotRmClicked() void KisLayerBox::slotRaiseClicked() { TQValueList<int> l = list()->selectedLayerIDs(); - if (l.count() < 2 && list()->activeLayer() && !l.tqcontains(list()->activeLayer()->id())) + if (l.count() < 2 && list()->activeLayer() && !l.contains(list()->activeLayer()->id())) { l.clear(); l.append(list()->activeLayer()->id()); @@ -542,7 +542,7 @@ void KisLayerBox::slotRaiseClicked() void KisLayerBox::slotLowerClicked() { TQValueList<LayerItem*> l = list()->selectedLayers(); - if (l.count() < 2 && list()->activeLayer() && !l.tqcontains(list()->activeLayer())) + if (l.count() < 2 && list()->activeLayer() && !l.contains(list()->activeLayer())) { l.clear(); l.append(list()->activeLayer()); @@ -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 tqfind %1").tqarg(filename), + KMessageBox::error(0, i18n("Cannot find %1").tqarg(filename), i18n("Canvas")); return pixmap; @@ -612,7 +612,7 @@ void KisLayerBox::markModified(KisLayer* layer) layer = layer->tqparent(); } for (int i = v.count() - 1; i >= 0; --i) - if (!m_modified.tqcontains(v[i])) + if (!m_modified.contains(v[i])) m_modified.append(v[i]); } diff --git a/chalk/ui/kis_paintop_box.cc b/chalk/ui/kis_paintop_box.cc index 9f8ac9de..ad4dbabb 100644 --- a/chalk/ui/kis_paintop_box.cc +++ b/chalk/ui/kis_paintop_box.cc @@ -126,7 +126,7 @@ void KisPaintopBox::colorSpaceChanged(KisColorSpace *cs) } } - int index = m_displayedOps->tqfindIndex(currentPaintop()); + int index = m_displayedOps->findIndex(currentPaintop()); if (index == -1) { // Must change the paintop as the current one is not supported @@ -162,7 +162,7 @@ void KisPaintopBox::slotInputDeviceChanged(const KisInputDevice & inputDevice) paintop = (*it).second; } - int index = m_displayedOps->tqfindIndex(paintop); + int index = m_displayedOps->findIndex(paintop); if (index == -1) { // Must change the paintop as the current one is not supported @@ -238,7 +238,7 @@ const KisPaintOpSettings *KisPaintopBox::paintopSettings(const KisID & paintop, settingsArray = (*it).second; } - const int index = m_paintops->tqfindIndex(paintop); + const int index = m_paintops->findIndex(paintop); if (index >= 0 && index < (int)settingsArray.count()) return settingsArray[index]; else diff --git a/chalk/ui/kis_part_layer.cc b/chalk/ui/kis_part_layer.cc index 459770d1..ace29965 100644 --- a/chalk/ui/kis_part_layer.cc +++ b/chalk/ui/kis_part_layer.cc @@ -129,7 +129,7 @@ void KisPartLayerImpl::paintSelection(TQImage &img, TQ_INT32 x, TQ_INT32 y, TQ_I for (int y2 = y; y2 < h + y; ++y2) { for (int x2 = x; x2 < w + x; ++x2) { - if (!rect.tqcontains(x2, y2)) { + if (!rect.contains(x2, y2)) { TQ_UINT8 g = (*(j + 0) + *(j + 1 ) + *(j + 2 )) / 9; *(j+0) = 165+g; *(j+1) = 128+g; diff --git a/chalk/ui/kis_resource_mediator.cc b/chalk/ui/kis_resource_mediator.cc index 204a1033..d4993807 100644 --- a/chalk/ui/kis_resource_mediator.cc +++ b/chalk/ui/kis_resource_mediator.cc @@ -64,7 +64,7 @@ KisResource *KisResourceMediator::currentResource() const KisIconItem *KisResourceMediator::itemFor(KisResource *r) const { - if(m_items.tqcontains(r)) + if(m_items.contains(r)) { return m_items[r]; } diff --git a/chalk/ui/kis_resourceserver.cc b/chalk/ui/kis_resourceserver.cc index d464e1bc..e7593ceb 100644 --- a/chalk/ui/kis_resourceserver.cc +++ b/chalk/ui/kis_resourceserver.cc @@ -64,7 +64,7 @@ void KisResourceServerBase::loadResources(TQStringList filenames) // XXX: Don't load resources with the same filename. Actually, we should look inside // the resource to find out whether they are really the same, but for now this // will prevent the same brush etc. showing up twice. - if (uniqueFiles.empty() || uniqueFiles.tqfind(fname) == uniqueFiles.end()) { + if (uniqueFiles.empty() || uniqueFiles.find(fname) == uniqueFiles.end()) { uniqueFiles.append(fname); KisResource *resource; resource = createResource(front); diff --git a/chalk/ui/kis_tool_freehand.cc b/chalk/ui/kis_tool_freehand.cc index 5885c433..bbe575d1 100644 --- a/chalk/ui/kis_tool_freehand.cc +++ b/chalk/ui/kis_tool_freehand.cc @@ -87,7 +87,7 @@ void KisToolFreehand::buttonPress(KisButtonPressEvent *e) // People complain that they can't start brush strokes outside of the image boundaries. // This makes sense, especially when combined with BUG:132759, so commenting out the // next line makes sense. - //if (!m_currentImage->bounds().tqcontains(e->pos().floorTQPoint())) return; + //if (!m_currentImage->bounds().contains(e->pos().floorTQPoint())) return; initPaint(e); paintAt(e->pos(), e->pressure(), e->xTilt(), e->yTilt()); @@ -309,7 +309,7 @@ void KisToolFreehand::paintOutline(const KisPoint& point) { KisCanvasController *controller = m_subject->canvasController(); - if (currentImage() && !currentImage()->bounds().tqcontains(point.floorTQPoint())) { + if (currentImage() && !currentImage()->bounds().contains(point.floorTQPoint())) { if (m_paintedOutline) { controller->kiscanvas()->update(); m_paintedOutline = false; diff --git a/chalk/ui/kis_tool_paint.cc b/chalk/ui/kis_tool_paint.cc index d8d19f36..aa1bf7a7 100644 --- a/chalk/ui/kis_tool_paint.cc +++ b/chalk/ui/kis_tool_paint.cc @@ -244,7 +244,7 @@ void KisToolPaint::updateCompositeOpComboBox() KisCompositeOpList compositeOps = device->colorSpace()->userVisiblecompositeOps(); m_cmbComposite->setCompositeOpList(compositeOps); - if (compositeOps.tqfind(m_compositeOp) == compositeOps.end()) { + if (compositeOps.find(m_compositeOp) == compositeOps.end()) { m_compositeOp = COMPOSITE_OVER; } m_cmbComposite->setCurrentItem(m_compositeOp); diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc index e3500f97..0b288da5 100644 --- a/chalk/ui/kis_view.cc +++ b/chalk/ui/kis_view.cc @@ -2281,7 +2281,7 @@ void KisView::canvasGotButtonPressEvent(KisButtonPressEvent *e) // m_currentGuide = 0; // // if ((e->state() & ~TQt::ShiftButton) == Qt::NoButton) { -// KisGuideSP gd = mgr->tqfind(static_cast<TQ_INT32>(pt.x() / zoom()), static_cast<TQ_INT32>(pt.y() / zoom()), TQMAX(2.0, 2.0 / zoom())); +// KisGuideSP gd = mgr->find(static_cast<TQ_INT32>(pt.x() / zoom()), static_cast<TQ_INT32>(pt.y() / zoom()), TQMAX(2.0, 2.0 / zoom())); // // if (gd) { // m_currentGuide = gd; @@ -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().tqcontains(pt); + bool flag = tqgeometry().contains(pt); KisGuideSP gd; if (m_currentGuide == 0 && flag) { diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp index 0cd835b1..34dd043f 100644 --- a/chalk/ui/kobirdeyepanel.cpp +++ b/chalk/ui/kobirdeyepanel.cpp @@ -362,23 +362,23 @@ KoBirdEyePanel::enumDragHandle KoBirdEyePanel::dragHandleAt(TQPoint p) TQRect top = TQRect(m_visibleAreaInThumbnail.left()-1, m_visibleAreaInThumbnail.top()-1, m_visibleAreaInThumbnail.width()+2, 3); TQRect bottom = TQRect(m_visibleAreaInThumbnail.left()-1, m_visibleAreaInThumbnail.bottom()-1, m_visibleAreaInThumbnail.width()+2, 3); - if (left.tqcontains(p)) { + if (left.contains(p)) { return DragHandleLeft; } - if (right.tqcontains(p)) { + if (right.contains(p)) { return DragHandleRight; } - if (top.tqcontains(p)) { + if (top.contains(p)) { return DragHandleTop; } - if (bottom.tqcontains(p)) { + if (bottom.contains(p)) { return DragHandleBottom; } - if (m_visibleAreaInThumbnail.tqcontains(p)) { + if (m_visibleAreaInThumbnail.contains(p)) { return DragHandleCentre; } @@ -403,7 +403,7 @@ void KoBirdEyePanel::handleMouseMove(TQPoint p) break; default: case DragHandleNone: - if (TQT_TQRECT_OBJECT(m_thumbnail.rect()).tqcontains(p)) { + if (TQT_TQRECT_OBJECT(m_thumbnail.rect()).contains(p)) { cursor = TQt::PointingHandCursor; } else { cursor = TQt::arrowCursor; @@ -462,7 +462,7 @@ void KoBirdEyePanel::handleMousePress(TQPoint p) enumDragHandle dragHandle = dragHandleAt(p); if (dragHandle == DragHandleNone) { - if (TQT_TQRECT_OBJECT(m_thumbnail.rect()).tqcontains(p)) { + if (TQT_TQRECT_OBJECT(m_thumbnail.rect()).contains(p)) { // Snap visible area centre to p and begin a centre drag. diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp index 059d4e35..6f7cb4e2 100644 --- a/chalk/ui/layerlist.cpp +++ b/chalk/ui/layerlist.cpp @@ -681,7 +681,7 @@ void LayerList::contentsMouseDoubleClickEvent( TQMouseEvent *e ) super::contentsMouseDoubleClickEvent( e ); if( LayerItem *layer = static_cast<LayerItem*>( itemAt( contentsToViewport( e->pos() ) ) ) ) { - if( !layer->iconsRect().tqcontains( layer->mapFromListView( e->pos() ) ) ) + if( !layer->iconsRect().contains( layer->mapFromListView( e->pos() ) ) ) { emit requestLayerProperties( layer ); emit requestLayerProperties( layer->id() ); @@ -867,7 +867,7 @@ void LayerItem::init() LayerItem::~LayerItem() { - if (listView() && (listView()->activeLayer() == this || tqcontains(listView()->activeLayer()))) + if (listView() && (listView()->activeLayer() == this || contains(listView()->activeLayer()))) listView()->setActiveLayer( static_cast<LayerItem*>( 0 ) ); delete d; } @@ -885,7 +885,7 @@ bool LayerItem::isFolder() const return d->isFolder; } -bool LayerItem::tqcontains(const LayerItem *item) +bool LayerItem::contains(const LayerItem *item) { TQListViewItemIterator it(this); @@ -1180,7 +1180,7 @@ bool LayerItem::mousePressEvent( TQMouseEvent *e ) const TQRect ir = iconsRect(), tr = textRect(); - if( ir.tqcontains( e->pos() ) ) + if( ir.contains( e->pos() ) ) { const int iconWidth = iconSize().width(); int x = e->pos().x() - ir.left(); @@ -1201,7 +1201,7 @@ bool LayerItem::mousePressEvent( TQMouseEvent *e ) return true; } - else if( tr.tqcontains( e->pos() ) && isSelected() && !listView()->renameLineEdit()->isVisible() ) + else if( tr.contains( e->pos() ) && isSelected() && !listView()->renameLineEdit()->isVisible() ) { listView()->rename( this, 0 ); TQRect r( listView()->contentsToViewport( mapToListView( tr.topLeft() ) ), tr.size() ); diff --git a/chalk/ui/layerlist.h b/chalk/ui/layerlist.h index 58c2a4bb..5c75b6b7 100644 --- a/chalk/ui/layerlist.h +++ b/chalk/ui/layerlist.h @@ -178,7 +178,7 @@ public: // Returns true if this item is the given item or the tree rooted at // this item contains the given item. - bool tqcontains(const LayerItem *item); + bool contains(const LayerItem *item); int id() const; diff --git a/chalk/ui/squeezedcombobox.cpp b/chalk/ui/squeezedcombobox.cpp index 96929450..1c58f1dd 100644 --- a/chalk/ui/squeezedcombobox.cpp +++ b/chalk/ui/squeezedcombobox.cpp @@ -76,7 +76,7 @@ SqueezedComboBox::~SqueezedComboBox() delete m_timer; } -bool SqueezedComboBox::tqcontains( const TQString& _text ) const +bool SqueezedComboBox::contains( const TQString& _text ) const { if ( _text.isEmpty() ) return false; diff --git a/chalk/ui/squeezedcombobox.h b/chalk/ui/squeezedcombobox.h index 66758335..0ca7bb41 100644 --- a/chalk/ui/squeezedcombobox.h +++ b/chalk/ui/squeezedcombobox.h @@ -97,7 +97,7 @@ public: */ virtual ~SqueezedComboBox(); - bool tqcontains(const TQString & text) const; + bool contains(const TQString & text) const; /** * This inserts a item to the list. See TQComboBox::insertItem() diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cc index a0545569..2118e376 100644 --- a/filters/chalk/gmagick/kis_image_magick_converter.cc +++ b/filters/chalk/gmagick/kis_image_magick_converter.cc @@ -1025,7 +1025,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB description = info -> description; kdDebug(41008) << "Found import filter for: " << name << "\n"; - if (!description.isEmpty() && !description.tqcontains('/')) { + if (!description.isEmpty() && !description.contains('/')) { all += "*." + name.lower() + " *." + name + " "; s += "*." + name.lower() + " *." + name + "|"; s += i18n(description.utf8()); @@ -1042,7 +1042,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB description = mi -> description; kdDebug(41008) << "Found import filter for: " << name << "\n"; - if (!description.isEmpty() && !description.tqcontains('/')) { + if (!description.isEmpty() && !description.contains('/')) { all += "*." + name.lower() + " *." + name + " "; s += "*." + name.lower() + " *." + name + "|"; s += i18n(description.utf8()); @@ -1102,7 +1102,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB description = info -> description; - if (!description.isEmpty() && !description.tqcontains('/')) { + if (!description.isEmpty() && !description.contains('/')) { all += "*." + name.lower() + " *." + name + " "; s += "*." + name.lower() + " *." + name + "|"; s += i18n(description.utf8()); @@ -1121,7 +1121,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB description = mi -> description; - if (!description.isEmpty() && !description.tqcontains('/')) { + if (!description.isEmpty() && !description.contains('/')) { all += "*." + name.lower() + " *." + name + " "; s += "*." + name.lower() + " *." + name + "|"; s += i18n(description.utf8()); diff --git a/filters/chalk/jpeg/iccjpeg.c b/filters/chalk/jpeg/iccjpeg.c index 7abe1ff4..fefa9509 100644 --- a/filters/chalk/jpeg/iccjpeg.c +++ b/filters/chalk/jpeg/iccjpeg.c @@ -133,7 +133,7 @@ write_icc_profile (j_compress_ptr cinfo, void setup_read_icc_profile (j_decompress_ptr cinfo) { - /* Tell the library to keep any APP2 data it may tqfind */ + /* Tell the library to keep any APP2 data it may find */ jpeg_save_markers(cinfo, ICC_MARKER, 0xFFFF); } diff --git a/filters/chalk/magick/kis_image_magick_converter.cc b/filters/chalk/magick/kis_image_magick_converter.cc index ee6267ad..16140414 100644 --- a/filters/chalk/magick/kis_image_magick_converter.cc +++ b/filters/chalk/magick/kis_image_magick_converter.cc @@ -970,7 +970,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB description = info -> description; kdDebug(41008) << "Found import filter for: " << name << "\n"; - if (!description.isEmpty() && !description.tqcontains('/')) { + if (!description.isEmpty() && !description.contains('/')) { all += "*." + name.lower() + " *." + name + " "; s += "*." + name.lower() + " *." + name + "|"; s += i18n(description.utf8()); @@ -987,7 +987,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB description = mi -> description; kdDebug(41008) << "Found import filter for: " << name << "\n"; - if (!description.isEmpty() && !description.tqcontains('/')) { + if (!description.isEmpty() && !description.contains('/')) { all += "*." + name.lower() + " *." + name + " "; s += "*." + name.lower() + " *." + name + "|"; s += i18n(description.utf8()); @@ -1047,7 +1047,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB description = info -> description; - if (!description.isEmpty() && !description.tqcontains('/')) { + if (!description.isEmpty() && !description.contains('/')) { all += "*." + name.lower() + " *." + name + " "; s += "*." + name.lower() + " *." + name + "|"; s += i18n(description.utf8()); @@ -1066,7 +1066,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB description = mi -> description; - if (!description.isEmpty() && !description.tqcontains('/')) { + if (!description.isEmpty() && !description.contains('/')) { all += "*." + name.lower() + " *." + name + " "; s += "*." + name.lower() + " *." + name + "|"; s += i18n(description.utf8()); diff --git a/filters/chalk/xcf/xcf/xcf-load.cc b/filters/chalk/xcf/xcf/xcf-load.cc index cf1152c6..670bec0a 100644 --- a/filters/chalk/xcf/xcf/xcf-load.cc +++ b/filters/chalk/xcf/xcf/xcf-load.cc @@ -128,7 +128,7 @@ xcf_load_image (XcfInfo * info) goto hard_error; /* check for a GimpGrid parasite */ - parasite = gimp_image_parasite_tqfind (GIMP_IMAGE (gimage), + parasite = gimp_image_parasite_find (GIMP_IMAGE (gimage), gimp_grid_parasite_name ()); if (parasite) { diff --git a/filters/karbon/ai/aiparserbase.cc b/filters/karbon/ai/aiparserbase.cc index 6e9ff040..817c3d7e 100644 --- a/filters/karbon/ai/aiparserbase.cc +++ b/filters/karbon/ai/aiparserbase.cc @@ -791,16 +791,16 @@ void AIParserBase::_handleDocumentProcessColors(const char *data) { signed int index; - index = tmp.tqfind ("Cyan"); + index = tmp.find ("Cyan"); if (index > 0) colorSet |= PC_Cyan; - index = tmp.tqfind ("Magenta"); + index = tmp.find ("Magenta"); if (index > 0) colorSet |= PC_Magenta; - index = tmp.tqfind ("Yellow"); + index = tmp.find ("Yellow"); if (index > 0) colorSet |= PC_Yellow; - index = tmp.tqfind ("Black"); + index = tmp.find ("Black"); if (index > 0) colorSet |= PC_Black; if (m_documentHandler) m_documentHandler->gotProcessColors (colorSet); @@ -945,7 +945,7 @@ void AIParserBase::gotToken (const char *value) { TQString string(value); - if (m_modules.tqfindIndex(string) != -1) + if (m_modules.findIndex(string) != -1) { AIElement element (string, AIElement::Reference); handleElement (element); @@ -1067,7 +1067,7 @@ CommentOperation AIParserBase::getCommentOperation (const char *command) { for(;;) { CommentOperationMapping map = commentMappings[i]; if (map.op == NULL) return CO_Other; - index = data.tqfind (map.op); + index = data.find (map.op); if (index >= 0) return map.action; i++; } @@ -1088,7 +1088,7 @@ void GStateHandlerBase::gotStrokePattern (const char *pname, double px, double p const char *AIParserBase::getValue (const char *input) { TQString data(input); - signed int index = data.tqfind (':'); + signed int index = data.find (':'); if (index < 0) return ""; index++; while (data.at(index) == ' ') index++; @@ -1099,7 +1099,7 @@ bool AIParserBase::getRectangle (const char* input, int &llx, int &lly, int &urx if (input == NULL) return false; TQString s(input); - if (s.tqcontains ("(atend)")) return false; + if (s.contains ("(atend)")) return false; TQStringList values = TQStringList::split (" ", input); if (values.size() < 5) return false; llx = values[1].toInt(); diff --git a/filters/karbon/applixgraphics/applixgraphicimport.cc b/filters/karbon/applixgraphics/applixgraphicimport.cc index 8a433ec9..b3df1581 100644 --- a/filters/karbon/applixgraphics/applixgraphicimport.cc +++ b/filters/karbon/applixgraphics/applixgraphicimport.cc @@ -231,11 +231,11 @@ KoFilter::ConversiontqStatus APPLIXGRAPHICImport::convert( const TQCString& from //mystr.remove (0, 7); - //remove_pos = mystr.tqfind ('('); + //remove_pos = mystr.find ('('); //mystr.remove (0, remove_pos); //agLine.offX= mystr.toInt(); - //remove_pos = mystr.tqfind (','); + //remove_pos = mystr.find (','); //mystr.remove (0, remove_pos); //agLine.offY= mystr.toInt(); rueck = sscanf ((const char *) mystr.latin1(), "(%d,%d)", diff --git a/filters/karbon/eps/pscommentlexer.cc b/filters/karbon/eps/pscommentlexer.cc index dc0a67a1..04aa9aaa 100644 --- a/filters/karbon/eps/pscommentlexer.cc +++ b/filters/karbon/eps/pscommentlexer.cc @@ -298,7 +298,7 @@ BoundingBoxExtractor::~BoundingBoxExtractor() {} void BoundingBoxExtractor::gotComment (const char *value) { TQString data (value); - if (data.tqfind("%BoundingBox:")==-1) return; + if (data.find("%BoundingBox:")==-1) return; getRectangle (value, m_llx, m_lly, m_urx, m_ury); } @@ -308,7 +308,7 @@ bool BoundingBoxExtractor::getRectangle (const char* input, int &llx, int &lly, if (input == NULL) return false; TQString s(input); - if (s.tqcontains ("(atend)")) return false; + if (s.contains ("(atend)")) return false; TQString s2 = s.remove("%BoundingBox:"); TQStringList values = TQStringList::split (" ", s2.latin1()); diff --git a/filters/karbon/oodraw/oodrawimport.cc b/filters/karbon/oodraw/oodrawimport.cc index d571762b..ef90c93d 100644 --- a/filters/karbon/oodraw/oodrawimport.cc +++ b/filters/karbon/oodraw/oodrawimport.cc @@ -659,7 +659,7 @@ OoDrawImport::parseViewBox( const TQDomElement& object ) { // allow for viewbox def with ',' or whitespace TQString viewbox( object.attributeNS( ooNS::svg, "viewBox", TQString() ) ); - TQStringList points = TQStringList::split( ' ', viewbox.tqreplace( ',', ' ').simplifyWhiteSpace() ); + TQStringList points = TQStringList::split( ' ', viewbox.replace( ',', ' ').simplifyWhiteSpace() ); rect.setX( points[0].toFloat() ); rect.setY( points[1].toFloat() ); @@ -715,19 +715,19 @@ OoDrawImport::parseColor( VColor &color, const TQString &s ) TQString g = colors[1]; TQString b = colors[2].left( ( colors[2].length() - 1 ) ); - if( r.tqcontains( "%" ) ) + if( r.contains( "%" ) ) { r = r.left( r.length() - 1 ); r = TQString::number( int( ( double( 255 * r.toDouble() ) / 100.0 ) ) ); } - if( g.tqcontains( "%" ) ) + if( g.contains( "%" ) ) { g = g.left( g.length() - 1 ); g = TQString::number( int( ( double( 255 * g.toDouble() ) / 100.0 ) ) ); } - if( b.tqcontains( "%" ) ) + if( b.contains( "%" ) ) { b = b.left( b.length() - 1 ); b = TQString::number( int( ( double( 255 * b.toDouble() ) / 100.0 ) ) ); diff --git a/filters/karbon/svg/svgimport.cc b/filters/karbon/svg/svgimport.cc index b8b580f7..5a5e90aa 100644 --- a/filters/karbon/svg/svgimport.cc +++ b/filters/karbon/svg/svgimport.cc @@ -63,7 +63,7 @@ KoFilter::ConversiontqStatus SvgImport::convert(const TQCString& from, const TQC //Find the last extension TQString strExt; TQString fileIn ( m_chain->inputFile() ); - const int result=fileIn.tqfindRev('.'); + const int result=fileIn.findRev('.'); if (result>=0) strExt=fileIn.mid(result).lower(); @@ -143,7 +143,7 @@ void SvgImport::convert() { // allow for viewbox def with ',' or whitespace TQString viewbox( docElem.attribute( "viewBox" ) ); - TQStringList points = TQStringList::split( ' ', viewbox.tqreplace( ',', ' ').simplifyWhiteSpace() ); + TQStringList points = TQStringList::split( ' ', viewbox.replace( ',', ' ').simplifyWhiteSpace() ); gc->matrix.scale( width / points[2].toFloat() , height / points[3].toFloat() ); m_outerRect.setWidth( m_outerRect.width() * ( points[2].toFloat() / width ) ); @@ -310,11 +310,11 @@ VObject* SvgImport::findObject( const TQString &name ) SvgImport::GradientHelper* SvgImport::findGradient( const TQString &id, const TQString &href) { // check if gradient was already parsed, and return it - if( m_gradients.tqcontains( id ) ) + if( m_gradients.contains( id ) ) return &m_gradients[ id ]; // check if gradient was stored for later parsing - if( !m_defs.tqcontains( id ) ) + if( !m_defs.contains( id ) ) return 0L; TQDomElement e = m_defs[ id ]; @@ -322,7 +322,7 @@ SvgImport::GradientHelper* SvgImport::findGradient( const TQString &id, const TQ { TQString mhref = e.attribute("xlink:href").mid(1); - if(m_defs.tqcontains(mhref)) + if(m_defs.contains(mhref)) return findGradient(mhref, id); else return 0L; @@ -340,7 +340,7 @@ SvgImport::GradientHelper* SvgImport::findGradient( const TQString &id, const TQ else n = href; - if( m_gradients.tqcontains( n ) ) + if( m_gradients.contains( n ) ) return &m_gradients[ n ]; else return 0L; @@ -456,19 +456,19 @@ void SvgImport::parseColor( VColor &color, const TQString &s ) TQString g = colors[1]; TQString b = colors[2].left( ( colors[2].length() - 1 ) ); - if( r.tqcontains( "%" ) ) + if( r.contains( "%" ) ) { r = r.left( r.length() - 1 ); r = TQString::number( int( ( double( 255 * r.toDouble() ) / 100.0 ) ) ); } - if( g.tqcontains( "%" ) ) + if( g.contains( "%" ) ) { g = g.left( g.length() - 1 ); g = TQString::number( int( ( double( 255 * g.toDouble() ) / 100.0 ) ) ); } - if( b.tqcontains( "%" ) ) + if( b.contains( "%" ) ) { b = b.left( b.length() - 1 ); b = TQString::number( int( ( double( 255 * b.toDouble() ) / 100.0 ) ) ); @@ -504,7 +504,7 @@ void SvgImport::parseColorStops( VGradient *gradient, const TQDomElement &e ) { float offset; TQString temp = stop.attribute( "offset" ); - if( temp.tqcontains( '%' ) ) + if( temp.contains( '%' ) ) { temp = temp.left( temp.length() - 1 ); offset = temp.toFloat() / 100.0; @@ -582,7 +582,7 @@ void SvgImport::parseGradient( const TQDomElement &e , const TQDomElement &refer if( !id.isEmpty() ) { // Copy existing gradient if it exists - if( m_gradients.tqfind( id ) != m_gradients.end() ) + if( m_gradients.find( id ) != m_gradients.end() ) gradhelper.gradient = m_gradients[ id ].gradient; } @@ -676,8 +676,8 @@ void SvgImport::parsePA( VObject *obj, SvgGraphicsContext *gc, const TQString &c gc->fill.setType( VFill::none ); else if( params.startsWith( "url(" ) ) { - unsigned int start = params.tqfind("#") + 1; - unsigned int end = params.tqfindRev(")"); + unsigned int start = params.find("#") + 1; + unsigned int end = params.findRev(")"); TQString key = params.mid( start, end - start ); GradientHelper *gradHelper = findGradient( key ); if( gradHelper ) @@ -739,8 +739,8 @@ void SvgImport::parsePA( VObject *obj, SvgGraphicsContext *gc, const TQString &c gc->stroke.setType( VStroke::none ); else if( params.startsWith( "url(" ) ) { - unsigned int start = params.tqfind("#") + 1; - unsigned int end = params.tqfindRev(")"); + unsigned int start = params.find("#") + 1; + unsigned int end = params.findRev(")"); TQString key = params.mid( start, end - start ); GradientHelper *gradHelper = findGradient( key ); @@ -810,7 +810,7 @@ void SvgImport::parsePA( VObject *obj, SvgGraphicsContext *gc, const TQString &c else if( command == "font-family" ) { TQString family = params; - family.tqreplace( '\'' , ' ' ); + family.replace( '\'' , ' ' ); gc->font.setFamily( family ); } else if( command == "font-size" ) @@ -1006,7 +1006,7 @@ void SvgImport::parseUse( VGroup *grp, const TQDomElement &e ) m_gc.current()->matrix.translate(tx,ty); } - if(m_defs.tqcontains(key)) + if(m_defs.contains(key)) { TQDomElement a = m_defs[key]; if(a.tagName() == "g" || a.tagName() == "a") @@ -1100,7 +1100,7 @@ void SvgImport::parseDefs( const TQDomElement &e ) TQString definition = b.attribute( "id" ); if( !definition.isEmpty() ) { - if( !m_defs.tqcontains( definition ) ) + if( !m_defs.contains( definition ) ) m_defs.insert( definition, b ); } } @@ -1152,7 +1152,7 @@ void SvgImport::createText( VGroup *grp, const TQDomElement &b ) continue; TQString key = e.attribute( "xlink:href" ).mid( 1 ); - if( ! m_defs.tqcontains(key) ) + if( ! m_defs.contains(key) ) { // try to find referenced object in document VObject* obj = findObject( key ); @@ -1214,7 +1214,7 @@ void SvgImport::createText( VGroup *grp, const TQDomElement &b ) continue; TQString key = e.attribute( "xlink:href" ).mid( 1 ); - if( ! m_defs.tqcontains(key) ) + if( ! m_defs.contains(key) ) { // try to find referenced object in document VObject* obj = findObject( key ); @@ -1328,7 +1328,7 @@ void SvgImport::createObject( VGroup *grp, const TQDomElement &b, const VObject: bool bFirst = true; TQString points = b.attribute( "points" ).simplifyWhiteSpace(); - points.tqreplace( ',', ' ' ); + points.replace( ',', ' ' ); points.remove( '\r' ); points.remove( '\n' ); TQStringList pointList = TQStringList::split( ' ', points ); diff --git a/filters/karbon/xaml/xamlimport.cc b/filters/karbon/xaml/xamlimport.cc index b7f68bbb..3a755181 100644 --- a/filters/karbon/xaml/xamlimport.cc +++ b/filters/karbon/xaml/xamlimport.cc @@ -61,7 +61,7 @@ KoFilter::ConversiontqStatus XAMLImport::convert(const TQCString& from, const TQ //Find the last extension TQString strExt; TQString fileIn ( m_chain->inputFile() ); - const int result=fileIn.tqfindRev('.'); + const int result=fileIn.findRev('.'); if (result>=0) { strExt=fileIn.mid(result).lower(); @@ -133,7 +133,7 @@ XAMLImport::convert() { // allow for viewbox def with ',' or whitespace TQString viewbox( docElem.attribute( "viewBox" ) ); - TQStringList points = TQStringList::split( ' ', viewbox.tqreplace( ',', ' ').simplifyWhiteSpace() ); + TQStringList points = TQStringList::split( ' ', viewbox.replace( ',', ' ').simplifyWhiteSpace() ); gc->matrix.scale( width / points[2].toFloat() , height / points[3].toFloat() ); m_outerRect.setWidth( m_outerRect.width() * ( points[2].toFloat() / width ) ); @@ -303,19 +303,19 @@ XAMLImport::parseColor( VColor &color, const TQString &s ) TQString g = colors[1]; TQString b = colors[2].left( ( colors[2].length() - 1 ) ); - if( r.tqcontains( "%" ) ) + if( r.contains( "%" ) ) { r = r.left( r.length() - 1 ); r = TQString::number( int( ( double( 255 * r.toDouble() ) / 100.0 ) ) ); } - if( g.tqcontains( "%" ) ) + if( g.contains( "%" ) ) { g = g.left( g.length() - 1 ); g = TQString::number( int( ( double( 255 * g.toDouble() ) / 100.0 ) ) ); } - if( b.tqcontains( "%" ) ) + if( b.contains( "%" ) ) { b = b.left( b.length() - 1 ); b = TQString::number( int( ( double( 255 * b.toDouble() ) / 100.0 ) ) ); @@ -347,7 +347,7 @@ XAMLImport::parseColorStops( VGradient *gradient, const TQDomElement &e ) { float offset; TQString temp = stop.attribute( "offset" ); - if( temp.tqcontains( '%' ) ) + if( temp.contains( '%' ) ) { temp = temp.left( temp.length() - 1 ); offset = temp.toFloat() / 100.0; @@ -454,8 +454,8 @@ XAMLImport::parsePA( VObject *obj, XAMLGraphicsContext *gc, const TQString &comm gc->fill.setType( VFill::none ); else if( params.startsWith( "url(" ) ) { - unsigned int start = params.tqfind("#") + 1; - unsigned int end = params.tqfindRev(")"); + unsigned int start = params.find("#") + 1; + unsigned int end = params.findRev(")"); TQString key = params.mid( start, end - start ); gc->fill.gradient() = m_gradients[ key ].gradient; if( m_gradients[ key ].bbox ) @@ -505,8 +505,8 @@ XAMLImport::parsePA( VObject *obj, XAMLGraphicsContext *gc, const TQString &comm gc->stroke.setType( VStroke::none ); else if( params.startsWith( "url(" ) ) { - unsigned int start = params.tqfind("#") + 1; - unsigned int end = params.tqfindRev(")"); + unsigned int start = params.find("#") + 1; + unsigned int end = params.findRev(")"); TQString key = params.mid( start, end - start ); gc->stroke.gradient() = m_gradients[ key ].gradient; gc->stroke.gradient().transform( m_gradients[ key ].gradientTransform ); @@ -567,7 +567,7 @@ XAMLImport::parsePA( VObject *obj, XAMLGraphicsContext *gc, const TQString &comm else if( command == "font-family" ) { TQString family = params; - family.tqreplace( '\'' , ' ' ); + family.replace( '\'' , ' ' ); gc->font.setFamily( family ); } else if( command == "font-size" ) @@ -750,10 +750,10 @@ XAMLImport::parseGroup( VGroup *grp, const TQDomElement &e ) if( !b.attribute( "xlink:href" ).isEmpty() ) { TQString params = b.attribute( "xlink:href" ); - unsigned int start = params.tqfind("#") + 1; - unsigned int end = params.tqfindRev(")"); + unsigned int start = params.find("#") + 1; + unsigned int end = params.findRev(")"); TQString key = params.mid( start, end - start ); - if(m_paths.tqcontains(key)) + if(m_paths.contains(key)) { TQDomElement a = m_paths[key]; obj = createObject( a ); @@ -854,10 +854,10 @@ void XAMLImport::createText( VGroup *grp, const TQDomElement &b ) continue; TQString uri = e.attribute( "xlink:href" ); - unsigned int start = uri.tqfind("#") + 1; - unsigned int end = uri.tqfindRev(")"); + unsigned int start = uri.find("#") + 1; + unsigned int end = uri.findRev(")"); TQString key = uri.mid( start, end - start ); - if( ! m_paths.tqcontains(key) ) + if( ! m_paths.contains(key) ) { VObject* obj = findObject( key ); if( obj ) @@ -899,11 +899,11 @@ void XAMLImport::createText( VGroup *grp, const TQDomElement &b ) continue; TQString uri = e.attribute( "xlink:href" ); - unsigned int start = uri.tqfind("#") + 1; - unsigned int end = uri.tqfindRev(")"); + unsigned int start = uri.find("#") + 1; + unsigned int end = uri.findRev(")"); TQString key = uri.mid( start, end - start ); - if( ! m_paths.tqcontains(key) ) + if( ! m_paths.contains(key) ) { VObject* obj = findObject( key ); if( obj ) @@ -1000,7 +1000,7 @@ VObject* XAMLImport::createObject( const TQDomElement &b ) bool bFirst = true; TQString points = b.attribute( "points" ).simplifyWhiteSpace(); - points.tqreplace( ',', ' ' ); + points.replace( ',', ' ' ); points.remove( '\r' ); points.remove( '\n' ); TQStringList pointList = TQStringList::split( ' ', points ); diff --git a/filters/kpresenter/magicpoint/mgp2kpr.py b/filters/kpresenter/magicpoint/mgp2kpr.py index 73751f26..e5716989 100755 --- a/filters/kpresenter/magicpoint/mgp2kpr.py +++ b/filters/kpresenter/magicpoint/mgp2kpr.py @@ -84,14 +84,14 @@ class MgpImporter: def __setupDefaultFonts(self,command): tokens=string.split(command,' ') - _key=string.tqreplace(tokens[1], '"', '') - _val=string.tqreplace(tokens[3], '"', '') + _key=string.replace(tokens[1], '"', '') + _val=string.replace(tokens[3], '"', '') self.defFonts[_key]=_val #print self.defFonts def __setFontIndirect(self,command): tokens=string.split(command,' ') - _font=string.tqreplace(tokens[1], '"', '') + _font=string.replace(tokens[1], '"', '') if _font in self.defFonts.keys(): # we have a "default" font, find it in the map self.__setFont(None,self.defFonts[_font]) #print self.defFonts[_font] @@ -99,9 +99,9 @@ class MgpImporter: def __setFont(self,command,font=""): if command: tokens=string.split(command,' ') - font=string.tqreplace(tokens[1], '"', '').strip() #XLFD-like, eg: mincho-medium-r (family-weight-slant) + font=string.replace(tokens[1], '"', '').strip() #XLFD-like, eg: mincho-medium-r (family-weight-slant) - _numDash=string.tqfind(font,"-") #find dashes + _numDash=string.find(font,"-") #find dashes if (_numDash==-1): #mincho self.fontName=font @@ -124,7 +124,7 @@ class MgpImporter: def __setBgColor(self, command): tokens=string.split(command,' ') self.bctype="0" - self.color1=string.tqreplace(tokens[1].strip(),'"', '') #strip quotes and \n + self.color1=string.replace(tokens[1].strip(),'"', '') #strip quotes and \n def __setBgGradient(self, command): tokens=string.split(command,' ') @@ -135,8 +135,8 @@ class MgpImporter: try: dir=tokens[4] - self.color1=string.tqreplace(tokens[6].strip(),'"', '') #strip quotes and \n - self.color2=string.tqreplace(tokens[7].strip(),'"', '') + self.color1=string.replace(tokens[6].strip(),'"', '') #strip quotes and \n + self.color2=string.replace(tokens[7].strip(),'"', '') except: self.bctype="0" self.color1="black" @@ -296,14 +296,14 @@ class MgpImporter: def __setTextColor(self,command): tokens=string.split(command,' ') - self.textColor=string.tqreplace(tokens[1].strip(),'"', '') #strip quotes + self.textColor=string.replace(tokens[1].strip(),'"', '') #strip quotes #print self.textColor def __handleBar(self,command): tokens=string.split(command,' ') try: - color=string.tqreplace(tokens[1].strip(),'"', '') #strip quotes and \n + color=string.replace(tokens[1].strip(),'"', '') #strip quotes and \n width=tokens[2].strip()/1000*Y_OFFSET #in per mils of display height start=tokens[3].strip()/100*PAGE_WIDTH #start position percent of display width length=tokens[4].strip()/100*PAGE_WIDTH #length percent of display width @@ -357,7 +357,7 @@ class MgpImporter: if (line.startswith('#') or line.startswith('%%')): #skip comments continue elif (line.startswith('%')): #commands - commands=string.split(string.tqreplace(line, '%', ''),',') #list of commands, comma separated, remove '%' + commands=string.split(string.replace(line, '%', ''),',') #list of commands, comma separated, remove '%' for command in commands: command=command.strip().lower() #print command diff --git a/filters/kpresenter/ooimpress/ooimpressexport.cc b/filters/kpresenter/ooimpress/ooimpressexport.cc index 3e54a05f..0e4771cf 100644 --- a/filters/kpresenter/ooimpress/ooimpressexport.cc +++ b/filters/kpresenter/ooimpress/ooimpressexport.cc @@ -886,7 +886,7 @@ void OoImpressExport::appendPicture( TQDomDocument & doc, TQDomElement & source, { TQString str = pictureKey( key ); TQString returnstr = m_kpresenterPictureLst[str]; - const int pos=returnstr.tqfindRev('.'); + const int pos=returnstr.findRev('.'); if (pos!=-1) { const TQString extension( returnstr.mid(pos+1) ); diff --git a/filters/kpresenter/ooimpress/ooimpressimport.cc b/filters/kpresenter/ooimpress/ooimpressimport.cc index 0c286fb5..cf853dea 100644 --- a/filters/kpresenter/ooimpress/ooimpressimport.cc +++ b/filters/kpresenter/ooimpress/ooimpressimport.cc @@ -828,11 +828,11 @@ void OoImpressImport::append2DGeometry( TQDomDocument& doc, TQDomElement& e, con kdDebug(30518)<<" object transform \n"; //todo parse it TQString transform = object.attributeNS( ooNS::draw, "transform", TQString() ); - if( transform.tqcontains("rotate (")) + if( transform.contains("rotate (")) { //kdDebug(30518)<<" rotate object \n"; transform = transform.remove("rotate (" ); - transform = transform.left(transform.tqfind(")")); + transform = transform.left(transform.find(")")); //kdDebug(30518)<<" transform :"<<transform<<endl; bool ok; double radian = transform.toDouble(&ok); @@ -1353,7 +1353,7 @@ void OoImpressImport::appendShadow( TQDomDocument& doc, TQDomElement& e ) // use the shadow attribute to indicate a text-shadow TQDomElement shadow = doc.createElement( "SHADOW" ); TQString distance = m_styleStack.attributeNS( ooNS::fo, "text-shadow" ); - distance.truncate( distance.tqfind( ' ' ) ); + distance.truncate( distance.find( ' ' ) ); shadow.setAttribute( "distance", KoUnit::parseValue( distance ) ); shadow.setAttribute( "direction", 5 ); shadow.setAttribute( "color", "#a0a0a0" ); @@ -2045,7 +2045,7 @@ TQString OoImpressImport::storeImage( const TQDomElement& object ) TQString url = object.attributeNS( ooNS::xlink, "href", TQString() ).remove( '#' ); KArchiveFile* file = (KArchiveFile*) m_zip->directory()->entry( url ); - TQString extension = url.mid( url.tqfind( '.' ) ); + TQString extension = url.mid( url.find( '.' ) ); TQString fileName = TQString( "picture%1" ).tqarg( m_numPicture++ ) + extension; KoStoreDevice* out = m_chain->storageFile( "pictures/" + fileName, KoStore::Write ); @@ -2071,7 +2071,7 @@ TQString OoImpressImport::storeSound(const TQDomElement & object, TQDomElement & if (!file.exists()) return TQString(); - TQString extension = url.mid( url.tqfind( '.' ) ); + TQString extension = url.mid( url.find( '.' ) ); TQString fileName = TQString( "sound%1" ).tqarg( m_numSound++ ) + extension; fileName = "sounds/" + fileName; KoStoreDevice* out = m_chain->storageFile( fileName, KoStore::Write ); diff --git a/filters/kpresenter/powerpoint/libppt/objects.cpp b/filters/kpresenter/powerpoint/libppt/objects.cpp index 82359d15..d0343b43 100644 --- a/filters/kpresenter/powerpoint/libppt/objects.cpp +++ b/filters/kpresenter/powerpoint/libppt/objects.cpp @@ -139,7 +139,7 @@ void Object::setBackground( bool bg ) bool Object::hasProperty( std::string name ) { std::map<std::string,PropertyValue>::const_iterator i; - i = d->properties.tqfind( name ); + i = d->properties.find( name ); if( i == d->properties.end() ) return false; else diff --git a/filters/kpresenter/powerpoint/libppt/ustring.cpp b/filters/kpresenter/powerpoint/libppt/ustring.cpp index b574d7de..23b61d30 100644 --- a/filters/kpresenter/powerpoint/libppt/ustring.cpp +++ b/filters/kpresenter/powerpoint/libppt/ustring.cpp @@ -526,7 +526,7 @@ unsigned long UString::toULong(bool *ok) const return static_cast<unsigned long>(d); } -int UString::tqfind(const UString &f, int pos) const +int UString::find(const UString &f, int pos) const { if (isNull()) return -1; diff --git a/filters/kpresenter/powerpoint/libppt/ustring.h b/filters/kpresenter/powerpoint/libppt/ustring.h index 087aff50..c0e34cf4 100644 --- a/filters/kpresenter/powerpoint/libppt/ustring.h +++ b/filters/kpresenter/powerpoint/libppt/ustring.h @@ -334,7 +334,7 @@ namespace Libppt { * @return Position of first occurence of f starting at position pos. * -1 if the search was not successful. */ - int tqfind(const UString &f, int pos = 0) const; + int find(const UString &f, int pos = 0) const; /** * @return Position of first occurence of f searching backwards from * position pos. diff --git a/filters/kspread/applixspread/applixspreadimport.cc b/filters/kspread/applixspread/applixspreadimport.cc index 16ea0d8f..ab3201c8 100644 --- a/filters/kspread/applixspread/applixspreadimport.cc +++ b/filters/kspread/applixspread/applixspreadimport.cc @@ -181,7 +181,7 @@ KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from, // Search for ')' - pos = mystr.tqfind (')'); + pos = mystr.find (')'); typestr = mystr.left (pos); @@ -190,7 +190,7 @@ KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from, // alllenght = alllenght - pos - 1; // Search for ':' - pos = mystr.tqfind (':'); + pos = mystr.find (':'); // Copy cellnumber informations cellnostr = mystr.left (pos); @@ -201,7 +201,7 @@ KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from, // Split Table and Cell Number - pos = cellnostr.tqfind ('!'); + pos = cellnostr.find ('!'); // Copy tabnumber informations tabnostr = cellnostr.left (pos); @@ -215,7 +215,7 @@ KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from, - pos = cellnostr.tqfind (TQRegExp ("[0-9]")); + pos = cellnostr.find (TQRegExp ("[0-9]")); kdDebug()<<" findpos :"<<pos<<endl; @@ -251,9 +251,9 @@ KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from, // Replace part for this characters: <, >, & - mystr.tqreplace (TQRegExp ("&"), "&"); - mystr.tqreplace (TQRegExp ("<"), "<"); - mystr.tqreplace (TQRegExp (">"), ">"); + mystr.replace (TQRegExp ("&"), "&"); + mystr.replace (TQRegExp ("<"), "<"); + mystr.replace (TQRegExp (">"), ">"); // Replace part for Applix Characters @@ -265,7 +265,7 @@ KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from, // initialize foundSpecialCharakter = false; - pos = mystr.tqfind ("^"); + pos = mystr.find ("^"); // is there a special character ? if (pos > -1 ) @@ -277,7 +277,7 @@ KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from, newchar = specCharfind (mystr[pos+1], mystr[pos+2]); // replace the character - mystr.tqreplace (pos, 3, newchar); + mystr.replace (pos, 3, newchar); } } @@ -290,8 +290,8 @@ KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from, TQString typeCharStr; TQString typeCellStr; - int pos1 = typestr.tqfind ("|"); - int pos2 = typestr.tqfindRev ("|"); + int pos1 = typestr.find ("|"); + int pos2 = typestr.findRev ("|"); typeFormStr = typestr.left (pos1); @@ -313,7 +313,7 @@ KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from, tabctr = tabnostr; // Searching for the rowcol part and adding to the hole string - pos = my_rc.tabname.tqfindIndex (tabnostr); + pos = my_rc.tabname.findIndex (tabnostr); if (pos > -1) str += my_rc.rc[pos]; } @@ -936,12 +936,12 @@ APPLIXSPREADImport::readColormap (TQTextStream &stream, TQPtrList<t_mycolor> &m kdDebug()<<" -> "<< mystr<<endl; // Count the number of whitespaces - contcount = mystr.tqcontains (' '); + contcount = mystr.contains (' '); kdDebug()<< "contcount: "<< contcount<<endl; contcount -= 5; // Begin off interest - pos = mystr.tqfind (" 0 "); + pos = mystr.find (" 0 "); // get colorname colstr = mystr.left (pos); @@ -1035,7 +1035,7 @@ APPLIXSPREADImport::readView (TQTextStream &stream, TQString instr, t_rc &rc) sscanf ((*it).latin1(), "%c:%d", &ccolumn, &colwidth); int len = (*it).length (); - int pos = (*it).tqfind (":"); + int pos = (*it).find (":"); (*it).remove (pos, len-pos); printf( " >%s<- -<%c><%d> \n", (*it).latin1(), ccolumn, colwidth); @@ -1120,7 +1120,7 @@ APPLIXSPREADImport::filterSHFGBG (TQString it, int *style, int *bgcolor, int m2=0, m3=0; // filter SH = Brushstyle Background - pos = it.tqfind ("SH"); + pos = it.find ("SH"); if (pos > -1) { tmpstr = it; @@ -1134,7 +1134,7 @@ APPLIXSPREADImport::filterSHFGBG (TQString it, int *style, int *bgcolor, // filter FG = FGCOLOR - pos = it.tqfind ("FG"); + pos = it.find ("FG"); if (pos > -1) { tmpstr = it; @@ -1148,7 +1148,7 @@ APPLIXSPREADImport::filterSHFGBG (TQString it, int *style, int *bgcolor, // filter BG = BGCOLOR - pos = it.tqfind ("BG"); + pos = it.find ("BG"); if (pos > -1) { tmpstr = it; diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp index f6fae839..47cb19fe 100644 --- a/filters/kspread/csv/csvdialog.cpp +++ b/filters/kspread/csv/csvdialog.cpp @@ -351,7 +351,7 @@ void CSVDialog::fillTable( ) for (column = 0; column < m_dialog->m_sheet->numCols(); ++column) { const TQString header = m_dialog->m_sheet->horizontalHeader()->label(column); - if ( m_formatList.tqfind( header ) == m_formatList.end() ) + if ( m_formatList.find( header ) == m_formatList.end() ) m_dialog->m_sheet->horizontalHeader()->setLabel(column, i18n("Text")); m_dialog->m_sheet->adjustColumn(column); diff --git a/filters/kspread/csv/csvexport.cc b/filters/kspread/csv/csvexport.cc index 4e54a071..9961d218 100644 --- a/filters/kspread/csv/csvexport.cc +++ b/filters/kspread/csv/csvexport.cc @@ -93,18 +93,18 @@ TQString CSVExport::exportCSVCell( Sheet const * const sheet, int col, int row, bool quote = false; if ( !text.isEmpty() ) { - if ( text.tqfind( textQuote ) != -1 ) + if ( text.find( textQuote ) != -1 ) { TQString doubleTextQuote(textQuote); doubleTextQuote.append(textQuote); - text.tqreplace(textQuote, doubleTextQuote); + text.replace(textQuote, doubleTextQuote); quote = true; } else if ( text[0].isSpace() || text[text.length()-1].isSpace() ) quote = true; - else if ( text.tqfind( csvDelimiter ) != -1 ) + else if ( text.find( csvDelimiter ) != -1 ) quote = true; - else if ( text.tqfind( "\n" ) != -1 || text.tqfind( "\r" ) != -1 ) + else if ( text.find( "\n" ) != -1 || text.find( "\r" ) != -1 ) quote = true; } @@ -308,10 +308,10 @@ KoFilter::ConversiontqStatus CSVExport::convert( const TQCString & from, const T else name = "********<SHEETNAME>********"; const TQString tname( i18n("<SHEETNAME>") ); - int pos = name.tqfind( tname ); + int pos = name.find( tname ); if ( pos != -1 ) { - name.tqreplace( pos, tname.length(), sheet->sheetName() ); + name.replace( pos, tname.length(), sheet->sheetName() ); } str += name; str += m_eol; diff --git a/filters/kspread/csv/csvimport.cc b/filters/kspread/csv/csvimport.cc index c05c075c..cd93017b 100644 --- a/filters/kspread/csv/csvimport.cc +++ b/filters/kspread/csv/csvimport.cc @@ -193,7 +193,7 @@ KoFilter::ConversiontqStatus CSVFilter::convert( const TQCString& from, const TQ bool ok = false; TQString tmp ( text ); tmp.remove ( TQRegExp( "[^0-9,Ee+-]" ) ); // Keep only 0 to 9, comma, E, e, plus, minus - tmp.tqreplace ( ',', '.' ); + tmp.replace ( ',', '.' ); kdDebug(30501) << "Comma: " << text << " => " << tmp << endl; const double d = tmp.toDouble( &ok ); if ( !ok ) @@ -214,7 +214,7 @@ KoFilter::ConversiontqStatus CSVFilter::convert( const TQCString& from, const TQ bool ok = false; TQString tmp ( text ); tmp.remove ( TQRegExp( "[^0-9\\.EeD+-]" ) ); // Keep only 0 to 9, dot, E, e, D, plus, minus - tmp.tqreplace ( 'D', 'E' ); // double from FORTRAN use D instead of E + tmp.replace ( 'D', 'E' ); // double from FORTRAN use D instead of E kdDebug(30501) << "Point: " << text << " => " << tmp << endl; const double d = tmp.toDouble( &ok ); if ( !ok ) diff --git a/filters/kspread/excel/import/excelimport.cc b/filters/kspread/excel/import/excelimport.cc index 88a20e33..f1bade9e 100644 --- a/filters/kspread/excel/import/excelimport.cc +++ b/filters/kspread/excel/import/excelimport.cc @@ -692,7 +692,7 @@ void ExcelImport::Private::processCellForStyle( Cell* cell, KoXmlWriter* xmlWrit if( !xmlWriter ) return; // only IF automatic style for this format has not been already created yet - if( !styleFormats.tqcontains( cell->formatIndex() ) ) + if( !styleFormats.contains( cell->formatIndex() ) ) { styleFormats[ cell->formatIndex() ] = true; diff --git a/filters/kspread/excel/sidewinder/excel.cpp b/filters/kspread/excel/sidewinder/excel.cpp index 7d128a5b..c201ea27 100644 --- a/filters/kspread/excel/sidewinder/excel.cpp +++ b/filters/kspread/excel/sidewinder/excel.cpp @@ -5520,11 +5520,11 @@ void ExcelReader::handleFooter( FooterRecord* record ) int pos = -1, len = 0; // left part - pos = footer.tqfind( UString("&L") ); + pos = footer.find( UString("&L") ); if( pos >= 0 ) { pos += 2; - len = footer.tqfind( UString("&C") ) - pos; + len = footer.find( UString("&C") ) - pos; if( len > 0 ) { left = footer.substr( pos, len ); @@ -5533,11 +5533,11 @@ void ExcelReader::handleFooter( FooterRecord* record ) } // center part - pos = footer.tqfind( UString("&C") ); + pos = footer.find( UString("&C") ); if( pos >= 0 ) { pos += 2; - len = footer.tqfind( UString("&R") ) - pos; + len = footer.find( UString("&R") ) - pos; if( len > 0 ) { center = footer.substr( pos, len ); @@ -5546,7 +5546,7 @@ void ExcelReader::handleFooter( FooterRecord* record ) } // right part - pos = footer.tqfind( UString("&R") ); + pos = footer.find( UString("&R") ); if( pos >= 0 ) { pos += 2; @@ -5569,11 +5569,11 @@ void ExcelReader::handleHeader( HeaderRecord* record ) int pos = -1, len = 0; // left part of the header - pos = header.tqfind( UString("&L") ); + pos = header.find( UString("&L") ); if( pos >= 0 ) { pos += 2; - len = header.tqfind( UString("&C") ) - pos; + len = header.find( UString("&C") ) - pos; if( len > 0 ) { left = header.substr( pos, len ); @@ -5582,11 +5582,11 @@ void ExcelReader::handleHeader( HeaderRecord* record ) } // center part of the header - pos = header.tqfind( UString("&C") ); + pos = header.find( UString("&C") ); if( pos >= 0 ) { pos += 2; - len = header.tqfind( UString("&R") ) - pos; + len = header.find( UString("&R") ) - pos; if( len > 0 ) { center = header.substr( pos, len ); @@ -5595,7 +5595,7 @@ void ExcelReader::handleHeader( HeaderRecord* record ) } // right part of the header - pos = header.tqfind( UString("&R") ); + pos = header.find( UString("&R") ); if( pos >= 0 ) { pos += 2; diff --git a/filters/kspread/excel/sidewinder/excel.h b/filters/kspread/excel/sidewinder/excel.h index 8450d643..c114aa80 100644 --- a/filters/kspread/excel/sidewinder/excel.h +++ b/filters/kspread/excel/sidewinder/excel.h @@ -1838,7 +1838,7 @@ private: /** - Class MergedCellsRecord represents MergedCells record, which tqcontains + Class MergedCellsRecord represents MergedCells record, which contains a list of all merged cells in the current sheets. Each entry in this list define the range of cells that should be merged, namely firstRow, lastRow, firstColumn and lastColumn. diff --git a/filters/kspread/excel/sidewinder/ustring.cpp b/filters/kspread/excel/sidewinder/ustring.cpp index 497bc586..b26ee196 100644 --- a/filters/kspread/excel/sidewinder/ustring.cpp +++ b/filters/kspread/excel/sidewinder/ustring.cpp @@ -492,7 +492,7 @@ UString UString::substr(int pos, int len) const return result; } -int UString::tqfind(const UString &f, int pos) const +int UString::find(const UString &f, int pos) const { if (isNull()) return -1; diff --git a/filters/kspread/excel/sidewinder/ustring.h b/filters/kspread/excel/sidewinder/ustring.h index 0643400d..1c4f2bc5 100644 --- a/filters/kspread/excel/sidewinder/ustring.h +++ b/filters/kspread/excel/sidewinder/ustring.h @@ -333,7 +333,7 @@ namespace Swinder { * @return Position of first occurence of f starting at position pos. * -1 if the search was not successful. */ - int tqfind(const UString &f, int pos = 0) const; + int find(const UString &f, int pos = 0) const; /** * Static instance of a null string. diff --git a/filters/kspread/gnumeric/gnumericexport.cc b/filters/kspread/gnumeric/gnumericexport.cc index beb78879..cccfcc9f 100644 --- a/filters/kspread/gnumeric/gnumericexport.cc +++ b/filters/kspread/gnumeric/gnumericexport.cc @@ -1340,8 +1340,8 @@ KoFilter::ConversiontqStatus GNUMERICExport::convert( const TQCString& from, con if ( cell->isFormula() ) { TQString tmp = cell->text(); - if ( tmp.tqcontains( "==" ) ) - tmp=tmp.tqreplace( "==", "=" ); + if ( tmp.contains( "==" ) ) + tmp=tmp.replace( "==", "=" ); text = tmp; isLink = false; } @@ -1406,7 +1406,7 @@ KoFilter::ConversiontqStatus GNUMERICExport::convert( const TQCString& from, con isLink = false; TQString tmp = cell->text(); if ( tmp =="==" ) - tmp=tqreplace( "==", "=" ); + tmp=replace( "==", "=" ); /* cell->calc( TRUE ); // Incredible, cells are not calculated if the document was just opened text = cell->valueString(); */ text = tmp; break; @@ -1561,12 +1561,12 @@ TQString GNUMERICExport::convertRefToBase( const TQString & table, const TQRect TQString GNUMERICExport::convertVariable( TQString headerFooter ) { - headerFooter = headerFooter.tqreplace( "<sheet>", "&[TAB]" ); - headerFooter = headerFooter.tqreplace( "<date>", "&[DATE]" ); - headerFooter = headerFooter.tqreplace( "<page>", "&[PAGE]" ); - headerFooter = headerFooter.tqreplace( "<pages>", "&[PAGES]" ); - headerFooter = headerFooter.tqreplace( "<time>", "&[TIME]" ); - headerFooter = headerFooter.tqreplace( "<file>", "&[FILE]" ); + headerFooter = headerFooter.replace( "<sheet>", "&[TAB]" ); + headerFooter = headerFooter.replace( "<date>", "&[DATE]" ); + headerFooter = headerFooter.replace( "<page>", "&[PAGE]" ); + headerFooter = headerFooter.replace( "<pages>", "&[PAGES]" ); + headerFooter = headerFooter.replace( "<time>", "&[TIME]" ); + headerFooter = headerFooter.replace( "<file>", "&[FILE]" ); return headerFooter; } diff --git a/filters/kspread/gnumeric/gnumericimport.cc b/filters/kspread/gnumeric/gnumericimport.cc index ad97a548..249258b3 100644 --- a/filters/kspread/gnumeric/gnumericimport.cc +++ b/filters/kspread/gnumeric/gnumericimport.cc @@ -176,8 +176,8 @@ void convert_string_to_qcolor(TQString color_string, TQColor * color) bool number_ok; - first_col_pos = color_string.tqfind(":", 0); - second_col_pos = color_string.tqfind(":", first_col_pos + 1); + first_col_pos = color_string.find(":", 0); + second_col_pos = color_string.find(":", first_col_pos + 1); /* Fore="0:0:FF00" */ /* If GNUmeric kicks out some invalid colors, we could crash. */ @@ -196,30 +196,30 @@ void areaNames( Doc * ksdoc, const TQString &_name, TQString _zone ) { //Sheet2!$A$2:$D$8 TQString tableName; - int pos = _zone.tqfind( '!' ); + int pos = _zone.find( '!' ); if ( pos != -1 ) { tableName = _zone.left( pos ); _zone = _zone.right( _zone.length()-pos-1 ); - pos = _zone.tqfind( ':' ); + pos = _zone.find( ':' ); TQRect rect; if ( pos != -1 ) { TQString left = _zone.mid( 1, pos-1 ); TQString right = _zone.mid( pos+2, _zone.length()-pos-2 ); - int pos = left.tqfind( '$' ); + int pos = left.find( '$' ); rect.setLeft( util_decodeColumnLabelText(left.left(pos ) ) ); rect.setTop( left.right( left.length()-pos-1 ).toInt() ); - pos = right.tqfind( '$' ); + pos = right.find( '$' ); rect.setRight( util_decodeColumnLabelText(right.left(pos ) ) ); rect.setBottom( right.right( right.length()-pos-1 ).toInt() ); } else { TQString left = _zone; - int pos = left.tqfind( '$' ); + int pos = left.find( '$' ); int leftPos = util_decodeColumnLabelText(left.left(pos ) ); rect.setLeft( leftPos ); rect.setRight( leftPos ); @@ -814,15 +814,15 @@ TQString GNUMERICFilter::convertVars( TQString const & str, Sheet * table ) cons for ( uint i = 0; i < count; ++i ) { - int n = result.tqfind( list1[i] ); + int n = result.find( list1[i] ); if ( n != -1 ) { kdDebug(30521) << "Found var: " << list1[i] << endl; if ( i == 0 ) - result = result.tqreplace( list1[i], table->tableName() ); + result = result.replace( list1[i], table->tableName() ); else - result = result.tqreplace( list1[i], list2[i] ); + result = result.replace( list1[i], list2[i] ); } } @@ -926,7 +926,7 @@ void GNUMERICFilter::ParsePrintInfo( TQDomNode const & printInfo, Sheet * table if ( !repeate.isEmpty() ) { //fix row too high - repeate = repeate.tqreplace( "65536", "32500" ); + repeate = repeate.replace( "65536", "32500" ); Range range(repeate); //kdDebug()<<" repeate :"<<repeate<<"range. ::start row : "<<range.startRow ()<<" start col :"<<range.startCol ()<<" end row :"<<range.endRow ()<<" end col :"<<range.endCol ()<<endl; table->print()->setPrintRepeatColumns( tqMakePair( range.startCol (),range.endCol ()) ); @@ -983,7 +983,7 @@ void GNUMERICFilter::ParseFormat(TQString const & formatString, Cell * kspread_c { if ((formatString[0] == '[') && (formatString[1] == '$')) { - int n = formatString.tqfind(']'); + int n = formatString.find(']'); if (n != -1) { TQString currency = formatString.mid(2, n - 2); @@ -992,7 +992,7 @@ void GNUMERICFilter::ParseFormat(TQString const & formatString, Cell * kspread_c } lastPos = ++n; } - else if (formatString.tqfind("E+0") != -1) + else if (formatString.find("E+0") != -1) { kspread_cell->format()->setFormatType(Scientific_format); } @@ -1004,7 +1004,7 @@ void GNUMERICFilter::ParseFormat(TQString const & formatString, Cell * kspread_c if ( setType(kspread_cell, formatString, content) ) return; - if (formatString.tqfind("?/?") != -1) + if (formatString.find("?/?") != -1) { // TODO: fixme! kspread_cell->format()->setFormatType( fraction_three_digits ); @@ -1035,7 +1035,7 @@ void GNUMERICFilter::ParseFormat(TQString const & formatString, Cell * kspread_c while (formatString[lastPos] == ' ') ++lastPos; - int n = formatString.tqfind( '.', lastPos ); + int n = formatString.find( '.', lastPos ); if ( n != -1) { lastPos = n + 1; @@ -1051,12 +1051,12 @@ void GNUMERICFilter::ParseFormat(TQString const & formatString, Cell * kspread_c } bool red = false; - if (formatString.tqfind("[RED]", lastPos) != -1) + if (formatString.find("[RED]", lastPos) != -1) { red = true; kspread_cell->format()->setFloatColor( Format::NegRed ); } - if ( formatString.tqfind('(', lastPos) != -1 ) + if ( formatString.find('(', lastPos) != -1 ) { if ( red ) kspread_cell->format()->setFloatColor( Format::NegRedBrackets ); @@ -1067,11 +1067,11 @@ void GNUMERICFilter::ParseFormat(TQString const & formatString, Cell * kspread_c void GNUMERICFilter::convertFormula( TQString & formula ) const { - int n = formula.tqfind( '=', 1 ); + int n = formula.find( '=', 1 ); // TODO: check if we do not screw something up here... if ( n != -1 ) - formula = formula.tqreplace( n, 1, "==" ); + formula = formula.replace( n, 1, "==" ); bool inQuote1 = false; bool inQuote2 = false; @@ -1083,7 +1083,7 @@ void GNUMERICFilter::convertFormula( TQString & formula ) const else if ( formula[i] == '"' ) inQuote2 = !inQuote2; else if ( formula[i] == ',' && !inQuote1 && !inQuote2 ) - formula = formula.tqreplace( i, 1, ";" ); + formula = formula.replace( i, 1, ";" ); } } diff --git a/filters/kspread/html/htmlexport.cc b/filters/kspread/html/htmlexport.cc index 3360c593..54711d8d 100644 --- a/filters/kspread/html/htmlexport.cc +++ b/filters/kspread/html/htmlexport.cc @@ -105,7 +105,7 @@ KoFilter::ConversiontqStatus HTMLExport::convert( const TQCString& from, const T Sheet *sheet = ksdoc->map()->firstSheet(); TQString filenameBase = m_chain->outputFile(); - filenameBase = filenameBase.left( filenameBase.tqfindRev( '.' ) ); + filenameBase = filenameBase.left( filenameBase.findRev( '.' ) ); TQStringList sheets; while( sheet != 0 ) @@ -345,10 +345,10 @@ void HTMLExport::convertSheet( Sheet *sheet, TQString &str, int iMaxUsedRow, int text = text.right(text.length()-1); } else if ( !link ) { // Escape HTML characters. - text.tqreplace ('&' , strAmp) - .tqreplace ('<' , strLt) - .tqreplace ('>' , strGt) - .tqreplace (' ' , nbsp); + text.replace ('&' , strAmp) + .replace ('<' , strLt) + .replace ('>' , strGt) + .replace (' ' , nbsp); } line += ">\n"; diff --git a/filters/kspread/opencalc/opencalcexport.cc b/filters/kspread/opencalc/opencalcexport.cc index f38b0bb8..6a0376f4 100644 --- a/filters/kspread/opencalc/opencalcexport.cc +++ b/filters/kspread/opencalc/opencalcexport.cc @@ -474,14 +474,14 @@ bool OpenCalcExport::exportBody( TQDomDocument & doc, TQDomElement & content, co TQString name( sheet->tableName() ); - int n = name.tqfind( ' ' ); + int n = name.find( ' ' ); if ( n != -1 ) { kdDebug(30518) << "Sheet name converting: " << name << endl; name[n] == '_'; kdDebug(30518) << "Sheet name converted: " << name << endl; } - name = name.tqreplace( ' ', "_" ); + name = name.replace( ' ', "_" ); TQRect _printRange = sheet->print()->printRange(); if ( _printRange != ( TQRect( TQPoint( 1, 1 ), TQPoint( KS_colMax, KS_rowMax ) ) ) ) diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc index 5316749e..f52ffd0f 100644 --- a/filters/kspread/opencalc/opencalcimport.cc +++ b/filters/kspread/opencalc/opencalcimport.cc @@ -80,7 +80,7 @@ OpenCalcImport::OpenCalcPoint::OpenCalcPoint( TQString const & str ) int colonPos = -1; TQString range; - // tqreplace '.' with '!' + // replace '.' with '!' for ( int i = 0; i < l; ++i ) { if ( str[i] == '$' ) @@ -261,9 +261,9 @@ void OpenCalcImport::checkForNamedAreas( TQString & formula ) const } if ( word.length() > 0 ) { - if ( m_namedAreas.tqfind( word ) != m_namedAreas.end() ) + if ( m_namedAreas.find( word ) != m_namedAreas.end() ) { - formula = formula.tqreplace( start, word.length(), "'" + word + "'" ); + formula = formula.replace( start, word.length(), "'" + word + "'" ); l = formula.length(); ++i; kdDebug(30518) << "Formula: " << formula << ", L: " << l << ", i: " << i + 1 <<endl; @@ -276,9 +276,9 @@ void OpenCalcImport::checkForNamedAreas( TQString & formula ) const } if ( word.length() > 0 ) { - if ( m_namedAreas.tqfind( word ) != m_namedAreas.end() ) + if ( m_namedAreas.find( word ) != m_namedAreas.end() ) { - formula = formula.tqreplace( start, word.length(), "'" + word + "'" ); + formula = formula.replace( start, word.length(), "'" + word + "'" ); l = formula.length(); ++i; kdDebug(30518) << "Formula: " << formula << ", L: " << l << ", i: " << i + 1 <<endl; @@ -635,13 +635,13 @@ bool OpenCalcImport::readCells( TQDomElement & rowNode, Sheet * table, int row, int year=0, month=0, day=0; ok = false; - int p1 = value.tqfind( '-' ); + int p1 = value.find( '-' ); if ( p1 > 0 ) year = value.left( p1 ).toInt( &ok ); kdDebug(30518) << "year: " << value.left( p1 ) << endl; - int p2 = value.tqfind( '-', ++p1 ); + int p2 = value.find( '-', ++p1 ); if ( ok ) month = value.mid( p1, p2 - p1 ).toInt( &ok ); @@ -807,14 +807,14 @@ void OpenCalcImport::loadOasisCondition(Cell*cell,const TQDomElement &property ) void OpenCalcImport::loadOasisConditionValue( const TQString &styleCondition, Conditional &newCondition ) { TQString val( styleCondition ); - if ( val.tqcontains( "cell-content()" ) ) + if ( val.contains( "cell-content()" ) ) { val = val.remove( "cell-content()" ); loadOasisCondition( val,newCondition ); } //GetFunction ::= cell-content-is-between(Value, Value) | cell-content-is-not-between(Value, Value) //for the moment we support just int/double value, not text/date/time :( - if ( val.tqcontains( "cell-content-is-between(" ) ) + if ( val.contains( "cell-content-is-between(" ) ) { val = val.remove( "cell-content-is-between(" ); val = val.remove( ")" ); @@ -822,7 +822,7 @@ void OpenCalcImport::loadOasisConditionValue( const TQString &styleCondition, Co loadOasisValidationValue( listVal, newCondition ); newCondition.cond = Conditional::Between; } - if ( val.tqcontains( "cell-content-is-not-between(" ) ) + if ( val.contains( "cell-content-is-not-between(" ) ) { val = val.remove( "cell-content-is-not-between(" ); val = val.remove( ")" ); @@ -837,33 +837,33 @@ void OpenCalcImport::loadOasisConditionValue( const TQString &styleCondition, Co void OpenCalcImport::loadOasisCondition( TQString &valExpression, Conditional &newCondition ) { TQString value; - if (valExpression.tqfind( "<=" )==0 ) + if (valExpression.find( "<=" )==0 ) { value = valExpression.remove( 0,2 ); newCondition.cond = Conditional::InferiorEqual; } - else if (valExpression.tqfind( ">=" )==0 ) + else if (valExpression.find( ">=" )==0 ) { value = valExpression.remove( 0,2 ); newCondition.cond = Conditional::SuperiorEqual; } - else if (valExpression.tqfind( "!=" )==0 ) + else if (valExpression.find( "!=" )==0 ) { //add Differentto attribute value = valExpression.remove( 0,2 ); newCondition.cond = Conditional::DifferentTo; } - else if ( valExpression.tqfind( "<" )==0 ) + else if ( valExpression.find( "<" )==0 ) { value = valExpression.remove( 0,1 ); newCondition.cond = Conditional::Inferior; } - else if(valExpression.tqfind( ">" )==0 ) + else if(valExpression.find( ">" )==0 ) { value = valExpression.remove( 0,1 ); newCondition.cond = Conditional::Superior; } - else if (valExpression.tqfind( "=" )==0 ) + else if (valExpression.find( "=" )==0 ) { value = valExpression.remove( 0,1 ); newCondition.cond = Conditional::Equal; @@ -1135,9 +1135,9 @@ bool OpenCalcImport::readColLayouts( TQDomElement & content, Sheet * table ) void replaceMacro( TQString & text, TQString const & old, TQString const & newS ) { - int n = text.tqfind( old ); + int n = text.find( old ); if ( n != -1 ) - text = text.tqreplace( n, old.length(), newS ); + text = text.replace( n, old.length(), newS ); } TQString getPart( TQDomNode const & part ) @@ -1332,35 +1332,35 @@ void OpenCalcImport::loadOasisMasterLayoutPage( Sheet * table,KoStyleStack &styl TQString str = styleStack.attributeNS( ooNS::style, "print" ); kdDebug(30518)<<" style:print :"<<str<<endl; - if (str.tqcontains( "headers" ) ) + if (str.contains( "headers" ) ) { //todo implement it into kspread } - if ( str.tqcontains( "grid" ) ) + if ( str.contains( "grid" ) ) { table->print()->setPrintGrid( true ); } - if ( str.tqcontains( "annotations" ) ) + if ( str.contains( "annotations" ) ) { //todo it's not implemented } - if ( str.tqcontains( "objects" ) ) + if ( str.contains( "objects" ) ) { //todo it's not implemented } - if ( str.tqcontains( "charts" ) ) + if ( str.contains( "charts" ) ) { //todo it's not implemented } - if ( str.tqcontains( "drawings" ) ) + if ( str.contains( "drawings" ) ) { //todo it's not implemented } - if ( str.tqcontains( "formulas" ) ) + if ( str.contains( "formulas" ) ) { table->setShowFormula(true); } - if ( str.tqcontains( "zero-values" ) ) + if ( str.contains( "zero-values" ) ) { //todo it's not implemented } @@ -1624,11 +1624,11 @@ void OpenCalcImport::loadOasisAreaName( const TQDomElement&body ) TQString range( point.translation ); - if ( point.translation.tqfind( ':' ) == -1 ) + if ( point.translation.find( ':' ) == -1 ) { Point p( point.translation ); - int n = range.tqfind( '!' ); + int n = range.find( '!' ); if ( n > 0 ) range = range + ":" + range.right( range.length() - n - 1); @@ -2001,7 +2001,7 @@ void OpenCalcImport::loadBorder( Format * tqlayout, TQString const & borderDef, if ( borderDef == "none" ) return; - int p = borderDef.tqfind( ' ' ); + int p = borderDef.find( ' ' ); if ( p < 0 ) return; @@ -2011,7 +2011,7 @@ void OpenCalcImport::loadBorder( Format * tqlayout, TQString const & borderDef, ++p; - int p2 = borderDef.tqfind( ' ', p ); + int p2 = borderDef.find( ' ', p ); TQString s = borderDef.mid( p, p2 - p ); kdDebug(30518) << "Borderstyle: " << s << endl; @@ -2031,7 +2031,7 @@ void OpenCalcImport::loadBorder( Format * tqlayout, TQString const & borderDef, } ++p2; - p = borderDef.tqfind( ' ', p2 ); + p = borderDef.find( ' ', p2 ); if ( p == -1 ) p = borderDef.length(); @@ -2224,7 +2224,7 @@ void OpenCalcImport::readInStyle( Format * tqlayout, TQDomElement const & style if ( style.hasAttributeNS( ooNS::style, "tqparent-style-name" ) ) { Format * cp - = m_defaultStyles.tqfind( style.attributeNS( ooNS::style, "tqparent-style-name", TQString() ) ); + = m_defaultStyles.find( style.attributeNS( ooNS::style, "tqparent-style-name", TQString() ) ); kdDebug(30518) << "Copying tqlayout from " << style.attributeNS( ooNS::style, "tqparent-style-name", TQString() ) << endl; if ( cp != 0 ) @@ -2233,7 +2233,7 @@ void OpenCalcImport::readInStyle( Format * tqlayout, TQDomElement const & style else if ( style.hasAttributeNS( ooNS::style, "family") ) { TQString name = style.attribute( "style-family" ) + "default"; - Format * cp = m_defaultStyles.tqfind( name ); + Format * cp = m_defaultStyles.find( name ); kdDebug(30518) << "Copying tqlayout from " << name << ", " << !cp << endl; @@ -2440,7 +2440,7 @@ void OpenCalcImport::loadOasisValidation( Validity* val, const TQString& validat //A NumberValue is a whole or decimal number. It must not contain comma separators for numbers of 1000 or greater. //ExtendedTrueCondition - if ( valExpression.tqcontains( "cell-content-text-length()" ) ) + if ( valExpression.contains( "cell-content-text-length()" ) ) { //"cell-content-text-length()>45" valExpression = valExpression.remove("cell-content-text-length()" ); @@ -2450,7 +2450,7 @@ void OpenCalcImport::loadOasisValidation( Validity* val, const TQString& validat loadOasisValidationCondition( val, valExpression ); } //cell-content-text-length-is-between(Value, Value) | cell-content-text-length-is-not-between(Value, Value) - else if ( valExpression.tqcontains( "cell-content-text-length-is-between" ) ) + else if ( valExpression.contains( "cell-content-text-length-is-between" ) ) { val->m_restriction = Restriction::TextLength; val->m_cond = Conditional::Between; @@ -2460,7 +2460,7 @@ void OpenCalcImport::loadOasisValidation( Validity* val, const TQString& validat TQStringList listVal = TQStringList::split( ",", valExpression ); loadOasisValidationValue( val, listVal ); } - else if ( valExpression.tqcontains( "cell-content-text-length-is-not-between" ) ) + else if ( valExpression.contains( "cell-content-text-length-is-not-between" ) ) { val->m_restriction = Restriction::TextLength; val->m_cond = Conditional::Different; @@ -2475,36 +2475,36 @@ void OpenCalcImport::loadOasisValidation( Validity* val, const TQString& validat //TrueFunction ::= cell-content-is-whole-number() | cell-content-is-decimal-number() | cell-content-is-date() | cell-content-is-time() else { - if (valExpression.tqcontains( "cell-content-is-whole-number()" ) ) + if (valExpression.contains( "cell-content-is-whole-number()" ) ) { val->m_restriction = Restriction::Number; valExpression = valExpression.remove( "cell-content-is-whole-number() and " ); } - else if (valExpression.tqcontains( "cell-content-is-decimal-number()" ) ) + else if (valExpression.contains( "cell-content-is-decimal-number()" ) ) { val->m_restriction = Restriction::Integer; valExpression = valExpression.remove( "cell-content-is-decimal-number() and " ); } - else if (valExpression.tqcontains( "cell-content-is-date()" ) ) + else if (valExpression.contains( "cell-content-is-date()" ) ) { val->m_restriction = Restriction::Date; valExpression = valExpression.remove( "cell-content-is-date() and " ); } - else if (valExpression.tqcontains( "cell-content-is-time()" ) ) + else if (valExpression.contains( "cell-content-is-time()" ) ) { val->m_restriction = Restriction::Time; valExpression = valExpression.remove( "cell-content-is-time() and " ); } kdDebug(30518)<<"valExpression :"<<valExpression<<endl; - if ( valExpression.tqcontains( "cell-content()" ) ) + if ( valExpression.contains( "cell-content()" ) ) { valExpression = valExpression.remove( "cell-content()" ); loadOasisValidationCondition( val, valExpression ); } //GetFunction ::= cell-content-is-between(Value, Value) | cell-content-is-not-between(Value, Value) //for the moment we support just int/double value, not text/date/time :( - if ( valExpression.tqcontains( "cell-content-is-between(" ) ) + if ( valExpression.contains( "cell-content-is-between(" ) ) { valExpression = valExpression.remove( "cell-content-is-between(" ); valExpression = valExpression.remove( ")" ); @@ -2513,7 +2513,7 @@ void OpenCalcImport::loadOasisValidation( Validity* val, const TQString& validat val->m_cond = Conditional::Between; } - if ( valExpression.tqcontains( "cell-content-is-not-between(" ) ) + if ( valExpression.contains( "cell-content-is-not-between(" ) ) { valExpression = valExpression.remove( "cell-content-is-not-between(" ); valExpression = valExpression.remove( ")" ); @@ -2623,33 +2623,33 @@ void OpenCalcImport::loadOasisValidationValue( Validity* val, const TQStringList void OpenCalcImport::loadOasisValidationCondition( Validity* val,TQString &valExpression ) { TQString value; - if (valExpression.tqcontains( "<=" ) ) + if (valExpression.contains( "<=" ) ) { value = valExpression.remove( "<=" ); val->m_cond = Conditional::InferiorEqual; } - else if (valExpression.tqcontains( ">=" ) ) + else if (valExpression.contains( ">=" ) ) { value = valExpression.remove( ">=" ); val->m_cond = Conditional::SuperiorEqual; } - else if (valExpression.tqcontains( "!=" ) ) + else if (valExpression.contains( "!=" ) ) { //add Differentto attribute value = valExpression.remove( "!=" ); val->m_cond = Conditional::DifferentTo; } - else if ( valExpression.tqcontains( "<" ) ) + else if ( valExpression.contains( "<" ) ) { value = valExpression.remove( "<" ); val->m_cond = Conditional::Inferior; } - else if(valExpression.tqcontains( ">" ) ) + else if(valExpression.contains( ">" ) ) { value = valExpression.remove( ">" ); val->m_cond = Conditional::Superior; } - else if (valExpression.tqcontains( "=" ) ) + else if (valExpression.contains( "=" ) ) { value = valExpression.remove( "=" ); val->m_cond = Conditional::Equal; diff --git a/filters/kspread/qpro/libqpro/src/formula.cc b/filters/kspread/qpro/libqpro/src/formula.cc index bd250048..13e3a457 100644 --- a/filters/kspread/qpro/libqpro/src/formula.cc +++ b/filters/kspread/qpro/libqpro/src/formula.cc @@ -214,7 +214,7 @@ static const QpFormulaConv gConv[] = {73, QpFormula::func3, "@mid("}, {74, QpFormula::func1, "@char("}, {75, QpFormula::func1, "@code("}, - {76, QpFormula::func3, "@tqfind("}, + {76, QpFormula::func3, "@find("}, {77, QpFormula::func1, "@dateVal("}, {78, QpFormula::func1, "@timeVal("}, {79, QpFormula::func1, "@cellPtr("}, @@ -244,7 +244,7 @@ static const QpFormulaConv gConv[] = {103, QpFormula::func1, "@lower("}, {104, QpFormula::func2, "@left("}, {105, QpFormula::func2, "@right("}, - {106, QpFormula::func4, "@tqreplace("}, + {106, QpFormula::func4, "@replace("}, {107, QpFormula::func1, "@proper("}, {108, QpFormula::func2, "@cell("}, {109, QpFormula::func1, "@trim("}, diff --git a/filters/kword/abiword/ImportHelpers.cc b/filters/kword/abiword/ImportHelpers.cc index d37b078c..c3cad308 100644 --- a/filters/kword/abiword/ImportHelpers.cc +++ b/filters/kword/abiword/ImportHelpers.cc @@ -26,7 +26,7 @@ bool AbiPropsMap::setProperty(const TQString& newName, const TQString& newValue) { - tqreplace(newName,AbiProps(newValue)); + replace(newName,AbiProps(newValue)); return true; } @@ -43,7 +43,7 @@ void AbiPropsMap::splitAndAddAbiProps(const TQString& strProps) TQStringList::ConstIterator end(list.end()); for (it=list.begin();it!=end;++it) { - const int result=(*it).tqfind(':'); + const int result=(*it).find(':'); if (result==-1) { name=(*it); diff --git a/filters/kword/abiword/ImportStyle.cc b/filters/kword/abiword/ImportStyle.cc index 62d951e5..4f84a8e4 100644 --- a/filters/kword/abiword/ImportStyle.cc +++ b/filters/kword/abiword/ImportStyle.cc @@ -57,7 +57,7 @@ void StyleDataMap::defineNewStyleFromOld(const TQString& strName, const TQString return; } - StyleDataMap::Iterator it=tqfind(strOld); + StyleDataMap::Iterator it=find(strOld); if (it==end()) { defineNewStyle(strName,level,strProps); @@ -76,7 +76,7 @@ void StyleDataMap::defineNewStyle(const TQString& strName, const int level, { // Despite its name, this method can be called multiple times // We must take care that KWord just gets it only one time. - StyleDataMap::Iterator it=tqfind(strName); + StyleDataMap::Iterator it=find(strName); if (it==end()) { // The style does not exist yet, so we must define it. @@ -95,7 +95,7 @@ void StyleDataMap::defineNewStyle(const TQString& strName, const int level, StyleDataMap::Iterator StyleDataMap::useOrCreateStyle(const TQString& strName) { // We are using a style but we are not sure if it is defined - StyleDataMap::Iterator it=tqfind(strName); + StyleDataMap::Iterator it=find(strName); if (it==end()) { // The style is not yet defined! diff --git a/filters/kword/abiword/abiwordexport.cc b/filters/kword/abiword/abiwordexport.cc index c48b3c27..96c5cc6d 100644 --- a/filters/kword/abiword/abiwordexport.cc +++ b/filters/kword/abiword/abiwordexport.cc @@ -153,7 +153,7 @@ bool AbiWordWorker::doOpenFile(const TQString& filenameOut, const TQString& ) << " (in AbiWordWorker::doOpenFile)" << endl; //Find the last extension TQString strExt; - const int result=filenameOut.tqfindRev('.'); + const int result=filenameOut.findRev('.'); if (result>=0) { strExt=filenameOut.mid(result); @@ -253,7 +253,7 @@ void AbiWordWorker::writePictureData(const TQString& koStoreName, const TQString TQByteArray image; TQString strExtension(koStoreName.lower()); - const int result=koStoreName.tqfindRev("."); + const int result=koStoreName.findRev("."); if (result>=0) { strExtension=koStoreName.mid(result+1); @@ -543,7 +543,7 @@ void AbiWordWorker::writeAbiProps (const TextFormatting& formatLayout, const Tex TQString abiprops=textFormatToAbiProps(formatLayout,format,false); // Erase the last semi-comma (as in CSS2, semi-commas only separate instructions and do not terminate them) - const int result=abiprops.tqfindRev(";"); + const int result=abiprops.findRev(";"); if (result>=0) { @@ -566,9 +566,9 @@ void AbiWordWorker::processNormalText ( const TQString ¶Text, // Replace line feeds by line breaks int pos; - while ((pos=partialText.tqfind(TQChar(10)))>-1) + while ((pos=partialText.find(TQChar(10)))>-1) { - partialText.tqreplace(pos,1,"<br/>"); + partialText.replace(pos,1,"<br/>"); } if (formatData.text.missing) @@ -904,7 +904,7 @@ bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData& { // Find the last semi-comma // Note: as in CSS2, semi-commas only separates instructions (like in PASCAL) and do not terminate them (like in C) - const int result=props.tqfindRev(";"); + const int result=props.findRev(";"); if (result>=0) { // Remove the last semi-comma and the space thereafter @@ -956,7 +956,7 @@ bool AbiWordWorker::doFullDefineStyle(LayoutData& tqlayout) TQString abiprops=layoutToCss(tqlayout,tqlayout,true); - const int result=abiprops.tqfindRev(";"); + const int result=abiprops.findRev(";"); if (result>=0) { // Remove the last semi-comma and the space thereafter diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cc index 2d0697ba..56524cd6 100644 --- a/filters/kword/abiword/abiwordimport.cc +++ b/filters/kword/abiword/abiwordimport.cc @@ -157,7 +157,7 @@ bool StructureParser::StartElementC(StackItem* stackItem, StackItem* stackCurren TQString strStyleName=attributes.value("style").stripWhiteSpace(); if (!strStyleName.isEmpty()) { - StyleDataMap::Iterator it=styleDataMap.tqfind(strStyleName); + StyleDataMap::Iterator it=styleDataMap.find(strStyleName); if (it!=styleDataMap.end()) { strStyleProps=it.data().m_props; @@ -823,7 +823,7 @@ static bool StartElementPBR(StackItem* /*stackItem*/, StackItem* stackCurrent, if (!nodeList.count()) { - kdError(30506) << "Unable to tqfind <LAYOUT> element! Aborting! (in StartElementPBR)" <<endl; + kdError(30506) << "Unable to find <LAYOUT> element! Aborting! (in StartElementPBR)" <<endl; return false; } @@ -1587,7 +1587,7 @@ bool StructureParser::endDocument(void) StyleDataMap::ConstIterator it; // At first, we put the Normal style - it=styleDataMap.tqfind("Normal"); + it=styleDataMap.find("Normal"); if (it!=styleDataMap.end()) { kdDebug(30506) << "\"" << it.key() << "\" => " << it.data().m_props << endl; @@ -1774,7 +1774,7 @@ KoFilter::ConversiontqStatus ABIWORDImport::convert( const TQCString& from, cons //Find the last extension TQString strExt; TQString fileIn = m_chain->inputFile(); - const int result=fileIn.tqfindRev('.'); + const int result=fileIn.findRev('.'); if (result>=0) { strExt=fileIn.mid(result); diff --git a/filters/kword/applixword/applixwordimport.cc b/filters/kword/applixword/applixwordimport.cc index 17af6d88..d7acc7ed 100644 --- a/filters/kword/applixword/applixwordimport.cc +++ b/filters/kword/applixword/applixwordimport.cc @@ -160,7 +160,7 @@ KoFilter::ConversiontqStatus APPLIXWORDImport::convert( const TQCString& from, c if (mystr.startsWith ("<color ")) { mystr.remove (0, 8); - pos = mystr.tqfind ("\""); + pos = mystr.find ("\""); coltxt = mystr.left (pos); mystr.remove (0,pos+1); rueck = sscanf ((const char *) mystr.latin1() , @@ -252,7 +252,7 @@ KoFilter::ConversiontqStatus APPLIXWORDImport::convert( const TQCString& from, c int y=0; do { - pos = mystr.tqfind ("\"", y); + pos = mystr.find ("\"", y); kdDebug(30517)<<"POS:"<<pos<<" length:"<< mystr.length()<<" y:"<<y <<endl; kdDebug(30517)<<"< "<<mystr<<" >\n"; @@ -334,7 +334,7 @@ KoFilter::ConversiontqStatus APPLIXWORDImport::convert( const TQCString& from, c (*it).remove (0, 7); (*it).remove ((*it).length()-1, 1); colname = *it; - colpos = mcoltxt.tqfindIndex (colname); + colpos = mcoltxt.findIndex (colname); kdDebug(30517) <<" Color: "<< colname<<" "<< colpos <<" \n"; } else @@ -691,9 +691,9 @@ APPLIXWORDImport::replaceSpecial (TQString &textstr) int ok, pos; // 1. Replace Part for this characters: <, >, & - textstr.tqreplace ('&', "&"); - textstr.tqreplace ('<', "<"); - textstr.tqreplace ('>', ">"); + textstr.replace ('&', "&"); + textstr.replace ('<', "<"); + textstr.replace ('>', ">"); // 2. Replace part for this characters: applixwear qoutes @@ -702,12 +702,12 @@ APPLIXWORDImport::replaceSpecial (TQString &textstr) do { // Searching for an quote - pos = textstr.tqfind ('\"', pos); + pos = textstr.find ('\"', pos); // Is it an textqoute ? if ((pos > -1) && (textstr[pos-1] == '\\')) { - textstr.tqreplace (pos-1, 2,"\""); + textstr.replace (pos-1, 2,"\""); } else { @@ -727,7 +727,7 @@ APPLIXWORDImport::replaceSpecial (TQString &textstr) // initialize foundSpecialCharakter = false; - pos = textstr.tqfind ("^"); + pos = textstr.find ("^"); // is there a special character ? if (pos > -1 ) @@ -739,7 +739,7 @@ APPLIXWORDImport::replaceSpecial (TQString &textstr) newchar = specCharfind (textstr[pos+1], textstr[pos+2]); // replace the character - textstr.tqreplace (pos, 3, newchar); + textstr.replace (pos, 3, newchar); } } while (foundSpecialCharakter == true); diff --git a/filters/kword/ascii/asciiexport.cc b/filters/kword/ascii/asciiexport.cc index 04b7f451..4f4fbb06 100644 --- a/filters/kword/ascii/asciiexport.cc +++ b/filters/kword/ascii/asciiexport.cc @@ -391,7 +391,7 @@ bool ASCIIWorker::ProcessParagraphData(const TQString& paraText, case 1: // Normal text { TQString strText(paraText.mid((*paraFormatDataIt).pos,(*paraFormatDataIt).len)); - strText = strText.tqreplace(TQChar(10), m_eol, true); + strText = strText.replace(TQChar(10), m_eol, true); *m_streamOut << strText; break; } @@ -409,7 +409,7 @@ bool ASCIIWorker::ProcessParagraphData(const TQString& paraText, TQValueList<ParaData>::ConstIterator it; TQValueList<ParaData>::ConstIterator end(paraList->end()); for (it=paraList->begin();it!=end;++it) - notestr += (*it).text.stripWhiteSpace().tqreplace(TQChar(10), m_eol, true) + m_eol; + notestr += (*it).text.stripWhiteSpace().replace(TQChar(10), m_eol, true) + m_eol; *m_streamOut << "["; if (automatic) { diff --git a/filters/kword/ascii/asciiimport.cc b/filters/kword/ascii/asciiimport.cc index a04da78f..f2a6e039 100644 --- a/filters/kword/ascii/asciiimport.cc +++ b/filters/kword/ascii/asciiimport.cc @@ -404,7 +404,7 @@ void ASCIIImport::sentenceConvert(TQTextStream& stream, TQDomDocument& mainDocum lastChar=strLine[lastPos]; if (lastChar.isNull()) break; - else if (skippingQuotes.tqfind(lastChar)==-1) + else if (skippingQuotes.find(lastChar)==-1) break; else lastPos--; @@ -413,7 +413,7 @@ void ASCIIImport::sentenceConvert(TQTextStream& stream, TQDomDocument& mainDocum lastChar=strLine[lastPos]; if (lastChar.isNull()) continue; - else if (stoppingPunctuation.tqfind(lastChar)!=-1) + else if (stoppingPunctuation.find(lastChar)!=-1) break; } #if 1 @@ -659,12 +659,12 @@ bool ASCIIImport::Table( TQString *Line, int *linecount, int no_lines, } // find column positions and record text fields - while((index2 = Line->tqfind( TQRegExp("\t"),index)) > index + while((index2 = Line->find( TQRegExp("\t"),index)) > index || (index3 = MultSpaces( *Line, index)) > index ) { index1 = kMax(index2, index3); if( index2 > index3) - index1 = Line->tqfind( TQRegExp("[^\t]"), index1); + index1 = Line->find( TQRegExp("[^\t]"), index1); tabcount++; tabs[i].field[no_cols] = Line->mid(index, (index1 - index -1)); tabs[i].width[no_cols] = index1 - index + spacespertab - 1; @@ -916,13 +916,13 @@ int ASCIIImport::MultSpaces(const TQString& text, const int index) const { type = "6"; // delete * at beginning of line - text.tqreplace( TQRegExp("^[ \t]*\\* "), ""); + text.replace( TQRegExp("^[ \t]*\\* "), ""); } else if( listtype[begin] == dash) // write out a dash list { type = "7"; // delete - at beginning of line - text.tqreplace( TQRegExp("^[ \t]*\\- "), ""); + text.replace( TQRegExp("^[ \t]*\\- "), ""); } else if( listtype[begin] == none) // write out a paragraph type = ""; @@ -965,7 +965,7 @@ bool ASCIIImport::IsListItem( TQString FirstLine, TQChar mark ) - int k = FirstLine.tqfind(mark); + int k = FirstLine.find(mark); if( k < 0) return false; // list item mark not on line diff --git a/filters/kword/hancomword/hancomwordimport.cpp b/filters/kword/hancomword/hancomwordimport.cpp index 41244247..6fc353e5 100644 --- a/filters/kword/hancomword/hancomwordimport.cpp +++ b/filters/kword/hancomword/hancomwordimport.cpp @@ -200,7 +200,7 @@ TQByteArray HancomWordImport::Private::createContent() for( uint i = 0; i < paragraphs.count(); i++ ) { TQString text = paragraphs[i]; - text.tqreplace( '\r', ' ' ); + text.replace( '\r', ' ' ); contentWriter->startElement( "text:p" ); contentWriter->addTextNode( text ); contentWriter->endElement(); // text:p diff --git a/filters/kword/html/export/ExportCss.cc b/filters/kword/html/export/ExportCss.cc index 057cdd86..49abcf79 100644 --- a/filters/kword/html/export/ExportCss.cc +++ b/filters/kword/html/export/ExportCss.cc @@ -101,7 +101,7 @@ TQString HtmlCssWorker::textFormatToCss(const TextFormatting& formatOrigin, && (force || (formatOrigin.fontName!=formatData.fontName))) { strElement+="font-family: "; - if (fontName.tqfind(' ')==-1) + if (fontName.find(' ')==-1) strElement+=escapeHtmlText(fontName); else { // If the font name contains a space, it should be quoted. diff --git a/filters/kword/html/export/ExportDocStruct.cc b/filters/kword/html/export/ExportDocStruct.cc index 545d3e31..f0e4b3aa 100644 --- a/filters/kword/html/export/ExportDocStruct.cc +++ b/filters/kword/html/export/ExportDocStruct.cc @@ -66,7 +66,7 @@ void HtmlDocStructWorker::openFormatData(const FormatData& formatOrigin, { // TODO/FIXME: find another way to find fixed fonts // TODO/FIXME: (leaves out "Typewriter", "Monospace", "Mono") - if (format.text.fontName.tqcontains("ourier")) + if (format.text.fontName.contains("ourier")) { *m_streamOut << "<tt>"; // teletype } @@ -133,7 +133,7 @@ void HtmlDocStructWorker::closeFormatData(const FormatData& formatOrigin, } } - if (format.text.fontName.tqcontains("ourier")) // Courier? + if (format.text.fontName.contains("ourier")) // Courier? { *m_streamOut << "</tt>"; // teletype } diff --git a/filters/kword/html/export/ExportFilter.cc b/filters/kword/html/export/ExportFilter.cc index 4a4cd64d..aa1b1817 100644 --- a/filters/kword/html/export/ExportFilter.cc +++ b/filters/kword/html/export/ExportFilter.cc @@ -98,7 +98,7 @@ TQString HtmlWorker::getAdditionalFileName(const TQString& additionalName) TQString strFileName(m_strSubDirectoryName); strFileName+="/"; - const int result=additionalName.tqfindRev("/"); + const int result=additionalName.findRev("/"); if (result>=0) { strFileName+=additionalName.mid(result+1); @@ -140,7 +140,7 @@ bool HtmlWorker::makeImage(const FrameAnchor& anchor) const double height = anchor.frame.bottom - anchor.frame.top; const double width = anchor.frame.right - anchor.frame.left; - const int pos = anchor.picture.koStoreName.tqfindRev( '.' ); + const int pos = anchor.picture.koStoreName.findRev( '.' ); TQString extension; if ( pos > -1 ) extension = anchor.picture.koStoreName.mid( pos+1 ).lower(); @@ -243,9 +243,9 @@ void HtmlWorker::formatTextParagraph(const TQString& strText, // Replace line feeds by line breaks int pos; TQString strBr(isXML()?TQString("<br />"):TQString("<br>")); - while ((pos=strEscaped.tqfind(TQChar(10)))>-1) + while ((pos=strEscaped.find(TQChar(10)))>-1) { - strEscaped.tqreplace(pos,1,strBr); + strEscaped.replace(pos,1,strBr); } if (!format.text.missing) diff --git a/filters/kword/kword1.3/import/kword13document.cpp b/filters/kword/kword1.3/import/kword13document.cpp index fcf8e60c..db75a02f 100644 --- a/filters/kword/kword1.3/import/kword13document.cpp +++ b/filters/kword/kword1.3/import/kword13document.cpp @@ -147,7 +147,7 @@ void KWord13Document::xmldump( TQIODevice* io ) TQString KWord13Document::getDocumentInfo( const TQString& name ) const { - TQMap<TQString,TQString>::ConstIterator it ( m_documentInfo.tqfind( name ) ); + TQMap<TQString,TQString>::ConstIterator it ( m_documentInfo.find( name ) ); if ( it == m_documentInfo.end() ) { // Property does not exist @@ -176,7 +176,7 @@ TQString KWord13Document::getProperty( const TQString& name, const TQString& old TQString KWord13Document::getPropertyInternal( const TQString& name ) const { - TQMap<TQString,TQString>::ConstIterator it ( m_documentProperties.tqfind( name ) ); + TQMap<TQString,TQString>::ConstIterator it ( m_documentProperties.find( name ) ); if ( it == m_documentProperties.end() ) { // Property does not exist diff --git a/filters/kword/kword1.3/import/kword13formatone.cpp b/filters/kword/kword1.3/import/kword13formatone.cpp index 5f4dca5f..9a658e41 100644 --- a/filters/kword/kword1.3/import/kword13formatone.cpp +++ b/filters/kword/kword1.3/import/kword13formatone.cpp @@ -48,7 +48,7 @@ TQString KWord13FormatOneData::key( void ) const TQString KWord13FormatOneData::getProperty( const TQString& name ) const { - TQMap<TQString,TQString>::ConstIterator it ( m_properties.tqfind( name ) ); + TQMap<TQString,TQString>::ConstIterator it ( m_properties.find( name ) ); if ( it == m_properties.end() ) { // Property does not exist diff --git a/filters/kword/kword1.3/import/kword13layout.cpp b/filters/kword/kword1.3/import/kword13layout.cpp index 4ec4c59d..cc8a7046 100644 --- a/filters/kword/kword1.3/import/kword13layout.cpp +++ b/filters/kword/kword1.3/import/kword13layout.cpp @@ -63,7 +63,7 @@ TQString KWord13Layout::key( void ) const TQString KWord13Layout::getProperty( const TQString& name ) const { - TQMap<TQString,TQString>::ConstIterator it ( m_layoutProperties.tqfind( name ) ); + TQMap<TQString,TQString>::ConstIterator it ( m_layoutProperties.find( name ) ); if ( it == m_layoutProperties.end() ) { // Property does not exist diff --git a/filters/kword/kword1.3/import/kword13parser.cpp b/filters/kword/kword1.3/import/kword13parser.cpp index 00d8290d..2f6403af 100644 --- a/filters/kword/kword1.3/import/kword13parser.cpp +++ b/filters/kword/kword1.3/import/kword13parser.cpp @@ -474,7 +474,7 @@ bool KWord13Parser::startElementAnchor( const TQString& name, const TQXmlAttribu six->m_anchorName = frameset; } // add frameset name to the list of anchored framesets - if ( m_kwordDocument->m_anchoredFramesetNames.tqfind( frameset ) == m_kwordDocument->m_anchoredFramesetNames.end() ) + if ( m_kwordDocument->m_anchoredFramesetNames.find( frameset ) == m_kwordDocument->m_anchoredFramesetNames.end() ) { m_kwordDocument->m_anchoredFramesetNames.append( frameset ); } diff --git a/filters/kword/kword1.3/import/kword13picture.cpp b/filters/kword/kword1.3/import/kword13picture.cpp index 13437d6c..c94d1e34 100644 --- a/filters/kword/kword1.3/import/kword13picture.cpp +++ b/filters/kword/kword1.3/import/kword13picture.cpp @@ -72,7 +72,7 @@ TQString KWord13Picture::getOasisPictureName( void ) const number += TQString::number( (long long)( (void*) m_tempFile ) , 16 ); // in hex TQString strExtension( m_storeName.lower() ); - const int result = m_storeName.tqfindRev( '.' ); + const int result = m_storeName.findRev( '.' ); if ( result >= 0 ) { strExtension = m_storeName.mid( result ); diff --git a/filters/kword/latex/export/pixmapFrame.cc b/filters/kword/latex/export/pixmapFrame.cc index bbd0430b..25f5951d 100644 --- a/filters/kword/latex/export/pixmapFrame.cc +++ b/filters/kword/latex/export/pixmapFrame.cc @@ -102,7 +102,7 @@ void PixmapFrame::getPixmap(const TQDomNode balise_initiale) FileHeader::instance()->useGraphics(); TQString file = getKey(); /* Remove the extension */ - int posExt = file.tqfindRev('.'); + int posExt = file.findRev('.'); file.truncate(posExt); /* Remove the path */ file = file.section('/', -1); @@ -166,7 +166,7 @@ void PixmapFrame::convert() Config::instance()->getPicturesDir() == NULL) { dir = getFilename(); - dir.truncate(getFilename().tqfindRev('/')); + dir.truncate(getFilename().findRev('/')); } else dir = Config::instance()->getPicturesDir(); diff --git a/filters/kword/latex/export/textzone.cc b/filters/kword/latex/export/textzone.cc index 476babb3..a4beb875 100644 --- a/filters/kword/latex/export/textzone.cc +++ b/filters/kword/latex/export/textzone.cc @@ -269,7 +269,7 @@ void TextZone::convert(TQString& text, int tqunicode, const char* escape) if( !TQString(escape).isEmpty() ) { /*1. translate special characters with a space after. */ - text = text.tqreplace( TQRegExp( expression), TQString(escape)); + text = text.replace( TQRegExp( expression), TQString(escape)); } } @@ -347,7 +347,7 @@ void TextZone::display(TQString texte, TQTextStream& out) { TQString line; int index = 0, end = 0; - end = texte.tqfind(' ', 60, false); + end = texte.find(' ', 60, false); if(end != -1) line = texte.mid(index, end - index); else @@ -361,7 +361,7 @@ void TextZone::display(TQString texte, TQTextStream& out) out << line << endl; Config::instance()->writeIndent(out); index = end; - end = texte.tqfind(' ', index + 60, false); + end = texte.find(' ', index + 60, false); line = texte.mid(index, end - index); } kdDebug(30522) << line << endl; diff --git a/filters/kword/latex/import/parser/command.cc b/filters/kword/latex/import/parser/command.cc index 9b7d1979..d110c089 100644 --- a/filters/kword/latex/import/parser/command.cc +++ b/filters/kword/latex/import/parser/command.cc @@ -86,16 +86,16 @@ Command::~Command() void Command::addParam(const char* ) { /*TQString test = TQString(name); - TQString key = test.left(test.tqfind("=")); - TQString value = test.right(test.tqfind("=")); + TQString key = test.left(test.find("=")); + TQString value = test.right(test.find("=")); addParam(key, value);*/ } void Command::addOption(const char* ) { /*TQString test = TQString(name); - TQString key = test.left(test.tqfind("=")); - TQString value = test.right(test.tqfind("=")); + TQString key = test.left(test.find("=")); + TQString value = test.right(test.find("=")); addOption(key, value);*/ } diff --git a/filters/kword/latex/import/parser/env.cc b/filters/kword/latex/import/parser/env.cc index a490d328..e25e95ab 100644 --- a/filters/kword/latex/import/parser/env.cc +++ b/filters/kword/latex/import/parser/env.cc @@ -30,7 +30,7 @@ Env::Env(const char* command) setType(Element::LATEX_ENV); /* Parse the command name */ TQString pattern = TQString(command); - int pos = pattern.tqfind("{"); + int pos = pattern.find("{"); /* Remove \begin{ at the begining and the } at the end. */ if(pos != -1) _name = pattern.mid(pos + 1, pattern.length() - pos - 2); diff --git a/filters/kword/libexport/KWEFKWordLeader.cc b/filters/kword/libexport/KWEFKWordLeader.cc index 4a966dad..3e9a724e 100644 --- a/filters/kword/libexport/KWEFKWordLeader.cc +++ b/filters/kword/libexport/KWEFKWordLeader.cc @@ -178,7 +178,7 @@ static void ProcessParagraphTag ( TQDomNode myNode, AllowNoAttributes (myNode); // We need to adjust the paragraph number (0 if first) - TQMap<TQString,int>::Iterator it = leader->m_paraCountMap.tqfind( leader->m_currentFramesetName ); + TQMap<TQString,int>::Iterator it = leader->m_paraCountMap.find( leader->m_currentFramesetName ); if ( it == leader->m_paraCountMap.end() ) leader->m_paraCountMap.insert( leader->m_currentFramesetName, 0 ); else diff --git a/filters/kword/libexport/TagProcessing.h b/filters/kword/libexport/TagProcessing.h index 27512bfd..f2bf4665 100644 --- a/filters/kword/libexport/TagProcessing.h +++ b/filters/kword/libexport/TagProcessing.h @@ -47,7 +47,7 @@ class KWEFKWordLeader; * AllowNoSubtags () allow for easing parsing of subtags in the * current tag. If don't expect any subtags you call AllowNoSubtags (). * Otherwise you create a list of TagProcessing elements and pass that - * to ProcessSubtags () which will go through all subtags it can tqfind, + * to ProcessSubtags () which will go through all subtags it can find, * call the corresponding processing function, and do all the * necessary error handling. */ @@ -89,7 +89,7 @@ void AllowNoSubtags ( const TQDomNode& myNode, KWEFKWordLeader *leader ); * attributes. If don't expect any attributes you call AllowNoAttributes (). * Otherwise you create a list of AttrProcessing elements and pass * that to ProcessAttributes () which will go through all attributes - * it can tqfind, retrieve the value in the datatype defined, and do all + * it can find, retrieve the value in the datatype defined, and do all * the necessary error handling. */ diff --git a/filters/kword/msword/texthandler.cpp b/filters/kword/msword/texthandler.cpp index e58ffead..1fea6625 100644 --- a/filters/kword/msword/texthandler.cpp +++ b/filters/kword/msword/texthandler.cpp @@ -497,7 +497,7 @@ TQString KWordTextHandler::getFont(unsigned fc) const static const unsigned ENTRIES = 6; static const char* const fuzzyLookup[ENTRIES][2] = { - // MS tqcontains X11 font family + // MS contains X11 font family // substring. non-Xft name. { "times", "times" }, { "courier", "courier" }, @@ -515,7 +515,7 @@ TQString KWordTextHandler::getFont(unsigned fc) const for (i = 0; i < ENTRIES; i++) { // The loop will leave unchanged any MS font name not fuzzy-matched. - if (font.tqfind(fuzzyLookup[i][0], 0, FALSE) != -1) + if (font.find(fuzzyLookup[i][0], 0, FALSE) != -1) { font = fuzzyLookup[i][1]; break; diff --git a/filters/kword/mswrite/mswriteexport.cc b/filters/kword/mswrite/mswriteexport.cc index efc4020c..02d980ef 100644 --- a/filters/kword/mswrite/mswriteexport.cc +++ b/filters/kword/mswrite/mswriteexport.cc @@ -1028,7 +1028,7 @@ public: MSWrite::DWord imageSize = 0; TQString imageType; - int pos = frameAnchor.picture.koStoreName.tqfindRev ('.'); + int pos = frameAnchor.picture.koStoreName.findRev ('.'); if (pos != -1) imageType = frameAnchor.picture.koStoreName.mid (pos).lower (); kdDebug (30509) << "\timageType: " << imageType << endl; @@ -1783,19 +1783,19 @@ public: if (softHyphen == -2) { - softHyphen = stringUnicode.tqfind (TQChar (0xAD), upto); + softHyphen = stringUnicode.find (TQChar (0xAD), upto); if (softHyphen == -1) softHyphen = INT_MAX; } if (nonBreakingSpace == -2) { - nonBreakingSpace = stringUnicode.tqfind (TQChar (0xA0), upto); + nonBreakingSpace = stringUnicode.find (TQChar (0xA0), upto); if (nonBreakingSpace == -1) nonBreakingSpace = INT_MAX; } if (newLine == -2) { - newLine = stringUnicode.tqfind (TQChar ('\n'), upto); + newLine = stringUnicode.find (TQChar ('\n'), upto); if (newLine == -1) newLine = INT_MAX; } diff --git a/filters/kword/mswrite/mswriteimport.cc b/filters/kword/mswrite/mswriteimport.cc index feff4917..379d3c01 100644 --- a/filters/kword/mswrite/mswriteimport.cc +++ b/filters/kword/mswrite/mswriteimport.cc @@ -1182,11 +1182,11 @@ public: m_charInfoCountLen += strUnicode.length (); // make string XML-friendly (TODO: speed up) - strUnicode.tqreplace ('&', "&"); - strUnicode.tqreplace ('<', "<"); - strUnicode.tqreplace ('>', ">"); - strUnicode.tqreplace ('\"', """); - strUnicode.tqreplace ('\'', "'"); + strUnicode.replace ('&', "&"); + strUnicode.replace ('<', "<"); + strUnicode.replace ('>', ">"); + strUnicode.replace ('\"', """); + strUnicode.replace ('\'', "'"); return writeTextInternal (strUnicode); } diff --git a/filters/kword/mswrite/structures_private.cpp b/filters/kword/mswrite/structures_private.cpp index dec806c0..6779e1d7 100644 --- a/filters/kword/mswrite/structures_private.cpp +++ b/filters/kword/mswrite/structures_private.cpp @@ -479,7 +479,7 @@ namespace MSWrite code++; } - // couldn't tqfind + // couldn't find return 0xFFFFFFFF; } diff --git a/filters/kword/oowriter/ExportFilter.cc b/filters/kword/oowriter/ExportFilter.cc index 36485105..40f0bee6 100644 --- a/filters/kword/oowriter/ExportFilter.cc +++ b/filters/kword/oowriter/ExportFilter.cc @@ -361,7 +361,7 @@ void OOWriterWorker::writeFontDeclaration(void) TQMap<TQString,TQString>::ConstIterator end(m_fontNames.end()); for (TQMap<TQString,TQString>::ConstIterator it=m_fontNames.begin(); it!=end; ++it) { - const bool space=(it.key().tqfind(' ')>=0); // Does the font has at least a space in its name + const bool space=(it.key().find(' ')>=0); // Does the font has at least a space in its name const TQString fontName(escapeOOText(it.key())); zipWriteData(" <style:font-decl style:name=\""); zipWriteData(fontName); @@ -864,7 +864,7 @@ TQString OOWriterWorker::textFormatToStyle(const TextFormatting& formatOrigin, const TQString lang ( formatData.language ); if ( ! lang.isEmpty() ) { - const int res = lang.tqfind( '_' ); + const int res = lang.find( '_' ); if ( res >= 0 ) { @@ -1054,7 +1054,7 @@ bool OOWriterWorker::makeTableRows( const TQString& tableName, const Table& tabl const TQString props ( cellToProperties( (*itCell), key ) ); TQString automaticCellStyle; - TQMap<TQString,TQString>::ConstIterator it ( mapCellStyleKeys.tqfind( key ) ); + TQMap<TQString,TQString>::ConstIterator it ( mapCellStyleKeys.find( key ) ); if ( it == mapCellStyleKeys.end() ) { automaticCellStyle = makeAutomaticStyleName( tableName + ".Cell", cellNumber ); @@ -1349,7 +1349,7 @@ bool OOWriterWorker::makePicture( const FrameAnchor& anchor, const AnchorType an TQByteArray image; TQString strExtension(koStoreName.lower()); - const int result=koStoreName.tqfindRev("."); + const int result=koStoreName.findRev("."); if (result>=0) { strExtension=koStoreName.mid(result+1); @@ -1495,7 +1495,7 @@ void OOWriterWorker::processNormalText ( const TQString ¶Text, TQString styleKey; const TQString props ( textFormatToStyle(formatLayout,formatData.text,false,styleKey) ); - TQMap<TQString,TQString>::ConstIterator it ( m_mapTextStyleKeys.tqfind(styleKey) ); + TQMap<TQString,TQString>::ConstIterator it ( m_mapTextStyleKeys.find(styleKey) ); kdDebug(30518) << "Searching text key: " << styleKey << endl; TQString automaticStyle; @@ -1989,7 +1989,7 @@ bool OOWriterWorker::doFullParagraph(const TQString& paraText, const LayoutData& TQString actualStyle(tqlayout.styleName); if (!props.isEmpty()) { - TQMap<TQString,TQString>::ConstIterator it ( m_mapParaStyleKeys.tqfind(styleKey) ); + TQMap<TQString,TQString>::ConstIterator it ( m_mapParaStyleKeys.find(styleKey) ); kdDebug(30518) << "Searching paragraph key: " << styleKey << endl; TQString automaticStyle; @@ -2156,7 +2156,7 @@ void OOWriterWorker::declareFont(const TQString& fontName) if (fontName.isEmpty()) return; - if (m_fontNames.tqfind(fontName)==m_fontNames.end()) + if (m_fontNames.find(fontName)==m_fontNames.end()) { TQString props; @@ -2205,22 +2205,22 @@ TQString OOWriterWorker::makeAutomaticStyleName(const TQString& prefix, ulong& c // Checks if the automatic style has not the same name as a user one. // If it is the case, change it! - if (m_styleMap.tqfind(str)==m_styleMap.end()) + if (m_styleMap.find(str)==m_styleMap.end()) return str; // Unique, so let's go! TQString str2(str+"_bis"); - if (m_styleMap.tqfind(str2)==m_styleMap.end()) + if (m_styleMap.find(str2)==m_styleMap.end()) return str2; str2 = str+"_ter"; - if (m_styleMap.tqfind(str2)==m_styleMap.end()) + if (m_styleMap.find(str2)==m_styleMap.end()) return str2; // If it is still not unique, try a time stamp. const TQDateTime dt(TQDateTime::tqcurrentDateTime(Qt::UTC)); str2 = str + "_" + TQString::number(dt.toTime_t(),16); - if (m_styleMap.tqfind(str2)==m_styleMap.end()) + if (m_styleMap.find(str2)==m_styleMap.end()) return str2; kdWarning(30518) << "Could not make an unique style name: " << str2 << endl; diff --git a/filters/kword/oowriter/oowriterimport.cc b/filters/kword/oowriter/oowriterimport.cc index 4304f346..e1aeda78 100644 --- a/filters/kword/oowriter/oowriterimport.cc +++ b/filters/kword/oowriter/oowriterimport.cc @@ -1131,7 +1131,7 @@ void OoWriterImport::parseSpanOrSimilar( TQDomDocument& doc, const TQDomElement& } else if ( isTextNS && localName == "bookmark-end" ) { TQString bkName = ts.attributeNS( ooNS::text, "name", TQString() ); - BookmarkStartsMap::iterator it = m_bookmarkStarts.tqfind( bkName ); + BookmarkStartsMap::iterator it = m_bookmarkStarts.find( bkName ); if ( it == m_bookmarkStarts.end() ) { // bookmark end without start. This seems to happen.. // insert simple bookmark then appendBookmark( doc, numberOfParagraphs( m_currentFrameset ), @@ -1811,7 +1811,7 @@ TQString OoWriterImport::appendPicture(TQDomDocument& doc, const TQDomElement& o if ( href[0]=='#' ) { TQString strExtension; - const int result=href.tqfindRev("."); + const int result=href.findRev("."); if (result>=0) { strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. @@ -1953,7 +1953,7 @@ void OoWriterImport::appendField(TQDomDocument& doc, TQDomElement& outputFormats { TQString dataStyleName = object.attributeNS( ooNS::style, "data-style-name", TQString() ); TQString dateFormat = "locale"; - DataFormatsMap::const_iterator it = m_dateTimeFormats.tqfind( dataStyleName ); + DataFormatsMap::const_iterator it = m_dateTimeFormats.find( dataStyleName ); if ( it != m_dateTimeFormats.end() ) dateFormat = (*it); @@ -2234,7 +2234,7 @@ void OoWriterImport::parseTable( TQDomDocument &doc, const TQDomElement& tqparen repeat=1; // At least one column defined! const TQString styleName ( elem.attributeNS( ooNS::table, "style-name", TQString()) ); kdDebug(30518) << "Column " << col << " style " << styleName << endl; - const TQDomElement* style=m_styles.tqfind(styleName); + const TQDomElement* style=m_styles.find(styleName); double width=0.0; if (style) { @@ -2481,7 +2481,7 @@ TQString OoWriterImport::kWordStyleName( const TQString& ooStyleName ) { if ( ooStyleName.startsWith( "Contents " ) ) { TQString s( ooStyleName ); - return s.tqreplace( 0, 9, TQString("Contents Head ") ); // Awful hack for KWord's broken "update TOC" feature + return s.replace( 0, 9, TQString("Contents Head ") ); // Awful hack for KWord's broken "update TOC" feature } else { return ooStyleName; } diff --git a/filters/kword/palmdoc/palmdocimport.cc b/filters/kword/palmdoc/palmdocimport.cc index f659cad0..98cd7629 100644 --- a/filters/kword/palmdoc/palmdocimport.cc +++ b/filters/kword/palmdoc/palmdocimport.cc @@ -133,11 +133,11 @@ TQString PalmDocImport::processPlainParagraph( TQString text ) tqlayout.append( "</LAYOUT>\n" ); // encode text for XML-ness - text.tqreplace( '&', "&" ); - text.tqreplace( '<', "<" ); - text.tqreplace( '>', ">" ); - text.tqreplace( '"', """ ); - text.tqreplace( '\'', "'" ); + text.replace( '&', "&" ); + text.replace( '<', "<" ); + text.replace( '>', ">" ); + text.replace( '"', """ ); + text.replace( '\'', "'" ); // construct the <PARAGRAPH> result.append( "<PARAGRAPH>\n" ); @@ -160,7 +160,7 @@ TQString PalmDocImport::processPlainDocument( TQString plaindoc ) for( unsigned int i = 0; i < paragraphs.count(); i++ ) { TQString text = paragraphs[i]; - text.tqreplace( '\n', ' ' ); + text.replace( '\n', ' ' ); content.append( processPlainParagraph( text ) ); } diff --git a/filters/kword/pdf/misc.cpp b/filters/kword/pdf/misc.cpp index 86eb81f6..0ffc9dba 100644 --- a/filters/kword/pdf/misc.cpp +++ b/filters/kword/pdf/misc.cpp @@ -177,17 +177,17 @@ static const KnownData KNOWN_DATA[] = { void Font::init(const TQString &n) { // check if font already parsed - _data = _dict->tqfind(n); + _data = _dict->find(n); if ( _data==0 ) { // kdDebug(30516) << "font " << n << endl; TQString name = n; - name.tqreplace("oblique", "italic"); + name.replace("oblique", "italic"); // check if known font _data = new Data; uint i = 0; while ( KNOWN_DATA[i].name!=0 ) { - if ( name.tqfind(KNOWN_DATA[i].name)!=-1 ) { + if ( name.find(KNOWN_DATA[i].name)!=-1 ) { // kdDebug(30516) << "found " << KNOWN_DATA[i].name // << " " << isBold(KNOWN_DATA[i].style) << endl; _data->family = FAMILY_DATA[KNOWN_DATA[i].family]; @@ -201,13 +201,13 @@ void Font::init(const TQString &n) if ( _data->family.isEmpty() ) { // let's try harder // simple heuristic kdDebug(30516) << "unknown font : " << n << endl; - if ( name.tqfind("times")!=-1 ) + if ( name.find("times")!=-1 ) _data->family = FAMILY_DATA[Times]; - else if ( name.tqfind("helvetica")!=-1 ) + else if ( name.find("helvetica")!=-1 ) _data->family = FAMILY_DATA[Helvetica]; - else if ( name.tqfind("courier")!=-1 ) + else if ( name.find("courier")!=-1 ) _data->family = FAMILY_DATA[Courier]; - else if ( name.tqfind("symbol")!=-1 ) + else if ( name.find("symbol")!=-1 ) _data->family = FAMILY_DATA[Symbol]; else { // with TQt TQFontDatabase fdb; @@ -223,8 +223,8 @@ void Font::init(const TQString &n) } } - bool italic = ( name.tqfind("italic")!=-1 ); - bool bold = ( name.tqfind("bold")!=-1 ); + bool italic = ( name.find("italic")!=-1 ); + bool bold = ( name.find("bold")!=-1 ); _data->style = toStyle(bold, italic); _data->latex = false; } @@ -233,7 +233,7 @@ void Font::init(const TQString &n) } // check if TQFont already created - if ( !_data->height.tqcontains(_pointSize) ) { + if ( !_data->height.contains(_pointSize) ) { TQFont font(_data->family, _pointSize, (isBold(_data->style) ? TQFont::Bold : TQFont::Normal), isItalic(_data->style)); diff --git a/filters/kword/pdf/xpdf/goo/GHash.cc b/filters/kword/pdf/xpdf/goo/GHash.cc index b8f511e0..d336f88e 100644 --- a/filters/kword/pdf/xpdf/goo/GHash.cc +++ b/filters/kword/pdf/xpdf/goo/GHash.cc @@ -97,7 +97,7 @@ void *GHash::lookup(const GString *key) { GHashBucket *p; int h; - if (!(p = tqfind(key, &h))) { + if (!(p = find(key, &h))) { return NULL; } return p->val; @@ -107,7 +107,7 @@ void *GHash::lookup(const char *key) { GHashBucket *p; int h; - if (!(p = tqfind(key, &h))) { + if (!(p = find(key, &h))) { return NULL; } return p->val; @@ -119,7 +119,7 @@ void *GHash::remove(const GString *key) { void *val; int h; - if (!(p = tqfind(key, &h))) { + if (!(p = find(key, &h))) { return NULL; } q = &tab[h]; @@ -142,7 +142,7 @@ void *GHash::remove(const char *key) { void *val; int h; - if (!(p = tqfind(key, &h))) { + if (!(p = find(key, &h))) { return NULL; } q = &tab[h]; @@ -190,7 +190,7 @@ void GHash::killIter(GHashIter **iter) { *iter = NULL; } -GHashBucket *GHash::tqfind(const GString *key, int *h) { +GHashBucket *GHash::find(const GString *key, int *h) { GHashBucket *p; *h = hash(key); @@ -202,7 +202,7 @@ GHashBucket *GHash::tqfind(const GString *key, int *h) { return NULL; } -GHashBucket *GHash::tqfind(const char *key, int *h) { +GHashBucket *GHash::find(const char *key, int *h) { GHashBucket *p; *h = hash(key); diff --git a/filters/kword/pdf/xpdf/goo/GHash.h b/filters/kword/pdf/xpdf/goo/GHash.h index 426428c1..79d9a7ea 100644 --- a/filters/kword/pdf/xpdf/goo/GHash.h +++ b/filters/kword/pdf/xpdf/goo/GHash.h @@ -37,8 +37,8 @@ public: private: - GHashBucket *tqfind(const GString *key, int *h); - GHashBucket *tqfind(const char *key, int *h); + GHashBucket *find(const GString *key, int *h); + GHashBucket *find(const char *key, int *h); int hash(const GString *key); int hash(const char *key); diff --git a/filters/kword/pdf/xpdf/xpdf/CMap.cc b/filters/kword/pdf/xpdf/xpdf/CMap.cc index 21f0af22..b0002183 100644 --- a/filters/kword/pdf/xpdf/xpdf/CMap.cc +++ b/filters/kword/pdf/xpdf/xpdf/CMap.cc @@ -61,7 +61,7 @@ CMap *CMap::parse(CMapCache *cache, GString *collectionA, return new CMap(collectionA->copy(), cMapNameA->copy(), 1); } - error(-1, "Couldn't tqfind '%s' CMap file for '%s' collection", + error(-1, "Couldn't find '%s' CMap file for '%s' collection", cMapNameA->getCString(), collectionA->getCString()); return NULL; } diff --git a/filters/kword/pdf/xpdf/xpdf/CMap.h b/filters/kword/pdf/xpdf/xpdf/CMap.h index 5ece2635..ce926baf 100644 --- a/filters/kword/pdf/xpdf/xpdf/CMap.h +++ b/filters/kword/pdf/xpdf/xpdf/CMap.h @@ -45,7 +45,7 @@ public: GBool match(GString *collectionA, GString *cMapNameA); // Return the CID corresponding to the character code starting at - // <s>, which tqcontains <len> bytes. Sets *<nUsed> to the number of + // <s>, which contains <len> bytes. Sets *<nUsed> to the number of // bytes used by the char code. CID getCID(char *s, int len, int *nUsed); diff --git a/filters/kword/pdf/xpdf/xpdf/Dict.cc b/filters/kword/pdf/xpdf/xpdf/Dict.cc index 048ce80a..351c23a0 100644 --- a/filters/kword/pdf/xpdf/xpdf/Dict.cc +++ b/filters/kword/pdf/xpdf/xpdf/Dict.cc @@ -50,7 +50,7 @@ void Dict::add(char *key, Object *val) { ++length; } -inline DictEntry *Dict::tqfind(const char *key) { +inline DictEntry *Dict::find(const char *key) { int i; for (i = 0; i < length; ++i) { @@ -63,19 +63,19 @@ inline DictEntry *Dict::tqfind(const char *key) { GBool Dict::is(const char *type) { DictEntry *e; - return (e = tqfind("Type")) && e->val.isName(type); + return (e = find("Type")) && e->val.isName(type); } Object *Dict::lookup(const char *key, Object *obj) { DictEntry *e; - return (e = tqfind(key)) ? e->val.fetch(xref, obj) : obj->initNull(); + return (e = find(key)) ? e->val.fetch(xref, obj) : obj->initNull(); } Object *Dict::lookupNF(const char *key, Object *obj) { DictEntry *e; - return (e = tqfind(key)) ? e->val.copy(obj) : obj->initNull(); + return (e = find(key)) ? e->val.copy(obj) : obj->initNull(); } char *Dict::getKey(int i) { diff --git a/filters/kword/pdf/xpdf/xpdf/Dict.h b/filters/kword/pdf/xpdf/xpdf/Dict.h index cc66161e..4bc4408e 100644 --- a/filters/kword/pdf/xpdf/xpdf/Dict.h +++ b/filters/kword/pdf/xpdf/xpdf/Dict.h @@ -71,7 +71,7 @@ private: int length; // number of entries in dictionary int ref; // reference count - DictEntry *tqfind(const char *key); + DictEntry *find(const char *key); }; #endif diff --git a/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc b/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc index c5d5450b..ec76e1cc 100644 --- a/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc +++ b/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc @@ -1121,7 +1121,7 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *bitmap, int x, int y, case 3: // xnor dest ^= ((src1 ^ 0xff) >> s1) & m2; break; - case 4: // tqreplace + case 4: // replace dest = (dest & ~m3) | ((src1 >> s1) & m3); break; } @@ -1144,7 +1144,7 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *bitmap, int x, int y, case 3: // xnor dest ^= (src1 ^ 0xff) & m2; break; - case 4: // tqreplace + case 4: // replace dest = (src1 & m2) | (dest & m1); break; } @@ -1174,7 +1174,7 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *bitmap, int x, int y, case 3: // xnor dest ^= (src1 ^ 0xff) >> s1; break; - case 4: // tqreplace + case 4: // replace dest = (dest & (0xff << s2)) | (src1 >> s1); break; } @@ -1206,7 +1206,7 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *bitmap, int x, int y, case 3: // xnor dest ^= src ^ 0xff; break; - case 4: // tqreplace + case 4: // replace dest = src; break; } @@ -1231,7 +1231,7 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *bitmap, int x, int y, case 3: // xnor dest ^= (src ^ 0xff) & m2; break; - case 4: // tqreplace + case 4: // replace dest = (src & m2) | (dest & m1); break; } diff --git a/filters/kword/pdf/xpdf/xpdf/Link.cc b/filters/kword/pdf/xpdf/xpdf/Link.cc index b660c035..345e7296 100644 --- a/filters/kword/pdf/xpdf/xpdf/Link.cc +++ b/filters/kword/pdf/xpdf/xpdf/Link.cc @@ -713,7 +713,7 @@ Links::~Links() { gfree(links); } -LinkAction *Links::tqfind(double x, double y) { +LinkAction *Links::find(double x, double y) { int i; for (i = numLinks - 1; i >= 0; --i) { diff --git a/filters/kword/pdf/xpdf/xpdf/Link.h b/filters/kword/pdf/xpdf/xpdf/Link.h index 65161876..17eab2c7 100644 --- a/filters/kword/pdf/xpdf/xpdf/Link.h +++ b/filters/kword/pdf/xpdf/xpdf/Link.h @@ -357,7 +357,7 @@ public: // If point <x>,<y> is in a link, return the associated action; // else return NULL. - LinkAction *tqfind(double x, double y); + LinkAction *find(double x, double y); // Return true if <x>,<y> is in a link. GBool onLink(double x, double y); diff --git a/filters/kword/pdf/xpdf/xpdf/PDFDoc.h b/filters/kword/pdf/xpdf/xpdf/PDFDoc.h index 64c6cd2a..ff6e359c 100644 --- a/filters/kword/pdf/xpdf/xpdf/PDFDoc.h +++ b/filters/kword/pdf/xpdf/xpdf/PDFDoc.h @@ -103,7 +103,7 @@ public: // If point <x>,<y> is in a link, return the associated action; // else return NULL. - LinkAction *findLink(double x, double y) { return links->tqfind(x, y); } + LinkAction *findLink(double x, double y) { return links->find(x, y); } // Return true if <x>,<y> is in a link. GBool onLink(double x, double y) { return links->onLink(x, y); } diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc b/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc index 2aa620d6..5c53ade1 100644 --- a/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc +++ b/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc @@ -1231,10 +1231,10 @@ void XPDFCore::runCommand(GString *cmdFmt, GString *arg) { //------------------------------------------------------------------------ -// tqfind +// find //------------------------------------------------------------------------ -void XPDFCore::tqfind(char *s) { +void XPDFCore::find(char *s) { Unicode *u; TextOutputDev *textOut; int xMin, yMin, xMax, yMax; diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFCore.h b/filters/kword/pdf/xpdf/xpdf/XPDFCore.h index 4c250704..adc7f507 100644 --- a/filters/kword/pdf/xpdf/xpdf/XPDFCore.h +++ b/filters/kword/pdf/xpdf/xpdf/XPDFCore.h @@ -142,9 +142,9 @@ public: void doAction(LinkAction *action); - //----- tqfind + //----- find - void tqfind(char *s); + void find(char *s); //----- simple modal dialogs diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc index cf2ea6d0..a75830b8 100644 --- a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc +++ b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc @@ -690,7 +690,7 @@ void XPDFViewer::initWindow() { zoomMenu = XmCreateOptionMenu(toolBar, "zoomMenu", args, n); XtManageChild(zoomMenu); - // tqfind/print/about buttons + // find/print/about buttons n = 0; XtSetArg(args[n], XmNleftAttachment, XmATTACH_WIDGET); ++n; XtSetArg(args[n], XmNleftWidget, zoomMenu); ++n; @@ -698,7 +698,7 @@ void XPDFViewer::initWindow() { XtSetArg(args[n], XmNbottomAttachment, XmATTACH_FORM); ++n; XtSetArg(args[n], XmNmarginWidth, 6); ++n; XtSetArg(args[n], XmNlabelString, emptyString); ++n; - findBtn = XmCreatePushButton(toolBar, "tqfind", args, n); + findBtn = XmCreatePushButton(toolBar, "find", args, n); XtManageChild(findBtn); XtAddCallback(findBtn, XmNactivateCallback, &findCbk, (XtPointer)this); @@ -1741,7 +1741,7 @@ void XPDFViewer::openOkCbk(Widget widget, XtPointer ptr, } //------------------------------------------------------------------------ -// GUI code: "tqfind" dialog +// GUI code: "find" dialog //------------------------------------------------------------------------ void XPDFViewer::initFindDialog() { @@ -1780,7 +1780,7 @@ void XPDFViewer::initFindDialog() { findText = XmCreateTextField(row1, "text", args, n); XtManageChild(findText); - //----- "tqfind" and "close" buttons + //----- "find" and "close" buttons n = 0; XtSetArg(args[n], XmNtopAttachment, XmATTACH_WIDGET); ++n; XtSetArg(args[n], XmNtopWidget, row1); ++n; @@ -1816,7 +1816,7 @@ void XPDFViewer::findFindCbk(Widget widget, XtPointer ptr, XtPointer callData) { XPDFViewer *viewer = (XPDFViewer *)ptr; - viewer->core->tqfind(XmTextFieldGetString(viewer->findText)); + viewer->core->find(XmTextFieldGetString(viewer->findText)); } void XPDFViewer::findCloseCbk(Widget widget, XtPointer ptr, diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.h b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.h index df606395..b9b0b2da 100644 --- a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.h +++ b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.h @@ -139,7 +139,7 @@ private: static void openOkCbk(Widget widget, XtPointer ptr, XtPointer callData); - //----- GUI code: "tqfind" dialog + //----- GUI code: "find" dialog void initFindDialog(); static void findFindCbk(Widget widget, XtPointer ptr, XtPointer callData); diff --git a/filters/kword/rtf/export/ExportFilter.cc b/filters/kword/rtf/export/ExportFilter.cc index 67df3fd1..2fa566fa 100644 --- a/filters/kword/rtf/export/ExportFilter.cc +++ b/filters/kword/rtf/export/ExportFilter.cc @@ -200,7 +200,7 @@ TQString RTFWorker::makeImage(const FrameAnchor& anchor) kdDebug(30515) << "RTFWorker::makeImage" << endl << anchor.picture.koStoreName << endl; - const int pos=strImageName.tqfindRev('.'); + const int pos=strImageName.findRev('.'); if(pos!=-1) strExt = strImageName.mid(pos+1).lower(); TQString strTag; @@ -345,9 +345,9 @@ TQString RTFWorker::formatTextParagraph(const TQString& strText, // Replace line feeds by forced line breaks int pos; TQString strBr("\\line "); - while ((pos=strEscaped.tqfind(TQChar(10)))>-1) + while ((pos=strEscaped.find(TQChar(10)))>-1) { - strEscaped.tqreplace(pos,1,strBr); + strEscaped.replace(pos,1,strBr); } str+=strEscaped; @@ -609,26 +609,26 @@ TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, // KLocale's key differ from KWord // Date - key.tqreplace( "%Y", "yyyy" ); // Year 4 digits - key.tqreplace( "%y", "yy" ); // Year 2 digits - key.tqreplace( "%n", "M" ); // Month 1 digit - key.tqreplace( "%m", "MM" ); // Month 2 digits - key.tqreplace( "%e", "d" ); // Day 1 digit - key.tqreplace( "%d", "dd" ); // Day 2 digits - key.tqreplace( "%b", "MMM" ); // Month 3 letters - key.tqreplace( "%B", "MMMM" ); // Month all letters - key.tqreplace( "%a", "ddd" ); // Day 3 letters - key.tqreplace( "%A", "dddd" ); // Day all letters + key.replace( "%Y", "yyyy" ); // Year 4 digits + key.replace( "%y", "yy" ); // Year 2 digits + key.replace( "%n", "M" ); // Month 1 digit + key.replace( "%m", "MM" ); // Month 2 digits + key.replace( "%e", "d" ); // Day 1 digit + key.replace( "%d", "dd" ); // Day 2 digits + key.replace( "%b", "MMM" ); // Month 3 letters + key.replace( "%B", "MMMM" ); // Month all letters + key.replace( "%a", "ddd" ); // Day 3 letters + key.replace( "%A", "dddd" ); // Day all letters // 12h - key.tqreplace( "%p", "am/pm" ); // AM/PM (KLocale knows it only lower case) - key.tqreplace( "%I", "hh" ); // 12 hour 2 digits - key.tqreplace( "%l", "h" ); // 12 hour 1 digits + key.replace( "%p", "am/pm" ); // AM/PM (KLocale knows it only lower case) + key.replace( "%I", "hh" ); // 12 hour 2 digits + key.replace( "%l", "h" ); // 12 hour 1 digits // 24h - key.tqreplace( "%H", "HH" ); // 24 hour 2 digits - key.tqreplace( "%k", "H" ); // 24 hour 1 digit + key.replace( "%H", "HH" ); // 24 hour 2 digits + key.replace( "%k", "H" ); // 24 hour 1 digit // Other times - key.tqreplace( "%M", "mm" ); // minute 2 digits (KLocale knows it with 2 digits) - key.tqreplace( "%S", "ss" ); // second 2 digits (KLocale knows it with 2 digits) + key.replace( "%M", "mm" ); // minute 2 digits (KLocale knows it with 2 digits) + key.replace( "%S", "ss" ); // second 2 digits (KLocale knows it with 2 digits) kdDebug(30515) << "Locale date in RTF format: " << key << endl; } @@ -638,18 +638,18 @@ TQString RTFWorker::ProcessParagraphData ( const TQString ¶Text, if (regexp.search(key)!=-1) { // 12h - key.tqreplace("ap","am/pm"); - key.tqreplace("AP","AM/PM"); + key.replace("ap","am/pm"); + key.replace("AP","AM/PM"); } else { //24h - key.tqreplace('h','H'); // MS Word uses H for 24hour times + key.replace('h','H'); // MS Word uses H for 24hour times } // MS Word do not know possesive months - key.tqreplace("PPP","MMM"); - key.tqreplace("PPPP","MMMM"); - key.tqreplace("zzz","000"); // replace microseconds by 000 + key.replace("PPP","MMM"); + key.replace("PPPP","MMMM"); + key.replace("zzz","000"); // replace microseconds by 000 kdDebug(30515) << "New format: " << key << endl; content += "\\@ \""; content += key; @@ -954,9 +954,9 @@ void RTFWorker::writeFontData(void) { const TQString strLower( (*it).lower() ); *m_streamOut << "{\\f" << count; - if ( (strLower.tqfind("symbol")>-1) || (strLower.tqfind("dingbat")>-1) ) + if ( (strLower.find("symbol")>-1) || (strLower.find("dingbat")>-1) ) *m_streamOut << "\\ftech"; - else if ( (strLower.tqfind("script")>-1) ) + else if ( (strLower.find("script")>-1) ) *m_streamOut << "\\fscript"; #if 1 diff --git a/filters/kword/rtf/import/rtfimport.cpp b/filters/kword/rtf/import/rtfimport.cpp index bb17d532..2526a6b0 100644 --- a/filters/kword/rtf/import/rtfimport.cpp +++ b/filters/kword/rtf/import/rtfimport.cpp @@ -1,4 +1,4 @@ -// kate: space-indent on; indent-width 4; tqreplace-tabs off; +// kate: space-indent on; indent-width 4; replace-tabs off; /* This file is part of the KDE project Copyright (C) 2001 Ewald Snel <ewald@rambo.its.tudelft.nl> @@ -1347,7 +1347,7 @@ void RTFImport::parseFontTable( RTFProperty * ) qFont.setStyleHint( font.tqstyleHint ); for(;!qFont.exactMatch();) { - int space=font.name.tqfindRev(' ', font.name.length()); + int space=font.name.findRev(' ', font.name.length()); if(space==-1) break; font.name.truncate(space); @@ -1571,7 +1571,7 @@ void RTFImport::addImportedPicture( const TQString& rawFileName ) } TQString slashPath( rawFileName ); - slashPath.tqreplace('\\','/'); // Replace directory separators. + slashPath.replace('\\','/'); // Replace directory separators. // ### TODO: what with MS-DOS absolute paths? (Will only work for KOffice on Win32) TQFileInfo info; info.setFile( inFileName ); @@ -1801,10 +1801,10 @@ void RTFImport::parseField( RTFProperty * ) } TQString format(regexp.cap(1)); kdDebug(30515) << "Date/time field format: " << format << endl; - format.tqreplace("am/pm", "ap"); - format.tqreplace("a/p", "ap"); // Approximation - format.tqreplace("AM/PM", "AP"); - format.tqreplace("A/P", "AP"); // Approximation + format.replace("am/pm", "ap"); + format.replace("a/p", "ap"); // Approximation + format.replace("AM/PM", "AP"); + format.replace("A/P", "AP"); // Approximation format.remove("'"); // KWord 1.3 cannot protect text in date/time addDateTime( format, (fieldName == "DATE"), fldfmt ); } @@ -2110,7 +2110,7 @@ void RTFImport::addFormat( DomNode &node, const KWFormat& format, const RTFForma { node.addNode( "FONT" ); - if (fontTable.tqcontains( format.fmt.font )) + if (fontTable.contains( format.fmt.font )) { node.setAttribute( "name", fontTable[format.fmt.font] ); } @@ -2524,10 +2524,10 @@ void RTFImport::finishTable() // ### TODO: use ConstIterator for (uint k=0; k < row.cells.count(); k++) { - if (!cellx.tqcontains( row.cells[k].x )) + if (!cellx.contains( row.cells[k].x )) cellx << row.cells[k].x; } - if (!cellx.tqcontains( row.left )) + if (!cellx.contains( row.left )) { cellx << row.left; } @@ -2562,7 +2562,7 @@ void RTFImport::finishTable() { char buf[64]; int x2 = row.cells[k].x; - int col = cellx.tqfindIndex( x1 ); + int col = cellx.findIndex( x1 ); sprintf( buf, "Table %d Cell %d,%d", textState->table, i, col ); frameSets.addFrameSet( buf, 1, 0 ); @@ -2571,7 +2571,7 @@ void RTFImport::finishTable() frameSets.setAttribute( "row", (int)i ); frameSets.setAttribute( "col", col ); frameSets.setAttribute( "rows", 1 ); - frameSets.setAttribute( "cols", cellx.tqfindIndex( x2 ) - col ); + frameSets.setAttribute( "cols", cellx.findIndex( x2 ) - col ); frameSets.addFrame( x1, y1, x2, y2, (row.height < 0) ? 2 : 0, 1, 0 ); diff --git a/filters/kword/rtf/import/rtfimport_dom.cpp b/filters/kword/rtf/import/rtfimport_dom.cpp index 9794e088..95fa43fc 100644 --- a/filters/kword/rtf/import/rtfimport_dom.cpp +++ b/filters/kword/rtf/import/rtfimport_dom.cpp @@ -33,11 +33,11 @@ TQString CheckAndEscapeXmlText(const TQString& strText) const int test = ch.tqunicode(); // The i+= is for the additional characters - if (test == 38) { strReturn.tqreplace(i, 1, "&"); i+=4; } // & - else if (test == 60) { strReturn.tqreplace(i, 1, "<"); i+=3; } // < - else if (test == 62) { strReturn.tqreplace(i, 1, ">"); i+=3; } // > - else if (test == 34) { strReturn.tqreplace(i, 1, """); i+=5; } // " - else if (test == 39) { strReturn.tqreplace(i, 1, "'"); i+=5; } // ' + if (test == 38) { strReturn.replace(i, 1, "&"); i+=4; } // & + else if (test == 60) { strReturn.replace(i, 1, "<"); i+=3; } // < + else if (test == 62) { strReturn.replace(i, 1, ">"); i+=3; } // > + else if (test == 34) { strReturn.replace(i, 1, """); i+=5; } // " + else if (test == 39) { strReturn.replace(i, 1, "'"); i+=5; } // ' else if (test >= 32) continue; // Normal character (from space on) else if ((test == 9) || (test == 10) || (test == 13) ) continue; // Allowed control characters: TAB, LF, CR else @@ -47,7 +47,7 @@ TQString CheckAndEscapeXmlText(const TQString& strText) // - could be not supported encoding. // In any case, we must replace this character. kdDebug(30515) << "Control character in XML stream: " << test << endl; - strReturn.tqreplace(i, 1, '?'); // Replacement character + strReturn.replace(i, 1, '?'); // Replacement character } } diff --git a/filters/kword/wml/wmlimport.cc b/filters/kword/wml/wmlimport.cc index a9b5edc7..e44c10ae 100644 --- a/filters/kword/wml/wmlimport.cc +++ b/filters/kword/wml/wmlimport.cc @@ -167,9 +167,9 @@ bool WMLConverter::doParagraph( TQString atext, WMLFormatList formatList, // encode the text for XML-ness text = atext; - text.tqreplace( '&', "&" ); - text.tqreplace( '<', "<" ); - text.tqreplace( '>', ">" ); + text.replace( '&', "&" ); + text.replace( '<', "<" ); + text.replace( '>', ">" ); // formats, taken from formatList WMLFormatList::iterator it; diff --git a/filters/kword/wordperfect/import/kwordfilter.cpp b/filters/kword/wordperfect/import/kwordfilter.cpp index 56e91b33..de9246cc 100644 --- a/filters/kword/wordperfect/import/kwordfilter.cpp +++ b/filters/kword/wordperfect/import/kwordfilter.cpp @@ -282,11 +282,11 @@ KWordFilter::parse (const TQString & filename) // encode text for XML-ness // FIXME could be faster without TQRegExp - text.tqreplace( TQRegExp("&"), "&" ); - text.tqreplace( TQRegExp("<"), "<" ); - text.tqreplace( TQRegExp(">"), ">" ); - text.tqreplace( TQRegExp("\""), """ ); - text.tqreplace( TQRegExp("'"), "'" ); + text.replace( TQRegExp("&"), "&" ); + text.replace( TQRegExp("<"), "<" ); + text.replace( TQRegExp(">"), ">" ); + text.replace( TQRegExp("\""), """ ); + text.replace( TQRegExp("'"), "'" ); // construct the <PARAGRAPH> root.append( "<PARAGRAPH>\n" ); diff --git a/filters/olefilters/lib/klaola.cc b/filters/olefilters/lib/klaola.cc index 7db5d815..80f57f0f 100644 --- a/filters/olefilters/lib/klaola.cc +++ b/filters/olefilters/lib/klaola.cc @@ -130,7 +130,7 @@ bool KLaola::enterDir(const OLENode *dirHandle) { return false; } -const KLaola::NodeList KLaola::tqfind(const TQString &name, bool onlyCurrentDir) { +const KLaola::NodeList KLaola::find(const TQString &name, bool onlyCurrentDir) { OLENode *node; NodeList ret; diff --git a/filters/olefilters/lib/klaola.h b/filters/olefilters/lib/klaola.h index b292716f..fd44aa56 100644 --- a/filters/olefilters/lib/klaola.h +++ b/filters/olefilters/lib/klaola.h @@ -73,7 +73,7 @@ public: NodeList parseRootDir(); NodeList parseCurrentDir(); const NodeList currentPath() const; - const NodeList tqfind(const TQString &name, bool onlyCurrentDir=false); + const NodeList find(const TQString &name, bool onlyCurrentDir=false); bool enterDir(const OLENode *node); bool leaveDir(); diff --git a/filters/olefilters/olefilter.cc b/filters/olefilters/olefilter.cc index ff40cd72..9d1ded51 100644 --- a/filters/olefilters/olefilter.cc +++ b/filters/olefilters/olefilter.cc @@ -226,7 +226,7 @@ void OLEFilter::slotSavePic( if(nameIN.isEmpty()) return; - TQMap<TQString, TQString>::ConstIterator it = imageMap.tqfind(nameIN); + TQMap<TQString, TQString>::ConstIterator it = imageMap.find(nameIN); if (it != imageMap.end()) // The key is already here - return the part id. @@ -284,7 +284,7 @@ void OLEFilter::slotGetStream(const TQString &name, myFile &stream) { KLaola::NodeList handle; - handle=docfile->tqfind(name, true); // search only in current dir! + handle=docfile->find(name, true); // search only in current dir! if (handle.count()==1) stream=docfile->stream(handle.at(0)); @@ -348,22 +348,22 @@ void OLEFilter::convert( const TQCString& mimeTypeHint ) myFile main; KLaola::NodeList tmp; - tmp=docfile->tqfind("WordDocument", true); + tmp=docfile->find("WordDocument", true); if(tmp.count()==1) { // okay, not a dummy main=docfile->stream(tmp.at(0)); myFile table0, table1, data; - tmp=docfile->tqfind("0Table", true); + tmp=docfile->find("0Table", true); if(tmp.count()==1) table0=docfile->stream(tmp.at(0)); - tmp=docfile->tqfind("1Table", true); + tmp=docfile->find("1Table", true); if(tmp.count()==1) table1=docfile->stream(tmp.at(0)); - tmp=docfile->tqfind("Data", true); + tmp=docfile->find("Data", true); if(tmp.count()==1) data=docfile->stream(tmp.at(0)); @@ -380,11 +380,11 @@ void OLEFilter::convert( const TQCString& mimeTypeHint ) myFile workbook; KLaola::NodeList tmp; - tmp = docfile->tqfind( "Workbook", true ); + tmp = docfile->find( "Workbook", true ); if ( tmp.count() == 1 ) workbook = docfile->stream( tmp.at( 0 ) ); else { - tmp = docfile->tqfind( "Book", true ); + tmp = docfile->find( "Book", true ); if ( tmp.count() == 1 ) workbook = docfile->stream( tmp.at( 0 ) ); } @@ -398,23 +398,23 @@ void OLEFilter::convert( const TQCString& mimeTypeHint ) myFile main, currentUser, pictures, summary, documentSummary; KLaola::NodeList tmp; - tmp=docfile->tqfind("PowerPoint Document", true); + tmp=docfile->find("PowerPoint Document", true); if(tmp.count()==1) main=docfile->stream(tmp.at(0)); - tmp=docfile->tqfind("Current User", true); + tmp=docfile->find("Current User", true); if(tmp.count()==1) currentUser=docfile->stream(tmp.at(0)); - tmp=docfile->tqfind("Pictures", true); + tmp=docfile->find("Pictures", true); if(tmp.count()==1) pictures=docfile->stream(tmp.at(0)); - tmp=docfile->tqfind("SummaryInformation", true); + tmp=docfile->find("SummaryInformation", true); if(tmp.count()==1) summary=docfile->stream(tmp.at(0)); - tmp=docfile->tqfind("DocumentSummaryInformation", true); + tmp=docfile->find("DocumentSummaryInformation", true); if(tmp.count()==1) documentSummary=docfile->stream(tmp.at(0)); @@ -426,7 +426,7 @@ void OLEFilter::convert( const TQCString& mimeTypeHint ) myFile prvText; KLaola::NodeList tmp; - tmp = docfile->tqfind( "PrvText", true ); + tmp = docfile->find( "PrvText", true ); if( tmp.count() == 1 ) prvText = docfile->stream( tmp.at( 0 ) ); myFilter = new HancomWordFilter( prvText ); diff --git a/filters/olefilters/powerpoint97/powerpoint.cc b/filters/olefilters/powerpoint97/powerpoint.cc index b240a690..b53acfc5 100644 --- a/filters/olefilters/powerpoint97/powerpoint.cc +++ b/filters/olefilters/powerpoint97/powerpoint.cc @@ -724,7 +724,7 @@ void Powerpoint::opPersistPtrIncrementalBlock( // Create a record of this persistent reference. - if (m_persistentReferences.end() == m_persistentReferences.tqfind(reference)) + if (m_persistentReferences.end() == m_persistentReferences.find(reference)) { if(reference < 5) { @@ -1287,7 +1287,7 @@ void Powerpoint::walkRecord(TQ_UINT32 mainStreamOffset) void Powerpoint::walkReference(TQ_UINT32 reference) { - if (m_persistentReferences.end() == m_persistentReferences.tqfind(reference)) + if (m_persistentReferences.end() == m_persistentReferences.find(reference)) { kdError(s_area) << "cannot find reference: " << reference << endl; } diff --git a/filters/olefilters/powerpoint97/pptxml.cc b/filters/olefilters/powerpoint97/pptxml.cc index 7c6a45fe..96a03567 100644 --- a/filters/olefilters/powerpoint97/pptxml.cc +++ b/filters/olefilters/powerpoint97/pptxml.cc @@ -64,15 +64,15 @@ void PptXml::encode(TQString &text) // accidentally converting user text into one of the other escape // sequences. - text.tqreplace('&', "&"); - text.tqreplace('<', "<"); - text.tqreplace('>', ">"); // Needed to avoid ]]> + text.replace('&', "&"); + text.replace('<', "<"); + text.replace('>', ">"); // Needed to avoid ]]> // Strictly, there is no need to encode " or ', but we do so to allow // them to co-exist! - text.tqreplace('"', """); - text.tqreplace('\'', "'"); + text.replace('"', """); + text.replace('\'', "'"); } const TQString PptXml::getXml() const diff --git a/filters/xsltfilter/export/xsltexportdia.cc b/filters/xsltfilter/export/xsltexportdia.cc index 2da253aa..b77e9128 100644 --- a/filters/xsltfilter/export/xsltexportdia.cc +++ b/filters/xsltfilter/export/xsltexportdia.cc @@ -97,7 +97,7 @@ XSLTExportDia::XSLTExportDia(KoStoreDevice* in, const TQCString &format, TQWidge name = tempList.last(); tempList.pop_back(); kdDebug() << name << " " << file << endl; - if(!_namesList.tqcontains(name) && file == "main.xsl") + if(!_namesList.contains(name) && file == "main.xsl") { _filesList.append(file); _namesList.append(name); @@ -210,7 +210,7 @@ void XSLTExportDia::okSlot() TQString stylesheet = _currentFile.directory() + TQDir::separator() + _currentFile.fileName(); /* Add the current file in the recent list if is not and save the list. */ - if(_recentList.tqcontains(stylesheet) == 0) + if(_recentList.contains(stylesheet) == 0) { kdDebug() << "Style sheet add to recent list" << endl; /* Remove the older stylesheet used */ diff --git a/filters/xsltfilter/import/xsltimportdia.cc b/filters/xsltfilter/import/xsltimportdia.cc index a72b2b1c..0d55c309 100644 --- a/filters/xsltfilter/import/xsltimportdia.cc +++ b/filters/xsltfilter/import/xsltimportdia.cc @@ -92,7 +92,7 @@ XSLTImportDia::XSLTImportDia(KoStore* out, const TQCString &format, TQWidget* tq name = tempList.last(); tempList.pop_back(); kdDebug() << name << " " << file << endl; - if(!_namesList.tqcontains(name) && file == "main.xsl") + if(!_namesList.contains(name) && file == "main.xsl") { _filesList.append(file); _namesList.append(name); @@ -209,7 +209,7 @@ void XSLTImportDia::okSlot() TQString stylesheet = _currentFile.directory() + "/" + _currentFile.fileName(); /* Add the current file in the recent list if is not and save the list. */ - if(_recentList.tqcontains(stylesheet) == 0) + if(_recentList.contains(stylesheet) == 0) { kdDebug() << "Style sheet add to recent list" << endl; /* Remove the older stylesheet used */ diff --git a/karbon/commands/vcommand.cc b/karbon/commands/vcommand.cc index da08d94f..a793115d 100644 --- a/karbon/commands/vcommand.cc +++ b/karbon/commands/vcommand.cc @@ -82,7 +82,7 @@ VCommandHistory::addCommand( VCommand* command, bool execute ) } m_commands.append( command ); - kdDebug(38000) << "History: new command: " << m_commands.tqfindRef( command ) << endl; + kdDebug(38000) << "History: new command: " << m_commands.findRef( command ) << endl; if( execute ) { @@ -176,7 +176,7 @@ VCommandHistory::redo() void VCommandHistory::undo( VCommand* command ) { - if( ( m_commands.tqfindRef( command ) == -1 ) || ( !command->success() ) ) + if( ( m_commands.findRef( command ) == -1 ) || ( !command->success() ) ) return; command->unexecute(); @@ -192,7 +192,7 @@ VCommandHistory::undo( VCommand* command ) void VCommandHistory::redo( VCommand* command ) { - if( ( m_commands.tqfindRef( command ) == -1 ) || ( command->success() ) ) + if( ( m_commands.findRef( command ) == -1 ) || ( command->success() ) ) return; command->execute(); @@ -210,7 +210,7 @@ VCommandHistory::undoAllTo( VCommand* command ) { int to; - if( ( to = m_commands.tqfindRef( command ) ) == -1 ) + if( ( to = m_commands.findRef( command ) ) == -1 ) return; int i = m_commands.count() - 1; @@ -239,7 +239,7 @@ VCommandHistory::redoAllTo( VCommand* command ) { int to; - if( ( to = m_commands.tqfindRef( command ) ) == -1 ) + if( ( to = m_commands.findRef( command ) ) == -1 ) return; int i = 0; diff --git a/karbon/commands/vreplacingcmd.h b/karbon/commands/vreplacingcmd.h index a4f478e3..727dc806 100644 --- a/karbon/commands/vreplacingcmd.h +++ b/karbon/commands/vreplacingcmd.h @@ -29,7 +29,7 @@ class VSelection; /** * VReplacingCmd is a generic command. Derive from it if you plan to do complex - * transformations upon selected objects which make it necessary to tqreplace + * transformations upon selected objects which make it necessary to replace * each object as a whole with a new object. */ diff --git a/karbon/core/vcomposite.cc b/karbon/core/vcomposite.cc index d8eaf027..7872df5f 100644 --- a/karbon/core/vcomposite.cc +++ b/karbon/core/vcomposite.cc @@ -264,7 +264,7 @@ bool VPath::pointIsInside( const KoPoint& p ) const { // Check if point is inside boundingbox. - if( !boundingBox().tqcontains( p ) ) + if( !boundingBox().contains( p ) ) return false; @@ -422,7 +422,7 @@ VPath::transformByViewbox( const TQDomElement &element, TQString viewbox ) if( ! viewbox.isEmpty() ) { // allow for viewbox def with ',' or whitespace - TQStringList points = TQStringList::split( ' ', viewbox.tqreplace( ',', ' ' ).simplifyWhiteSpace() ); + TQStringList points = TQStringList::split( ' ', viewbox.replace( ',', ' ' ).simplifyWhiteSpace() ); double w = KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "width", TQString() ) ); double h = KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "height", TQString() ) ); diff --git a/karbon/core/vdocument.cc b/karbon/core/vdocument.cc index 0384141b..2de51bf1 100644 --- a/karbon/core/vdocument.cc +++ b/karbon/core/vdocument.cc @@ -151,20 +151,20 @@ VDocument::removeLayer( VLayer* layer ) bool VDocument::canRaiseLayer( VLayer* layer ) { - int pos = m_layers.tqfind( layer ); + int pos = m_layers.find( layer ); return (pos != int( m_layers.count() ) - 1 && pos >= 0 ); } bool VDocument::canLowerLayer( VLayer* layer ) { - int pos = m_layers.tqfind( layer ); + int pos = m_layers.find( layer ); return (pos>0); } void VDocument::raiseLayer( VLayer* layer ) { - int pos = m_layers.tqfind( layer ); + int pos = m_layers.find( layer ); if( pos != int( m_layers.count() ) - 1 && pos >= 0 ) { VLayer* layer = m_layers.take( pos ); @@ -175,7 +175,7 @@ VDocument::raiseLayer( VLayer* layer ) void VDocument::lowerLayer( VLayer* layer ) { - int pos = m_layers.tqfind( layer ); + int pos = m_layers.find( layer ); if ( pos > 0 ) { VLayer* layer = m_layers.take( pos ); @@ -186,13 +186,13 @@ VDocument::lowerLayer( VLayer* layer ) int VDocument::layerPos( VLayer* layer ) { - return m_layers.tqfind( layer ); + return m_layers.find( layer ); } // VDocument::layerPos void VDocument::setActiveLayer( VLayer* layer ) { - if ( m_layers.tqfind( layer ) != -1 ) + if ( m_layers.find( layer ) != -1 ) m_activeLayer = layer; } // VDocument::setActiveLayer @@ -318,6 +318,6 @@ VDocument::accept( VVisitor& visitor ) TQString VDocument::objectName( const VObject *obj ) const { - TQMap<const VObject *, TQString>::ConstIterator it = m_objectNames.tqfind( obj ); + TQMap<const VObject *, TQString>::ConstIterator it = m_objectNames.find( obj ); return it == m_objectNames.end() ? 0L : it.data(); } diff --git a/karbon/core/vgroup.cc b/karbon/core/vgroup.cc index ab2ec328..35f3991e 100644 --- a/karbon/core/vgroup.cc +++ b/karbon/core/vgroup.cc @@ -383,7 +383,7 @@ VGroup::insertInfrontOf( VObject* newObject, VObject* oldObject ) { newObject->setParent( this ); - m_objects.insert( m_objects.tqfind( oldObject ), newObject ); + m_objects.insert( m_objects.find( oldObject ), newObject ); invalidateBoundingBox(); } diff --git a/karbon/core/vlayer.cc b/karbon/core/vlayer.cc index 49c3bc11..dddfe6ce 100644 --- a/karbon/core/vlayer.cc +++ b/karbon/core/vlayer.cc @@ -111,7 +111,7 @@ VLayer::downwards( const VObject& object ) { if( m_objects.getFirst() == &object ) return; - int index = m_objects.tqfind( &object ); + int index = m_objects.find( &object ); bool bLast = m_objects.getLast() == &object; m_objects.remove( index ); diff --git a/karbon/core/vpath.cc b/karbon/core/vpath.cc index 4f279cd7..1442d90c 100644 --- a/karbon/core/vpath.cc +++ b/karbon/core/vpath.cc @@ -416,7 +416,7 @@ bool VSubpath::pointIsInside( const KoPoint& p ) const { // If the point is not inside the boundingbox, it cannot be inside the path either. - if( !boundingBox().tqcontains( p ) ) + if( !boundingBox().contains( p ) ) return false; // First check if the point is inside the knot polygon (beziers are treated diff --git a/karbon/core/vselection.cc b/karbon/core/vselection.cc index b7cc2167..77809ac5 100644 --- a/karbon/core/vselection.cc +++ b/karbon/core/vselection.cc @@ -135,7 +135,7 @@ VSelection::append( VObject* object ) // only append if item is not deleted or not already in list if( object->state() != deleted ) { - if( ! m_objects.tqcontainsRef( object ) ) + if( ! m_objects.containsRef( object ) ) m_objects.append( object ); object->setState( selected ); invalidateBoundingBox(); @@ -295,7 +295,7 @@ VSelection::handleNode( const KoPoint &point ) const { for( uint i = node_lt; i <= node_rb; ++i ) { - if( m_handleRect[i].tqcontains( point ) ) + if( m_handleRect[i].contains( point ) ) return static_cast<VHandleNode>( i ); } diff --git a/karbon/core/vtext.cc b/karbon/core/vtext.cc index 9f215b59..e73445ee 100644 --- a/karbon/core/vtext.cc +++ b/karbon/core/vtext.cc @@ -660,7 +660,7 @@ VText::buildRequest( TQString family, int weight, int slant, double size, int &i { // Strip those stupid [Xft or whatever]... int pos; - if( ( pos = family.tqfind( '[' ) ) ) + if( ( pos = family.find( '[' ) ) ) family = family.left( pos ); // Use FontConfig to locate & select fonts and use FreeType2 to open them diff --git a/karbon/dockers/vdocumentdocker.cc b/karbon/dockers/vdocumentdocker.cc index a0cba13b..23e4243c 100644 --- a/karbon/dockers/vdocumentdocker.cc +++ b/karbon/dockers/vdocumentdocker.cc @@ -110,7 +110,7 @@ VDocumentPreview::eventFilter( TQObject* object, TQEvent* event ) m_lastPoint = m_firstPoint; KoPoint p3( m_firstPoint.x() / scaleFactor - xoffset, ( height() - m_firstPoint.y() ) / scaleFactor - yoffset ); - m_dragging = rect.tqcontains( p3 ); + m_dragging = rect.contains( p3 ); } else if( event->type() == TQEvent::MouseButtonRelease ) { @@ -144,7 +144,7 @@ VDocumentPreview::eventFilter( TQObject* object, TQEvent* event ) { KoPoint p3( mouseEvent->pos().x() / scaleFactor - xoffset, ( height() - mouseEvent->pos().y() ) / scaleFactor - yoffset ); - setCursor( rect.tqcontains( p3 ) ? TQCursor::SizeAllCursor : TQCursor( TQt::arrowCursor ) ); + setCursor( rect.contains( p3 ) ? TQCursor::SizeAllCursor : TQCursor( TQt::arrowCursor ) ); } } @@ -1014,7 +1014,7 @@ VLayersTab::removeDeletedObjectsFromList() { VGroup *group = dynamic_cast<VGroup*>( layerItem->layer() ); // check if object of item is still child of object of tqparent item - if( group && ! group->objects().tqcontains( it.current()->object() ) ) + if( group && ! group->objects().contains( it.current()->object() ) ) { layerItem->takeItem( it.current() ); delete it.current(); @@ -1028,7 +1028,7 @@ VLayersTab::removeDeletedObjectsFromList() { VGroup *group = dynamic_cast<VGroup*>( objectItem->object() ); // check if object of item is still child of object of tqparent item - if( group && ! group->objects().tqcontains( it.current()->object() ) ) + if( group && ! group->objects().contains( it.current()->object() ) ) { objectItem->takeItem( it.current() ); delete it.current(); diff --git a/karbon/plugins/roundcorners/roundcornersplugin.cc b/karbon/plugins/roundcorners/roundcornersplugin.cc index 39739e68..7003e510 100644 --- a/karbon/plugins/roundcorners/roundcornersplugin.cc +++ b/karbon/plugins/roundcorners/roundcornersplugin.cc @@ -102,7 +102,7 @@ VRoundCornersCmd::visitVSubpath( VSubpath& path ) return; // Note: we modiy segments from path. that doesn't hurt, since we - // tqreplace "path" with the temporary path "newPath" afterwards. + // replace "path" with the temporary path "newPath" afterwards. VSubpath newPath( 0L ); diff --git a/karbon/render/vkopainter.cc b/karbon/render/vkopainter.cc index 98ae826e..0ac9fd0c 100644 --- a/karbon/render/vkopainter.cc +++ b/karbon/render/vkopainter.cc @@ -293,25 +293,25 @@ VKoPainter::fillPath() if( m_index == 0 ) return; // find begin of last subpath - int tqfind = -1; + int find = -1; for( int i = m_index - 1; i >= 0; i-- ) { if( m_path[i].code == ART_MOVETO_OPEN || m_path[i].code == ART_MOVETO ) { - tqfind = i; + find = i; break; } } // for now, always close - if( tqfind != -1 && ( m_path[ tqfind ].x3 != m_path[ m_index - 1 ].x3 || - m_path[ tqfind ].y3 != m_path[ m_index - 1 ].y3 ) ) + if( find != -1 && ( m_path[ find ].x3 != m_path[ m_index - 1 ].x3 || + m_path[ find ].y3 != m_path[ m_index - 1 ].y3 ) ) { ensureSpace( m_index + 1 ); m_path[ m_index ].code = ART_LINETO; - m_path[ m_index ].x3 = m_path[ tqfind ].x3; - m_path[ m_index ].y3 = m_path[ tqfind ].y3; + m_path[ m_index ].x3 = m_path[ find ].x3; + m_path[ m_index ].y3 = m_path[ find ].y3; m_index++; m_path[ m_index ].code = ART_END; diff --git a/karbon/shapes/vpolygon.cc b/karbon/shapes/vpolygon.cc index 724b228f..47f07a68 100644 --- a/karbon/shapes/vpolygon.cc +++ b/karbon/shapes/vpolygon.cc @@ -48,7 +48,7 @@ VPolygon::init() bool bFirst = true; TQString points = m_points.simplifyWhiteSpace(); - points.tqreplace( ',', ' ' ); + points.replace( ',', ' ' ); points.remove( '\r' ); points.remove( '\n' ); TQStringList pointList = TQStringList::split( ' ', points ); diff --git a/karbon/shapes/vpolyline.cc b/karbon/shapes/vpolyline.cc index de5d15f4..85faa0f7 100644 --- a/karbon/shapes/vpolyline.cc +++ b/karbon/shapes/vpolyline.cc @@ -52,7 +52,7 @@ VPolyline::init() bool bFirst = true; TQString points = m_points.simplifyWhiteSpace(); - points.tqreplace( ',', ' ' ); + points.replace( ',', ' ' ); points.remove( '\r' ); points.remove( '\n' ); TQStringList pointList = TQStringList::split( ' ', points ); diff --git a/karbon/tools/vcurvefit.cc b/karbon/tools/vcurvefit.cc index fee361c2..40d7b7e3 100644 --- a/karbon/tools/vcurvefit.cc +++ b/karbon/tools/vcurvefit.cc @@ -425,7 +425,7 @@ static double NewtonRaphsonRootFind(KoPoint *Q,KoPoint P,double u) /* * Reparameterize: - * Given set of points and their parameterization, try to tqfind + * Given set of points and their parameterization, try to find * a better parameterization. * */ diff --git a/karbon/tools/vgradienttool.cc b/karbon/tools/vgradienttool.cc index 7254e835..95752f52 100644 --- a/karbon/tools/vgradienttool.cc +++ b/karbon/tools/vgradienttool.cc @@ -289,16 +289,16 @@ VGradientTool::mouseButtonPress() m_current = first(); // set the apropriate editing state - if( m_center.tqcontains( m_current ) && shiftPressed()) + if( m_center.contains( m_current ) && shiftPressed()) { m_state = moveCenter; } - else if( m_origin.tqcontains( m_current ) ) + else if( m_origin.contains( m_current ) ) { m_state = moveOrigin; m_fixed = m_vector.center(); } - else if( m_vector.tqcontains( m_current ) ) + else if( m_vector.contains( m_current ) ) { m_state = moveVector; m_fixed = m_origin.center(); @@ -489,7 +489,7 @@ VGradientTool::setCursor() const if( !view() ) return; // set a different cursor if mouse is inside the handle rects - if( m_origin.tqcontains( last() ) || m_vector.tqcontains( last() ) || m_center.tqcontains( last() ) ) + if( m_origin.contains( last() ) || m_vector.contains( last() ) || m_center.contains( last() ) ) view()->setCursor( TQCursor( TQt::SizeAllCursor ) ); else view()->setCursor( TQCursor( TQt::arrowCursor ) ); diff --git a/karbon/tools/vpatterntool.cc b/karbon/tools/vpatterntool.cc index 1856672f..d522652c 100644 --- a/karbon/tools/vpatterntool.cc +++ b/karbon/tools/vpatterntool.cc @@ -300,12 +300,12 @@ VPatternTool::mouseButtonPress() m_current = first(); // set the apropriate editing state - if( m_origin.tqcontains( m_current ) ) + if( m_origin.contains( m_current ) ) { m_state = moveOrigin; m_fixed = m_vector.center(); } - else if( m_vector.tqcontains( m_current ) ) + else if( m_vector.contains( m_current ) ) { m_state = moveVector; m_fixed = m_origin.center(); @@ -472,7 +472,7 @@ VPatternTool::setCursor() const if( !view() ) return; // set a different cursor if mouse is inside the handle rects - if( m_origin.tqcontains( last() ) || m_vector.tqcontains( last() ) ) + if( m_origin.contains( last() ) || m_vector.contains( last() ) ) view()->setCursor( TQCursor( TQt::SizeAllCursor ) ); else view()->setCursor( TQCursor( TQt::arrowCursor ) ); diff --git a/karbon/tools/vselectnodestool.cc b/karbon/tools/vselectnodestool.cc index 747357de..7ef25c5e 100644 --- a/karbon/tools/vselectnodestool.cc +++ b/karbon/tools/vselectnodestool.cc @@ -120,7 +120,7 @@ VSelectNodesTool::setCursor() const { VSegment* seg = segments.at( 0 ); for( int i = 0; i < seg->degree(); ++i ) - if( seg->pointIsSelected( i ) && selrect.tqcontains( seg->point( i ) ) ) + if( seg->pointIsSelected( i ) && selrect.contains( seg->point( i ) ) ) { view()->setCursor( VCursor::needleMoveArrow() ); break; @@ -158,16 +158,16 @@ VSelectNodesTool::mouseButtonPress() // allow moving bezier points only if one of the bezier points is within the selection rect // and no neighboring knot is selected - if( segments.count() == 1 && ! selrect.tqcontains( seg->knot() ) && ! seg->knotIsSelected() + if( segments.count() == 1 && ! selrect.contains( seg->knot() ) && ! seg->knotIsSelected() && ( prev && ! prev->knotIsSelected() ) ) { - if( selrect.tqcontains( seg->point( 1 ) ) ) + if( selrect.contains( seg->point( 1 ) ) ) { m_state = movingbezier1; if( next ) next->selectPoint( 0, false ); } - else if( selrect.tqcontains( seg->point( 0 ) ) ) + else if( selrect.contains( seg->point( 0 ) ) ) { m_state = movingbezier2; if( prev ) @@ -180,7 +180,7 @@ VSelectNodesTool::mouseButtonPress() { for( int i = 0; i < seg->degree(); ++i ) { - if( seg->pointIsSelected( i ) && selrect.tqcontains( seg->point( i ) ) ) + if( seg->pointIsSelected( i ) && selrect.contains( seg->point( i ) ) ) { m_state = moving; break; @@ -197,7 +197,7 @@ VSelectNodesTool::mouseButtonPress() { for( int i = 0; i < seg->degree(); ++i ) { - if( selrect.tqcontains( seg->point( i ) ) ) + if( selrect.contains( seg->point( i ) ) ) { KoPoint vDist = seg->point( i ) - m_current; double dist = vDist.x()*vDist.x() + vDist.y()*vDist.y(); diff --git a/karbon/tools/vselecttool.cc b/karbon/tools/vselecttool.cc index 751c0ebe..e29e1afb 100644 --- a/karbon/tools/vselecttool.cc +++ b/karbon/tools/vselecttool.cc @@ -183,7 +183,7 @@ VSelectTool::mouseButtonPress() if( m_activeNode != node_none ) m_state = scaling; - else if( rect.tqcontains( m_current ) && m_state == normal ) + else if( rect.contains( m_current ) && m_state == normal ) m_state = moving; recalc(); @@ -274,7 +274,7 @@ VSelectTool::mouseButtonRelease() VObjectListIterator it( newSelection ); for( ; it.current(); ++it ) { - if( oldSelection.tqcontains( it.current() ) ) + if( oldSelection.contains( it.current() ) ) lastMatched = it.current(); } @@ -282,7 +282,7 @@ VSelectTool::mouseButtonRelease() // - none is selected // - the stack's bottom object was the last selected object if( lastMatched && lastMatched != newSelection.first() ) - view()->part()->document().selection()->append( newSelection.at( newSelection.tqfind( lastMatched )-1 ) ); + view()->part()->document().selection()->append( newSelection.at( newSelection.find( lastMatched )-1 ) ); else view()->part()->document().selection()->append( newSelection.last() ); } diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc index fda8e9fe..67776ac3 100644 --- a/karbon/tools/vtexttool.cc +++ b/karbon/tools/vtexttool.cc @@ -678,7 +678,7 @@ VTextTool::mouseButtonRelease() VObject* selObj = selection->objects().getFirst(); // initialize dialog with single selected object - if( selection->objects().count() == 1 && selObj->boundingBox().tqcontains( last() ) ) + if( selection->objects().count() == 1 && selObj->boundingBox().contains( last() ) ) m_optionsWidget->initialize( *selObj ); else { @@ -691,7 +691,7 @@ VTextTool::mouseButtonRelease() return; } - if( dynamic_cast<VText*>( selObj ) && selObj->boundingBox().tqcontains( last() ) ) + if( dynamic_cast<VText*>( selObj ) && selObj->boundingBox().contains( last() ) ) m_optionsWidget->setCaption( i18n( "Change Text") ); else m_optionsWidget->setCaption( i18n( "Insert Text") ); diff --git a/karbon/visitors/vselectnodes.cc b/karbon/visitors/vselectnodes.cc index 28789956..6d297c96 100644 --- a/karbon/visitors/vselectnodes.cc +++ b/karbon/visitors/vselectnodes.cc @@ -54,7 +54,7 @@ VSelectNodes::visitVSubpath( VSubpath& path ) // select all control points inside the selection rect for( int i = 0; i < curr->degree()-1; ++i ) { - if( m_rect.tqcontains( curr->point( i ) ) ) + if( m_rect.contains( curr->point( i ) ) ) { curr->selectPoint( i, m_select ); setSuccess(); @@ -81,7 +81,7 @@ VSelectNodes::visitVSubpath( VSubpath& path ) } } - if( m_rect.tqcontains( curr->knot() ) ) + if( m_rect.contains( curr->knot() ) ) { curr->selectKnot( m_select ); // select the last control point before the knot, if segment is curve @@ -122,7 +122,7 @@ VTestNodes::visitVSubpath( VSubpath& path ) while( path.current() ) { for( int i = 0; i < path.current()->degree(); i++ ) - if( m_rect.tqcontains( path.current()->point( i ) ) ) //&& + if( m_rect.contains( path.current()->point( i ) ) ) //&& //path.current()->pointIsSelected( i ) ) { m_segments.append( path.current() ); diff --git a/karbon/visitors/vselectobjects.cc b/karbon/visitors/vselectobjects.cc index d64900db..0a428c43 100644 --- a/karbon/visitors/vselectobjects.cc +++ b/karbon/visitors/vselectobjects.cc @@ -44,7 +44,7 @@ VSelectObjects::visitVPath( VPath& composite ) { // Check if composite is completely inside the selection rectangle. // This test should be the first test since it's the less expensive one. - if( m_rect.tqcontains( composite.boundingBox() ) ) + if( m_rect.contains( composite.boundingBox() ) ) { selected = true; } @@ -117,7 +117,7 @@ VSelectObjects::visitVPath( VPath& composite ) if( m_select ) { composite.setState( VObject::selected ); - if( ! m_selection.tqcontainsRef( &composite ) ) + if( ! m_selection.containsRef( &composite ) ) m_selection.append( &composite ); } else @@ -148,7 +148,7 @@ VSelectObjects::visitVObject( VObject& object ) if( m_rect.intersects( object.boundingBox() ) ) { object.setState( VObject::selected ); - if( ! m_selection.tqcontainsRef( &object ) ) + if( ! m_selection.containsRef( &object ) ) m_selection.append( &object ); setSuccess(); } @@ -168,7 +168,7 @@ VSelectObjects::visitVObject( VObject& object ) if( m_select ) { object.setState( VObject::selected ); - if( ! m_selection.tqcontainsRef( &object ) ) + if( ! m_selection.containsRef( &object ) ) m_selection.append( &object ); setSuccess(); } @@ -183,12 +183,12 @@ VSelectObjects::visitVObject( VObject& object ) // selection by point else { - if( object.boundingBox().tqcontains( m_point ) ) + if( object.boundingBox().contains( m_point ) ) { if( m_select ) { object.setState( VObject::selected ); - if( ! m_selection.tqcontainsRef( &object ) ) + if( ! m_selection.containsRef( &object ) ) m_selection.append( &object ); } else @@ -239,7 +239,7 @@ VSelectObjects::visitVText( VText& text ) kdDebug(38000) << "selected: " << itr.current() << endl; m_selection.remove( &c ); text.setState( VObject::selected ); - if( ! m_selection.tqcontainsRef( &text ) ) + if( ! m_selection.containsRef( &text ) ) m_selection.append( &text ); return; } diff --git a/karbon/vtoolcontroller.cc b/karbon/vtoolcontroller.cc index 902deb78..03cc9ee8 100644 --- a/karbon/vtoolcontroller.cc +++ b/karbon/vtoolcontroller.cc @@ -65,7 +65,7 @@ VToolController::setCurrentTool( VTool *tool ) void VToolController::registerTool( VTool *tool ) { - if( !m_tools.tqfind( tool->name() ) ) + if( !m_tools.find( tool->name() ) ) m_tools.insert( tool->name(), tool ); //kdDebug(38000) << "active tool : " << m_currentTool->name() << endl; } diff --git a/karbon/widgets/vgradientwidget.cc b/karbon/widgets/vgradientwidget.cc index 49410a35..49d7f053 100644 --- a/karbon/widgets/vgradientwidget.cc +++ b/karbon/widgets/vgradientwidget.cc @@ -174,7 +174,7 @@ void VGradientWidget::paintEvent( TQPaintEvent* ) void VGradientWidget::mousePressEvent( TQMouseEvent* e ) { - if( ! m_pntArea.tqcontains( e->x(), e->y() ) ) + if( ! m_pntArea.contains( e->x(), e->y() ) ) return; TQPtrList<VColorStop>& colorStops = m_gradient->m_colorStops; @@ -217,7 +217,7 @@ void VGradientWidget::mouseReleaseEvent( TQMouseEvent* e ) { if( e->button() == Qt::RightButton && currentPoint ) { - if( m_pntArea.tqcontains( e->x(), e->y() ) && ( currentPoint % 2 == 1 ) ) + if( m_pntArea.contains( e->x(), e->y() ) && ( currentPoint % 2 == 1 ) ) { int x = e->x() - m_pntArea.left(); // check if we are still above the actual ramp point @@ -235,7 +235,7 @@ void VGradientWidget::mouseReleaseEvent( TQMouseEvent* e ) void VGradientWidget::mouseDoubleClickEvent( TQMouseEvent* e ) { - if( ! m_pntArea.tqcontains( e->x(), e->y() ) ) + if( ! m_pntArea.contains( e->x(), e->y() ) ) return; if( e->button() != Qt::LeftButton ) diff --git a/kchart/csvimportdialog.cc b/kchart/csvimportdialog.cc index 248719eb..1330ee88 100644 --- a/kchart/csvimportdialog.cc +++ b/kchart/csvimportdialog.cc @@ -378,7 +378,7 @@ void CSVImportDialog::fillTable( ) for (column = 0; column < m_dialog->m_sheet->numCols(); ++column) { const TQString header = m_dialog->m_sheet->horizontalHeader()->label(column); - if ( m_formatList.tqfind( header ) == m_formatList.end() ) + if ( m_formatList.find( header ) == m_formatList.end() ) m_dialog->m_sheet->horizontalHeader()->setLabel(column, i18n("Text")); m_dialog->m_sheet->adjustColumn(column); diff --git a/kchart/kchartBackgroundPixmapConfigPage.cc b/kchart/kchartBackgroundPixmapConfigPage.cc index 825bca94..0f517ad6 100644 --- a/kchart/kchartBackgroundPixmapConfigPage.cc +++ b/kchart/kchartBackgroundPixmapConfigPage.cc @@ -194,19 +194,19 @@ void KChartBackgroundPixmapConfigPage::loadWallpaperFilesList() if (imageCaption.isEmpty()) { imageCaption = fileName; - imageCaption.tqreplace('_', ' '); + imageCaption.replace('_', ' '); imageCaption = KStringHandler::capwords(imageCaption); } // avoid name collisions TQString rs = imageCaption; TQString lrs = rs.lower(); - for (int n = 1; papers.tqfind(lrs) != papers.end(); ++n) + for (int n = 1; papers.find(lrs) != papers.end(); ++n) { rs = imageCaption + " (" + TQString::number(n) + ')'; lrs = rs.lower(); } - int slash = (*it).tqfindRev('/') + 1; + int slash = (*it).findRev('/') + 1; TQString directory = (*it).left(slash); bool canLoadScaleable = false; #ifdef HAVE_LIBART @@ -233,8 +233,8 @@ void KChartBackgroundPixmapConfigPage::loadWallpaperFilesList() if (imageCaption.isEmpty()) { - int slash = (*it).tqfindRev('/') + 1; - int endDot = (*it).tqfindRev('.'); + int slash = (*it).findRev('/') + 1; + int endDot = (*it).findRev('.'); // strip the extension if it exists if (endDot != -1 && endDot > slash) @@ -242,14 +242,14 @@ void KChartBackgroundPixmapConfigPage::loadWallpaperFilesList() else imageCaption = (*it).mid(slash); - imageCaption.tqreplace('_', ' '); + imageCaption.replace('_', ' '); imageCaption = KStringHandler::capwords(imageCaption); } // avoid name collisions TQString rs = imageCaption; TQString lrs = rs.lower(); - for (int n = 1; papers.tqfind(lrs) != papers.end(); ++n) + for (int n = 1; papers.find(lrs) != papers.end(); ++n) { rs = imageCaption + " (" + TQString::number(n) + ')'; lrs = rs.lower(); @@ -455,12 +455,12 @@ void KChartBackgroundPixmapConfigPage::showSettings( const TQString& fileName ) { wallCB->blockSignals(true); - if (m_wallpaper.tqfind(fileName) == m_wallpaper.end()) + if (m_wallpaper.find(fileName) == m_wallpaper.end()) { int i = wallCB->count(); TQString imageCaption; - int slash = fileName.tqfindRev('/') + 1; - int endDot = fileName.tqfindRev('.'); + int slash = fileName.findRev('/') + 1; + int endDot = fileName.findRev('.'); // strip the extension if it exists if (endDot != -1 && endDot > slash) diff --git a/kchart/kchartWizardSelectChartTypePage.cc b/kchart/kchartWizardSelectChartTypePage.cc index 9cd2c4c8..ff2b8746 100644 --- a/kchart/kchartWizardSelectChartTypePage.cc +++ b/kchart/kchartWizardSelectChartTypePage.cc @@ -73,7 +73,7 @@ KChartWizardSelectChartTypePage::KChartWizardSelectChartTypePage( TQWidget* tqpa addButton( i18n( "Ring" ), "chart_ring", KChartParams::Ring ); addButton( i18n( "Polar" ), "chart_polar", KChartParams::Polar); - TQPushButton *current = ((TQPushButton*)m_typeBG->tqfind( m_chart->params()->chartType() )); + TQPushButton *current = ((TQPushButton*)m_typeBG->find( m_chart->params()->chartType() )); if (current != NULL) { current->setOn( true ); } diff --git a/kchart/kdchart/KDChart.cpp b/kchart/kdchart/KDChart.cpp index c7c80250..415f013a 100644 --- a/kchart/kdchart/KDChart.cpp +++ b/kchart/kdchart/KDChart.cpp @@ -58,7 +58,7 @@ \brief Provides a single entry-point to the charting engine for applications that wish to provide their own TQPainter. - It is not useful to instantiate this class as it tqcontains + It is not useful to instantiate this class as it contains static methods only. \note If for some reason you are NOT using the diff --git a/kchart/kdchart/KDChart.h b/kchart/kdchart/KDChart.h index 1f91f255..1510211e 100644 --- a/kchart/kdchart/KDChart.h +++ b/kchart/kdchart/KDChart.h @@ -43,7 +43,7 @@ \brief Definition of a single entry-point to the charting engine for applications that wish to provide their own TQPainter. - It is not useful to instantiate the KDChart class as it only tqcontains + It is not useful to instantiate the KDChart class as it only contains static methods. */ diff --git a/kchart/kdchart/KDChartAxesPainter.cpp b/kchart/kdchart/KDChartAxesPainter.cpp index 4c592ea6..6124abe8 100644 --- a/kchart/kdchart/KDChartAxesPainter.cpp +++ b/kchart/kdchart/KDChartAxesPainter.cpp @@ -2479,7 +2479,7 @@ void KDChartAxesPainter::calculateLabelTexts( modf( ddelta, &ddelta ); bool positive = ( 0.0 <= ddelta ); int delta = static_cast < int > ( fabs( ddelta ) ); - // tqfind 1st significant entry + // find 1st significant entry TQStringList::Iterator it = positive ? tmpList.begin() : tmpList.fromLast(); @@ -3663,7 +3663,7 @@ TQString KDChartAxesPainter::truncateBehindComma( const double nVal, //qDebug("nVal: %f sVal: "+sVal, nVal ); //qDebug( TQString(" %1").tqarg(sVal)); if ( bUseAutoDigits ) { - int comma = sVal.tqfind( '.' ); + int comma = sVal.find( '.' ); if ( -1 < comma ) { if ( bAutoDelta ) { int i = sVal.length(); @@ -3684,7 +3684,7 @@ TQString KDChartAxesPainter::truncateBehindComma( const double nVal, if ( '.' == sDelta[ i - 1 ] ) trueBehindComma = 0; else { - int deltaComma = sDelta.tqfind( '.' ); + int deltaComma = sDelta.find( '.' ); if ( -1 < deltaComma ) trueBehindComma = sDelta.length() - deltaComma - 1; else @@ -3753,9 +3753,9 @@ TQString KDChartAxesPainter::applyLabelsFormat( const double nVal_, trueBehindComma ); //qDebug("sVal : "+sVal+" behindComma: %i",behindComma); - int posComma = sVal.tqfind( '.' ); + int posComma = sVal.find( '.' ); if( 0 <= posComma ){ - sVal.tqreplace( posComma, 1, decimalPoint); + sVal.replace( posComma, 1, decimalPoint); }else{ posComma = sVal.length(); } @@ -3795,7 +3795,7 @@ TQString KDChartAxesPainter::applyLabelsFormat( const double nVal_, *and the user has set axisLabelsDigitsBehindComma() == 0 *return an empty string */ - if ( behindComma == 0 && TQString::number(nVal).tqfind('.') > 0 ) + if ( behindComma == 0 && TQString::number(nVal).find('.') > 0 ) sVal = TQString();//sVal = ""; return sVal; } @@ -3854,7 +3854,7 @@ void KDChartAxesPainter::calculateOrdinateFactors( if ( 100.0 > nDist ) nDivisor = 1.0; else { - int comma = sDistDigis2.tqfind( '.' ); + int comma = sDistDigis2.find( '.' ); if ( -1 < comma ) sDistDigis2.truncate( comma ); nDivisor = fastPow10( (int)sDistDigis2.length() - 2 ); diff --git a/kchart/kdchart/KDChartAxisParams.cpp b/kchart/kdchart/KDChartAxisParams.cpp index 31ec8de4..a6e337f2 100644 --- a/kchart/kdchart/KDChartAxisParams.cpp +++ b/kchart/kdchart/KDChartAxisParams.cpp @@ -1933,7 +1933,7 @@ void KDChartAxisParams::setAxisValues( bool axisSteadyValueCalc, with the next value lower than your start value that can be divided by the delta factor. - \param isExactValue set this to FALSE if KD Chart shall tqfind + \param isExactValue set this to FALSE if KD Chart shall find a better value than the one you have specified by setAxisValueStart() \sa setAxisValues, setAxisValueEnd, setAxisValueDelta \sa axisValueStartIsExact, axisValueStart @@ -2401,7 +2401,7 @@ void KDChartAxisParams::setAxisDtHighPos( double x, double y ) \note Calling this function results in overwriting the information that you might have set by previous calls of that function. Only <b>one</b> data row can be specified as containing label texts. - To specify a data row that tqcontains (or might contain) axis label texts just + To specify a data row that contains (or might contain) axis label texts just call this function with \c LabelsFromDataRowYes (or \c LabelsFromDataRowGuess, resp.) specifying this row but do <b>not</b> call the function n times with the \c LabelsFromDataRowNo parameter to 'deactivate' the other rows. @@ -2409,7 +2409,7 @@ void KDChartAxisParams::setAxisDtHighPos( double x, double y ) the data rows is containing the axis label texts (this is the default setting). - \param row the data row number that tqcontains (or might contain, resp.) the labels + \param row the data row number that contains (or might contain, resp.) the labels \param mode the state of our information concerning that row (see: \c LabelsFromDataRow) \sa LabelsFromDataRow, axisLabelTextsFormDataRow, setAxisValues @@ -2434,7 +2434,7 @@ void KDChartAxisParams::setLabelTextsFormDataRow( int row, LabelsFromDataRow mo /** \fn int KDChartAxisParams::labelTextsDataRow() const - Returns the number of the data row that tqcontains (or might contain, + Returns the number of the data row that contains (or might contain, resp.) the texts to be taken for the axis labels. <br> Use \c axisLabelTextsFormDataRow to make sure the texts are @@ -2451,7 +2451,7 @@ void KDChartAxisParams::setLabelTextsFormDataRow( int row, LabelsFromDataRow mo Use \c axisLabelTexts to get a TQStringList* containing the label texts that are <b>actually</b> drawn at the axis. - \return the number of the data row that tqcontains (or might contain, + \return the number of the data row that contains (or might contain, resp.) the texts to be taken for the axis labels. \sa setAxisValues \sa axisValueStart, axisValueEnd diff --git a/kchart/kdchart/KDChartBWPainter.cpp b/kchart/kdchart/KDChartBWPainter.cpp index f376403b..9f6e5fb5 100644 --- a/kchart/kdchart/KDChartBWPainter.cpp +++ b/kchart/kdchart/KDChartBWPainter.cpp @@ -148,13 +148,13 @@ int KDChartBWPainter::calculateStats( KDChartTableDataBase& data, (values[ TQMAX(nUd2-1, 0) ] + values[ nUd2 ]) /2; // find last value of lower quartile nLastQ1 = TQMAX( nUd2-1, 0 ); - // tqfind 1st value of lower quartile + // find 1st value of lower quartile nFirstQ1 = nLastQ1 / 2; // determine how many values are below the median ( == how many are above it) int nLowerCount = nLastQ1 - nFirstQ1 + 1; - // tqfind 1st value of upper quartile + // find 1st value of upper quartile nFirstQ3 = bOdd ? TQMIN( nUd2+1, nUsed-1 ) : nUd2; // find last value of upper quartile nLastQ3 = nFirstQ3 + nLowerCount - 1; diff --git a/kchart/kdchart/KDChartDataIntern.h b/kchart/kdchart/KDChartDataIntern.h index 70cd3bda..a1d6562b 100644 --- a/kchart/kdchart/KDChartDataIntern.h +++ b/kchart/kdchart/KDChartDataIntern.h @@ -230,7 +230,7 @@ public: } } } - // Note: We do *not* compare the _propSetID here since it tqcontains + // Note: We do *not* compare the _propSetID here since it contains // no values but is used to handle some tqlayout information... } return bRet; @@ -288,7 +288,7 @@ public: default: /* NOOP */; } - // Note: We do *not* copy the _propSetID here since it tqcontains + // Note: We do *not* copy the _propSetID here since it contains // no values but is used to handle some tqlayout information... } } diff --git a/kchart/kdchart/KDChartDataRegion.h b/kchart/kdchart/KDChartDataRegion.h index 13790435..c86d0bdc 100644 --- a/kchart/kdchart/KDChartDataRegion.h +++ b/kchart/kdchart/KDChartDataRegion.h @@ -137,23 +137,23 @@ struct KDCHART_EXPORT KDChartDataRegion return TQRect(); } - bool tqcontains(const TQPoint & p) const + bool contains(const TQPoint & p) const { if( pPointArrayList && ! pPointArrayList->empty() ){ PointArrayList::iterator it; for ( it = pPointArrayList->begin(); it != pPointArrayList->end(); ++it ){ TQRegion region( *it ); - if( region.tqcontains( p ) ) + if( region.contains( p ) ) return true; } return false; } if( pRegion ) - return pRegion->tqcontains( p ); + return pRegion->contains( p ); if( pArray ) - return TQRegion( *pArray ).tqcontains( p ); + return TQRegion( *pArray ).contains( p ); if( pRect ) - return pRect->tqcontains( p ); + return pRect->contains( p ); return false; } diff --git a/kchart/kdchart/KDChartLinesPainter.cpp b/kchart/kdchart/KDChartLinesPainter.cpp index aef52b79..a7e01092 100644 --- a/kchart/kdchart/KDChartLinesPainter.cpp +++ b/kchart/kdchart/KDChartLinesPainter.cpp @@ -509,7 +509,7 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter, if( curPropSetId != KDChartPropertySet::UndefinedID ){ // we can safely call the following functions and ignore their // return values since they will touch the parameters' values - // if the propSet *tqcontains* corresponding own values only. + // if the propSet *contains* corresponding own values only. int iDummy; curPropSet.hasOwnShowMarker( iDummy, currentDrawMarkers ); } @@ -554,7 +554,7 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter, if( curPropSetId != KDChartPropertySet::UndefinedID ){ // we can safely call the following functions and ignore their // return values since they will touch the parameters' values - // if the propSet *tqcontains* corresponding own values only. + // if the propSet *contains* corresponding own values only. int iDummy; curPropSet.hasOwnMarkerAlign( iDummy, theAlignment ); curPropSet.hasOwnMarkerColor( iDummy, theColor ); @@ -658,7 +658,7 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter, if( curPropSetId != KDChartPropertySet::UndefinedID ){ // we can safely call the following functions and ignore their // return values since they will touch the parameters' values - // if the propSet *tqcontains* corresponding own values only. + // if the propSet *contains* corresponding own values only. int iDummy; curPropSet.hasOwnAreaBrush( iDummy, theAreaBrush ); } @@ -808,7 +808,7 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter, if( curPropSetId != KDChartPropertySet::UndefinedID ){ // we can safely call the following functions and ignore their // return values since they will touch the parameters' values - // if the propSet *tqcontains* corresponding own values only. + // if the propSet *contains* corresponding own values only. int iDummy; curPropSet.hasOwnLineWidth ( iDummy, theLineWidth ); curPropSet.hasOwnLineColor ( iDummy, theLineColor ); diff --git a/kchart/kdchart/KDChartPainter.cpp b/kchart/kdchart/KDChartPainter.cpp index 987857aa..156d5d82 100644 --- a/kchart/kdchart/KDChartPainter.cpp +++ b/kchart/kdchart/KDChartPainter.cpp @@ -494,7 +494,7 @@ void KDChartPainter::paintDataValues( TQPainter* painter, region->text = "+LEMNISKATE"; else { region->text.setNum( value, 'f', digits ); - if ( autoDigits && region->text.tqcontains( '.' ) ) { + if ( autoDigits && region->text.contains( '.' ) ) { int len = region->text.length(); while ( 3 < len && '0' == region->text[ len-1 ] @@ -518,7 +518,7 @@ void KDChartPainter::paintDataValues( TQPainter* painter, region = regions->next() ) if ( ( ( lastDigitIrrelevant0 && !region->chart ) || ( lastDigitIrrelevant1 && region->chart ) ) - && region->text.tqcontains( '.' ) + && region->text.contains( '.' ) && ( 2 < region->text.length() ) ) region->text.truncate ( region->text.length() - 2 ); @@ -1931,7 +1931,7 @@ void KDChartPainter::calculateAllAxesRects( if( KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT == format ) areaMin = TQMAX( areaMin, static_cast < int > ( fntHeight * 6.75 ) ); else - areaMin = TQMAX( areaMin, fntHeight * ( 3 + format.tqcontains("\n") ) ); + areaMin = TQMAX( areaMin, fntHeight * ( 3 + format.contains("\n") ) ); } else areaMin = TQMAX( areaMin, fntHeight * 3 ); @@ -2851,7 +2851,7 @@ void KDChartPainter::drawExtraLinesAndMarkers( // we can safely call the following functions and ignore their // return values since they will touch the parameters' values - // if the propSet *tqcontains* corresponding own values only. + // if the propSet *contains* corresponding own values only. int iDummy; uint extraLinesAlign = 0; if( propSet.hasOwnExtraLinesAlign( iDummy, extraLinesAlign ) diff --git a/kchart/kdchart/KDChartParams.cpp b/kchart/kdchart/KDChartParams.cpp index 7306cfe0..aac8928f 100644 --- a/kchart/kdchart/KDChartParams.cpp +++ b/kchart/kdchart/KDChartParams.cpp @@ -518,7 +518,7 @@ void KDChartParams::setProperties( int id, KDChartPropertySet& rSet ) { _propertySetList.setAutoDelete( true ); rSet.mOwnID = id; - _propertySetList.tqreplace( rSet.mOwnID, rSet.clone() ); + _propertySetList.replace( rSet.mOwnID, rSet.clone() ); } /** @@ -568,7 +568,7 @@ bool KDChartParams::removeProperties( int id ) */ bool KDChartParams::properties( int id, KDChartPropertySet& rSet ) const { - const KDChartPropertySet* R = _propertySetList.tqfind( id ); + const KDChartPropertySet* R = _propertySetList.find( id ); const bool bFound = (0 != R); if( bFound ) rSet.deepCopy( R ); @@ -600,7 +600,7 @@ bool KDChartParams::properties( int id, KDChartPropertySet& rSet ) const */ KDChartPropertySet* KDChartParams::properties( int id ) { - return _propertySetList.tqfind( id ); + return _propertySetList.find( id ); } @@ -1514,7 +1514,7 @@ KDChartParams::SourceMode KDChartParams::chartSourceMode( uint dataset, bool bStart = true; ModeAndChartMap::ConstIterator it; - for( it = _dataSourceModeAndChart.tqfind( a ); + for( it = _dataSourceModeAndChart.find( a ); ( it != _dataSourceModeAndChart.end() ) && ( it.key() <= b ); ++it ){ if ( bStart ) { @@ -1860,7 +1860,7 @@ void KDChartParams::calculateShadowColors( TQColor color, TQColor KDChartParams::dataColor( uint dataset ) const { uint index = dataset % (_maxDatasetColor+1); - if( _dataColors.tqfind( index ) != _dataColors.end() ) + if( _dataColors.find( index ) != _dataColors.end() ) return _dataColors[ index ]; else return TQColor(); // documentation says undefined @@ -1916,12 +1916,12 @@ TQColor KDChartParams::dataShadow1Color( uint dataset ) const { uint index = dataset % _maxDatasetColor; if ( _threeDShadowColors ) - if( _dataColorsShadow1.tqfind( index ) != _dataColorsShadow1.end() ) + if( _dataColorsShadow1.find( index ) != _dataColorsShadow1.end() ) return _dataColorsShadow1[ index ]; else return TQColor(); // documentation says undefined else - if( _dataColors.tqfind( index ) != _dataColors.end() ) + if( _dataColors.find( index ) != _dataColors.end() ) return _dataColors[ index ]; else return TQColor(); // documentation says undefined @@ -1945,12 +1945,12 @@ TQColor KDChartParams::dataShadow2Color( uint dataset ) const { uint index = dataset % _maxDatasetColor; if ( _threeDShadowColors ) - if( _dataColorsShadow2.tqfind( index ) != _dataColorsShadow2.end() ) + if( _dataColorsShadow2.find( index ) != _dataColorsShadow2.end() ) return _dataColorsShadow2[ index ]; else return TQColor(); // documentation says undefined else - if( _dataColors.tqfind( index ) != _dataColors.end() ) + if( _dataColors.find( index ) != _dataColors.end() ) return _dataColors[ index ]; else return TQColor(); // documentation says undefined @@ -2572,7 +2572,7 @@ bool KDChartParams::moveDataRegionFrame( uint oldDataRow, ) { const TQString oldKey( dataRegionFrameAreaName( oldDataRow, oldDataCol, 0 ) ); // oldData3rd ) ); - KDChartFrameSettings* it = _areaDict.tqfind( oldKey ); + KDChartFrameSettings* it = _areaDict.find( oldKey ); bool bFound = ( it != 0 ); if( bFound ){ if( KDCHART_NO_DATASET != newDataRow ){ @@ -2582,7 +2582,7 @@ bool KDChartParams::moveDataRegionFrame( uint oldDataRow, frame->setDataCol( newDataCol ); frame->setData3rd( 0 ); // newData3rd ); _areaDict.setAutoDelete( TRUE ); - _areaDict.tqreplace( + _areaDict.replace( dataRegionFrameAreaName( newDataRow, newDataCol, 0 ), //data3rd 5 ), frame ); } @@ -2610,7 +2610,7 @@ const KDChartParams::KDChartFrameSettings* KDChartParams::frameSettings( uint ar if( pIterIdx ) *pIterIdx = 0; const TQString key( TQString( "%1/-----/-----/-----" ).tqarg( area, 5 ) ); - KDChartFrameSettings* it = _areaDict.tqfind( key ); + KDChartFrameSettings* it = _areaDict.find( key ); bFound = ( it != 0 ); if( bFound ) return it; @@ -2698,7 +2698,7 @@ uint KDChartParams::insertCustomBox( const KDChartCustomBox & box ) const uint maxIndex = maxCustomBoxIdx(); newIdx = 1 + maxIndex; for( uint idx = 0; idx <= maxIndex; ++idx ) { - if( ! _customBoxDict.tqfind( idx ) ) { + if( ! _customBoxDict.find( idx ) ) { newIdx = idx; _customBoxDictMayContainHoles = true; // we found a hole, so there might be more of them break; @@ -2758,7 +2758,7 @@ bool KDChartParams::removeCustomBox( const uint & idx ) */ const KDChartCustomBox* KDChartParams::customBox( uint box ) const { - return _customBoxDict.tqfind( box ); + return _customBoxDict.find( box ); } /** @@ -2776,7 +2776,7 @@ const KDChartCustomBox* KDChartParams::customBox( uint box ) const */ KDChartCustomBox* KDChartParams::customBoxRef( uint box ) { - return _customBoxDict.tqfind( box ); + return _customBoxDict.find( box ); } /** @@ -4685,7 +4685,7 @@ void KDChartParams::setLineMarkerStyle( uint dataset, LineMarkerStyle style ) */ KDChartParams::LineMarkerStyle KDChartParams::lineMarkerStyle( uint dataset ) const { - if( _lineMarkerStyles.tqfind( dataset ) != _lineMarkerStyles.end() ) + if( _lineMarkerStyles.find( dataset ) != _lineMarkerStyles.end() ) return _lineMarkerStyles[ dataset ]; else return LineMarkerCircle; // default @@ -4891,7 +4891,7 @@ Qt::PenStyle KDChartParams::lineStyle( uint dataset ) const if( KDCHART_GLOBAL_LINE_STYLE == dataset ) // global line style return _lineStyle; - else if( _datasetLineStyles.tqfind( dataset ) == _datasetLineStyles.end() ) + else if( _datasetLineStyles.find( dataset ) == _datasetLineStyles.end() ) return lineStyle(); else return _datasetLineStyles[ dataset ]; @@ -5197,7 +5197,7 @@ void KDChartParams::setPolarMarkerStyle( uint dataset, PolarMarkerStyle style ) */ KDChartParams::PolarMarkerStyle KDChartParams::polarMarkerStyle( uint dataset ) const { - if( _polarMarkerStyles.tqfind( dataset ) != _polarMarkerStyles.end() ) + if( _polarMarkerStyles.find( dataset ) != _polarMarkerStyles.end() ) return _polarMarkerStyles[ dataset ]; else return PolarMarkerCircle; // default @@ -6729,7 +6729,7 @@ void KDChartParams::setBWChartPrintStatistics( BWStatVal statValue, <li>Manual - Uses texts set with setLegendText(); if no text is set for a dataset, the legend text will be empty. <li>FirstColumn - Uses values from the first column, no matter what - this tqcontains. + this contains. <li>Automatic - Tries first to use values from the first column; if this does not contain any string values, tries to use values set manually with setLegendText(). If there are no values set manually diff --git a/kchart/kdchart/KDChartParams.h b/kchart/kdchart/KDChartParams.h index 7196ef2c..7ae8c27c 100644 --- a/kchart/kdchart/KDChartParams.h +++ b/kchart/kdchart/KDChartParams.h @@ -393,7 +393,7 @@ public slots: bool addFrameHeightToLayout = true ) { _areaDict.setAutoDelete( TRUE ); - _areaDict.tqreplace( TQString( "%1/-----/-----/-----" ).tqarg( area, 5 ), + _areaDict.replace( TQString( "%1/-----/-----/-----" ).tqarg( area, 5 ), new KDChartFrameSettings(0,0,0, frame, outerGapX, @@ -436,7 +436,7 @@ public slots: shadowWidth, sunPos ); - _areaDict.tqreplace( TQString( "%1/-----/-----/-----" ).tqarg( area, 5 ), + _areaDict.replace( TQString( "%1/-----/-----/-----" ).tqarg( area, 5 ), new KDChartFrameSettings( 0,0,0, frame, outerGapX, outerGapY, @@ -477,7 +477,7 @@ public slots: shadowWidth, sunPos ); - _areaDict.tqreplace( + _areaDict.replace( dataRegionFrameAreaName( dataRow, dataCol, 0 ), //data3rd 5 ), new KDChartFrameSettings( dataRow, dataCol, @@ -1924,7 +1924,7 @@ public slots: TQString legendText( uint dataset ) const { - if( _legendText.tqfind( dataset ) != _legendText.end() ) + if( _legendText.find( dataset ) != _legendText.end() ) return _legendText[ dataset ]; else return TQString(); diff --git a/kchart/kdchart/KDChartParams_io.cpp b/kchart/kdchart/KDChartParams_io.cpp index e24ce590..2feaf179 100644 --- a/kchart/kdchart/KDChartParams_io.cpp +++ b/kchart/kdchart/KDChartParams_io.cpp @@ -2200,7 +2200,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc ) .tqarg( 0, 5 );//frameSettings->data3rd(), 5 ); else str = TQString( "%1/-----/-----/-----" ).tqarg( areaId, 5 ); - _areaDict.tqreplace( str, frameSettings ); + _areaDict.replace( str, frameSettings ); } } else diff --git a/kchart/kdchart/KDChartPiePainter.cpp b/kchart/kdchart/KDChartPiePainter.cpp index dd00f627..ada03b44 100644 --- a/kchart/kdchart/KDChartPiePainter.cpp +++ b/kchart/kdchart/KDChartPiePainter.cpp @@ -241,7 +241,7 @@ void KDChartPiePainter::paintData( TQPainter* painter, // take one pie from the stack int currentpie = todostack.pop(); // if this pie was already drawn, ignore it - if ( donelist.tqfind( currentpie ) != donelist.end() ) + if ( donelist.find( currentpie ) != donelist.end() ) continue; // If this pie is the frontmost pie, put it back, but at the @@ -278,10 +278,10 @@ void KDChartPiePainter::paintData( TQPainter* painter, // whether these have not been painted already, and put them // on the stack. int leftOfCurrent = findLeftPie( currentpie ); - if ( donelist.tqfind( leftOfCurrent ) == donelist.end() ) + if ( donelist.find( leftOfCurrent ) == donelist.end() ) todostack.push( leftOfCurrent ); int rightOfCurrent = findRightPie( currentpie ); - if ( donelist.tqfind( rightOfCurrent ) == donelist.end() ) + if ( donelist.find( rightOfCurrent ) == donelist.end() ) todostack.push( rightOfCurrent ); } @@ -326,7 +326,7 @@ void KDChartPiePainter::drawOnePie( TQPainter* painter, // need to compute a new position for each or some of the pie TQValueList<int> explodeList = params()->explodeValues(); if( explodeList.count() == 0 || // nothing on list, explode all - explodeList.tqfind( pie ) != explodeList.end() ) { + explodeList.find( pie ) != explodeList.end() ) { double explodeAngle = ( startAngle + angleLen / 2 ) / 16; double explodeAngleRad = DEGTORAD( explodeAngle ); double cosAngle = cos( explodeAngleRad ); @@ -335,7 +335,7 @@ void KDChartPiePainter::drawOnePie( TQPainter* painter, // find the explode factor for this particular pie double explodeFactor = 0.0; TQMap<int,double> explodeFactors = params()->explodeFactors(); - if( !explodeFactors.tqcontains( pie ) ) // not on factors list, use default + if( !explodeFactors.contains( pie ) ) // not on factors list, use default explodeFactor = params()->explodeFactor(); else // on factors list, use segment-specific value explodeFactor = explodeFactors[pie]; diff --git a/kchart/kdchart/KDChartRingPainter.cpp b/kchart/kdchart/KDChartRingPainter.cpp index d9016ed3..9740fa5e 100644 --- a/kchart/kdchart/KDChartRingPainter.cpp +++ b/kchart/kdchart/KDChartRingPainter.cpp @@ -203,7 +203,7 @@ void KDChartRingPainter::paintData( TQPainter* painter, bool explode = params()->explode() && // explosion is on at all ( dataset == (int)datasetStart ) && // outermost ring ( ( explodeList.count() == 0 ) || // either nothing on explode list - ( explodeList.tqfind( value ) != explodeList.end() ) ); // or pie is on it + ( explodeList.find( value ) != explodeList.end() ) ); // or pie is on it drawOneSegment( painter, currentouterradius, @@ -253,7 +253,7 @@ void KDChartRingPainter::drawOneSegment( TQPainter* painter, // find the explode factor for this particular ring segment double explodeFactor = 0.0; TQMap<int,double> explodeFactors = params()->explodeFactors(); - if( !explodeFactors.tqcontains( value ) ) // not on factors list, use default + if( !explodeFactors.contains( value ) ) // not on factors list, use default explodeFactor = params()->explodeFactor(); else // on factors list, use segment-specific value explodeFactor = explodeFactors[value]; diff --git a/kchart/kdchart/KDChartWidget.cpp b/kchart/kdchart/KDChartWidget.cpp index 00e4a45c..c3e42b8b 100644 --- a/kchart/kdchart/KDChartWidget.cpp +++ b/kchart/kdchart/KDChartWidget.cpp @@ -168,7 +168,7 @@ void KDChartWidget::mousePressEvent( TQMouseEvent* event ) //TQPtrListIterator < KDChartDataRegion > it( _dataRegions ); for( current = _dataRegions.last(); current; current = _dataRegions.prev() ){ //while ( ( current = it.current() ) ) { - if ( current->tqcontains( event->pos() ) ) { + if ( current->contains( event->pos() ) ) { _mousePressedOnRegion = current; if ( event->button() == Qt::LeftButton ){ emit dataLeftPressed( current->row, current->col ); @@ -198,7 +198,7 @@ void KDChartWidget::mouseReleaseEvent( TQMouseEvent* event ) TQPtrListIterator < KDChartDataRegion > it( _dataRegions ); while ( ( current = it.current() ) ) { ++it; - if ( current->tqcontains( event->pos() ) ) { + if ( current->contains( event->pos() ) ) { if ( event->button() == Qt::LeftButton ) { emit dataLeftReleased( current->row, current->col ); emit dataLeftReleased( event->pos() ); diff --git a/kchart/kdchart/KDDrawText.cpp b/kchart/kdchart/KDDrawText.cpp index 2ef93088..a954a5bf 100644 --- a/kchart/kdchart/KDDrawText.cpp +++ b/kchart/kdchart/KDDrawText.cpp @@ -163,13 +163,13 @@ void KDDrawText::drawRotatedTxt( TQPainter* painter, pFM = const_cast<TQFontMetrics*>(fontMet); } - int nLF = text.tqcontains('\n'); + int nLF = text.contains('\n'); if( INT_MAX == txtWidth ) { if( nLF ){ int tw; txtWidth = 0; int i0 = 0; - int iLF = text.tqfind('\n'); + int iLF = text.find('\n'); while( -1 != iLF ){ const TQRect r(pFM->boundingRect( text.mid(i0, iLF-i0) )); tw = r.width()+ 2; @@ -177,7 +177,7 @@ void KDDrawText::drawRotatedTxt( TQPainter* painter, if( tw > txtWidth ) txtWidth = tw; i0 = iLF+1; - iLF = text.tqfind('\n', i0); + iLF = text.find('\n', i0); } if( iLF < (int)text.length() ){ const TQRect r(pFM->boundingRect( text.mid( i0 ) )); diff --git a/kchart/kdchart/LICENSE b/kchart/kdchart/LICENSE index 0d0f1cfa..8d0b8788 100644 --- a/kchart/kdchart/LICENSE +++ b/kchart/kdchart/LICENSE @@ -67,7 +67,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -162,7 +162,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp index 9b226637..90cdc18e 100644 --- a/kdgantt/KDGanttMinimizeSplitter.cpp +++ b/kdgantt/KDGanttMinimizeSplitter.cpp @@ -179,7 +179,7 @@ int KDGanttSplitterHandle::onButton( const TQPoint& p ) rect.setRight( rect.right() + 4); rect.setTop( rect.top()- 4 ); rect.setBottom( rect.bottom() + 4); - if ( rect.tqcontains( p ) ) { + if ( rect.contains( p ) ) { return index; } index++; diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp index 9191faaf..7f7e1983 100644 --- a/kdgantt/KDGanttView.cpp +++ b/kdgantt/KDGanttView.cpp @@ -3724,7 +3724,7 @@ void KDGanttView::addTaskLinkGroup(KDGanttViewTaskLinkGroup* group) myTaskLinkGroupList.append(group); return; } - if (myTaskLinkGroupList.tqfind(group) == -1) + if (myTaskLinkGroupList.find(group) == -1) myTaskLinkGroupList.append(group); } diff --git a/kdgantt/KDGanttViewItem.cpp b/kdgantt/KDGanttViewItem.cpp index f9928c51..90aff68a 100644 --- a/kdgantt/KDGanttViewItem.cpp +++ b/kdgantt/KDGanttViewItem.cpp @@ -292,10 +292,10 @@ void KDGanttViewItem::generateAndInsertName( const TQString& name ) sItemDict.remove( _name ); TQString newName; - if ( name.isEmpty() || sItemDict.tqfind( name ) ) { + if ( name.isEmpty() || sItemDict.find( name ) ) { // create unique name newName.sprintf( "%p", (void* )this ); - while( sItemDict.tqfind( newName ) ) { + while( sItemDict.find( newName ) ) { newName += "_0"; } } else { @@ -325,11 +325,11 @@ TQString KDGanttViewItem::name() const with that name exists */ -KDGanttViewItem* KDGanttViewItem::tqfind( const TQString& name ) +KDGanttViewItem* KDGanttViewItem::find( const TQString& name ) { if (name.isEmpty()) // avoid error msg from TQDict return 0; - return sItemDict.tqfind( name ); + return sItemDict.find( name ); } @@ -2292,7 +2292,7 @@ void KDGanttViewItem::resetSubitemVisibility() In calendar mode, only those items can be opened which have subitems which have subitems. An item which has subitems which have no subitems is called a calendar. - I.e., an item that tqcontains + I.e., an item that contains multiple calendars can be opened, while a calendar item itself cannot. But if all calendars of an item do not have any subitem (e.g at startup), the program cannot detect automatically that it should be possible to open diff --git a/kdgantt/KDGanttViewItem.h b/kdgantt/KDGanttViewItem.h index 369153cf..c69f77c4 100644 --- a/kdgantt/KDGanttViewItem.h +++ b/kdgantt/KDGanttViewItem.h @@ -171,7 +171,7 @@ public: KDGanttViewItem* itemBelow( bool includeDisabled = true ); KDGanttViewItem* getChildByName( const TQString& name ); TQString name() const; - static KDGanttViewItem* tqfind( const TQString& name ); + static KDGanttViewItem* find( const TQString& name ); void createNode( TQDomDocument& doc, TQDomElement& parentElement ); diff --git a/kdgantt/KDGanttViewTaskLink.cpp b/kdgantt/KDGanttViewTaskLink.cpp index 3e891ef5..13872900 100644 --- a/kdgantt/KDGanttViewTaskLink.cpp +++ b/kdgantt/KDGanttViewTaskLink.cpp @@ -870,13 +870,13 @@ KDGanttViewTaskLink* KDGanttViewTaskLink::createFromDomElement( TQDomElement& el TQPtrList<KDGanttViewItem> toItemList; for( TQStringList::const_iterator fromIt = fromList.begin(); fromIt != fromList.end(); ++fromIt ) { - KDGanttViewItem* item = KDGanttViewItem::tqfind( *fromIt ); + KDGanttViewItem* item = KDGanttViewItem::find( *fromIt ); if( item ) fromItemList.append( item ); } for( TQStringList::const_iterator toIt = toList.begin(); toIt != toList.end(); ++toIt ) { - KDGanttViewItem* item = KDGanttViewItem::tqfind( *toIt ); + KDGanttViewItem* item = KDGanttViewItem::find( *toIt ); if( item ) toItemList.append( item ); } @@ -898,7 +898,7 @@ KDGanttViewTaskLink* KDGanttViewTaskLink::createFromDomElement( TQDomElement& el tl->setHighlightColor( highlightColor ); tl->setTooltipText( tooltipText ); tl->setWhatsThisText( whatsThisText ); - KDGanttViewTaskLinkGroup* gr = KDGanttViewTaskLinkGroup::tqfind( group ); + KDGanttViewTaskLinkGroup* gr = KDGanttViewTaskLinkGroup::find( group ); if( gr ) tl->setGroup( gr ); diff --git a/kdgantt/KDGanttViewTaskLinkGroup.cpp b/kdgantt/KDGanttViewTaskLinkGroup.cpp index 2abee1df..2082629a 100644 --- a/kdgantt/KDGanttViewTaskLinkGroup.cpp +++ b/kdgantt/KDGanttViewTaskLinkGroup.cpp @@ -70,7 +70,7 @@ KDGanttViewTaskLinkGroup::~KDGanttViewTaskLinkGroup() /*! Constructs an empty task link group and records it under the name \a name so that it can later be found again with - KDGanttViewTaskLinkGroup::tqfind(). + KDGanttViewTaskLinkGroup::find(). \param name the search name of this task link group */ @@ -268,11 +268,11 @@ void KDGanttViewTaskLinkGroup::removeItem (KDGanttViewTaskLink* link) \return the task link group with the specified name; 0 if no group with that name exists */ -KDGanttViewTaskLinkGroup* KDGanttViewTaskLinkGroup::tqfind( const TQString& name ) +KDGanttViewTaskLinkGroup* KDGanttViewTaskLinkGroup::find( const TQString& name ) { if (name.isEmpty()) // avoid error msg from TQDict return 0; - return sGroupDict.tqfind( name ); + return sGroupDict.find( name ); } @@ -371,10 +371,10 @@ void KDGanttViewTaskLinkGroup::generateAndInsertName( const TQString& name ) sGroupDict.remove( _name ); TQString newName; - if ( name.isEmpty() || sGroupDict.tqfind( name ) ) { + if ( name.isEmpty() || sGroupDict.find( name ) ) { // create unique name newName.sprintf( "%p", (void* )this ); - while( sGroupDict.tqfind( newName ) ) { + while( sGroupDict.find( newName ) ) { newName += "_0"; } } else { diff --git a/kdgantt/KDGanttViewTaskLinkGroup.h b/kdgantt/KDGanttViewTaskLinkGroup.h index b415ab11..120281d4 100644 --- a/kdgantt/KDGanttViewTaskLinkGroup.h +++ b/kdgantt/KDGanttViewTaskLinkGroup.h @@ -62,7 +62,7 @@ public: void setHighlightColor( const TQColor& color ); TQColor highlightColor() const; - static KDGanttViewTaskLinkGroup* tqfind( const TQString& name ); + static KDGanttViewTaskLinkGroup* find( const TQString& name ); void createNode( TQDomDocument& doc, TQDomElement& parentElement ); diff --git a/kexi/3rdparty/kexisql/src/btree.c b/kexi/3rdparty/kexisql/src/btree.c index 3a79a624..a257011e 100644 --- a/kexi/3rdparty/kexisql/src/btree.c +++ b/kexi/3rdparty/kexisql/src/btree.c @@ -47,7 +47,7 @@ ** the file really is a valid BTree database, a pointer to a list of unused ** pages in the file, and some meta information. The root of the first ** BTree begins on page 2 of the file. (Pages are numbered beginning with -** 1, not 0.) Thus a minimum database tqcontains 2 pages. +** 1, not 0.) Thus a minimum database contains 2 pages. */ #include "sqliteInt.h" #include "pager.h" @@ -128,7 +128,7 @@ static const char zMagicHeader[] = /* ** The first page of the database file contains a magic header string -** to identify the file as an SQLite database file. It also tqcontains +** to identify the file as an SQLite database file. It also contains ** a pointer to the first free page of the file. Page 2 contains the ** root of the principle BTree. The file might contain other BTrees ** rooted on pages above 2. diff --git a/kexi/3rdparty/kexisql/src/btree_rb.c b/kexi/3rdparty/kexisql/src/btree_rb.c index 8d905ef0..afb2c508 100644 --- a/kexi/3rdparty/kexisql/src/btree_rb.c +++ b/kexi/3rdparty/kexisql/src/btree_rb.c @@ -768,7 +768,7 @@ static int memRbtreeInsert( memcpy(pData, pDataInput, nData); /* Move the cursor to a node near the key to be inserted. If the key already - * exists in the table, then (match == 0). In this case we can just tqreplace + * exists in the table, then (match == 0). In this case we can just replace * the data associated with the entry, we don't need to manipulate the tree. * * If there is no exact match, then the cursor points at what would be either diff --git a/kexi/3rdparty/kexisql/src/encode.c b/kexi/3rdparty/kexisql/src/encode.c index 3e14e641..899901b5 100644 --- a/kexi/3rdparty/kexisql/src/encode.c +++ b/kexi/3rdparty/kexisql/src/encode.c @@ -67,7 +67,7 @@ ** (2) Copy each input character into the output buffer, one by ** one, adding the offset value as you copy. ** -** (3) If the value of an input character plus offset is 0x00, tqreplace +** (3) If the value of an input character plus offset is 0x00, replace ** that one character by the two-character sequence 0x01 0x01. ** If the sum is 0x01, replace it with 0x01 0x02. If the sum ** is 0x27, replace it with 0x01 0x03. @@ -101,7 +101,7 @@ */ /* -** Encode a binary buffer "in" of size n bytes so that it tqcontains +** Encode a binary buffer "in" of size n bytes so that it contains ** no instances of characters '\'' or '\000'. The output is ** null-terminated and can be used as a string value in an INSERT ** or UPDATE statement. Use sqlite_decode_binary() to convert the @@ -231,7 +231,7 @@ int main(int argc, char **argv){ } for(j=0; out[j]; j++){ if( out[j]=='\'' ){ - printf(" ERROR tqcontains (')\n"); + printf(" ERROR contains (')\n"); exit(1); } } diff --git a/kexi/3rdparty/kexisql/src/insert.c b/kexi/3rdparty/kexisql/src/insert.c index 8c303573..e8d5e567 100644 --- a/kexi/3rdparty/kexisql/src/insert.c +++ b/kexi/3rdparty/kexisql/src/insert.c @@ -541,7 +541,7 @@ insert_cleanup: /* ** Generate code to do a constraint check prior to an INSERT or an UPDATE. ** -** When this routine is called, the stack tqcontains (from bottom to top) +** When this routine is called, the stack contains (from bottom to top) ** the following values: ** ** 1. The recno of the row to be updated before the update. This diff --git a/kexi/3rdparty/kexisql/src/os.c b/kexi/3rdparty/kexisql/src/os.c index fc0f91e2..79eb15e5 100644 --- a/kexi/3rdparty/kexisql/src/os.c +++ b/kexi/3rdparty/kexisql/src/os.c @@ -172,7 +172,7 @@ static unsigned int elapse; ** ** If you close a file descriptor that points to a file that has locks, ** all locks on that file that are owned by the current process are -** released. To work around this problem, each OsFile structure tqcontains +** released. To work around this problem, each OsFile structure contains ** a pointer to an openCnt structure. There is one openCnt structure ** per open inode, which means that multiple OsFiles can point to a single ** openCnt. When an attempt is made to close an OsFile, if there are diff --git a/kexi/3rdparty/kexisql/src/pager.c b/kexi/3rdparty/kexisql/src/pager.c index 566c778c..0ce24086 100644 --- a/kexi/3rdparty/kexisql/src/pager.c +++ b/kexi/3rdparty/kexisql/src/pager.c @@ -1920,7 +1920,7 @@ int sqlitepager_overwrite(Pager *pPager, Pgno pgno, void *pData){ ** a transaction then removed from the freelist during a later part ** of the same transaction and reused for some other purpose. When it ** is first added to the freelist, this routine is called. When reused, -** the dont_rollback() routine is called. But because the page tqcontains +** the dont_rollback() routine is called. But because the page contains ** critical data, we still need to be sure it gets rolled back in spite ** of the dont_rollback() call. */ diff --git a/kexi/3rdparty/kexisql/src/select.c b/kexi/3rdparty/kexisql/src/select.c index 28136e76..0dde6d2e 100644 --- a/kexi/3rdparty/kexisql/src/select.c +++ b/kexi/3rdparty/kexisql/src/select.c @@ -1707,7 +1707,7 @@ static int flattenSubquery( ** the FROM clause of the outer query. Before doing this, remember ** the cursor number for the original outer query FROM element in ** iParent. The iParent cursor will never be used. Subsequent code - ** will scan expressions looking for iParent references and tqreplace + ** will scan expressions looking for iParent references and replace ** those references with expressions that resolve to the subquery FROM ** elements we are now copying in. */ diff --git a/kexi/3rdparty/kexisql/src/sqlite.h b/kexi/3rdparty/kexisql/src/sqlite.h index 4264cc1b..dd227cd0 100644 --- a/kexi/3rdparty/kexisql/src/sqlite.h +++ b/kexi/3rdparty/kexisql/src/sqlite.h @@ -828,7 +828,7 @@ int sqlite_rekey( ); /* -** Encode a binary buffer "in" of size n bytes so that it tqcontains +** Encode a binary buffer "in" of size n bytes so that it contains ** no instances of characters '\'' or '\000'. The output is ** null-terminated and can be used as a string value in an INSERT ** or UPDATE statement. Use sqlite_decode_binary() to convert the diff --git a/kexi/3rdparty/kexisql/src/tclsqlite.c b/kexi/3rdparty/kexisql/src/tclsqlite.c index 7256eafe..fdc2f5e8 100644 --- a/kexi/3rdparty/kexisql/src/tclsqlite.c +++ b/kexi/3rdparty/kexisql/src/tclsqlite.c @@ -999,7 +999,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ ** DBNAME that is used to control that connection. The database ** connection is deleted when the DBNAME command is deleted. ** -** The second argument is the name of the directory that tqcontains +** The second argument is the name of the directory that contains ** the sqlite database that is to be accessed. ** ** For testing purposes, we also support the following: diff --git a/kexi/3rdparty/kexisql/src/vdbe.c b/kexi/3rdparty/kexisql/src/vdbe.c index 6ac81058..9f31e9cf 100644 --- a/kexi/3rdparty/kexisql/src/vdbe.c +++ b/kexi/3rdparty/kexisql/src/vdbe.c @@ -233,7 +233,7 @@ static int hardDynamicify(Mem *pStack){ } /* -** An ephemeral string value (signified by the MEM_Ephem flag) tqcontains +** An ephemeral string value (signified by the MEM_Ephem flag) contains ** a pointer to a dynamically allocated string where some other entity ** is responsible for deallocating that string. Because the stack entry ** does not control the string, it might be deleted without the stack @@ -4151,8 +4151,8 @@ case OP_FileOpen: { ** Read a single line of input from the open file (the file opened using ** FileOpen). If we reach end-of-file, jump immediately to P2. If ** we are able to get another line, split the line apart using P3 as -** a delimiter. There should be P1 fields. If the input line tqcontains -** more than P1 fields, ignore the excess. If the input line tqcontains +** a delimiter. There should be P1 fields. If the input line contains +** more than P1 fields, ignore the excess. If the input line contains ** fewer than P1 fields, assume the remaining fields contain NULLs. ** ** Input ends if a line consists of just "\.". A field containing only diff --git a/kexi/3rdparty/kexisql/src/vdbeInt.h b/kexi/3rdparty/kexisql/src/vdbeInt.h index 3daa74c3..79b6b51a 100644 --- a/kexi/3rdparty/kexisql/src/vdbeInt.h +++ b/kexi/3rdparty/kexisql/src/vdbeInt.h @@ -161,7 +161,7 @@ struct sqlite_func { /* ** An Agg structure describes an Aggregator. Each Agg consists of -** zero or more Aggregator elements (AggElem). Each AggElem tqcontains +** zero or more Aggregator elements (AggElem). Each AggElem contains ** a key and one or more values. The values are used in processing ** aggregate functions in a SELECT. The key is used to implement ** the GROUP BY clause of a select. diff --git a/kexi/3rdparty/kexisql/src/where.c b/kexi/3rdparty/kexisql/src/where.c index 58b6e3d0..bb6a7f4f 100644 --- a/kexi/3rdparty/kexisql/src/where.c +++ b/kexi/3rdparty/kexisql/src/where.c @@ -302,7 +302,7 @@ static void disableTerm(WhereLevel *pLevel, Expr **ppExpr){ /* ** Generate the beginning of the loop used for WHERE clause processing. -** The return value is a pointer to an (opaque) structure that tqcontains +** The return value is a pointer to an (opaque) structure that contains ** information needed to terminate the loop. Later, the calling routine ** should invoke sqliteWhereEnd() with the return value of this function ** in order to complete the WHERE clause processing. diff --git a/kexi/3rdparty/kexisql/tool/lemon.c b/kexi/3rdparty/kexisql/tool/lemon.c index 84f73d17..a0eef810 100644 --- a/kexi/3rdparty/kexisql/tool/lemon.c +++ b/kexi/3rdparty/kexisql/tool/lemon.c @@ -298,7 +298,7 @@ char *Strsafe(); void Strsafe_init(/* void */); int Strsafe_insert(/* char * */); -char *Strsafe_tqfind(/* char * */); +char *Strsafe_find(/* char * */); /* Routines for handling symbols of the grammar */ @@ -306,7 +306,7 @@ struct symbol *Symbol_new(); int Symbolcmpp(/* struct symbol **, struct symbol ** */); void Symbol_init(/* void */); int Symbol_insert(/* struct symbol *, char * */); -struct symbol *Symbol_tqfind(/* char * */); +struct symbol *Symbol_find(/* char * */); struct symbol *Symbol_Nth(/* int */); int Symbol_count(/* */); struct symbol **Symbol_arrayof(/* */); @@ -317,14 +317,14 @@ int Configcmp(/* struct config *, struct config * */); struct state *State_new(); void State_init(/* void */); int State_insert(/* struct state *, struct config * */); -struct state *State_tqfind(/* struct config * */); +struct state *State_find(/* struct config * */); struct state **State_arrayof(/* */); /* Routines used for efficiency in Configlist_add */ void Configtable_init(/* void */); int Configtable_insert(/* struct config * */); -struct config *Configtable_tqfind(/* struct config * */); +struct config *Configtable_find(/* struct config * */); void Configtable_clear(/* int(*)(struct config *) */); /****************** From the file "action.c" *******************************/ /* @@ -510,7 +510,7 @@ struct lemon *lemp; /* Find the start symbol */ if( lemp->start ){ - sp = Symbol_tqfind(lemp->start); + sp = Symbol_find(lemp->start); if( sp==0 ){ ErrorMsg(lemp->filename,0, "The specified start symbol \"%s\" is not \ @@ -571,7 +571,7 @@ struct lemon *lemp; bp = Configlist_basis(); /* Get a state with the same basis */ - stp = State_tqfind(bp); + stp = State_find(bp); if( stp ){ /* A state with the same basis already exists! Copy all the follow-set ** propagation links from the state under construction into the @@ -755,7 +755,7 @@ struct lemon *lemp; /* Add the accepting token */ if( lemp->start ){ - sp = Symbol_tqfind(lemp->start); + sp = Symbol_find(lemp->start); if( sp==0 ) sp = lemp->rule->lhs; }else{ sp = lemp->rule->lhs; @@ -933,7 +933,7 @@ int dot; /* Index into the RHS of the rule where the dot goes */ assert( currentend!=0 ); model.rp = rp; model.dot = dot; - cfp = Configtable_tqfind(&model); + cfp = Configtable_find(&model); if( cfp==0 ){ cfp = newconfig(); cfp->rp = rp; @@ -961,7 +961,7 @@ int dot; assert( currentend!=0 ); model.rp = rp; model.dot = dot; - cfp = Configtable_tqfind(&model); + cfp = Configtable_find(&model); if( cfp==0 ){ cfp = newconfig(); cfp->rp = rp; @@ -3470,7 +3470,7 @@ char *y; { char *z; - z = Strsafe_tqfind(y); + z = Strsafe_find(y); if( z==0 && (z=malloc( strlen(y)+1 ))!=0 ){ strcpy(z,y); Strsafe_insert(z); @@ -3581,7 +3581,7 @@ char *data; /* Return a pointer to data assigned to the given key. Return NULL ** if no such key. */ -char *Strsafe_tqfind(key) +char *Strsafe_find(key) char *key; { int h; @@ -3605,7 +3605,7 @@ char *x; { struct symbol *sp; - sp = Symbol_tqfind(x); + sp = Symbol_find(x); if( sp==0 ){ sp = (struct symbol *)malloc( sizeof(struct symbol) ); MemoryCheck(sp); @@ -3738,7 +3738,7 @@ char *key; /* Return a pointer to data assigned to the given key. Return NULL ** if no such key. */ -struct symbol *Symbol_tqfind(key) +struct symbol *Symbol_find(key) char *key; { int h; @@ -3944,7 +3944,7 @@ struct config *key; /* Return a pointer to data assigned to the given key. Return NULL ** if no such key. */ -struct state *State_tqfind(key) +struct state *State_find(key) struct config *key; { int h; @@ -4087,7 +4087,7 @@ struct config *data; /* Return a pointer to data assigned to the given key. Return NULL ** if no such key. */ -struct config *Configtable_tqfind(key) +struct config *Configtable_find(key) struct config *key; { int h; diff --git a/kexi/3rdparty/kexisql/tool/lempar.c b/kexi/3rdparty/kexisql/tool/lempar.c index b6ffceb0..5604fe10 100644 --- a/kexi/3rdparty/kexisql/tool/lempar.c +++ b/kexi/3rdparty/kexisql/tool/lempar.c @@ -58,7 +58,7 @@ #define YY_NO_ACTION (YYNSTATE+YYNRULE+2) #define YY_ACCEPT_ACTION (YYNSTATE+YYNRULE+1) #define YY_ERROR_ACTION (YYNSTATE+YYNRULE) -/* Next is the action table. Each entry in this table tqcontains +/* Next is the action table. Each entry in this table contains ** ** + An integer which is the number representing the look-ahead ** token diff --git a/kexi/3rdparty/kexisql3/src/btree.c b/kexi/3rdparty/kexisql3/src/btree.c index fb54c9c4..0a2501d0 100644 --- a/kexi/3rdparty/kexisql3/src/btree.c +++ b/kexi/3rdparty/kexisql3/src/btree.c @@ -445,7 +445,7 @@ static void put4byte(unsigned char *p, u32 v){ /* ** The pointer map is a lookup table that identifies the tqparent page for ** each child page in the database file. The tqparent page is the page that -** contains a pointer to the child. Every page in the database tqcontains +** contains a pointer to the child. Every page in the database contains ** 0 or 1 tqparent pages. (In this context 'database page' refers ** to any page that is not part of the pointer map itself.) Each pointer map ** entry consists of a single byte 'type' and a 4 byte tqparent page number. @@ -3065,7 +3065,7 @@ static int allocatePage( memcpy(&pPrevTrunk->aData[0], &pTrunk->aData[0], 4); } }else{ - /* The trunk page is required by the caller but it tqcontains + /* The trunk page is required by the caller but it contains ** pointers to free-list leaves. The first leaf becomes a trunk ** page in this case. */ diff --git a/kexi/3rdparty/kexisql3/src/build.c b/kexi/3rdparty/kexisql3/src/build.c index 02faa0fe..4fcd2bc0 100644 --- a/kexi/3rdparty/kexisql3/src/build.c +++ b/kexi/3rdparty/kexisql3/src/build.c @@ -879,7 +879,7 @@ void sqlite3AddNotNull(Parse *pParse, int onError){ ** ** This routine does a case-independent search of zType for the ** substrings in the following table. If one of the substrings is -** found, the corresponding affinity is returned. If zType tqcontains +** found, the corresponding affinity is returned. If zType contains ** more than one of the substrings, entries toward the top of ** the table take priority. For example, if zType is 'BLOBINT', ** SQLITE_AFF_INTEGER is returned. diff --git a/kexi/3rdparty/kexisql3/src/insert.c b/kexi/3rdparty/kexisql3/src/insert.c index 4cac8724..7b8735a1 100644 --- a/kexi/3rdparty/kexisql3/src/insert.c +++ b/kexi/3rdparty/kexisql3/src/insert.c @@ -720,7 +720,7 @@ insert_cleanup: /* ** Generate code to do a constraint check prior to an INSERT or an UPDATE. ** -** When this routine is called, the stack tqcontains (from bottom to top) +** When this routine is called, the stack contains (from bottom to top) ** the following values: ** ** 1. The rowid of the row to be updated before the update. This diff --git a/kexi/3rdparty/kexisql3/src/os_unix.c b/kexi/3rdparty/kexisql3/src/os_unix.c index 91ca787e..cef00ffa 100644 --- a/kexi/3rdparty/kexisql3/src/os_unix.c +++ b/kexi/3rdparty/kexisql3/src/os_unix.c @@ -147,7 +147,7 @@ ** ** If you close a file descriptor that points to a file that has locks, ** all locks on that file that are owned by the current process are -** released. To work around this problem, each OsFile structure tqcontains +** released. To work around this problem, each OsFile structure contains ** a pointer to an openCnt structure. There is one openCnt structure ** per open inode, which means that multiple OsFiles can point to a single ** openCnt. When an attempt is made to close an OsFile, if there are diff --git a/kexi/3rdparty/kexisql3/src/pager.c b/kexi/3rdparty/kexisql3/src/pager.c index b49a37d5..60cb43bd 100644 --- a/kexi/3rdparty/kexisql3/src/pager.c +++ b/kexi/3rdparty/kexisql3/src/pager.c @@ -2972,7 +2972,7 @@ int sqlite3pager_overwrite(Pager *pPager, Pgno pgno, void *pData){ ** a transaction then removed from the freelist during a later part ** of the same transaction and reused for some other purpose. When it ** is first added to the freelist, this routine is called. When reused, -** the dont_rollback() routine is called. But because the page tqcontains +** the dont_rollback() routine is called. But because the page contains ** critical data, we still need to be sure it gets rolled back in spite ** of the dont_rollback() call. */ diff --git a/kexi/3rdparty/kexisql3/src/select.c b/kexi/3rdparty/kexisql3/src/select.c index fd8b41a8..13c38d50 100644 --- a/kexi/3rdparty/kexisql3/src/select.c +++ b/kexi/3rdparty/kexisql3/src/select.c @@ -2038,7 +2038,7 @@ static int flattenSubquery( ** the FROM clause of the outer query. Before doing this, remember ** the cursor number for the original outer query FROM element in ** iParent. The iParent cursor will never be used. Subsequent code - ** will scan expressions looking for iParent references and tqreplace + ** will scan expressions looking for iParent references and replace ** those references with expressions that resolve to the subquery FROM ** elements we are now copying in. */ diff --git a/kexi/3rdparty/kexisql3/src/tclsqlite.c b/kexi/3rdparty/kexisql3/src/tclsqlite.c index 4387e2f7..51bde4ee 100644 --- a/kexi/3rdparty/kexisql3/src/tclsqlite.c +++ b/kexi/3rdparty/kexisql3/src/tclsqlite.c @@ -921,7 +921,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ ** as column separators. If a column contains a null string, or the ** value of NULLINDICATOR, a NULL is inserted for the column. ** conflict-algorithm is one of the sqlite conflict algorithms: - ** rollback, abort, fail, ignore, tqreplace + ** rollback, abort, fail, ignore, replace ** On success, return the number of lines processed, not necessarily same ** as 'db changes' due to conflict-algorithm selected. ** @@ -982,10 +982,10 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ sqlite3StrICmp(zConflict, "abort" ) != 0 && sqlite3StrICmp(zConflict, "fail" ) != 0 && sqlite3StrICmp(zConflict, "ignore" ) != 0 && - sqlite3StrICmp(zConflict, "tqreplace" ) != 0 ) { + sqlite3StrICmp(zConflict, "replace" ) != 0 ) { Tcl_AppendResult(interp, "Error: \"", zConflict, "\", conflict-algorithm must be one of: rollback, " - "abort, fail, ignore, or tqreplace", 0); + "abort, fail, ignore, or replace", 0); return TCL_ERROR; } zSql = sqlite3_mprintf("SELECT * FROM '%q'", zTable); @@ -1822,7 +1822,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ ** DBNAME that is used to control that connection. The database ** connection is deleted when the DBNAME command is deleted. ** -** The second argument is the name of the directory that tqcontains +** The second argument is the name of the directory that contains ** the sqlite database that is to be accessed. ** ** For testing purposes, we also support the following: diff --git a/kexi/3rdparty/kexisql3/src/vdbe.c b/kexi/3rdparty/kexisql3/src/vdbe.c index 1b5678fd..f4659371 100644 --- a/kexi/3rdparty/kexisql3/src/vdbe.c +++ b/kexi/3rdparty/kexisql3/src/vdbe.c @@ -103,7 +103,7 @@ int sqlite3_sort_count = 0; /* -** An ephemeral string value (signified by the MEM_Ephem flag) tqcontains +** An ephemeral string value (signified by the MEM_Ephem flag) contains ** a pointer to a dynamically allocated string where some other entity ** is responsible for deallocating that string. Because the stack entry ** does not control the string, it might be deleted without the stack @@ -508,7 +508,7 @@ int sqlite3VdbeExec( ** case statement is followed by a comment of the form "/# same as ... #/" ** that comment is used to determine the particular value of the opcode. ** -** If a comment on the same line as the "case OP_" construction tqcontains +** If a comment on the same line as the "case OP_" construction contains ** the word "no-push", then the opcode is guarenteed not to grow the ** vdbe stack when it is executed. See function opcode() in ** vdbeaux.c for details. diff --git a/kexi/3rdparty/kexisql3/src/vdbeInt.h b/kexi/3rdparty/kexisql3/src/vdbeInt.h index dea8465b..89174271 100644 --- a/kexi/3rdparty/kexisql3/src/vdbeInt.h +++ b/kexi/3rdparty/kexisql3/src/vdbeInt.h @@ -160,7 +160,7 @@ typedef struct Mem Mem; #define MEM_Agg 0x0400 /* Mem.z points to an agg function context */ -/* A VdbeFunc is just a FuncDef (defined in sqliteInt.h) that tqcontains +/* A VdbeFunc is just a FuncDef (defined in sqliteInt.h) that contains ** additional information about auxiliary information bound to arguments ** of the function. This is used to implement the sqlite3_get_auxdata() ** and sqlite3_set_auxdata() APIs. The "auxdata" is some auxiliary data diff --git a/kexi/3rdparty/kexisql3/src/vdbeaux.c b/kexi/3rdparty/kexisql3/src/vdbeaux.c index 33c812bf..1ff314d1 100644 --- a/kexi/3rdparty/kexisql3/src/vdbeaux.c +++ b/kexi/3rdparty/kexisql3/src/vdbeaux.c @@ -186,7 +186,7 @@ static int opcodeNoPush(u8 op){ ** to grow the stack when it is executed. Otherwise, it may grow the ** stack by at most one entry. ** - ** NOPUSH_MASK_0 corresponds to opcodes 0 to 15. NOPUSH_MASK_1 tqcontains + ** NOPUSH_MASK_0 corresponds to opcodes 0 to 15. NOPUSH_MASK_1 contains ** one bit for opcodes 16 to 31, and so on. ** ** 16-bit bitmasks (rather than 32-bit) are specified in opcodes.h diff --git a/kexi/3rdparty/kexisql3/src/where.c b/kexi/3rdparty/kexisql3/src/where.c index f4b8ba51..54c8402f 100644 --- a/kexi/3rdparty/kexisql3/src/where.c +++ b/kexi/3rdparty/kexisql3/src/where.c @@ -1284,7 +1284,7 @@ static int nTQPlan = 0; /* Next free slow in _query_plan[] */ /* ** Generate the beginning of the loop used for WHERE clause processing. -** The return value is a pointer to an opaque structure that tqcontains +** The return value is a pointer to an opaque structure that contains ** information needed to terminate the loop. Later, the calling routine ** should invoke sqlite3WhereEnd() with the return value of this function ** in order to complete the WHERE clause processing. diff --git a/kexi/3rdparty/kolibs/koGlobal.cc b/kexi/3rdparty/kolibs/koGlobal.cc index b8f6e23d..3541e6ea 100644 --- a/kexi/3rdparty/kolibs/koGlobal.cc +++ b/kexi/3rdparty/kolibs/koGlobal.cc @@ -139,12 +139,12 @@ void KoGlobal::createListOfLanguages() { // Extract the language tag from the directory name TQString tag = *it; - int index = tag.tqfindRev('/'); + int index = tag.findRev('/'); tag = tag.left(index); - index = tag.tqfindRev('/'); + index = tag.findRev('/'); tag = tag.mid(index+1); - if ( seenLanguages.tqfind( tag ) == seenLanguages.end() ) { + if ( seenLanguages.find( tag ) == seenLanguages.end() ) { KSimpleConfig entry(*it); entry.setGroup("KCM Locale"); @@ -166,7 +166,7 @@ void KoGlobal::createListOfLanguages() TQString KoGlobal::tagOfLanguage( const TQString & _lang) { const LanguageMap& map = self()->m_langMap; - TQMap<TQString,TQString>::ConstIterator it = map.tqfind( _lang ); + TQMap<TQString,TQString>::ConstIterator it = map.find( _lang ); if ( it != map.end() ) return *it; return TQString(); diff --git a/kexi/3rdparty/kolibs/koUnit.cc b/kexi/3rdparty/kolibs/koUnit.cc index bd10e26e..506e24e1 100644 --- a/kexi/3rdparty/kolibs/koUnit.cc +++ b/kexi/3rdparty/kolibs/koUnit.cc @@ -155,7 +155,7 @@ double KoUnit::parseValue( TQString value, double defaultVal ) if( value.isEmpty() ) return defaultVal; - int index = value.tqfind( TQRegExp( "[a-z]+$" ) ); + int index = value.find( TQRegExp( "[a-z]+$" ) ); if ( index == -1 ) return value.toDouble(); diff --git a/kexi/core/kexi.cpp b/kexi/core/kexi.cpp index 4efb6d7b..24cd08e8 100644 --- a/kexi/core/kexi.cpp +++ b/kexi/core/kexi.cpp @@ -335,7 +335,7 @@ void KEXI_UNFINISHED(const TQString& feature_name, const TQString& extra_text) else { TQString feature_name_(feature_name); msg = i18n("\"%1\" function is not available for version %2 of %3 application.") - .tqarg(feature_name_.tqreplace("&","")) + .tqarg(feature_name_.replace("&","")) .tqarg(KEXI_VERSION_STRING) .tqarg(KEXI_APP_NAME); } diff --git a/kexi/core/kexiactioncategories.cpp b/kexi/core/kexiactioncategories.cpp index b3cd1c06..03c09433 100644 --- a/kexi/core/kexiactioncategories.cpp +++ b/kexi/core/kexiactioncategories.cpp @@ -89,7 +89,7 @@ void ActionCategories::addAction(const char* name, int categories, KexiPart::ObjectTypes supportedObjectType5, KexiPart::ObjectTypes supportedObjectType6, KexiPart::ObjectTypes supportedObjectType7, KexiPart::ObjectTypes supportedObjectType8) { - ActionInternal * a = d->actions.tqfind( name ); + ActionInternal * a = d->actions.find( name ); if (a) { a->categories |= categories; } @@ -127,7 +127,7 @@ void ActionCategories::addAction(const char* name, int categories, void ActionCategories::setAllObjectTypesSupported(const char* name, bool set) { - ActionInternal * a = d->actions.tqfind( name ); + ActionInternal * a = d->actions.find( name ); if (a) a->allObjectTypesAreSupported = set; else @@ -136,14 +136,14 @@ void ActionCategories::setAllObjectTypesSupported(const char* name, bool set) int ActionCategories::actionCategories(const char* name) const { - const ActionInternal * a = d->actions.tqfind( name ); + const ActionInternal * a = d->actions.find( name ); return a ? a->categories : 0; } bool ActionCategories::actionSupportsObjectType(const char* name, KexiPart::ObjectTypes objectType) const { - const ActionInternal * a = d->actions.tqfind( name ); + const ActionInternal * a = d->actions.find( name ); if (a && a->allObjectTypesAreSupported) return true; - return (a && a->supportedObjectTypes) ? a->supportedObjectTypes->tqcontains(objectType) : false; + return (a && a->supportedObjectTypes) ? a->supportedObjectTypes->contains(objectType) : false; } diff --git a/kexi/core/kexiactionproxy.cpp b/kexi/core/kexiactionproxy.cpp index 7f5f42f9..4b77b9ef 100644 --- a/kexi/core/kexiactionproxy.cpp +++ b/kexi/core/kexiactionproxy.cpp @@ -269,7 +269,7 @@ void KexiActionProxy::addActionProxyChild( KexiActionProxy* child ) void KexiActionProxy::takeActionProxyChild( KexiActionProxy* child ) { - if (m_sharedActionChildren.tqfindRef( child ) != -1) + if (m_sharedActionChildren.findRef( child ) != -1) m_sharedActionChildren.take(); } diff --git a/kexi/core/kexiblobbuffer.cpp b/kexi/core/kexiblobbuffer.cpp index d1f78c4a..a4c57791 100644 --- a/kexi/core/kexiblobbuffer.cpp +++ b/kexi/core/kexiblobbuffer.cpp @@ -193,7 +193,7 @@ KexiBLOBBuffer::Handle KexiBLOBBuffer::insertPixmap(const KURL& url) return KexiBLOBBuffer::Handle(); } //! @todo what about searching by filename only and then compare data? - Item * item = d->itemsByURL.tqfind(url.prettyURL()); + Item * item = d->itemsByURL.find(url.prettyURL()); if (item) return KexiBLOBBuffer::Handle(item); @@ -212,14 +212,14 @@ KexiBLOBBuffer::Handle KexiBLOBBuffer::insertPixmap(const KURL& url) return KexiBLOBBuffer::Handle(); } TQFileInfo fi(url.fileName()); - TQString caption(fi.baseName().tqreplace('_', " ").simplifyWhiteSpace()); + TQString caption(fi.baseName().replace('_', " ").simplifyWhiteSpace()); item = new Item(data, ++d->maxId, /*!stored*/false, url.fileName(), caption, mimeType); insertItem(item); //cache item->prettyURL = url.prettyURL(); - d->itemsByURL.tqreplace(url.prettyURL(), item); + d->itemsByURL.replace(url.prettyURL(), item); return KexiBLOBBuffer::Handle(item); } @@ -261,7 +261,7 @@ KexiBLOBBuffer::Handle KexiBLOBBuffer::objectForId(Id_t id, bool stored) if (id<=0) return KexiBLOBBuffer::Handle(); if (stored) { - Item *item = d->storedItems.tqfind(id); + Item *item = d->storedItems.find(id); if (item || !d->conn) return KexiBLOBBuffer::Handle(item); //retrieve stored BLOB: @@ -314,7 +314,7 @@ KexiBLOBBuffer::Handle KexiBLOBBuffer::objectForId(Id_t id, bool stored) //#endif } else - return KexiBLOBBuffer::Handle(d->inMemoryItems.tqfind(id)); + return KexiBLOBBuffer::Handle(d->inMemoryItems.find(id)); } KexiBLOBBuffer::Handle KexiBLOBBuffer::objectForId(Id_t id) diff --git a/kexi/core/kexidbconnectionset.cpp b/kexi/core/kexidbconnectionset.cpp index f548d82b..d76ed3f4 100644 --- a/kexi/core/kexidbconnectionset.cpp +++ b/kexi/core/kexidbconnectionset.cpp @@ -101,7 +101,7 @@ bool KexiDBConnectionSet::saveConnectionData(KexiDB::ConnectionData *oldData, { if (!oldData || !newData) return false; - TQMap<KexiDB::ConnectionData*, TQString>::ConstIterator it = d->filenamesForData.tqfind( oldData ); + TQMap<KexiDB::ConnectionData*, TQString>::ConstIterator it = d->filenamesForData.find( oldData ); if (it == d->filenamesForData.constEnd() || it.data().isEmpty()) return false; const TQString filename( it.data() ); @@ -115,7 +115,7 @@ bool KexiDBConnectionSet::saveConnectionData(KexiDB::ConnectionData *oldData, void KexiDBConnectionSet::removeConnectionDataInternal(KexiDB::ConnectionData *data) { - TQMap<KexiDB::ConnectionData*, TQString>::ConstIterator it = d->filenamesForData.tqfind( data ); + TQMap<KexiDB::ConnectionData*, TQString>::ConstIterator it = d->filenamesForData.find( data ); const TQString filename( it.data() ); d->filenamesForData.remove(data); d->dataForFilenames.remove(filename); @@ -126,7 +126,7 @@ bool KexiDBConnectionSet::removeConnectionData(KexiDB::ConnectionData *data) { if (!data) return false; - TQMap<KexiDB::ConnectionData*, TQString>::ConstIterator it = d->filenamesForData.tqfind( data ); + TQMap<KexiDB::ConnectionData*, TQString>::ConstIterator it = d->filenamesForData.find( data ); if (it == d->filenamesForData.constEnd() || it.data().isEmpty()) return false; TQFile file( it.data() ); @@ -173,7 +173,7 @@ TQString KexiDBConnectionSet::fileNameForConnectionData(KexiDB::ConnectionData * { if (!data) return TQString(); - TQMap<KexiDB::ConnectionData*, TQString>::ConstIterator it = d->filenamesForData.tqfind( data ); + TQMap<KexiDB::ConnectionData*, TQString>::ConstIterator it = d->filenamesForData.find( data ); return (it == d->filenamesForData.constEnd()) ? TQString() : it.data(); } diff --git a/kexi/core/kexipartmanager.cpp b/kexi/core/kexipartmanager.cpp index 8cd8fc0e..00575461 100644 --- a/kexi/core/kexipartmanager.cpp +++ b/kexi/core/kexipartmanager.cpp @@ -81,7 +81,7 @@ Manager::lookup() if (!Kexi::tempShowScripts() && mime=="kexi/script") continue; //</TEMP> - int idx = sl_order.tqfindIndex( ptr->library() ); + int idx = sl_order.findIndex( ptr->library() ); if (idx!=-1) ordered.insert(idx, ptr); else //add to end @@ -254,11 +254,11 @@ Manager::checkProject(KexiDB::Connection *conn) KexiDB::FieldList *fl = ts->subList("p_id", "p_name", "p_mime", "p_url"); if (!fl) return false; - if (!parts_found.tqcontains("kexi/table")) { + if (!parts_found.contains("kexi/table")) { if (!conn->insertRecord(*fl, TQVariant(1), TQVariant("Tables"), TQVariant("kexi/table"), TQVariant("http://"))) return false; } - if (!parts_found.tqcontains("kexi/query")) { + if (!parts_found.contains("kexi/query")) { if (!conn->insertRecord(*fl, TQVariant(2), TQVariant("Queries"), TQVariant("kexi/query"), TQVariant("http://"))) return false; } diff --git a/kexi/core/kexiproject.cpp b/kexi/core/kexiproject.cpp index 7a2d9367..159de750 100644 --- a/kexi/core/kexiproject.cpp +++ b/kexi/core/kexiproject.cpp @@ -664,7 +664,7 @@ KexiProject::item(int identifier) { KexiPart::ItemDict *dict; for (TQIntDictIterator<KexiPart::ItemDict> it(d->itemDictsCache); (dict = it.current()); ++it) { - KexiPart::Item *item = dict->tqfind(identifier); + KexiPart::Item *item = dict->find(identifier); if (item) return item; } diff --git a/kexi/core/kexisearchandreplaceiface.h b/kexi/core/kexisearchandreplaceiface.h index f581de34..0101c7ce 100644 --- a/kexi/core/kexisearchandreplaceiface.h +++ b/kexi/core/kexisearchandreplaceiface.h @@ -78,10 +78,10 @@ class KEXICORE_EXPORT KexiSearchAndReplaceViewInterface bool promptOnReplace : 1; }; - /*! Sets up data for tqfind/replace dialog, based on view's data model. + /*! Sets up data for find/replace dialog, based on view's data model. \a columnNames should contain column name, \a columnCaptions should contain column captions, and \a currentColumnName should beset to current column's name. - Implementation should set up values and return true if tqfind/replace dialog should be filled. */ + Implementation should set up values and return true if find/replace dialog should be filled. */ virtual bool setupFindAndReplace(TQStringList& columnNames, TQStringList& columnCaptions, TQString& currentColumnName) = 0; @@ -90,7 +90,7 @@ class KEXICORE_EXPORT KexiSearchAndReplaceViewInterface \return true if value has been found, false if value has not been found, and cancelled if there is nothing to find or there is no data to search in. If \a next is true, "find next" is performed, else "find previous" is performed. */ - virtual tristate tqfind(const TQVariant& valueToFind, + virtual tristate find(const TQVariant& valueToFind, const KexiSearchAndReplaceViewInterface::Options& options, bool next) = 0; /*! Finds \a valueToFind within the view and replaces with \a replacement diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp index a98ac5a6..aabba3e2 100644 --- a/kexi/core/kexisharedactionhost.cpp +++ b/kexi/core/kexisharedactionhost.cpp @@ -119,7 +119,7 @@ void KexiSharedActionHost::updateActionAvailable(const char *action_name, bool a setActionAvailable(action_name, avail); if (avail) { - d->enablers.tqreplace(action_name, fw); + d->enablers.replace(action_name, fw); } else { d->enablers.take(action_name); diff --git a/kexi/data/kde34compat/sqlite.magic b/kexi/data/kde34compat/sqlite.magic index 4e43a7fe..a31592fb 100644 --- a/kexi/data/kde34compat/sqlite.magic +++ b/kexi/data/kde34compat/sqlite.magic @@ -1,2 +1,2 @@ -0 string **\ This\ file\ tqcontains\ an\ SQLite application/x-sqlite2 +0 string **\ This\ file\ contains\ an\ SQLite application/x-sqlite2 0 string SQLite\ format\ 3 application/x-sqlite3 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 16195281..9d74be25 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 @@ -387,7 +387,7 @@ For each widget inserted into the form, there are settings for size policy avail <br><img src="img/05_04_09_size_policy_properties.png"> <br>A group of properties for defining a widget's size policy<br><br> -This group of properties tqcontains: +This group of properties contains: <ul> <li><b>Horizontal Size Policy</b> defining horizontal size of the widget,</li> <li><b>Vertical Size Policy</b> defining vertical size of the widget,</li> diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp index c08e44e6..c2319069 100644 --- a/kexi/formeditor/commands.cpp +++ b/kexi/formeditor/commands.cpp @@ -127,7 +127,7 @@ PropertyCommand::unexecute() WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(widg); TQWidget *subWidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : widg; - if (-1!=subWidget->tqmetaObject()->tqfindProperty( m_property, true )) + if (-1!=subWidget->tqmetaObject()->findProperty( m_property, true )) subWidget->setProperty(m_property, it.data()); } diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp index a9942d1c..2b6d5eb7 100644 --- a/kexi/formeditor/container.cpp +++ b/kexi/formeditor/container.cpp @@ -174,7 +174,7 @@ Container::eventFilter(TQObject *s, TQEvent *e) if(((mev->state() == ControlButton) || (mev->state() == ShiftButton)) && (!FormManager::self()->isInserting())) // multiple selection mode { - if(m_form->selectedWidgets()->tqfindRef(m_moving) != -1) // widget is already selected + if(m_form->selectedWidgets()->findRef(m_moving) != -1) // widget is already selected { if(m_form->selectedWidgets()->count() > 1) // we remove it from selection unSelectWidget(m_moving); @@ -191,7 +191,7 @@ Container::eventFilter(TQObject *s, TQEvent *e) } else if((m_form->selectedWidgets()->count() > 1))//&& (!m_form->manager()->isInserting())) // more than one widget selected { - if(m_form->selectedWidgets()->tqfindRef(m_moving) == -1) // widget is not selected, it becomes the only selected widget + if(m_form->selectedWidgets()->findRef(m_moving) == -1) // widget is not selected, it becomes the only selected widget setSelectedWidget(m_moving, false, (mev->button() == Qt::RightButton)); // If the widget is already selected, we do nothing (to ease widget moving, etc.) } @@ -353,7 +353,7 @@ Container::eventFilter(TQObject *s, TQEvent *e) // try to find the widget which was clicked last and should be edited if(m_form->selectedWidgets()->count() == 1) w = m_form->selectedWidgets()->first(); - else if(m_form->selectedWidgets()->tqfindRef(m_moving) != -1) + else if(m_form->selectedWidgets()->findRef(m_moving) != -1) w = m_moving; else w = m_form->selectedWidgets()->last(); @@ -411,7 +411,7 @@ Container::eventFilter(TQObject *s, TQEvent *e) ObjectTreeList *list = item->tqparent()->tqchildren(); if(list->count() == 1) return true; - int index = list->tqfindRef(item); + int index = list->findRef(item); if(kev->key() == Key_BackTab){ if(index == 0) // go back to the last item diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp index 15011e50..ff7a2562 100644 --- a/kexi/formeditor/factories/containerfactory.cpp +++ b/kexi/formeditor/factories/containerfactory.cpp @@ -625,7 +625,7 @@ ContainerFactory::previewWidget(const TQCString &classname, TQWidget *widget, KF { TQWidgetStack *stack = ((TQWidgetStack*)widget); KFormDesigner::ObjectTreeItem *tree = container->form()->objectTree()->lookup(widget->name()); - if(!tree->modifiedProperties()->tqcontains("frameShape")) + if(!tree->modifiedProperties()->contains("frameShape")) stack->setFrameStyle(TQFrame::NoFrame); } else if(classname == "HBox") diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp index 08621283..32c557b3 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.cpp +++ b/kexi/formeditor/factories/stdwidgetfactory.cpp @@ -972,7 +972,7 @@ StdWidgetFactory::setPropertyOptions( KFormDesigner::WidgetPropertySet& buf, con Q_UNUSED( info ); Q_UNUSED( w ); - if (buf.tqcontains("indent")) { + if (buf.contains("indent")) { buf["indent"].setOption("min", -1); buf["indent"].setOption("minValueText", i18n("default indent value", "default")); } diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp index 6acf139c..e8b25c84 100644 --- a/kexi/formeditor/form.cpp +++ b/kexi/formeditor/form.cpp @@ -176,7 +176,7 @@ Form::commonParentContainer(WidgetList *wlist) // Creates a list of all widget parents for(TQWidget *w = wlist->first(); w; w = wlist->next()) { - if(list->tqfindRef(w->parentWidget()) == -1) + if(list->findRef(w->parentWidget()) == -1) list->append(w->parentWidget()); } @@ -465,14 +465,14 @@ Form::addWidgetToTabStops(ObjectTreeItem *it) // For composed widgets, we check if one of the child can have focus for(TQObjectListIterator chIt(clo); chIt.current(); ++chIt) { if(chIt.current()->isWidgetType()) {//TQ_TabFocus flag will be checked later! - if(d->tabstops.tqfindRef(it) == -1) { + if(d->tabstops.findRef(it) == -1) { d->tabstops.append(it); return; } } } } - else if(d->tabstops.tqfindRef(it) == -1) // not yet in the list + else if(d->tabstops.findRef(it) == -1) // not yet in the list d->tabstops.append(it); } diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp index dbfdc10a..639b4a83 100644 --- a/kexi/formeditor/formIO.cpp +++ b/kexi/formeditor/formIO.cpp @@ -324,7 +324,7 @@ FormIO::loadFormFromDom(Form *form, TQWidget *container, TQDomDocument &inBuf) } //update format version information uint ver = 1; //the default - if (form->headerProperties()->tqcontains("version")) { + if (form->headerProperties()->contains("version")) { bool ok; uint v = (*form->headerProperties())["version"].toUInt(&ok); if (ok) @@ -369,7 +369,7 @@ FormIO::loadFormFromDom(Form *form, TQWidget *container, TQDomDocument &inBuf) kdDebug() << "FormIO::loadFormFromDom ERROR : no ObjectTreeItem " << endl; continue; } - const int index = form->tabStops()->tqfindRef(item); + const int index = form->tabStops()->findRef(item); /* Compute a real destination index: "a number of not found items so far". */ const int realIndex = i - itemsNotFound; if((index != -1) && (index != realIndex)) // the widget is not in the same place, so we move it @@ -406,10 +406,10 @@ FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &tqparent, con WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(w); TQWidget *subwidget = w; bool addSubwidgetFlag = false; - int propertyId = w->tqmetaObject()->tqfindProperty(name, true); + int propertyId = w->tqmetaObject()->findProperty(name, true); if (propertyId == -1 && subpropIface && subpropIface->subwidget()) { // try property from subwidget subwidget = subpropIface->subwidget(); - propertyId = subpropIface->subwidget()->tqmetaObject()->tqfindProperty(name, true); + propertyId = subpropIface->subwidget()->tqmetaObject()->findProperty(name, true); addSubwidgetFlag = true; } if(propertyId == -1) @@ -865,7 +865,7 @@ FormIO::readPropertyValue(TQDomNode node, TQObject *obj, const TQString &name) } else if(type == "pixmap") { - if(m_savePixmapsInline || !m_currentForm || !m_currentItem || !m_currentForm->pixmapCollection()->tqcontains(text)) + if(m_savePixmapsInline || !m_currentForm || !m_currentItem || !m_currentForm->pixmapCollection()->contains(text)) return loadImage(tag.ownerDocument(), text); else { @@ -880,7 +880,7 @@ 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()->tqfindProperty(name.latin1(), true); + const int count = subobject->tqmetaObject()->findProperty(name.latin1(), true); const TQMetaProperty *meta = count!=-1 ? subobject->tqmetaObject()->property(count, true) : 0; if (meta) { @@ -1025,9 +1025,9 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument & { tqlayout = domDoc.createElement("temp"); savePropertyValue(tqlayout, domDoc, "name", "unnamed", item->widget()); - if(item->modifiedProperties()->tqcontains("layoutMargin")) + if(item->modifiedProperties()->contains("layoutMargin")) savePropertyElement(tqlayout, domDoc, "property", "margin", item->container()->layoutMargin()); - if(item->modifiedProperties()->tqcontains("layoutSpacing")) + if(item->modifiedProperties()->contains("layoutSpacing")) savePropertyElement(tqlayout, domDoc, "property", "spacing", item->container()->layoutSpacing()); tclass.appendChild(tqlayout); } @@ -1261,7 +1261,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *tqpar = 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()->tqfindProperty(*it, true) != -1) + if(subwidget->tqmetaObject()->findProperty(*it, true) != -1) item->addModifiedProperty(*it, subwidget->property(*it)); } @@ -1376,7 +1376,7 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl } } // If the object doesn't have this property, we let the Factory handle it (maybe a special property) - else if(subwidget->tqmetaObject()->tqfindProperty(name.latin1(), true) == -1) + else if(subwidget->tqmetaObject()->findProperty(name.latin1(), true) == -1) { if(w->className() == TQString::tqfromLatin1("CustomWidget")) item->storeUnknownProperty(node); @@ -1611,7 +1611,7 @@ FormIO::loadImage(TQDomDocument domDoc, const TQString& name) ba[2] = ( len & 0x0000ff00 ) >> 8; ba[3] = ( len & 0x000000ff ); TQByteArray baunzip = tqUncompress(ba, baSize); - pix.loadFromData( (const uchar*)baunzip.data(), baunzip.size(), format.left(format.tqfind('.')).latin1() ); + pix.loadFromData( (const uchar*)baunzip.data(), baunzip.size(), format.left(format.find('.')).latin1() ); } else pix.loadFromData( (const uchar*)ba+lengthOffset, baSize-lengthOffset, format.latin1() ); diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp index 4004fcd4..66948abb 100644 --- a/kexi/formeditor/formmanager.cpp +++ b/kexi/formeditor/formmanager.cpp @@ -328,7 +328,7 @@ FormManager::stopInsert() TQT_TQWIDGET(o)->unsetCursor(); #if 0 if( ((TQWidget*)o)->ownCursor()) { - TQMap<TQObject*,TQCursor>::ConstIterator curIt( form->d->cursors.tqfind(o) ); + TQMap<TQObject*,TQCursor>::ConstIterator curIt( form->d->cursors.find(o) ); if (curIt!=form->d->cursors.constEnd()) TQT_TQWIDGET(o)->setCursor( *curIt ); // ((TQWidget*)o)->setCursor( (*(form->d->cursors))[o->name()] ) ; @@ -437,7 +437,7 @@ FormManager::stopCreatingConnection() { TQWidget *w = (TQWidget*)o; if( w->ownCursor()) { - TQMap<TQObject*,TQCursor>::ConstIterator curIt( form->d->cursors.tqfind(o) ); + TQMap<TQObject*,TQCursor>::ConstIterator curIt( form->d->cursors.find(o) ); if (curIt!=form->d->cursors.constEnd()) TQT_TQWIDGET(o)->setCursor( *curIt ); } @@ -595,7 +595,7 @@ FormManager::deleteForm(Form *form) { if (!form) return; - if(m_forms.tqfind(form) == -1) + if(m_forms.find(form) == -1) m_preview.remove(form); else m_forms.remove(form); @@ -898,7 +898,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu separatorNeeded = true; // We create the buddy menu - if(!multiple && w->inherits(TQLABEL_OBJECT_NAME_STRING) && ((TQLabel*)w)->text().tqcontains("&") && (((TQLabel*)w)->textFormat() != RichText)) + if(!multiple && w->inherits(TQLABEL_OBJECT_NAME_STRING) && ((TQLabel*)w)->text().contains("&") && (((TQLabel*)w)->textFormat() != RichText)) { if (separatorNeeded) m_popup->insertSeparator(); @@ -1103,7 +1103,7 @@ FormManager::createLayout(int layoutType) if(list->count() == 1) { ObjectTreeItem *item = m_active->objectTree()->lookup(list->first()->name()); - if(!item || !item->container() || !m_propSet->tqcontains("tqlayout")) + if(!item || !item->container() || !m_propSet->contains("tqlayout")) return; (*m_propSet)["tqlayout"] = Container::layoutTypeToString(layoutType); return; @@ -1493,7 +1493,7 @@ 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()->tqfindProperty("font", true)) { + if (-1 != it.current()->tqmetaObject()->findProperty("font", true)) { fontEnabled = true; break; } diff --git a/kexi/formeditor/objecttree.cpp b/kexi/formeditor/objecttree.cpp index f9dad43a..a00fbcbb 100644 --- a/kexi/formeditor/objecttree.cpp +++ b/kexi/formeditor/objecttree.cpp @@ -80,7 +80,7 @@ ObjectTreeItem::addModifiedProperty(const TQCString &property, const TQVariant & if(property == "name") return; - if(!m_props.tqcontains(property)) { + if(!m_props.contains(property)) { m_props.insert(property, oldValue); kdDebug() << "ObjectTree::adModProperty(): Added this property in the list: " << property << " oldValue: " << oldValue << endl; } @@ -91,7 +91,7 @@ ObjectTreeItem::addSubproperty(const TQCString &property, const TQVariant& value { if (!m_subprops) m_subprops = new TQMap<TQString, TQVariant>(); - if (!m_props.tqcontains(property)) + if (!m_props.contains(property)) m_subprops->insert( property, value ); } @@ -113,7 +113,7 @@ ObjectTreeItem::setPixmapName(const TQCString &property, const TQString &name) TQString ObjectTreeItem::pixmapName(const TQCString &property) { - if(m_pixmapNames.tqcontains(property)) + if(m_pixmapNames.contains(property)) return m_pixmapNames[property]; return TQString(); } diff --git a/kexi/formeditor/objecttreeview.cpp b/kexi/formeditor/objecttreeview.cpp index 4f258446..e6802d81 100644 --- a/kexi/formeditor/objecttreeview.cpp +++ b/kexi/formeditor/objecttreeview.cpp @@ -280,7 +280,7 @@ ObjectTreeView::slotSelectionChanged() { ObjectTreeViewItem *it = static_cast<ObjectTreeViewItem*>(item); TQWidget *w = it->objectTree()->widget(); - if(w && (m_form->selectedWidgets()->tqfindRef(w) == -1)) + if(w && (m_form->selectedWidgets()->findRef(w) == -1)) m_form->setSelectedWidget(w, true, true); } if (hadFocus) diff --git a/kexi/formeditor/scripting/scriptIO.h b/kexi/formeditor/scripting/scriptIO.h index 9261d75c..f384fade 100644 --- a/kexi/formeditor/scripting/scriptIO.h +++ b/kexi/formeditor/scripting/scriptIO.h @@ -41,7 +41,7 @@ class ScriptIO public: /*! Save the evnts of a form. Creates an \<events\> tag, and then one \<event\> tag for each event. - Each event tqcontains \<sender\> and \<receiver\> tags, with attributes depending on event type. */ + Each event contains \<sender\> and \<receiver\> tags, with attributes depending on event type. */ static bool saveFormEvents(TQDomNode &parentNode, FormScript *script); /*! Reads the \<events\> tag (\a parentNode), then creates and fills a FormScript object linked to this \a form. The new FormScript object is then added to ScriptManager list.*/ diff --git a/kexi/formeditor/utils.cpp b/kexi/formeditor/utils.cpp index f80c2c27..6ce4bcae 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()->tqcontains("cursor")) || !tree->tqchildren()->isEmpty()) + if(tree && ((tree->modifiedProperties()->contains("cursor")) || !tree->tqchildren()->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 diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfactory.cpp index f26661ab..3e0458b9 100644 --- a/kexi/formeditor/widgetfactory.cpp +++ b/kexi/formeditor/widgetfactory.cpp @@ -100,7 +100,7 @@ void WidgetInfo::addAlternateClassName(const TQCString& alternateName, bool over bool WidgetInfo::isOverriddenClassName(const TQCString& alternateName) const { - return m_overriddenAlternateNames && (m_overriddenAlternateNames->tqfind(alternateName) != 0); + return m_overriddenAlternateNames && (m_overriddenAlternateNames->find(alternateName) != 0); } void WidgetInfo::setAutoSyncForProperty(const char *propertyName, tristate flag) @@ -121,7 +121,7 @@ void WidgetInfo::setAutoSyncForProperty(const char *propertyName, tristate flag) tristate WidgetInfo::autoSyncForProperty(const char *propertyName) const { - char* flag = m_propertiesWithDisabledAutoSync ? m_propertiesWithDisabledAutoSync->tqfind(propertyName) : 0; + char* flag = m_propertiesWithDisabledAutoSync ? m_propertiesWithDisabledAutoSync->find(propertyName) : 0; if (!flag) return cancelled; return flag==(char*)1 ? true : false; @@ -134,12 +134,12 @@ void WidgetInfo::setCustomTypeForProperty(const char *propertyName, int type) if (!m_customTypesForProperty) { m_customTypesForProperty = new TQMap<TQCString,int>(); } - m_customTypesForProperty->tqreplace(propertyName, type); + m_customTypesForProperty->replace(propertyName, type); } int WidgetInfo::customTypeForProperty(const char *propertyName) const { - if (!m_customTypesForProperty || !m_customTypesForProperty->tqcontains(propertyName)) + if (!m_customTypesForProperty || !m_customTypesForProperty->contains(propertyName)) return KoProperty::Auto; return (*m_customTypesForProperty)[propertyName]; } @@ -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()->tqfindProperty("margin", true) && -1!=subwidget->tqmetaObject()->tqfindProperty("margin", true)) + if (-1!=m_editor->tqmetaObject()->findProperty("margin", true) && -1!=subwidget->tqmetaObject()->findProperty("margin", true)) m_editor->setProperty("margin", subwidget->property("margin")); //#endif //js m_handles = new ResizeHandleSet(w, container->form(), true); @@ -520,7 +520,7 @@ WidgetFactory::changeProperty(const char *name, const TQVariant &value, Form *fo else { WidgetPropertySet *set = KFormDesigner::FormManager::self()->propertySet(); - if(set->tqcontains(name)) + if(set->contains(name)) (*set)[name] = value; } } diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp index ac663f8b..3d8607ba 100644 --- a/kexi/formeditor/widgetlibrary.cpp +++ b/kexi/formeditor/widgetlibrary.cpp @@ -173,20 +173,20 @@ WidgetLibrary::loadFactoryWidgets(WidgetFactory *f) // TQStringList l = TQStringList::split("|", w->alternateClassName()); TQValueList<TQCString>::ConstIterator endIt = l.constEnd(); for(TQValueList<TQCString>::ConstIterator it = l.constBegin(); it != endIt; ++it) { - WidgetInfo *widgetForClass = d->widgets.tqfind( *it ); + WidgetInfo *widgetForClass = d->widgets.find( *it ); if (!widgetForClass || (widgetForClass && !widgetForClass->isOverriddenClassName(*it))) { //insert a widgetinfo, if: //1) this class has no alternate class assigned yet, or //2) this class has alternate class assigned but without 'override' flag - d->widgets.tqreplace( *it, w); + d->widgets.replace( *it, w); } -/* WidgetInfo *widgetForClass = d->alternateWidgets.tqfind(*it); +/* WidgetInfo *widgetForClass = d->alternateWidgets.find(*it); if (!widgetForClass || (widgetForClass && !widgetForClass->isOverriddenClassName(*it))) { //insert a widgetinfo, if: //1) this class has no alternate class assigned yet, or //2) this class has alternate class assigned but without 'override' flag - d->alternateWidgets.tqreplace(*it, w); + d->alternateWidgets.replace(*it, w); }*/ } } @@ -249,7 +249,7 @@ WidgetLibrary::loadFactories() //collect information about classes to be hidden if (f->m_hiddenClasses) { for (TQAsciiDictIterator<char> it2(*f->m_hiddenClasses); it2.current(); ++it2) { - d->hiddenClasses.tqreplace( it2.currentKey(), (char*)1 ); + d->hiddenClasses.replace( it2.currentKey(), (char*)1 ); } } } @@ -453,7 +453,7 @@ TQString WidgetLibrary::displayName(const TQCString &classname) { loadFactories(); - WidgetInfo *wi = d->widgets.tqfind(classname); + WidgetInfo *wi = d->widgets.find(classname); if(wi) return wi->name(); @@ -465,7 +465,7 @@ WidgetLibrary::savingName(const TQCString &classname) { loadFactories(); TQString s; - WidgetInfo *wi = d->widgets.tqfind(classname); + WidgetInfo *wi = d->widgets.find(classname); if(wi && !wi->savingName().isEmpty()) return wi->savingName(); @@ -476,7 +476,7 @@ TQString WidgetLibrary::namePrefix(const TQCString &classname) { loadFactories(); - WidgetInfo *wi = d->widgets.tqfind(classname); + WidgetInfo *wi = d->widgets.find(classname); if(wi) return wi->namePrefix(); @@ -501,7 +501,7 @@ TQCString WidgetLibrary::classNameForAlternate(const TQCString &classname) { loadFactories(); - if(d->widgets.tqfind(classname)) + if(d->widgets.find(classname)) return classname; WidgetInfo *wi = d->widgets[classname]; @@ -517,7 +517,7 @@ TQString WidgetLibrary::includeFileName(const TQCString &classname) { loadFactories(); - WidgetInfo *wi = d->widgets.tqfind(classname); + WidgetInfo *wi = d->widgets.find(classname); if(wi) return wi->includeFileName(); @@ -528,7 +528,7 @@ TQString WidgetLibrary::iconName(const TQCString &classname) { loadFactories(); - WidgetInfo *wi = d->widgets.tqfind(classname); + WidgetInfo *wi = d->widgets.find(classname); if(wi) return wi->pixmap(); @@ -539,7 +539,7 @@ bool WidgetLibrary::saveSpecialProperty(const TQCString &classname, const TQString &name, const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent) { loadFactories(); - WidgetInfo *wi = d->widgets.tqfind(classname); + WidgetInfo *wi = d->widgets.find(classname); if (!wi) return false; @@ -555,7 +555,7 @@ bool WidgetLibrary::readSpecialProperty(const TQCString &classname, TQDomElement &node, TQWidget *w, ObjectTreeItem *item) { loadFactories(); - WidgetInfo *wi = d->widgets.tqfind(classname); + WidgetInfo *wi = d->widgets.find(classname); if (!wi) return false; if (wi->factory()->readSpecialProperty(classname, node, w, item)) @@ -587,7 +587,7 @@ WidgetLibrary::isPropertyVisible(const TQCString &classname, TQWidget *w, } loadFactories(); - WidgetInfo *wi = d->widgets.tqfind(classname); + WidgetInfo *wi = d->widgets.find(classname); if (!wi) return false; if (!d->showAdvancedProperties && d->advancedProperties[ property ]) { @@ -613,7 +613,7 @@ TQValueList<TQCString> WidgetLibrary::autoSaveProperties(const TQCString &classname) { loadFactories(); - WidgetInfo *wi = d->widgets.tqfind(classname); + WidgetInfo *wi = d->widgets.find(classname); if(!wi) return TQValueList<TQCString>(); TQValueList<TQCString> lst; @@ -628,7 +628,7 @@ WidgetInfo* WidgetLibrary::widgetInfoForClassName(const char* classname) { loadFactories(); - return d->widgets.tqfind(classname); + return d->widgets.find(classname); } WidgetFactory* diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp index 55bd4c60..bd150e45 100644 --- a/kexi/formeditor/widgetpropertyset.cpp +++ b/kexi/formeditor/widgetpropertyset.cpp @@ -126,9 +126,9 @@ WidgetPropertySet::property(const TQCString &name) } bool -WidgetPropertySet::tqcontains(const TQCString &property) +WidgetPropertySet::contains(const TQCString &property) { - return d->set.tqcontains(property); + return d->set.contains(property); } KoProperty::Set* @@ -195,7 +195,7 @@ WidgetPropertySet::setSelectedWidget(TQWidget *w, bool add, bool forceReload, bo } // don't add a widget twice - if(!forceReload && d->widgets.tqcontains(TQGuardedPtr<TQWidget>(w))) { + if(!forceReload && d->widgets.contains(TQGuardedPtr<TQWidget>(w))) { kdWarning() << "WidgetPropertySet::setSelectedWidget() Widget is already selected" << endl; return; } @@ -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()->tqfindProperty(*it, true), true); + : w->tqmetaObject()->property( w->tqmetaObject()->findProperty(*it, true), true); if (!meta) continue; const char* propertyName = meta->name(); @@ -317,14 +317,14 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w) WidgetInfo *subwinfo = form->library()->widgetInfoForClassName(subwidget->className()); // kdDebug() << "$$$ " << subwidget->className() << endl; - if(subwinfo && meta->designable(subwidget) && !d->set.tqcontains(propertyName)) { + if(subwinfo && meta->designable(subwidget) && !d->set.contains(propertyName)) { //! \todo add another list for property description TQString desc( d->propCaption[meta->name()] ); //! \todo change i18n if (desc.isEmpty()) //try to get property description from factory desc = form->library()->propertyDescForName(subwinfo, propertyName); - modifiedPropertiesIt = modifiedProperties->tqfind(propertyName); + modifiedPropertiesIt = modifiedProperties->find(propertyName); const bool oldValueExists = modifiedPropertiesIt!=modifiedProperties->constEnd(); if(meta->isEnumType()) { @@ -411,12 +411,12 @@ void WidgetPropertySet::updatePropertyValue(ObjectTreeItem *tree, const char *property, const TQMetaProperty *meta) { const char *propertyName = meta ? meta->name() : property; - if (!d->set.tqcontains(propertyName)) + if (!d->set.contains(propertyName)) return; KoProperty::Property p( d->set[propertyName] ); //! \todo what about set properties, and lists properties - TQMap<TQString, TQVariant>::ConstIterator it( tree->modifiedProperties()->tqfind(propertyName) ); + TQMap<TQString, TQVariant>::ConstIterator it( tree->modifiedProperties()->find(propertyName) ); if (it != tree->modifiedProperties()->constEnd()) { blockSignals(true); if(meta && meta->isEnumType()) { @@ -485,7 +485,7 @@ WidgetPropertySet::slotPropertyChanged(KoProperty::Set& set, KoProperty::Propert return; TQCString property = p.name(); - if (0==property.tqfind("this:")) + if (0==property.find("this:")) return; //starts with magical prefix: it's a "meta" prop. TQVariant value = p.value(); @@ -608,7 +608,7 @@ WidgetPropertySet::createPropertyCommandsInDesignMode(TQWidget* widget, // CommandGroup *group = new CommandGroup(commandName); for(TQMap<TQCString, TQVariant>::ConstIterator it = propValues.constBegin(); it != endIt; ++it) { - if (!d->set.tqcontains(it.key())) { + if (!d->set.contains(it.key())) { kdWarning() << "WidgetPropertySet::createPropertyCommandsInDesignMode(): \"" <<it.key()<<"\" property not found"<<endl; continue; } @@ -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()->tqfindProperty(it.key(), true) && subwidget->property(it.key())!=it.data()) { + if (-1 != subwidget->tqmetaObject()->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())); @@ -711,15 +711,15 @@ WidgetPropertySet::slotPropertyReset(KoProperty::Set& set, KoProperty::Property& // for(TQWidget *w = d->widgets.first(); w; w = d->widgets.next()) { foreach(TQGuardedWidgetList::ConstIterator, it, d->widgets) { ObjectTreeItem *tree = KFormDesigner::FormManager::self()->activeForm()->objectTree()->lookup((*it)->name()); - if(tree->modifiedProperties()->tqcontains(property.name())) - (*it)->setProperty(property.name(), tree->modifiedProperties()->tqfind(property.name()).data()); + if(tree->modifiedProperties()->contains(property.name())) + (*it)->setProperty(property.name(), tree->modifiedProperties()->find(property.name()).data()); } } void WidgetPropertySet::slotWidgetDestroyed() { -// if(d->widgets.tqcontains(TQGuardedPtr<const TQWidget>( dynamic_cast<const TQWidget*>(sender()) ))) { +// if(d->widgets.contains(TQGuardedPtr<const TQWidget>( dynamic_cast<const TQWidget*>(sender()) ))) { //only clear this set if it contains the destroyed widget foreach(TQGuardedWidgetList::ConstIterator, it, d->widgets) { if (dynamic_cast<const TQWidget*>(sender()) == *it) { @@ -735,7 +735,7 @@ WidgetPropertySet::eventFilter(TQObject *o, TQEvent *ev) if(d->widgets.count() > 0 && o == d->widgets.first() && d->widgets.count() < 2) { if((ev->type() == TQEvent::Resize) || (ev->type() == TQEvent::Move)) { - if(!d->set.tqcontains("geometry")) + if(!d->set.contains("geometry")) return false; if(d->set["geometry"].value() == o->property("geometry")) // to avoid infinite recursion return false; @@ -785,15 +785,15 @@ WidgetPropertySet::createAlignProperty(const TQMetaProperty *meta, TQWidget *wid ObjectTreeItem *tree = KFormDesigner::FormManager::self()->activeForm()->objectTree()->lookup(widget->name()); bool isTopLevel = KFormDesigner::FormManager::self()->isTopLevel(widget); - if(possibleValues.tqfind("AlignHCenter")!=possibleValues.constEnd()) { + if(possibleValues.find("AlignHCenter")!=possibleValues.constEnd()) { // Create the horizontal tqalignment property - if(keys.tqfind("AlignHCenter")!=keys.constEnd() || keys.tqfind("AlignCenter")!=keys.constEnd()) + if(keys.find("AlignHCenter")!=keys.constEnd() || keys.find("AlignCenter")!=keys.constEnd()) value = "AlignHCenter"; - else if(keys.tqfind("AlignRight")!=keys.constEnd()) + else if(keys.find("AlignRight")!=keys.constEnd()) value = "AlignRight"; - else if(keys.tqfind("AlignLeft")!=keys.constEnd()) + else if(keys.find("AlignLeft")!=keys.constEnd()) value = "AlignLeft"; - else if(keys.tqfind("AlignJustify")!=keys.constEnd()) + else if(keys.find("AlignJustify")!=keys.constEnd()) value = "AlignJustify"; else value = "AlignAuto"; @@ -810,12 +810,12 @@ WidgetPropertySet::createAlignProperty(const TQMetaProperty *meta, TQWidget *wid list.clear(); } - if(possibleValues.tqfind("AlignTop")!=possibleValues.constEnd()) + if(possibleValues.find("AlignTop")!=possibleValues.constEnd()) { // Create the ver tqalignment property - if(keys.tqfind("AlignTop")!=keys.constEnd()) + if(keys.find("AlignTop")!=keys.constEnd()) value = "AlignTop"; - else if(keys.tqfind("AlignBottom")!=keys.constEnd()) + else if(keys.find("AlignBottom")!=keys.constEnd()) value = "AlignBottom"; else value = "AlignVCenter"; @@ -831,7 +831,7 @@ WidgetPropertySet::createAlignProperty(const TQMetaProperty *meta, TQWidget *wid updatePropertyValue(tree, "vAlign"); } - if(possibleValues.tqfind("WordBreak")!=possibleValues.constEnd() + if(possibleValues.find("WordBreak")!=possibleValues.constEnd() // && isPropertyVisible("wordbreak", false, subwidget->className()) // && !subWidget->inherits(TQLINEEDIT_OBJECT_NAME_STRING) /* TQLineEdit doesn't support 'word break' is this generic enough?*/ ) { @@ -855,17 +855,17 @@ WidgetPropertySet::saveAlignProperty(const TQString &property) return; TQStrList list; - if( d->set.tqcontains("hAlign") ) + if( d->set.contains("hAlign") ) list.append( d->set["hAlign"].value().toCString() ); - if( d->set.tqcontains("vAlign") ) + if( d->set.contains("vAlign") ) list.append( d->set["vAlign"].value().toCString() ); - if( d->set.tqcontains("wordbreak") && d->set["wordbreak"].value().toBool() ) + if( d->set.contains("wordbreak") && d->set["wordbreak"].value().toBool() ) list.append("WordBreak"); WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>( (TQWidget*)d->widgets.first() ); TQWidget *subwidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : (TQWidget*)d->widgets.first(); - int count = subwidget->tqmetaObject()->tqfindProperty("tqalignment", true); + int count = subwidget->tqmetaObject()->findProperty("tqalignment", true); const TQMetaProperty *meta = subwidget->tqmetaObject()->property(count, true); subwidget->setProperty("tqalignment", meta->keysToValue(list)); @@ -1106,14 +1106,14 @@ WidgetPropertySet::createValueList(WidgetInfo *winfo, const TQStringList &list) void WidgetPropertySet::addPropertyCaption(const TQCString &property, const TQString &caption) { - if(!d->propCaption.tqcontains(property)) + if(!d->propCaption.contains(property)) d->propCaption[property] = caption; } void WidgetPropertySet::addValueCaption(const TQCString &value, const TQString &caption) { - if(!d->propValCaption.tqcontains(value)) + if(!d->propValCaption.contains(value)) d->propValCaption[value] = caption; } diff --git a/kexi/formeditor/widgetpropertyset.h b/kexi/formeditor/widgetpropertyset.h index d330e4ed..cc403ef0 100644 --- a/kexi/formeditor/widgetpropertyset.h +++ b/kexi/formeditor/widgetpropertyset.h @@ -53,7 +53,7 @@ class KFORMEDITOR_EXPORT WidgetPropertySet : public TQObject KoProperty::Property& property(const TQCString &name); - bool tqcontains(const TQCString &property); + bool contains(const TQCString &property); /*! i18n function used by factories to add new property caption. Should be called on Factory creation. */ diff --git a/kexi/formeditor/widgetwithsubpropertiesinterface.cpp b/kexi/formeditor/widgetwithsubpropertiesinterface.cpp index 83904aa7..0bbb958c 100644 --- a/kexi/formeditor/widgetwithsubpropertiesinterface.cpp +++ b/kexi/formeditor/widgetwithsubpropertiesinterface.cpp @@ -45,8 +45,8 @@ void WidgetWithSubpropertiesInterface::setSubwidget(TQWidget *widget) const int numProperties = tqmetaObject->numProperties(); for (int i = 0; i < numProperties; i++) { const char *propertyName = tqmetaObject->property( i )->name(); - if (dynamic_cast<TQObject*>(this)->tqmetaObject()->tqfindProperty( propertyName, true )==-1 - && !addedSubproperies.tqfind( propertyName ) ) + if (dynamic_cast<TQObject*>(this)->tqmetaObject()->findProperty( propertyName, true )==-1 + && !addedSubproperies.find( propertyName ) ) { m_subproperies.append( propertyName ); addedSubproperies.insert( propertyName, (char*)1 ); @@ -70,10 +70,10 @@ TQValueList<TQCString> WidgetWithSubpropertiesInterface::subproperies() const const TQMetaProperty *WidgetWithSubpropertiesInterface::findMetaSubproperty(const char * name) const { - if (!m_subwidget || m_subproperies.tqfind(name) == m_subproperies.constEnd()) { + if (!m_subwidget || m_subproperies.find(name) == m_subproperies.constEnd()) { return 0; } - const int index = m_subwidget->tqmetaObject()->tqfindProperty( name, true ); + const int index = m_subwidget->tqmetaObject()->findProperty( name, true ); if (index==-1) return 0; return m_subwidget->tqmetaObject()->property( index, true ); @@ -81,7 +81,7 @@ const TQMetaProperty *WidgetWithSubpropertiesInterface::findMetaSubproperty(cons TQVariant WidgetWithSubpropertiesInterface::subproperty( const char * name, bool &ok ) const { - if (!m_subwidget || m_subproperies.tqfind(name) == m_subproperies.constEnd()) { + if (!m_subwidget || m_subproperies.find(name) == m_subproperies.constEnd()) { ok = false; return TQVariant(); } @@ -91,7 +91,7 @@ TQVariant WidgetWithSubpropertiesInterface::subproperty( const char * name, bool bool WidgetWithSubpropertiesInterface::setSubproperty( const char * name, const TQVariant & value ) { - if (!m_subwidget || m_subproperies.tqfind(name) == m_subproperies.end()) { + if (!m_subwidget || m_subproperies.find(name) == m_subproperies.end()) { return false; } return m_subwidget->setProperty( name, value ); diff --git a/kexi/kexidb/alter.cpp b/kexi/kexidb/alter.cpp index 5a84424e..5386d3d6 100644 --- a/kexi/kexidb/alter.cpp +++ b/kexi/kexidb/alter.cpp @@ -316,7 +316,7 @@ void AlterTableHandler::ChangeFieldPropertyAction::simplifyActions(ActionDictDic // Case 1. special: name1 -> name2, i.e. rename action TQString newName( newValue().toString() ); // try to find rename(newName, otherName) action - ActionBase *renameActionLikeThis = actionsLikeThis ? actionsLikeThis->tqfind( "name" ) : 0; + ActionBase *renameActionLikeThis = actionsLikeThis ? actionsLikeThis->find( "name" ) : 0; if (dynamic_cast<ChangeFieldPropertyAction*>(renameActionLikeThis)) { // 1. instead of having rename(fieldName(), newValue()) action, // let's have rename(fieldName(), otherName) action @@ -334,7 +334,7 @@ void AlterTableHandler::ChangeFieldPropertyAction::simplifyActions(ActionDictDic adict->insert(m_propertyName.latin1(), newRenameAction);*/ } else { - ActionBase *removeActionForThisField = actionsLikeThis ? actionsLikeThis->tqfind( ":remove:" ) : 0; + ActionBase *removeActionForThisField = actionsLikeThis ? actionsLikeThis->find( ":remove:" ) : 0; if (removeActionForThisField) { //if this field is going to be removed, jsut change the action's field name // and do not add a new action @@ -362,7 +362,7 @@ void AlterTableHandler::ChangeFieldPropertyAction::simplifyActions(ActionDictDic } return; } - ActionBase *removeActionForThisField = actionsLikeThis ? actionsLikeThis->tqfind( ":remove:" ) : 0; + ActionBase *removeActionForThisField = actionsLikeThis ? actionsLikeThis->find( ":remove:" ) : 0; if (removeActionForThisField) { //if this field is going to be removed, do not add a new action return; @@ -372,7 +372,7 @@ void AlterTableHandler::ChangeFieldPropertyAction::simplifyActions(ActionDictDic // becomes: [ setCaption(A, "captionB") ] // because adding this action does nothing ActionDict *nextActionsLikeThis = fieldActions[ uid() ]; //fieldName().latin1() ]; - if (!nextActionsLikeThis || !nextActionsLikeThis->tqfind( m_propertyName.latin1() )) { + if (!nextActionsLikeThis || !nextActionsLikeThis->find( m_propertyName.latin1() )) { //no such action, add this AlterTableHandler::ChangeFieldPropertyAction* newAction = new AlterTableHandler::ChangeFieldPropertyAction( *this ); @@ -608,7 +608,7 @@ void AlterTableHandler::InsertFieldAction::simplifyActions(ActionDictDict &field // Try to find actions related to this action ActionDict *actionsForThisField = fieldActions[ uid() ]; //m_field->name().latin1() ]; - ActionBase *removeActionForThisField = actionsForThisField ? actionsForThisField->tqfind( ":remove:" ) : 0; + ActionBase *removeActionForThisField = actionsForThisField ? actionsForThisField->find( ":remove:" ) : 0; if (removeActionForThisField) { //if this field is going to be removed, do not add a new action //and remove the "Remove" action @@ -1070,7 +1070,7 @@ TableSchema* AlterTableHandler::execute(const TQString& tableName, ExecutionArgu oldTable = 0;*/ // Replace the old table with the new one (oldTable will be destroyed) - if (!d->conn->alterTableName(*newTable, oldTableName, true /*tqreplace*/)) { + if (!d->conn->alterTableName(*newTable, oldTableName, true /*replace*/)) { setError(d->conn); //! @todo delete newTable... args.result = false; diff --git a/kexi/kexidb/connection.cpp b/kexi/kexidb/connection.cpp index 830dee29..4af6cae6 100644 --- a/kexi/kexidb/connection.cpp +++ b/kexi/kexidb/connection.cpp @@ -361,7 +361,7 @@ bool Connection::drv_databaseExists( const TQString &dbName, bool ignoreErrors ) return false; } - if (list.tqfind( dbName )==list.end()) { + if (list.find( dbName )==list.end()) { if (!ignoreErrors) setError(ERR_OBJECT_NOT_FOUND, i18n("The database \"%1\" does not exist.").tqarg(dbName)); return false; @@ -1784,12 +1784,12 @@ tristate Connection::alterTable( TableSchema& tableSchema, TableSchema& newTable empty = true; #endif if (empty) { - ok = createTable(&newTableSchema, true/*tqreplace*/); + ok = createTable(&newTableSchema, true/*replace*/); } return ok; } -bool Connection::alterTableName(TableSchema& tableSchema, const TQString& newName, bool tqreplace) +bool Connection::alterTableName(TableSchema& tableSchema, const TQString& newName, bool replace) { clearError(); if (&tableSchema!=d->tables[tableSchema.id()]) { @@ -1813,7 +1813,7 @@ bool Connection::alterTableName(TableSchema& tableSchema, const TQString& newNam TableSchema *tableToReplace = this->tableSchema( newName ); const bool destTableExists = tableToReplace != 0; const int origID = destTableExists ? tableToReplace->id() : -1; //will be reused in the new table - if (!tqreplace && destTableExists) { + 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)); @@ -1830,7 +1830,7 @@ bool Connection::alterTableName(TableSchema& tableSchema, const TQString& newNam // drop the table replaced (with schema) if (destTableExists) { - if (!tqreplace) { + if (!replace) { return false; } if (!dropTable( newName )) { @@ -3139,7 +3139,7 @@ inline void updateRowDataWithNewValues(QuerySchema &query, RowData& data, KexiDB columnsOrderExpanded = query.columnsOrder(QuerySchema::ExpandedList); TQMap<QueryColumnInfo*,int>::ConstIterator columnsOrderExpandedIt; for (KexiDB::RowEditBuffer::DBMap::ConstIterator it=b.constBegin();it!=b.constEnd();++it) { - columnsOrderExpandedIt = columnsOrderExpanded.tqfind( it.key() ); + columnsOrderExpandedIt = columnsOrderExpanded.find( it.key() ); if (columnsOrderExpandedIt == columnsOrderExpanded.constEnd()) { KexiDBWarn << "(Connection) updateRowDataWithNewValues(): \"now also assign new value in memory\" step " "- could not find item '" << it.key()->aliasOrName() << "'" << endl; @@ -3268,7 +3268,7 @@ bool Connection::insertRow(QuerySchema &query, RowData& data, RowEditBuffer& buf QueryColumnInfo *ci = fieldsExpanded.at(i); if (ci->field && KexiDB::isDefaultValueAllowed(ci->field) && !ci->field->defaultValue().isNull() - && !b.tqcontains( ci )) + && !b.contains( ci )) { KexiDBDbg << "Connection::insertRow(): adding default value '" << ci->field->defaultValue().toString() << "' for column '" << ci->field->name() << "'" << endl; @@ -3483,7 +3483,7 @@ void Connection::registerForTableSchemaChanges(TableSchemaChangeListenerInterfac d->tableSchemaChangeListeners.insert(&schema, listeners); } //TODO: inefficient - if (listeners->tqfindRef( &listener )==-1) + if (listeners->findRef( &listener )==-1) listeners->append( &listener ); } @@ -3502,7 +3502,7 @@ void Connection::unregisterForTablesSchemaChanges(TableSchemaChangeListenerInter for (TQPtrDictIterator< TQPtrList<TableSchemaChangeListenerInterface> > it(d->tableSchemaChangeListeners); it.current(); ++it) { - if (-1!=it.current()->tqfind(&listener)) + if (-1!=it.current()->find(&listener)) it.current()->take(); } } diff --git a/kexi/kexidb/connection.h b/kexi/kexidb/connection.h index 3d4eb82c..b06df35b 100644 --- a/kexi/kexidb/connection.h +++ b/kexi/kexidb/connection.h @@ -566,7 +566,7 @@ class KEXI_DB_EXPORT Connection : public TQObject, public KexiDB::Object -- false is returned and ERR_OBJECT_EXISTS error is set. The schema of \a tableSchema is updated on success. \return true on success. */ - bool alterTableName(TableSchema& tableSchema, const TQString& newName, bool tqreplace = false); + bool alterTableName(TableSchema& tableSchema, const TQString& newName, bool replace = false); /*! Drops a query defined by \a querySchema. If true is returned, schema information \a querySchema is destoyed @@ -894,7 +894,7 @@ class KEXI_DB_EXPORT Connection : public TQObject, public KexiDB::Object /*! For optional reimplemenation: asks server if database \a dbName exists. This method is used internally in databaseExists(). The default implementation - calls databaseNames and checks if that list tqcontains \a dbName. If you need to + calls databaseNames and checks if that list contains \a dbName. If you need to ask the server specifically if a database exists, eg. if you can't retrieve a list of all available database names, please reimplement this method and do all needed checks. diff --git a/kexi/kexidb/driver.cpp b/kexi/kexidb/driver.cpp index d192fe87..da77ab72 100644 --- a/kexi/kexidb/driver.cpp +++ b/kexi/kexidb/driver.cpp @@ -237,7 +237,7 @@ bool Driver::isKexiDBSystemObjectName( const TQString& n ) if (!n.lower().startsWith("kexi__")) return false; const TQStringList list( Connection::kexiDBSystemTableNames() ); - return list.tqfind(n.lower())!=list.constEnd(); + return list.find(n.lower())!=list.constEnd(); } bool Driver::isSystemFieldName( const TQString& n ) const @@ -255,7 +255,7 @@ TQString Driver::valueToSQL( uint ftype, const TQVariant& v ) const case Field::Text: case Field::LongText: { TQString s = v.toString(); - return escapeString(s); //TQString("'")+s.tqreplace( '"', "\\\"" ) + "'"; + return escapeString(s); //TQString("'")+s.replace( '"', "\\\"" ) + "'"; } case Field::Byte: case Field::ShortInteger: @@ -267,7 +267,7 @@ TQString Driver::valueToSQL( uint ftype, const TQVariant& v ) const if (v.type()==TQVariant::String) { //workaround for values stored as string that should be casted to floating-point TQString s(v.toString()); - return s.tqreplace(',', "."); + return s.replace(',', "."); } return v.toString(); } @@ -333,21 +333,21 @@ TQCString Driver::escapeIdentifier(const TQCString& str, int options) const needOuterQuotes = true; // ... or if it's a keyword in Kexi's SQL dialect, - else if(d->kexiSQLDict->tqfind(str)) + else if(d->kexiSQLDict->find(str)) needOuterQuotes = true; // ... or if it's a keyword in the backends SQL dialect, // (have already checked !d->driverSQLDict) - else if((options & EscapeDriver) && d->driverSQLDict->tqfind(str)) + else if((options & EscapeDriver) && d->driverSQLDict->find(str)) needOuterQuotes = true; // ... or if the identifier has a space in it... - else if(str.tqfind(' ') != -1) + else if(str.find(' ') != -1) needOuterQuotes = true; if(needOuterQuotes && (options & EscapeKexi)) { const char quote = '"'; - return quote + TQCString(str).tqreplace( quote, "\"\"" ) + quote; + return quote + TQCString(str).replace( quote, "\"\"" ) + quote; } else if (needOuterQuotes) { const char quote = beh->TQUOTATION_MARKS_FOR_IDENTIFIER.latin1(); diff --git a/kexi/kexidb/drivermanager.cpp b/kexi/kexidb/drivermanager.cpp index 1afcbd64..0a7ff574 100644 --- a/kexi/kexidb/drivermanager.cpp +++ b/kexi/kexidb/drivermanager.cpp @@ -115,7 +115,7 @@ bool DriverManagerInternal::lookupDrivers() << ptr->property("Name").toString() << "\" service!\n -- skipped!" << endl; continue; } - if (m_services_lcase.tqcontains(srv_name.lower())) { + if (m_services_lcase.contains(srv_name.lower())) { KexiDBWarn << "DriverManagerInternal::lookupDrivers(): more than one driver named '" << srv_name.lower() << "'\n -- skipping this one!" << endl; continue; @@ -160,7 +160,7 @@ bool DriverManagerInternal::lookupDrivers() //store association of this driver with all listed mime types for (TQStringList::ConstIterator mime_it = mimes.constBegin(); mime_it!=mimes.constEnd(); ++mime_it) { TQString mime( (*mime_it).lower() ); - if (!m_services_by_mimetype.tqcontains(mime)) { + if (!m_services_by_mimetype.contains(mime)) { m_services_by_mimetype.insert(mime, ptr); } else { @@ -198,16 +198,16 @@ Driver* DriverManagerInternal::driver(const TQString& name) clearError(); KexiDBDbg << "DriverManager::driver(): loading " << name << endl; - Driver *drv = name.isEmpty() ? 0 : m_drivers.tqfind(name.latin1()); + Driver *drv = name.isEmpty() ? 0 : m_drivers.find(name.latin1()); if (drv) return drv; //cached - if (!m_services_lcase.tqcontains(name.lower())) { + if (!m_services_lcase.contains(name.lower())) { setError(ERR_DRIVERMANAGER, i18n("Could not find database driver \"%1\".").tqarg(name) ); return 0; } - KService::Ptr ptr= *(m_services_lcase.tqfind(name.lower())); + KService::Ptr ptr= *(m_services_lcase.find(name.lower())); TQString srv_name = ptr->property("X-Kexi-DriverName").toString(); KexiDBDbg << "KexiDBInterfaceManager::load(): library: "<<ptr->library()<<endl; @@ -357,8 +357,8 @@ KService::Ptr DriverManager::serviceInfo(const TQString &name) } clearError(); - if (d_int->m_services_lcase.tqcontains(name.lower())) { - return *d_int->m_services_lcase.tqfind(name.lower()); + 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) ); return KService::Ptr(); diff --git a/kexi/kexidb/drivers/mySQL/mySQL.pro b/kexi/kexidb/drivers/mySQL/mySQL.pro index 6c443be3..5f00a413 100644 --- a/kexi/kexidb/drivers/mySQL/mySQL.pro +++ b/kexi/kexidb/drivers/mySQL/mySQL.pro @@ -2,11 +2,11 @@ include( ../common.pro ) INCLUDEPATH += $(MYSQL_INC) $(MYSQL_INC)/mysql -tqcontains(CONFIG,debug) { +contains(CONFIG,debug) { win32:LIBS += $(MYSQL_LIB)/debug/libmysql.lib win32:QMAKE_LFLAGS += /NODEFAULTLIB:LIBCMTD.LIB } -!tqcontains(CONFIG,debug) { +!contains(CONFIG,debug) { # win32:LIBS += $(MYSQL_LIB)/opt/mysqlclient.lib win32:LIBS += $(MYSQL_LIB)/opt/libmysql.lib # win32:QMAKE_LFLAGS += /NODEFAULTLIB:MSVCRT.LIB diff --git a/kexi/kexidb/drivers/mySQL/mysqlconnection_p.cpp b/kexi/kexidb/drivers/mySQL/mysqlconnection_p.cpp index 50b94ae2..4a82df50 100644 --- a/kexi/kexidb/drivers/mySQL/mysqlconnection_p.cpp +++ b/kexi/kexidb/drivers/mySQL/mysqlconnection_p.cpp @@ -154,7 +154,7 @@ bool MySqlConnectionInternal::executeSQL(const TQString& statement) { } TQString MySqlConnectionInternal::escapeIdentifier(const TQString& str) const { - return TQString(str).tqreplace('`', "'"); + return TQString(str).replace('`', "'"); } //-------------------------------------- diff --git a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp index 9a1213b0..4d7db160 100644 --- a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp +++ b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp @@ -191,9 +191,9 @@ TQCString MySqlDriver::escapeString(const TQCString& str) const //! see http://dev.mysql.com/doc/refman/5.0/en/string-syntax.html return TQCString("'")+TQCString(str) - .tqreplace( '\\', "\\\\" ) - .tqreplace( '\'', "\\''" ) - .tqreplace( '"', "\\\"" ) + .replace( '\\', "\\\\" ) + .replace( '\'', "\\''" ) + .replace( '"', "\\\"" ) + TQCString("'"); } @@ -201,11 +201,11 @@ TQCString MySqlDriver::escapeString(const TQCString& str) const * the name with single quotes. */ TQString MySqlDriver::drv_escapeIdentifier( const TQString& str) const { - return TQString(str).tqreplace('`', "'"); + return TQString(str).replace('`', "'"); } TQCString MySqlDriver::drv_escapeIdentifier( const TQCString& str) const { - return TQCString(str).tqreplace('`', "'"); + return TQCString(str).replace('`', "'"); } #include "mysqldriver.moc" diff --git a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp index 3d9162ca..ce66a6e8 100644 --- a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp +++ b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp @@ -150,13 +150,13 @@ TQCString pqxxSqlDriver::escapeString( const TQCString& str) const //================================================================================== // TQString pqxxSqlDriver::drv_escapeIdentifier( const TQString& str) const { - return TQString(str).tqreplace( '"', "\"\"" ); + return TQString(str).replace( '"', "\"\"" ); } //================================================================================== // TQCString pqxxSqlDriver::drv_escapeIdentifier( const TQCString& str) const { - return TQCString(str).tqreplace( '"', "\"\"" ); + return TQCString(str).replace( '"', "\"\"" ); } //================================================================================== diff --git a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp index 27f190b8..631f3bc6 100644 --- a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp +++ b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp @@ -366,14 +366,14 @@ bool SQLiteConnection::isReadOnly() const } #ifdef SQLITE2 -bool SQLiteConnection::drv_alterTableName(TableSchema& tableSchema, const TQString& newName, bool tqreplace) +bool SQLiteConnection::drv_alterTableName(TableSchema& tableSchema, const TQString& newName, bool replace) { const TQString oldTableName = tableSchema.name(); const bool destTableExists = this->tableSchema( newName ) != 0; //1. drop the table if (destTableExists) { - if (!tqreplace) + if (!replace) return false; if (!drv_dropTable( newName )) return false; diff --git a/kexi/kexidb/drivers/sqlite/sqliteconnection.h b/kexi/kexidb/drivers/sqlite/sqliteconnection.h index 922e8447..ab80675e 100644 --- a/kexi/kexidb/drivers/sqlite/sqliteconnection.h +++ b/kexi/kexidb/drivers/sqlite/sqliteconnection.h @@ -109,7 +109,7 @@ class SQLiteConnection : public Connection \return true on success. More advanced server backends implement this using "ALTER TABLE .. RENAME TO". */ - virtual bool drv_alterTableName(TableSchema& tableSchema, const TQString& newName, bool tqreplace = false); + virtual bool drv_alterTableName(TableSchema& tableSchema, const TQString& newName, bool replace = false); #endif //! for drv_changeFieldProperty() diff --git a/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp b/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp index c5128b63..80276682 100644 --- a/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp +++ b/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp @@ -124,12 +124,12 @@ bool SQLiteDriver::drv_isSystemFieldName( const TQString& n ) const TQString SQLiteDriver::escapeString(const TQString& str) const { - return TQString("'")+TQString(str).tqreplace( '\'', "''" ) + "'"; + return TQString("'")+TQString(str).replace( '\'', "''" ) + "'"; } TQCString SQLiteDriver::escapeString(const TQCString& str) const { - return TQCString("'")+TQCString(str).tqreplace( '\'', "''" )+"'"; + return TQCString("'")+TQCString(str).replace( '\'', "''" )+"'"; } TQString SQLiteDriver::escapeBLOB(const TQByteArray& array) const @@ -139,12 +139,12 @@ TQString SQLiteDriver::escapeBLOB(const TQByteArray& array) const TQString SQLiteDriver::drv_escapeIdentifier( const TQString& str) const { - return TQString(str).tqreplace( '"', "\"\"" ); + return TQString(str).replace( '"', "\"\"" ); } TQCString SQLiteDriver::drv_escapeIdentifier( const TQCString& str) const { - return TQCString(str).tqreplace( '"', "\"\"" ); + return TQCString(str).replace( '"', "\"\"" ); } AdminTools* SQLiteDriver::drv_createAdminTools() const diff --git a/kexi/kexidb/expression.cpp b/kexi/kexidb/expression.cpp index ffa45c9b..35ab8d70 100644 --- a/kexi/kexidb/expression.cpp +++ b/kexi/kexidb/expression.cpp @@ -692,7 +692,7 @@ bool VariableExpr::validate(ParseInfo& parseInfo) /* taken from parser's addColumn(): */ KexiDBDbg << "checking variable name: " << name << endl; - int dotPos = name.tqfind('.'); + int dotPos = name.find('.'); TQString tableName, fieldName; //TODO: shall we also support db name? if (dotPos>0) { @@ -910,5 +910,5 @@ bool FunctionExpr::validate(ParseInfo& parseInfo) bool FunctionExpr::isBuiltInAggregate(const TQCString& fname) { - return builtInAggregates().tqfind(fname.upper())!=FunctionExpr_builtIns.end(); + return builtInAggregates().find(fname.upper())!=FunctionExpr_builtIns.end(); } diff --git a/kexi/kexidb/field.cpp b/kexi/kexidb/field.cpp index 97c4ae58..33e9e929 100644 --- a/kexi/kexidb/field.cpp +++ b/kexi/kexidb/field.cpp @@ -197,7 +197,7 @@ TQString Field::typeGroupString(uint typeGroup) Field::Type Field::typeForString(const TQString& typeString) { m_typeNames.init(); - TQMap<TQString,Type>::ConstIterator it = m_typeNames.str2num.tqfind(typeString.lower()); + TQMap<TQString,Type>::ConstIterator it = m_typeNames.str2num.find(typeString.lower()); if (it==m_typeNames.str2num.end()) return InvalidType; return it.data(); @@ -206,7 +206,7 @@ Field::Type Field::typeForString(const TQString& typeString) Field::TypeGroup Field::typeGroupForString(const TQString& typeGroupString) { m_typeGroupNames.init(); - TQMap<TQString,TypeGroup>::ConstIterator it = m_typeGroupNames.str2num.tqfind(typeGroupString.lower()); + TQMap<TQString,TypeGroup>::ConstIterator it = m_typeGroupNames.str2num.find(typeGroupString.lower()); if (it==m_typeGroupNames.str2num.end()) return InvalidGroup; return it.data(); @@ -646,7 +646,7 @@ TQVariant Field::customProperty(const TQCString& propertyName, { if (!m_customProperties) return defaultValue; - CustomPropertiesMap::ConstIterator it(m_customProperties->tqfind(propertyName)); + CustomPropertiesMap::ConstIterator it(m_customProperties->find(propertyName)); if (it==m_customProperties->constEnd()) return defaultValue; return it.data(); diff --git a/kexi/kexidb/fieldlist.h b/kexi/kexidb/fieldlist.h index f77dba2b..439a5cc1 100644 --- a/kexi/kexidb/fieldlist.h +++ b/kexi/kexidb/fieldlist.h @@ -79,11 +79,11 @@ class KEXI_DB_EXPORT FieldList virtual Field* field(const TQString& name); /*! \return true if this list contains given \a field. */ - inline bool hasField(const Field* field) { return m_fields.tqfindRef(field)!=-1; } + inline bool hasField(const Field* field) { return m_fields.findRef(field)!=-1; } /*! \return first occurrence of \a field in the list or -1 if this list does not contain this field. */ - inline int indexOf(const Field* field) { return m_fields.tqfindRef(field); } + inline int indexOf(const Field* field) { return m_fields.findRef(field); } /*! \return list of field names for this list. */ TQStringList names() const; diff --git a/kexi/kexidb/indexschema.cpp b/kexi/kexidb/indexschema.cpp index 4775125b..dc01ae0e 100644 --- a/kexi/kexidb/indexschema.cpp +++ b/kexi/kexidb/indexschema.cpp @@ -172,18 +172,18 @@ void IndexSchema::attachRelationship(Relationship *rel, bool ownedByMaster) return; if (rel->masterIndex()==this) { if (ownedByMaster) { - if (m_master_owned_rels.tqfindRef(rel)==-1) { + if (m_master_owned_rels.findRef(rel)==-1) { m_master_owned_rels.append(rel); } } else {//not owned - if (m_master_rels.tqfindRef(rel)==-1) { + if (m_master_rels.findRef(rel)==-1) { m_master_rels.append(rel); } } } else if (rel->detailsIndex()==this) { - if (m_details_rels.tqfindRef(rel)==-1) { + if (m_details_rels.findRef(rel)==-1) { m_details_rels.append(rel); } } @@ -193,7 +193,7 @@ void IndexSchema::detachRelationship(Relationship *rel) { if (!rel) return; - m_master_owned_rels.take( m_master_owned_rels.tqfindRef(rel) ); //for sanity - m_master_rels.take( m_master_rels.tqfindRef(rel) ); //for sanity - m_details_rels.take( m_details_rels.tqfindRef(rel) ); //for sanity + m_master_owned_rels.take( m_master_owned_rels.findRef(rel) ); //for sanity + m_master_rels.take( m_master_rels.findRef(rel) ); //for sanity + m_details_rels.take( m_details_rels.findRef(rel) ); //for sanity } diff --git a/kexi/kexidb/parser/parser.cpp b/kexi/kexidb/parser/parser.cpp index eeb6e39d..2a9a0e4c 100644 --- a/kexi/kexidb/parser/parser.cpp +++ b/kexi/kexidb/parser/parser.cpp @@ -109,7 +109,7 @@ void Parser::init() bool Parser::isReservedKeyword(const char *str) { - return d->reservedKeywords.tqfind(str); + return d->reservedKeywords.find(str); } bool diff --git a/kexi/kexidb/parser/parser_p.cpp b/kexi/kexidb/parser/parser_p.cpp index f64696e8..7ed1a47b 100644 --- a/kexi/kexidb/parser/parser_p.cpp +++ b/kexi/kexidb/parser/parser_p.cpp @@ -202,7 +202,7 @@ bool parseData(Parser *p, const char *data) Field::ListIterator it = parser->select()->fieldsIterator(); for(Field *item; (item = it.current()); ++it) { - if(tableList.tqfindRef(item->table()) == -1) + 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); parser->setError(err); @@ -263,7 +263,7 @@ bool addColumn( ParseInfo& parseInfo, BaseExpr* columnExpr ) #if 0 KexiDBDbg << "found variable name: " << varName << endl; - int dotPos = varName.tqfind('.'); + int dotPos = varName.find('.'); TQString tableName, fieldName; //TODO: shall we also support db name? if (dotPos>0) { diff --git a/kexi/kexidb/parser/sqlparser.cpp b/kexi/kexidb/parser/sqlparser.cpp index f4086b3b..57e386ee 100644 --- a/kexi/kexidb/parser/sqlparser.cpp +++ b/kexi/kexidb/parser/sqlparser.cpp @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* As a special exception, you may create a larger work that tqcontains +/* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof diff --git a/kexi/kexidb/parser/sqlparser.h b/kexi/kexidb/parser/sqlparser.h index 6895e29f..6f2b6534 100644 --- a/kexi/kexidb/parser/sqlparser.h +++ b/kexi/kexidb/parser/sqlparser.h @@ -27,7 +27,7 @@ bool parseData(KexiDB::Parser *p, const char *data); Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* As a special exception, you may create a larger work that tqcontains +/* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof diff --git a/kexi/kexidb/queryschema.cpp b/kexi/kexidb/queryschema.cpp index 4fae1cf1..a82ca99a 100644 --- a/kexi/kexidb/queryschema.cpp +++ b/kexi/kexidb/queryschema.cpp @@ -187,8 +187,8 @@ class QuerySchemaPrivate void setColumnAliasInternal(uint position, const TQCString& alias) { - columnAliases.tqreplace(position, new TQCString(alias)); - columnPositionsForAliases.tqreplace(alias, new int(position)); + columnAliases.replace(position, new TQCString(alias)); + columnPositionsForAliases.replace(alias, new int(position)); maxIndexWithAlias = TQMAX( maxIndexWithAlias, (int)position ); } @@ -245,7 +245,7 @@ class QuerySchemaPrivate for (Field::ListIterator it(query->fieldsIterator()); (f = it.current()); ++it, p++) { if (f->isExpression() && !columnAliases[p]) { //missing - for (;;) { //tqfind 1st unused + for (;;) { //find 1st unused colNum++; columnAlias = (i18n("short for 'expression' word (only latin letters, please)", "expr") + TQString::number(colNum)).latin1(); @@ -663,12 +663,12 @@ FieldList& QuerySchema::insertField(uint position, Field *field, d->asterisks.append(field); //if this is single-table asterisk, //add a table to list if doesn't exist there: - if (field->table() && (d->tables.tqfindRef(field->table())==-1)) + if (field->table() && (d->tables.findRef(field->table())==-1)) d->tables.append(field->table()); } else if (field->table()) { //add a table to list if doesn't exist there: - if (d->tables.tqfindRef(field->table())==-1) + if (d->tables.findRef(field->table())==-1) d->tables.append(field->table()); } // //visible by default @@ -918,7 +918,7 @@ void QuerySchema::addTable(TableSchema *table, const TQCString& alias) //only append table if: //-it has alias //-it has no alias but there is no such table on the list - if (alias.isEmpty() && d->tables.tqfindRef(table)!=-1) { + if (alias.isEmpty() && d->tables.findRef(table)!=-1) { const TQString& tableNameLower = table->name().lower(); const TQString& aliasLower = TQString(alias.lower()); int num = 0; @@ -960,9 +960,9 @@ TableSchema* QuerySchema::table(const TQString& tableName) const return 0; } -bool QuerySchema::tqcontains(TableSchema *table) const +bool QuerySchema::contains(TableSchema *table) const { - return d->tables.tqfindRef(table)!=-1; + return d->tables.findRef(table)!=-1; } Field* QuerySchema::findTableField(const TQString &tableOrTableAndFieldName) const @@ -1080,8 +1080,8 @@ void QuerySchema::setTableAlias(uint position, const TQCString& alias) // d->maxIndexWithTableAlias = -1; } else { - d->tableAliases.tqreplace(position, new TQCString(fixedAlias)); - d->tablePositionsForAliases.tqreplace(fixedAlias, new int(position)); + d->tableAliases.replace(position, new TQCString(fixedAlias)); + d->tablePositionsForAliases.replace(fixedAlias, new int(position)); // d->maxIndexWithTableAlias = TQMAX( d->maxIndexWithTableAlias, (int)index ); } } @@ -1164,7 +1164,7 @@ QueryColumnInfo::Vector QuerySchema::fieldsExpanded(FieldsExpandedOptions option uint uniqueListCount = 0; for (uint i=0; i<d->fieldsExpanded->count(); i++) { QueryColumnInfo *ci = (*d->fieldsExpanded)[i]; -// columnsAlreadyFoundIt = columnsAlreadyFound.tqfind(ci); +// columnsAlreadyFoundIt = columnsAlreadyFound.find(ci); // uint foundColumnIndex = -1; if (!columnsAlreadyFound[ci->aliasOrName()]) {// columnsAlreadyFoundIt==columnsAlreadyFound.constEnd()) columnsAlreadyFound.insert(ci->aliasOrName(), (char*)1); @@ -1412,7 +1412,7 @@ void QuerySchema::computeFieldsExpanded() if (!d->columnInfosByNameExpanded[ tableAndAlias ]) d->columnInfosByNameExpanded.insert( tableAndAlias, ci ); //the same for "unexpanded" list - if (columnInfosOutsideAsterisks.tqcontains(ci)) { + if (columnInfosOutsideAsterisks.contains(ci)) { if (!d->columnInfosByName[ ci->alias ]) d->columnInfosByName.insert( ci->alias, ci ); if (!d->columnInfosByName[ tableAndAlias ]) @@ -1429,7 +1429,7 @@ void QuerySchema::computeFieldsExpanded() if (!d->columnInfosByNameExpanded[ tableAndName ]) d->columnInfosByNameExpanded.insert( tableAndName, ci ); //the same for "unexpanded" list - if (columnInfosOutsideAsterisks.tqcontains(ci)) { + if (columnInfosOutsideAsterisks.contains(ci)) { if (!d->columnInfosByName[ ci->field->name() ]) d->columnInfosByName.insert( ci->field->name(), ci ); if (!d->columnInfosByName[ tableAndName ]) @@ -1453,7 +1453,7 @@ void QuerySchema::computeFieldsExpanded() lookup_list.removeRef( ci ); } else { - lookup_dict.tqreplace( key, new uint( i ) ); + lookup_dict.replace( key, new uint( i ) ); ++it; i++; } diff --git a/kexi/kexidb/queryschema.h b/kexi/kexidb/queryschema.h index 7c6821d1..6681ddd3 100644 --- a/kexi/kexidb/queryschema.h +++ b/kexi/kexidb/queryschema.h @@ -364,7 +364,7 @@ class KEXI_DB_EXPORT QuerySchema : public FieldList, public SchemaData TableSchema* table(const TQString& tableName) const; /*! \return true if the query uses \a table. */ - bool tqcontains(TableSchema *table) const; + bool contains(TableSchema *table) const; /*! Convenience function. \return table field by searching through all tables in this query. diff --git a/kexi/kexidb/relationship.cpp b/kexi/kexidb/relationship.cpp index bcb6ec89..a7796207 100644 --- a/kexi/kexidb/relationship.cpp +++ b/kexi/kexidb/relationship.cpp @@ -80,7 +80,7 @@ void Relationship::createIndices( QuerySchema *query, Field *field1, Field *fiel return; } // if (!query->hasField(field1) && !query->hasField(field2)) { - if (!query->tqcontains(field1->table()) || !query->tqcontains(field2->table())) { + if (!query->contains(field1->table()) || !query->contains(field2->table())) { KexiDBWarn << "Relationship::addRelationship(): fields do not belong to this query" << endl; return; } diff --git a/kexi/kexidb/roweditbuffer.cpp b/kexi/kexidb/roweditbuffer.cpp index ba1bb7d5..40d2b04d 100644 --- a/kexi/kexidb/roweditbuffer.cpp +++ b/kexi/kexidb/roweditbuffer.cpp @@ -50,7 +50,7 @@ const TQVariant* RowEditBuffer::at( QueryColumnInfo& ci, bool useDefaultValueIfP KexiDBWarn << "RowEditBuffer::at(QueryColumnInfo&): not db-aware buffer!" << endl; return 0; } - *m_dbBufferIt = m_dbBuffer->tqfind( &ci ); + *m_dbBufferIt = m_dbBuffer->find( &ci ); TQVariant* result = 0; if (*m_dbBufferIt!=m_dbBuffer->end()) result = &(*m_dbBufferIt).data(); @@ -74,7 +74,7 @@ const TQVariant* RowEditBuffer::at( Field& f ) const KexiDBWarn << "RowEditBuffer::at(Field&): this is db-aware buffer!" << endl; return 0; } - *m_simpleBufferIt = m_simpleBuffer->tqfind( f.name() ); + *m_simpleBufferIt = m_simpleBuffer->find( f.name() ); if (*m_simpleBufferIt==m_simpleBuffer->constEnd()) return 0; return &(*m_simpleBufferIt).data(); @@ -86,7 +86,7 @@ const TQVariant* RowEditBuffer::at( const TQString& fname ) const KexiDBWarn << "RowEditBuffer::at(Field&): this is db-aware buffer!" << endl; return 0; } - *m_simpleBufferIt = m_simpleBuffer->tqfind( fname ); + *m_simpleBufferIt = m_simpleBuffer->find( fname ); if (*m_simpleBufferIt==m_simpleBuffer->constEnd()) return 0; return &(*m_simpleBufferIt).data(); diff --git a/kexi/kexidb/roweditbuffer.h b/kexi/kexidb/roweditbuffer.h index 438e525e..568d5daf 100644 --- a/kexi/kexidb/roweditbuffer.h +++ b/kexi/kexidb/roweditbuffer.h @@ -113,7 +113,7 @@ public: //! Useful only for db-aware buffer: \return true if the value available as //! at( ci ) is obtained from column's default value inline bool hasDefaultValueAt( QueryColumnInfo& ci ) const { - return m_defaultValuesDbBuffer->tqcontains(&ci) && (*m_defaultValuesDbBuffer)[ &ci ]; + return m_defaultValuesDbBuffer->contains(&ci) && (*m_defaultValuesDbBuffer)[ &ci ]; } inline const SimpleMap simpleBuffer() { return *m_simpleBuffer; } diff --git a/kexi/kexidb/tableschema.cpp b/kexi/kexidb/tableschema.cpp index b794f273..d78efa09 100644 --- a/kexi/kexidb/tableschema.cpp +++ b/kexi/kexidb/tableschema.cpp @@ -374,7 +374,7 @@ Field* TableSchema::anyNonPKField() if (!d->anyNonPKField) { Field *f; Field::ListIterator it(m_fields); - it.toLast(); //from the end (higher chances to tqfind) + it.toLast(); //from the end (higher chances to find) for (; (f = it.current()); --it) { if (!f->isPrimaryKey() && (!m_pkey || !m_pkey->hasField(f))) break; @@ -393,7 +393,7 @@ bool TableSchema::setLookupFieldSchema( const TQString& fieldName, LookupFieldSc return false; } if (lookupFieldSchema) - d->lookupFields.tqreplace( f, lookupFieldSchema ); + d->lookupFields.replace( f, lookupFieldSchema ); else { delete d->lookupFields[f]; d->lookupFields.remove( f ); @@ -426,7 +426,7 @@ const TQPtrVector<LookupFieldSchema>& TableSchema::lookupFieldsList() d->lookupFieldsList.resize( d->lookupFields.count() ); uint i = 0; for (Field::ListIterator it(m_fields); it.current(); ++it) { - TQMap<const Field*, LookupFieldSchema*>::ConstIterator itMap = d->lookupFields.tqfind( it.current() ); + TQMap<const Field*, LookupFieldSchema*>::ConstIterator itMap = d->lookupFields.find( it.current() ); if (itMap != d->lookupFields.constEnd()) { d->lookupFieldsList.insert( i, itMap.data() ); i++; diff --git a/kexi/kexidb/utils.cpp b/kexi/kexidb/utils.cpp index 36267b1f..d3d1361c 100644 --- a/kexi/kexidb/utils.cpp +++ b/kexi/kexidb/utils.cpp @@ -59,7 +59,7 @@ static void initList() const uint tg = KexiDB::Field::typeGroup( t ); TypeGroupList list; TQStringList name_list, str_list; - if (KexiDB_typeCache->tlist.tqfind( tg )!=KexiDB_typeCache->tlist.end()) { + if (KexiDB_typeCache->tlist.find( tg )!=KexiDB_typeCache->tlist.end()) { list = KexiDB_typeCache->tlist[ tg ]; name_list = KexiDB_typeCache->nlist[ tg ]; str_list = KexiDB_typeCache->slist[ tg ]; @@ -584,7 +584,7 @@ bool KexiDB::splitToTableAndFieldParts(const TQString& string, TQString& tableName, TQString& fieldName, SplitToTableAndFieldPartsOptions option) { - const int id = string.tqfind('.'); + const int id = string.find('.'); if (option & SetFieldNameIfNoTableName && id==-1) { tableName = TQString(); fieldName = string; @@ -613,7 +613,7 @@ TQString KexiDB::formatNumberForVisibleDecimalPlaces(double value, int decimalPl i--; if (s[i]=='.') //remove '.' i--; - s = s.left(i+1).tqreplace('.', KGlobal::locale()->decimalSymbol()); + s = s.left(i+1).replace('.', KGlobal::locale()->decimalSymbol()); return s; } if (decimalPlaces == 0) @@ -671,13 +671,13 @@ bool KexiDB::isBuiltinTableFieldProperty( const TQCString& propertyName ) //! @todo always update this when new builtins appear! #undef ADD } - return KexiDB_builtinFieldProperties->tqfind( propertyName ); + return KexiDB_builtinFieldProperties->find( propertyName ); } bool KexiDB::setFieldProperties( Field& field, const TQMap<TQCString, TQVariant>& values ) { TQMapConstIterator<TQCString, TQVariant> it; - if ( (it = values.tqfind("type")) != values.constEnd() ) { + if ( (it = values.find("type")) != values.constEnd() ) { if (!setIntToFieldType(field, *it)) return false; } @@ -690,50 +690,50 @@ bool KexiDB::setFieldProperties( Field& field, const TQMap<TQCString, TQVariant> uint constraints = field.constraints(); bool ok = true; - if ( (it = values.tqfind("primaryKey")) != values.constEnd() ) + if ( (it = values.find("primaryKey")) != values.constEnd() ) SET_BOOLEAN_FLAG(PrimaryKey, (*it).toBool()); - if ( (it = values.tqfind("indexed")) != values.constEnd() ) + if ( (it = values.find("indexed")) != values.constEnd() ) SET_BOOLEAN_FLAG(Indexed, (*it).toBool()); - if ( (it = values.tqfind("autoIncrement")) != values.constEnd() + if ( (it = values.find("autoIncrement")) != values.constEnd() && KexiDB::Field::isAutoIncrementAllowed(field.type()) ) SET_BOOLEAN_FLAG(AutoInc, (*it).toBool()); - if ( (it = values.tqfind("unique")) != values.constEnd() ) + if ( (it = values.find("unique")) != values.constEnd() ) SET_BOOLEAN_FLAG(Unique, (*it).toBool()); - if ( (it = values.tqfind("notNull")) != values.constEnd() ) + if ( (it = values.find("notNull")) != values.constEnd() ) SET_BOOLEAN_FLAG(NotNull, (*it).toBool()); - if ( (it = values.tqfind("allowEmpty")) != values.constEnd() ) + if ( (it = values.find("allowEmpty")) != values.constEnd() ) SET_BOOLEAN_FLAG(NotEmpty, !(*it).toBool()); field.setConstraints( constraints ); uint options = 0; - if ( (it = values.tqfind("unsigned")) != values.constEnd()) { + if ( (it = values.find("unsigned")) != values.constEnd()) { options |= KexiDB::Field::Unsigned; if (!(*it).toBool()) options ^= KexiDB::Field::Unsigned; } field.setOptions( options ); - if ( (it = values.tqfind("name")) != values.constEnd()) + if ( (it = values.find("name")) != values.constEnd()) field.setName( (*it).toString() ); - if ( (it = values.tqfind("caption")) != values.constEnd()) + if ( (it = values.find("caption")) != values.constEnd()) field.setCaption( (*it).toString() ); - if ( (it = values.tqfind("description")) != values.constEnd()) + if ( (it = values.find("description")) != values.constEnd()) field.setDescription( (*it).toString() ); - if ( (it = values.tqfind("length")) != values.constEnd()) + if ( (it = values.find("length")) != values.constEnd()) field.setLength( (*it).isNull() ? 0/*default*/ : (*it).toUInt(&ok) ); if (!ok) return false; - if ( (it = values.tqfind("precision")) != values.constEnd()) + if ( (it = values.find("precision")) != values.constEnd()) field.setPrecision( (*it).isNull() ? 0/*default*/ : (*it).toUInt(&ok) ); if (!ok) return false; - if ( (it = values.tqfind("defaultValue")) != values.constEnd()) + if ( (it = values.find("defaultValue")) != values.constEnd()) field.setDefaultValue( *it ); - if ( (it = values.tqfind("width")) != values.constEnd()) + if ( (it = values.find("width")) != values.constEnd()) field.setWidth( (*it).isNull() ? 0/*default*/ : (*it).toUInt(&ok) ); if (!ok) return false; - if ( (it = values.tqfind("visibleDecimalPlaces")) != values.constEnd() + if ( (it = values.find("visibleDecimalPlaces")) != values.constEnd() && KexiDB::supportsVisibleDecimalPlacesProperty(field.type()) ) field.setVisibleDecimalPlaces( (*it).isNull() ? -1/*default*/ : (*it).toInt(&ok) ); if (!ok) @@ -773,7 +773,7 @@ bool KexiDB::isExtendedTableFieldProperty( const TQCString& propertyName ) ADD("displayWidget"); #undef ADD } - return KexiDB_extendedProperties->tqfind( propertyName ); + return KexiDB_extendedProperties->find( propertyName ); } bool KexiDB::setFieldProperty( Field& field, const TQCString& propertyName, const TQVariant& value ) @@ -924,7 +924,7 @@ TQVariant KexiDB::loadPropertyValueFromDom( const TQDomNode& node ) return TQCString(text.latin1()); } else if (valueType == "number") { // integer or double - if (text.tqfind('.')!=-1) { + if (text.find('.')!=-1) { double val = text.toDouble(&ok); if (ok) return val; diff --git a/kexi/kexiutils/identifier.cpp b/kexi/kexiutils/identifier.cpp index e09df22a..46e62b7b 100644 --- a/kexi/kexiutils/identifier.cpp +++ b/kexi/kexiutils/identifier.cpp @@ -37,9 +37,9 @@ bool KexiUtils::isIdentifier(const TQString& s) TQString KexiUtils::string2FileName(const TQString &s) { TQString fn( s.simplifyWhiteSpace() ); - fn.tqreplace(' ',"_"); fn.tqreplace('$',"_"); - fn.tqreplace('\\',"-"); fn.tqreplace('/',"-"); - fn.tqreplace(':',"-"); fn.tqreplace('*',"-"); + fn.replace(' ',"_"); fn.replace('$',"_"); + fn.replace('\\',"-"); fn.replace('/',"-"); + fn.replace(':',"-"); fn.replace('*',"-"); return fn; } @@ -59,7 +59,7 @@ TQString KexiUtils::string2Identifier(const TQString &s) if (id.isEmpty()) return TQString(); r.reserve(id.length()); - id.tqreplace(' ',"_"); + id.replace(' ',"_"); TQChar c = id[0]; TQString add; bool wasUnderscore = false; diff --git a/kexi/kexiutils/utils.cpp b/kexi/kexiutils/utils.cpp index 6b3e26dc..7a1ab0f7 100644 --- a/kexi/kexiutils/utils.cpp +++ b/kexi/kexiutils/utils.cpp @@ -237,7 +237,7 @@ TQMap<TQString,TQString> KexiUtils::deserializeMap(const TQString& string) TQString KexiUtils::stringToFileName(const TQString& string) { TQString _string(string); - _string.tqreplace(TQRegExp("[\\\\/:\\*?\"<>|]"), " "); + _string.replace(TQRegExp("[\\\\/:\\*?\"<>|]"), " "); return _string.simplifyWhiteSpace(); } diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp index d7474958..6f451aef 100644 --- a/kexi/main/kexifinddialog.cpp +++ b/kexi/main/kexifinddialog.cpp @@ -110,11 +110,11 @@ KexiFindDialog::~KexiFindDialog() } void KexiFindDialog::setActions( KAction *findnext, KAction *findprev, - KAction *tqreplace, KAction *replaceall ) + KAction *replace, KAction *replaceall ) { d->findnextAction = findnext; d->findprevAction = findprev; - d->replaceAction = tqreplace; + d->replaceAction = replace; d->replaceallAction = replaceall; d->accels.clear(); d->setActionAndAccel(d->findnextAction, this, TQT_SIGNAL(findNext())); @@ -172,7 +172,7 @@ void KexiFindDialog::setCurrentLookInColumnName(const TQString& columnName) else if (columnName == "(field)") index = 1; else { - index = d->lookInColumnNames.tqfindIndex( columnName ); + index = d->lookInColumnNames.findIndex( columnName ); if (index == -1) { kdWarning() << TQString("KexiFindDialog::setCurrentLookInColumn(%1) column name not found on the list") .tqarg(columnName) << endl; diff --git a/kexi/main/kexifinddialog.h b/kexi/main/kexifinddialog.h index 9d0bf088..4cf55e53 100644 --- a/kexi/main/kexifinddialog.h +++ b/kexi/main/kexifinddialog.h @@ -42,7 +42,7 @@ class KexiFindDialog : public KexiFindDialogBase //! Sets actions that receive button clicks and shortcuts within the dialog. Should be called once. void setActions( KAction *findnext, KAction *findprev, - KAction *tqreplace, KAction *replaceall ); + KAction *replace, KAction *replaceall ); //! Shows the dialog as a modal dialog. virtual void show(); @@ -86,14 +86,14 @@ class KexiFindDialog : public KexiFindDialogBase void setCurrentLookInColumnName(const TQString& columnName); /*! Sets or clears replace mode. - For replace mode 'prompt or tqreplace' option is visible. */ + For replace mode 'prompt or replace' option is visible. */ void setReplaceMode(bool set); /*! Sets object name for caption, so for example it will be set to i18n("Find \"Persons\"")). */ void setObjectNameForCaption(const TQString& name); - /*! Enables of disables the tqfind/tqreplace/replace all buttons. + /*! Enables of disables the find/replace/replace all buttons. This is used if for the current context the dialog could not be used. If \a enable is false, object name for caption is cleared using setObjectNameForCaption() too. */ diff --git a/kexi/main/kexifinddialogbase.ui b/kexi/main/kexifinddialogbase.ui index 6eea7453..8ffc254d 100644 --- a/kexi/main/kexifinddialogbase.ui +++ b/kexi/main/kexifinddialogbase.ui @@ -82,7 +82,7 @@ <enum>WheelFocus</enum> </property> <property name="text"> - <string>Prompt on tqreplace</string> + <string>Prompt on replace</string> </property> <property name="checked"> <bool>true</bool> diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 795ddd53..a14ebfbb 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -693,21 +693,21 @@ void KexiMainWindowImpl::initActions() d->action_edit_redo->setWhatsThis(i18n("Reverts the most recent undo action.")); #if 0 //old - d->action_edit_tqfind = createSharedAction( KStdAction::Find, "edit_tqfind"); + d->action_edit_find = createSharedAction( KStdAction::Find, "edit_find"); d->action_edit_findnext = createSharedAction( KStdAction::FindNext, "edit_findnext"); d->action_edit_findprev = createSharedAction( KStdAction::FindPrev, "edit_findprevious"); -//! @todo d->action_edit_paste = createSharedAction( KStdAction::Replace, "edit_tqreplace"); +//! @todo d->action_edit_paste = createSharedAction( KStdAction::Replace, "edit_replace"); #endif - d->action_edit_tqfind = KStdAction::find( - TQT_TQOBJECT(this), TQT_SLOT(slotEditFind()), actionCollection(), "edit_tqfind" ); -// d->action_edit_tqfind = createSharedAction( KStdAction::Find, "edit_tqfind"); + d->action_edit_find = KStdAction::find( + TQT_TQOBJECT(this), TQT_SLOT(slotEditFind()), actionCollection(), "edit_find" ); +// d->action_edit_find = createSharedAction( KStdAction::Find, "edit_find"); d->action_edit_findnext = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT(slotEditFindNext()), actionCollection(), "edit_findnext"); d->action_edit_findprev = KStdAction::findPrev( TQT_TQOBJECT(this), TQT_SLOT(slotEditFindPrevious()), actionCollection(), "edit_findprevious"); - d->action_edit_tqreplace = 0; -//! @todo d->action_edit_tqreplace = KStdAction::tqreplace( + d->action_edit_replace = 0; +//! @todo d->action_edit_replace = KStdAction::replace( //! TQT_TQOBJECT(this), TQT_SLOT(slotEditReplace()), actionCollection(), "project_print_preview" ); d->action_edit_replace_all = 0; //! @todo d->action_edit_replace_all = new KAction( i18n("Replace All"), "", 0, @@ -1005,7 +1005,7 @@ void KexiMainWindowImpl::initActions() acat->addAction("edit_edititem", Kexi::PartItemActionCategory|Kexi::WindowActionCategory, KexiPart::TableObjectType, KexiPart::QueryObjectType); - acat->addAction("edit_tqfind", Kexi::GlobalActionCategory|Kexi::WindowActionCategory, + acat->addAction("edit_find", Kexi::GlobalActionCategory|Kexi::WindowActionCategory, KexiPart::TableObjectType, KexiPart::QueryObjectType, KexiPart::FormObjectType); acat->addAction("edit_findnext", Kexi::GlobalActionCategory|Kexi::WindowActionCategory, @@ -1014,7 +1014,7 @@ void KexiMainWindowImpl::initActions() acat->addAction("edit_findprevious", Kexi::GlobalActionCategory|Kexi::WindowActionCategory, KexiPart::TableObjectType, KexiPart::QueryObjectType, KexiPart::FormObjectType); - acat->addAction("edit_tqreplace", Kexi::GlobalActionCategory|Kexi::WindowActionCategory, + acat->addAction("edit_replace", Kexi::GlobalActionCategory|Kexi::WindowActionCategory, KexiPart::TableObjectType, KexiPart::QueryObjectType, KexiPart::FormObjectType); acat->addAction("edit_paste_special_data_table", Kexi::GlobalActionCategory); @@ -2323,7 +2323,7 @@ void KexiMainWindowImpl::updateCustomPropertyPanelTabs( curDialogPart->setupCustomPropertyPanelTabs(d->propEditorTabWidget, this); //restore current page number for this part - if (d->recentlySelectedPropertyPanelPages.tqcontains( curDialogPart )) { + if (d->recentlySelectedPropertyPanelPages.contains( curDialogPart )) { d->propEditorTabWidget->setCurrentPage( d->recentlySelectedPropertyPanelPages[ curDialogPart ] ); @@ -3297,7 +3297,7 @@ tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool layoutTaskBar d->removeDialog(dlg_id); //don't remove -KMDI will do that //also remove from 'print setup dialogs' cache, if needed int printedObjectID = 0; - if (d->pageSetupDialogItemID2dataItemID_map.tqcontains(dlg_id)) + if (d->pageSetupDialogItemID2dataItemID_map.contains(dlg_id)) printedObjectID = d->pageSetupDialogItemID2dataItemID_map[ dlg_id ]; d->pageSetupDialogs.take(printedObjectID); @@ -3798,7 +3798,7 @@ tristate KexiMainWindowImpl::removeObject( KexiPart::Item *item, bool dontAsk ) //also close 'print setup' dialog for this item, if any tristate res; // int printedObjectID = 0; -// if (d->pageSetupDialogItemID2dataItemID_map.tqcontains(item->identifier())) +// if (d->pageSetupDialogItemID2dataItemID_map.contains(item->identifier())) // printedObjectID = d->pageSetupDialogItemID2dataItemID_map[ item->identifier() ]; KexiDialogBase * pageSetupDlg = d->pageSetupDialogs[ item->identifier() ]; const bool oldInsideCloseDialog = d->insideCloseDialog; @@ -4245,7 +4245,7 @@ tristate KexiMainWindowImpl::showProjectMigrationWizard( TQString destinationDatabaseName( args["destinationDatabaseName"] ); TQString fileName, destinationConnectionShortcut, dbName; if (!destinationDatabaseName.isEmpty()) { - if (args.tqcontains("destinationConnectionShortcut")) { + if (args.contains("destinationConnectionShortcut")) { // server-based destinationConnectionShortcut = args["destinationConnectionShortcut"]; } @@ -4542,7 +4542,7 @@ void KexiMainWindowImpl::slotEditFind(bool next) KexiSearchAndReplaceViewInterface* iface = d->currentViewSupportingSearchAndReplaceInterface(); if (!iface) return; - tristate res = iface->tqfind( + tristate res = iface->find( d->findDialog()->valueToFind(), d->findDialog()->options(), next); if (~res) return; diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h index cf5f44c2..974f51c7 100644 --- a/kexi/main/keximainwindowimpl_p.h +++ b/kexi/main/keximainwindowimpl_p.h @@ -105,7 +105,7 @@ public: KexiDialogBase *openedDialogFor( int identifier, PendingJobType &pendingType ) { //todo(threads) TQMutexLocker dialogsLocker( &dialogsMutex ); - TQMap<int, PendingJobType>::ConstIterator it = pendingDialogs.tqfind( identifier ); + TQMap<int, PendingJobType>::ConstIterator it = pendingDialogs.find( identifier ); if (it==pendingDialogs.constEnd()) pendingType = NoJob; else @@ -140,7 +140,7 @@ public: #ifndef KEXI_NO_PENDING_DIALOGS void addItemToPendingDialogs(const KexiPart::Item* item, PendingJobType jobType) { //todo(threads) TQMutexLocker dialogsLocker( &dialogsMutex ); - pendingDialogs.tqreplace( item->identifier(), jobType ); + pendingDialogs.replace( item->identifier(), jobType ); } bool pendingDialogsExist() { @@ -322,7 +322,7 @@ void updatePropEditorDockWidthInfo() { return 0; } TQString key( TQString::number(item->identifier()) + name ); - return dynamic_cast<type*>( m_openedCustomObjectsForItem.tqfind( key.latin1() ) ); + return dynamic_cast<type*>( m_openedCustomObjectsForItem.find( key.latin1() ) ); } void addOpenedCustomObjectForItem(KexiPart::Item* item, TQObject* object, const char* name) @@ -335,16 +335,16 @@ void updatePropEditorDockWidthInfo() { if (!m_findDialog) { m_findDialog = new KexiFindDialog(wnd); m_findDialog->setActions( action_edit_findnext, action_edit_findprev, - action_edit_tqreplace, action_edit_replace_all ); + action_edit_replace, action_edit_replace_all ); /* connect(m_findDialog, TQT_SIGNAL(findNext()), action_edit_findnext, TQT_SLOT(activate())); - connect(m_findDialog, TQT_SIGNAL(tqfind()), wnd, TQT_SLOT(slotEditFindNext())); - connect(m_findDialog, TQT_SIGNAL(tqreplace()), wnd, TQT_SLOT(slotEditReplaceNext())); + connect(m_findDialog, TQT_SIGNAL(find()), wnd, TQT_SLOT(slotEditFindNext())); + connect(m_findDialog, TQT_SIGNAL(replace()), wnd, TQT_SLOT(slotEditReplaceNext())); connect(m_findDialog, TQT_SIGNAL(replaceAll()), wnd, TQT_SLOT(slotEditReplaceAll()));*/ } return m_findDialog; } - /*! Updates the tqfind/replace dialog depending on the active view. + /*! Updates the find/replace dialog depending on the active view. Nothing is performed if the dialog is not instantiated yet or is invisible. */ void updateFindDialogContents(bool createIfDoesNotExist = false) { if (!createIfDoesNotExist && (!m_findDialog || !m_findDialog->isVisible())) @@ -461,8 +461,8 @@ void updatePropEditorDockWidthInfo() { //! edit menu KAction *action_edit_delete, *action_edit_delete_row, *action_edit_cut, *action_edit_copy, *action_edit_paste, - *action_edit_tqfind, *action_edit_findnext, *action_edit_findprev, - *action_edit_tqreplace, *action_edit_replace_all, + *action_edit_find, *action_edit_findnext, *action_edit_findprev, + *action_edit_replace, *action_edit_replace_all, *action_edit_select_all, *action_edit_undo, *action_edit_redo, *action_edit_insert_empty_row, diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp index 54d977e4..13becfc8 100644 --- a/kexi/main/startup/KexiStartup.cpp +++ b/kexi/main/startup/KexiStartup.cpp @@ -231,7 +231,7 @@ bool KexiStartupHandler::getAutoopenObjects(KCmdLineArgs *args, const TQCString if (stripQuotes(item, obj_name)) { type_name = defaultType; } - else if ((idx = item.tqfind(':'))!=-1) { + else if ((idx = item.find(':'))!=-1) { //option with type name specified: type_name = item.left(idx).lower(); obj_name = item.mid(idx+1); diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp index 667c5288..ed4dcd40 100644 --- a/kexi/main/startup/KexiStartupFileDialog.cpp +++ b/kexi/main/startup/KexiStartupFileDialog.cpp @@ -142,21 +142,21 @@ void KexiStartupFileDialog::updateFilters() if (normalOpeningMode || normalSavingMode) { mime = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() ); - if (mime && m_excludedMimeTypes.tqfind(mime->name())==m_excludedMimeTypes.end()) { + if (mime && m_excludedMimeTypes.find(mime->name())==m_excludedMimeTypes.end()) { filter += KexiUtils::fileDialogFilterString(mime); allfilters += mime->patterns(); } } if (normalOpeningMode || m_mode & SavingServerBasedDB) { mime = KMimeType::mimeType("application/x-kexiproject-shortcut"); - if (mime && m_excludedMimeTypes.tqfind(mime->name())==m_excludedMimeTypes.end()) { + if (mime && m_excludedMimeTypes.find(mime->name())==m_excludedMimeTypes.end()) { filter += KexiUtils::fileDialogFilterString(mime); allfilters += mime->patterns(); } } if (normalOpeningMode || m_mode & SavingServerBasedDB) { mime = KMimeType::mimeType("application/x-kexi-connectiondata"); - if (mime && m_excludedMimeTypes.tqfind(mime->name())==m_excludedMimeTypes.end()) { + if (mime && m_excludedMimeTypes.find(mime->name())==m_excludedMimeTypes.end()) { filter += KexiUtils::fileDialogFilterString(mime); allfilters += mime->patterns(); } @@ -165,7 +165,7 @@ void KexiStartupFileDialog::updateFilters() //! @todo hardcoded for MSA: if (normalOpeningMode) { mime = KMimeType::mimeType("application/x-msaccess"); - if (mime && m_excludedMimeTypes.tqfind(mime->name())==m_excludedMimeTypes.end()) { + if (mime && m_excludedMimeTypes.find(mime->name())==m_excludedMimeTypes.end()) { filter += KexiUtils::fileDialogFilterString(mime); allfilters += mime->patterns(); } @@ -174,14 +174,14 @@ void KexiStartupFileDialog::updateFilters() foreach (TQStringList::ConstIterator, it, m_additionalMimeTypes) { if (*it == "all/allfiles") continue; - if (m_excludedMimeTypes.tqfind(*it)!=m_excludedMimeTypes.end()) + if (m_excludedMimeTypes.find(*it)!=m_excludedMimeTypes.end()) continue; filter += KexiUtils::fileDialogFilterString(*it); mime = KMimeType::mimeType(*it); allfilters += mime->patterns(); } - if (m_excludedMimeTypes.tqfind("all/allfiles")==m_excludedMimeTypes.end()) + if (m_excludedMimeTypes.find("all/allfiles")==m_excludedMimeTypes.end()) filter += KexiUtils::fileDialogFilterString("all/allfiles"); // mime = KMimeType::mimeType("all/allfiles"); // if (mime) { diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp index a51cd0c4..e716a607 100644 --- a/kexi/main/startup/KexiStartupFileDialog_win.cpp +++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp @@ -60,7 +60,7 @@ KexiStartupFileDialogBase::KexiStartupFileDialogBase( init(_dirName, filter, tqparent); - //tqfind "OK" button + //find "OK" button TQObjectList *l = queryList( TQPUSHBUTTON_OBJECT_NAME_STRING, "OK", false ); m_okBtn = dynamic_cast<TQPushButton*>(l->first()); delete l; @@ -403,17 +403,17 @@ TQString KexiStartupFileDialogBase::currentFilter() const //TQt format: "some text (*.first *.second)" or "All (*)" //KDE format: "*.first *.second" or "*" TQString f = selectedFilter(); - if (f.tqfind('(')!=-1) - f = f.mid(f.tqfind('(')+1); - if (f.mid(f.tqfind(')')!=-1)) - f = f.left(f.tqfind(')')); + if (f.find('(')!=-1) + f = f.mid(f.find('(')+1); + if (f.mid(f.find(')')!=-1)) + f = f.left(f.find(')')); return f; } void KexiStartupFileDialogBase::setFilter(const TQString& filter) { d->kde_filters = filter; - int pos = d->kde_filters.tqfind('/'); + int pos = d->kde_filters.find('/'); // Check for an un-escaped '/', if found // interpret as a MIME filter. diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp index bf20fbfb..b97b6fcf 100644 --- a/kexi/migration/importwizard.cpp +++ b/kexi/migration/importwizard.cpp @@ -130,7 +130,7 @@ void ImportWizard::parseArguments() if (!(*m_args)["databaseName"].isEmpty() && !(*m_args)["mimeType"].isEmpty()) { m_predefinedDatabaseName = (*m_args)["databaseName"]; m_predefinedMimeType = (*m_args)["mimeType"]; - if (m_args->tqcontains("connectionData")) { + if (m_args->contains("connectionData")) { m_predefinedConnectionData = new KexiDB::ConnectionData(); KexiDB::fromMap( KexiUtils::deserializeMap((*m_args)["connectionData"]), *m_predefinedConnectionData @@ -429,13 +429,13 @@ void ImportWizard::arriveSrcConnPage() m_setupFileBasedSrcNeeded = false; TQStringList additionalMimeTypes; /* moved - if (m_srcTypeCombo->currentText().tqcontains("Access")) { + if (m_srcTypeCombo->currentText().contains("Access")) { //! @todo tmp: hardcoded! additionalMimeTypes << "application/x-msaccess"; }*/ m_srcConn->m_fileDlg->setMode(KexiStartupFileDialog::Opening); m_srcConn->m_fileDlg->setAdditionalFilters(additionalMimeTypes); -/*moved if (m_srcTypeCombo->currentText().tqcontains("Access")) { +/*moved if (m_srcTypeCombo->currentText().contains("Access")) { //! @todo tmp: hardcoded! #ifdef TQ_WS_WIN m_srcConn->m_fileDlg->setSelectedFilter("*.mdb"); @@ -639,7 +639,7 @@ void ImportWizard::accept() // cancelButton()->setEnabled(true); */ if (m_args) { - if ((!fileBasedDstSelected() && !m_args->tqcontains("destinationConnectionShortcut")) + if ((!fileBasedDstSelected() && !m_args->contains("destinationConnectionShortcut")) || !m_openImportedProjectCheckBox->isChecked()) { //do not open dest db if used didn't want it @@ -803,7 +803,7 @@ tristate ImportWizard::import() { if (!m_sourceDBEncoding.isEmpty()) { sourceDriver->setPropertyValue( "source_database_nontqunicode_encoding", - TQVariant(m_sourceDBEncoding.upper().tqreplace(' ',"")) // "CP1250", not "cp 1250" + TQVariant(m_sourceDBEncoding.upper().replace(' ',"")) // "CP1250", not "cp 1250" ); } diff --git a/kexi/migration/keximigrate.cpp b/kexi/migration/keximigrate.cpp index 989a002a..fc11d0cd 100644 --- a/kexi/migration/keximigrate.cpp +++ b/kexi/migration/keximigrate.cpp @@ -168,7 +168,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) result->settqStatus(&drvManager); return false; } - const bool kexi__objects_exists = tables.tqfind("kexi__objects")!=tables.end(); + const bool kexi__objects_exists = tables.find("kexi__objects")!=tables.end(); TQStringList kexiDBTables; if (kexi__objects_exists) { tristate res = drv_queryStringListFromSQL( @@ -344,13 +344,13 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) if (m_migrateData->keepData) { //! @todo check detailed "copy forms/blobs/tables" flags here when we add them // Copy data for "kexi__objectdata" as well, if available in the source db - if (tables.tqfind("kexi__objectdata")!=tables.end()) + if (tables.find("kexi__objectdata")!=tables.end()) m_tableSchemas.append(destConn->tableSchema("kexi__objectdata")); // Copy data for "kexi__blobs" as well, if available in the source db - if (tables.tqfind("kexi__blobs")!=tables.end()) + if (tables.find("kexi__blobs")!=tables.end()) m_tableSchemas.append(destConn->tableSchema("kexi__blobs")); // Copy data for "kexi__fields" as well, if available in the source db - if (tables.tqfind("kexi__fields")!=tables.end()) + if (tables.find("kexi__fields")!=tables.end()) m_tableSchemas.append(destConn->tableSchema("kexi__fields")); } @@ -371,7 +371,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) } kdDebug() << "Copying data for table: " << tname << endl; TQString originalTableName; - if (kexiDBTables.tqfind(tname)==kexiDBTables.end()) + if (kexiDBTables.find(tname)==kexiDBTables.end()) //caption is equal to the original name originalTableName = ts.current()->caption().isEmpty() ? tname : ts.current()->caption(); else diff --git a/kexi/migration/migratemanager.cpp b/kexi/migration/migratemanager.cpp index 8cd26c3c..2c0ce6cd 100644 --- a/kexi/migration/migratemanager.cpp +++ b/kexi/migration/migratemanager.cpp @@ -112,7 +112,7 @@ bool MigrateManagerInternal::lookupDrivers() << ptr->property("Name").toString() << "\" service!\n -- skipped!" << endl; continue; } - if (m_services_lcase.tqcontains(srv_name.lower())) { + if (m_services_lcase.contains(srv_name.lower())) { continue; } @@ -152,7 +152,7 @@ bool MigrateManagerInternal::lookupDrivers() TQString drvType = ptr->property("X-Kexi-MigrationDriverType").toString().lower(); if (drvType=="file") { if (!mime.isEmpty()) { - if (!m_services_by_mimetype.tqcontains(mime)) { + if (!m_services_by_mimetype.contains(mime)) { m_services_by_mimetype.insert(mime, ptr); } else { @@ -183,16 +183,16 @@ KexiMigrate* MigrateManagerInternal::driver(const TQString& name) clearError(); KexiDBDbg << "MigrationrManagerInternal::migrationDriver(): loading " << name << endl; - KexiMigrate *drv = name.isEmpty() ? 0 : m_drivers.tqfind(name.latin1()); + KexiMigrate *drv = name.isEmpty() ? 0 : m_drivers.find(name.latin1()); if (drv) return drv; //cached - if (!m_services_lcase.tqcontains(name.lower())) { + if (!m_services_lcase.contains(name.lower())) { setError(ERR_DRIVERMANAGER, i18n("Could not find import/export database driver \"%1\".").tqarg(name) ); return 0; } - KService::Ptr ptr= *(m_services_lcase.tqfind(name.lower())); + KService::Ptr ptr= *(m_services_lcase.find(name.lower())); TQString srv_name = ptr->property("X-Kexi-MigrationDriverName").toString(); KexiDBDbg << "MigrateManagerInternal::driver(): library: "<<ptr->library()<<endl; diff --git a/kexi/migration/mysql/mysqlmigrate.cpp b/kexi/migration/mysql/mysqlmigrate.cpp index 9b69350b..1ea152c6 100644 --- a/kexi/migration/mysql/mysqlmigrate.cpp +++ b/kexi/migration/mysql/mysqlmigrate.cpp @@ -417,10 +417,10 @@ KexiDB::Field::Type MySQLMigrate::examineBlobField(const TQString& table, kdDebug() << "MySQLMigrate::examineBlobField: considering " << mysqlType << endl; - if(mysqlType.tqcontains("blob", false) != 0) { + if(mysqlType.contains("blob", false) != 0) { // Doesn't matter how big it is, it's binary kexiType = KexiDB::Field::BLOB; - } else if(mysqlType.tqcontains("text", false) != 0) { + } else if(mysqlType.contains("text", false) != 0) { // All the TEXT types are too big for Kexi text. kexiType = KexiDB::Field::BLOB; } else if(fld->length < 200) { diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp index 31ab61d0..9318bb5e 100644 --- a/kexi/plugins/forms/kexiactionselectiondialog.cpp +++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp @@ -142,7 +142,7 @@ void KActionsListViewBase::init() if (!isActionVisible((*it)->name(), actionCategories)) continue; ActionSelectorDialogListItem *pitem = new ActionSelectorDialogListItem((*it)->name(), - this, (*it)->toolTip().isEmpty() ? (*it)->text().tqreplace("&", "") : (*it)->toolTip() ); + this, (*it)->toolTip().isEmpty() ? (*it)->text().replace("&", "") : (*it)->toolTip() ); pitem->fifoSorting = false; //alpha sort pitem->setPixmap( 0, (*it)->iconSet( KIcon::Small, 16 ).pixmap( TQIconSet::Small, TQIconSet::Active ) ); if (!pitem->pixmap(0) || pitem->pixmap(0)->isNull()) @@ -278,7 +278,7 @@ class ActionToExecuteListView : public ActionsListViewBase printItem->setPixmap(0, SmallIcon("fileprint")); KAction *a = KStdAction::printPreview(0, 0, 0); item = new ActionSelectorDialogListItem("printPreview", printItem, - a->text().tqreplace("&", "").tqreplace("...", "")); + a->text().replace("&", "").replace("...", "")); item->setPixmap(0, SmallIcon(a->icon())); delete a; item = new ActionSelectorDialogListItem("pageSetup", printItem, i18n("Show Page Setup")); diff --git a/kexi/plugins/forms/kexidataprovider.cpp b/kexi/plugins/forms/kexidataprovider.cpp index 3e1e5c4b..7e5b9b85 100644 --- a/kexi/plugins/forms/kexidataprovider.cpp +++ b/kexi/plugins/forms/kexidataprovider.cpp @@ -81,7 +81,7 @@ void KexiFormDataProvider::setMainDataSourceWidget(TQWidget* mainWidget) kexipluginsdbg << obj->name() << endl; m_dataItems.append( formDataItem ); formDataItem->installListener( this ); - tmpSources.tqreplace( dataSource, (char*)1 ); + tmpSources.replace( dataSource, (char*)1 ); } delete l; //now we've got a set (unique list) of field names in tmpSources @@ -145,7 +145,7 @@ void KexiFormDataProvider::fillDuplicatedDataItems( if (!it.current()->columnInfo() || !it.current()->columnInfo()->field) continue; kdDebug() << " ** " << it.current()->columnInfo()->field->name() << endl; - it_dup = tmpDuplicatedItems.tqfind( it.current()->columnInfo()->field ); + it_dup = tmpDuplicatedItems.find( it.current()->columnInfo()->field ); uint count; if (it_dup==tmpDuplicatedItems.end()) count = 0; @@ -162,7 +162,7 @@ void KexiFormDataProvider::fillDuplicatedDataItems( } } } - if (item->columnInfo() && m_duplicatedItems->tqfind( item->columnInfo()->field )) { + if (item->columnInfo() && m_duplicatedItems->find( item->columnInfo()->field )) { for (TQPtrListIterator<KexiFormDataItemInterface> it(m_dataItems); it.current(); ++it) { if (it.current()!=item && item->columnInfo()->field == it.current()->columnInfo()->field) { kexipluginsdbg << "- setting a copy of value for item '" @@ -248,7 +248,7 @@ void KexiFormDataProvider::invalidateDataSources( const TQDict<char>& invalidSou const int newIndex = newIndices.at( it.data(), &ok ); if (ok && newIndex!=-1) { kexipluginsdbg << "invalidateDataSources(): " << it.key()->dataSource() << ": " << it.data() << " -> " << newIndex << endl; - newFieldNumbersForDataItems.tqreplace(it.key(), newIndex); + newFieldNumbersForDataItems.replace(it.key(), newIndex); } else { kexipluginsdbg << "invalidateDataSources(): removing " << it.key()->dataSource() << endl; @@ -304,7 +304,7 @@ void KexiFormDataProvider::invalidateDataSources( const TQDict<char>& invalidSou } } } - tmpUsedDataSources.tqreplace( item->dataSource().lower(), (char*)1 ); + tmpUsedDataSources.replace( item->dataSource().lower(), (char*)1 ); ++it; } m_disableFillDuplicatedDataItems = false; diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp index ce11e7d9..74f9af05 100644 --- a/kexi/plugins/forms/kexidatasourcepage.cpp +++ b/kexi/plugins/forms/kexidatasourcepage.cpp @@ -357,26 +357,26 @@ void KexiDataSourcePage::setDataSource(const TQCString& mimeType, const TQCStrin void KexiDataSourcePage::assignPropertySet(KoProperty::Set* propertySet) { TQCString objectName; - if (propertySet && propertySet->tqcontains("name")) + if (propertySet && propertySet->contains("name")) objectName = (*propertySet)["name"].value().toCString(); if (!objectName.isEmpty() && objectName == m_currentObjectName) return; //the same object m_currentObjectName = objectName; TQCString objectClassName; - if (propertySet && propertySet->tqcontains("this:className")) + if (propertySet && propertySet->contains("this:className")) objectClassName = (*propertySet)["this:className"].value().toCString(); /*moved if (propertySet) { TQCString iconName; TQString objectClassString; - if (propertySet->tqcontains("this:iconName")) + if (propertySet->contains("this:iconName")) iconName = (*propertySet)["this:iconName"].value().toCString(); - if (propertySet->tqcontains("this:classString")) + if (propertySet->contains("this:classString")) objectClassString = (*propertySet)["this:classString"].value().toString(); m_objectInfoLabel->setObjectName(objectName); m_objectInfoLabel->setObjectClassIcon(iconName); m_objectInfoLabel->setObjectClassName(objectClassString); - if (propertySet->tqcontains("this:className")) + if (propertySet->contains("this:className")) objectClassName = (*propertySet)["this:className"].value().toCString(); }*/ KexiPropertyEditorView::updateInfoLabelForPropertySet( @@ -396,7 +396,7 @@ void KexiDataSourcePage::assignPropertySet(KoProperty::Set* propertySet) // else { const bool multipleSelection = objectClassName=="special:multiple"; - const bool hasDataSourceProperty = propertySet && propertySet->tqcontains("dataSource") && !multipleSelection; + const bool hasDataSourceProperty = propertySet && propertySet->contains("dataSource") && !multipleSelection; if (!isForm) { //this is a widget diff --git a/kexi/plugins/forms/kexiformeventhandler.cpp b/kexi/plugins/forms/kexiformeventhandler.cpp index de2d8570..cd6f5ac3 100644 --- a/kexi/plugins/forms/kexiformeventhandler.cpp +++ b/kexi/plugins/forms/kexiformeventhandler.cpp @@ -46,7 +46,7 @@ bool KexiFormEventAction::ActionData::isEmpty() const KexiPart::Info* KexiFormEventAction::ActionData::decodeString( TQString& actionType, TQString& actionArg, bool& ok) const { - const int idx = string.tqfind(':'); + const int idx = string.find(':'); ok = false; if (idx==-1) return 0; diff --git a/kexi/plugins/forms/kexiformmanager.cpp b/kexi/plugins/forms/kexiformmanager.cpp index ce9b142b..3c76e7d9 100644 --- a/kexi/plugins/forms/kexiformmanager.cpp +++ b/kexi/plugins/forms/kexiformmanager.cpp @@ -120,10 +120,10 @@ void KexiFormManager::setFormDataSource(const TQCString& mime, const TQCString& if (activeForm()->selectedWidget() == formWidget) { //active form is selected: just use properties system KFormDesigner::WidgetPropertySet *set = propertySet(); - if (!set || !set->tqcontains("dataSource")) + if (!set || !set->contains("dataSource")) return; (*set)["dataSource"].setValue(name); - if (set->tqcontains("dataSourceMimeType")) + if (set->contains("dataSourceMimeType")) (*set)["dataSourceMimeType"].setValue(mime); return; } @@ -159,19 +159,19 @@ void KexiFormManager::setDataSourceFieldOrExpression(const TQString& string, con // return; KFormDesigner::WidgetPropertySet *set = propertySet(); - if (!set || !set->tqcontains("dataSource")) + if (!set || !set->contains("dataSource")) return; (*set)["dataSource"].setValue(string); - if (set->tqcontains("autoCaption") && (*set)["autoCaption"].value().toBool()) { - if (set->tqcontains("fieldCaptionInternal")) + if (set->contains("autoCaption") && (*set)["autoCaption"].value().toBool()) { + if (set->contains("fieldCaptionInternal")) (*set)["fieldCaptionInternal"].setValue(caption); } if (//type!=KexiDB::Field::InvalidType && - set->tqcontains("widgetType") && (*set)["widgetType"].value().toString()=="Auto") + set->contains("widgetType") && (*set)["widgetType"].value().toString()=="Auto") { - if (set->tqcontains("fieldTypeInternal")) + if (set->contains("fieldTypeInternal")) (*set)["fieldTypeInternal"].setValue(type); } diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp index 3f1d3466..e03a0779 100644 --- a/kexi/plugins/forms/kexiformpart.cpp +++ b/kexi/plugins/forms/kexiformpart.cpp @@ -466,7 +466,7 @@ KexiFormPart::slotPropertyChanged(TQWidget *w, const TQCString &name, const TQVa } if (KFormDesigner::FormManager::self()->activeForm()->widget() && name == "geometry") { //fall back to sizeInternal property.... - if (KFormDesigner::FormManager::self()->propertySet()->tqcontains("sizeInternal")) + if (KFormDesigner::FormManager::self()->propertySet()->contains("sizeInternal")) KFormDesigner::FormManager::self()->propertySet()->property("sizeInternal").setValue(TQSize(value.toRect().size())); } } diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp index 057e0a33..5996061f 100644 --- a/kexi/plugins/forms/kexiformscrollview.cpp +++ b/kexi/plugins/forms/kexiformscrollview.cpp @@ -394,7 +394,7 @@ int KexiFormScrollView::columns() const KexiFormDataItemInterface *item = dynamic_cast<KexiFormDataItemInterface*>(dbFormWidget()->orderedDataAwareWidgets()->at( col )); if (!item) return -1; - KexiFormDataItemInterfaceToIntMap::ConstIterator it(m_fieldNumbersForDataItems.tqfind( item )); + KexiFormDataItemInterfaceToIntMap::ConstIterator it(m_fieldNumbersForDataItems.find( item )); return it!=m_fieldNumbersForDataItems.constEnd() ? it.data() : -1; }*/ @@ -421,7 +421,7 @@ bool KexiFormScrollView::columnEditable(int col) if (!item || item->isReadOnly()) return false; -// KexiFormDataItemInterfaceToIntMap::ConstIterator it(m_fieldNumbersForDataItems.tqfind( item )); +// KexiFormDataItemInterfaceToIntMap::ConstIterator it(m_fieldNumbersForDataItems.find( item )); // return KexiDataAwareObjectInterface::columnEditable( it!=m_fieldNumbersForDataItems.constEnd() ? it.data() : -1 ); return KexiDataAwareObjectInterface::columnEditable( col ); } diff --git a/kexi/plugins/forms/kexiformscrollview.h b/kexi/plugins/forms/kexiformscrollview.h index cf2731d1..61c13a8f 100644 --- a/kexi/plugins/forms/kexiformscrollview.h +++ b/kexi/plugins/forms/kexiformscrollview.h @@ -79,7 +79,7 @@ class KEXIFORMUTILS_EXPORT KexiFormScrollView : dbFormWidget()->orderedDataAwareWidgets()->at( col )); if (!item) return -1; - KexiFormDataItemInterfaceToIntMap::ConstIterator it(m_fieldNumbersForDataItems.tqfind( item )); + KexiFormDataItemInterfaceToIntMap::ConstIterator it(m_fieldNumbersForDataItems.find( item )); return it!=m_fieldNumbersForDataItems.constEnd() ? (int)it.data() : -1; } diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp index 3f30fff2..3b12588c 100644 --- a/kexi/plugins/forms/kexiformview.cpp +++ b/kexi/plugins/forms/kexiformview.cpp @@ -345,7 +345,7 @@ 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()->tqfindProperty(subpropIt.key().latin1(), true); + const int count = subwidget->tqmetaObject()->findProperty(subpropIt.key().latin1(), true); const TQMetaProperty *meta = count!=-1 ? subwidget->tqmetaObject()->property(count, true) : 0; if (meta) { // Special case: the property value of type enum (set) but is saved as a string list, @@ -371,7 +371,7 @@ void KexiFormView::updateValuesForSubproperties() static void setUnsavedBLOBIdsForDataViewMode( TQWidget* widget, const TQMap<TQCString, KexiBLOBBuffer::Id_t>& unsavedLocalBLOBsByName) { - if (-1 != widget->tqmetaObject()->tqfindProperty("pixmapId")) { + if (-1 != widget->tqmetaObject()->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); @@ -783,7 +783,7 @@ KexiFormView::storeData(bool dontAsk) TQString originalFileName(h.originalFileName()); TQFileInfo fi(originalFileName); - TQString caption(fi.baseName().tqreplace('_', " ").simplifyWhiteSpace()); + TQString caption(fi.baseName().replace('_', " ").simplifyWhiteSpace()); if (st) { *st /* << NO, (pgsql doesn't support this):TQVariant()*/ /*id*/ @@ -1044,9 +1044,9 @@ KexiFormView::updateDataSourcePage() if (viewMode()==Kexi::DesignViewMode) { TQCString dataSourceMimeType, dataSource; KFormDesigner::WidgetPropertySet *set = KFormDesigner::FormManager::self()->propertySet(); - if (set->tqcontains("dataSourceMimeType")) + if (set->contains("dataSourceMimeType")) dataSourceMimeType = (*set)["dataSourceMimeType"].value().toCString(); - if (set->tqcontains("dataSource")) + if (set->contains("dataSource")) dataSource = (*set)["dataSource"].value().toCString(); formPart()->dataSourcePage()->setDataSource(dataSourceMimeType, dataSource); @@ -1149,7 +1149,7 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s group->addCommand(insertCmd, false/*don't exec twice*/); KFormDesigner::ObjectTreeItem *newWidgetItem - = form()->objectTree()->dict()->tqfind(insertCmd->widgetName()); + = form()->objectTree()->dict()->find(insertCmd->widgetName()); KexiDBAutoField* newWidget = newWidgetItem ? dynamic_cast<KexiDBAutoField*>(newWidgetItem->widget()) : 0; widgetsToSelect.append(newWidget); diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp index f977a962..f194908f 100644 --- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp @@ -211,7 +211,7 @@ void KexiDBComboBox::createEditor() void KexiDBComboBox::setLabelPosition(LabelPosition position) { if(m_subwidget) { - if (-1 != m_subwidget->tqmetaObject()->tqfindProperty("frameShape", true)) + if (-1 != m_subwidget->tqmetaObject()->findProperty("frameShape", true)) m_subwidget->setProperty("frameShape", TQVariant((int)TQFrame::NoFrame)); m_subwidget->setGeometry( editorGeometry() ); } @@ -247,7 +247,7 @@ bool KexiDBComboBox::handleMousePressEvent(TQMouseEvent *e) return; }*/ - if ( /*count() &&*/ ( !isEditable() || buttonGeometry().tqcontains( e->pos() ) ) ) { + if ( /*count() &&*/ ( !isEditable() || buttonGeometry().contains( e->pos() ) ) ) { d->buttonPressed = false; /* if ( d->usingListBox() ) { @@ -256,7 +256,7 @@ bool KexiDBComboBox::handleMousePressEvent(TQMouseEvent *e) listBox()->setCurrentItem(d->current); listBox()->blockSignals( FALSE ); popup(); - if ( arrowRect.tqcontains( e->pos() ) ) { + if ( arrowRect.contains( e->pos() ) ) { d->arrowPressed = TRUE; d->arrowDown = TRUE; tqrepaint( FALSE ); @@ -339,7 +339,7 @@ bool KexiDBComboBox::eventFilter( TQObject *o, TQEvent *e ) } else if (e->type()==TQEvent::Enter) { if (!d->isEditable - || /*over button if editable combo*/buttonGeometry().tqcontains( TQT_TQMOUSEEVENT(e)->pos() )) + || /*over button if editable combo*/buttonGeometry().contains( TQT_TQMOUSEEVENT(e)->pos() )) { d->mouseOver = true; update(); @@ -347,7 +347,7 @@ bool KexiDBComboBox::eventFilter( TQObject *o, TQEvent *e ) } else if (e->type()==TQEvent::MouseMove) { if (d->isEditable) { - const bool overButton = buttonGeometry().tqcontains( TQT_TQMOUSEEVENT(e)->pos() ); + const bool overButton = buttonGeometry().contains( TQT_TQMOUSEEVENT(e)->pos() ); if (overButton != d->mouseOver) { d->mouseOver = overButton; update(); @@ -370,7 +370,7 @@ bool KexiDBComboBox::eventFilter( TQObject *o, TQEvent *e ) } } } - else if (!d->isEditable && d->subWidgetsWithDisabledEvents && d->subWidgetsWithDisabledEvents->tqfind(o)) { + else if (!d->isEditable && d->subWidgetsWithDisabledEvents && d->subWidgetsWithDisabledEvents->find(o)) { if (e->type()==TQEvent::MouseButtonPress) { // clicking the subwidget should mean the same as clicking the combo box (i.e. show the popup) if (handleMousePressEvent(TQT_TQMOUSEEVENT(e))) diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp index cca955e5..c2a705c0 100644 --- a/kexi/plugins/forms/widgets/kexidbform.cpp +++ b/kexi/plugins/forms/widgets/kexidbform.cpp @@ -66,7 +66,7 @@ class KexiDBForm::Private int indexOfDataItem( KexiDataItemInterface* item ) const { TQMapConstIterator<KexiDataItemInterface*, uint> indicesForDataAwareWidgetsIt( - indicesForDataAwareWidgets.tqfind(item)); + indicesForDataAwareWidgets.find(item)); if (indicesForDataAwareWidgetsIt == indicesForDataAwareWidgets.constEnd()) return -1; kexipluginsdbg << "KexiDBForm: column # for item: " @@ -342,7 +342,7 @@ void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form) // /*! @todo d->indicesForDataAwareWidgets SHOULDNT BE UPDATED HERE BECAUSE // THERE CAN BE ALSO NON-TABSTOP DATA WIDGETS! // */ - d->indicesForDataAwareWidgets.tqreplace( + d->indicesForDataAwareWidgets.replace( dataItem, numberOfDataAwareWidgets ); numberOfDataAwareWidgets++; diff --git a/kexi/plugins/forms/widgets/kexidblabel.cpp b/kexi/plugins/forms/widgets/kexidblabel.cpp index af539e3d..8226d3c4 100644 --- a/kexi/plugins/forms/widgets/kexidblabel.cpp +++ b/kexi/plugins/forms/widgets/kexidblabel.cpp @@ -482,7 +482,7 @@ void KexiDBLabel::paintEvent( TQPaintEvent* e ) the shadow has to be drawn using an offset relative to the widgets border. */ - if ( !d->pixmapDirty && e->rect().tqcontains( d->shadowPosition ) && !d->shadowPixmap.isNull()) { + if ( !d->pixmapDirty && e->rect().contains( d->shadowPosition ) && !d->shadowPixmap.isNull()) { TQRect clipRect = TQRect( TQMAX( e->rect().x() - d->shadowPosition.x(), 0 ), TQMAX( e->rect().y() - d->shadowPosition.y(), 0 ), diff --git a/kexi/plugins/forms/widgets/kexidbsubform.cpp b/kexi/plugins/forms/widgets/kexidbsubform.cpp index 6fcd851a..283631c3 100644 --- a/kexi/plugins/forms/widgets/kexidbsubform.cpp +++ b/kexi/plugins/forms/widgets/kexidbsubform.cpp @@ -79,7 +79,7 @@ KexiDBSubForm::setFormName(const TQString &name) TQStringList list; while(pw) { if(pw->isA("KexiDBSubForm")) { - if(list.tqcontains(pw->name())) { + if(list.contains(pw->name())) { //! @todo error message return; // Be sure to don't run into a endless-loop cause of recursive subforms. } diff --git a/kexi/plugins/importexport/csv/kexicsv_importexportpart.cpp b/kexi/plugins/importexport/csv/kexicsv_importexportpart.cpp index 4112bf52..7037b29a 100644 --- a/kexi/plugins/importexport/csv/kexicsv_importexportpart.cpp +++ b/kexi/plugins/importexport/csv/kexicsv_importexportpart.cpp @@ -76,7 +76,7 @@ bool KexiCSVImportExportPart::executeCommand(KexiMainWindow* mainWin, const char KexiDB::TableOrQuerySchema tableOrQuery( mainWin->project()->dbConnection(), options.itemId); TQTextStream *stream = 0; - if (args->tqcontains("textStream")) + if (args->contains("textStream")) stream = KexiUtils::stringToPtr<TQTextStream>( (*args)["textStream"] ); return KexiCSVExport::exportData(tableOrQuery, options, -1, stream); } diff --git a/kexi/plugins/importexport/csv/kexicsvexport.cpp b/kexi/plugins/importexport/csv/kexicsvexport.cpp index 5af3d8ed..f3347676 100644 --- a/kexi/plugins/importexport/csv/kexicsvexport.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexport.cpp @@ -55,12 +55,12 @@ bool Options::assign( TQMap<TQString,TQString>& args ) mode = (args["destinationType"]=="file") ? KexiCSVExport::File : KexiCSVExport::Clipboard; - if (args.tqcontains("delimiter")) + if (args.contains("delimiter")) delimiter = args["delimiter"]; else delimiter = (mode==File) ? KEXICSV_DEFAULT_FILE_DELIMITER : KEXICSV_DEFAULT_CLIPBOARD_DELIMITER; - if (args.tqcontains("textQuote")) + if (args.contains("textQuote")) textQuote = args["textQuote"]; else textQuote = (mode==File) ? KEXICSV_DEFAULT_FILE_TEXT_TQUOTE : KEXICSV_DEFAULT_CLIPBOARD_TEXT_TQUOTE; @@ -69,9 +69,9 @@ bool Options::assign( TQMap<TQString,TQString>& args ) itemId = args["itemId"].toInt(&ok); if (!ok || itemId<=0) return false; - if (args.tqcontains("forceDelimiter")) + if (args.contains("forceDelimiter")) forceDelimiter = args["forceDelimiter"]; - if (args.tqcontains("addColumnNames")) + if (args.contains("addColumnNames")) addColumnNames = (args["addColumnNames"]=="1"); return true; } @@ -193,7 +193,7 @@ bool KexiCSVExport::exportData(KexiDB::TableOrQuerySchema& tableOrQuery, if (i>0) APPEND( delimiter ); if (hasTextQuote){ - APPEND( textQuote + fields[i]->captionOrAliasOrName().tqreplace(textQuote, escapedTextQuote) + textQuote ); + APPEND( textQuote + fields[i]->captionOrAliasOrName().replace(textQuote, escapedTextQuote) + textQuote ); } else { APPEND( fields[i]->captionOrAliasOrName() ); @@ -218,7 +218,7 @@ bool KexiCSVExport::exportData(KexiDB::TableOrQuerySchema& tableOrQuery, continue; if (isText[real_i]) { if (hasTextQuote) - APPEND( textQuote + TQString(cursor->value(real_i).toString()).tqreplace(textQuote, escapedTextQuote) + textQuote ); + APPEND( textQuote + TQString(cursor->value(real_i).toString()).replace(textQuote, escapedTextQuote) + textQuote ); else APPEND( cursor->value(real_i).toString() ); } diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp index 931eab73..956681b1 100644 --- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp @@ -378,9 +378,9 @@ static TQString convertKey(const char *key, KexiCSVExport::Mode mode) { TQString _key(TQString::tqfromLatin1(key)); if (mode == KexiCSVExport::Clipboard) { - _key.tqreplace("Exporting", "Copying"); - _key.tqreplace("Export", "Copy"); - _key.tqreplace("CSVFiles", "CSVToClipboard"); + _key.replace("Exporting", "Copying"); + _key.replace("Export", "Copy"); + _key.replace("CSVFiles", "CSVToClipboard"); } return _key; } diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index 3060db2a..01601230 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -1104,7 +1104,7 @@ void KexiCSVImportDialog::setText(int row, int col, const TQString& text, bool i //! @todo what about time and float/double types and different integer subtypes? } else if (detectedType==_FP_NUMBER_TYPE) { - //tqreplace ',' with '.' + //replace ',' with '.' TQCString t(text.latin1()); const int textLen = t.length(); for (int i=0; i<textLen; i++) { @@ -1348,7 +1348,7 @@ void KexiCSVImportDialog::accept() suggestedName = KURL::fromPathOrURL(m_fname).fileName(); //remove extension if (!suggestedName.isEmpty()) { - const int idx = suggestedName.tqfindRev("."); + const int idx = suggestedName.findRev("."); if (idx!=-1) suggestedName = suggestedName.mid(0, idx ).simplifyWhiteSpace(); } @@ -1414,9 +1414,9 @@ void KexiCSVImportDialog::accept() for (uint col = 0; col < numCols; col++) colnames.append( m_table->text(0, col).lower().simplifyWhiteSpace() ); - if (colnames.tqfind(fieldName)!=colnames.end()) { + if (colnames.find(fieldName)!=colnames.end()) { int num = 1; - while (colnames.tqfind(fieldName+TQString::number(num))!=colnames.end()) + while (colnames.find(fieldName+TQString::number(num))!=colnames.end()) num++; fieldName += TQString::number(num); fieldCaption += TQString::number(num); diff --git a/kexi/plugins/macros/kexiactions/datatableaction.cpp b/kexi/plugins/macros/kexiactions/datatableaction.cpp index fff0eaf5..d2eb1df1 100644 --- a/kexi/plugins/macros/kexiactions/datatableaction.cpp +++ b/kexi/plugins/macros/kexiactions/datatableaction.cpp @@ -93,7 +93,7 @@ namespace KexiMacro { //this->appendChild( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(name)) ); } const TQString n = - namelist.tqcontains(partitem) + namelist.contains(partitem) ? partitem : namelist.count() > 0 ? namelist[0] : ""; this->setVariant(n); diff --git a/kexi/plugins/macros/kexiactions/objectnamevariable.h b/kexi/plugins/macros/kexiactions/objectnamevariable.h index e9ffa949..419e2b00 100644 --- a/kexi/plugins/macros/kexiactions/objectnamevariable.h +++ b/kexi/plugins/macros/kexiactions/objectnamevariable.h @@ -63,7 +63,7 @@ namespace KexiMacro { for(TQStringList::Iterator it = namelist.begin(); it != namelist.end(); ++it) this->appendChild( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) ); - this->setVariant( (name.isNull() || ! namelist.tqcontains(name)) ? namelist[0] : name ); + this->setVariant( (name.isNull() || ! namelist.contains(name)) ? namelist[0] : name ); kdDebug()<<"##################### KexiActions::ObjectNameVariable() objectname="<<objectname<<" name="<<name<<" value="<<this->variant()<<" tqchildren="<<namelist<<endl; } diff --git a/kexi/plugins/macros/kexiactions/openaction.cpp b/kexi/plugins/macros/kexiactions/openaction.cpp index 2e43116f..9cd2e664 100644 --- a/kexi/plugins/macros/kexiactions/openaction.cpp +++ b/kexi/plugins/macros/kexiactions/openaction.cpp @@ -66,7 +66,7 @@ namespace KexiMacro { this->tqchildren().append( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) ); } const TQString n = - namelist.tqcontains(viewname) + namelist.contains(viewname) ? viewname : namelist.count() > 0 ? namelist[0] : ""; diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp index 4d480365..efce73c0 100644 --- a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp +++ b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp @@ -264,7 +264,7 @@ void KexiMacroDesignView::beforeCellChanged(KexiTableItem* item, int colnum, TQV Q_UNUSED(result); kdDebug() << "KexiMacroDesignView::beforeCellChanged() colnum=" << colnum << " newvalue=" << newvalue.toString() << endl; - int rowindex = d->tabledata->tqfindRef(item); + int rowindex = d->tabledata->findRef(item); if(rowindex < 0) { kdWarning() << "KexiMacroDesignView::beforeCellChanged() No such item" << endl; return; @@ -311,7 +311,7 @@ void KexiMacroDesignView::beforeCellChanged(KexiTableItem* item, int colnum, TQV void KexiMacroDesignView::rowUpdated(KexiTableItem* item) { - int rowindex = d->tabledata->tqfindRef(item); + int rowindex = d->tabledata->findRef(item); kdDebug() << "KexiMacroDesignView::rowUpdated() rowindex=" << rowindex << endl; //propertySetSwitched(); //propertySetReloaded(true); @@ -452,7 +452,7 @@ void KexiMacroDesignView::propertyChanged(KoProperty::Set& set, KoProperty::Prop continue; } - if(! set.tqcontains( (*it).latin1() )) { + if(! set.contains( (*it).latin1() )) { // If there exist no such property yet, we need to add it. if(updateSet(&set, macroitem, *it)) reload = true; // we like to reload the whole set diff --git a/kexi/plugins/macros/lib/action.cpp b/kexi/plugins/macros/lib/action.cpp index db5596b4..45c03d12 100644 --- a/kexi/plugins/macros/lib/action.cpp +++ b/kexi/plugins/macros/lib/action.cpp @@ -124,12 +124,12 @@ void Action::setComment(const TQString& comment) bool Action::hasVariable(const TQString& name) const { - return d->varmap.tqcontains(name); + return d->varmap.contains(name); } KSharedPtr<Variable> Action::variable(const TQString& name) const { - return d->varmap.tqcontains(name) ? d->varmap[name] : KSharedPtr<Variable>(0); + return d->varmap.contains(name) ? d->varmap[name] : KSharedPtr<Variable>(0); } Variable::Map Action::variables() const @@ -145,10 +145,10 @@ TQStringList Action::variableNames() const void Action::setVariable(KSharedPtr<Variable> variable) { const TQString name = variable->name(); - if(! d->varmap.tqcontains(name)) { + if(! d->varmap.contains(name)) { d->varnames.append(name); } - d->varmap.tqreplace(name, variable); + d->varmap.replace(name, variable); } void Action::setVariable(const TQString& name, const TQString& text, const TQVariant& variant) @@ -161,7 +161,7 @@ void Action::setVariable(const TQString& name, const TQString& text, const TQVar void Action::removeVariable(const TQString& name) { - if(d->varmap.tqcontains(name)) { + if(d->varmap.contains(name)) { d->varmap.remove(name); d->varnames.remove(name); } diff --git a/kexi/plugins/macros/lib/context.cpp b/kexi/plugins/macros/lib/context.cpp index 6e2fb2e4..7c0b6ee8 100644 --- a/kexi/plugins/macros/lib/context.cpp +++ b/kexi/plugins/macros/lib/context.cpp @@ -100,14 +100,14 @@ Context::~Context() bool Context::hasVariable(const TQString& name) const { //Use TQMap?s contains to check if a variable with name exists - return d->variables.tqcontains(name); + return d->variables.contains(name); } //return variable with name or throw an exception if none is found in variables KSharedPtr<Variable> Context::variable(const TQString& name) const { //Use TQMap?s contains to check if a variable with name exists in context - if (d->variables.tqcontains(name)) { + if (d->variables.contains(name)) { //return it return d->variables[name]; } @@ -134,7 +134,7 @@ 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; //Use TQMap?s replace to set/replace the variable named name - d->variables.tqreplace(name, variable); + d->variables.replace(name, variable); } //return the associated Macro @@ -252,7 +252,7 @@ void Context::activateNext() } //find the macroitem from which to continue - TQValueList<KSharedPtr<MacroItem > >::ConstIterator it = d->items.tqfind(d->macroitem); + TQValueList<KSharedPtr<MacroItem > >::ConstIterator it = d->items.find(d->macroitem); if (it != d->items.constEnd()) { activate(++it); // try to continue the execution. } diff --git a/kexi/plugins/macros/lib/macroitem.cpp b/kexi/plugins/macros/lib/macroitem.cpp index 471f9660..cf317fab 100644 --- a/kexi/plugins/macros/lib/macroitem.cpp +++ b/kexi/plugins/macros/lib/macroitem.cpp @@ -147,7 +147,7 @@ TQVariant MacroItem::variant(const TQString& name, bool checkaction) const KSharedPtr<Variable> MacroItem::variable(const TQString& name, bool checkaction) const { - if(d->variables.tqcontains(name)) + if(d->variables.contains(name)) return d->variables[name]; if(checkaction && d->action.data()) return d->action->variable(name); @@ -179,7 +179,7 @@ bool MacroItem::setVariant(const TQString& name, const TQVariant& variant) variable = KSharedPtr<Variable>( new Variable() ); variable->setName(name); - d->variables.tqreplace(name, variable); + d->variables.replace(name, variable); } // Remember the previous value for the case we like to restore it. @@ -203,13 +203,13 @@ bool MacroItem::setVariant(const TQString& name, const TQVariant& variant) KSharedPtr<Variable> MacroItem::addVariable(const TQString& name, const TQVariant& variant) { - Q_ASSERT(! d->variables.tqcontains(name) ); + Q_ASSERT(! d->variables.contains(name) ); // Create a new Variable. KSharedPtr<Variable> variable = KSharedPtr<Variable>( new Variable() ); variable->setName(name); // Put it into the Variable-map. - d->variables.tqreplace(name, variable); + d->variables.replace(name, variable); // Set the variant of the Variable. this->setVariant(name, variant); diff --git a/kexi/plugins/macros/lib/manager.cpp b/kexi/plugins/macros/lib/manager.cpp index 0a0d59e0..f73ddaa8 100644 --- a/kexi/plugins/macros/lib/manager.cpp +++ b/kexi/plugins/macros/lib/manager.cpp @@ -85,11 +85,11 @@ Manager::Manager(KXMLGUIClient* const xmlguiclient) kdDebug() << "Manager::Manager() Ctor" << endl; TQObject* obj = dynamic_cast<TQObject*>(xmlguiclient); if(obj) { - d->objects.tqreplace(obj->name(), obj); + d->objects.replace(obj->name(), obj); } //TESTCASE - d->objects.tqreplace("TestCase", new TQWidget()); + d->objects.replace("TestCase", new TQWidget()); } Manager::~Manager() @@ -105,7 +105,7 @@ KXMLGUIClient* Manager::guiClient() const bool Manager::hasMacro(const TQString& macroname) { - return d->macros.tqcontains(macroname); + return d->macros.contains(macroname); } KSharedPtr<Macro> Manager::getMacro(const TQString& macroname) @@ -115,7 +115,7 @@ KSharedPtr<Macro> Manager::getMacro(const TQString& macroname) void Manager::addMacro(const TQString& macroname, KSharedPtr<Macro> macro) { - d->macros.tqreplace(macroname, macro); + d->macros.replace(macroname, macro); } void Manager::removeMacro(const TQString& macroname) @@ -147,16 +147,16 @@ TQStringList Manager::actionNames() const void Manager::publishAction(KSharedPtr<Action> action) { const TQString name = action->name(); - if(! d->actions.tqcontains(name)) { + if(! d->actions.contains(name)) { d->actionnames.append(name); } - d->actions.tqreplace(name, action); + d->actions.replace(name, action); } void Manager::publishObject(const TQString& name, TQObject* object) { - Q_ASSERT(! d->objects.tqcontains(name)); - d->objects.tqreplace(name, object); + Q_ASSERT(! d->objects.contains(name)); + d->objects.replace(name, object); } TQGuardedPtr<TQObject> Manager::object(const TQString& name) const diff --git a/kexi/plugins/macros/lib/manager.h b/kexi/plugins/macros/lib/manager.h index fb332f66..ae32aad9 100644 --- a/kexi/plugins/macros/lib/manager.h +++ b/kexi/plugins/macros/lib/manager.h @@ -128,7 +128,7 @@ namespace KoMacro { * Add a new \a Macro to the list of known macros. If * there exists already a \a Macro instance with the * defined \p macroname then the already existing one - * will be tqreplace. + * will be replace. * * \param macroname The name the \a Macro will be * accessible as. diff --git a/kexi/plugins/macros/lib/metamethod.cpp b/kexi/plugins/macros/lib/metamethod.cpp index 979202e8..16b93803 100644 --- a/kexi/plugins/macros/lib/metamethod.cpp +++ b/kexi/plugins/macros/lib/metamethod.cpp @@ -89,8 +89,8 @@ MetaMethod::MetaMethod(const TQString& signature, Type type, KSharedPtr<MetaObje d->object = object; d->type = type; - int startpos = d->signature.tqfind("("); - int endpos = d->signature.tqfindRev(")"); + int startpos = d->signature.find("("); + int endpos = d->signature.findRev(")"); if(startpos < 0 || startpos > endpos) { throw Exception(TQString("Invalid signature \"%1\"").tqarg(d->signature)); } @@ -103,14 +103,14 @@ MetaMethod::MetaMethod(const TQString& signature, Type type, KSharedPtr<MetaObje d->signaturearguments = d->signature.mid(startpos + 1, endpos - startpos - 1).stripWhiteSpace(); do { - int commapos = d->signaturearguments.tqfind(","); - int starttemplatepos = d->signaturearguments.tqfind("<"); + int commapos = d->signaturearguments.find(","); + int starttemplatepos = d->signaturearguments.find("<"); if(starttemplatepos >= 0 && (commapos < 0 || starttemplatepos < commapos)) { - int endtemplatepos = d->signaturearguments.tqfind(">", starttemplatepos); + int endtemplatepos = d->signaturearguments.find(">", starttemplatepos); if(endtemplatepos <= 0) { throw Exception(TQString("No closing template-definiton in signature \"%1\"").tqarg(d->signature)); } - commapos = d->signaturearguments.tqfind(",", endtemplatepos); + commapos = d->signaturearguments.find(",", endtemplatepos); } if(commapos > 0) { diff --git a/kexi/plugins/macros/tests/xmlhandlertests.cpp b/kexi/plugins/macros/tests/xmlhandlertests.cpp index a08ff33d..29c53831 100644 --- a/kexi/plugins/macros/tests/xmlhandlertests.cpp +++ b/kexi/plugins/macros/tests/xmlhandlertests.cpp @@ -177,7 +177,7 @@ void XMLHandlerTests::testCorrectDomElement() // Test the Compare-method when a Variable will change, it must fail. macro->items().first()->variable("teststring")->setVariant("bla"); - isvariableok.tqreplace("teststring",false); + isvariableok.replace("teststring",false); assertMacroContentEqToXML(macro,elem,false,true,isvariableok); } @@ -568,12 +568,12 @@ void XMLHandlerTests::assertMacroContentEqToXML(const KSharedPtr<KoMacro::Macro> while ( ! varnode.isNull()) { const TQDomElement varelem = varnode.toElement(); - const KSharedPtr<KoMacro::Variable> varitem = mvariables.tqfind(varelem.attribute("name")).data(); + const KSharedPtr<KoMacro::Variable> varitem = mvariables.find(varelem.attribute("name")).data(); //3.comparison - Is the content of the Variable // in the MacroItem and and item equal? { - const bool var = *isvariableok.tqfind(varelem.attribute("name")); + const bool var = *isvariableok.find(varelem.attribute("name")); if( ! var ) { KOMACROTEST_XASSERT(varitem->variant() == TQVariant(varelem.text()), !var); kdDebug() << "The content of the Variable: " << varitem->name() diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp index 5be54145..be16b70d 100644 --- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp +++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp @@ -318,7 +318,7 @@ void KexiQueryDesignerGuiEditor::updateColumnsData() { //table /*! @todo what about query? */ - KexiDB::TableSchema *table = d->relations->tables()->tqfind(*it)->schema()->table(); + KexiDB::TableSchema *table = d->relations->tables()->find(*it)->schema()->table(); d->conn->registerForTableSchemaChanges(*tempData(), *table); //this table will be used item = d->tablesColumnData->createItem(); //new KexiTableItem(2); (*item)[COLUMN_ID_COLUMN]=table->name(); @@ -961,7 +961,7 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal( if (column) { //sorting for visible column if (column->visible) { - if (columnsOrder.tqcontains(column)) { + if (columnsOrder.contains(column)) { const int columnPosition = columnsOrder[ column ]; rowItem = d->data->at( columnPosition ); rowPropertySet = d->sets->at( columnPosition ); @@ -1018,7 +1018,7 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal( } } KexiDB::Field* field = 0; - if (-1 == columnNameArgument->name.tqfind('.') && query->tables()->count()==1) { + if (-1 == columnNameArgument->name.find('.') && query->tables()->count()==1) { //extreme case: only field name provided for one-table query: field = query->tables()->first()->field(columnNameArgument->name); } @@ -1374,9 +1374,9 @@ KexiQueryDesignerGuiEditor::parseExpressionString(const TQString& fullString, in //number TQString decimalSym = KGlobal::locale()->decimalSymbol(); bool ok; - int pos = str.tqfind('.'); + int pos = str.find('.'); if (pos==-1) {//second chance: local decimal symbol - pos = str.tqfind(decimalSym); + pos = str.find(decimalSym); } if (pos>=0) {//real const number const int left = str.left(pos).toInt(&ok); @@ -1440,8 +1440,8 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int //this value is entered by hand and doesn't match //any value in the combo box -- we're assuming this is an expression //-table remains null - //-tqfind "alias" in something like "alias : expr" - const int id = fieldId.tqfind(':'); + //-find "alias" in something like "alias : expr" + const int id = fieldId.find(':'); if (id>0) { alias = fieldId.left(id).stripWhiteSpace().latin1(); if (!KexiUtils::isIdentifier(alias)) { @@ -1490,7 +1490,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int KoProperty::Set *set = d->sets->findPropertySetForItem(*item); //*propertyBuffer(); if (!set) { saveOldValue = false; // no old val. - const int row = d->data->tqfindRef(item); + const int row = d->data->findRef(item); if (row<0) { result->success = false; return; @@ -1605,7 +1605,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int field = (*set)["field"].value().toString(); table = (*set)["table"].value().toString(); } - if (!str.isEmpty() && (!set || table=="*" || field.tqfind("*")!=-1)) { + if (!str.isEmpty() && (!set || table=="*" || field.find("*")!=-1)) { //asterisk found! criteria not allowed result->success = false; result->allowToDiscardChanges = true; diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp index 19c0e06a..0321ff2b 100644 --- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp +++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp @@ -83,7 +83,7 @@ KexiQueryDesignerSQLHistory::contentsMousePressEvent(TQMouseEvent * e) updateContents(it.current()->tqgeometry(y, visibleWidth(), fontMetrics())); } - if(it.current()->tqgeometry(y, visibleWidth(), fontMetrics()).tqcontains(e->pos())) + if(it.current()->tqgeometry(y, visibleWidth(), fontMetrics()).contains(e->pos())) { popupHistory = it.current(); pos = y; @@ -273,12 +273,12 @@ HistoryEntry::highlight(const TQColorGroup &cg) bool dblquote = false; statement = m_statement; - statement.tqreplace("<", "<"); - statement.tqreplace(">", ">"); - statement.tqreplace("\r\n", "<br>"); //(js) first win32 specific pair - statement.tqreplace("\n", "<br>"); // now single \n - statement.tqreplace(" ", " "); - statement.tqreplace("\t", " "); + statement.replace("<", "<"); + statement.replace(">", ">"); + statement.replace("\r\n", "<br>"); //(js) first win32 specific pair + statement.replace("\n", "<br>"); // now single \n + statement.replace(" ", " "); + statement.replace("\t", " "); // getting quoting... if(!m_selected) @@ -331,7 +331,7 @@ HistoryEntry::highlight(const TQColorGroup &cg) TQRegExp keywords("\\b(SELECT|UPDATE|INSERT|DELETE|DROP|FROM|WHERE|AND|OR|NOT|NULL|JOIN|LEFT|RIGHT|ON|INTO|TABLE)\\b"); keywords.setCaseSensitive(false); - text = text.tqreplace(keywords, "<b>\\1</b>"); + text = text.replace(keywords, "<b>\\1</b>"); if(!m_error.isEmpty()) // text += ("<br>"+i18n("Error: %1").tqarg(m_error)); diff --git a/kexi/plugins/scripting/kexidb.doxyfile b/kexi/plugins/scripting/kexidb.doxyfile index 3e21f7f1..f44e8230 100644 --- a/kexi/plugins/scripting/kexidb.doxyfile +++ b/kexi/plugins/scripting/kexidb.doxyfile @@ -16,7 +16,7 @@ ABBREVIATE_BRIEF = "The $name class" \ is \ provides \ specifies \ - tqcontains \ + contains \ represents \ a \ an \ diff --git a/kexi/plugins/scripting/kexidb/kexidbcursor.cpp b/kexi/plugins/scripting/kexidb/kexidbcursor.cpp index bb9f53df..b1d335b6 100644 --- a/kexi/plugins/scripting/kexidb/kexidbcursor.cpp +++ b/kexi/plugins/scripting/kexidb/kexidbcursor.cpp @@ -106,8 +106,8 @@ bool KexiDBCursor::setValue(uint index, TQVariant value) } const TQ_LLONG position = m_cursor->at(); - if(! m_modifiedrecords.tqcontains(position)) - m_modifiedrecords.tqreplace(position, new Record(m_cursor)); + if(! m_modifiedrecords.contains(position)) + m_modifiedrecords.replace(position, new Record(m_cursor)); m_modifiedrecords[position]->buffer->insert(*column, value); return true; } diff --git a/kexi/plugins/scripting/kexidb/kexidbschema.cpp b/kexi/plugins/scripting/kexidb/kexidbschema.cpp index aebcbd7e..2ac40342 100644 --- a/kexi/plugins/scripting/kexidb/kexidbschema.cpp +++ b/kexi/plugins/scripting/kexidb/kexidbschema.cpp @@ -154,20 +154,20 @@ bool KexiDBQuerySchema::setWhereExpression(const TQString& whereexpression) { TQRegExp re("[\"',]{1,1}"); while(true) { s.remove(TQRegExp("^[\\s,]+")); - int pos = s.tqfind('='); + int pos = s.find('='); if(pos < 0) break; TQString key = s.left(pos).stripWhiteSpace(); s = s.mid(pos + 1).stripWhiteSpace(); TQString value; - int sp = s.tqfind(re); + int sp = s.find(re); if(sp >= 0) { if(re.cap(0) == ",") { value = s.left(sp).stripWhiteSpace(); s = s.mid(sp+1).stripWhiteSpace(); } else { - int ep = s.tqfind(re.cap(0),sp+1); + int ep = s.find(re.cap(0),sp+1); value = s.mid(sp+1,ep-1); s = s.mid(ep + 1); } diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp index 39f84599..50a875b3 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp @@ -321,7 +321,7 @@ tristate KexiScriptDesignView::storeData(bool /*dontAsk*/) TQMap<TQString, TQVariant>& options = d->scriptaction->getOptions(); TQMap<TQString, TQVariant>::ConstIterator it, end( options.constEnd() ); for( it = options.constBegin(); it != end; ++it) { - if( defoptions.tqcontains(it.key()) ) { // only remember options which the InterpreterInfo knows about... + if( defoptions.contains(it.key()) ) { // only remember options which the InterpreterInfo knows about... scriptelem.setAttribute(it.key(), it.data().toString()); } } diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py index 43fa7e25..bdec927b 100644 --- a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py +++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py @@ -210,7 +210,7 @@ def runGuiApp(copycenter, name): if filename != "": self.jobfilecombobox.setCurrentText(filename) def escape(self,s): - return s.tqreplace("&", "&").tqreplace("'", "'").tqreplace("<", "<").tqreplace(">", ">").tqreplace('"', """) + return s.replace("&", "&").replace("'", "'").replace("<", "<").replace(">", ">").replace('"', """) def writeOptions(self,writer,pluginname,plugininst): print "CopyJobWidget.writeOptions" @@ -271,7 +271,7 @@ def runGuiApp(copycenter, name): def text(self, columnindex): if columnindex == 1: - if qt.QListViewItem.text(self,0).tqcontains("password"): + if qt.QListViewItem.text(self,0).contains("password"): return "*" * len(str(qt.QListViewItem.text(self,1))) return qt.QListViewItem.text(self,columnindex) return ListViewItem(pluginimpl, self.listview, parentitem, afteritem) diff --git a/kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py b/kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py index 9febfcdd..d0d1f0cc 100644 --- a/kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py +++ b/kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py @@ -83,7 +83,7 @@ class HtmlExporter: def htmlescape(self, text): import string - return string.tqreplace(string.tqreplace(string.tqreplace(str(text),'&','&'),'<','<'),'>','>') + return string.replace(string.replace(string.replace(str(text),'&','&'),'<','<'),'>','>') def write(self, output, style): name = self.datasource.name() diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp index 2f6cd21c..0e743bd1 100644 --- a/kexi/plugins/tables/kexitabledesignerview.cpp +++ b/kexi/plugins/tables/kexitabledesignerview.cpp @@ -833,7 +833,7 @@ void KexiTableDesignerView::slotBeforeCellChanged( void KexiTableDesignerView::slotRowUpdated(KexiTableItem *item) { - const int row = d->view->KexiDataAwareObjectInterface::data()->tqfindRef(item); + const int row = d->view->KexiDataAwareObjectInterface::data()->findRef(item); if (row < 0) return; @@ -1155,7 +1155,7 @@ void KexiTableDesignerView::slotAboutToDeleteRow( d->primaryKeyExists = false; if (d->addHistoryCommand_in_slotAboutToDeleteRow_enabled) { - const int row = d->view->KexiDataAwareObjectInterface::data()->tqfindRef(&item); + const int row = d->view->KexiDataAwareObjectInterface::data()->findRef(&item); KoProperty::Set *set = row >=0 ? d->sets->at(row) : 0; //set can be 0 here, what means "removing empty row" addHistoryCommand( @@ -1176,7 +1176,7 @@ KexiDB::Field * KexiTableDesignerView::buildField( const KoProperty::Set &set ) while (it!=values.end()) { const TQString propName( it.key() ); - if (d->internalPropertyNames.tqfind(propName.latin1()) || propName.startsWith("this:") + if (d->internalPropertyNames.find(propName.latin1()) || propName.startsWith("this:") || (/*sanity*/propName=="objectType" && KexiDB::Field::BLOB != KexiDB::intToFieldType( set["type"].value().toInt() ))) { TQMap<TQCString, TQVariant>::Iterator it_tmp = it; @@ -1717,7 +1717,7 @@ void KexiTableDesignerView::insertField(int row, KoProperty::Set& set, bool addC void KexiTableDesignerView::insertFieldInternal(int row, KoProperty::Set* set, //const KexiDB::Field& field, const TQString& caption, bool addCommand) { - if (set && (!set->tqcontains("type") || !set->tqcontains("caption"))) { + if (set && (!set->contains("type") || !set->contains("caption"))) { kexipluginswarn << "KexiTableDesignerView::insertField(): no 'type' or 'caption' property in set!" << endl; return; } @@ -1807,7 +1807,7 @@ void KexiTableDesignerView::changeFieldPropertyForRow( int row, return; KoProperty::Set* set = d->sets->at( row ); - if (!set || !set->tqcontains(propertyName)) + if (!set || !set->contains(propertyName)) return; KoProperty::Property &property = set->property(propertyName); if (listData) { @@ -1896,7 +1896,7 @@ void KexiTableDesignerView::changePropertyVisibility( if (row<0) return; KoProperty::Set* set = d->sets->at( row ); - if (!set || !set->tqcontains(propertyName)) + if (!set || !set->contains(propertyName)) return; KoProperty::Property &property = set->property(propertyName); diff --git a/kexi/tests/gui/finddialog/kexifinddialog.cpp b/kexi/tests/gui/finddialog/kexifinddialog.cpp index 5c3a7e4d..5482c072 100644 --- a/kexi/tests/gui/finddialog/kexifinddialog.cpp +++ b/kexi/tests/gui/finddialog/kexifinddialog.cpp @@ -31,7 +31,7 @@ KexiFindDialog::KexiFindDialog( bool replaceMode, TQWidget* tqparent, const char : KexiFindDialogBase(tqparent, name, modal) , m_replaceMode(true) { - m_btnFind->setIconSet(KStdGuiItem::tqfind().iconSet()); + m_btnFind->setIconSet(KStdGuiItem::find().iconSet()); m_btnClose->setIconSet(KStdGuiItem::close().iconSet()); setReplaceMode(replaceMode); m_lookIn->insertItem(i18n("(All columns)")); diff --git a/kexi/tests/gui/finddialog/kexifinddialog.h b/kexi/tests/gui/finddialog/kexifinddialog.h index a6cdc47c..b1cd4a5c 100644 --- a/kexi/tests/gui/finddialog/kexifinddialog.h +++ b/kexi/tests/gui/finddialog/kexifinddialog.h @@ -24,7 +24,7 @@ /*! @brief A Kexi-specific "Find text" dialog. - Also used for tqreplace. + Also used for replace. */ class KexiFindDialog : public KexiFindDialogBase { @@ -56,7 +56,7 @@ TODO TODO TODO TODO TODO TODO public slots: /*! Sets or clears replace mode. - For replace mode 'prompt or tqreplace' option is visible. + For replace mode 'prompt or replace' option is visible. */ void setReplaceMode(bool set); diff --git a/kexi/tests/gui/finddialog/kexifinddialogbase.ui b/kexi/tests/gui/finddialog/kexifinddialogbase.ui index 568e0781..0f2248e6 100644 --- a/kexi/tests/gui/finddialog/kexifinddialogbase.ui +++ b/kexi/tests/gui/finddialog/kexifinddialogbase.ui @@ -206,7 +206,7 @@ <enum>WheelFocus</enum> </property> <property name="text"> - <string>Prompt on tqreplace</string> + <string>Prompt on replace</string> </property> <property name="checked"> <bool>true</bool> diff --git a/kexi/tests/newapi/main.cpp b/kexi/tests/newapi/main.cpp index ba232d5f..d02dbc9b 100644 --- a/kexi/tests/newapi/main.cpp +++ b/kexi/tests/newapi/main.cpp @@ -75,7 +75,7 @@ static KCmdLineOptions options[] = " to be buffered", 0}, { "query-params <params>", "Query parameters separated\n" "by '|' character that will be passed to query\n" - "statement to tqreplace [...] placeholders.", 0 }, + "statement to replace [...] placeholders.", 0 }, { "", " Notes:\n" "1. 'dr_prop' requires <db_name> argument.\n" "2. 'parser' test requires <db_name>,\n" @@ -136,7 +136,7 @@ int main(int argc, char** argv) RETURN(1); } test_name = args->getOption("test"); - if (!tests.tqcontains(test_name)) { + if (!tests.contains(test_name)) { kdDebug() << TQString("No such test \"%1\". Use --help.").tqarg(test_name.data()) << endl; RETURN(1); } diff --git a/kexi/tools/delete_column/kexi_delete_column b/kexi/tools/delete_column/kexi_delete_column index 2f4d8d40..22566c61 100755 --- a/kexi/tools/delete_column/kexi_delete_column +++ b/kexi/tools/delete_column/kexi_delete_column @@ -127,7 +127,7 @@ for fname in `$ksqlite "$temp_db" \ column_order=`expr $column_order + 1` done -# 3. Copy the original database file to .old file and tqreplace +# 3. Copy the original database file to .old file and replace # the original with the new one cp "$database_name" "$database_name.old" || exit_with_error mv "$temp_db" "$database_name" || exit_with_error diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp index 46c7ade9..0f8b5e02 100644 --- a/kexi/widget/kexibrowser.cpp +++ b/kexi/widget/kexibrowser.cpp @@ -148,7 +148,7 @@ KexiBrowser::KexiBrowser(TQWidget* tqparent, KexiMainWindow *mainWin, int featur m_deleteAction = new KAction(i18n("&Delete"), "editdelete", 0/*TQt::Key_Delete*/, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), m_actions, "edit_delete"); //! @todo 1.1: just add "Delete" tooltip and what's this - m_deleteAction->setToolTip(i18n("&Delete").tqreplace("&","")); + m_deleteAction->setToolTip(i18n("&Delete").replace("&","")); m_renameAction = new KAction(i18n("&Rename"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRename()), m_actions, "edit_rename"); @@ -370,7 +370,7 @@ KexiBrowserItem *KexiBrowser::addGroup(KexiPart::Info& info) KexiBrowserItem* KexiBrowser::addItem(KexiPart::Item& item) { //part object for this item - KexiBrowserItem *tqparent = item.mimeType().isEmpty() ? 0 : m_baseItems.tqfind(item.mimeType().lower()); + KexiBrowserItem *tqparent = item.mimeType().isEmpty() ? 0 : m_baseItems.find(item.mimeType().lower()); return addItem(item, tqparent, tqparent->info()); } diff --git a/kexi/widget/kexidataawareview.cpp b/kexi/widget/kexidataawareview.cpp index c22c0dbb..13e308c8 100644 --- a/kexi/widget/kexidataawareview.cpp +++ b/kexi/widget/kexidataawareview.cpp @@ -120,8 +120,8 @@ void KexiDataAwareView::initActions() plugSharedAction("edit_paste", TQT_TQOBJECT(this), TQT_SLOT(paste())); m_actionClient->plugSharedAction(sharedAction("edit_paste")); //for proper shortcut -// plugSharedAction("edit_tqfind", TQT_TQOBJECT(this), TQT_SLOT(editFind())); -// m_actionClient->plugSharedAction(sharedAction("edit_tqfind")); //for proper shortcut +// plugSharedAction("edit_find", TQT_TQOBJECT(this), TQT_SLOT(editFind())); +// m_actionClient->plugSharedAction(sharedAction("edit_find")); //for proper shortcut // plugSharedAction("edit_findnext", TQT_TQOBJECT(this), TQT_SLOT(editFindNext())); // m_actionClient->plugSharedAction(sharedAction("edit_findnext")); //for proper shortcut @@ -129,13 +129,13 @@ void KexiDataAwareView::initActions() // plugSharedAction("edit_findprevious", TQT_TQOBJECT(this), TQT_SLOT(editFindPrevious())); // m_actionClient->plugSharedAction(sharedAction("edit_findprev")); //for proper shortcut -//! @todo plugSharedAction("edit_tqreplace", TQT_TQOBJECT(this), TQT_SLOT(editReplace())); -//! @todo m_actionClient->plugSharedAction(sharedAction("edit_tqreplace")); //for proper shortcut +//! @todo plugSharedAction("edit_replace", TQT_TQOBJECT(this), TQT_SLOT(editReplace())); +//! @todo m_actionClient->plugSharedAction(sharedAction("edit_replace")); //for proper shortcut -// setAvailable("edit_tqfind", true); +// setAvailable("edit_find", true); // setAvailable("edit_findnext", true); // setAvailable("edit_findprevious", true); -//! @todo setAvailable("edit_tqreplace", true); +//! @todo setAvailable("edit_replace", true); } void KexiDataAwareView::slotUpdateRowActions(int row) @@ -329,7 +329,7 @@ bool KexiDataAwareView::setupFindAndReplace(TQStringList& columnNames, TQStringL return true; } -tristate KexiDataAwareView::tqfind(const TQVariant& valueToFind, +tristate KexiDataAwareView::find(const TQVariant& valueToFind, const KexiSearchAndReplaceViewInterface::Options& options, bool next) { if (!dataAwareObject() || !dataAwareObject()->data()) @@ -338,7 +338,7 @@ tristate KexiDataAwareView::tqfind(const TQVariant& valueToFind, // const KexiDataAwareObjectInterface::FindAndReplaceOptions options(dlg->options()); /* if (res == KexiFindDialog::Find) {*/ // TQVariant valueToFind(dlg->valueToFind()); - return dataAwareObject()->tqfind( valueToFind, options, next ); + return dataAwareObject()->find( valueToFind, options, next ); /* //! @todo result... diff --git a/kexi/widget/kexidataawareview.h b/kexi/widget/kexidataawareview.h index 31a43445..98124f5a 100644 --- a/kexi/widget/kexidataawareview.h +++ b/kexi/widget/kexidataawareview.h @@ -55,14 +55,14 @@ class KEXIEXTWIDGETS_EXPORT KexiDataAwareView : public KexiViewBase, KexiDataAwareObjectInterface* dataAwareObject() const { return m_dataAwareObject; } - /*! Sets up data for tqfind/replace dialog, based on view's data model. + /*! Sets up data for find/replace dialog, based on view's data model. Implemented for KexiSearchAndReplaceViewInterface. */ virtual bool setupFindAndReplace(TQStringList& columnNames, TQStringList& columnCaptions, TQString& currentColumnName); /*! Finds \a valueToFind within the view. Implemented for KexiSearchAndReplaceViewInterface. */ - virtual tristate tqfind(const TQVariant& valueToFind, + virtual tristate find(const TQVariant& valueToFind, const KexiSearchAndReplaceViewInterface::Options& options, bool next); /*! Finds \a valueToFind within the view and replaces with \a replacement. diff --git a/kexi/widget/kexidatasourcecombobox.cpp b/kexi/widget/kexidatasourcecombobox.cpp index 77895e24..0db52c9d 100644 --- a/kexi/widget/kexidatasourcecombobox.cpp +++ b/kexi/widget/kexidatasourcecombobox.cpp @@ -310,7 +310,7 @@ void KexiDataSourceComboBox::slotReturnPressed(const TQString & text) changed = true; } else { - TQListBoxItem *item = listBox()->tqfindItem( text, TQt::ExactMatch ); + TQListBoxItem *item = listBox()->findItem( text, TQt::ExactMatch ); if (item) { int index = listBox()->index( item ); //if (index < d->firstTableIndex()) diff --git a/kexi/widget/kexidbdrivercombobox.cpp b/kexi/widget/kexidbdrivercombobox.cpp index 8026106d..e083ac1c 100644 --- a/kexi/widget/kexidbdrivercombobox.cpp +++ b/kexi/widget/kexidbdrivercombobox.cpp @@ -74,7 +74,7 @@ KexiDBDriverComboBox::~KexiDBDriverComboBox() TQString KexiDBDriverComboBox::selectedDriverName() const { - TQMapConstIterator<TQString,TQString> it( m_driversMap.tqfind( text( currentItem() ) ) ); + TQMapConstIterator<TQString,TQString> it( m_driversMap.find( text( currentItem() ) ) ); if (it==m_driversMap.constEnd()) return TQString(); return it.data(); @@ -82,7 +82,7 @@ TQString KexiDBDriverComboBox::selectedDriverName() const void KexiDBDriverComboBox::setDriverName(const TQString& driverName) { - int index = m_driverNames.tqfindIndex( driverName.lower() ); + int index = m_driverNames.findIndex( driverName.lower() ); if (index==-1) { return; } diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp index 82af06a3..f45faaa1 100644 --- a/kexi/widget/kexieditor.cpp +++ b/kexi/widget/kexieditor.cpp @@ -183,7 +183,7 @@ void KexiEditor::setHighlightMode(const TQString& highlightmodename) KTextEditor::HighlightingInterface *hl = KTextEditor::highlightingInterface( d->doc ); for(uint i = 0; i < hl->hlModeCount(); i++) { //kdDebug() << "hlmode("<<i<<"): " << hl->hlModeName(i) << endl; - if (hl->hlModeName(i).tqcontains(highlightmodename, false)) { + if (hl->hlModeName(i).contains(highlightmodename, false)) { hl->setHlMode(i); return; } diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp index fcf81036..0439a178 100644 --- a/kexi/widget/kexifieldcombobox.cpp +++ b/kexi/widget/kexifieldcombobox.cpp @@ -150,7 +150,7 @@ bool KexiFieldComboBox::isTableAssigned() const void KexiFieldComboBox::setFieldOrExpression(const TQString& string) { const TQString name(string); //string.stripWhiteSpace().lower()); - const int pos = name.tqfind('.'); + const int pos = name.find('.'); if (pos==-1) { d->fieldOrExpression = name; } @@ -167,7 +167,7 @@ void KexiFieldComboBox::setFieldOrExpression(const TQString& string) d->fieldOrExpression = name.mid(pos+1); } - TQListBoxItem *item = listBox()->tqfindItem(d->fieldOrExpression); + TQListBoxItem *item = listBox()->findItem(d->fieldOrExpression); if (!item) { setCurrentItem(0); setCurrentText(d->fieldOrExpression); @@ -228,7 +228,7 @@ void KexiFieldComboBox::slotReturnPressed(const TQString & text) index = 0; } else { - TQListBoxItem *item = listBox()->tqfindItem( text, TQt::ExactMatch ); + TQListBoxItem *item = listBox()->findItem( text, TQt::ExactMatch ); if (!item) return; index = listBox()->index( item ); diff --git a/kexi/widget/kexipropertyeditorview.cpp b/kexi/widget/kexipropertyeditorview.cpp index 801f17b2..5c36cfb0 100644 --- a/kexi/widget/kexipropertyeditorview.cpp +++ b/kexi/widget/kexipropertyeditorview.cpp @@ -183,13 +183,13 @@ void KexiPropertyEditorView::updateInfoLabelForPropertySet(KexiObjectInfoLabel * { TQString className, iconName, objectName; if (set) { - if (set->tqcontains("this:classString")) + if (set->contains("this:classString")) className = (*set)["this:classString"].value().toString(); - if (set->tqcontains("this:iconName")) + if (set->contains("this:iconName")) iconName = (*set)["this:iconName"].value().toString(); - const bool useCaptionAsObjectName = set->tqcontains("this:useCaptionAsObjectName") + const bool useCaptionAsObjectName = set->contains("this:useCaptionAsObjectName") && (*set)["this:useCaptionAsObjectName"].value().toBool(); - if (set->tqcontains(useCaptionAsObjectName ? "caption" : "name")) + if (set->contains(useCaptionAsObjectName ? "caption" : "name")) objectName = (*set)[useCaptionAsObjectName ? "caption" : "name"].value().toString(); } if (!set || objectName.isEmpty()) { diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp index 64d03681..b88ad3ae 100644 --- a/kexi/widget/kexiscrollview.cpp +++ b/kexi/widget/kexiscrollview.cpp @@ -205,7 +205,7 @@ KexiScrollView::contentsMousePressEvent(TQMouseEvent *ev) return; TQRect r3(0, 0, m_widget->width() + 4, m_widget->height() + 4); - if(!r3.tqcontains(ev->pos())) // clicked outside form + if(!r3.contains(ev->pos())) // clicked outside form //m_form->resetSelection(); emit outerAreaClicked(); @@ -214,7 +214,7 @@ KexiScrollView::contentsMousePressEvent(TQMouseEvent *ev) TQRect r(m_widget->width(), 0, 4, m_widget->height() + 4); // right limit TQRect r2(0, m_widget->height(), m_widget->width() + 4, 4); // bottom limit - if(r.tqcontains(ev->pos()) || r2.tqcontains(ev->pos())) + if(r.contains(ev->pos()) || r2.contains(ev->pos())) { m_resizing = true; emit resizingStarted(); @@ -303,11 +303,11 @@ KexiScrollView::contentsMouseMoveEvent(TQMouseEvent *ev) TQRect r2(0, m_widget->height(), m_widget->width(), 4); // bottom TQRect r3(m_widget->width(), m_widget->height(), 4, 4); // bottom-right corner - if(r.tqcontains(p)) + if(r.contains(p)) setCursor(TQCursor::SizeHorCursor); - else if(r2.tqcontains(p)) + else if(r2.contains(p)) setCursor(TQCursor::SizeVerCursor); - else if(r3.tqcontains(p)) + else if(r3.contains(p)) setCursor(TQCursor::SizeFDiagCursor); else unsetCursor(); diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp index f5bc4d9e..fecc5b76 100644 --- a/kexi/widget/pixmapcollection.cpp +++ b/kexi/widget/pixmapcollection.cpp @@ -50,7 +50,7 @@ TQString PixmapCollection::addPixmapPath(const KURL &url) { TQString name = url.filename(); - while(m_pixmaps.tqcontains(name)) + while(m_pixmaps.contains(name)) { bool ok; int num = name.right(1).toInt(&ok, 10); @@ -68,7 +68,7 @@ TQString PixmapCollection::addPixmapName(const TQString &icon, int size) { TQString name = icon; - while(m_pixmaps.tqcontains(name)) + while(m_pixmaps.contains(name)) { bool ok; int num = name.right(1).toInt(&ok, 10); @@ -91,7 +91,7 @@ PixmapCollection::removePixmap(const TQString &name) TQPixmap PixmapCollection::getPixmap(const TQString &name) { - if(!m_pixmaps.tqcontains(name)) + if(!m_pixmaps.contains(name)) { kdDebug() << " The icon " << name << " you requested is not in the collection" << endl; return TQPixmap(); @@ -106,9 +106,9 @@ PixmapCollection::getPixmap(const TQString &name) } bool -PixmapCollection::tqcontains(const TQString &name) +PixmapCollection::contains(const TQString &name) { - return m_pixmaps.tqcontains(name); + return m_pixmaps.contains(name); } void @@ -351,7 +351,7 @@ void PixmapCollectionEditor::renameCollectionItem(TQIconViewItem *it, const TQString &name) { PixmapIconViewItem *item = static_cast<PixmapIconViewItem*>(it); - if(!m_collection->m_pixmaps.tqcontains(item->name())) + if(!m_collection->m_pixmaps.contains(item->name())) return; // We just rename the collection item @@ -390,7 +390,7 @@ PixmapCollectionChooser::PixmapCollectionChooser(PixmapCollection *collection, c for(it = collection->m_pixmaps.constBegin(); it != endIt; ++it) new PixmapIconViewItem(m_iconView, it.key(), getPixmap(it.key())); - TQIconViewItem *item = m_iconView->tqfindItem(selectedItem, TQt::ExactMatch); + TQIconViewItem *item = m_iconView->findItem(selectedItem, TQt::ExactMatch); if(item && !selectedItem.isEmpty()) m_iconView->setCurrentItem(item); } diff --git a/kexi/widget/pixmapcollection.h b/kexi/widget/pixmapcollection.h index caf11fd5..3ac4c417 100644 --- a/kexi/widget/pixmapcollection.h +++ b/kexi/widget/pixmapcollection.h @@ -53,7 +53,7 @@ class KEXIEXTWIDGETS_EXPORT PixmapCollection : public TQObject TQString addPixmapName(const TQString &name, int size = KIcon::SizeMedium); void removePixmap(const TQString &name); - bool tqcontains(const TQString &name); + bool contains(const TQString &name); TQPixmap getPixmap(const TQString &name); void save(TQDomNode parentNode); diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp index 2be89bb0..b1fc22d2 100644 --- a/kexi/widget/relations/kexirelationview.cpp +++ b/kexi/widget/relations/kexirelationview.cpp @@ -116,7 +116,7 @@ KexiRelationView::containerForTable(KexiDB::TableSchema* tableSchema) KexiRelationViewTableContainer * KexiRelationView::tableContainer(KexiDB::TableSchema *t) const { - return t ? m_tables.tqfind(t->name()) : 0; + return t ? m_tables.find(t->name()) : 0; } KexiRelationViewTableContainer* @@ -554,7 +554,7 @@ KexiRelationView::hideAllTablesExcept( KexiDB::TableSchema::List* tables ) //! @todo what about queries? for (TablesDictIterator it(m_tables); it.current();) { KexiDB::TableSchema *table = it.current()->schema()->table(); - if (!table || tables->tqfindRef( table )!=-1) { + if (!table || tables->findRef( table )!=-1) { ++it; continue; } diff --git a/kexi/widget/relations/kexirelationviewconnection.cpp b/kexi/widget/relations/kexirelationviewconnection.cpp index 7c813298..f294b49c 100644 --- a/kexi/widget/relations/kexirelationviewconnection.cpp +++ b/kexi/widget/relations/kexirelationviewconnection.cpp @@ -221,7 +221,7 @@ KexiRelationViewConnection::matchesPoint(const TQPoint &p, int tolerance) { TQRect we = connectionRect(); - if(!we.tqcontains(p)) + if(!we.contains(p)) return false; /** get our coordinats diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp index 2145cf20..a45a9ad1 100644 --- a/kexi/widget/relations/kexirelationviewtable.cpp +++ b/kexi/widget/relations/kexirelationviewtable.cpp @@ -338,7 +338,7 @@ void KexiRelationViewTable::setReadOnly(bool b) int KexiRelationViewTable::globalY(const TQString &item) { - TQListViewItem *i = tqfindItem(item, 0); + TQListViewItem *i = findItem(item, 0); if (!i) return -1; int y = tqitemRect(i).y() + (tqitemRect(i).height() / 2); diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp index e48a5d00..ee9caeed 100644 --- a/kexi/widget/relations/kexirelationwidget.cpp +++ b/kexi/widget/relations/kexirelationwidget.cpp @@ -143,7 +143,7 @@ TablesDict* KexiRelationWidget::tables() const KexiRelationViewTableContainer* KexiRelationWidget::table(const TQString& name) const { - return m_relationView->tables()->tqfind( name ); + return m_relationView->tables()->find( name ); } const ConnectionList* KexiRelationWidget::connections() const diff --git a/kexi/widget/tableview/kexicelleditorfactory.cpp b/kexi/widget/tableview/kexicelleditorfactory.cpp index e0e9ec03..a2c79a88 100644 --- a/kexi/widget/tableview/kexicelleditorfactory.cpp +++ b/kexi/widget/tableview/kexicelleditorfactory.cpp @@ -176,7 +176,7 @@ KexiTableEdit* KexiCellEditorFactory::createEditor(KexiTableViewColumn &column, KexiDB::IndexSchema::ListIterator it = table->indicesIterator(); for (;it.current();++it) { KexiDB::IndexSchema *idx = it.current(); - if (idx->fields()->tqfindRef(&f)!=-1) { + if (idx->fields()->findRef(&f)!=-1) { //find details-side rel. for this index KexiDB::Relationship *rel = idx->detailsRelationships()->first(); if (rel) { diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp index 4695dbf8..8b803746 100644 --- a/kexi/widget/tableview/kexicomboboxtableedit.cpp +++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp @@ -352,7 +352,7 @@ bool KexiComboBoxTableEdit::eventFilter( TQObject *o, TQEvent *e ) + 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())); - if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(popup()) && popup()->isVisible() && r.tqcontains( gp )) { + if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(popup()) && popup()->isVisible() && r.contains( gp )) { m_mouseBtnPressedWhenPopupVisible = true; } } diff --git a/kexi/widget/tableview/kexidataawareobjectiface.cpp b/kexi/widget/tableview/kexidataawareobjectiface.cpp index 95ed31c0..79613d9d 100644 --- a/kexi/widget/tableview/kexidataawareobjectiface.cpp +++ b/kexi/widget/tableview/kexidataawareobjectiface.cpp @@ -306,7 +306,7 @@ bool KexiDataAwareObjectInterface::sort() return true; } if (m_currentItem != m_insertItem) { - m_curRow = m_data->tqfindRef(m_currentItem); + m_curRow = m_data->findRef(m_currentItem); int jump = m_curRow - oldRow; if (jump<0) (*m_itemIterator) -= -jump; @@ -1283,7 +1283,7 @@ void KexiDataAwareObjectInterface::insertItem(KexiTableItem *newItem, int row) void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem *item, bool tqrepaint) { - int row = m_data->tqfindRef(item); + int row = m_data->findRef(item); slotRowInserted( item, row, tqrepaint ); } @@ -1493,7 +1493,7 @@ void KexiDataAwareObjectInterface::slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* /*result*/, bool tqrepaint) { if (tqrepaint) { - m_rowWillBeDeleted = m_data->tqfindRef(&item); + m_rowWillBeDeleted = m_data->findRef(&item); } } @@ -1888,7 +1888,7 @@ static inline bool findInString(const TQString& stringValue, int stringLength, c if (wholeWordsOnly) { const int whereLength = where.length(); while (true) { - pos = where.tqfind( stringValue, pos, caseSensitive ); + pos = where.find( stringValue, pos, caseSensitive ); if (pos == -1) break; if ((pos > 0 && where.at(pos-1).isLetterOrNumber()) @@ -1902,7 +1902,7 @@ static inline bool findInString(const TQString& stringValue, int stringLength, c firstCharacter = pos; } else {// !wholeWordsOnly - firstCharacter = where.tqfind( stringValue, pos, caseSensitive ); + firstCharacter = where.find( stringValue, pos, caseSensitive ); } return firstCharacter != -1; } @@ -1915,7 +1915,7 @@ static inline bool findInString(const TQString& stringValue, int stringLength, c if (wholeWordsOnly) { const int whereLength = where.length(); while (true) { - pos = where.tqfindRev( stringValue, pos, caseSensitive ); + pos = where.findRev( stringValue, pos, caseSensitive ); if (pos == -1) break; if ((pos > 0 && where.at(pos-1).isLetterOrNumber()) @@ -1932,7 +1932,7 @@ static inline bool findInString(const TQString& stringValue, int stringLength, c firstCharacter = pos; } else {// !wholeWordsOnly - firstCharacter = where.tqfindRev( stringValue, pos, caseSensitive ); + firstCharacter = where.findRev( stringValue, pos, caseSensitive ); } return firstCharacter != -1; } @@ -1962,7 +1962,7 @@ static inline bool findInString(const TQString& stringValue, int stringLength, c return false; } -tristate KexiDataAwareObjectInterface::tqfind(const TQVariant& valueToFind, +tristate KexiDataAwareObjectInterface::find(const TQVariant& valueToFind, const KexiSearchAndReplaceViewInterface::Options& options, bool next) { if (!hasData()) diff --git a/kexi/widget/tableview/kexidataawareobjectiface.h b/kexi/widget/tableview/kexidataawareobjectiface.h index 3ac196fb..389c1c74 100644 --- a/kexi/widget/tableview/kexidataawareobjectiface.h +++ b/kexi/widget/tableview/kexidataawareobjectiface.h @@ -490,7 +490,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface \return true if value has been found, false if value has not been found, and cancelled if there is nothing to find or there is no data to search in. */ - virtual tristate tqfind(const TQVariant& valueToFind, + virtual tristate find(const TQVariant& valueToFind, const KexiSearchAndReplaceViewInterface::Options& options, bool next); /*! Finds \a valueToFind within the data items and replaces with \a replacement @@ -705,7 +705,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface This is per-interface global cache. Needed for faster lookup because there could be lookup values. Called whenever columns definition changes, i.e. in setData() and clearColumns(). - @see tqfind() */ + @see find() */ void updateIndicesForVisibleValues(); //! data structure displayed for this object @@ -856,7 +856,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface bool exists : 1; }; - /*! Used to mark recently found value. Updated on succesful execution of tqfind(). + /*! Used to mark recently found value. Updated on succesful execution of find(). If the current cursor's position changes, or data in the current cell changes, positionOfRecentlyFoundValue.exists is set to false. */ PositionOfValue m_positionOfRecentlyFoundValue; @@ -867,7 +867,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface /*! Used to compare whether the search direction has changed. */ KexiSearchAndReplaceViewInterface::Options::SearchDirection m_recentSearchDirection; - //! Setup by updateIndicesForVisibleValues() and used by tqfind() + //! Setup by updateIndicesForVisibleValues() and used by find() TQValueVector<uint> m_indicesForVisibleValues; }; diff --git a/kexi/widget/tableview/kexidataawarepropertyset.cpp b/kexi/widget/tableview/kexidataawarepropertyset.cpp index 7d49ec52..5668fbfd 100644 --- a/kexi/widget/tableview/kexidataawarepropertyset.cpp +++ b/kexi/widget/tableview/kexidataawarepropertyset.cpp @@ -238,7 +238,7 @@ KoProperty::Set* KexiDataAwarePropertySet::findPropertySetForItem(KexiTableItem& { if (m_currentTVData.isNull()) return 0; - int idx = m_currentTVData->tqfindRef(&item); + int idx = m_currentTVData->findRef(&item); if (idx<0) return 0; return m_sets[idx]; @@ -249,7 +249,7 @@ int KexiDataAwarePropertySet::findRowForPropertyValue(const TQCString& propertyN const int size = m_sets.size(); for (int i=0; i<size; i++) { KoProperty::Set *set = m_sets[i]; - if (!set || !set->tqcontains(propertyName)) + if (!set || !set->contains(propertyName)) continue; if (set->property(propertyName).value() == value) return i; diff --git a/kexi/widget/tableview/kexidatetableedit.cpp b/kexi/widget/tableview/kexidatetableedit.cpp index af71ae4c..a0b5185e 100644 --- a/kexi/widget/tableview/kexidatetableedit.cpp +++ b/kexi/widget/tableview/kexidatetableedit.cpp @@ -105,7 +105,7 @@ void KexiDateTableEdit::setupContents( TQPainter *p, bool focused, const TQVaria bool KexiDateTableEdit::valueIsNull() { -// if (m_lineedit->text().tqreplace(m_formatter.separator(),"").stripWhiteSpace().isEmpty()) +// if (m_lineedit->text().replace(m_formatter.separator(),"").stripWhiteSpace().isEmpty()) if (m_formatter.isEmpty(m_lineedit->text())) //empty date is null return true; return dateValue().isNull(); diff --git a/kexi/widget/tableview/kexiinputtableedit.cpp b/kexi/widget/tableview/kexiinputtableedit.cpp index 26a3ed7f..575ae1e6 100644 --- a/kexi/widget/tableview/kexiinputtableedit.cpp +++ b/kexi/widget/tableview/kexiinputtableedit.cpp @@ -280,7 +280,7 @@ TQVariant KexiInputTableEdit::value() //! js @todo PRESERVE PRECISION! TQString txt = m_lineedit->text(); if (m_decsym!=".") - txt = txt.tqreplace(m_decsym,".");//convert back + txt = txt.replace(m_decsym,".");//convert back bool ok; const double result = txt.toDouble(&ok); return ok ? TQVariant(result) : TQVariant(); diff --git a/kexi/widget/tableview/kexitableedit.h b/kexi/widget/tableview/kexitableedit.h index 1d9378b0..ef618178 100644 --- a/kexi/widget/tableview/kexitableedit.h +++ b/kexi/widget/tableview/kexitableedit.h @@ -120,12 +120,12 @@ class KEXIDATATABLE_EXPORT KexiTableEdit : public TQWidget, public KexiDataItemI int align, int x, int y_offset, int w, int h, const TQColor& fillColor, const TQFontMetrics &fm, bool readOnly, bool fullRowSelection ); - /*! Sometimes, editor can contain non-standard margin, for example combobox editor tqcontains + /*! Sometimes, editor can contain non-standard margin, for example combobox editor contains dropdown button at the right side. \return left margin's size; 0 by default. For reimplementation. */ int leftMargin() const { return m_leftMargin; } - /*! Sometimes, editor can contain non-standard margin, for example combobox editor tqcontains + /*! Sometimes, editor can contain non-standard margin, for example combobox editor contains dropdown button at the right side. THe dropdown button's width is counted only if \a focused is true. \return right margin's size; 0 by default. For reimplementation. */ int rightMargin(bool focused) const; diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp index 9fc319ff..d164f68a 100644 --- a/kexi/widget/tableview/kexitableview.cpp +++ b/kexi/widget/tableview/kexitableview.cpp @@ -1037,7 +1037,7 @@ void KexiTableView::contentsMousePressEvent( TQMouseEvent* e ) s = TQMIN( columnWidth(m_curCol)-3, s ); //avoid too large box const TQRect r( columnPos(m_curCol) + TQMAX( columnWidth(m_curCol)/2 - s/2, 0 ), rowPos(m_curRow) +d->rowHeight/2 - s/2 /*- 1*/, s, s); //kexidbg << r << endl; - if (r.tqcontains(e->pos())) { + if (r.contains(e->pos())) { // kexidbg << "e->x:" << e->x() << " e->y:" << e->y() << " " << rowPos(m_curRow) << // " " << columnPos(m_curCol) << endl; boolToggled(); @@ -2040,7 +2040,7 @@ void KexiTableView::removeEditor() void KexiTableView::slotRowRepaintRequested(KexiTableItem& item) { - updateRow( m_data->tqfindRef(&item) ); + updateRow( m_data->findRef(&item) ); } //(js) unused diff --git a/kexi/widget/tableview/kexitableviewdata.h b/kexi/widget/tableview/kexitableviewdata.h index b22d619d..dec81f95 100644 --- a/kexi/widget/tableview/kexitableviewdata.h +++ b/kexi/widget/tableview/kexitableviewdata.h @@ -408,7 +408,7 @@ public: inline bool isEmpty () const { return KexiTableViewDataBase::isEmpty(); } inline KexiTableItem* first() { return KexiTableViewDataBase::first(); } inline KexiTableItem* last() { return KexiTableViewDataBase::last(); } - inline int tqfindRef( const KexiTableItem* item ) { return KexiTableViewDataBase::tqfindRef(item); } + inline int findRef( const KexiTableItem* item ) { return KexiTableViewDataBase::findRef(item); } inline void sort() { KexiTableViewDataBase::sort(); } inline bool removeFirst() { return KexiTableViewDataBase::removeFirst(); } inline bool removeLast() { return KexiTableViewDataBase::removeLast(); } diff --git a/kexi/widget/tableview/kexitextformatter.cpp b/kexi/widget/tableview/kexitextformatter.cpp index b7388138..6045620a 100644 --- a/kexi/widget/tableview/kexitextformatter.cpp +++ b/kexi/widget/tableview/kexitextformatter.cpp @@ -168,7 +168,7 @@ TQVariant KexiTextFormatter::textToValue(const TQString& text) const case KexiDB::Field::Double: { // replace custom decimal symbol with '.' as required by to{Float|Double}() TQString fixedText( text ); - fixedText.tqreplace(KGlobal::locale()->decimalSymbol(), "."); + fixedText.replace(KGlobal::locale()->decimalSymbol(), "."); if (t == KexiDB::Field::Double) return fixedText.toDouble(); return fixedText.toFloat(); diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp index 8c6c3ab2..f882f6fa 100644 --- a/kexi/widget/utils/kexicontextmenuutils.cpp +++ b/kexi/widget/utils/kexicontextmenuutils.cpp @@ -258,7 +258,7 @@ bool KexiContextMenuUtils::updateTitle(TQPopupMenu *menu, const TQString& object if (!menu || objectName.isEmpty() || objectTypeName.isEmpty()) return false; const int id = menu->idAt(0); - TQMenuItem *item = menu->tqfindItem(id); + TQMenuItem *item = menu->findItem(id); if (!item) return false; KPopupTitle *title = dynamic_cast<KPopupTitle *>(item->widget()); diff --git a/kexi/widget/utils/kexidatetimeformatter.cpp b/kexi/widget/utils/kexidatetimeformatter.cpp index 430d2f8f..1e7b9bc9 100644 --- a/kexi/widget/utils/kexidatetimeformatter.cpp +++ b/kexi/widget/utils/kexidatetimeformatter.cpp @@ -43,27 +43,27 @@ KexiDateFormatter::KexiDateFormatter() monthDateFormat("MM"), dayDateFormat("dd"); //for setting up m_dateFormat bool ok = df.length()>=8; - int yearpos, monthpos, daypos; //result of df.tqfind() + int yearpos, monthpos, daypos; //result of df.find() if (ok) {//look at % variables //! @todo more variables are possible here, see void KLocale::setDateFormatShort() docs //! http://developer.kde.org/documentation/library/3.5-api/kdelibs-apidocs/kdecore/html/classKLocale.html#a59 - yearpos = df.tqfind("%y", 0, false); //&y or %y + yearpos = df.find("%y", 0, false); //&y or %y m_longYear = !(yearpos>=0 && df.mid(yearpos+1, 1)=="y"); if (!m_longYear) { yearMask = "99"; yearDateFormat = "yy"; } - monthpos = df.tqfind("%m", 0, true); //%m or %n + monthpos = df.find("%m", 0, true); //%m or %n m_monthWithLeadingZero = true; if (monthpos<0) { - monthpos = df.tqfind("%n", 0, false); + monthpos = df.find("%n", 0, false); m_monthWithLeadingZero = false; monthDateFormat = "M"; } - daypos = df.tqfind("%d", 0, true);//%d or %e + daypos = df.find("%d", 0, true);//%d or %e m_dayWithLeadingZero = true; if (daypos<0) { - daypos = df.tqfind("%e", 0, false); + daypos = df.find("%e", 0, false); m_dayWithLeadingZero = false; dayDateFormat = "d"; } @@ -76,7 +76,7 @@ KexiDateFormatter::KexiDateFormatter() } else if (yearpos<daypos && daypos<monthpos) { m_order = TQDateEdit::YDM; -//! @todo use TQRegExp (to tqreplace %Y by %1, etc.) instead of hardcoded "%1%299%399" +//! @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_qtFormat = yearDateFormat+m_separator+dayDateFormat+m_separator+monthDateFormat; @@ -157,7 +157,7 @@ TQVariant KexiDateFormatter::stringToVariant( const TQString& str ) const bool KexiDateFormatter::isEmpty( const TQString& str ) const { TQString s(str); - return s.tqreplace(m_separator,"").stripWhiteSpace().isEmpty(); + return s.replace(m_separator,"").stripWhiteSpace().isEmpty(); } TQString KexiDateFormatter::dateToString( const TQDate& date ) const @@ -172,31 +172,31 @@ KexiTimeFormatter::KexiTimeFormatter() , m_hmRegExp( new TQRegExp("(\\d*):(\\d*).*( am| pm){,1}", false/*!CS*/) ) { TQString tf( KGlobal::locale()->timeFormat() ); - //m_hourpos, m_minpos, m_secpos; are result of tf.tqfind() + //m_hourpos, m_minpos, m_secpos; are result of tf.find() TQString hourVariable, minVariable, secVariable; - //detect position of HOUR section: tqfind %H or %k or %I or %l + //detect position of HOUR section: find %H or %k or %I or %l m_24h = true; m_hoursWithLeadingZero = true; - m_hourpos = tf.tqfind("%H", 0, true); + m_hourpos = tf.find("%H", 0, true); if (m_hourpos>=0) { m_24h = true; m_hoursWithLeadingZero = true; } else { - m_hourpos = tf.tqfind("%k", 0, true); + m_hourpos = tf.find("%k", 0, true); if (m_hourpos>=0) { m_24h = true; m_hoursWithLeadingZero = false; } else { - m_hourpos = tf.tqfind("%I", 0, true); + m_hourpos = tf.find("%I", 0, true); if (m_hourpos>=0) { m_24h = false; m_hoursWithLeadingZero = true; } else { - m_hourpos = tf.tqfind("%l", 0, true); + m_hourpos = tf.find("%l", 0, true); if (m_hourpos>=0) { m_24h = false; m_hoursWithLeadingZero = false; @@ -204,9 +204,9 @@ KexiTimeFormatter::KexiTimeFormatter() } } } - m_minpos = tf.tqfind("%M", 0, true); - m_secpos = tf.tqfind("%S", 0, true); //can be -1 - m_ampmpos = tf.tqfind("%p", 0, true); //can be -1 + m_minpos = tf.find("%M", 0, true); + m_secpos = tf.find("%S", 0, true); //can be -1 + m_ampmpos = tf.find("%p", 0, true); //can be -1 if (m_hourpos<0 || m_minpos<0) { //set default: hr and min are needed, sec are optional @@ -221,13 +221,13 @@ KexiTimeFormatter::KexiTimeFormatter() hourVariable = tf.mid(m_hourpos, 2); m_inputMask = tf; -// m_inputMask.tqreplace( hourVariable, "00" ); -// m_inputMask.tqreplace( "%M", "00" ); -// m_inputMask.tqreplace( "%S", "00" ); //optional - m_inputMask.tqreplace( hourVariable, "99" ); - m_inputMask.tqreplace( "%M", "99" ); - m_inputMask.tqreplace( "%S", "00" ); //optional - m_inputMask.tqreplace( "%p", "AA" ); //am or pm +// m_inputMask.replace( hourVariable, "00" ); +// m_inputMask.replace( "%M", "00" ); +// m_inputMask.replace( "%S", "00" ); //optional + m_inputMask.replace( hourVariable, "99" ); + m_inputMask.replace( "%M", "99" ); + m_inputMask.replace( "%S", "00" ); //optional + m_inputMask.replace( "%p", "AA" ); //am or pm m_inputMask += ";_"; m_outputFormat = tf; @@ -283,7 +283,7 @@ TQVariant KexiTimeFormatter::stringToVariant( const TQString& str ) bool KexiTimeFormatter::isEmpty( const TQString& str ) const { TQString s(str); - return s.tqreplace(':',"").stripWhiteSpace().isEmpty(); + return s.replace(':',"").stripWhiteSpace().isEmpty(); } TQString KexiTimeFormatter::timeToString( const TQTime& time ) const @@ -294,22 +294,22 @@ TQString KexiTimeFormatter::timeToString( const TQTime& time ) const TQString s(m_outputFormat); if (m_24h) { if (m_hoursWithLeadingZero) - s.tqreplace( "%H", TQString::tqfromLatin1(time.hour()<10 ? "0" : "") + TQString::number(time.hour()) ); + s.replace( "%H", TQString::tqfromLatin1(time.hour()<10 ? "0" : "") + TQString::number(time.hour()) ); else - s.tqreplace( "%k", TQString::number(time.hour()) ); + s.replace( "%k", TQString::number(time.hour()) ); } else { int time12 = (time.hour()>12) ? (time.hour()-12) : time.hour(); if (m_hoursWithLeadingZero) - s.tqreplace( "%I", TQString::tqfromLatin1(time12<10 ? "0" : "") + TQString::number(time12) ); + s.replace( "%I", TQString::tqfromLatin1(time12<10 ? "0" : "") + TQString::number(time12) ); else - s.tqreplace( "%l", TQString::number(time12) ); + s.replace( "%l", TQString::number(time12) ); } - s.tqreplace( "%M", TQString::tqfromLatin1(time.minute()<10 ? "0" : "") + TQString::number(time.minute()) ); + s.replace( "%M", TQString::tqfromLatin1(time.minute()<10 ? "0" : "") + TQString::number(time.minute()) ); if (m_secpos>=0) - s.tqreplace( "%S", TQString::tqfromLatin1(time.second()<10 ? "0" : "") + TQString::number(time.second()) ); + s.replace( "%S", TQString::tqfromLatin1(time.second()<10 ? "0" : "") + TQString::number(time.second()) ); if (m_ampmpos>=0) - s.tqreplace( "%p", KGlobal::locale()->translate( time.hour()>=12 ? "pm" : "am") ); + s.replace( "%p", KGlobal::locale()->translate( time.hour()>=12 ? "pm" : "am") ); return s; } @@ -326,8 +326,8 @@ TQDateTime stringToDateTime( const KexiDateFormatter& dateFormatter, const KexiTimeFormatter& timeFormatter, const TQString& str) { TQString s( str.stripWhiteSpace() ); - const int timepos = s.tqfind(" "); - const bool emptyTime = timepos >= 0 && timeFormatter.isEmpty(s.mid(timepos+1)); //.tqreplace(':',"").stripWhiteSpace().isEmpty(); + const int timepos = s.find(" "); + const bool emptyTime = timepos >= 0 && timeFormatter.isEmpty(s.mid(timepos+1)); //.replace(':',"").stripWhiteSpace().isEmpty(); if (emptyTime) s = s.left(timepos); if (timepos>0 && !emptyTime) { @@ -347,18 +347,18 @@ TQDateTime stringToDateTime( bool dateTimeIsEmpty( const KexiDateFormatter& dateFormatter, const KexiTimeFormatter& timeFormatter, const TQString& str ) { - int timepos = str.tqfind(" "); - const bool emptyTime = timepos >= 0 && timeFormatter.isEmpty(str.mid(timepos+1)); //s.mid(timepos+1).tqreplace(':',"").stripWhiteSpace().isEmpty(); - return (timepos >= 0 && dateFormatter.isEmpty(str.left(timepos)) //s.left(timepos).tqreplace(m_dateFormatter.separator(), "").stripWhiteSpace().isEmpty() + int timepos = str.find(" "); + const bool emptyTime = timepos >= 0 && timeFormatter.isEmpty(str.mid(timepos+1)); //s.mid(timepos+1).replace(':',"").stripWhiteSpace().isEmpty(); + return (timepos >= 0 && dateFormatter.isEmpty(str.left(timepos)) //s.left(timepos).replace(m_dateFormatter.separator(), "").stripWhiteSpace().isEmpty() && emptyTime); } bool dateTimeIsValid( const KexiDateFormatter& dateFormatter, const KexiTimeFormatter& timeFormatter, const TQString& str ) { - int timepos = str.tqfind(" "); - const bool emptyTime = timepos >= 0 && timeFormatter.isEmpty(str.mid(timepos+1)); //s.mid(timepos+1).tqreplace(':',"").stripWhiteSpace().isEmpty(); - if (timepos >= 0 && dateFormatter.isEmpty(str.left(timepos)) // s.left(timepos).tqreplace(m_dateFormatter.separator(), "").stripWhiteSpace().isEmpty() + int timepos = str.find(" "); + const bool emptyTime = timepos >= 0 && timeFormatter.isEmpty(str.mid(timepos+1)); //s.mid(timepos+1).replace(':',"").stripWhiteSpace().isEmpty(); + if (timepos >= 0 && dateFormatter.isEmpty(str.left(timepos)) // s.left(timepos).replace(m_dateFormatter.separator(), "").stripWhiteSpace().isEmpty() && emptyTime) //empty date/time is valid return true; diff --git a/kexi/widget/utils/kexigradientwidget.cpp b/kexi/widget/utils/kexigradientwidget.cpp index 2a1a3ba3..ce92444f 100644 --- a/kexi/widget/utils/kexigradientwidget.cpp +++ b/kexi/widget/utils/kexigradientwidget.cpp @@ -98,7 +98,7 @@ void KexiGradientWidget::rebuildCache( void ) { for ( WidgetList::Iterator it = childWidgetList.begin(); it != childWidgetList.end(); ++it ) { - if ( p_customBackgroundWidgets.tqcontains( ( *it ) ) == false ) { + if ( p_customBackgroundWidgets.contains( ( *it ) ) == false ) { ( *it )->unsetPalette(); } } @@ -170,7 +170,7 @@ void KexiGradientWidget::rebuildCache( void ) { /** Exclude widgets with a custom palette. */ - if ( p_customBackgroundWidgets.tqcontains( childWidget ) ) { + if ( p_customBackgroundWidgets.contains( childWidget ) ) { continue; } @@ -255,7 +255,7 @@ bool KexiGradientWidget::eventFilter( TQObject* object, TQEvent* event ) { In this case, it has to be added to the customBackground-list. */ if ( p_currentChild == 0L && child != 0L ) { - if ( p_customBackgroundWidgets.tqcontains( child ) == false ) { + if ( p_customBackgroundWidgets.contains( child ) == false ) { p_customBackgroundWidgets.append( child ); return false; } @@ -269,7 +269,7 @@ bool KexiGradientWidget::eventFilter( TQObject* object, TQEvent* event ) { Add the new child to the list of widgets, we don't set the background ourselves if it isn't in the list. */ - if ( p_customBackgroundWidgets.tqcontains( child ) == false ) { + if ( p_customBackgroundWidgets.contains( child ) == false ) { if ( child->paletteBackgroundPixmap() != 0L ) { p_customBackgroundWidgets.append( child ); } @@ -291,7 +291,7 @@ bool KexiGradientWidget::eventFilter( TQObject* object, TQEvent* event ) { } if ( event->type() == TQEvent::Move ) { - if ( p_customBackgroundWidgets.tqcontains( child ) == false ) { + if ( p_customBackgroundWidgets.contains( child ) == false ) { updateChildBackground( child ); } } @@ -320,7 +320,7 @@ void KexiGradientWidget::updateChildBackground( TQWidget* childWidget ) /** Exclude widgets with a custom palette. */ - if ( p_customBackgroundWidgets.tqcontains( childWidget ) ) { + if ( p_customBackgroundWidgets.contains( childWidget ) ) { return; } diff --git a/kformula/kformula_doc.cc b/kformula/kformula_doc.cc index 330e6c51..98c25b46 100644 --- a/kformula/kformula_doc.cc +++ b/kformula/kformula_doc.cc @@ -169,7 +169,7 @@ bool KFormulaDoc::loadXML(TQIODevice *, const TQDomDocument& doc) bool KFormulaDoc::saveNativeFormat( const TQString & file ) { TQCString mimeType = outputMimeType(); - bool mathml = !mimeType.isEmpty() && mimeType.tqcontains( "mathml", false ); + bool mathml = !mimeType.isEmpty() && mimeType.contains( "mathml", false ); if ( mathml ) { TQFile f( file ); if ( f.open( IO_WriteOnly | IO_Translate ) ) diff --git a/kivio/LICENSE b/kivio/LICENSE index 73901f58..ebb24a85 100644 --- a/kivio/LICENSE +++ b/kivio/LICENSE @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/kivio/kivio.spec b/kivio/kivio.spec index 70171536..09cc47a8 100644 --- a/kivio/kivio.spec +++ b/kivio/kivio.spec @@ -38,9 +38,9 @@ make make prefix=$RPM_BUILD_ROOT%{prefix} install cd $RPM_BUILD_ROOT -tqfind . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.%{name} -tqfind . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name} -tqfind . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name} +find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.%{name} +find . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name} +find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name} %clean rm -rf $RPM_BUILD_ROOT diff --git a/kivio/kiviopart/kivio_doc.cpp b/kivio/kiviopart/kivio_doc.cpp index f30b256e..778ea2b9 100644 --- a/kivio/kiviopart/kivio_doc.cpp +++ b/kivio/kiviopart/kivio_doc.cpp @@ -927,17 +927,17 @@ KivioStencilSpawner* KivioDoc::findStencilSpawner( const TQString& setId, const KivioStencilSpawnerSet *pSpawnerSet = m_pLstSpawnerSets->first(); while( pSpawnerSet ) { - if( pSpawnerSet->id() == setId && pSpawnerSet->tqfind(stencilId) ) + if( pSpawnerSet->id() == setId && pSpawnerSet->find(stencilId) ) { - return pSpawnerSet->tqfind(stencilId); - // return pSpawnerSet->tqfind(name) + return pSpawnerSet->find(stencilId); + // return pSpawnerSet->find(name) } pSpawnerSet = m_pLstSpawnerSets->next(); } - if( m_pInternalSet->id() == setId && m_pInternalSet->tqfind(stencilId) ) + if( m_pInternalSet->id() == setId && m_pInternalSet->find(stencilId) ) { - return m_pInternalSet->tqfind(stencilId); + return m_pInternalSet->find(stencilId); } return NULL; @@ -945,7 +945,7 @@ KivioStencilSpawner* KivioDoc::findStencilSpawner( const TQString& setId, const KivioStencilSpawner* KivioDoc::findInternalStencilSpawner( const TQString& stencilId ) { - return m_pInternalSet->tqfind(stencilId); + return m_pInternalSet->find(stencilId); } void KivioDoc::addInternalStencilSpawner(KivioStencilSpawner* spawner) diff --git a/kivio/kiviopart/kivio_map.cpp b/kivio/kiviopart/kivio_map.cpp index d2cecdba..18914650 100644 --- a/kivio/kiviopart/kivio_map.cpp +++ b/kivio/kiviopart/kivio_map.cpp @@ -51,14 +51,14 @@ KivioMap::~KivioMap() void KivioMap::takePage( KivioPage* page ) { - int pos=m_lstPages.tqfindRef(page); + int pos=m_lstPages.findRef(page); m_lstPages.take( pos ); m_lstDeletedPages.append( page ); } void KivioMap::insertPage( KivioPage* page ) { - int pos=m_lstDeletedPages.tqfindRef(page); + int pos=m_lstDeletedPages.findRef(page); if ( pos != -1 ) m_lstDeletedPages.take( pos); m_lstPages.append(page); @@ -74,8 +74,8 @@ void KivioMap::movePage( const TQString& fromPageName, const TQString& toPageNam KivioPage* pagefrom = findPage(fromPageName); KivioPage* pageto = findPage(toPageName); - int from = m_lstPages.tqfind(pagefrom); - int to = m_lstPages.tqfind(pageto); + int from = m_lstPages.find(pagefrom); + int to = m_lstPages.find(pageto); if (!before) ++to; diff --git a/kivio/kiviopart/kivio_page.cpp b/kivio/kiviopart/kivio_page.cpp index 6e799f93..0b60344b 100644 --- a/kivio/kiviopart/kivio_page.cpp +++ b/kivio/kiviopart/kivio_page.cpp @@ -130,7 +130,7 @@ KivioPage::~KivioPage() delete m_dcop; } -KivioPage* KivioPage::tqfind( int _id ) +KivioPage* KivioPage::find( int _id ) { if ( !s_mapPages ) return 0L; @@ -306,7 +306,7 @@ bool KivioPage::loadXML( const TQDomElement& pageE ) kdDebug(43000) << "KivioLayer::loadXML() - loading layer connections" << endl; pLayer->searchForConnections(this); - m_lstLayers.tqfind( pLayerBak ); + m_lstLayers.find( pLayerBak ); pLayer = m_lstLayers.next(); } @@ -560,7 +560,7 @@ void KivioPage::selectStencil( KivioStencil *pStencil ) } // Don't allow reselection - if(m_lstSelection.tqfindRef(pStencil) != -1) { + if(m_lstSelection.findRef(pStencil) != -1) { return; } @@ -631,7 +631,7 @@ void KivioPage::unselectAllStencils() bool KivioPage::isStencilSelected(KivioStencil *pStencil) { - return m_lstSelection.tqfindRef( pStencil ) == -1; + return m_lstSelection.findRef( pStencil ) == -1; } /** @@ -1049,7 +1049,7 @@ bool KivioPage::removeCurrentLayer() if( pLayer != m_pCurLayer ) { - if( m_lstLayers.tqfind( m_pCurLayer )==false ) + if( m_lstLayers.find( m_pCurLayer )==false ) { kdDebug(43000) << "KivioLayer::removeCurrentLayer() - Couldn't find current layer in the list. Bad!" << endl; return false; @@ -1069,7 +1069,7 @@ bool KivioPage::removeCurrentLayer() return false; } - KivioRemoveLayerCommand * cmd = new KivioRemoveLayerCommand( i18n("Remove Layer"), this , m_pCurLayer , m_lstLayers.tqfindRef(m_pCurLayer) ); + KivioRemoveLayerCommand * cmd = new KivioRemoveLayerCommand( i18n("Remove Layer"), this , m_pCurLayer , m_lstLayers.findRef(m_pCurLayer) ); doc()->addCommand( cmd ); takeLayer( m_pCurLayer ); /* @@ -1087,7 +1087,7 @@ bool KivioPage::removeCurrentLayer() void KivioPage::takeLayer( KivioLayer *pLayer ) { - int pos=m_lstLayers.tqfindRef(pLayer); + int pos=m_lstLayers.findRef(pLayer); m_lstLayers.take( pos ); } diff --git a/kivio/kiviopart/kivio_page.h b/kivio/kiviopart/kivio_page.h index 872018a6..16d9db48 100644 --- a/kivio/kiviopart/kivio_page.h +++ b/kivio/kiviopart/kivio_page.h @@ -107,7 +107,7 @@ class KIVIO_EXPORT KivioPage : public TQObject void print( TQPainter &painter, KPrinter *_printer ); void update(); int id()const { return m_id; } - static KivioPage* tqfind( int _id ); + static KivioPage* find( int _id ); KoPageLayout paperLayout()const { return m_pPageLayout; } void setPaperLayout(const KoPageLayout&); diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp index 664d8af4..8d529449 100644 --- a/kivio/kiviopart/kivio_view.cpp +++ b/kivio/kiviopart/kivio_view.cpp @@ -2191,7 +2191,7 @@ int KivioView::vTextAlign() void KivioView::updatePageStatusLabel() { - TQString text = i18n("Page %1/%2").tqarg(m_pDoc->map()->pageList().tqfind(activePage()) + 1).tqarg(m_pDoc->map()->count()); + TQString text = i18n("Page %1/%2").tqarg(m_pDoc->map()->pageList().find(activePage()) + 1).tqarg(m_pDoc->map()->count()); m_pageCountSLbl->setText(text); } diff --git a/kivio/kiviopart/kivio_zoomaction.cpp b/kivio/kiviopart/kivio_zoomaction.cpp index b90be1e1..657faf48 100644 --- a/kivio/kiviopart/kivio_zoomaction.cpp +++ b/kivio/kiviopart/kivio_zoomaction.cpp @@ -72,12 +72,12 @@ void ZoomAction::insertItem( int zoom ) regexp.search(*it); const int val=regexp.cap(1).toInt(&ok); //zoom : limit inferior=10 - if(ok && val>9 && list.tqcontains(val)==0) + if(ok && val>9 && list.contains(val)==0) list.append( val ); } //necessary at the beginning when we read config //this value is not in combo list - if(list.tqcontains(zoom)==0) + if(list.contains(zoom)==0) list.append( zoom ); qHeapSort( list ); @@ -86,7 +86,7 @@ void ZoomAction::insertItem( int zoom ) for (TQValueList<int>::Iterator it = list.begin() ; it != list.end() ; ++it) lst.append( i18n("%1%").tqarg(*it) ); setItems(lst); - setCurrentItem(lst.tqfindIndex(i18n("%1%").tqarg(zoom))); + setCurrentItem(lst.findIndex(i18n("%1%").tqarg(zoom))); } void ZoomAction::setEditZoom( int zoom ) diff --git a/kivio/kiviopart/kiviosdk/kivio_common.cpp b/kivio/kiviopart/kiviosdk/kivio_common.cpp index e43c9fda..b67efc23 100644 --- a/kivio/kiviopart/kiviosdk/kivio_common.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_common.cpp @@ -224,7 +224,7 @@ TQColor XmlReadColor( const TQDomElement &e, const TQString &att, const TQColor bool ok=false; TQColor newColor; - if( val.tqcontains("#") ) // Is it #RRGGBB format? + if( val.contains("#") ) // Is it #RRGGBB format? { newColor.setNamedColor(val); return newColor; @@ -393,7 +393,7 @@ KoRect XmlReadRect( const TQDomElement &e, const TQString &att, const KoRect &de // Read the attribute TQString val = e.attribute( att ); - if (val.tqfind("[") == 0 && val.tqfind("]") == (int)val.length()-1) { + if (val.find("[") == 0 && val.find("]") == (int)val.length()-1) { val.remove(0,1); val.remove(val.length()-1,1); TQStringList vlist = TQStringList::split(",",val); diff --git a/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp b/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp index e3cf726b..4407d2d0 100644 --- a/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp @@ -417,7 +417,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file) if(svgChild.hasAttribute("d")) { - if(svgChild.attribute("d").tqcontains('z') || svgChild.attribute("d").tqcontains('Z')) + if(svgChild.attribute("d").contains('z') || svgChild.attribute("d").contains('Z')) { isClosed = true; kivioShape.setAttribute("type", "ClosedPath"); @@ -451,12 +451,12 @@ bool KivioDiaStencilSpawner::load(const TQString &file) for( uint idx = 0; idx < styles.count(); idx++) { //kdDebug(43000) << "Style: " << styles[idx] << endl; - if( isClosed && styles[idx].tqcontains("fill:")) + if( isClosed && styles[idx].contains("fill:")) { TQDomElement fillStyle = kivio.createElement("KivioFillStyle"); - if( styles[idx].tqcontains("forground")) + if( styles[idx].contains("forground")) fillStyle.setAttribute("color", "#0000"); - else if (styles[idx].tqcontains("background")) + else if (styles[idx].contains("background")) fillStyle.setAttribute("color", "#ffff"); fillStyle.setAttribute("colorStyle", "1"); diff --git a/kivio/kiviopart/kiviosdk/kivio_group_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_group_stencil.cpp index 2965ee74..c83f41f4 100644 --- a/kivio/kiviopart/kiviosdk/kivio_group_stencil.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_group_stencil.cpp @@ -503,7 +503,7 @@ void KivioGroupStencil::searchForConnections( KivioPage *p ) pStencil->searchForConnections( p ); // Restore it - m_pGroupList->tqfind( pCur ); + m_pGroupList->find( pCur ); pStencil = m_pGroupList->next(); } diff --git a/kivio/kiviopart/kiviosdk/kivio_layer.cpp b/kivio/kiviopart/kiviosdk/kivio_layer.cpp index 999d053d..13ed44f5 100644 --- a/kivio/kiviopart/kiviosdk/kivio_layer.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_layer.cpp @@ -81,7 +81,7 @@ KivioLayer::~KivioLayer() bool KivioLayer::addStencil( KivioStencil *pStencil ) { - int pos = m_pDeletedStencilList->tqfindRef(pStencil); + int pos = m_pDeletedStencilList->findRef(pStencil); if ( pos != -1 ) m_pDeletedStencilList->take( pos); @@ -92,14 +92,14 @@ bool KivioLayer::addStencil( KivioStencil *pStencil ) void KivioLayer::takeStencilFromList( KivioStencil *pStencil ) { - int pos=m_pStencilList->tqfindRef(pStencil); + int pos=m_pStencilList->findRef(pStencil); m_pStencilList->take( pos ); m_pDeletedStencilList->append( pStencil ); } void KivioLayer::insertStencil( KivioStencil *pStencil ) { - int pos=m_pDeletedStencilList->tqfindRef(pStencil); + int pos=m_pDeletedStencilList->findRef(pStencil); if ( pos != -1 ) m_pDeletedStencilList->take( pos); @@ -532,7 +532,7 @@ void KivioLayer::searchForConnections( KivioPage *p ) pStencil->searchForConnections( p ); // Restore it - m_pStencilList->tqfind( pCur ); + m_pStencilList->find( pCur ); pStencil = m_pStencilList->next(); } @@ -540,7 +540,7 @@ void KivioLayer::searchForConnections( KivioPage *p ) KivioStencil *KivioLayer::takeStencil( KivioStencil *p ) { - m_pStencilList->tqfind( p ); + m_pStencilList->find( p ); return m_pStencilList->take(); } diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_stencil.cpp index 915df3bb..5533a257 100644 --- a/kivio/kiviopart/kiviosdk/kivio_stencil.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_stencil.cpp @@ -256,8 +256,8 @@ void KivioStencil::move(double xOffset, double yOffset) bool KivioStencil::isInRect(const KoRect& rect) { bool retVal; - retVal = rect.tqcontains(m_x, m_y); - retVal = retVal && rect.tqcontains(m_x + m_w, m_y + m_h); + retVal = rect.contains(m_x, m_y); + retVal = retVal && rect.contains(m_x + m_w, m_y + m_h); return retVal; } diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp index 64d5a7c9..c2e54a58 100644 --- a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp @@ -118,23 +118,23 @@ KivioStencilSpawner* KivioStencilSpawnerSet::loadFile( const TQString &fileName KivioStencilSpawner *pSpawner; - if( fileName.tqcontains( ".sml", false ) ) + if( fileName.contains( ".sml", false ) ) { pSpawner = new KivioSMLStencilSpawner(this); } - else if( fileName.tqcontains( ".ksp", false ) ) + else if( fileName.contains( ".ksp", false ) ) { pSpawner = new KivioPluginStencilSpawner(this); } - else if( fileName.tqcontains( ".so", false ) ) + else if( fileName.contains( ".so", false ) ) { pSpawner = new KivioPluginStencilSpawner(this); } - else if( fileName.tqcontains( ".spy", false ) ) + else if( fileName.contains( ".spy", false ) ) { pSpawner = new KivioPyStencilSpawner(this); } - else if( fileName.tqcontains( ".tqshape", false ) ) + else if( fileName.contains( ".tqshape", false ) ) { pSpawner = new KivioDiaStencilSpawner(this); } @@ -167,7 +167,7 @@ TQString KivioStencilSpawnerSet::readTitle( const TQString &dir ) { kdDebug(43000) << "KivioStencilSpawnerSet::readTitle() - Error opening stencil set title: " << dir << "/desc" << endl; - return dir.right(dir.length() - dir.tqfindRev('/')-1); + return dir.right(dir.length() - dir.findRev('/')-1); } d.setContent(&f); @@ -289,7 +289,7 @@ TQString KivioStencilSpawnerSet::readDescription(const TQString& dir) } -KivioStencilSpawner* KivioStencilSpawnerSet::tqfind( const TQString& id) +KivioStencilSpawner* KivioStencilSpawnerSet::find( const TQString& id) { if(!m_pSpawners || m_pSpawners->isEmpty()) { return 0; diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.h b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.h index 9b215560..22b6d964 100644 --- a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.h +++ b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.h @@ -61,7 +61,7 @@ class KivioStencilSpawnerSet void setId( const TQString &s ) { m_id=s; } KivioStencilSpawner *spawnerAt( int i ) { return m_pSpawners->at(i); } - KivioStencilSpawner *tqfind( const TQString& ); + KivioStencilSpawner *find( const TQString& ); int count() { return m_pSpawners->count(); } diff --git a/kivio/kiviopart/kiviosdk/kiviopolylineconnector.cpp b/kivio/kiviopart/kiviosdk/kiviopolylineconnector.cpp index 71910eff..5906ab16 100644 --- a/kivio/kiviopart/kiviosdk/kiviopolylineconnector.cpp +++ b/kivio/kiviopart/kiviosdk/kiviopolylineconnector.cpp @@ -408,7 +408,7 @@ namespace Kivio { bool retVal = true; for(it = m_points.begin(); it != m_points.end(); ++it) { - retVal = retVal && rect.tqcontains((*it)); + retVal = retVal && rect.contains((*it)); } return retVal; diff --git a/kivio/kiviopart/kiviostencilsetaction.cpp b/kivio/kiviopart/kiviostencilsetaction.cpp index b12d157f..0d3eada8 100644 --- a/kivio/kiviopart/kiviostencilsetaction.cpp +++ b/kivio/kiviopart/kiviostencilsetaction.cpp @@ -213,7 +213,7 @@ void KivioStencilSetAction::loadCollections( const TQString& rootDirStr ) { cId = KivioStencilSpawnerSet::readId(colFInfo->absFilePath()); KPopupMenu* ch; - int index = m_collectionIdList.tqfindIndex(cId); + int index = m_collectionIdList.findIndex(cId); if(index < 0) { ch = new KPopupMenu; diff --git a/kivio/kiviopart/stencilbarbutton.cpp b/kivio/kiviopart/stencilbarbutton.cpp index 67d6c079..b44ab4c2 100644 --- a/kivio/kiviopart/stencilbarbutton.cpp +++ b/kivio/kiviopart/stencilbarbutton.cpp @@ -229,7 +229,7 @@ void DragBarButton::mousePressEvent( TQMouseEvent* ev ) closeRect.setRect(0, 20 - m_pClosePix->width(), width(), m_pClosePix->width()); } - if ( closeRect.tqcontains(ev->pos())) { + if ( closeRect.contains(ev->pos())) { m_bClose = true; tqrepaint(); return; @@ -252,7 +252,7 @@ void DragBarButton::mouseReleaseEvent( TQMouseEvent* ev ) closeRect.setRect(0, 20 - m_pClosePix->width(), width(), m_pClosePix->width()); } - if ( closeRect.tqcontains(ev->pos())) + if ( closeRect.contains(ev->pos())) { kdDebug(43000) << "DragBarButton::mouseReleaseEvent() - Emitting closeRequest" << endl; emit closeRequired(this); diff --git a/kivio/kiviopart/stencilbardockmanager.cpp b/kivio/kiviopart/stencilbardockmanager.cpp index a0dca0ee..d0121dd0 100644 --- a/kivio/kiviopart/stencilbardockmanager.cpp +++ b/kivio/kiviopart/stencilbardockmanager.cpp @@ -183,7 +183,7 @@ void StencilBarDockManager::slotFinishDragPage( DragBarButton* ) // remove KivioStackBar if no more pages if (!bar->visiblePage()) { - int k = m_pBars.tqfindRef(bar); + int k = m_pBars.findRef(bar); if ( k!= -1 ) { m_pBars.remove(k); @@ -205,7 +205,7 @@ void StencilBarDockManager::slotMoving() // check existing bars for ( KivioStackBar* bar = m_pBars.first(); bar; bar = m_pBars.next() ) { - if ( bar->tqgeometry().tqcontains(p) ) { + if ( bar->tqgeometry().contains(p) ) { if(bar->place() == TQDockWindow::OutsideDock) { dragPos = OnTopLevelBar; globalPos = bar->tqgeometry().topLeft(); @@ -227,10 +227,10 @@ void StencilBarDockManager::slotMoving() // check "on mainView" TQRect mr(m_pView->mapToGlobal(TQPoint(0,0)),m_pView->size()); - if ( mr.tqcontains(p) ) { + if ( mr.contains(p) ) { TQRect r(mr); r.setWidth(r.width()/4); - if ( r.tqcontains(p) && !m_pBars.at(Left) ) { + if ( r.contains(p) && !m_pBars.at(Left) ) { moveManager->movePause(); moveManager->setGeometry(r); dragPos = Left; @@ -239,7 +239,7 @@ void StencilBarDockManager::slotMoving() r.moveBy(r.width()*3,0); - if ( r.tqcontains(p) && !m_pBars.at(Right) ) { + if ( r.contains(p) && !m_pBars.at(Right) ) { moveManager->movePause(); moveManager->setGeometry(r); dragPos = Right; @@ -249,7 +249,7 @@ void StencilBarDockManager::slotMoving() TQRect t(mr); t.setHeight(t.height()/4); - if ( t.tqcontains(p) && !m_pBars.at(Top) ) { + if ( t.contains(p) && !m_pBars.at(Top) ) { moveManager->movePause(); moveManager->setGeometry(t); dragPos = Top; @@ -258,7 +258,7 @@ void StencilBarDockManager::slotMoving() t.moveBy(0,t.height()*3); - if ( t.tqcontains(p) && !m_pBars.at(Bottom) ) { + if ( t.contains(p) && !m_pBars.at(Bottom) ) { moveManager->movePause(); moveManager->setGeometry(t); dragPos = Bottom; @@ -278,7 +278,7 @@ void StencilBarDockManager::slotDeleteStencilSet( DragBarButton* pBtn, TQWidget // remove KivioStackBar if no more pages if (!pBar->visiblePage()) { - int k = m_pBars.tqfindRef(pBar); + int k = m_pBars.findRef(pBar); if ( k!= -1 ) { m_pBars.remove(k); diff --git a/kivio/kiviopart/ui/export_page_dialog_base.ui b/kivio/kiviopart/ui/export_page_dialog_base.ui index bc993ed8..18195eeb 100644 --- a/kivio/kiviopart/ui/export_page_dialog_base.ui +++ b/kivio/kiviopart/ui/export_page_dialog_base.ui @@ -106,7 +106,7 @@ This will cause the entire page to be exported to the file. This means that < </property> <property name="whatsThis" stdset="0"> <string><b>Crop picture to edges</b><br> -This will eliminate all blank portions of the drawing. The picture will only be as large as the stencils it tqcontains. If your stencils are located in the upper right corner of the page, then only the upper right corner will be exported.</string> +This will eliminate all blank portions of the drawing. The picture will only be as large as the stencils it contains. If your stencils are located in the upper right corner of the page, then only the upper right corner will be exported.</string> </property> </widget> </widget> diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp index 55b88d82..546c3203 100644 --- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp +++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp @@ -181,34 +181,34 @@ void KivioBirdEyePanel::handleMouseMove(TQPoint p) handlePress = true; TQRect r1 = TQRect(varea.x()-1, varea.y()-1, 3, varea.height()+2); - if (r1.tqcontains(p)) { + if (r1.contains(p)) { canvas->setCursor(sizeHorCursor); apos = AlignLeft; return; } r1.moveBy(varea.width(),0); - if (r1.tqcontains(p)) { + if (r1.contains(p)) { canvas->setCursor(sizeHorCursor); apos = AlignRight; return; } TQRect r2 = TQRect(varea.x()-1, varea.y()-1, varea.width()+2, 3); - if (r2.tqcontains(p)) { + if (r2.contains(p)) { canvas->setCursor(sizeVerCursor); apos = AlignTop; return; } r2.moveBy(0, varea.height()); - if (r2.tqcontains(p)) { + if (r2.contains(p)) { canvas->setCursor(sizeVerCursor); apos = AlignBottom; return; } - if (varea.tqcontains(p)) { + if (varea.contains(p)) { canvas->setCursor(sizeAllCursor); apos = AlignCenter; return; diff --git a/kivio/kiviopart/ui/kivio_layer_panel.cpp b/kivio/kiviopart/ui/kivio_layer_panel.cpp index 92161ba3..2e92bd00 100644 --- a/kivio/kiviopart/ui/kivio_layer_panel.cpp +++ b/kivio/kiviopart/ui/kivio_layer_panel.cpp @@ -181,7 +181,7 @@ void KivioLayerPanel::upItem() KivioPage* page = m_pView->activePage(); KivioLayer* layer = item->data; - int pos = page->layers()->tqfind(layer); + int pos = page->layers()->find(layer); // It's already the top layer... return if(pos == (static_cast<int>(page->layers()->count()) - 1)) return; @@ -217,7 +217,7 @@ void KivioLayerPanel::downItem() KivioPage* page = m_pView->activePage(); KivioLayer* layer = item->data; - int pos = page->layers()->tqfind(layer); + int pos = page->layers()->find(layer); // It's already the bottom layer... return if (pos == 0) return; diff --git a/koshell/koshell_shell.cc b/koshell/koshell_shell.cc index 079988a8..181fd88b 100644 --- a/koshell/koshell_shell.cc +++ b/koshell/koshell_shell.cc @@ -335,7 +335,7 @@ void KoShellWindow::setRootDocument( KoDocument * doc ) if ( doc ) { - if ( !doc->shells().tqcontains( this ) ) + if ( !doc->shells().contains( this ) ) doc->addShell( this ); KoView *v = doc->createView(this); diff --git a/kplato/kptaccount.cc b/kplato/kptaccount.cc index f166111c..074189d3 100644 --- a/kplato/kptaccount.cc +++ b/kplato/kptaccount.cc @@ -96,7 +96,7 @@ void Account::take(Account *account) { return; } if (account->tqparent() == this) { - m_accountList.take(m_accountList.tqfindRef(account)); + m_accountList.take(m_accountList.findRef(account)); } else if (account->tqparent()) { account->tqparent()->take(account); } else { @@ -387,7 +387,7 @@ void Accounts::take(Account *account){ account->tqparent()->take(account); return; } - m_accountList.take(m_accountList.tqfindRef(account)); + m_accountList.take(m_accountList.findRef(account)); //kdDebug()<<k_funcinfo<<account->name()<<endl; } @@ -477,12 +477,12 @@ Account *Accounts::findShutdownAccount(const Node &node) const { } Account *Accounts::findAccount(const TQString &id) const { - return m_idDict.tqfind(id); + return m_idDict.find(id); } bool Accounts::insertId(const Account *account) { Q_ASSERT(account); - Account *a = m_idDict.tqfind(account->name()); + Account *a = m_idDict.find(account->name()); if (a == 0) { //kdDebug()<<k_funcinfo<<"'"<<account->name()<<"' inserted"<<endl; m_idDict.insert(account->name(), account); diff --git a/kplato/kptaccountspanel.cc b/kplato/kptaccountspanel.cc index 1d38ac79..a27bd908 100644 --- a/kplato/kptaccountspanel.cc +++ b/kplato/kptaccountspanel.cc @@ -151,7 +151,7 @@ void AccountsPanel::addElement(const TQListViewItem *item) { if (item->tqparent()) { removeElement(item->tqparent()); } - m_elements.tqreplace(item->text(0), item); + m_elements.replace(item->text(0), item); //kdDebug()<<k_funcinfo<<item->text(0)<<endl; refreshDefaultAccount(); } diff --git a/kplato/kptcalendar.h b/kplato/kptcalendar.h index 6607ea67..6e35622a 100644 --- a/kplato/kptcalendar.h +++ b/kplato/kptcalendar.h @@ -128,9 +128,9 @@ public: */ CalendarDay *weekday(int day) const; CalendarDay *weekday(const TQDate &date) const { return weekday(date.dayOfWeek()-1); } - CalendarDay *tqreplace(int weekday, CalendarDay *day) { + CalendarDay *replace(int weekday, CalendarDay *day) { CalendarDay *d = m_weekdays.at(weekday); - m_weekdays.tqreplace(weekday, day); + m_weekdays.replace(weekday, day); return d; } IntMap map(); @@ -235,7 +235,7 @@ public: CalendarDay *findDay(const TQDate &date, bool skipUndefined=false) const; bool addDay(CalendarDay *day) { return m_days.insert(0, day); } bool removeDay(CalendarDay *day) { return m_days.removeRef(day); } - CalendarDay *takeDay(CalendarDay *day) { return m_days.take(m_days.tqfind(day)); } + CalendarDay *takeDay(CalendarDay *day) { return m_days.take(m_days.find(day)); } const TQPtrList<CalendarDay> &days() const { return m_days; } /** diff --git a/kplato/kptcanvasitem.cc b/kplato/kptcanvasitem.cc index bb3ab2ea..fb439945 100644 --- a/kplato/kptcanvasitem.cc +++ b/kplato/kptcanvasitem.cc @@ -703,7 +703,7 @@ void GanttViewSummaryItem::insertRelations(GanttView *view) TQPtrListIterator<Relation> it(m_node->dependChildNodes()); for (; it.current(); ++it) { - KDGanttViewItem *child = tqfind(m_view->firstChild(), it.current()->child()); + KDGanttViewItem *child = find(m_view->firstChild(), it.current()->child()); if (child) { KDGanttViewTaskLink *link = new KDGanttViewTaskLink(this, child, kdLinkType(it.current()->type())); @@ -719,21 +719,21 @@ void GanttViewSummaryItem::insertRelations(GanttView *view) } } -KDGanttViewItem *GanttViewSummaryItem::tqfind(Node *node) +KDGanttViewItem *GanttViewSummaryItem::find(Node *node) { //kdDebug()<<k_funcinfo<<endl; if (m_node == node) return this; - KDGanttViewItem *item = tqfind(firstChild(), node); + KDGanttViewItem *item = find(firstChild(), node); if (item) return item; - return tqfind(nextSibling(), node); + return find(nextSibling(), node); } -KDGanttViewItem *GanttViewSummaryItem::tqfind(KDGanttViewItem *item, Node *node) +KDGanttViewItem *GanttViewSummaryItem::find(KDGanttViewItem *item, Node *node) { if (!item) return 0; @@ -741,17 +741,17 @@ KDGanttViewItem *GanttViewSummaryItem::tqfind(KDGanttViewItem *item, Node *node) if (item->type() == Event) { GanttViewEventItem *i = static_cast<GanttViewEventItem *>(item); - return i->tqfind(node); + return i->find(node); } else if (item->type() == Task) { GanttViewTaskItem *i = static_cast<GanttViewTaskItem *>(item); - return i->tqfind(node); + return i->find(node); } else if (item->type() == Summary) { GanttViewSummaryItem *i = static_cast<GanttViewSummaryItem *>(item); - return i->tqfind(node); + return i->find(node); } return 0; } @@ -784,7 +784,7 @@ void GanttViewTaskItem::insertRelations(GanttView *view) TQPtrListIterator<Relation> it(m_task->dependChildNodes()); for (; it.current(); ++it) { - KDGanttViewItem *child = tqfind(m_view->firstChild(), it.current()->child()); + KDGanttViewItem *child = find(m_view->firstChild(), it.current()->child()); if (child) { KDGanttViewTaskLink *link = new KDGanttViewTaskLink(this, child, kdLinkType(it.current()->type())); @@ -800,21 +800,21 @@ void GanttViewTaskItem::insertRelations(GanttView *view) } } -KDGanttViewItem *GanttViewTaskItem::tqfind(Node *node) +KDGanttViewItem *GanttViewTaskItem::find(Node *node) { //kdDebug()<<k_funcinfo<<endl; if (m_task == node) return this; - KDGanttViewItem *item = tqfind(firstChild(), node); + KDGanttViewItem *item = find(firstChild(), node); if (item) return item; - return tqfind(nextSibling(), node); + return find(nextSibling(), node); } -KDGanttViewItem *GanttViewTaskItem::tqfind(KDGanttViewItem *item, Node *node) +KDGanttViewItem *GanttViewTaskItem::find(KDGanttViewItem *item, Node *node) { if (!item) return 0; @@ -822,17 +822,17 @@ KDGanttViewItem *GanttViewTaskItem::tqfind(KDGanttViewItem *item, Node *node) if (item->type() == Event) { GanttViewEventItem *i = static_cast<GanttViewEventItem *>(item); - return i->tqfind(node); + return i->find(node); } else if (item->type() == Task) { GanttViewTaskItem *i= static_cast<GanttViewTaskItem *>(item); - return i->tqfind(node); + return i->find(node); } else if (item->type() == Summary) { GanttViewSummaryItem *i = static_cast<GanttViewSummaryItem *>(item); - return i->tqfind(node); + return i->find(node); } return 0; // avoid warning } @@ -866,7 +866,7 @@ void GanttViewEventItem::insertRelations(GanttView *view) TQPtrListIterator<Relation> it(m_task->dependChildNodes()); for (; it.current(); ++it) { - KDGanttViewItem *child = tqfind(m_view->firstChild(), it.current()->child()); + KDGanttViewItem *child = find(m_view->firstChild(), it.current()->child()); if (child) { KDGanttViewTaskLink *link = new KDGanttViewTaskLink(this, child, kdLinkType(it.current()->type())); @@ -882,21 +882,21 @@ void GanttViewEventItem::insertRelations(GanttView *view) } } -KDGanttViewItem *GanttViewEventItem::tqfind(Node *node) +KDGanttViewItem *GanttViewEventItem::find(Node *node) { //kdDebug()<<k_funcinfo<<endl; if (m_task == node) return this; - KDGanttViewItem *item = tqfind(firstChild(), node); + KDGanttViewItem *item = find(firstChild(), node); if (item) return item; - return tqfind(nextSibling(), node); + return find(nextSibling(), node); } -KDGanttViewItem *GanttViewEventItem::tqfind(KDGanttViewItem *item, Node *node) +KDGanttViewItem *GanttViewEventItem::find(KDGanttViewItem *item, Node *node) { if (!item) return 0; @@ -904,17 +904,17 @@ KDGanttViewItem *GanttViewEventItem::tqfind(KDGanttViewItem *item, Node *node) if (item->type() == Event) { GanttViewEventItem *i = static_cast<GanttViewEventItem *>(item); - return i->tqfind(node); + return i->find(node); } else if (item->type() == Task) { GanttViewTaskItem *i = static_cast<GanttViewTaskItem *>(item); - return i->tqfind(node); + return i->find(node); } else if (item->type() == Summary) { GanttViewSummaryItem *i = static_cast<GanttViewSummaryItem *>(item); - return i->tqfind(node); + return i->find(node); } return 0; } diff --git a/kplato/kptcanvasitem.h b/kplato/kptcanvasitem.h index 3ce3ec96..98d35158 100644 --- a/kplato/kptcanvasitem.h +++ b/kplato/kptcanvasitem.h @@ -227,8 +227,8 @@ public: Node *getNode() { return m_node; } void insertRelations(GanttView *view); - KDGanttViewItem *tqfind(Node *node); - KDGanttViewItem *tqfind(KDGanttViewItem *item, Node *node); + KDGanttViewItem *find(Node *node); + KDGanttViewItem *find(KDGanttViewItem *item, Node *node); KDGanttView *ganttView() const { return m_view; } bool isDrawn() const { return m_drawn; } void setDrawn(bool drawn) { m_drawn = drawn; } @@ -249,8 +249,8 @@ public: KPlato::Task *getTask() const { return m_task; } void insertRelations(GanttView *view); - KDGanttViewItem *tqfind(Node *node); - KDGanttViewItem *tqfind(KDGanttViewItem *item, Node *node); + KDGanttViewItem *find(Node *node); + KDGanttViewItem *find(KDGanttViewItem *item, Node *node); KDGanttView *ganttView() const { return m_view; } bool isDrawn() const { return m_drawn; } void setDrawn(bool drawn) { m_drawn = drawn; } @@ -271,8 +271,8 @@ public: KPlato::Task *getTask() { return m_task; } void insertRelations(GanttView *view); - KDGanttViewItem *tqfind(Node *node); - KDGanttViewItem *tqfind(KDGanttViewItem *item, Node *node); + KDGanttViewItem *find(Node *node); + KDGanttViewItem *find(KDGanttViewItem *item, Node *node); KDGanttView *ganttView() const { return m_view; } bool isDrawn() const { return m_drawn; } void setDrawn(bool drawn) { m_drawn = drawn; } diff --git a/kplato/kptcommand.cc b/kplato/kptcommand.cc index 96efa2f7..364d552d 100644 --- a/kplato/kptcommand.cc +++ b/kplato/kptcommand.cc @@ -320,12 +320,12 @@ CalendarModifyWeekdayCmd::~CalendarModifyWeekdayCmd() { } void CalendarModifyWeekdayCmd::execute() { - m_value = m_cal->weekdays()->tqreplace(m_weekday, m_value); + m_value = m_cal->weekdays()->replace(m_weekday, m_value); setSchScheduled(false); setCommandType(1); } void CalendarModifyWeekdayCmd::unexecute() { - m_value = m_cal->weekdays()->tqreplace(m_weekday, m_value); + m_value = m_cal->weekdays()->replace(m_weekday, m_value); setSchScheduled(); setCommandType(1); } diff --git a/kplato/kptdatetable.cc b/kplato/kptdatetable.cc index 5b25c3a4..f552de26 100644 --- a/kplato/kptdatetable.cc +++ b/kplato/kptdatetable.cc @@ -142,7 +142,7 @@ void DateTable::paintWeekday(TQPainter *painter, int col) { painter->drawRect(0, 0, w, h); painter->setPen(colorTextHoliday); } - if (m_selectedWeekdays.tqcontains(day)) { + if (m_selectedWeekdays.contains(day)) { painter->setPen(backgroundSelectColor); painter->setBrush(backgroundSelectColor); painter->drawRect(2, 2, w-4, h-4); @@ -214,7 +214,7 @@ void DateTable::paintDay(TQPainter *painter, int row, int col) { painter->setBrush(colorBackgroundWorkday); painter->drawRect(0, 0, w, h); } - if(m_selectedDates.tqcontains(d)) { + if(m_selectedDates.contains(d)) { //kdDebug()<<k_funcinfo<<"Selected: "<<d<<" row,col=("<<row<<","<<col<<")"<<endl; painter->setPen(backgroundSelectColor); painter->setBrush(backgroundSelectColor); @@ -401,7 +401,7 @@ void DateTable::contentsMousePressEvent(TQMouseEvent *e) { bool select = false; for(int i=m_dateStartCol; i < col; ++i) { //kdDebug()<<"Down["<<i<<"]: col="<<col<<" day="<<day<<" column(i)="<<column(i)<<endl; - if (m_selectedWeekdays.tqcontains(weekday(i))) { + if (m_selectedWeekdays.contains(weekday(i))) { select = true; // we have hit a selected day; select the rest } else if (select) { m_selectedWeekdays.toggle(weekday(i)); // select @@ -411,14 +411,14 @@ void DateTable::contentsMousePressEvent(TQMouseEvent *e) { select = false; for(int i=7; i > col; --i) { //kdDebug()<<"Up["<<i<<"]: col="<<col<<" day="<<day<<" column(i)="<<column(i)<<endl; - if (m_selectedWeekdays.tqcontains(weekday(i))) { + if (m_selectedWeekdays.contains(weekday(i))) { if (selected) m_selectedWeekdays.toggle(weekday(i)); // deselect else select = true; } else if (select) { m_selectedWeekdays.toggle(weekday(i)); // select } } - if (!m_selectedWeekdays.tqcontains(day)) { + if (!m_selectedWeekdays.contains(day)) { m_selectedWeekdays.toggle(day); // always select } } else if (e->state() & ControlButton) { @@ -556,7 +556,7 @@ bool DateTable::setDate(const TQDate& date_, bool tqrepaint) { setWeekNumbers(d.addDays(d.daysInMonth()-1)); } /* if (m_selectedWeekdays.isEmpty() && - !m_selectedDates.isEmpty() && !m_selectedDates.tqcontains(date)) + !m_selectedDates.isEmpty() && !m_selectedDates.contains(date)) { //kdDebug()<<k_funcinfo<<"date inserted"<<endl; m_selectedDates.insert(date); @@ -618,8 +618,8 @@ void DateTable::updateSelectedCells() { TQDate dt(date.year(), date.month(), 1); dt = dt.addDays(-firstday); for (int pos=0; pos < 42; ++pos) { - if (m_selectedDates.tqcontains(dt.addDays(pos)) || - m_selectedWeekdays.tqcontains(pos%7+1)) + if (m_selectedDates.contains(dt.addDays(pos)) || + m_selectedWeekdays.contains(pos%7+1)) { updateCell(pos/7+1, pos%7+1); //kdDebug()<<k_funcinfo<<" update cell ("<<pos/7+1<<","<<pos%7+1<<") date="<<dt.addDays(pos).toString()<<endl; @@ -631,8 +631,8 @@ void DateTable::updateMarkedCells() { TQDate dt(date.year(), date.month(), 1); dt = dt.addDays(-firstday); for (int pos=0; pos < 42; ++pos) { - if (m_markedDates.tqcontains(dt.addDays(pos)) || - m_markedWeekdays.tqcontains(pos%7+1)) + if (m_markedDates.contains(dt.addDays(pos)) || + m_markedWeekdays.contains(pos%7+1)) { updateCell(pos/7+1, pos%7+1); //kdDebug()<<k_funcinfo<<" update cell ("<<pos/7+1<<","<<pos%7+1<<") date="<<dt.addDays(pos).toString()<<endl; @@ -649,7 +649,7 @@ void DateTable::setMarkedWeekdays(const IntMap days) { } bool DateTable::weekdayMarked(int day) { - return m_markedWeekdays.tqcontains(day); + return m_markedWeekdays.contains(day); } bool DateTable::dateMarked(TQDate date) { diff --git a/kplato/kptdoublelistviewbase.cc b/kplato/kptdoublelistviewbase.cc index 5a41776b..5eb411d8 100644 --- a/kplato/kptdoublelistviewbase.cc +++ b/kplato/kptdoublelistviewbase.cc @@ -130,7 +130,7 @@ 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, KGlobal::locale()->formatNumber(value, m_prec)); - m_valueMap.tqreplace(col, value); + m_valueMap.replace(col, value); //kdDebug()<<k_funcinfo<<m_masterItem->text(0)<<": column["<<col<<"]="<<value<<endl; } } @@ -143,7 +143,7 @@ void DoubleListViewBase::SlaveListItem::paintCell(TQPainter *p, const TQColorGro //kdDebug()<<k_funcinfo<<"c="<<column<<endl; TQColorGroup g = cg; if (m_highlight) { - if (m_limitMap.tqcontains(column)) { + if (m_limitMap.contains(column)) { if (m_valueMap[column] > m_limitMap[column]) { g.setColor(TQColorGroup::Text, TQColor(red)); } else if (m_valueMap[column] < m_limitMap[column]) { diff --git a/kplato/kptdurationwidget.ui.h b/kplato/kptdurationwidget.ui.h index 2bf5b033..4380c92e 100644 --- a/kplato/kptdurationwidget.ui.h +++ b/kplato/kptdurationwidget.ui.h @@ -321,7 +321,7 @@ void DurationWidget::handleLostFocus( v = v - (tmp.toUInt() * leftScale); newValue = KGlobal::locale()->formatNumber(v); } - int point = newValue.tqfind(m_decimalPoint); + int point = newValue.find(m_decimalPoint); if (point != -1) { //HACK doubles may be rounded(at fractions > 6 digits on my system) @@ -437,7 +437,7 @@ double DurationWidget::power(double m, int e) { } double DurationWidget::fraction(TQString number, int *exp) { - int point = number.tqfind(m_decimalPoint); + int point = number.find(m_decimalPoint); if (point == -1) { return 0.0; } diff --git a/kplato/kpteffortcostmap.h b/kplato/kpteffortcostmap.h index 7910adb5..7936fb02 100644 --- a/kplato/kpteffortcostmap.h +++ b/kplato/kpteffortcostmap.h @@ -79,7 +79,7 @@ public: kdError()<<k_funcinfo<<"Date not valid"<<endl; return ec; } - EffortCostDayMap::const_iterator it = m_days.tqfind(date); + EffortCostDayMap::const_iterator it = m_days.find(date); if (it != m_days.end()) ec = it.data(); return ec; @@ -148,7 +148,7 @@ public: kdError()<<k_funcinfo<<"Date not valid"<<endl; return 0.0; } - if (m_days.tqcontains(date)) { + if (m_days.contains(date)) { return m_days[date].cost(); } return 0.0; @@ -158,7 +158,7 @@ public: kdError()<<k_funcinfo<<"Date not valid"<<endl; return Duration::zeroDuration; } - if (m_days.tqcontains(date)) { + if (m_days.contains(date)) { return m_days[date].effort(); } return Duration::zeroDuration; diff --git a/kplato/kptmap.h b/kplato/kptmap.h index f21612c3..134eeac7 100644 --- a/kplato/kptmap.h +++ b/kplato/kptmap.h @@ -43,7 +43,7 @@ public: DateMap() {} virtual ~DateMap() {} - virtual bool tqcontains(TQDate date) const { return DateMapType::tqcontains(date.toString(Qt::ISODate)); } + virtual bool contains(TQDate date) const { return DateMapType::contains(date.toString(Qt::ISODate)); } void insert(TQString date, int state=Map::NonWorking) { //kdDebug()<<k_funcinfo<<date<<"="<<state<<endl; @@ -60,7 +60,7 @@ public: } int state(TQString date) { - DateMapType::iterator it = tqfind(date); + DateMapType::iterator it = find(date); if (it == end()) return 0; else return it.data(); } @@ -76,7 +76,7 @@ public: // boolean use void toggle(TQString date, int state=Map::NonWorking) { //kdDebug()<<k_funcinfo<<date<<"="<<state<<endl; - if (DateMapType::tqcontains(date)) + if (DateMapType::contains(date)) DateMapType::remove(date); else DateMapType::insert(date, state); @@ -84,7 +84,7 @@ public: void toggle(TQDate date, int state=Map::NonWorking) { return toggle(date.toString(Qt::ISODate)); } void toggleClear(TQString date, int state=Map::NonWorking) { //kdDebug()<<k_funcinfo<<date<<"="<<state<<endl; - bool s = DateMapType::tqcontains(date); + bool s = DateMapType::contains(date); clear(); if (!s) insert(date, state); } @@ -105,7 +105,7 @@ public: IntMapType::insert(key, state); } virtual int state(int key) { - IntMapType::iterator it = IntMapType::tqfind(key); + IntMapType::iterator it = IntMapType::find(key); if (it == IntMapType::end()) return 0; else return it.data(); } @@ -118,9 +118,9 @@ public: } // boolean use - void toggle(int key, int state=Map::NonWorking) { IntMapType::tqcontains(key) ? remove(key) : insert(key, state); } + void toggle(int key, int state=Map::NonWorking) { IntMapType::contains(key) ? remove(key) : insert(key, state); } void toggleClear(int key, int state=Map::NonWorking) { - bool s =tqcontains(key); + bool s =contains(key); clear(); if (!s) insert(key, state); } @@ -129,8 +129,8 @@ public: class WeekMap : public IntMap { public: - bool tqcontains(int week, int year) { return IntMap::tqcontains(week*10000 + year); } - bool tqcontains(TQPair<int,int> week) { return tqcontains(week.first, week.second); } + bool contains(int week, int year) { return IntMap::contains(week*10000 + year); } + bool contains(TQPair<int,int> week) { return contains(week.first, week.second); } void insert(int week, int year, int state=Map::NonWorking) { if (week < 1 || week > 53) { kdError()<<k_funcinfo<<"Illegal week number: "<<week<<endl; return; } diff --git a/kplato/kptnode.cc b/kplato/kptnode.cc index e8c25312..aaa770f0 100644 --- a/kplato/kptnode.cc +++ b/kplato/kptnode.cc @@ -118,8 +118,8 @@ Node *Node::projectNode() { } void Node::delChildNode( Node *node, bool remove) { - //kdDebug()<<k_funcinfo<<"tqfind="<<m_nodes.tqfindRef(node)<<endl; - if ( m_nodes.tqfindRef(node) != -1 ) { + //kdDebug()<<k_funcinfo<<"find="<<m_nodes.findRef(node)<<endl; + if ( m_nodes.findRef(node) != -1 ) { if(remove) m_nodes.remove(); else @@ -149,7 +149,7 @@ void Node::insertChildNode( unsigned int index, Node *node) { void Node::addChildNode( Node *node, Node *after) { //kdDebug()<<k_funcinfo<<endl; - int index = m_nodes.tqfindRef(after); + int index = m_nodes.findRef(after); if (index == -1) { //kdDebug()<<k_funcinfo<<"append id="<<node->id()<<": "<<node->name()<<endl; m_nodes.append(node); @@ -163,7 +163,7 @@ void Node::addChildNode( Node *node, Node *after) { int Node::findChildNode( Node* node ) { - return m_nodes.tqfindRef( node ); + return m_nodes.findRef( node ); } @@ -201,7 +201,7 @@ void Node::insertDependChildNode( unsigned int index, Node *node, Relation::Type } bool Node::addDependChildNode( Relation *relation) { - if(m_dependChildNodes.tqfindRef(relation) != -1) + if(m_dependChildNodes.findRef(relation) != -1) return false; m_dependChildNodes.append(relation); return true; @@ -209,7 +209,7 @@ bool Node::addDependChildNode( Relation *relation) { // These delDepend... methods look suspicious to me, can someone review? void Node::delDependChildNode( Node *node, bool remove) { - if ( m_nodes.tqfindRef(node) != -1 ) { + if ( m_nodes.findRef(node) != -1 ) { if(remove) m_dependChildNodes.remove(); else @@ -218,7 +218,7 @@ void Node::delDependChildNode( Node *node, bool remove) { } void Node::delDependChildNode( Relation *rel, bool remove) { - if ( m_dependChildNodes.tqfindRef(rel) != -1 ) { + if ( m_dependChildNodes.findRef(rel) != -1 ) { if(remove) m_dependChildNodes.remove(); else @@ -234,7 +234,7 @@ void Node::delDependChildNode( int number, bool remove) { } void Node::takeDependChildNode(Relation *rel) { - if (m_dependChildNodes.tqfindRef(rel) != -1) { + if (m_dependChildNodes.findRef(rel) != -1) { m_dependChildNodes.take(); } } @@ -260,7 +260,7 @@ void Node::insertDependParentNode( unsigned int index, Node *node, Relation::Typ } bool Node::addDependParentNode( Relation *relation) { - if(m_dependParentNodes.tqfindRef(relation) != -1) + if(m_dependParentNodes.findRef(relation) != -1) return false; m_dependParentNodes.append(relation); return true; @@ -268,7 +268,7 @@ bool Node::addDependParentNode( Relation *relation) { // These delDepend... methods look suspicious to me, can someone review? void Node::delDependParentNode( Node *node, bool remove) { - if ( m_nodes.tqfindRef(node) != -1 ) { + if ( m_nodes.findRef(node) != -1 ) { if(remove) m_dependParentNodes.remove(); else @@ -277,7 +277,7 @@ void Node::delDependParentNode( Node *node, bool remove) { } void Node::delDependParentNode( Relation *rel, bool remove) { - if ( m_dependParentNodes.tqfindRef(rel) != -1 ) { + if ( m_dependParentNodes.findRef(rel) != -1 ) { if(remove) m_dependParentNodes.remove(); else @@ -293,13 +293,13 @@ void Node::delDependParentNode( int number, bool remove) { } void Node::takeDependParentNode(Relation *rel) { - if (m_dependParentNodes.tqfindRef(rel) != -1) { + if (m_dependParentNodes.findRef(rel) != -1) { rel = m_dependParentNodes.take(); } } bool Node::isParentOf(Node *node) { - if (m_nodes.tqfindRef(node) != -1) + if (m_nodes.findRef(node) != -1) return true; TQPtrListIterator<Node> nit(childNodeIterator()); @@ -504,7 +504,7 @@ Node *Node::siblingBefore() { Node *Node::childBefore(Node *node) { //kdDebug()<<k_funcinfo<<endl; - int index = m_nodes.tqfindRef(node); + int index = m_nodes.findRef(node); if (index > 0){ return m_nodes.at(index-1); } @@ -521,7 +521,7 @@ Node *Node::siblingAfter() { Node *Node::childAfter(Node *node) { //kdDebug()<<k_funcinfo<<endl; - uint index = m_nodes.tqfindRef(node); + uint index = m_nodes.findRef(node); if (index < m_nodes.count()-1) { return m_nodes.at(index+1); } return 0; @@ -668,7 +668,7 @@ void Node::takeSchedule(const Schedule *schedule) { void Node::addSchedule(Schedule *schedule) { if (schedule == 0) return; - m_schedules.tqreplace(schedule->id(), schedule); + m_schedules.replace(schedule->id(), schedule); } Schedule *Node::createSchedule(TQString name, Schedule::Type type, long id) { diff --git a/kplato/kptpertcanvas.cc b/kplato/kptpertcanvas.cc index 198d4593..e269c6ed 100644 --- a/kplato/kptpertcanvas.cc +++ b/kplato/kptpertcanvas.cc @@ -103,7 +103,7 @@ void PertCanvas::draw(Project& project) PertNodeItem *PertCanvas::createNodeItem(Node *node) { - PertNodeItem *item = m_nodes.tqfind(node); + PertNodeItem *item = m_nodes.find(node); if (!item) { if ( node->type() == Node::Type_Project) @@ -153,8 +153,8 @@ void PertCanvas::drawRelations() TQPtrListIterator<Relation> it(m_relations); for (; it.current(); ++it) { - PertNodeItem *parentItem = m_nodes.tqfind(it.current()->tqparent()); - PertNodeItem *childItem = m_nodes.tqfind(it.current()->child()); + PertNodeItem *parentItem = m_nodes.find(it.current()->tqparent()); + PertNodeItem *childItem = m_nodes.find(it.current()->child()); if (parentItem && childItem) { PertRelationItem *item = new PertRelationItem(this, parentItem, childItem, it.current()); diff --git a/kplato/kptproject.cc b/kplato/kptproject.cc index 3a15ce2f..d06c5e51 100644 --- a/kplato/kptproject.cc +++ b/kplato/kptproject.cc @@ -1060,7 +1060,7 @@ void Project::setCurrentSchedule(long id) { MainSchedule *Project::createSchedule(TQString name, Schedule::Type type) { //kdDebug()<<k_funcinfo<<"No of schedules: "<<m_schedules.count()<<endl; long i=1; - while (m_schedules.tqfind(i)) { + while (m_schedules.find(i)) { ++i; } MainSchedule *sch = new MainSchedule(this, name, type, i); diff --git a/kplato/kptproject.h b/kplato/kptproject.h index f9444d8b..edfa83d1 100644 --- a/kplato/kptproject.h +++ b/kplato/kptproject.h @@ -96,7 +96,7 @@ public: void removeResourceGroup(ResourceGroup *resource); void removeResourceGroup(int number); ResourceGroup *takeResourceGroup(ResourceGroup *resource) - { return m_resourceGroups.take(m_resourceGroups.tqfindRef(resource)); } + { return m_resourceGroups.take(m_resourceGroups.findRef(resource)); } bool addTask( Node* task, Node* position ); bool addSubTask( Node* task, Node* position ); @@ -173,7 +173,7 @@ public: /// Find the node with identity id virtual Node *findNode(const TQString &id) const - { return (m_parent ? m_parent->findNode(id) : nodeIdDict.tqfind(id)); } + { return (m_parent ? m_parent->findNode(id) : nodeIdDict.find(id)); } /// Remove the node with identity id from the register virtual bool removeId(const TQString &id); /// Insert the node with identity id @@ -184,7 +184,7 @@ public: TQString uniqueNodeId(int seed=1); ResourceGroup *findResourceGroup(const TQString &id) const - { return resourceGroupIdDict.tqfind(id); } + { return resourceGroupIdDict.find(id); } /// Remove the resourcegroup with identity id from the register bool removeResourceGroupId(const TQString &id) { return resourceGroupIdDict.remove(id); } @@ -193,7 +193,7 @@ public: { resourceGroupIdDict.insert(id, group); } Resource *findResource(const TQString &id) const - { return resourceIdDict.tqfind(id); } + { return resourceIdDict.find(id); } /// Remove the resource with identity id from the register bool removeResourceId(const TQString &id) { return resourceIdDict.remove(id); } @@ -203,7 +203,7 @@ public: /// Find the calendar with identity id virtual Calendar *findCalendar(const TQString &id) const - { return id.isEmpty() ? 0 : calendarIdDict.tqfind(id); } + { return id.isEmpty() ? 0 : calendarIdDict.find(id); } /// Remove the calendar with identity id from the register virtual bool removeCalendarId(const TQString &id); /// Insert the calendar with identity id diff --git a/kplato/kptreportview.cc b/kplato/kptreportview.cc index abcf1904..3cecf3eb 100644 --- a/kplato/kptreportview.cc +++ b/kplato/kptreportview.cc @@ -71,7 +71,7 @@ public: ~ReportTagsPrivate() {} TQString getData(TQString source, TQString tag) const { - if (tag.tqcontains(".")) + if (tag.contains(".")) return getData(tag); return getData(source + "." + tag); @@ -80,7 +80,7 @@ public: TQString getData(TQString tag) const { //kdDebug()<<k_funcinfo<<"tag="<<tag<<endl; KLocale *l = KGlobal::locale(); - if (!tag.tqcontains('.')) { + if (!tag.contains('.')) { // global tags if (tag == "currentdate") { return l->formatDate(TQDate::tqcurrentDate(), true); @@ -227,7 +227,7 @@ void ReportView::initReportList() { TQString url = file.readURL(); if (!url.isNull()) { if (url.left(1) != "/" || url.left(6) != "file:/") { - TQString path = (*it).left((*it).tqfindRev('/', -1)+1); // include '/' + TQString path = (*it).left((*it).findRev('/', -1)+1); // include '/' url = path + url; } m_reportList->insertItem(new ReportItem(m_reportList, name, url)); @@ -407,9 +407,9 @@ TQString ReportView::setDetail(const TQString & source, TQStringList &properties TQString data = m_reportTags->getData(source, properties[i].section('=', 1, 1)); if (data.isNull()) data = ""; - data = data.tqreplace('<', "<"); - data = data.tqreplace('>', ">"); - data = data.tqreplace('"', """); + data = data.replace('<', "<"); + data = data.replace('>', ">"); + data = data.replace('"', """); s += "\"" + data + "\""; // Property //kdDebug()<<k_funcinfo<<s<<endl; @@ -541,10 +541,10 @@ void ReportView::handleHeader(TQDomNode &node) { int i = 0, j = 0; do { i = j; - if ( ((i = s.tqfind('[', i)) != -1) && ((j = s.tqfind(']', i+1)) != -1) ) { + if ( ((i = s.find('[', i)) != -1) && ((j = s.find(']', i+1)) != -1) ) { TQString tag = s.mid(i, j-i+1); TQString data = m_reportTags->getData(tag.mid(1, tag.length()-2)); - r = r.tqreplace(tag, data); + r = r.replace(tag, data); } } while (i != -1 && j != -1); n.setNodeValue(r); diff --git a/kplato/kptrequestresourcespanel.cc b/kplato/kptrequestresourcespanel.cc index df6b4e2b..0b1f7740 100644 --- a/kplato/kptrequestresourcespanel.cc +++ b/kplato/kptrequestresourcespanel.cc @@ -86,7 +86,7 @@ GroupLVItem::GroupLVItem(TQListView *tqparent, ResourceGroup *group, Task &task) //kdDebug()<<k_funcinfo<<"resource="<<it.current()->name()<<endl; ResourceRequest *req=0; if (m_request) { - req = m_request->tqfind(it.current()); + req = m_request->find(it.current()); } m_resources.append(new ResourceTableItem(it.current(), req, (bool)req)); } diff --git a/kplato/kptresource.cc b/kplato/kptresource.cc index 78834b4a..1b732e87 100644 --- a/kplato/kptresource.cc +++ b/kplato/kptresource.cc @@ -106,7 +106,7 @@ void ResourceGroup::removeResource(Resource *resource) { } Resource *ResourceGroup::takeResource(Resource *resource) { - return m_resources.take(m_resources.tqfindRef(resource)); + return m_resources.take(m_resources.findRef(resource)); } void ResourceGroup::removeResource(int) { @@ -457,7 +457,7 @@ void Resource::takeSchedule(const Schedule *schedule) { void Resource::addSchedule(Schedule *schedule) { if (schedule == 0) return; - m_schedules.tqreplace(schedule->id(), schedule); + m_schedules.replace(schedule->id(), schedule); } ResourceSchedule *Resource::createSchedule(TQString name, int type, long id) { @@ -791,10 +791,10 @@ void ResourceGroupRequest::addResourceRequest(ResourceRequest *request) { ResourceRequest *ResourceGroupRequest::takeResourceRequest(ResourceRequest *request) { if (request) request->unregisterRequest(); - return m_resourceRequests.take(m_resourceRequests.tqfindRef(request)); + return m_resourceRequests.take(m_resourceRequests.findRef(request)); } -ResourceRequest *ResourceGroupRequest::tqfind(Resource *resource) const { +ResourceRequest *ResourceGroupRequest::find(Resource *resource) const { TQPtrListIterator<ResourceRequest> it(m_resourceRequests); for (; it.current(); ++it) if (it.current()->resource() == resource) @@ -1075,7 +1075,7 @@ ResourceRequestCollection::~ResourceRequestCollection() { m_requests.clear(); } -ResourceGroupRequest *ResourceRequestCollection::tqfind(ResourceGroup *group) const { +ResourceGroupRequest *ResourceRequestCollection::find(ResourceGroup *group) const { TQPtrListIterator<ResourceGroupRequest> it(m_requests); for (; it.current(); ++it) { if (it.current()->group() == group) @@ -1085,11 +1085,11 @@ ResourceGroupRequest *ResourceRequestCollection::tqfind(ResourceGroup *group) co } -ResourceRequest *ResourceRequestCollection::tqfind(Resource *resource) const { +ResourceRequest *ResourceRequestCollection::find(Resource *resource) const { ResourceRequest *req = 0; TQPtrListIterator<ResourceGroupRequest> it(m_requests); for (; !req && it.current(); ++it) { - req = it.current()->tqfind(resource); + req = it.current()->find(resource); } return req; } diff --git a/kplato/kptresource.h b/kplato/kptresource.h index be558d93..e298a022 100644 --- a/kplato/kptresource.h +++ b/kplato/kptresource.h @@ -446,7 +446,7 @@ class ResourceGroupRequest { void addResourceRequest(ResourceRequest *request); void removeResourceRequest(ResourceRequest *request) { m_resourceRequests.removeRef(request); } ResourceRequest *takeResourceRequest(ResourceRequest *request); - ResourceRequest *tqfind(Resource *resource) const; + ResourceRequest *find(Resource *resource) const; bool load(TQDomElement &element, Project &project); void save(TQDomElement &element) const; @@ -515,9 +515,9 @@ public: request->setParent(this); } void removeRequest(ResourceGroupRequest *request) { m_requests.removeRef(request); } - void takeRequest(ResourceGroupRequest *request) { m_requests.take(m_requests.tqfindRef(request)); } - ResourceGroupRequest *tqfind(ResourceGroup *resource) const; - ResourceRequest *tqfind(Resource *resource) const; + void takeRequest(ResourceGroupRequest *request) { m_requests.take(m_requests.findRef(request)); } + ResourceGroupRequest *find(ResourceGroup *resource) const; + ResourceRequest *find(Resource *resource) const; bool isEmpty() const; //bool load(TQDomElement &element, Project &project); diff --git a/kplato/kptresourcespanel.cc b/kplato/kptresourcespanel.cc index cc645d42..29b1d4eb 100644 --- a/kplato/kptresourcespanel.cc +++ b/kplato/kptresourcespanel.cc @@ -152,7 +152,7 @@ public: } void deleteResource(ResourcesPanelResourceItem *item) { //kdDebug()<<k_funcinfo<<" Deleted: "<<item->m_name<<" ("<<item<<")"<<endl; - m_resourceItems.take(m_resourceItems.tqfindRef(item)); + m_resourceItems.take(m_resourceItems.findRef(item)); if (item->m_state == ResourcesPanelResourceItem::New) delete item; else @@ -302,7 +302,7 @@ void ResourcesPanel::slotDeleteGroup() { listOfResources->clear(); listOfGroups->takeItem(groupLVItem); // remove from listbox - m_groupItems.take(m_groupItems.tqfindRef(groupLVItem->m_group)); // remove GroupItem from active list + m_groupItems.take(m_groupItems.findRef(groupLVItem->m_group)); // remove GroupItem from active list m_deletedGroupItems.append(groupLVItem->takeGroup()); // remove GroupItem from GroupLVItem and add to deleted list //kdDebug()<<k_funcinfo<<" No of deleted groups="<<m_deletedGroupItems.count()<<", now "<<m_groupItems.count()<<" groups left"<<endl; diff --git a/kplato/kptresourceview.cc b/kplato/kptresourceview.cc index a0cdb552..13306105 100644 --- a/kplato/kptresourceview.cc +++ b/kplato/kptresourceview.cc @@ -317,23 +317,23 @@ public: } void setPriority(int col, int prio) { - if (prioColors.tqcontains(prio)) { + if (prioColors.contains(prio)) { columnPrio.insert(col, prio); } else { columnPrio.remove(col); } } int priority(int col) { - if (columnPrio.tqcontains(col)) { + if (columnPrio.contains(col)) { return columnPrio[col]; } return 0; } virtual void paintCell ( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ) { - //kdDebug()<<k_funcinfo<<"c="<<column<<" prio="<<(columnPrio.tqcontains(column)?columnPrio[column]:0)<<endl; + //kdDebug()<<k_funcinfo<<"c="<<column<<" prio="<<(columnPrio.contains(column)?columnPrio[column]:0)<<endl; TQColorGroup g = cg; - if (columnPrio.tqcontains(column)) { + if (columnPrio.contains(column)) { g.setColor(TQColorGroup::Base, prioColors[columnPrio[column]]); } KListViewItem::paintCell(p, g, column, width, align); diff --git a/kplato/kptschedule.cc b/kplato/kptschedule.cc index 84b2ddd3..3187a2e1 100644 --- a/kplato/kptschedule.cc +++ b/kplato/kptschedule.cc @@ -175,7 +175,7 @@ void Schedule::saveAppointments(TQDomElement &element) const { } bool Schedule::add(Appointment *appointment) { - if (m_appointments.tqfindRef(appointment) != -1) { + if (m_appointments.findRef(appointment) != -1) { kdError()<<k_funcinfo<<"Appointment allready exists"<<endl; return false; } @@ -191,7 +191,7 @@ void Schedule::removeAppointment(Appointment *appointment) { } void Schedule::takeAppointment(Appointment *appointment) { - int i = m_appointments.tqfindRef(appointment); + int i = m_appointments.findRef(appointment); if (i != -1) { m_appointments.take(i); //kdDebug()<<k_funcinfo<<"Taken: "<<appointment<<endl; diff --git a/kplato/kpttask.cc b/kplato/kpttask.cc index 7b00740b..c8ecba3a 100644 --- a/kplato/kpttask.cc +++ b/kplato/kpttask.cc @@ -97,7 +97,7 @@ Duration *Task::getRandomDuration() { ResourceGroupRequest *Task::resourceGroupRequest(ResourceGroup *group) const { if (m_requests) - return m_requests->tqfind(group); + return m_requests->find(group); return 0; } diff --git a/kplato/kptwbsdefinition.cc b/kplato/kptwbsdefinition.cc index d05b61d8..fd6b48aa 100644 --- a/kplato/kptwbsdefinition.cc +++ b/kplato/kptwbsdefinition.cc @@ -89,7 +89,7 @@ void WBSDefinition::setLevelsDef(TQMap<int, CodeDef> def) { } WBSDefinition::CodeDef WBSDefinition::levelsDef(int level) const { - return m_levelsDef.tqcontains(level) ? m_levelsDef[level] : CodeDef(); + return m_levelsDef.contains(level) ? m_levelsDef[level] : CodeDef(); } void WBSDefinition::setLevelsDef(int level, CodeDef def) { diff --git a/kpresenter/KPrAutoformObject.cpp b/kpresenter/KPrAutoformObject.cpp index 774f9f3e..88245f6d 100644 --- a/kpresenter/KPrAutoformObject.cpp +++ b/kpresenter/KPrAutoformObject.cpp @@ -174,15 +174,15 @@ double KPrAutoformObject::load(const TQDomElement &element) if(filename[0]=='/') { kdDebug(33001) << "rubbish ahead! cleaning up..." << endl; // remove the leading absolute path (i.e. to create Arrow/Arrow1.atf) - filename=filename.mid(filename.tqfindRev('/', filename.tqfindRev('/')-1)+1); + filename=filename.mid(filename.findRev('/', filename.findRev('/')-1)+1); } // okay... we changed the file format again and now the autoforms // are stored in .../kpresenter/autoforms/.source/foo.atf (note: we didn't have .source // before. Therefore we have to add this dir if it's not already there to make it // work with old files - if(filename.tqfind(".source")==-1) { + if(filename.find(".source")==-1) { // okay, old file -- add the .source dir - filename=filename.insert(filename.tqfind('/'), "/.source"); + filename=filename.insert(filename.find('/'), "/.source"); } filename = locate("autoforms", filename, KPrFactory::global()); atfInterp.load( filename ); diff --git a/kpresenter/KPrBackground.cpp b/kpresenter/KPrBackground.cpp index e2d08fa2..66102045 100644 --- a/kpresenter/KPrBackground.cpp +++ b/kpresenter/KPrBackground.cpp @@ -276,7 +276,7 @@ void KPrBackGround::loadOasis(KoOasisContext & context ) if ( !href.isEmpty() ) { TQString strExtension; - const int result=href.tqfindRev("."); + const int result=href.findRev("."); if (result>=0) { strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. @@ -435,11 +435,11 @@ void KPrBackGround::load( const TQDomElement &element ) _fileName=e.attribute("filename"); if ( !_fileName.isEmpty() ) { - if ( int _envVarB = _fileName.tqfind( '$' ) >= 0 ) + if ( int _envVarB = _fileName.find( '$' ) >= 0 ) { - int _envVarE = _fileName.tqfind( '/', _envVarB ); + int _envVarE = _fileName.find( '/', _envVarB ); TQString path = getenv( TQFile::encodeName(_fileName.mid( _envVarB, _envVarE-_envVarB )) ); - _fileName.tqreplace( _envVarB-1, _envVarE-_envVarB+1, path ); + _fileName.replace( _envVarB-1, _envVarE-_envVarB+1, path ); } } if ( openPic ) @@ -481,11 +481,11 @@ void KPrBackGround::load( const TQDomElement &element ) _fileName=e.attribute("filename"); if ( !_fileName.isEmpty() ) { - if ( int _envVarB = _fileName.tqfind( '$' ) >= 0 ) + if ( int _envVarB = _fileName.find( '$' ) >= 0 ) { - int _envVarE = _fileName.tqfind( '/', _envVarB ); + int _envVarE = _fileName.find( '/', _envVarB ); TQString path = getenv( TQFile::encodeName(_fileName.mid( _envVarB, _envVarE-_envVarB )) ); - _fileName.tqreplace( _envVarB-1, _envVarE-_envVarB+1, path ); + _fileName.replace( _envVarB-1, _envVarE-_envVarB+1, path ); } } //KPClipartKey clipKey( _fileName, TQDateTime( pictureCollection()->tmpDate(), diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp index 9e8d1815..2ada2d93 100644 --- a/kpresenter/KPrCanvas.cpp +++ b/kpresenter/KPrCanvas.cpp @@ -602,7 +602,7 @@ void KPrCanvas::drawEditPage( TQPainter *painter, const TQRect &_rect, { KoRect rect = m_view->zoomHandler()->unzoomRect(_rect); - int pageNum = m_view->kPresenterDoc()->pageList().tqfindRef( page ); + int pageNum = m_view->kPresenterDoc()->pageList().findRef( page ); //objects on master page if ( page->masterPage() && page->displayObjectFromMasterPage() ) drawObjectsEdit( painter, rect, page->masterPage()->objectList(), selectionMode, pageNum ); @@ -641,7 +641,7 @@ void KPrCanvas::drawGrid(TQPainter *painter, const TQRect &rect2) const for ( double i = offsetX; ( zoomedX = m_view->zoomHandler()->zoomItX( i )+pageRect.left() ) < pageRect.right(); i += offsetX ) for ( double j = offsetY; ( zoomedY = m_view->zoomHandler()->zoomItY( j )+pageRect.top() ) < pageRect.bottom(); j += offsetY ) - if( rect2.tqcontains( zoomedX, zoomedY ) ) + if( rect2.contains( zoomedX, zoomedY ) ) painter->drawPoint( zoomedX, zoomedY ); painter->restore(); @@ -691,7 +691,7 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e ) { KPrTextObject *txtObj=m_currentTextObjectView->kpTextObject(); Q_ASSERT(txtObj); - if(txtObj->tqcontains( docPoint )) + if(txtObj->contains( docPoint )) { KoPoint pos = docPoint - txtObj->innerRect().topLeft(); // in pt, but now translated into the object's coordinate system // This is common to all mouse buttons, so that RMB and MMB place the cursor too @@ -1406,7 +1406,7 @@ void KPrCanvas::mouseMoveEvent( TQMouseEvent *e ) KPrTextObject *txtObj=m_currentTextObjectView->kpTextObject(); Q_ASSERT(txtObj); - if(txtObj->tqcontains( docPoint )&&mousePressed) + if(txtObj->contains( docPoint )&&mousePressed) { KoPoint pos = docPoint - txtObj->innerRect().topLeft(); m_currentTextObjectView->mouseMoveEvent( e, m_view->zoomHandler()->ptToLayoutUnitPix( pos ) ); // in LU pixels @@ -1824,7 +1824,7 @@ void KPrCanvas::mouseDoubleClickEvent( TQMouseEvent *e ) { KPrTextObject *txtObj=m_currentTextObjectView->kpTextObject(); Q_ASSERT(txtObj); - if(txtObj->tqcontains( docPoint )) + if(txtObj->contains( docPoint )) { KoPoint pos = docPoint - txtObj->getOrig(); //pos=m_view->zoomHandler()->pixelToLayoutUnit(TQPoint(pos.x(),pos.y())); @@ -1834,7 +1834,7 @@ void KPrCanvas::mouseDoubleClickEvent( TQMouseEvent *e ) } //disallow activating objects outside the "page" - if ( !m_activePage->getPageRect().tqcontains(docPoint)) + if ( !m_activePage->getPageRect().contains(docPoint)) return; @@ -3034,7 +3034,7 @@ bool KPrCanvas::pNext( bool gotoNextPage ) // Then try to see if there is still one step to do in the current page if ( m_step.m_step < *( --m_pageEffectSteps.end() ) ) { - TQValueList<int>::ConstIterator it = m_pageEffectSteps.tqfind( m_step.m_step ); + TQValueList<int>::ConstIterator it = m_pageEffectSteps.find( m_step.m_step ); m_step.m_step = *( ++it ); m_step.m_subStep = 0; //kdDebug(33001) << "Page::pNext setting currentEffectStep to " << m_step.m_step << endl; @@ -3169,7 +3169,7 @@ bool KPrCanvas::pPrev( bool gotoPreviousPage ) m_drawModeLines.clear(); if ( !gotoPreviousPage && m_step.m_step > *m_pageEffectSteps.begin() ) { - TQValueList<int>::ConstIterator it = m_pageEffectSteps.tqfind( m_step.m_step ); + TQValueList<int>::ConstIterator it = m_pageEffectSteps.find( m_step.m_step ); m_step.m_step = *( --it ); //hopefully there are never more than 1000 sub steps :-) m_step.m_subStep = 1000; @@ -3898,7 +3898,7 @@ void KPrCanvas::selectNext() if ( m_activePage->numSelected() == 0 ) objectList().at( 0 )->setSelected( true ); else { - int i = objectList().tqfindRef( m_activePage->getSelectedObj() ); + int i = objectList().findRef( m_activePage->getSelectedObj() ); if ( i < static_cast<int>( objectList().count() ) - 1 ) { m_view->kPresenterDoc()->deSelectAllObj(); objectList().at( ++i )->setSelected( true ); @@ -3917,7 +3917,7 @@ void KPrCanvas::selectPrev() if ( m_activePage->numSelected() == 0 ) objectList().at( objectList().count() - 1 )->setSelected( true ); else { - int i = objectList().tqfindRef( m_activePage->getSelectedObj() ); + int i = objectList().findRef( m_activePage->getSelectedObj() ); if ( i > 0 ) { m_view->kPresenterDoc()->deSelectAllObj(); objectList().at( --i )->setSelected( true ); @@ -4001,7 +4001,7 @@ void KPrCanvas::dropEvent( TQDropEvent *e ) { //disallow dropping objects outside the "page" KoPoint docPoint = m_view->zoomHandler()->unzoomPoint( e->pos()+TQPoint(diffx(),diffy()) ); - if ( !m_activePage->getZoomPageRect().tqcontains(e->pos())) + if ( !m_activePage->getZoomPageRect().contains(e->pos())) return; if ( TQImageDrag::canDecode( e ) ) { @@ -4030,12 +4030,12 @@ void KPrCanvas::dropEvent( TQDropEvent *e ) if ( res && res->isValid() ) { TQString mimetype = res->mimeType(); - if ( mimetype.tqcontains( "image" ) ) { + if ( mimetype.contains( "image" ) ) { TQCursor c = cursor(); setCursor( waitCursor ); m_activePage->insertPicture( filename, docPoint ); setCursor( c ); - } else if ( mimetype.tqcontains( "text" ) ) { + } else if ( mimetype.contains( "text" ) ) { TQCursor c = cursor(); setCursor( waitCursor ); TQFile f( filename ); @@ -4106,7 +4106,7 @@ void KPrCanvas::gotoPage( int pg ) m_step.m_pageNumber = page; kdDebug(33001) << "Page::gotoPage m_step.m_pageNumber =" << m_step.m_pageNumber << endl; - m_presentationSlidesIterator = m_presentationSlides.tqfind( m_step.m_pageNumber + 1 ); + m_presentationSlidesIterator = m_presentationSlides.find( m_step.m_pageNumber + 1 ); editMode = false; m_drawMode = false; m_pageEffectSteps = m_view->kPresenterDoc()->getPageEffectSteps( m_step.m_pageNumber ); @@ -4996,7 +4996,7 @@ const TQPtrList<KPrObject> KPrCanvas::displayObjectList() const { // it can happen that the object is no longer there e.g. when // the insert of the object is undone - int pos = objectList().tqfindRef( m_objectDisplayAbove ); + int pos = objectList().findRef( m_objectDisplayAbove ); if ( pos != -1 && m_objectDisplayAbove->isSelected() ) { list.take( pos ); @@ -5416,7 +5416,7 @@ KPrTextObject* KPrCanvas::textUnderMouse( const TQPoint & point ) TQPtrListIterator<KPrTextObject> it2(obj ); for ( ; it2.current() ; ++it2 ) { TQRect outerRect( m_view->kPresenterDoc()->zoomHandler()->zoomRect( it2.current()->getRect()) ); - if ( !it2.current()->isProtectContent() && outerRect.tqcontains( point) ) + if ( !it2.current()->isProtectContent() && outerRect.contains( point) ) return it2.current(); } return 0L; diff --git a/kpresenter/KPrCommand.cpp b/kpresenter/KPrCommand.cpp index 491976cc..5236aaf6 100644 --- a/kpresenter/KPrCommand.cpp +++ b/kpresenter/KPrCommand.cpp @@ -668,7 +668,7 @@ void KPrInsertCmd::unexecute() { TQRect oldRect = m_doc->zoomHandler()->zoomRect( m_object->getRepaintRect() ); TQPtrList<KPrObject> list(m_page->objectList()); - if ( list.tqfindRef( m_object ) != -1 ) { + if ( list.findRef( m_object ) != -1 ) { m_page->takeObject( m_object ); m_object->removeFromObjList(); if ( m_object->getType() == OT_TEXT ) @@ -688,7 +688,7 @@ void KPrInsertCmd::unexecute() TQValueListConstIterator<KPrObject *> it( m_objects.begin() ); for ( ; it != m_objects.end(); ++it ) { - if ( list.tqfindRef( *it ) != -1 ) + if ( list.findRef( *it ) != -1 ) { m_page->takeObject( *it ); ( *it )->removeFromObjList(); diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp index a5cf24fe..da37a08e 100644 --- a/kpresenter/KPrConfig.cpp +++ b/kpresenter/KPrConfig.cpp @@ -992,17 +992,17 @@ void KPrConfigurePathPage::slotModifyPath() void KPrConfigurePathPage::slotDefault() { - TQListViewItem * item = m_pPathView->tqfindItem(i18n("Picture Path"), 0); + TQListViewItem * item = m_pPathView->findItem(i18n("Picture Path"), 0); if ( item ) item->setText(1, KGlobalSettings::documentPath()); - item = m_pPathView->tqfindItem(i18n("Backup Path"), 0); + item = m_pPathView->findItem(i18n("Backup Path"), 0); if ( item ) item->setText(1, TQString() ); } void KPrConfigurePathPage::apply() { - TQListViewItem *item = m_pPathView->tqfindItem(i18n("Backup Path"), 0); + TQListViewItem *item = m_pPathView->findItem(i18n("Backup Path"), 0); if ( item ) { TQString res = item->text(1 ); @@ -1017,7 +1017,7 @@ void KPrConfigurePathPage::apply() #endif } } - item = m_pPathView->tqfindItem(i18n("Picture Path"), 0); + item = m_pPathView->findItem(i18n("Picture Path"), 0); if ( item ) { TQString res = item->text(1 ); diff --git a/kpresenter/KPrCustomSlideShowDia.cpp b/kpresenter/KPrCustomSlideShowDia.cpp index 19072278..2cc74ef8 100644 --- a/kpresenter/KPrCustomSlideShowDia.cpp +++ b/kpresenter/KPrCustomSlideShowDia.cpp @@ -445,7 +445,7 @@ TQString KPrDefineCustomSlideShow::customSlideShowName() const void KPrDefineCustomSlideShow::slotOk() { - if ( listNameCustomSlideShow.tqcontains( m_name->text() ) ) + if ( listNameCustomSlideShow.contains( m_name->text() ) ) { KMessageBox::error(this, i18n("Custom Slide Show name is already used."), i18n("Define Custom Slide Show")); } diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp index 0b33a507..1a884752 100644 --- a/kpresenter/KPrDocument.cpp +++ b/kpresenter/KPrDocument.cpp @@ -616,7 +616,7 @@ TQDomDocument KPrDocument::saveXML() TQValueListIterator<KPrPage*> itPage ; for( itPage = ( *it ).begin(); itPage != ( *it ).end(); ++itPage ) { - int posPage = m_pageList.tqfind( *itPage ); + int posPage = m_pageList.find( *itPage ); if ( posPage != -1 ) { if ( itPage != ( *it ).begin() ) @@ -715,9 +715,9 @@ void KPrDocument::saveEmbeddedObject(KPrPage *page, const TQPtrList<KoDocumentCh TQPtrListIterator<KoDocumentChild> chl( childList ); double offset = 0.0; // we need no offset for objects on the master page and when we copy a page - if ( m_pageList.tqfindRef( page ) ) + if ( m_pageList.findRef( page ) ) { - offset=m_pageList.tqfindRef(page)*page->getPageRect().height(); + offset=m_pageList.findRef(page)*page->getPageRect().height(); } for( ; chl.current(); ++chl ) saveEmbeddedObject(page, chl.current(),doc,presenter, offset ); @@ -890,7 +890,7 @@ TQDomElement KPrDocument::saveAttribute( TQDomDocument &doc ) int activePage=0; if ( m_initialActivePage ) - activePage=m_pageList.tqfindRef(m_initialActivePage); + activePage=m_pageList.findRef(m_initialActivePage); activePage = TQMAX( activePage, 0); attributes.setAttribute("activePage",activePage ); attributes.setAttribute("gridx", m_gridX ); @@ -907,7 +907,7 @@ TQDomElement KPrDocument::saveUsedSoundFileToXML( TQDomDocument &_doc, TQStringL TQStringList::Iterator it = _list.begin(); for ( ; it != _list.end(); ++it ) { TQString soundFileName = *it; - int position = soundFileName.tqfindRev( '.' ); + int position = soundFileName.findRev( '.' ); TQString format = soundFileName.right( soundFileName.length() - position - 1 ); TQString _name = TQString( "sounds/sound%1.%2" ).tqarg( ++i ).tqarg( format.lower() ); @@ -953,7 +953,7 @@ void KPrDocument::saveUsedSoundFileToStore( KoStore *_store, TQStringList _list TQStringList::Iterator it = _list.begin(); for ( ; it != _list.end(); ++it ) { TQString soundFileName = *it; - int position = soundFileName.tqfindRev( '.' ); + int position = soundFileName.findRev( '.' ); TQString format = soundFileName.right( soundFileName.length() - position - 1 ); TQString _storeURL = TQString( "sounds/sound%1.%2" ).tqarg( ++i ).tqarg( format.lower() ); @@ -1301,7 +1301,7 @@ void KPrDocument::saveOasisSettings( KoXmlWriter &settingsWriter ) //store first view parameter. int activePage=0; if ( m_initialActivePage ) - activePage=m_pageList.tqfindRef(m_initialActivePage); + activePage=m_pageList.findRef(m_initialActivePage); activePage = TQMAX( activePage, 0); settingsWriter.addConfigItem( "SelectedPage", activePage ); @@ -1406,7 +1406,7 @@ void KPrDocument::loadOasisPresentationCustomSlideShow( TQDomNode &settingsDoc ) TQValueList<KPrPage *> pageList; for ( TQStringList::Iterator it = tmp.begin(); it != tmp.end(); ++it ) { - if ( m_loadingInfo->m_name2page.tqcontains( *it ) ) + if ( m_loadingInfo->m_name2page.contains( *it ) ) { kdDebug(33001) << "slide show " << name << " page = " << *it << endl; pageList.push_back( m_loadingInfo->m_name2page[*it] ); @@ -1450,7 +1450,7 @@ void KPrDocument::saveOasisPresentationCustomSlideShow( KoXmlWriter &contentTmpW TQValueListIterator<KPrPage*> itPage ; for( itPage = ( *it ).begin(); itPage != ( *it ).end(); ++itPage ) { - int posPage = m_pageList.tqfind(*itPage ); + int posPage = m_pageList.find(*itPage ); if ( posPage != -1 ) { if ( itPage != ( *it ).begin() ) @@ -2314,7 +2314,7 @@ void KPrDocument::insertEmbedded( KoStore *store, TQDomElement topElem, KMacroCo kppartobject = 0L; return; } - int index = m_pageList.tqfindRef(page); + int index = m_pageList.findRef(page); int pageIndex = (int)(offset/__pgLayout.ptHeight)+index; int newPos=(int)((offset+index*__pgLayout.ptHeight)-pageIndex*__pgLayout.ptHeight); kppartobject->setOrig(kppartobject->getOrig().x(),newPos); @@ -2644,7 +2644,7 @@ bool KPrDocument::loadXML( const TQDomDocument &doc ) TQValueList<KPrPage *> pageList; for ( TQStringList::Iterator it = tmp.begin(); it != tmp.end(); ++it ) { - if ( name2page.tqcontains( *it ) ) + if ( name2page.contains( *it ) ) { kdDebug(33001) << "slide show " << slide.attribute( "name" ) << " page = " << *it << endl; pageList.push_back( name2page[*it] ); @@ -3225,7 +3225,7 @@ void KPrDocument::loadUsedSoundFileFromStore( KoStore *_store, TQStringList _lis char *data = new char[size]; dev.readBlock( data, size ); - int position = soundFile.tqfindRev( '.' ); + int position = soundFile.findRev( '.' ); TQString format = soundFile.right( soundFile.length() - position ); KTempFile *tmpFile = new KTempFile( TQString(), format ); tmpFile->setAutoDelete( true ); @@ -3391,13 +3391,13 @@ void KPrDocument::setEmpty() // If we then load a document, it will override that date. } -void KPrDocument::setGridValue( double _x, double _y, bool _tqreplace ) +void KPrDocument::setGridValue( double _x, double _y, bool _replace ) { oldGridX = m_gridX; oldGridY = m_gridY; m_gridX=_x; m_gridY=_y; - if ( _tqreplace ) + if ( _replace ) replaceObjs(); } @@ -3505,7 +3505,7 @@ void KPrDocument::deletePage( int _page ) void KPrDocument::insertPage( KPrPage *page, int currentPageNum, int insertPageNum ) { // check if page was allready deleted - int pos = m_deletedPageList.tqfindRef( page ); + int pos = m_deletedPageList.findRef( page ); if ( pos != -1 ) m_deletedPageList.take( pos ); @@ -3533,7 +3533,7 @@ void KPrDocument::insertPage( KPrPage *page, int currentPageNum, int insertPageN void KPrDocument::takePage( KPrPage *page, int pageNum ) { - int pos = m_pageList.tqfindRef( page ); + int pos = m_pageList.findRef( page ); m_pageList.take( pos ); m_deletedPageList.append( page ); @@ -3821,17 +3821,17 @@ void KPrDocument::makeUsedSoundFileList() TQPtrListIterator<KPrPage> it( m_pageList ); for ( ; it.current(); ++it ) { TQString _file = it.current()->getPageSoundFileName(); - if ( !_file.isEmpty() && usedSoundFile.tqfindIndex( _file ) == -1 ) + if ( !_file.isEmpty() && usedSoundFile.findIndex( _file ) == -1 ) usedSoundFile.append( _file ); TQPtrListIterator<KPrObject> oIt( it.current()->objectList() ); for ( ; oIt.current(); ++oIt ) { _file = oIt.current()->getAppearSoundEffectFileName(); - if ( !_file.isEmpty() && usedSoundFile.tqfindIndex( _file ) == -1 ) + if ( !_file.isEmpty() && usedSoundFile.findIndex( _file ) == -1 ) usedSoundFile.append( _file ); _file = oIt.current()->getDisappearSoundEffectFileName(); - if ( !_file.isEmpty() && usedSoundFile.tqfindIndex( _file ) == -1 ) + if ( !_file.isEmpty() && usedSoundFile.findIndex( _file ) == -1 ) usedSoundFile.append( _file ); } } @@ -3861,7 +3861,7 @@ void KPrDocument::paintContent( TQPainter& painter, const TQRect& rect, if( m_initialActivePage ) page = m_initialActivePage; - int pageNum = m_pageList.tqfindRef( page ); + int pageNum = m_pageList.findRef( page ); if ( page->displayBackground() ) page->background()->drawBackground( &painter, zoomHandler(), rect, false ); @@ -4009,7 +4009,7 @@ void KPrDocument::selectPage( int pgNum /* 0-based */, bool select ) KPrPage * KPrDocument::findPage(KPrObject *object) { TQPtrList<KPrObject> masterObjects( m_masterPage->objectList() ); - if ( masterObjects.tqfindRef( object ) != -1 ) + if ( masterObjects.findRef( object ) != -1 ) { //kdDebug(33001) << "Object is on the master page" << endl; return m_masterPage; @@ -4017,8 +4017,8 @@ KPrPage * KPrDocument::findPage(KPrObject *object) TQPtrListIterator<KPrPage> it( m_pageList ); for ( ; it.current(); ++it ) { TQPtrList<KPrObject> list( it.current()->objectList() ); - if ( list.tqfindRef( object ) != -1 ) { - //kdDebug(33001) << "Object is on page " << m_pageList.tqfindRef(it.current()) + 1 << endl; + if ( list.findRef( object ) != -1 ) { + //kdDebug(33001) << "Object is on page " << m_pageList.findRef(it.current()) + 1 << endl; return it.current(); } } @@ -4031,7 +4031,7 @@ KPrPage * KPrDocument::findPage(TQPtrList<KPrObject> &objects) KPrObject *object; for ( object = objects.first(); object; object=objects.next() ) { TQPtrList<KPrObject> list( m_masterPage->objectList() ); - if ( list.tqfindRef( object ) != -1 ) + if ( list.findRef( object ) != -1 ) { //kdDebug(33001) << "Object is on the master page" << endl; return m_masterPage; @@ -4040,8 +4040,8 @@ KPrPage * KPrDocument::findPage(TQPtrList<KPrObject> &objects) object = objects.first(); for ( KPrPage *page=m_pageList.first(); page; page=m_pageList.next() ) { TQPtrList<KPrObject> list( page->objectList() ); - if ( list.tqfindRef( object ) != -1 ) { - //kdDebug(33001) << "The Objects are on page " << m_pageList.tqfindRef(page) + 1 << endl; + if ( list.findRef( object ) != -1 ) { + //kdDebug(33001) << "The Objects are on page " << m_pageList.findRef(page) + 1 << endl; return page; } } @@ -4070,7 +4070,7 @@ TQValueList<int> KPrDocument::listOfDisplaySelectedSlides( const TQValueList<KPr TQValueListConstIterator<KPrPage*> itPageEnd = lst.end(); for( itPage = lst.begin() ; itPage != itPageEnd; ++itPage ) { - int pageNum = m_pageList.tqfind(*itPage ); + int pageNum = m_pageList.find(*itPage ); if ( pageNum != -1 ) { kdDebug()<<" KPrDocument::displaySelectedSlide : add slide number :"<<pageNum<<endl; @@ -4254,7 +4254,7 @@ void KPrDocument::insertObjectInPage(double offset, KPrObject *_obj, int pos) void KPrDocument::insertPixmapKey( KoPictureKey key ) { - if ( !usedPictures.tqcontains( key ) ) + if ( !usedPictures.contains( key ) ) usedPictures.append( key ); } @@ -4601,7 +4601,7 @@ void KPrDocument::setSpellCheckIgnoreList( const TQStringList& lst ) void KPrDocument::addSpellCheckIgnoreWord( const TQString & word ) { // ### missing: undo/redo support - if( m_spellCheckIgnoreList.tqfindIndex( word ) == -1 ) + if( m_spellCheckIgnoreList.findIndex( word ) == -1 ) m_spellCheckIgnoreList.append( word ); setSpellCheckIgnoreList( m_spellCheckIgnoreList ); } @@ -4777,7 +4777,7 @@ void KPrDocument::addWordToDictionary( const TQString & word) { if ( m_bgSpellCheck ) { - if( m_spellCheckPersonalDict.tqfindIndex( word ) == -1 ) + if( m_spellCheckPersonalDict.findIndex( word ) == -1 ) m_spellCheckPersonalDict.append( word ); m_bgSpellCheck->settings()->setCurrentIgnoreList( m_spellCheckIgnoreList + m_spellCheckPersonalDict ); if ( backgroundSpellCheckEnabled() ) diff --git a/kpresenter/KPrDocument.h b/kpresenter/KPrDocument.h index c472c3a3..f5921b65 100644 --- a/kpresenter/KPrDocument.h +++ b/kpresenter/KPrDocument.h @@ -189,7 +189,7 @@ class KPrDocument : public KoDocument void insertObjectInPage(double offset, KPrObject *_obj, int pos = -1); - void setGridValue( double rx, double ry, bool _tqreplace = true ); + void setGridValue( double rx, double ry, bool _replace = true ); // get - set options for editmodi TQColor txtBackCol() const { return _txtBackCol; } diff --git a/kpresenter/KPrEffectHandler.cpp b/kpresenter/KPrEffectHandler.cpp index a63ad1d2..acbdf7a7 100644 --- a/kpresenter/KPrEffectHandler.cpp +++ b/kpresenter/KPrEffectHandler.cpp @@ -1028,12 +1028,12 @@ void KPrEffectHandler::drawObject( KPrObject *object, int x, int y, TQPixmap *sc p.translate( -x, -y ); // redraw objects which lie above the currenty drawn - m_objects.tqfindRef( object ); + m_objects.findRef( object ); KPrObject *obj; while ( ( obj = m_objects.next() ) != 0 ) { if ( ( obj->getAppearStep() < m_step.m_step - || obj->getAppearStep() == m_step.m_step && !m_appearEffectObjects.tqcontainsRef( obj ) ) + || obj->getAppearStep() == m_step.m_step && !m_appearEffectObjects.containsRef( obj ) ) && ( ( obj->getDisappear() && obj->getDisappearStep() > m_step.m_step ) || ! obj->getDisappear() ) && m_view->zoomHandler()->zoomRect( obj->getRealRect()).intersects(*m_repaintRects.getLast()) ) { diff --git a/kpresenter/KPrFindReplace.h b/kpresenter/KPrFindReplace.h index 7754aa39..54ee6861 100644 --- a/kpresenter/KPrFindReplace.h +++ b/kpresenter/KPrFindReplace.h @@ -35,8 +35,8 @@ class KPrTextView; class KPrFindReplace; class KCommand; /** - * This class implements the 'tqfind' functionality ( the "search next, prompt" loop ) - * and the 'tqreplace' functionality. Same class, to allow centralizing the code that + * This class implements the 'find' functionality ( the "search next, prompt" loop ) + * and the 'replace' functionality. Same class, to allow centralizing the code that * finds the framesets and paragraphs to look into. */ class KPrFindReplace : public KoFindReplace diff --git a/kpresenter/KPrGotoPage.cpp b/kpresenter/KPrGotoPage.cpp index 6a3f8592..fb9ef42a 100644 --- a/kpresenter/KPrGotoPage.cpp +++ b/kpresenter/KPrGotoPage.cpp @@ -81,7 +81,7 @@ int KPrGotoPage::gotoPage( const KPrDocument *doc, int KPrGotoPage::page() const { if(result()==TQDialog::Accepted) - return spinbox->currentText().left( spinbox->currentText().tqfind( "-" ) - 1 ).toInt(); + return spinbox->currentText().left( spinbox->currentText().find( "-" ) - 1 ).toInt(); return oldPage; } diff --git a/kpresenter/KPrImportStyleDia.cpp b/kpresenter/KPrImportStyleDia.cpp index 72d3b9ab..f649ebc1 100644 --- a/kpresenter/KPrImportStyleDia.cpp +++ b/kpresenter/KPrImportStyleDia.cpp @@ -127,7 +127,7 @@ void KPrImportStyleDia::loadFile() unsigned int i=0; for( TQValueList<TQString>::Iterator it = followingStyles.begin(); it != followingStyles.end(); ++it ) { TQString newName =*it; - if ( insertStyle.tqcontains( *it ) ) + if ( insertStyle.contains( *it ) ) newName = (insertStyle)[ *it ]; KoParagStyle * style = m_styleList.findStyle(newName); diff --git a/kpresenter/KPrNoteBar.cpp b/kpresenter/KPrNoteBar.cpp index 9862e2c6..10048537 100644 --- a/kpresenter/KPrNoteBar.cpp +++ b/kpresenter/KPrNoteBar.cpp @@ -168,7 +168,7 @@ TQString KPrNoteBar::getNotesTextForPrinting(TQValueList<int> _list) const KPrDocument *doc=view->kPresenterDoc(); for ( int i = 0; i < static_cast<int>( doc->pageList().count() ); i++, ++pageCount ) { - if (_list.tqcontains(i+1)==0) // that slide isn't printed, don't print its note either + if (_list.contains(i+1)==0) // that slide isn't printed, don't print its note either continue; if ( !firstText ) diff --git a/kpresenter/KPrObject.cpp b/kpresenter/KPrObject.cpp index 8c0284a3..5a03896a 100644 --- a/kpresenter/KPrObject.cpp +++ b/kpresenter/KPrObject.cpp @@ -854,7 +854,7 @@ void KPrObject::loadOasis(const TQDomElement &element, KoOasisContext & context, styleStack.attributeNS( KoXmlNS::fo, "text-shadow" ) != "none" ) { TQString distance = styleStack.attributeNS( KoXmlNS::fo, "text-shadow" ); - distance.truncate( distance.tqfind( ' ' ) ); + distance.truncate( distance.find( ' ' ) ); shadowDistance = (int)KoUnit::parseValue( distance ); shadowDirection = SD_RIGHT_BOTTOM; shadowColor= TQColor("#a0a0a0" ); @@ -1244,9 +1244,9 @@ void KPrObject::rotateObject(TQPainter *paint,KoTextZoomHandler *_zoomHandler) paint->setWorldMatrix( m, true ); } -bool KPrObject::tqcontains( const KoPoint &point ) const +bool KPrObject::contains( const KoPoint &point ) const { - return getRealRect().tqcontains( point ); + return getRealRect().contains( point ); } bool KPrObject::intersects( const KoRect &rect ) const diff --git a/kpresenter/KPrObject.h b/kpresenter/KPrObject.h index 598373ea..7b39be50 100644 --- a/kpresenter/KPrObject.h +++ b/kpresenter/KPrObject.h @@ -250,7 +250,7 @@ public: * @return true if point lies in rect of object * @return false otherwise */ - virtual bool tqcontains( const KoPoint &point ) const; + virtual bool contains( const KoPoint &point ) const; /** * @brief Check if rect intersects with rect of object @@ -289,8 +289,8 @@ public: /** * Collect all textobjects. - * (KPrTextObject returns the object it tqcontains, - * a KPrGroupObject returns all the text objects it tqcontains) + * (KPrTextObject returns the object it contains, + * a KPrGroupObject returns all the text objects it contains) */ virtual void addTextObjects( TQPtrList<KoTextObject> & ) const {} diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp index b357ded9..df4ca0fc 100644 --- a/kpresenter/KPrPage.cpp +++ b/kpresenter/KPrPage.cpp @@ -114,7 +114,7 @@ DCOPObject* KPrPage::dcopObject() if ( !m_dcop ) { // 0-based. 1-based would be nicer for the dcop user, but well, docs and views are 0-based, // and the page(int) DCOP call is 0-based. - int pgnum = m_doc->pageList().tqfindRef( this ); + int pgnum = m_doc->pageList().findRef( this ); m_dcop = new KPrPageIface( this, pgnum ); } @@ -152,7 +152,7 @@ void KPrPage::saveOasisObject( KoStore *store, KoXmlWriter &xmlWriter, KoSavingC lstappear->objIndex = indexObj; lstappear->appear = true; //kdDebug()<<" indexObj :"<<indexObj<<endl; - lstMap::Iterator tmp = listObjectAnimation.tqfind( it.current()->getAppearStep() ); + lstMap::Iterator tmp = listObjectAnimation.find( it.current()->getAppearStep() ); if ( tmp!= listObjectAnimation.end() ) { //kdDebug()<<" group already exist \n"; @@ -173,7 +173,7 @@ void KPrPage::saveOasisObject( KoStore *store, KoXmlWriter &xmlWriter, KoSavingC lstappear->objIndex = indexObj; lstappear->appear = false; //kdDebug()<<" indexObj :"<<indexObj<<endl; - lstMap::Iterator tmp = listObjectAnimation.tqfind( it.current()->getDisappearStep() ); + lstMap::Iterator tmp = listObjectAnimation.find( it.current()->getDisappearStep() ); if ( tmp!= listObjectAnimation.end() ) { //kdDebug()<<" group already exist \n"; @@ -563,7 +563,7 @@ bool KPrPage::saveOasisPage( KoStore *store, KoXmlWriter &xmlWriter, int posPage TQString drawName( m_manualTitle ); TQRegExp rx( "^page[0-9]+$" ); - if ( drawName.isEmpty() || pageNames.tqcontains( drawName ) || rx.search( drawName ) != -1 ) + if ( drawName.isEmpty() || pageNames.contains( drawName ) || rx.search( drawName ) != -1 ) { drawName = "page" + TQString::number( posPage ); } @@ -927,7 +927,7 @@ void KPrPage::appendObjects( const TQValueList<KPrObject *> &objects ) objectName.remove( rx ); } - if ( usedPageNames.tqcontains( objectName ) ) + if ( usedPageNames.contains( objectName ) ) { usedPageNames[objectName]++; objectName += TQString(" (%1)").tqarg( usedPageNames[objectName] ); @@ -939,7 +939,7 @@ void KPrPage::appendObjects( const TQValueList<KPrObject *> &objects ) int KPrPage::takeObject( KPrObject *object ) { - int pos = m_objectList.tqfindRef( object ); + int pos = m_objectList.findRef( object ); m_objectList.take( pos ); return pos; } @@ -947,7 +947,7 @@ int KPrPage::takeObject( KPrObject *object ) void KPrPage::replaceObject( KPrObject *oldObject, KPrObject *newObject ) { //XXX check if object name gets set - unsigned int pos = m_objectList.tqfindRef( oldObject ); + unsigned int pos = m_objectList.findRef( oldObject ); m_objectList.take( pos ); m_objectList.insert( pos, newObject ); } @@ -988,7 +988,7 @@ void KPrPage::copyObjs(TQDomDocument &doc, TQDomElement &presenter, TQValueList< if ( it.current()->getType() == OT_PICTURE ) { KoPictureKey key = static_cast<KPrPixmapObject *>( it.current() )->getKey(); - if ( !savePictures.tqcontains( key ) ) + if ( !savePictures.contains( key ) ) savePictures.append( key ); } TQDomElement object=doc.createElement("OBJECT"); @@ -1779,7 +1779,7 @@ void KPrPage::completeLoading( bool _clean, int lastObj ) // get the picture from the collection, and set it in the image/clipart object if ( ( it.current()->getType() == OT_PICTURE ) || ( it.current()->getType() == OT_CLIPART ) ) { - if ( _clean || m_objectList.tqfindRef( it.current() ) > lastObj ) + if ( _clean || m_objectList.findRef( it.current() ) > lastObj ) { KPrPixmapObject* obj=dynamic_cast<KPrPixmapObject*>( it.current()); if(obj) @@ -1883,7 +1883,7 @@ TQString KPrPage::pageTitle( const TQString &_title ) const { // MASTERPAGE if ( m_masterPage ) - title = i18n( "Slide %1" ).tqarg( m_doc->pageList().tqfindRef( this ) + 1 ); + title = i18n( "Slide %1" ).tqarg( m_doc->pageList().findRef( this ) + 1 ); else title = i18n( "Slide Master" ); } @@ -2314,7 +2314,7 @@ KPrObject * KPrPage::getCursor(const KoPoint &pos ) TQPtrListIterator<KPrObject> it( m_objectList ); KPrObject *kpobject = it.toLast(); while ( kpobject ) { - if ( kpobject->tqcontains( pos ) && kpobject->isSelected() ) + if ( kpobject->contains( pos ) && kpobject->isSelected() ) return kpobject; kpobject = --it; } @@ -2336,7 +2336,7 @@ KPrObject* KPrPage::getObjectAt( const KoPoint &pos, bool withoutProtected ) con ( m_bHasHeader && o == m_doc->header() ) ) { if ( ( o->isSelected() || i > 0 ) && - o->tqcontains( pos ) && !( o->isProtect() && withoutProtected ) ) + o->contains( pos ) && !( o->isProtect() && withoutProtected ) ) return o; } o = --it; @@ -2458,7 +2458,7 @@ KPrObject *KPrPage::nextTextObject(KPrTextObject *obj) return 0L; int pos = -1; if ( obj ) - pos = m_objectList.tqfindNextRef(obj); + pos = m_objectList.findNextRef(obj); if (pos != -1 ) { @@ -2485,7 +2485,7 @@ KPrObject *KPrPage::nextTextObject(KPrTextObject *obj) bool KPrPage::findTextObject( KPrObject *obj ) { - return (m_objectList.tqfindRef( obj )>=0 ); + return (m_objectList.findRef( obj )>=0 ); } void KPrPage::getAllObjectSelectedList(TQPtrList<KPrObject> &lst, bool force ) diff --git a/kpresenter/KPrPixmapObject.cpp b/kpresenter/KPrPixmapObject.cpp index d64c5b60..0a4c8921 100644 --- a/kpresenter/KPrPixmapObject.cpp +++ b/kpresenter/KPrPixmapObject.cpp @@ -359,7 +359,7 @@ void KPrPixmapObject::loadOasis(const TQDomElement &element, KoOasisContext & co if ( !href.isEmpty() /*&& href[0] == '#'*/ ) { TQString strExtension; - const int result=href.tqfindRev("."); + const int result=href.findRev("."); if (result>=0) { strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. @@ -416,12 +416,12 @@ double KPrPixmapObject::load(const TQDomElement &element) _fileName=e.attribute("filename"); if ( !_fileName.isEmpty() ) { - if ( int _envVarB = _fileName.tqfind( '$' ) >= 0 ) + if ( int _envVarB = _fileName.find( '$' ) >= 0 ) { - int _envVarE = _fileName.tqfind( '/', _envVarB ); + int _envVarE = _fileName.find( '/', _envVarB ); // ### FIXME: it should be TQString::local8Bit instead of TQFile::encodeName, shouldn't it? TQString path = getenv( TQFile::encodeName(_fileName.mid( _envVarB, _envVarE-_envVarB )) ); - _fileName.tqreplace( _envVarB-1, _envVarE-_envVarB+1, path ); + _fileName.replace( _envVarB-1, _envVarE-_envVarB+1, path ); } } diff --git a/kpresenter/KPrSideBar.cpp b/kpresenter/KPrSideBar.cpp index 51db3f4e..a1077a17 100644 --- a/kpresenter/KPrSideBar.cpp +++ b/kpresenter/KPrSideBar.cpp @@ -60,7 +60,7 @@ TQValidator::State KPrRenamePageValidator::validate( TQString & input, int& ) co if ( str.isEmpty() ) // we want to allow empty titles. Empty == automatic. return Acceptable; - if ( mStringList.tqfind( str ) == mStringList.end() ) + if ( mStringList.find( str ) == mStringList.end() ) return Acceptable; else return Intermediate; @@ -208,7 +208,7 @@ void KPrSideBar::updateItem( KPrPage *page ) } else { - pos = m_doc->pageList().tqfindRef( page ); + pos = m_doc->pageList().findRef( page ); } m_outline->updateItem( pos, sticky ); @@ -277,7 +277,7 @@ void KPrThumbBar::setCurrentPage( int pg ) TQRect KPrThumbBar::tip(const TQPoint &pos, TQString &title) { - TQIconViewItem *item = tqfindItem(viewportToContents(pos)); + TQIconViewItem *item = findItem(viewportToContents(pos)); if (!item) return TQRect(0, 0, -1, -1); @@ -363,7 +363,7 @@ void KPrThumbBar::refreshItems(bool offset) else vRect.moveBy( contentsX(), contentsY() ); - TQIconViewItem *it = tqfindFirstVisibleItem( vRect ); + TQIconViewItem *it = findFirstVisibleItem( vRect ); while ( it ) { kdDebug(33001) << "visible page = " << it->text().toInt() << endl; @@ -373,7 +373,7 @@ void KPrThumbBar::refreshItems(bool offset) static_cast<ThumbItem *>(it)->setUptodate( true ); } - if ( it == tqfindLastVisibleItem( vRect ) ) + if ( it == findLastVisibleItem( vRect ) ) break; it = it->nextItem(); } @@ -397,7 +397,7 @@ void KPrThumbBar::updateItem( int pagenr /* 0-based */, bool sticky ) TQIconViewItem *it = firstItem(); do { - if ( it == tqfindFirstVisibleItem( vRect ) ) { + if ( it == findFirstVisibleItem( vRect ) ) { do { if ( sticky || it->text().toInt() == pagenr + 1 ) { @@ -407,7 +407,7 @@ void KPrThumbBar::updateItem( int pagenr /* 0-based */, bool sticky ) if ( !sticky ) return; } - if ( it == tqfindLastVisibleItem( vRect ) ) + if ( it == findLastVisibleItem( vRect ) ) break; pagecnt++; it = it->nextItem(); @@ -911,7 +911,7 @@ void KPrOutline::itemClicked( TQListViewItem *item ) KPrPage* page = slideItem->page(); if( !page ) return; if ( !m_viewMasterPage ) - emit showPage( m_doc->pageList().tqfindRef( page ) ); + emit showPage( m_doc->pageList().findRef( page ) ); } // check if we need to show chosen object @@ -928,7 +928,7 @@ void KPrOutline::itemClicked( TQListViewItem *item ) KPrPage* page = slideItem->page(); if( !page ) return; if ( !m_viewMasterPage ) - emit showPage( m_doc->pageList().tqfindRef( page ) ); + emit showPage( m_doc->pageList().findRef( page ) ); } // select the object, make sure it's visible @@ -1010,7 +1010,7 @@ void KPrOutline::moveItem( TQListViewItem *i, TQListViewItem *, TQListViewItem * if ( !srcItem ) return; - int num = m_doc->pageList().tqfindRef( srcItem->page() ); + int num = m_doc->pageList().findRef( srcItem->page() ); int numNow = 0; if ( newAfter ) @@ -1019,7 +1019,7 @@ void KPrOutline::moveItem( TQListViewItem *i, TQListViewItem *, TQListViewItem * if( !dstItem ) return; - numNow = m_doc->pageList().tqfindRef( dstItem->page() ); + numNow = m_doc->pageList().findRef( dstItem->page() ); if ( numNow < num ) numNow++; } diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp index c696a8e5..06b5d5df 100644 --- a/kpresenter/KPrTextObject.cpp +++ b/kpresenter/KPrTextObject.cpp @@ -872,7 +872,7 @@ KoTextFormat KPrTextObject::loadFormat( TQDomElement &n, KoTextFormat * refForma { TQFontDatabase fdb; TQStringList families = fdb.tqfamilies(); - if ( families.tqfindIndex( n.attribute( attrFamily ) ) != -1 ) + if ( families.findIndex( n.attribute( attrFamily ) ) != -1 ) fn.setFamily( n.attribute( attrFamily ) ); else fn = defaultFont; @@ -1258,7 +1258,7 @@ void KPrTextObject::saveParagLayout( const KoParagLayout& tqlayout, TQDomElement void KPrTextObject::recalcPageNum( KPrPage *page ) { - int pgnum=m_doc->pageList().tqfindRef(page); + int pgnum=m_doc->pageList().findRef(page); pgnum+=1; TQPtrListIterator<KoTextCustomItem> cit( textDocument()->allCustomItems() ); @@ -1472,7 +1472,7 @@ void KPrTextObject::highlightPortion( KoTextParag * parag, int index, int length // ** slow method ** KPrPage* page = doc->findPage( this ); if ( page ) { - int pageNum = doc->pageList().tqfindRef( page ); + int pageNum = doc->pageList().findRef( page ); // if the pageNum is -1 the object is located on the master slide if ( pageNum > -1 ) { diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index 9577bc7d..f3bc053d 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -2255,7 +2255,7 @@ void KPrView::createGUI() KPrPage *initPage=m_pKPresenterDoc->initialActivePage(); if ( !initPage ) m_pKPresenterDoc->pageList().at( 0 ); // first page - skipToPage( m_pKPresenterDoc->pageList().tqfindRef( initPage ) ); + skipToPage( m_pKPresenterDoc->pageList().findRef( initPage ) ); } void KPrView::initGui() @@ -2338,10 +2338,10 @@ void KPrView::setupActions() TQT_TQOBJECT(this), TQT_SLOT( editDelPage() ), actionCollection(), "edit_delpage" ); - actionEditFind=KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( editFind() ), actionCollection(), "edit_tqfind" ); + actionEditFind=KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( editFind() ), actionCollection(), "edit_find" ); actionEditFindNext = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( editFindNext() ), actionCollection(), "edit_findnext" ); actionEditFindPrevious = KStdAction::findPrev( TQT_TQOBJECT(this), TQT_SLOT( editFindPrevious() ), actionCollection(), "edit_findprevious" ); - actionEditReplace=KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( editReplace() ), actionCollection(), "edit_tqreplace" ); + actionEditReplace=KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( editReplace() ), actionCollection(), "edit_replace" ); // ---------------- View actions @@ -3368,7 +3368,7 @@ void KPrView::recalcCurrentPageNum() TQPtrList<KPrPage> pageList( m_pKPresenterDoc->pageList() ); - int pos = pageList.tqfindRef( activePage ); + int pos = pageList.findRef( activePage ); if ( pos != -1 ) { @@ -3873,7 +3873,7 @@ void KPrView::showObjectRect( const KPrObject * object ) if ( ! TQRect( getCanvas()->diffx(), getCanvas()->diffy(), getCanvas()->width(), - getCanvas()->height() ).tqcontains( r ) ) + getCanvas()->height() ).contains( r ) ) { int x = r.left() - 20; int y = r.top() - 20; @@ -4396,7 +4396,7 @@ void KPrView::insertLink() if ( edit->textObject()->hasSelection() ) { TQString selectedText = edit->textObject()->selectedText(); - if ( edit->textObject()->selectionHasCustomItems() || selectedText.tqcontains('\n') ) + if ( edit->textObject()->selectionHasCustomItems() || selectedText.contains('\n') ) return; if ( selectedText.startsWith( "mailto:/" ) || selectedText.startsWith( "ftp:/" ) || @@ -4595,7 +4595,7 @@ void KPrView::startKSpell() m_spell.dlg->activeAutoCorrect( true ); TQObject::connect( m_spell.dlg, TQT_SIGNAL(misspelling(const TQString&, int)), TQT_TQOBJECT(this), TQT_SLOT(spellCheckerMisspelling(const TQString&, int)) ); - TQObject::connect( m_spell.dlg, TQT_SIGNAL(tqreplace(const TQString&, int, const TQString&)), + TQObject::connect( m_spell.dlg, TQT_SIGNAL(replace(const TQString&, int, const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(spellCheckerCorrected(const TQString&, int, const TQString&)) ); TQObject::connect( m_spell.dlg, TQT_SIGNAL(done(const TQString&) ), TQT_TQOBJECT(this), TQT_SLOT(spellCheckerDone(const TQString&)) ); @@ -4878,7 +4878,7 @@ void KPrView::refreshCustomMenu() if ( var->type() == VT_CUSTOM ) { varName=( (KoCustomVariable*) var )->name(); - if ( !lst.tqcontains( varName) ) + if ( !lst.contains( varName) ) { lst.append( varName ); TQCString name = TQString("custom-action_%1").tqarg(i).latin1(); @@ -4993,7 +4993,7 @@ void KPrView::insertVariable() if ( edit ) { KAction * act = (KAction *)(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))); - VariableDefMap::ConstIterator it = m_variableDefMap.tqfind( act ); + VariableDefMap::ConstIterator it = m_variableDefMap.find( act ); if ( it == m_variableDefMap.end() ) kdWarning(33001) << "Action not found in m_variableDefMap." << endl; else @@ -5140,7 +5140,7 @@ void KPrView::editFind() KPrTextView * edit = m_canvas->currentTextObjectView(); bool hasSelection = edit && (edit->kpTextObject())->textObject()->hasSelection(); bool hasCursor = edit != 0; - KoSearchDia dialog( m_canvas, "tqfind", m_searchEntry, hasSelection, hasCursor ); + KoSearchDia dialog( m_canvas, "find", m_searchEntry, hasSelection, hasCursor ); /// KoFindReplace needs a TQValueList<KoTextObject *>... TQValueList<KoTextObject *> list; @@ -5170,7 +5170,7 @@ void KPrView::editReplace() KPrTextView * edit = m_canvas->currentTextObjectView(); bool hasSelection = edit && (edit->kpTextObject())->textObject()->hasSelection(); bool hasCursor = edit != 0; - KoReplaceDia dialog( m_canvas, "tqreplace", m_searchEntry, m_replaceEntry, hasSelection, hasCursor ); + KoReplaceDia dialog( m_canvas, "replace", m_searchEntry, m_replaceEntry, hasSelection, hasCursor ); /// KoFindReplace needs a TQValueList<KoTextObject *>... TQValueList<KoTextObject *> list; @@ -5233,12 +5233,12 @@ void KPrView::changeZoomMenu( int zoom ) regexp.search(*it); const int val=regexp.cap(1).toInt(&ok); //zoom : limit inferior=10 - if(ok && val>9 && list.tqcontains(val)==0) + if(ok && val>9 && list.contains(val)==0) list.append( val ); } //necessary at the beginning when we read config //this value is not in combo list - if(list.tqcontains(zoom)==0) + if(list.contains(zoom)==0) list.append( zoom ); qHeapSort( list ); @@ -5268,13 +5268,13 @@ void KPrView::showZoom( int zoom ) { TQStringList list = actionViewZoom->items(); TQString zoomStr( i18n("%1%").tqarg( zoom ) ); - int pos = list.tqfindIndex(zoomStr); + int pos = list.findIndex(zoomStr); if( pos == -1) { changeZoomMenu( zoom ); list = actionViewZoom->items(); } - actionViewZoom->setCurrentItem( list.tqfindIndex(zoomStr) ); + actionViewZoom->setCurrentItem( list.findIndex(zoomStr) ); } void KPrView::viewZoom( const TQString &s ) @@ -5455,7 +5455,7 @@ void KPrView::updateStyleList() TQString currentStyle = actionFormatStyle->currentText(); // Generate list of styles const TQStringList lst = m_pKPresenterDoc->styleCollection()->displayNameList(); - const int pos = lst.tqfindIndex( currentStyle ); + const int pos = lst.findIndex( currentStyle ); // Fill the combo - using a KSelectAction actionFormatStyle->setItems( lst ); if ( pos > -1 ) @@ -6000,7 +6000,7 @@ void KPrView::applyAutoFormat() { m_pKPresenterDoc->getAutoFormat()->readConfig(); KMacroCommand *macro = 0L; - m_switchPage=m_pKPresenterDoc->pageList().tqfindRef(m_canvas->activePage()); + m_switchPage=m_pKPresenterDoc->pageList().findRef(m_canvas->activePage()); m_initSwitchPage=m_switchPage; TQPtrList<KoTextObject> list=m_canvas->activePage()->allTextObjects(); @@ -6369,7 +6369,7 @@ TQPtrList<KAction> KPrView::listOfResultOfCheckWord( const TQString &word ) TQPtrList<KAction> listAction; DefaultDictionary *dict = m_broker->defaultDictionary(); TQStringList lst = dict->suggest( word ); - if ( !lst.tqcontains( word )) + if ( !lst.contains( word )) { TQStringList::ConstIterator it = lst.begin(); for ( int i = 0; it != lst.end() ; ++it, ++i ) diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp index 78afb783..957e07f2 100644 --- a/kpresenter/KPrWebPresentation.cpp +++ b/kpresenter/KPrWebPresentation.cpp @@ -367,7 +367,7 @@ void KPrWebPresentation::writeStartOfHeader(TQTextStream& streamOut, TQTextCodec // Eliminate the dollar signs // (We don't want that the version number changes if the HTML file is itself put in a CVS storage.) streamOut << "<meta name=\"Generator\" content=\"KPresenter's Web Presentation " - << strVersion.mid(10).tqreplace("$","") + << strVersion.mid(10).replace("$","") << "\""<< ( isXML() ?" /":"") // X(HT)ML closes empty elements, HTML not! << ">\n"; @@ -498,7 +498,7 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar ) streamOut << " <b>" << escapeHtmlText( codec, i18n( "Note" ) ) << "</b>\n"; streamOut << " <blockquote>\n"; - streamOut << note.tqreplace( "\n", brtag ); + streamOut << note.replace( "\n", brtag ); streamOut << " </blockquote><hr noshade=\"noshade\"" << ( isXML() ?" /":"") << ">\n"; } diff --git a/kpresenter/autoformEdit/ATFInterpreter.cpp b/kpresenter/autoformEdit/ATFInterpreter.cpp index ff2b1037..5f010518 100644 --- a/kpresenter/autoformEdit/ATFInterpreter.cpp +++ b/kpresenter/autoformEdit/ATFInterpreter.cpp @@ -304,7 +304,7 @@ void ATFInterpreter::interpret() } break; case VAR_VARIA: { - if ((*it).tqfind('0') != -1) v = false; + if ((*it).find('0') != -1) v = false; else v = true; attrib.isVariable = (*it); } break; diff --git a/kspread/Doxyfile b/kspread/Doxyfile index 33244f7f..54f1fb39 100644 --- a/kspread/Doxyfile +++ b/kspread/Doxyfile @@ -74,7 +74,7 @@ REPEAT_BRIEF = YES # as the annotated text. Otherwise, the brief description is used as-is. If left # blank, the following values are used ("$name" is automatically replaced with the # name of the entity): "The $name class" "The $name widget" "The $name file" -# "is" "provides" "specifies" "tqcontains" "represents" "a" "an" "the" +# "is" "provides" "specifies" "contains" "represents" "a" "an" "the" ABBREVIATE_BRIEF = diff --git a/kspread/KSpreadViewIface.cc b/kspread/KSpreadViewIface.cc index fab646f9..4b7f2a66 100644 --- a/kspread/KSpreadViewIface.cc +++ b/kspread/KSpreadViewIface.cc @@ -87,14 +87,14 @@ void ViewIface::show() m_view->show(); } -void ViewIface::tqfind() +void ViewIface::find() { - m_view->tqfind(); + m_view->find(); } -void ViewIface::tqreplace() +void ViewIface::replace() { - m_view->tqreplace(); + m_view->replace(); } void ViewIface::conditional() diff --git a/kspread/KSpreadViewIface.h b/kspread/KSpreadViewIface.h index 090e8967..385c23f3 100644 --- a/kspread/KSpreadViewIface.h +++ b/kspread/KSpreadViewIface.h @@ -55,8 +55,8 @@ k_dcop: virtual void setSelection(TQRect selection); virtual TQRect selection(); - virtual void tqfind(); - virtual void tqreplace(); + virtual void find(); + virtual void replace(); virtual void conditional(); virtual void validity(); virtual void insertSeries(); diff --git a/kspread/OASIS.txt b/kspread/OASIS.txt index d85e8779..d0dfb9d5 100644 --- a/kspread/OASIS.txt +++ b/kspread/OASIS.txt @@ -96,7 +96,7 @@ rich text will be converted to simple plain text. Link may not fully compatible since KSpread can only link the whole cell, not partial text. For example, if the text is "Visit the website" where only the string "website" is a hyperlink to an URL, in KSpread the whole string -"Visit the website" becomes the link. Consequently, if the text tqcontains +"Visit the website" becomes the link. Consequently, if the text contains two or more links, only the first link will be used. (I will fixe when we convert it to kotext) diff --git a/kspread/dependencies.cc b/kspread/dependencies.cc index 7f7c986f..66bbe61a 100644 --- a/kspread/dependencies.cc +++ b/kspread/dependencies.cc @@ -92,7 +92,7 @@ class DependencyList { RangeList computeDependencies (const Point &cell) const; TQValueList<Point> getCellDeps(const Point& cell) const { - CellDepsMap::const_iterator it = cellDeps.tqfind( cell ); + CellDepsMap::const_iterator it = cellDeps.find( cell ); return it == cellDeps.end() ? TQValueList<Point>() : *it; } @@ -231,7 +231,7 @@ RangeList DependencyList::getDependencies (const Point &cell) { RangeList rl; //look if the cell has any dependencies - if (!dependencies.tqcontains (cell)) + if (!dependencies.contains (cell)) return rl; //it doesn't - return an empty list //the cell does have dependencies - return them! @@ -253,7 +253,7 @@ TQValueList<Point> DependencyList::getDependants (const Point &cell) { //process all range dependencies, and for each range including the questioned cell, //add the depending cell to the list - if ((*it).range.tqcontains (cell)) + if ((*it).range.contains (cell)) { Point c; c.setRow ((*it).cellrow); @@ -272,7 +272,7 @@ void DependencyList::areaModified (const TQString &name) // basically means that all cells referencing this area should be treated // as modified - that will retrieve updated area ranges and also update // everything as necessary ... - if (!areaDeps.tqcontains (name)) + if (!areaDeps.contains (name)) return; TQMap<Point, bool>::iterator it; @@ -323,7 +323,7 @@ void DependencyList::addRangeDependency (const RangeDependency &rd) void DependencyList::removeDependencies (const Point &cell) { //look if the cell has any dependencies - if (!dependencies.tqcontains (cell)) + if (!dependencies.contains (cell)) return; //it doesn't - nothing more to do //first we remove cell-dependencies @@ -336,12 +336,12 @@ void DependencyList::removeDependencies (const Point &cell) if (!sh) sh = sheet; - if (!sh->dependencies()->deps->cellDeps.tqcontains (*it1)) + if (!sh->dependencies()->deps->cellDeps.contains (*it1)) continue; //this should never happen //we no longer depend on this cell TQValueList<Point>::iterator cit; - cit = sh->dependencies()->deps->cellDeps[*it1].tqfind (cell); + cit = sh->dependencies()->deps->cellDeps[*it1].find (cell); if (cit != sh->dependencies()->deps->cellDeps[*it1].end()) sh->dependencies()->deps->cellDeps[*it1].erase (cit); } @@ -356,7 +356,7 @@ void DependencyList::removeDependencies (const Point &cell) //with lists generated from all previous ranges (duplicates are removed) TQValueList<Point> leadings = leadingCells (*it2); for (it1 = leadings.begin(); it1 != leadings.end(); ++it1) - if (!leads.tqcontains (*it1)) + if (!leads.contains (*it1)) leads.push_back (*it1); } for (it1 = leads.begin(); it1 != leads.end(); ++it1) @@ -366,7 +366,7 @@ void DependencyList::removeDependencies (const Point &cell) if (!sh) sh = sheet; - if (sh->dependencies()->deps->rangeDeps.tqcontains (*it1)) + if (sh->dependencies()->deps->rangeDeps.contains (*it1)) { TQValueList<RangeDependency>::iterator it3; it3 = sh->dependencies()->deps->rangeDeps[*it1].begin(); @@ -386,7 +386,7 @@ void DependencyList::removeDependencies (const Point &cell) // remove information about named area dependencies TQMap<TQString, TQMap<Point, bool> >::iterator itr; for (itr = areaDeps.begin(); itr != areaDeps.end(); ++itr) { - if (itr.data().tqcontains (cell)) + if (itr.data().contains (cell)) itr.data().remove (cell); } @@ -481,7 +481,7 @@ void DependencyList::processRangeDependencies (const Point &cell) { //process all range dependencies, and for each range including the modified cell, //recalc the depending cell - if ((*it).range.tqcontains (cell)) + if ((*it).range.contains (cell)) { Point c; c.setRow ((*it).cellrow); diff --git a/kspread/dialogs/kspread_dlg_cons.cc b/kspread/dialogs/kspread_dlg_cons.cc index ca049ee1..16b0ebbb 100644 --- a/kspread/dialogs/kspread_dlg_cons.cc +++ b/kspread/dialogs/kspread_dlg_cons.cc @@ -302,7 +302,7 @@ void ConsolidateDialog::slotOk() if ( c ) { TQString s = c->value().asString(); - if ( !lst.tqcontains( s ) ) + if ( !lst.contains( s ) ) lst.append( s ); } } @@ -384,7 +384,7 @@ void ConsolidateDialog::slotOk() if ( c ) { TQString s = c->value().asString(); - if ( !s.isEmpty() && lst.tqfind( s ) == lst.end() ) + if ( !s.isEmpty() && lst.find( s ) == lst.end() ) lst.append( s ); } } @@ -467,7 +467,7 @@ void ConsolidateDialog::slotOk() if ( c ) { TQString s = c->value().asString(); - if ( !s.isEmpty() && cols.tqfind( s ) == cols.end() ) + if ( !s.isEmpty() && cols.find( s ) == cols.end() ) cols.append( s ); } } @@ -487,7 +487,7 @@ void ConsolidateDialog::slotOk() if ( c ) { TQString s = c->value().asString(); - if ( !s.isEmpty() && rows.tqfind( s ) == rows.end() ) + if ( !s.isEmpty() && rows.find( s ) == rows.end() ) rows.append( s ); } } diff --git a/kspread/dialogs/kspread_dlg_database.cc b/kspread/dialogs/kspread_dlg_database.cc index 1bca7c85..7aa5dfa9 100644 --- a/kspread/dialogs/kspread_dlg_database.cc +++ b/kspread/dialogs/kspread_dlg_database.cc @@ -944,18 +944,18 @@ TQString DatabaseDialog::getWhereCondition(TQString const & column, TQString DatabaseDialog::exchangeWildcards(TQString const & value) { TQString str(value); - int p = str.tqfind('*'); + int p = str.find('*'); while ( p > -1 ) { - str = str.tqreplace( p, 1, "%" ); - p = str.tqfind('*'); + str = str.replace( p, 1, "%" ); + p = str.find('*'); } - p = str.tqfind('?'); + p = str.find('?'); while ( p > -1 ) { - str = str.tqreplace( p, 1, "_" ); - p = str.tqfind('?'); + str = str.replace( p, 1, "_" ); + p = str.find('?'); } return str; } @@ -964,8 +964,8 @@ bool DatabaseDialog::optionsDoNext() { if ( m_operator_1->currentItem() == 4 ) { - if ( ( m_operatorValue_1->text().tqfind('*') != -1 ) - || ( m_operatorValue_1->text().tqfind('?') != -1 ) ) + if ( ( m_operatorValue_1->text().find('*') != -1 ) + || ( m_operatorValue_1->text().find('?') != -1 ) ) { // xgettext: no-c-format int res = KMessageBox::warningYesNo( this, i18n("'*' or '?' are not valid wildcards in SQL. " @@ -978,8 +978,8 @@ bool DatabaseDialog::optionsDoNext() if ( m_operator_2->currentItem() == 4 ) { - if ( ( m_operatorValue_2->text().tqfind('*') != -1 ) - || ( m_operatorValue_2->text().tqfind('?') != -1 ) ) + if ( ( m_operatorValue_2->text().find('*') != -1 ) + || ( m_operatorValue_2->text().find('?') != -1 ) ) { // xgettext: no-c-format int res = KMessageBox::warningYesNo( this, i18n("'*' or '?' are not valid wildcards in SQL. " @@ -992,8 +992,8 @@ bool DatabaseDialog::optionsDoNext() if ( m_operator_3->currentItem() == 4 ) { - if ( ( m_operatorValue_3->text().tqfind('*') != -1 ) - || ( m_operatorValue_3->text().tqfind('?') != -1 ) ) + if ( ( m_operatorValue_3->text().find('*') != -1 ) + || ( m_operatorValue_3->text().find('?') != -1 ) ) { // xgettext: no-c-format int res = KMessageBox::warningYesNo( this, i18n("'*' or '?' are not valid wildcards in SQL. " diff --git a/kspread/dialogs/kspread_dlg_formula.cc b/kspread/dialogs/kspread_dlg_formula.cc index 0981a4e7..d8d7e9d7 100644 --- a/kspread/dialogs/kspread_dlg_formula.cc +++ b/kspread/dialogs/kspread_dlg_formula.cc @@ -224,8 +224,8 @@ FormulaDialog::FormulaDialog( View* tqparent, const char* name,const TQString& f // Was a function name passed along with the constructor ? Then activate it. if( !formulaName.isEmpty() ) { - functions->setCurrentItem( functions->index( functions->tqfindItem( formulaName ) ) ); - slotDoubleClicked( functions->tqfindItem( formulaName ) ); + functions->setCurrentItem( functions->index( functions->findItem( formulaName ) ) ); + slotDoubleClicked( functions->findItem( formulaName ) ); } else { @@ -266,7 +266,7 @@ void FormulaDialog::slotSearchText(const TQString &_text) { TQString result = listFunct.makeCompletion( _text.upper() ); if( !result.isNull() ) - functions->setCurrentItem( functions->index( functions->tqfindItem( result ) ) ); + functions->setCurrentItem( functions->index( functions->findItem( result ) ) ); } bool FormulaDialog::eventFilter( TQObject* obj, TQEvent* ev ) @@ -364,7 +364,7 @@ void FormulaDialog::slotSelectButton() { if( functions->currentItem() != -1 ) { - slotDoubleClicked(functions->tqfindItem(functions->text(functions->currentItem()))); + slotDoubleClicked(functions->findItem(functions->text(functions->currentItem()))); } } @@ -473,10 +473,10 @@ TQString FormulaDialog::createParameter( const TQString& _text, int param ) TQString tmp = _text; int pos; int start = 1; - while( ( pos = tmp.tqfind( '"', start ) ) != -1 ) + while( ( pos = tmp.find( '"', start ) ) != -1 ) { if (tmp[pos - 1] != '\\') - tmp.tqreplace( pos, 1, "\\\"" ); + tmp.replace( pos, 1, "\\\"" ); else start = pos + 1; } @@ -497,10 +497,10 @@ TQString FormulaDialog::createParameter( const TQString& _text, int param ) TQString tmp = _text; int pos; int start = 1; - while( ( pos = tmp.tqfind( '"', start ) ) != -1 ) + while( ( pos = tmp.find( '"', start ) ) != -1 ) { if (tmp[pos - 1] != '\\') - tmp.tqreplace( pos, 1, "\\\"" ); + tmp.replace( pos, 1, "\\\"" ); else start = pos + 1; } @@ -712,7 +712,7 @@ void FormulaDialog::slotShowFunction( const TQString& function ) slotActivated( category ); // select the function - TQListBoxItem* item = functions->tqfindItem( function, + TQListBoxItem* item = functions->findItem( function, TQt::ExactMatch | TQt::CaseSensitive ); if( item ) functions->setCurrentItem( item ); diff --git a/kspread/dialogs/kspread_dlg_layout.cc b/kspread/dialogs/kspread_dlg_layout.cc index fcbb734e..8c21d75a 100644 --- a/kspread/dialogs/kspread_dlg_layout.cc +++ b/kspread/dialogs/kspread_dlg_layout.cc @@ -1976,13 +1976,13 @@ CellFormatPageFont::CellFormatPageFont( TQWidget* tqparent, CellFormatDialog *_d selFont.setFamily( dlg->textFontFamily ); kdDebug(36001) << "Family = " << dlg->textFontFamily << endl; - if ( !family_combo->tqfindItem(dlg->textFontFamily)) + if ( !family_combo->findItem(dlg->textFontFamily)) { family_combo->insertItem("",0); family_combo->setCurrentItem(0); } else - family_combo->setCurrentItem(family_combo->index(family_combo->tqfindItem(dlg->textFontFamily))); + family_combo->setCurrentItem(family_combo->index(family_combo->findItem(dlg->textFontFamily))); } else { @@ -3361,7 +3361,7 @@ void CellFormatPageBorder::slotPressEvent(TQMouseEvent *_ev) TQRect rect(OFFSETX,OFFSETY-8,area->width()-OFFSETX,OFFSETY+8); - if (rect.tqcontains(TQPoint(_ev->x(),_ev->y()))) + if (rect.contains(TQPoint(_ev->x(),_ev->y()))) { if (((top->getPenWidth()!=preview->getPenWidth()) || (top->getColor()!=currentColor) || @@ -3378,7 +3378,7 @@ void CellFormatPageBorder::slotPressEvent(TQMouseEvent *_ev) } rect.setCoords(OFFSETX,area->height()-OFFSETY-8,area->width()-OFFSETX, area->height()-OFFSETY+8); - if (rect.tqcontains(TQPoint(_ev->x(),_ev->y()))) + if (rect.contains(TQPoint(_ev->x(),_ev->y()))) { if (((bottom->getPenWidth()!=preview->getPenWidth()) || (bottom->getColor()!=currentColor) || @@ -3395,7 +3395,7 @@ void CellFormatPageBorder::slotPressEvent(TQMouseEvent *_ev) } rect.setCoords(OFFSETX-8,OFFSETY,OFFSETX+8,area->height()-OFFSETY); - if (rect.tqcontains(TQPoint(_ev->x(),_ev->y()))) + if (rect.contains(TQPoint(_ev->x(),_ev->y()))) { if (((left->getPenWidth()!=preview->getPenWidth()) || (left->getColor()!=currentColor) || @@ -3412,7 +3412,7 @@ void CellFormatPageBorder::slotPressEvent(TQMouseEvent *_ev) } rect.setCoords(area->width()-OFFSETX-8,OFFSETY,area->width()-OFFSETX+8, area->height()-OFFSETY); - if (rect.tqcontains(TQPoint(_ev->x(),_ev->y()))) + if (rect.contains(TQPoint(_ev->x(),_ev->y()))) { if (((right->getPenWidth()!=preview->getPenWidth()) || (right->getColor()!=currentColor) || @@ -3431,12 +3431,12 @@ void CellFormatPageBorder::slotPressEvent(TQMouseEvent *_ev) //don't work because I don't know how create a rectangle //for diagonal /*rect.setCoords(OFFSETX,OFFSETY,XLEN-OFFSETX,YHEI-OFFSETY); -if (rect.tqcontains(TQPoint(_ev->x(),_ev->y()))) +if (rect.contains(TQPoint(_ev->x(),_ev->y()))) { invertState(fallDiagonal); } rect.setCoords(OFFSETX,YHEI-OFFSETY,XLEN-OFFSETX,OFFSETY); -if (rect.tqcontains(TQPoint(_ev->x(),_ev->y()))) +if (rect.contains(TQPoint(_ev->x(),_ev->y()))) { invertState(goUpDiagonal); } */ @@ -3446,7 +3446,7 @@ if (rect.tqcontains(TQPoint(_ev->x(),_ev->y()))) rect.setCoords(area->width()/2-8,OFFSETY,area->width()/2+8, area->height()-OFFSETY); - if (rect.tqcontains(TQPoint(_ev->x(),_ev->y()))) + if (rect.contains(TQPoint(_ev->x(),_ev->y()))) { if (((vertical->getPenWidth()!=preview->getPenWidth()) || (vertical->getColor()!=currentColor) || @@ -3466,7 +3466,7 @@ if (rect.tqcontains(TQPoint(_ev->x(),_ev->y()))) { rect.setCoords(OFFSETX,area->height()/2-8,area->width()-OFFSETX, area->height()/2+8); - if (rect.tqcontains(TQPoint(_ev->x(),_ev->y()))) + if (rect.contains(TQPoint(_ev->x(),_ev->y()))) { if (((horizontal->getPenWidth()!=preview->getPenWidth()) || (horizontal->getColor()!=currentColor) || diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cc b/kspread/dialogs/kspread_dlg_paperlayout.cc index 6c277be6..c6b52c15 100644 --- a/kspread/dialogs/kspread_dlg_paperlayout.cc +++ b/kspread/dialogs/kspread_dlg_paperlayout.cc @@ -331,7 +331,7 @@ void PaperLayout::slotOk() else { bool error = true; - int first = tmpPrintRange.tqfind(":"); + int first = tmpPrintRange.find(":"); if ( ( first != -1 ) && ( (int)tmpPrintRange.length() > first ) ) { Point point1 ( tmpPrintRange.left( first ) ); @@ -359,7 +359,7 @@ void PaperLayout::slotOk() else { bool error = true; - int first = tmpRepeatCols.tqfind(":"); + int first = tmpRepeatCols.find(":"); if ( ( first != -1 ) && ( (int)tmpRepeatCols.length() > first ) ) { int col1 = util_decodeColumnLabelText( tmpRepeatCols.left( first ) ); @@ -385,7 +385,7 @@ void PaperLayout::slotOk() else { bool error = true; - int first = tmpRepeatRows.tqfind(":"); + int first = tmpRepeatRows.find(":"); if ( ( first != -1 ) && ( (int)tmpRepeatRows.length() > first ) ) { int row1 = tmpRepeatRows.left( first ).toInt(); @@ -411,7 +411,7 @@ void PaperLayout::slotOk() { kdDebug() << "New zoom is different than original: " << m_cZoom->currentText() << endl; TQString zoomtext = m_cZoom->currentText(); - zoomtext.tqreplace("%",""); + zoomtext.replace("%",""); bool convertok = false; double zoomvalue = zoomtext.toDouble(&convertok); if (!convertok) diff --git a/kspread/dialogs/kspread_dlg_reference.cc b/kspread/dialogs/kspread_dlg_reference.cc index 1fbb55e3..8f315ca5 100644 --- a/kspread/dialogs/kspread_dlg_reference.cc +++ b/kspread/dialogs/kspread_dlg_reference.cc @@ -91,7 +91,7 @@ reference::reference( View* tqparent, const char* name ) for ( it = area.begin(); it != area.end(); ++it ) { text = (*it).ref_name; - if ( sheetName.tqcontains((*it).sheet_name )) + if ( sheetName.contains((*it).sheet_name )) m_list->insertItem(text); } diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc index 3b94da54..17beca41 100644 --- a/kspread/dialogs/kspread_dlg_sort.cc +++ b/kspread/dialogs/kspread_dlg_sort.cc @@ -574,7 +574,7 @@ void SortDialog::slotOk() int h = outputPoint.pos().y() + sortArea.height(); int w = outputPoint.pos().x() + sortArea.width(); - if ( sortArea.tqcontains(outputPoint.pos()) + if ( sortArea.contains(outputPoint.pos()) || ( w >= sortArea.left() && w <= sortArea.right() ) || ( h >= sortArea.top() && h <= sortArea.bottom() ) ) { diff --git a/kspread/dialogs/kspread_dlg_styles.cc b/kspread/dialogs/kspread_dlg_styles.cc index 818581f6..6a8e0fae 100644 --- a/kspread/dialogs/kspread_dlg_styles.cc +++ b/kspread/dialogs/kspread_dlg_styles.cc @@ -111,13 +111,13 @@ void StyleDlg::fillComboBox() while ( entries.count() != count ) { - if ( entries.tqfind( iter.data() ) == entries.end() ) + if ( entries.find( iter.data() ) == entries.end() ) { if ( iter.data()->tqparent() == 0 ) entries[iter.data()] = new KListViewItem( m_dlg->m_styleList, iter.data()->name() ); else { - Map::const_iterator i = entries.tqfind( iter.data()->tqparent() ); + Map::const_iterator i = entries.find( iter.data()->tqparent() ); if ( i != entries.end() ) entries[iter.data()] = new KListViewItem( i.data(), iter.data()->name() ); } diff --git a/kspread/dialogs/kspread_dlg_subtotal.cc b/kspread/dialogs/kspread_dlg_subtotal.cc index 696821cb..a2771642 100644 --- a/kspread/dialogs/kspread_dlg_subtotal.cc +++ b/kspread/dialogs/kspread_dlg_subtotal.cc @@ -206,7 +206,7 @@ void SubtotalDialog::removeSubtotalLines() continue; text = cell->text(); - if ( text.tqfind( "SUBTOTAL" ) != -1 ) + if ( text.find( "SUBTOTAL" ) != -1 ) { containsSubtotal = true; break; diff --git a/kspread/dialogs/link.cc b/kspread/dialogs/link.cc index 0e115e01..aba1a170 100644 --- a/kspread/dialogs/link.cc +++ b/kspread/dialogs/link.cc @@ -165,23 +165,23 @@ TQString LinkDialog::link() const case 0: str = d->internetLink->text(); if( !str.isEmpty() ) - if( str.tqfind( "http://" )==-1 ) - if( str.tqfind( "https://" )==-1 ) - if( str.tqfind( "ftp://" )==-1 ) + if( str.find( "http://" )==-1 ) + if( str.find( "https://" )==-1 ) + if( str.find( "ftp://" )==-1 ) str.prepend( "http://" ); break; case 1: str = d->mailLink->text(); if( !str.isEmpty() ) - if( str.tqfind( "mailto:" )==-1 ) + if( str.find( "mailto:" )==-1 ) str.prepend( "mailto:" ); break; case 2: str = d->fileLink->lineEdit()->text(); if( !str.isEmpty() ) - if( str.tqfind( "file:/" )==-1 ) + if( str.find( "file:/" )==-1 ) str.prepend( "file://" ); break; diff --git a/kspread/formula.cc b/kspread/formula.cc index efeec46e..1e42867a 100644 --- a/kspread/formula.cc +++ b/kspread/formula.cc @@ -267,7 +267,7 @@ Token::Op Token::asOperator() const TQString Token::sheetName() const { if( !isCell() && !isRange() ) return TQString(); - int i = m_text.tqfind( '!' ); + int i = m_text.find( '!' ); if( i < 0 ) return TQString(); TQString sheet = m_text.left( i ); return sheet; diff --git a/kspread/formula.h b/kspread/formula.h index 8a1e2f03..8ece47c5 100644 --- a/kspread/formula.h +++ b/kspread/formula.h @@ -280,7 +280,7 @@ class Formula void clear(); /** - * Returns true if the specified expression is valid, i.e. it tqcontains + * Returns true if the specified expression is valid, i.e. it contains * no parsing error. * Empty formula (i.e. without expression) is always invalid. */ diff --git a/kspread/functions.cc b/kspread/functions.cc index 0cc0dd98..de55f7e5 100644 --- a/kspread/functions.cc +++ b/kspread/functions.cc @@ -242,12 +242,12 @@ void FunctionRepository::add( Function* function ) Function *FunctionRepository::function (const TQString& name) { - return d->functions.tqfind (name.upper()); + return d->functions.find (name.upper()); } FunctionDescription *FunctionRepository::functionInfo (const TQString& name) { - return d->funcs.tqfind (name.upper()); + return d->funcs.find (name.upper()); } // returns names of function in certain group @@ -299,7 +299,7 @@ void FunctionRepository::loadFile (const TQString& filename) { FunctionDescription* desc = new FunctionDescription( e2 ); desc->setGroup (group); - if (d->functions.tqfind (desc->name())) + if (d->functions.find (desc->name())) d->funcs.insert (desc->name(), desc); } } diff --git a/kspread/ksploadinginfo.h b/kspread/ksploadinginfo.h index 0c5aed03..4ca95632 100644 --- a/kspread/ksploadinginfo.h +++ b/kspread/ksploadinginfo.h @@ -36,7 +36,7 @@ public: KSPLoadingInfo() { m_loadTemplate = false;} ~KSPLoadingInfo() {} void addWordInAreaList( const TQString & word) { m_areaNamed.append( word ); } - bool findWordInAreaList(const TQString & word) const { return (m_areaNamed.tqfind( word ) != m_areaNamed.end());} + bool findWordInAreaList(const TQString & word) const { return (m_areaNamed.find( word ) != m_areaNamed.end());} void appendValidation( const TQString &name, const TQDomElement &element){ m_validationList.insert( name, element);} TQDomElement validation( const TQString &name) { return m_validationList[name];} diff --git a/kspread/kspread_autofill.cc b/kspread/kspread_autofill.cc index 8a84e904..38cca433 100644 --- a/kspread/kspread_autofill.cc +++ b/kspread/kspread_autofill.cc @@ -206,38 +206,38 @@ AutoFillSequenceItem::AutoFillSequenceItem( const TQString &_str ) other=new TQStringList(config->readListEntry("Other list")); } - if ( month->tqfind( _str ) != month->end() ) + if ( month->find( _str ) != month->end() ) { m_Type = MONTH; return; } - if ( shortMonth->tqfind( _str ) != shortMonth->end() ) + if ( shortMonth->find( _str ) != shortMonth->end() ) { m_Type = SHORTMONTH; return; } - if ( day->tqfind( _str ) != day->end() ) + if ( day->find( _str ) != day->end() ) { m_Type = DAY; return; } - if ( shortDay->tqfind( _str ) != shortDay->end() ) + if ( shortDay->find( _str ) != shortDay->end() ) { m_Type = SHORTDAY; return; } - if( other->tqfind(_str)!=other->end()) + if( other->find(_str)!=other->end()) { m_Type = OTHER; m_OtherBegin=0; m_OtherEnd=other->count(); - int index= other->tqfindIndex(_str); + int index= other->findIndex(_str); //find end and begin of qstringlist of other. - for ( TQStringList::Iterator it = other->tqfind(_str); it != other->end();++it ) + for ( TQStringList::Iterator it = other->find(_str); it != other->end();++it ) { if((*it)=="\\") { @@ -246,8 +246,8 @@ AutoFillSequenceItem::AutoFillSequenceItem( const TQString &_str ) } index++; } - index= other->tqfindIndex(_str); - for ( TQStringList::Iterator it = other->tqfind(_str); it != other->begin();--it ) + index= other->findIndex(_str); + for ( TQStringList::Iterator it = other->find(_str); it != other->begin();--it ) { if((*it)=="\\") { @@ -286,8 +286,8 @@ bool AutoFillSequenceItem::getDelta( AutoFillSequenceItem *seq, double &_delta ) return false; case MONTH: { - int i = month->tqfindIndex( m_String ); - int j = month->tqfindIndex( seq->getString() ); + int i = month->findIndex( m_String ); + int j = month->findIndex( seq->getString() ); int k = j; if ( j + 1 == i ) @@ -299,8 +299,8 @@ bool AutoFillSequenceItem::getDelta( AutoFillSequenceItem *seq, double &_delta ) case SHORTMONTH: { - int i = shortMonth->tqfindIndex( m_String ); - int j = shortMonth->tqfindIndex( seq->getString() ); + int i = shortMonth->findIndex( m_String ); + int j = shortMonth->findIndex( seq->getString() ); int k = j; if ( j + 1 == i ) @@ -312,8 +312,8 @@ bool AutoFillSequenceItem::getDelta( AutoFillSequenceItem *seq, double &_delta ) case DAY: { - int i = day->tqfindIndex( m_String ); - int j = day->tqfindIndex( seq->getString() ); + int i = day->findIndex( m_String ); + int j = day->findIndex( seq->getString() ); int k = j; if ( j + 1 == i ) @@ -326,8 +326,8 @@ bool AutoFillSequenceItem::getDelta( AutoFillSequenceItem *seq, double &_delta ) case SHORTDAY: { - int i = shortDay->tqfindIndex( m_String ); - int j = shortDay->tqfindIndex( seq->getString() ); + int i = shortDay->findIndex( m_String ); + int j = shortDay->findIndex( seq->getString() ); int k = j; if ( j + 1 == i ) @@ -340,8 +340,8 @@ bool AutoFillSequenceItem::getDelta( AutoFillSequenceItem *seq, double &_delta ) { if( m_OtherEnd!= seq->getIOtherEnd() || m_OtherBegin!= seq->getIOtherBegin()) return false; - int i = other->tqfindIndex( m_String ); - int j = other->tqfindIndex( seq->getString() ); + int i = other->findIndex( m_String ); + int j = other->findIndex( seq->getString() ); int k = j; if ( j < i ) k += (m_OtherEnd - m_OtherBegin - 1); @@ -373,7 +373,7 @@ TQString AutoFillSequenceItem::getSuccessor( int _no, double _delta ) break; case MONTH: { - int i = month->tqfindIndex( m_String ); + int i = month->findIndex( m_String ); int j = i + _no * (int) _delta; while (j < 0) j += month->count(); @@ -383,7 +383,7 @@ TQString AutoFillSequenceItem::getSuccessor( int _no, double _delta ) break; case SHORTMONTH: { - int i = shortMonth->tqfindIndex( m_String ); + int i = shortMonth->findIndex( m_String ); int j = i + _no * (int) _delta; while (j < 0) j += shortMonth->count(); @@ -393,7 +393,7 @@ TQString AutoFillSequenceItem::getSuccessor( int _no, double _delta ) break; case DAY: { - int i = day->tqfindIndex( m_String ); + int i = day->findIndex( m_String ); int j = i + _no * (int) _delta; while (j < 0) j += day->count(); @@ -403,7 +403,7 @@ TQString AutoFillSequenceItem::getSuccessor( int _no, double _delta ) break; case SHORTDAY: { - int i = shortDay->tqfindIndex( m_String ); + int i = shortDay->findIndex( m_String ); int j = i + _no * (int) _delta; while (j < 0) j += shortDay->count(); @@ -413,7 +413,7 @@ TQString AutoFillSequenceItem::getSuccessor( int _no, double _delta ) break; case OTHER: { - int i = other->tqfindIndex( m_String )-(m_OtherBegin+1); + int i = other->findIndex( m_String )-(m_OtherBegin+1); int j = i + _no * (int) _delta; int k = j % (m_OtherEnd - m_OtherBegin-1); erg = (*other->at( (k+m_OtherBegin+1) )); @@ -444,7 +444,7 @@ TQString AutoFillSequenceItem::getPredecessor( int _no, double _delta ) break; case MONTH: { - int i = month->tqfindIndex( m_String ); + int i = month->findIndex( m_String ); int j = i - _no * (int) _delta; while ( j < 0 ) j += month->count(); @@ -454,7 +454,7 @@ TQString AutoFillSequenceItem::getPredecessor( int _no, double _delta ) break; case SHORTMONTH: { - int i = shortMonth->tqfindIndex( m_String ); + int i = shortMonth->findIndex( m_String ); int j = i - _no * (int) _delta; while ( j < 0 ) j += shortMonth->count(); @@ -464,7 +464,7 @@ TQString AutoFillSequenceItem::getPredecessor( int _no, double _delta ) break; case DAY: { - int i = day->tqfindIndex( m_String ); + int i = day->findIndex( m_String ); int j = i - _no * (int) _delta; while ( j < 0 ) j += day->count(); @@ -474,7 +474,7 @@ TQString AutoFillSequenceItem::getPredecessor( int _no, double _delta ) break; case SHORTDAY: { - int i = shortDay->tqfindIndex( m_String ); + int i = shortDay->findIndex( m_String ); int j = i - _no * (int) _delta; while ( j < 0 ) j += shortDay->count(); @@ -484,7 +484,7 @@ TQString AutoFillSequenceItem::getPredecessor( int _no, double _delta ) break; case OTHER: { - int i = other->tqfindIndex( m_String ) - (m_OtherBegin + 1); + int i = other->findIndex( m_String ) - (m_OtherBegin + 1); int j = i - _no * (int) _delta; while ( j < 0 ) j += (m_OtherEnd - m_OtherBegin - 1); @@ -1130,7 +1130,7 @@ void Sheet::FillSequenceWithCopy(TQPtrList<Cell>& _srcList, { // FIXME this is a workaround to avoid those nasty one minute off // "dragging down" time is inaccurate overa large lists! - // This is the best approximation I could tqfind (raphael) + // This is the best approximation I could find (raphael) if (down) { // factor = 1.000002/24. + 0.000000001; @@ -1153,24 +1153,24 @@ void Sheet::FillSequenceWithCopy(TQPtrList<Cell>& _srcList, ++incr; } else if((AutoFillSequenceItem::month != 0L) - && AutoFillSequenceItem::month->tqfind( _srcList.at( s )->text()) != 0L - && AutoFillSequenceItem::month->tqfind( _srcList.at( s )->text()) != AutoFillSequenceItem::month->end() + && AutoFillSequenceItem::month->find( _srcList.at( s )->text()) != 0L + && AutoFillSequenceItem::month->find( _srcList.at( s )->text()) != AutoFillSequenceItem::month->end() && _srcList.count() == 1) { TQString strMonth=_srcList.at( s )->text(); - int i = AutoFillSequenceItem::month->tqfindIndex( strMonth )+incr; + int i = AutoFillSequenceItem::month->findIndex( strMonth )+incr; int k = (i) % AutoFillSequenceItem::month->count(); cell->setCellText((*AutoFillSequenceItem::month->at( k ))); incr++; } else if(AutoFillSequenceItem::day != 0L - && AutoFillSequenceItem::day->tqfind( _srcList.at( s )->text()) != 0L - && AutoFillSequenceItem::day->tqfind( _srcList.at( s )->text()) + && AutoFillSequenceItem::day->find( _srcList.at( s )->text()) != 0L + && AutoFillSequenceItem::day->find( _srcList.at( s )->text()) != AutoFillSequenceItem::day->end() && _srcList.count()==1) { TQString strDay=_srcList.at( s )->text(); - int i = AutoFillSequenceItem::day->tqfindIndex( strDay )+incr; + int i = AutoFillSequenceItem::day->findIndex( strDay )+incr; int k = (i) % AutoFillSequenceItem::day->count(); cell->setCellText((*AutoFillSequenceItem::day->at( k ))); incr++; @@ -1183,7 +1183,7 @@ void Sheet::FillSequenceWithCopy(TQPtrList<Cell>& _srcList, { TQString tmp=number.cap(1); int num=tmp.toInt()+incr; - cell->setCellText(_srcList.at( s )->text().tqreplace(number,TQString::number(num))); + cell->setCellText(_srcList.at( s )->text().replace(number,TQString::number(num))); ++incr; } else if ( !_srcList.at( s )->link().isEmpty() ) diff --git a/kspread/kspread_canvas.cc b/kspread/kspread_canvas.cc index 96d4836a..a6411621 100644 --- a/kspread/kspread_canvas.cc +++ b/kspread/kspread_canvas.cc @@ -566,7 +566,7 @@ void Canvas::validateSelection() TQString t; do { - i = message.tqfind( "\n", pos ); + i = message.find( "\n", pos ); if ( i == -1 ) t = message.mid( pos, message.length() - pos ); else @@ -1110,7 +1110,7 @@ void Canvas::mouseMoveEvent( TQMouseEvent * _ev ) // Test wether mouse is over the selection handle TQRect selectionHandle = d->view->selectionInfo()->selectionHandleArea(); - if ( selectionHandle.tqcontains( TQPoint( d->view->doc()->zoomItX( ev_PosX ), + if ( selectionHandle.contains( TQPoint( d->view->doc()->zoomItX( ev_PosX ), d->view->doc()->zoomItY( ev_PosY ) ) ) ) { //If the cursor is over the handle, than it might be already on the next cell. @@ -1131,8 +1131,8 @@ void Canvas::mouseMoveEvent( TQMouseEvent * _ev ) if ( !sheet->isProtected() ) setCursor( KCursor::handCursor() ); } - else if ( r1.tqcontains( TQPoint( (int) ev_PosX, (int) ev_PosY ) ) - && !r2.tqcontains( TQPoint( (int) ev_PosX, (int) ev_PosY ) ) ) + else if ( r1.contains( TQPoint( (int) ev_PosX, (int) ev_PosY ) ) + && !r2.contains( TQPoint( (int) ev_PosX, (int) ev_PosY ) ) ) { setCursor( KCursor::handCursor() ); } @@ -1246,7 +1246,7 @@ void Canvas::processClickSelectionHandle( TQMouseEvent *event ) void Canvas::processLeftClickAnchor() { bool isRefLink = localReferenceAnchor( d->anchor ); - bool isLocalLink = (d->anchor.tqfind("file:") == 0); + bool isLocalLink = (d->anchor.find("file:") == 0); if ( !isRefLink ) { TQString type=KMimeType::findByURL(d->anchor, 0, isLocalLink)->name(); @@ -1296,7 +1296,7 @@ bool Canvas::highlightRangeSizeGripAt(double x, double y) ( 6 ), ( 6 ) ); - if (handle.tqcontains(TQPoint((int) x,(int) y))) + if (handle.contains(TQPoint((int) x,(int) y))) { return true; } @@ -1428,7 +1428,7 @@ void Canvas::mousePressEvent( TQMouseEvent * _ev ) d->scrollTimer->start( 50 ); // Did we click in the lower right corner of the marker/marked-area ? - if ( selectionInfo()->selectionHandleArea().tqcontains( TQPoint( d->view->doc()->zoomItX( ev_PosX ), + if ( selectionInfo()->selectionHandleArea().contains( TQPoint( d->view->doc()->zoomItX( ev_PosX ), d->view->doc()->zoomItY( ev_PosY ) ) ) ) { processClickSelectionHandle( _ev ); @@ -1462,8 +1462,8 @@ void Canvas::mousePressEvent( TQMouseEvent * _ev ) d->dragStart.setX( -1 ); - if ( r1.tqcontains( TQPoint( (int) ev_PosX, (int) ev_PosY ) ) - && !r2.tqcontains( TQPoint( (int) ev_PosX, (int) ev_PosY ) ) ) + if ( r1.contains( TQPoint( (int) ev_PosX, (int) ev_PosY ) ) + && !r2.contains( TQPoint( (int) ev_PosX, (int) ev_PosY ) ) ) { d->dragStart.setX( (int) ev_PosX ); d->dragStart.setY( (int) ev_PosY ); @@ -1543,7 +1543,7 @@ void Canvas::mousePressEvent( TQMouseEvent * _ev ) } break; case Qt::RightButton: - if (!selectionInfo()->tqcontains( TQPoint( col, row ) )) + if (!selectionInfo()->contains( TQPoint( col, row ) )) { // No selection or the mouse press was outside of an existing selection? (d->chooseCell ? choice() : selectionInfo())->initialize(TQPoint(col,row), activeSheet()); @@ -1738,7 +1738,7 @@ void Canvas::dragMoveEvent( TQDragMoveEvent * _ev ) double ev_PosY = d->view->doc()->unzoomItY( _ev->pos().y() ) + yOffset(); - if ( r1.tqcontains( TQPoint ((int) ev_PosX, (int) ev_PosY) ) ) + if ( r1.contains( TQPoint ((int) ev_PosX, (int) ev_PosY) ) ) _ev->ignore( r1 ); } @@ -1776,7 +1776,7 @@ void Canvas::dropEvent( TQDropEvent * _ev ) double ev_PosY = d->view->doc()->unzoomItY( _ev->pos().y() ) + yOffset(); - if ( r1.tqcontains( TQPoint ((int) ev_PosX, (int) ev_PosY) ) ) + if ( r1.contains( TQPoint ((int) ev_PosX, (int) ev_PosY) ) ) { _ev->ignore( ); return; @@ -3239,14 +3239,14 @@ void Canvas::speakCell(TQWidget* w, const TQPoint& p, uint flags) // Try to format the formula so synth can more clearly speak it. TQString f2; for (uint i = 0; i < f.length(); i++) f2 += f[i] + " "; - f2.tqreplace("(", i18n("character (", "left paren")); - f2.tqreplace(")", i18n("character )", "right paren")); - f2.tqreplace(":", i18n("character :", "colon")); - f2.tqreplace(";", i18n("character ;", "semicolon")); - f2.tqreplace("=", i18n("character =", "equals")); - f2.tqreplace(".", i18n("character .", "point")); - f2.tqreplace(",", i18n("character ,", "comma")); - f2.tqreplace(" . . ", i18n("characters ..", " dot dot ")); + f2.replace("(", i18n("character (", "left paren")); + f2.replace(")", i18n("character )", "right paren")); + f2.replace(":", i18n("character :", "colon")); + f2.replace(";", i18n("character ;", "semicolon")); + f2.replace("=", i18n("character =", "equals")); + f2.replace(".", i18n("character .", "point")); + f2.replace(",", i18n("character ,", "comma")); + f2.replace(" . . ", i18n("characters ..", " dot dot ")); text.append(i18n("Spreadsheet formula", " Formula ") + f2); } // kdDebug() << "Canvas::speakCell: text = " << text << endl; @@ -3295,7 +3295,7 @@ KSpread::EmbeddedObject *Canvas::getObject( const TQPoint &pos, Sheet *_sheet ) bound.width(), bound.height() ) ); zoomedBound.moveBy( (int)( -xOffset() * doc()->zoomedResolutionX() ), (int)( -yOffset() * doc()->zoomedResolutionY() ) ); - if ( zoomedBound.tqcontains( p ) ) + if ( zoomedBound.contains( p ) ) return itObject.current(); } } @@ -3636,7 +3636,7 @@ void Canvas::displayObjectList( TQPtrList<EmbeddedObject> &list ) { // it can happen that the object is no longer there e.g. when // the insert of the object is undone - int pos = doc()->embeddedObjects().tqfindRef( d->m_objectDisplayAbove ); + int pos = doc()->embeddedObjects().findRef( d->m_objectDisplayAbove ); if ( pos != -1 && d->m_objectDisplayAbove->isSelected() ) { list.take( pos ); @@ -3679,8 +3679,8 @@ void Canvas::deleteEditor (bool saveChanges, bool array) if ( t.at(0)=='=' ) { //a formula - int openParenthese = t.tqcontains('(' ); - int closeParenthese = t.tqcontains(')' ); + int openParenthese = t.contains('(' ); + int closeParenthese = t.contains(')' ); int diff = TQABS( openParenthese - closeParenthese ); if ( openParenthese > closeParenthese ) { @@ -4732,7 +4732,7 @@ void VBorder::mousePressEvent( TQMouseEvent * _ev ) m_iSelectionAnchor = hit_row; - if ( !m_pView->selectionInfo()->tqcontains( TQPoint(1, hit_row) ) || + if ( !m_pView->selectionInfo()->contains( TQPoint(1, hit_row) ) || !( _ev->button() == Qt::RightButton ) || !m_pView->selectionInfo()->isRowSelected() ) { @@ -4796,7 +4796,7 @@ void VBorder::mouseReleaseEvent( TQMouseEvent * _ev ) rect.setCoords( 1, m_iResizedRow, KS_colMax, m_iResizedRow ); if ( m_pView->selectionInfo()->isRowSelected() ) { - if ( m_pView->selectionInfo()->tqcontains( TQPoint( 1, m_iResizedRow ) ) ) + if ( m_pView->selectionInfo()->contains( TQPoint( 1, m_iResizedRow ) ) ) { start = m_pView->selectionInfo()->lastRange().top(); end = m_pView->selectionInfo()->lastRange().bottom(); @@ -5348,7 +5348,7 @@ void HBorder::mousePressEvent( TQMouseEvent * _ev ) m_iSelectionAnchor = hit_col; - if ( !m_pView->selectionInfo()->tqcontains( TQPoint( hit_col, 1 ) ) || + if ( !m_pView->selectionInfo()->contains( TQPoint( hit_col, 1 ) ) || !( _ev->button() == Qt::RightButton ) || !m_pView->selectionInfo()->isColumnSelected() ) { @@ -5413,7 +5413,7 @@ void HBorder::mouseReleaseEvent( TQMouseEvent * _ev ) rect.setCoords( m_iResizedColumn, 1, m_iResizedColumn, KS_rowMax ); if ( m_pView->selectionInfo()->isColumnSelected() ) { - if ( m_pView->selectionInfo()->tqcontains( TQPoint( m_iResizedColumn, 1 ) ) ) + if ( m_pView->selectionInfo()->contains( TQPoint( m_iResizedColumn, 1 ) ) ) { start = m_pView->selectionInfo()->lastRange().left(); end = m_pView->selectionInfo()->lastRange().right(); @@ -6093,7 +6093,7 @@ void ToolTip::maybeTip( const TQPoint& p ) v ); marker = m_canvas->doc()->zoomRect( unzoomedMarker ); - insideMarker = marker.tqcontains( p ); + insideMarker = marker.contains( p ); } else { @@ -6103,7 +6103,7 @@ void ToolTip::maybeTip( const TQPoint& p ) v ); marker = m_canvas->doc()->zoomRect( unzoomedMarker ); - insideMarker = marker.tqcontains( p ); + insideMarker = marker.contains( p ); } // No use if mouse is somewhere else diff --git a/kspread/kspread_cell.cc b/kspread/kspread_cell.cc index c3c520f8..a0ae2073 100644 --- a/kspread/kspread_cell.cc +++ b/kspread/kspread_cell.cc @@ -1326,7 +1326,7 @@ void Cell::makeLayout( TQPainter &_painter, int _col, int _row ) && format()->multiRow( _col, _row ) ) { // Copy of d->strOutText but without the newlines. -// TQString o = d->strOutText.tqreplace( TQChar('\n'), " " ); +// TQString o = d->strOutText.replace( TQChar('\n'), " " ); // don't remove the existing LF, these are intended line wraps (whishlist #9881) TQString o = d->strOutText; @@ -1334,7 +1334,7 @@ void Cell::makeLayout( TQPainter &_painter, int _col, int _row ) // Break the line at appropriate places, i.e. spaces, if // necessary. This means to change the spaces where breaks occur // into newlines. - if ( o.tqfind(' ') != -1 ) + if ( o.find(' ') != -1 ) { d->strOutText = ""; @@ -1350,8 +1350,8 @@ void Cell::makeLayout( TQPainter &_painter, int _col, int _row ) do { - breakpos = o.tqfind( ' ', breakpos ); - int linefeed = o.tqfind( '\n', pos1 ); + breakpos = o.find( ' ', breakpos ); + int linefeed = o.find( '\n', pos1 ); // kdDebug() << "start: " << start << "; breakpos: " << breakpos << "; pos1: " << pos1 << "; linefeed: " << linefeed << endl; @@ -1394,11 +1394,11 @@ void Cell::makeLayout( TQPainter &_painter, int _col, int _row ) } breakpos++; - } while( o.tqfind( ' ', breakpos ) != -1 ); + } while( o.find( ' ', breakpos ) != -1 ); } else { - lines = o.tqcontains('\n'); + lines = o.contains('\n'); } d->textHeight *= lines; @@ -1414,7 +1414,7 @@ void Cell::makeLayout( TQPainter &_painter, int _col, int _row ) int pos = 0; d->textWidth = 0.0; do { - i = d->strOutText.tqfind( "\n", pos ); + i = d->strOutText.find( "\n", pos ); if ( i == -1 ) t = d->strOutText.mid( pos, d->strOutText.length() - pos ); @@ -2243,14 +2243,14 @@ void Cell::paintCell( const KoRect &rect, TQPainter & painter, // itself really is selected. bool selected = false; if ( view != NULL ) { - selected = view->selectionInfo()->tqcontains( cellRef ); + selected = view->selectionInfo()->contains( cellRef ); // But the cell doesn't look selected if this is the marker cell. Cell *cell = format()->sheet()->cellAt( view->selectionInfo()->marker() ); TQPoint bottomRight( view->selectionInfo()->marker().x() + cell->extraXCells(), view->selectionInfo()->marker().y() + cell->extraYCells() ); TQRect markerArea( view->selectionInfo()->marker(), bottomRight ); - selected = selected && !( markerArea.tqcontains( cellRef ) ); + selected = selected && !( markerArea.contains( cellRef ) ); // Don't draw any selection at all when printing. if ( painter.tqdevice()->isExtDev() || !drawCursor ) @@ -2432,7 +2432,7 @@ void Cell::paintCell( const KoRect &rect, TQPainter & painter, // // This optimization removes an O(n^4) behaviour where n is // the number of cells on one edge in a merged cell. - if ( mergedCellsPainted.tqcontains( obscuringCellRef ) ) + if ( mergedCellsPainted.contains( obscuringCellRef ) ) continue; Cell *obscuringCell = format()->sheet()->cellAt( obscuringCellRef.x(), @@ -3389,7 +3389,7 @@ void Cell::paintText( TQPainter& painter, double dy = 0.0; TQFontMetrics fm = painter.fontMetrics(); do { - i = d->strOutText.tqfind( "\n", pos ); + i = d->strOutText.find( "\n", pos ); if ( i == -1 ) t = d->strOutText.mid( pos, d->strOutText.length() - pos ); else { @@ -4105,7 +4105,7 @@ TQString Cell::textDisplaying( TQPainter &_painter ) //out of space to fit even the integer part of the number then display ######### //TODO Perhaps try to display integer part in standard form if there is not enough room for it? - if (!tmp.tqcontains('.')) + if (!tmp.contains('.')) d->strOutText=TQString().fill('#',20); } @@ -4546,19 +4546,19 @@ void Cell::incPrecision() if ( tmpPreci == -1 ) { - int pos = d->strOutText.tqfind(decimal_point); + int pos = d->strOutText.find(decimal_point); if ( pos == -1 ) - pos = d->strOutText.tqfind('.'); + pos = d->strOutText.find('.'); if ( pos == -1 ) format()->setPrecision(1); else { int start = 0; - if ( d->strOutText.tqfind('%') != -1 ) + if ( d->strOutText.find('%') != -1 ) start = 2; - else if ( d->strOutText.tqfind(locale()->currencySymbol()) == ((int)(d->strOutText.length()-locale()->currencySymbol().length())) ) + else if ( d->strOutText.find(locale()->currencySymbol()) == ((int)(d->strOutText.length()-locale()->currencySymbol().length())) ) start = locale()->currencySymbol().length() + 1; - else if ( (start=d->strOutText.tqfind('E')) != -1 ) + else if ( (start=d->strOutText.find('E')) != -1 ) start = d->strOutText.length() - start; //kdDebug(36001) << "start=" << start << " pos=" << pos << " length=" << d->strOutText.length() << endl; @@ -4582,13 +4582,13 @@ void Cell::decPrecision() // kdDebug(36001) << "decPrecision: tmpPreci = " << tmpPreci << endl; if ( format()->precision(column(),row()) == -1 ) { - int pos = d->strOutText.tqfind( decimal_point ); + int pos = d->strOutText.find( decimal_point ); int start = 0; - if ( d->strOutText.tqfind('%') != -1 ) + if ( d->strOutText.find('%') != -1 ) start = 2; - else if ( d->strOutText.tqfind(locale()->currencySymbol()) == ((int)(d->strOutText.length()-locale()->currencySymbol().length())) ) + else if ( d->strOutText.find(locale()->currencySymbol()) == ((int)(d->strOutText.length()-locale()->currencySymbol().length())) ) start = locale()->currencySymbol().length() + 1; - else if ( (start = d->strOutText.tqfind('E')) != -1 ) + else if ( (start = d->strOutText.find('E')) != -1 ) start = d->strOutText.length() - start; else start = 0; @@ -4780,7 +4780,7 @@ bool Cell::testValidity() const else if ( d->extra()->validity->m_restriction == Restriction::List ) { //test int value - if ( value().isString() && d->extra()->validity->listValidity.tqcontains( value().asString() ) ) + if ( value().isString() && d->extra()->validity->listValidity.contains( value().asString() ) ) valid = true; } else if(d->extra()->validity->m_restriction==Restriction::TextLength) @@ -5009,7 +5009,7 @@ bool Cell::updateChart(bool refresh) CellBinding *bind; for ( bind = format()->sheet()->firstCellBinding(); bind != 0L; bind = format()->sheet()->nextCellBinding() ) { - if ( bind->tqcontains( d->column, d->row ) ) + if ( bind->contains( d->column, d->row ) ) { if (!refresh) return true; @@ -5817,13 +5817,13 @@ bool Cell::loadOasis( const TQDomElement& element , KoOasisLoadingContext& oasis int year = 0, month = 0, day = 0; bool ok = false; - int p1 = value.tqfind( '-' ); + int p1 = value.find( '-' ); if ( p1 > 0 ) year = value.left( p1 ).toInt( &ok ); kdDebug() << "year: " << value.left( p1 ) << endl; - int p2 = value.tqfind( '-', ++p1 ); + int p2 = value.find( '-', ++p1 ); if ( ok ) month = value.mid( p1, p2 - p1 ).toInt( &ok ); @@ -6095,7 +6095,7 @@ void Cell::loadOasisValidation( const TQString& validationName ) //A NumberValue is a whole or decimal number. It must not contain comma separators for numbers of 1000 or greater. //ExtendedTrueCondition - if ( valExpression.tqcontains( "cell-content-text-length()" ) ) + if ( valExpression.contains( "cell-content-text-length()" ) ) { //"cell-content-text-length()>45" valExpression = valExpression.remove("oooc:cell-content-text-length()" ); @@ -6104,12 +6104,12 @@ void Cell::loadOasisValidation( const TQString& validationName ) loadOasisValidationCondition( valExpression ); } - else if ( valExpression.tqcontains( "cell-content-is-text()" ) ) + else if ( valExpression.contains( "cell-content-is-text()" ) ) { d->extra()->validity->m_restriction = Restriction::Text; } //cell-content-text-length-is-between(Value, Value) | cell-content-text-length-is-not-between(Value, Value) | cell-content-is-in-list( StringList ) - else if ( valExpression.tqcontains( "cell-content-text-length-is-between" ) ) + else if ( valExpression.contains( "cell-content-text-length-is-between" ) ) { d->extra()->validity->m_restriction = Restriction::TextLength; d->extra()->validity->m_cond = Conditional::Between; @@ -6119,7 +6119,7 @@ void Cell::loadOasisValidation( const TQString& validationName ) TQStringList listVal = TQStringList::split( ",", valExpression ); loadOasisValidationValue( listVal ); } - else if ( valExpression.tqcontains( "cell-content-text-length-is-not-between" ) ) + else if ( valExpression.contains( "cell-content-text-length-is-not-between" ) ) { d->extra()->validity->m_restriction = Restriction::TextLength; d->extra()->validity->m_cond = Conditional::Different; @@ -6130,7 +6130,7 @@ void Cell::loadOasisValidation( const TQString& validationName ) TQStringList listVal = TQStringList::split( ",", valExpression ); loadOasisValidationValue( listVal ); } - else if ( valExpression.tqcontains( "cell-content-is-in-list(" ) ) + else if ( valExpression.contains( "cell-content-is-in-list(" ) ) { d->extra()->validity->m_restriction = Restriction::List; valExpression = valExpression.remove( "oooc:cell-content-is-in-list(" ); @@ -6142,36 +6142,36 @@ void Cell::loadOasisValidation( const TQString& validationName ) //TrueFunction ::= cell-content-is-whole-number() | cell-content-is-decimal-number() | cell-content-is-date() | cell-content-is-time() else { - if (valExpression.tqcontains( "cell-content-is-whole-number()" ) ) + if (valExpression.contains( "cell-content-is-whole-number()" ) ) { d->extra()->validity->m_restriction = Restriction::Number; valExpression = valExpression.remove( "oooc:cell-content-is-whole-number() and " ); } - else if (valExpression.tqcontains( "cell-content-is-decimal-number()" ) ) + else if (valExpression.contains( "cell-content-is-decimal-number()" ) ) { d->extra()->validity->m_restriction = Restriction::Integer; valExpression = valExpression.remove( "oooc:cell-content-is-decimal-number() and " ); } - else if (valExpression.tqcontains( "cell-content-is-date()" ) ) + else if (valExpression.contains( "cell-content-is-date()" ) ) { d->extra()->validity->m_restriction = Restriction::Date; valExpression = valExpression.remove( "oooc:cell-content-is-date() and " ); } - else if (valExpression.tqcontains( "cell-content-is-time()" ) ) + else if (valExpression.contains( "cell-content-is-time()" ) ) { d->extra()->validity->m_restriction = Restriction::Time; valExpression = valExpression.remove( "oooc:cell-content-is-time() and " ); } kdDebug()<<"valExpression :"<<valExpression<<endl; - if ( valExpression.tqcontains( "cell-content()" ) ) + if ( valExpression.contains( "cell-content()" ) ) { valExpression = valExpression.remove( "cell-content()" ); loadOasisValidationCondition( valExpression ); } //GetFunction ::= cell-content-is-between(Value, Value) | cell-content-is-not-between(Value, Value) //for the moment we support just int/double value, not text/date/time :( - if ( valExpression.tqcontains( "cell-content-is-between(" ) ) + if ( valExpression.contains( "cell-content-is-between(" ) ) { valExpression = valExpression.remove( "cell-content-is-between(" ); valExpression = valExpression.remove( ")" ); @@ -6179,7 +6179,7 @@ void Cell::loadOasisValidation( const TQString& validationName ) loadOasisValidationValue( listVal ); d->extra()->validity->m_cond = Conditional::Between; } - if ( valExpression.tqcontains( "cell-content-is-not-between(" ) ) + if ( valExpression.contains( "cell-content-is-not-between(" ) ) { valExpression = valExpression.remove( "cell-content-is-not-between(" ); valExpression = valExpression.remove( ")" ); @@ -6298,33 +6298,33 @@ void Cell::loadOasisValidationValue( const TQStringList &listVal ) void Cell::loadOasisValidationCondition( TQString &valExpression ) { TQString value; - if (valExpression.tqfind( "<=" )==0 ) + if (valExpression.find( "<=" )==0 ) { value = valExpression.remove( 0,2 ); d->extra()->validity->m_cond = Conditional::InferiorEqual; } - else if (valExpression.tqfind( ">=" )==0 ) + else if (valExpression.find( ">=" )==0 ) { value = valExpression.remove( 0,2 ); d->extra()->validity->m_cond = Conditional::SuperiorEqual; } - else if (valExpression.tqfind( "!=" )==0 ) + else if (valExpression.find( "!=" )==0 ) { //add Differentto attribute value = valExpression.remove( 0,2 ); d->extra()->validity->m_cond = Conditional::DifferentTo; } - else if ( valExpression.tqfind( "<" )==0 ) + else if ( valExpression.find( "<" )==0 ) { value = valExpression.remove( 0,1 ); d->extra()->validity->m_cond = Conditional::Inferior; } - else if(valExpression.tqfind( ">" )==0 ) + else if(valExpression.find( ">" )==0 ) { value = valExpression.remove( 0,1 ); d->extra()->validity->m_cond = Conditional::Superior; } - else if (valExpression.tqfind( "=" )==0 ) + else if (valExpression.find( "=" )==0 ) { value = valExpression.remove( 0,1 ); d->extra()->validity->m_cond = Conditional::Equal; @@ -6646,9 +6646,9 @@ bool Cell::load( const TQDomElement & cell, int _xshift, int _yshift, setValue ( dd ); else { - int pos = t.tqfind( '/' ); + int pos = t.find( '/' ); int year = t.mid( 0, pos ).toInt(); - int pos1 = t.tqfind( '/', pos + 1 ); + int pos1 = t.find( '/', pos + 1 ); int month = t.mid( pos + 1, ( ( pos1 - 1 ) - pos ) ).toInt(); int day = t.right( t.length() - pos1 - 1 ).toInt(); TQDate date( year, month, day ); @@ -6670,9 +6670,9 @@ bool Cell::load( const TQDomElement & cell, int _xshift, int _yshift, int minutes = -1; int second = -1; int pos, pos1; - pos = t.tqfind( ':' ); + pos = t.find( ':' ); hours = t.mid( 0, pos ).toInt(); - pos1 = t.tqfind( ':', pos + 1 ); + pos1 = t.find( ':', pos + 1 ); minutes = t.mid( pos + 1, ( ( pos1 - 1 ) - pos ) ).toInt(); second = t.right( t.length() - pos1 - 1 ).toInt(); TQTime time( hours, minutes, second ); @@ -6776,9 +6776,9 @@ bool Cell::loadCellData(const TQDomElement & text, Paste::Operation op ) else // old docs: do the ugly solution of calling checkTextInput to parse the text { // ...except for date/time - if (isDate() && ( t.tqcontains('/') == 2 )) + if (isDate() && ( t.contains('/') == 2 )) dataType = "Date"; - else if (isTime() && ( t.tqcontains(':') == 2 ) ) + else if (isTime() && ( t.contains(':') == 2 ) ) dataType = "Time"; else { @@ -6805,7 +6805,7 @@ bool Cell::loadCellData(const TQDomElement & text, Paste::Operation op ) else if( dataType == "Num" ) { bool ok = false; - if (t.tqcontains('.')) + if (t.contains('.')) setValue ( Value( t.toDouble(&ok) ) ); // We save in non-localized format else setValue ( Value( t.toLong(&ok) ) ); @@ -6818,7 +6818,7 @@ bool Cell::loadCellData(const TQDomElement & text, Paste::Operation op ) /* KLocale::formatNumber requires the precision we want to return. */ - int precision = t.length() - t.tqfind('.') - 1; + int precision = t.length() - t.find('.') - 1; if ( formatType() == Percentage_format ) { @@ -6842,9 +6842,9 @@ bool Cell::loadCellData(const TQDomElement & text, Paste::Operation op ) // date ? else if( dataType == "Date" ) { - int pos = t.tqfind('/'); + int pos = t.find('/'); int year = t.mid(0,pos).toInt(); - int pos1 = t.tqfind('/',pos+1); + int pos1 = t.find('/',pos+1); int month = t.mid(pos+1,((pos1-1)-pos)).toInt(); int day = t.right(t.length()-pos1-1).toInt(); setValue( TQDate(year,month,day) ); @@ -6864,9 +6864,9 @@ bool Cell::loadCellData(const TQDomElement & text, Paste::Operation op ) int minutes = -1; int second = -1; int pos, pos1; - pos = t.tqfind(':'); + pos = t.find(':'); hours = t.mid(0,pos).toInt(); - pos1 = t.tqfind(':',pos+1); + pos1 = t.find(':',pos+1); minutes = t.mid(pos+1,((pos1-1)-pos)).toInt(); second = t.right(t.length()-pos1-1).toInt(); setValue( TQTime(hours,minutes,second) ); @@ -6913,9 +6913,9 @@ TQTime Cell::toTime(const TQDomElement &element) int minutes = -1; int second = -1; int pos, pos1; - pos = t.tqfind(':'); + pos = t.find(':'); hours = t.mid(0,pos).toInt(); - pos1 = t.tqfind(':',pos+1); + pos1 = t.find(':',pos+1); minutes = t.mid(pos+1,((pos1-1)-pos)).toInt(); second = t.right(t.length()-pos1-1).toInt(); setValue( Value( TQTime(hours,minutes,second)) ); @@ -6930,9 +6930,9 @@ TQDate Cell::toDate(const TQDomElement &element) int year = -1; int month = -1; int day = -1; - pos = t.tqfind('/'); + pos = t.find('/'); year = t.mid(0,pos).toInt(); - pos1 = t.tqfind('/',pos+1); + pos1 = t.find('/',pos+1); month = t.mid(pos+1,((pos1-1)-pos)).toInt(); day = t.right(t.length()-pos1-1).toInt(); setValue( Value( TQDate(year,month,day) ) ); @@ -7324,7 +7324,7 @@ void Cell::checkForNamedAreas( TQString & formula ) const { if ( loadinginfo->findWordInAreaList(word) ) { - formula = formula.tqreplace( start, word.length(), "'" + word + "'" ); + formula = formula.replace( start, word.length(), "'" + word + "'" ); l = formula.length(); ++i; kdDebug() << "Formula: " << formula << ", L: " << l << ", i: " << i + 1 <<endl; @@ -7339,7 +7339,7 @@ void Cell::checkForNamedAreas( TQString & formula ) const { if ( loadinginfo->findWordInAreaList(word) ) { - formula = formula.tqreplace( start, word.length(), "'" + word + "'" ); + formula = formula.replace( start, word.length(), "'" + word + "'" ); l = formula.length(); ++i; kdDebug() << "Formula: " << formula << ", L: " << l << ", i: " << i + 1 <<endl; diff --git a/kspread/kspread_cell.h b/kspread/kspread_cell.h index 24662186..5831d717 100644 --- a/kspread/kspread_cell.h +++ b/kspread/kspread_cell.h @@ -483,7 +483,7 @@ public: /** * @return effective pen for the left border * If this cell is merged by another cell, the other cell's - * left border pen. If this cell's conditional formatting tqcontains + * left border pen. If this cell's conditional formatting contains * a left border pen and the condition is matched, the conditional * formatting's pen. Otherwise, its own left border pen. */ diff --git a/kspread/kspread_condition.cc b/kspread/kspread_condition.cc index fdca8e46..876dfbf0 100644 --- a/kspread/kspread_condition.cc +++ b/kspread/kspread_condition.cc @@ -475,14 +475,14 @@ void Conditions::loadOasisConditions( const TQDomElement & element ) void Conditions::loadOasisConditionValue( const TQString &styleCondition, Conditional &newCondition ) { TQString val( styleCondition ); - if ( val.tqcontains( "cell-content()" ) ) + if ( val.contains( "cell-content()" ) ) { val = val.remove( "cell-content()" ); loadOasisCondition( val,newCondition ); } //GetFunction ::= cell-content-is-between(Value, Value) | cell-content-is-not-between(Value, Value) //for the moment we support just int/double value, not text/date/time :( - if ( val.tqcontains( "cell-content-is-between(" ) ) + if ( val.contains( "cell-content-is-between(" ) ) { val = val.remove( "cell-content-is-between(" ); val = val.remove( ")" ); @@ -490,7 +490,7 @@ void Conditions::loadOasisConditionValue( const TQString &styleCondition, Condit loadOasisValidationValue( listVal, newCondition ); newCondition.cond = Conditional::Between; } - if ( val.tqcontains( "cell-content-is-not-between(" ) ) + if ( val.contains( "cell-content-is-not-between(" ) ) { val = val.remove( "cell-content-is-not-between(" ); val = val.remove( ")" ); @@ -505,33 +505,33 @@ void Conditions::loadOasisConditionValue( const TQString &styleCondition, Condit void Conditions::loadOasisCondition( TQString &valExpression, Conditional &newCondition ) { TQString value; - if (valExpression.tqfind( "<=" )==0 ) + if (valExpression.find( "<=" )==0 ) { value = valExpression.remove( 0,2 ); newCondition.cond = Conditional::InferiorEqual; } - else if (valExpression.tqfind( ">=" )==0 ) + else if (valExpression.find( ">=" )==0 ) { value = valExpression.remove( 0,2 ); newCondition.cond = Conditional::SuperiorEqual; } - else if (valExpression.tqfind( "!=" )==0 ) + else if (valExpression.find( "!=" )==0 ) { //add Differentto attribute value = valExpression.remove( 0,2 ); newCondition.cond = Conditional::DifferentTo; } - else if ( valExpression.tqfind( "<" )==0 ) + else if ( valExpression.find( "<" )==0 ) { value = valExpression.remove( 0,1 ); newCondition.cond = Conditional::Inferior; } - else if(valExpression.tqfind( ">" )==0 ) + else if(valExpression.find( ">" )==0 ) { value = valExpression.remove( 0,1 ); newCondition.cond = Conditional::Superior; } - else if (valExpression.tqfind( "=" )==0 ) + else if (valExpression.find( "=" )==0 ) { value = valExpression.remove( 0,1 ); newCondition.cond = Conditional::Equal; diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cc index 7340feda..0491e630 100644 --- a/kspread/kspread_doc.cc +++ b/kspread/kspread_doc.cc @@ -1273,12 +1273,12 @@ void Doc::loadPaper( TQDomElement const & paper ) fright = right.text(); } //The macro "<sheet>" formerly was typed as "<table>" - hleft = hleft.tqreplace( "<table>", "<sheet>" ); - hcenter = hcenter.tqreplace( "<table>", "<sheet>" ); - hright = hright.tqreplace( "<table>", "<sheet>" ); - fleft = fleft.tqreplace( "<table>", "<sheet>" ); - fcenter = fcenter.tqreplace( "<table>", "<sheet>" ); - fright = fright.tqreplace( "<table>", "<sheet>" ); + hleft = hleft.replace( "<table>", "<sheet>" ); + hcenter = hcenter.replace( "<table>", "<sheet>" ); + hright = hright.replace( "<table>", "<sheet>" ); + fleft = fleft.replace( "<table>", "<sheet>" ); + fcenter = fcenter.replace( "<table>", "<sheet>" ); + fright = fright.replace( "<table>", "<sheet>" ); TQPtrListIterator<Sheet> it ( map()->sheetList() ); for( ; it.current(); ++it ) @@ -1319,7 +1319,7 @@ void Doc::deregisterPlugin( Plugin * plugin ) bool Doc::docData( TQString const & xmlTag, TQDomElement & data ) { - SavedDocParts::iterator iter = m_savedDocParts.tqfind( xmlTag ); + SavedDocParts::iterator iter = m_savedDocParts.find( xmlTag ); if ( iter == m_savedDocParts.end() ) return false; @@ -2090,18 +2090,18 @@ void Doc::loadOasisAreaName( const TQDomElement& body ) range = Oasis::decodeFormula( range ); - if ( range.tqfind( ':' ) == -1 ) + if ( range.find( ':' ) == -1 ) { Point p( range ); - int n = range.tqfind( '!' ); + int n = range.find( '!' ); if ( n > 0 ) range = range + ":" + range.right( range.length() - n - 1); kdDebug() << "=> Area: " << range << endl; } - if ( range.tqcontains( '!' ) && range[0] == '$' ) + if ( range.contains( '!' ) && range[0] == '$' ) { // cut absolute sheet indicator range.remove( 0, 1 ); @@ -2168,7 +2168,7 @@ void Doc::loadAreaName( const TQDomElement& element ) void Doc::addStringCompletion(const TQString &stringCompletion) { - if ( d->listCompletion.items().tqcontains(stringCompletion) == 0 ) + if ( d->listCompletion.items().contains(stringCompletion) == 0 ) d->listCompletion.addItem( stringCompletion ); } @@ -2288,7 +2288,7 @@ void Doc::takeSheet( Sheet * sheet ) void Doc::addIgnoreWordAll( const TQString & word) { - if( d->spellListIgnoreAll.tqfindIndex( word )==-1) + if( d->spellListIgnoreAll.findIndex( word )==-1) d->spellListIgnoreAll.append( word ); } @@ -2438,7 +2438,7 @@ void Doc::setUndoRedoLimit(int val) void Doc::insertPixmapKey( KoPictureKey key ) { - if ( !d->usedPictures.tqcontains( key ) ) + if ( !d->usedPictures.contains( key ) ) d->usedPictures.append( key ); } diff --git a/kspread/kspread_editors.cc b/kspread/kspread_editors.cc index 1ed83ac2..c9948189 100644 --- a/kspread/kspread_editors.cc +++ b/kspread/kspread_editors.cc @@ -137,12 +137,12 @@ int FormulaEditorHighlighter::highlightParagraph(const TQString& text, int /* en Range newRange( token.text() ); - if (!alreadyFoundRanges.tqcontains(newRange)) + if (!alreadyFoundRanges.contains(newRange)) { alreadyFoundRanges.append(newRange); d->rangeCount++; } - setFormat(token.pos() + 1, token.text().length(), colors[ alreadyFoundRanges.tqfindIndex(newRange) % colors.size()] ); + setFormat(token.pos() + 1, token.text().length(), colors[ alreadyFoundRanges.findIndex(newRange) % colors.size()] ); } break; case Token::Boolean: // True, False (also i18n-ized) @@ -768,7 +768,7 @@ void CellEditor::slotCursorPositionChanged(int /* para */, int pos) Region region(d->canvas->view(), token.text()); it = region.constBegin(); - if (!alreadyUsedRegions.tqcontains(region)) + if (!alreadyUsedRegions.contains(region)) { TQRect r=(*it)->rect(); @@ -1310,7 +1310,7 @@ LocationEditWidget::LocationEditWidget( TQWidget * _parent, void LocationEditWidget::addCompletionItem( const TQString &_item ) { kdDebug()<<" LocationEditWidget::addCompletionItem add :"<<_item<<endl; - if ( completionList.items().tqcontains( _item) == 0 ) + if ( completionList.items().contains( _item) == 0 ) { completionList.addItem( _item ); kdDebug()<<" _utem :"<<_item<<endl; @@ -1348,14 +1348,14 @@ bool LocationEditWidget::activateItem() // Set the cell component to uppercase: // Sheet1!a1 -> Sheet1!A2 - int pos = ltext.tqfind('!'); + int pos = ltext.find('!'); if ( pos !=- 1 ) tmp = ltext.left(pos)+ltext.mid(pos).upper(); else tmp = ltext.upper(); // Selection entered in location widget - if ( ltext.tqcontains( ':' ) ) + if ( ltext.contains( ':' ) ) m_pView->selectionInfo()->initialize( Region(m_pView,tmp) ); // Location entered in location widget else diff --git a/kspread/kspread_format.cc b/kspread/kspread_format.cc index 95898cd3..73c0bbff 100644 --- a/kspread/kspread_format.cc +++ b/kspread/kspread_format.cc @@ -3429,15 +3429,15 @@ Currency::Currency(TQString const & code, currencyFormat format) if ( format == Gnumeric ) { // I use TQChar(c,r) here so that this file can be opened in any encoding... - if ( code.tqfind( TQChar( 172, 32 ) ) != -1 ) // Euro sign + if ( code.find( TQChar( 172, 32 ) ) != -1 ) // Euro sign m_code = TQChar( 172, 32 ); - else if ( code.tqfind( TQChar( 163, 0 ) ) != -1 ) // Pound sign + else if ( code.find( TQChar( 163, 0 ) ) != -1 ) // Pound sign m_code = TQChar( 163, 0 ); - else if ( code.tqfind( TQChar( 165, 0 ) ) != -1 ) // Yen sign + else if ( code.find( TQChar( 165, 0 ) ) != -1 ) // Yen sign m_code = TQChar( 165, 0 ); else if ( code[0] == '[' && code[1] == '$' ) { - int n = code.tqfind(']'); + int n = code.find(']'); if (n != -1) { m_code = code.mid( 2, n - 2 ); @@ -3447,7 +3447,7 @@ Currency::Currency(TQString const & code, currencyFormat format) m_type = 0; } } - else if ( code.tqfind( '$' ) != -1 ) + else if ( code.find( '$' ) != -1 ) m_code = "$"; } // end gnumeric m_type = gCurrencyMap.getIndex( m_code ); diff --git a/kspread/kspread_functions_engineering.cc b/kspread/kspread_functions_engineering.cc index 8e2a47d9..8ae0bf2f 100644 --- a/kspread/kspread_functions_engineering.cc +++ b/kspread/kspread_functions_engineering.cc @@ -307,7 +307,7 @@ Value func_hex2oct (valVector args, ValueCalc *calc, FuncExtra *) // example: "kPa" will return 1e3 and change unit into "Pa" static double kspread_convert_prefix( TQMap<TQString,double> map, TQString& unit ) { - if( map.tqcontains( unit ) ) + if( map.contains( unit ) ) return 1.0; // initialize prefix mapping if necessary @@ -334,7 +334,7 @@ static double kspread_convert_prefix( TQMap<TQString,double> map, TQString& unit // check for possible prefix char prefix = unit[0].latin1(); - if( prefixMap.tqcontains( prefix ) ) + if( prefixMap.contains( prefix ) ) { unit.remove( 0, 1 ); return prefixMap[ prefix ]; @@ -372,8 +372,8 @@ static bool kspread_convert_mass( const TQString& fromUnit, double toPrefix = kspread_convert_prefix( massMap, toU ); if( fromPrefix == 0.0 ) return false; if( toPrefix == 0.0 ) return false; - if( !massMap.tqcontains( fromU ) ) return false; - if( !massMap.tqcontains( toU ) ) return false; + if( !massMap.contains( fromU ) ) return false; + if( !massMap.contains( toU ) ) return false; result = value * fromPrefix * massMap[toU] / (massMap[fromU] * toPrefix); @@ -406,8 +406,8 @@ static bool kspread_convert_distance( const TQString& fromUnit, double toPrefix = kspread_convert_prefix( distanceMap, toU ); if( fromPrefix == 0.0 ) return false; if( toPrefix == 0.0 ) return false; - if( !distanceMap.tqcontains( fromU ) ) return false; - if( !distanceMap.tqcontains( toU ) ) return false; + if( !distanceMap.contains( fromU ) ) return false; + if( !distanceMap.contains( toU ) ) return false; result = value * fromPrefix * distanceMap[toU] / (distanceMap[fromU] * toPrefix); @@ -435,8 +435,8 @@ static bool kspread_convert_pressure( const TQString& fromUnit, double toPrefix = kspread_convert_prefix( pressureMap, toU ); if( fromPrefix == 0.0 ) return false; if( toPrefix == 0.0 ) return false; - if( !pressureMap.tqcontains( fromU ) ) return false; - if( !pressureMap.tqcontains( toU ) ) return false; + if( !pressureMap.contains( fromU ) ) return false; + if( !pressureMap.contains( toU ) ) return false; result = value * fromPrefix * pressureMap[toU] / (pressureMap[fromU] * toPrefix); @@ -462,8 +462,8 @@ static bool kspread_convert_force( const TQString& fromUnit, double toPrefix = kspread_convert_prefix( forceMap, toU ); if( fromPrefix == 0.0 ) return false; if( toPrefix == 0.0 ) return false; - if( !forceMap.tqcontains( fromU ) ) return false; - if( !forceMap.tqcontains( toU ) ) return false; + if( !forceMap.contains( fromU ) ) return false; + if( !forceMap.contains( toU ) ) return false; result = value * fromPrefix * forceMap[toU] / (forceMap[fromU] * toPrefix); @@ -495,8 +495,8 @@ static bool kspread_convert_energy( const TQString& fromUnit, double toPrefix = kspread_convert_prefix( energyMap, toU ); if( fromPrefix == 0.0 ) return false; if( toPrefix == 0.0 ) return false; - if( !energyMap.tqcontains( fromU ) ) return false; - if( !energyMap.tqcontains( toU ) ) return false; + if( !energyMap.contains( fromU ) ) return false; + if( !energyMap.contains( toU ) ) return false; result = value * fromPrefix * energyMap[toU] / (energyMap[fromU] * toPrefix); @@ -522,8 +522,8 @@ static bool kspread_convert_power( const TQString& fromUnit, double toPrefix = kspread_convert_prefix( powerMap, toU ); if( fromPrefix == 0.0 ) return false; if( toPrefix == 0.0 ) return false; - if( !powerMap.tqcontains( fromU ) ) return false; - if( !powerMap.tqcontains( toU ) ) return false; + if( !powerMap.contains( fromU ) ) return false; + if( !powerMap.contains( toU ) ) return false; result = value * fromPrefix * powerMap[toU] / (powerMap[fromU] * toPrefix); @@ -548,8 +548,8 @@ static bool kspread_convert_magnetism( const TQString& fromUnit, double toPrefix = kspread_convert_prefix( magnetismMap, toU ); if( fromPrefix == 0.0 ) return false; if( toPrefix == 0.0 ) return false; - if( !magnetismMap.tqcontains( fromU ) ) return false; - if( !magnetismMap.tqcontains( toU ) ) return false; + if( !magnetismMap.contains( fromU ) ) return false; + if( !magnetismMap.contains( toU ) ) return false; result = value * fromPrefix * magnetismMap[toU] / (magnetismMap[fromU] * toPrefix); @@ -570,10 +570,10 @@ static bool kspread_convert_temperature( const TQString& fromUnit, tempFactorMap[ "K" ] = 1.0; tempOffsetMap[ "K" ] = -273.15; } - if( !tempFactorMap.tqcontains( fromUnit ) ) return false; - if( !tempOffsetMap.tqcontains( fromUnit ) ) return false; - if( !tempFactorMap.tqcontains( toUnit ) ) return false; - if( !tempOffsetMap.tqcontains( toUnit ) ) return false; + if( !tempFactorMap.contains( fromUnit ) ) return false; + if( !tempOffsetMap.contains( fromUnit ) ) return false; + if( !tempFactorMap.contains( toUnit ) ) return false; + if( !tempOffsetMap.contains( toUnit ) ) return false; result = ( value + tempOffsetMap[ fromUnit ] )* tempFactorMap[ fromUnit ]; result = ( result / tempFactorMap[ toUnit ] ) - tempOffsetMap[ toUnit ]; @@ -612,8 +612,8 @@ static bool kspread_convert_volume( const TQString& fromUnit, double toPrefix = kspread_convert_prefix( volumeMap, toU ); if( fromPrefix == 0.0 ) return false; if( toPrefix == 0.0 ) return false; - if( !volumeMap.tqcontains( fromU ) ) return false; - if( !volumeMap.tqcontains( toU ) ) return false; + if( !volumeMap.contains( fromU ) ) return false; + if( !volumeMap.contains( toU ) ) return false; result = value * fromPrefix * volumeMap[toU] / (volumeMap[fromU] * toPrefix); @@ -644,8 +644,8 @@ static bool kspread_convert_area( const TQString& fromUnit, double toPrefix = kspread_convert_prefix( areaMap, toU ); if( fromPrefix == 0.0 ) return false; if( toPrefix == 0.0 ) return false; - if( !areaMap.tqcontains( fromU ) ) return false; - if( !areaMap.tqcontains( toU ) ) return false; + if( !areaMap.contains( fromU ) ) return false; + if( !areaMap.contains( toU ) ) return false; result = value * fromPrefix * areaMap[toU] / (areaMap[fromU] * toPrefix); @@ -672,8 +672,8 @@ static bool kspread_convert_speed( const TQString& fromUnit, double toPrefix = kspread_convert_prefix( speedMap, toU ); if( fromPrefix == 0.0 ) return false; if( toPrefix == 0.0 ) return false; - if( !speedMap.tqcontains( fromU ) ) return false; - if( !speedMap.tqcontains( toU ) ) return false; + if( !speedMap.contains( fromU ) ) return false; + if( !speedMap.contains( toU ) ) return false; result = value * fromPrefix * speedMap[toU] / (speedMap[fromU] * toPrefix); @@ -751,7 +751,7 @@ Value func_complex (valVector args, ValueCalc *calc, FuncExtra *) static double imag_complexe(TQString str, bool &ok) { TQString tmp=str; -if(tmp.tqfind('i')==-1) +if(tmp.find('i')==-1) { //not a complex ok=true; return 0; @@ -766,12 +766,12 @@ else if( tmp.length()==2 ) { //-i,+i, int pos1; - if((pos1=tmp.tqfind('+'))!=-1&& pos1==0) + if((pos1=tmp.find('+'))!=-1&& pos1==0) { ok=true; return 1; } - else if( (pos1=tmp.tqfind('-'))!=-1 && pos1==0 ) + else if( (pos1=tmp.find('-'))!=-1 && pos1==0 ) { ok=true; return -1; @@ -790,12 +790,12 @@ else if( tmp.length()==2 ) else {//12+12i int pos1,pos2; - if((pos1=tmp.tqfind('i'))!=-1) + if((pos1=tmp.find('i'))!=-1) { double val; TQString tmpStr; - if((pos2=tmp.tqfindRev('+'))!=-1 && pos2!=0) + if((pos2=tmp.findRev('+'))!=-1 && pos2!=0) { if((pos1-pos2)==1) { @@ -811,7 +811,7 @@ else return val; } } - else if( (pos2=tmp.tqfindRev('-'))!=-1&& pos2!=0) + else if( (pos2=tmp.findRev('-'))!=-1&& pos2!=0) { if((pos1-pos2)==1) { @@ -859,7 +859,7 @@ double val; int pos1,pos2; TQString tmp=str; TQString tmpStr; -if((pos1=tmp.tqfind('i'))==-1) +if((pos1=tmp.find('i'))==-1) { //12.5 val=KGlobal::locale()->readNumber(tmp, &ok); if(!ok) @@ -868,7 +868,7 @@ if((pos1=tmp.tqfind('i'))==-1) } else { //15-xi - if((pos2=tmp.tqfindRev('-'))!=-1 && pos2!=0) + if((pos2=tmp.findRev('-'))!=-1 && pos2!=0) { tmpStr=tmp.left(pos2); val=KGlobal::locale()->readNumber(tmpStr, &ok); @@ -876,7 +876,7 @@ else val=0; return val; } //15+xi - else if((pos2=tmp.tqfindRev('+'))!=-1) + else if((pos2=tmp.findRev('+'))!=-1) { tmpStr=tmp.left(pos2); val=KGlobal::locale()->readNumber(tmpStr, &ok); diff --git a/kspread/kspread_functions_math.cc b/kspread/kspread_functions_math.cc index 702160bc..814226ae 100644 --- a/kspread/kspread_functions_math.cc +++ b/kspread/kspread_functions_math.cc @@ -994,7 +994,7 @@ Value func_subtotal (valVector args, ValueCalc *calc, FuncExtra *e) Cell *cell = e->sheet->cellAt (c, r); if (cell->isDefault()) continue; - if (cell->isFormula() && cell->text().tqfind ("SUBTOTAL", 0, false) != -1) + if (cell->isFormula() && cell->text().find ("SUBTOTAL", 0, false) != -1) // cell contains the word SUBTOTAL - replace value with empty range.setElement (c-c1, r-r1, empty); } diff --git a/kspread/kspread_functions_text.cc b/kspread/kspread_functions_text.cc index 966ac56c..1f661d27 100644 --- a/kspread/kspread_functions_text.cc +++ b/kspread/kspread_functions_text.cc @@ -45,7 +45,7 @@ Value func_compare (valVector args, ValueCalc *calc, FuncExtra *); Value func_concatenate (valVector args, ValueCalc *calc, FuncExtra *); Value func_dollar (valVector args, ValueCalc *calc, FuncExtra *); Value func_exact (valVector args, ValueCalc *calc, FuncExtra *); -Value func_tqfind (valVector args, ValueCalc *calc, FuncExtra *); +Value func_find (valVector args, ValueCalc *calc, FuncExtra *); Value func_fixed (valVector args, ValueCalc *calc, FuncExtra *); Value func_left (valVector args, ValueCalc *calc, FuncExtra *); Value func_len (valVector args, ValueCalc *calc, FuncExtra *); @@ -54,7 +54,7 @@ Value func_mid (valVector args, ValueCalc *calc, FuncExtra *); Value func_proper (valVector args, ValueCalc *calc, FuncExtra *); Value func_regexp (valVector args, ValueCalc *calc, FuncExtra *); Value func_regexpre (valVector args, ValueCalc *calc, FuncExtra *); -Value func_tqreplace (valVector args, ValueCalc *calc, FuncExtra *); +Value func_replace (valVector args, ValueCalc *calc, FuncExtra *); Value func_rept (valVector args, ValueCalc *calc, FuncExtra *); Value func_rot (valVector args, ValueCalc *calc, FuncExtra *); Value func_right (valVector args, ValueCalc *calc, FuncExtra *); @@ -116,7 +116,7 @@ void RegisterTextFunctions() f = new Function ("EXACT", func_exact); f->setParamCount (2); repo->add (f); - f = new Function ("FIND", func_tqfind); + f = new Function ("FIND", func_find); f->setParamCount (2, 3); repo->add (f); f = new Function ("FIXED", func_fixed); @@ -134,7 +134,7 @@ void RegisterTextFunctions() f = new Function ("REGEXPRE", func_regexpre); f->setParamCount (3); repo->add (f); - f = new Function ("REPLACE", func_tqreplace); + f = new Function ("REPLACE", func_replace); f->setParamCount (4); repo->add (f); f = new Function ("REPT", func_rept); @@ -268,7 +268,7 @@ Value func_exact (valVector args, ValueCalc *calc, FuncExtra *) } // Function: FIND -Value func_tqfind (valVector args, ValueCalc *calc, FuncExtra *) +Value func_find (valVector args, ValueCalc *calc, FuncExtra *) { TQString find_text, within_text; int start_num = 1; @@ -282,7 +282,7 @@ Value func_tqfind (valVector args, ValueCalc *calc, FuncExtra *) if (start_num <= 0) return Value::errorVALUE(); if (start_num > (int)within_text.length()) return Value::errorVALUE(); - int pos = within_text.tqfind (find_text, start_num - 1); + int pos = within_text.find (find_text, start_num - 1); if( pos < 0 ) return Value::errorNA(); return Value (pos + 1); @@ -319,9 +319,9 @@ Value func_fixed (valVector args, ValueCalc *calc, FuncExtra *) bool neg = number < 0; result = TQString::number( neg ? -number:number, 'f', decimals ); - int pos = result.tqfind('.'); + int pos = result.find('.'); if (pos == -1) pos = result.length(); - else result.tqreplace(pos, 1, locale->decimalSymbol()); + else result.replace(pos, 1, locale->decimalSymbol()); if( !no_commas ) while (0 < (pos -= 3)) result.insert(pos, locale->thousandsSeparator()); @@ -446,7 +446,7 @@ Value func_regexpre (valVector args, ValueCalc *calc, FuncExtra *) while ((pos = exp.search (s, pos)) != -1) { int i = exp.matchedLength(); - s = s.tqreplace (pos, i, str); + s = s.replace (pos, i, str); pos += str.length(); } @@ -454,7 +454,7 @@ Value func_regexpre (valVector args, ValueCalc *calc, FuncExtra *) } // Function: REPLACE -Value func_tqreplace (valVector args, ValueCalc *calc, FuncExtra *) +Value func_replace (valVector args, ValueCalc *calc, FuncExtra *) { TQString text = calc->conv()->asString (args[0]).asString(); int pos = calc->conv()->asInteger (args[1]).asInteger(); @@ -463,7 +463,7 @@ Value func_tqreplace (valVector args, ValueCalc *calc, FuncExtra *) if (pos < 0) pos = 0; - TQString result = text.tqreplace (pos-1, len, new_text); + TQString result = text.replace (pos-1, len, new_text); return Value (result); } @@ -521,7 +521,7 @@ Value func_search (valVector args, ValueCalc *calc, FuncExtra *) // use globbing feature of TQRegExp TQRegExp regex( find_text, false, true ); - int pos = within_text.tqfind( regex, start_num-1 ); + int pos = within_text.find( regex, start_num-1 ); if( pos < 0 ) return Value::errorNA(); return Value (pos + 1); @@ -567,12 +567,12 @@ Value func_substitute (valVector args, ValueCalc *calc, FuncExtra *) TQString result = text; - int p = result.tqfind (old_text); + int p = result.find (old_text); while ((p != -1) && (num > 0)) { - result.tqreplace( p, old_text.length(), new_text ); + result.replace( p, old_text.length(), new_text ); // find another location, starting straight after the replaced text - p = result.tqfind (old_text, p + new_text.length()); + p = result.find (old_text, p + new_text.length()); if( !all ) num--; } diff --git a/kspread/kspread_genvalidationstyle.cc b/kspread/kspread_genvalidationstyle.cc index f886836a..613be176 100644 --- a/kspread/kspread_genvalidationstyle.cc +++ b/kspread/kspread_genvalidationstyle.cc @@ -36,7 +36,7 @@ GenValidationStyles::~GenValidationStyles() TQString GenValidationStyles::lookup( const GenValidationStyle& style ) { - StyleMap::iterator it = m_styles.tqfind( style ); + StyleMap::iterator it = m_styles.find( style ); if ( it == m_styles.end() ) { TQString styleName( "val" ); @@ -54,7 +54,7 @@ TQString GenValidationStyles::makeUniqueName( const TQString& base ) const do { name = base; name += TQString::number( num++ ); - } while ( m_names.tqfind( name ) != m_names.end() ); + } while ( m_names.find( name ) != m_names.end() ); return name; } diff --git a/kspread/kspread_map.cc b/kspread/kspread_map.cc index 032fd13c..7d55a8ff 100644 --- a/kspread/kspread_map.cc +++ b/kspread/kspread_map.cc @@ -107,8 +107,8 @@ void Map::moveSheet( const TQString & _from, const TQString & _to, bool _before Sheet* sheetfrom = findSheet( _from ); Sheet* sheetto = findSheet( _to ); - int from = m_lstSheets.tqfind( sheetfrom ) ; - int to = m_lstSheets.tqfind( sheetto ) ; + int from = m_lstSheets.find( sheetfrom ) ; + int to = m_lstSheets.find( sheetto ) ; if ( !_before ) ++to; @@ -475,14 +475,14 @@ DCOPObject * Map::dcopObject() void Map::takeSheet( Sheet * sheet ) { - int pos = m_lstSheets.tqfindRef( sheet ); + int pos = m_lstSheets.findRef( sheet ); m_lstSheets.take( pos ); m_lstDeletedSheets.append( sheet ); } void Map::insertSheet( Sheet * sheet ) { - int pos = m_lstDeletedSheets.tqfindRef( sheet ); + int pos = m_lstDeletedSheets.findRef( sheet ); if ( pos != -1 ) m_lstDeletedSheets.take( pos ); m_lstSheets.append(sheet); diff --git a/kspread/kspread_numformat.cc b/kspread/kspread_numformat.cc index ed118ec1..906086f9 100644 --- a/kspread/kspread_numformat.cc +++ b/kspread/kspread_numformat.cc @@ -182,7 +182,7 @@ namespace NumFormat_Local int getType( TQString const & format, BaseFormat * f ) const { - FormatMap::const_iterator iter = m_formats.tqfind( format ); + FormatMap::const_iterator iter = m_formats.find( format ); if ( iter == m_formats.end() ) { f = 0; @@ -338,7 +338,7 @@ void parseNegativePart( TQString & format, int i, g_convertionInfo.negBr = true; break; case '[': - if ( format.tqfind( "[red]", i, false ) == i ) + if ( format.find( "[red]", i, false ) == i ) { g_convertionInfo.negRed = true; i += 5; @@ -370,12 +370,12 @@ void parseNegativePart( TQString & format, int i, } } - int p = g_convertionInfo.postfix.tqfind( '"' ); + int p = g_convertionInfo.postfix.find( '"' ); while ( p != -1 ) { g_convertionInfo.postfix.remove( p, 1 ); - p = g_convertionInfo.postfix.tqfind( '"', p ); + p = g_convertionInfo.postfix.find( '"', p ); } } @@ -935,10 +935,10 @@ void createNumber( TQString & result, Value const & value, result = TQString::number( nnum, 'f', prec ); - int pos = result.tqfind( '.' ); + int pos = result.find( '.' ); if ( pos >= 0 ) { - result = result.tqreplace( pos, 1, g_dcSymbol ); + result = result.replace( pos, 1, g_dcSymbol ); // remove '0' from the end if not required if ( data->rightOpt > 0 ) @@ -1168,13 +1168,13 @@ void createScientific( TQString & result, Value const & value, result = TQString::number( nnum, 'E', data->rightReq + data->rightOpt ); - int pos = result.tqfind( '.' ); + int pos = result.find( '.' ); if ( pos >= 0 ) { - result = result.tqreplace( pos, 1, g_dcSymbol ); + result = result.replace( pos, 1, g_dcSymbol ); if ( data->rightOpt > 0 ) { - int i = result.tqfind( 'E', pos, false ) - 1; + int i = result.find( 'E', pos, false ) - 1; int n = result.length() - data->rightOpt; if ( i > 0 ) diff --git a/kspread/kspread_object.cc b/kspread/kspread_object.cc index 71cbbd75..7440b990 100644 --- a/kspread/kspread_object.cc +++ b/kspread/kspread_object.cc @@ -628,7 +628,7 @@ bool EmbeddedChart::saveOasisObjectAttributes( KSpreadOasisSaveContext &sc ) con if(m_pBinding) { // see http://bugs.kde.org/show_bug.cgi?id=120395 TQRect dataArea = m_pBinding->dataArea(); TQString rangeName = util_rangeName( dataArea); - rangeName.insert( rangeName.tqfind(':') +1, sheet()->sheetName() + "." ); + rangeName.insert( rangeName.find(':') +1, sheet()->sheetName() + "." ); rangeName.prepend( sheet()->sheetName() + "." ); sc.xmlWriter.addAttribute( "draw:notify-on-update-of-ranges", rangeName ); } @@ -1009,7 +1009,7 @@ void EmbeddedPictureObject::loadOasis(const TQDomElement &element, KoOasisLoadin if ( !href.isEmpty() /*&& href[0] == '#'*/ ) { TQString strExtension; - const int result=href.tqfindRev("."); + const int result=href.findRev("."); if (result>=0) { strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. @@ -1066,12 +1066,12 @@ void EmbeddedPictureObject::loadOasis(const TQDomElement &element, KoOasisLoadin // _fileName=e.attribute("filename"); // if ( !_fileName.isEmpty() ) // { -// if ( int _envVarB = _fileName.tqfind( '$' ) >= 0 ) +// if ( int _envVarB = _fileName.find( '$' ) >= 0 ) // { -// int _envVarE = _fileName.tqfind( '/', _envVarB ); +// int _envVarE = _fileName.find( '/', _envVarB ); // // ### FIXME: it should be TQString::local8Bit instead of TQFile::encodeName, shouldn't it? // TQString path = getenv( TQFile::encodeName(_fileName.mid( _envVarB, _envVarE-_envVarB )) ); -// _fileName.tqreplace( _envVarB-1, _envVarE-_envVarB+1, path ); +// _fileName.replace( _envVarB-1, _envVarE-_envVarB+1, path ); // } // } // diff --git a/kspread/kspread_sheet.cc b/kspread/kspread_sheet.cc index 43e4bbec..6c27757c 100644 --- a/kspread/kspread_sheet.cc +++ b/kspread/kspread_sheet.cc @@ -122,9 +122,9 @@ void CellBinding::cellChanged( Cell *_cell ) emit changed( _cell ); } -bool CellBinding::tqcontains( int _x, int _y ) +bool CellBinding::contains( int _x, int _y ) { - return m_rctDataArea.tqcontains( TQPoint( _x, _y ) ); + return m_rctDataArea.contains( TQPoint( _x, _y ) ); } /***************************************************************************** @@ -344,7 +344,7 @@ public: int Sheet::s_id = 0L; TQIntDict<Sheet>* Sheet::s_mapSheets; -Sheet* Sheet::tqfind( int _id ) +Sheet* Sheet::find( int _id ) { if ( !s_mapSheets ) return 0L; @@ -2331,7 +2331,7 @@ void Sheet::refreshRemoveAreaName(const TQString & _areaName) { if ( c->isFormula() ) { - if (c->text().tqfind(tmp) != -1) + if (c->text().find(tmp) != -1) { if ( !c->makeFormula() ) kdError(36001) << "ERROR: Syntax ERROR" << endl; @@ -2348,7 +2348,7 @@ void Sheet::refreshChangeAreaName(const TQString & _areaName) { if ( c->isFormula() ) { - if (c->text().tqfind(tmp) != -1) + if (c->text().find(tmp) != -1) { if ( !c->makeFormula() ) kdError(36001) << "ERROR: Syntax ERROR" << endl; @@ -2369,17 +2369,17 @@ void Sheet::changeCellTabName( TQString const & old_name, TQString const & new_n { if( c->isFormula() ) { - if(c->text().tqfind(old_name)!=-1) + if(c->text().find(old_name)!=-1) { - int nb = c->text().tqcontains(old_name+"!"); + int nb = c->text().contains(old_name+"!"); TQString tmp=old_name+"!"; int len = tmp.length(); tmp=c->text(); for( int i=0; i<nb; i++ ) { - int pos = tmp.tqfind( old_name+"!" ); - tmp.tqreplace( pos, len, new_name+"!" ); + int pos = tmp.find( old_name+"!" ); + tmp.replace( pos, len, new_name+"!" ); } c->setCellText(tmp); } @@ -2958,7 +2958,7 @@ void Sheet::changeNameCellRef( const TQPoint & pos, bool fullRowOrColumn, } #if 0 -void Sheet::tqreplace( const TQString &_tqfind, const TQString &_tqreplace, long options, +void Sheet::replace( const TQString &_find, const TQString &_replace, long options, Canvas *canvas ) { Selection* selectionInfo = canvas->view()->selectionInfo(); @@ -2987,13 +2987,13 @@ void Sheet::tqreplace( const TQString &_tqfind, const TQString &_tqreplace, long // Create the class that handles all the actual replace stuff, and connect it to its // local slots. - KReplace dialog( _tqfind, _tqreplace, options ); + KReplace dialog( _find, _replace, options ); TQObject::connect( &dialog, TQT_SIGNAL( highlight( const TQString &, int, int, const TQRect & ) ), canvas, TQT_SLOT( highlight( const TQString &, int, int, const TQRect & ) ) ); TQObject::connect( - &dialog, TQT_SIGNAL( tqreplace( const TQString &, int, int,int, const TQRect & ) ), - canvas, TQT_SLOT( tqreplace( const TQString &, int, int,int, const TQRect & ) ) ); + &dialog, TQT_SIGNAL( replace( const TQString &, int, int,int, const TQRect & ) ), + canvas, TQT_SLOT( replace( const TQString &, int, int,int, const TQRect & ) ) ); // Now do the replacing... if ( !doc()->undoLocked() ) @@ -3024,7 +3024,7 @@ void Sheet::tqreplace( const TQString &_tqfind, const TQString &_tqreplace, long TQString text = cell->text(); cellRegion.setTop( row ); cellRegion.setLeft( col ); - if (!dialog.tqreplace( text, cellRegion )) + if (!dialog.replace( text, cellRegion )) return; } } @@ -3276,8 +3276,8 @@ void Sheet::sortByRow( const TQRect &area, int key1, int key2, int key3, if ( firstKey ) { - int i1 = firstKey->tqfindIndex( cell2->text() ); - int i2 = firstKey->tqfindIndex( bestCell->text() ); + int i1 = firstKey->findIndex( cell2->text() ); + int i2 = firstKey->findIndex( bestCell->text() ); if ( i1 != -1 && i2 != -1 ) { @@ -3632,8 +3632,8 @@ void Sheet::sortByColumn( const TQRect &area, int key1, int key2, int key3, if ( firstKey ) { - int i1 = firstKey->tqfindIndex( cell2->text() ); - int i2 = firstKey->tqfindIndex( bestCell->text() ); + int i1 = firstKey->findIndex( cell2->text() ); + int i2 = firstKey->findIndex( bestCell->text() ); if ( i1 != -1 && i2 != -1 ) { @@ -5043,7 +5043,7 @@ TQString Sheet::copyAsText( Selection* selectionInfo ) if ( !c->isDefault() ) { TQPoint p( c->column(), c->row() ); - if ( selection.tqcontains( p ) ) + if ( selection.contains( p ) ) { top = TQMIN( top, (unsigned) c->row() ); left = TQMIN( left, (unsigned) c->column() ); @@ -5193,7 +5193,7 @@ void Sheet::pasteTextPlain( TQString &_text, TQRect pasteArea) { int p = 0; - p = tmp.tqfind('\n'); + p = tmp.find('\n'); if (p < 0) p = tmp.length(); @@ -5816,7 +5816,7 @@ TQDomDocument Sheet::saveCellRegion(const Region& region, bool copy, bool era) if (!cell->isDefault() && !cell->isPartOfMerged()) { TQPoint point(cell->column(), cell->row()); - if (range.tqcontains(point)) + if (range.contains(point)) { root.appendChild(cell->save( dd, 0, top - 1, copy, copy, era)); } @@ -5857,7 +5857,7 @@ TQDomDocument Sheet::saveCellRegion(const Region& region, bool copy, bool era) if (!cell->isDefault() && !cell->isPartOfMerged()) { TQPoint point(cell->column(), cell->row()); - if (range.tqcontains(point)) + if (range.contains(point)) { root.appendChild(cell->save( dd, left - 1, 0, copy, copy, era)); } @@ -6334,9 +6334,9 @@ bool Sheet::loadSheetStyleFormat( TQDomElement *style ) void Sheet::replaceMacro( TQString & text, const TQString & old, const TQString & newS ) { - int n = text.tqfind( old ); + int n = text.find( old ); if ( n != -1 ) - text = text.tqreplace( n, old.length(), newS ); + text = text.replace( n, old.length(), newS ); } @@ -6630,35 +6630,35 @@ void Sheet::loadOasisMasterLayoutPage( KoStyleStack &styleStack ) TQString str = styleStack.attributeNS( KoXmlNS::style, "print" ); kdDebug()<<" style:print :"<<str<<endl; - if (str.tqcontains( "headers" ) ) + if (str.contains( "headers" ) ) { //TODO implement it into kspread } - if ( str.tqcontains( "grid" ) ) + if ( str.contains( "grid" ) ) { d->print->setPrintGrid( true ); } - if ( str.tqcontains( "annotations" ) ) + if ( str.contains( "annotations" ) ) { //TODO it's not implemented } - if ( str.tqcontains( "objects" ) ) + if ( str.contains( "objects" ) ) { //TODO it's not implemented } - if ( str.tqcontains( "charts" ) ) + if ( str.contains( "charts" ) ) { //TODO it's not implemented } - if ( str.tqcontains( "drawings" ) ) + if ( str.contains( "drawings" ) ) { //TODO it's not implemented } - if ( str.tqcontains( "formulas" ) ) + if ( str.contains( "formulas" ) ) { d->showFormula = true; } - if ( str.tqcontains( "zero-values" ) ) + if ( str.contains( "zero-values" ) ) { //TODO it's not implemented } @@ -8537,7 +8537,7 @@ void Sheet::clearPaintDirtyData() bool Sheet::cellIsPaintDirty( TQPoint const & cell ) const { - return d->paintDirtyList.tqcontains(cell); + return d->paintDirtyList.contains(cell); } #ifndef NDEBUG diff --git a/kspread/kspread_sheet.h b/kspread/kspread_sheet.h index 6266d382..5d907810 100644 --- a/kspread/kspread_sheet.h +++ b/kspread/kspread_sheet.h @@ -98,7 +98,7 @@ public: CellBinding( Sheet *_sheet, const TQRect& _area ); virtual ~CellBinding(); - bool tqcontains( int _x, int _y ); + bool contains( int _x, int _y ); /** * Call this function if one of the cells covered by this binding ( @see #rect ) * has changed. This will in turn force for example a chart to update. @@ -1057,7 +1057,7 @@ public: virtual DCOPObject* dcopObject(); - static Sheet* tqfind( int _id ); + static Sheet* find( int _id ); #ifndef NDEBUG void printDebug(); diff --git a/kspread/kspread_sheetprint.cc b/kspread/kspread_sheetprint.cc index 6bb577f6..c3c12117 100644 --- a/kspread/kspread_sheetprint.cc +++ b/kspread/kspread_sheetprint.cc @@ -705,7 +705,7 @@ bool SheetPrint::isOnNewPageX( int _column ) } //Now check if we find the column already in the list - if ( m_lnewPageListX.tqfindIndex( _column ) != -1 ) + if ( m_lnewPageListX.findIndex( _column ) != -1 ) { if( _column > m_maxCheckedNewPageX ) m_maxCheckedNewPageX = _column; @@ -820,7 +820,7 @@ bool SheetPrint::isOnNewPageY( int _row ) } //Now check if we find the row already in the list - if ( m_lnewPageListY.tqfindIndex( _row ) != -1 ) + if ( m_lnewPageListY.findIndex( _row ) != -1 ) { if( _row > m_maxCheckedNewPageY ) m_maxCheckedNewPageY = _row; @@ -934,11 +934,11 @@ void SheetPrint::updateNewPageListX( int _col ) { //Find the page entry for this column TQValueList<PrintNewPageEntry>::iterator it; - it = m_lnewPageListX.tqfind( _col ); + it = m_lnewPageListX.find( _col ); while ( ( it == m_lnewPageListX.end() ) && _col > 0 ) { _col--; - it = m_lnewPageListX.tqfind( _col ); + it = m_lnewPageListX.find( _col ); } //Remove later pages @@ -969,11 +969,11 @@ void SheetPrint::updateNewPageListY( int _row ) { //Find the page entry for this row TQValueList<PrintNewPageEntry>::iterator it; - it = m_lnewPageListY.tqfind( _row ); + it = m_lnewPageListY.find( _row ); while ( ( it == m_lnewPageListY.end() ) && _row > 0 ) { _row--; - it = m_lnewPageListY.tqfind( _row ); + it = m_lnewPageListY.find( _row ); } //Remove later pages @@ -1005,10 +1005,10 @@ void SheetPrint::resetPrintRange () setPrintRange( TQRect( TQPoint( 1, 1 ), TQPoint( KS_colMax, KS_rowMax ) ) ); } -void SheetPrint::replaceHeadFootLineMacro ( TQString &_text, const TQString &_search, const TQString &_tqreplace ) +void SheetPrint::replaceHeadFootLineMacro ( TQString &_text, const TQString &_search, const TQString &_replace ) { - if ( _search != _tqreplace ) - _text.tqreplace ( TQString( "<" + _search + ">" ), "<" + _tqreplace + ">" ); + if ( _search != _replace ) + _text.replace ( TQString( "<" + _search + ">" ), "<" + _replace + ">" ); } TQString SheetPrint::localizeHeadFootLine ( const TQString &_text ) @@ -1172,7 +1172,7 @@ void SheetPrint::setPaperLayout( float _leftBorder, float _topBorder, TQString paper( _paper ); if ( paper[0].isDigit() ) // Custom format { - const int i = paper.tqfind( 'x' ); + const int i = paper.find( 'x' ); if ( i < 0 ) { // We have nothing useful, so assume ISO A4 @@ -1218,7 +1218,7 @@ TQValueList<PrintNewPageEntry>::iterator SheetPrint::findNewPageColumn( int col } return it; // TQValueList<PrintNewPageEntry>::iterator it; -// it = m_lnewPageListX.tqfind( startCol ); +// it = m_lnewPageListX.find( startCol ); } TQValueList<PrintNewPageEntry>::iterator SheetPrint::findNewPageRow( int row ) @@ -1307,35 +1307,35 @@ TQString SheetPrint::completeHeading( const TQString &_data, int _page, const TQ tmp = _data; int pos = 0; - while ( ( pos = tmp.tqfind( "<page>", pos ) ) != -1 ) - tmp.tqreplace( pos, 6, page ); + while ( ( pos = tmp.find( "<page>", pos ) ) != -1 ) + tmp.replace( pos, 6, page ); pos = 0; - while ( ( pos = tmp.tqfind( "<pages>", pos ) ) != -1 ) - tmp.tqreplace( pos, 7, pages ); + while ( ( pos = tmp.find( "<pages>", pos ) ) != -1 ) + tmp.replace( pos, 7, pages ); pos = 0; - while ( ( pos = tmp.tqfind( "<file>", pos ) ) != -1 ) - tmp.tqreplace( pos, 6, pathFileName ); + while ( ( pos = tmp.find( "<file>", pos ) ) != -1 ) + tmp.replace( pos, 6, pathFileName ); pos = 0; - while ( ( pos = tmp.tqfind( "<name>", pos ) ) != -1 ) - tmp.tqreplace( pos, 6, fileName ); + while ( ( pos = tmp.find( "<name>", pos ) ) != -1 ) + tmp.replace( pos, 6, fileName ); pos = 0; - while ( ( pos = tmp.tqfind( "<time>", pos ) ) != -1 ) - tmp.tqreplace( pos, 6, t ); + while ( ( pos = tmp.find( "<time>", pos ) ) != -1 ) + tmp.replace( pos, 6, t ); pos = 0; - while ( ( pos = tmp.tqfind( "<date>", pos ) ) != -1 ) - tmp.tqreplace( pos, 6, d ); + while ( ( pos = tmp.find( "<date>", pos ) ) != -1 ) + tmp.replace( pos, 6, d ); pos = 0; - while ( ( pos = tmp.tqfind( "<author>", pos ) ) != -1 ) - tmp.tqreplace( pos, 8, full_name ); + while ( ( pos = tmp.find( "<author>", pos ) ) != -1 ) + tmp.replace( pos, 8, full_name ); pos = 0; - while ( ( pos = tmp.tqfind( "<email>", pos ) ) != -1 ) - tmp.tqreplace( pos, 7, email_addr ); + while ( ( pos = tmp.find( "<email>", pos ) ) != -1 ) + tmp.replace( pos, 7, email_addr ); pos = 0; - while ( ( pos = tmp.tqfind( "<org>", pos ) ) != -1 ) - tmp.tqreplace( pos, 5, organization ); + while ( ( pos = tmp.find( "<org>", pos ) ) != -1 ) + tmp.replace( pos, 5, organization ); pos = 0; - while ( ( pos = tmp.tqfind( "<sheet>", pos ) ) != -1 ) - tmp.tqreplace( pos, 7, ta ); + while ( ( pos = tmp.find( "<sheet>", pos ) ) != -1 ) + tmp.replace( pos, 7, ta ); return tmp; } diff --git a/kspread/kspread_sheetprint.h b/kspread/kspread_sheetprint.h index d0779eb5..0062476d 100644 --- a/kspread/kspread_sheetprint.h +++ b/kspread/kspread_sheetprint.h @@ -290,11 +290,11 @@ public: /** * Replaces in _text all _search text parts by _replace text parts. - * Included is a test to not change if _search == _tqreplace. + * Included is a test to not change if _search == _replace. * The arguments should not include neither the beginning "<" nor the leading ">", this is already * included internally. */ - void replaceHeadFootLineMacro ( TQString &_text, const TQString &_search, const TQString &_tqreplace ); + void replaceHeadFootLineMacro ( TQString &_text, const TQString &_search, const TQString &_replace ); /** * Replaces in _text all page macros by the i18n-version of the macros */ diff --git a/kspread/kspread_style.cc b/kspread/kspread_style.cc index ef3b9158..e1bbbf52 100644 --- a/kspread/kspread_style.cc +++ b/kspread/kspread_style.cc @@ -207,7 +207,7 @@ void Style::loadOasisDataStyle( KoOasisStyles& oasisStyles, const TQDomElement& // kdDebug()<< " oasisStyles.dataFormats()[...] suffix :"<< oasisStyles.dataFormats()[element.attributeNS( KoXmlNS::style, "data-style-name" , TQString())].suffix<<endl; const TQString styleName = element.attributeNS( KoXmlNS::style, "data-style-name", TQString() ); - if ( oasisStyles.dataFormats().tqcontains(styleName) ) + if ( oasisStyles.dataFormats().contains(styleName) ) { const KoOasisStyles::NumericStyleFormat dataStyle = oasisStyles.dataFormats()[styleName]; @@ -571,16 +571,16 @@ void Style::loadOasisTextProperties( KoOasisStyles& oasisStyles, const KoStyleSt static TQString convertDateFormat( const TQString& date ) { TQString result = date; - result.tqreplace( "%Y", "yyyy" ); - result.tqreplace( "%y", "yy" ); - result.tqreplace( "%n", "M" ); - result.tqreplace( "%m", "MM" ); - result.tqreplace( "%e", "d" ); - result.tqreplace( "%d", "dd" ); - result.tqreplace( "%b", "MMM" ); - result.tqreplace( "%B", "MMMM" ); - result.tqreplace( "%a", "ddd" ); - result.tqreplace( "%A", "dddd" ); + result.replace( "%Y", "yyyy" ); + result.replace( "%y", "yy" ); + result.replace( "%n", "M" ); + result.replace( "%m", "MM" ); + result.replace( "%e", "d" ); + result.replace( "%d", "dd" ); + result.replace( "%b", "MMM" ); + result.replace( "%B", "MMMM" ); + result.replace( "%a", "ddd" ); + result.replace( "%A", "dddd" ); return result; } @@ -2674,7 +2674,7 @@ TQString Style::colorName( const TQColor& color ) TQRgb rgb = color.rgb(); - if (!map.tqcontains( rgb )) + if (!map.contains( rgb )) { map[rgb] = color.name(); return map[rgb]; diff --git a/kspread/kspread_style_manager.cc b/kspread/kspread_style_manager.cc index 1d570e95..61ca5711 100644 --- a/kspread/kspread_style_manager.cc +++ b/kspread/kspread_style_manager.cc @@ -244,7 +244,7 @@ void StyleManager::createBuiltinStyles() CustomStyle * StyleManager::style( TQString const & name ) const { - Styles::const_iterator iter( m_styles.tqfind( name ) ); + Styles::const_iterator iter( m_styles.find( name ) ); if ( iter != m_styles.end() ) return iter.data(); @@ -270,7 +270,7 @@ void StyleManager::takeStyle( CustomStyle * style ) ++iter; } - Styles::iterator i( m_styles.tqfind( style->name() ) ); + Styles::iterator i( m_styles.find( style->name() ) ); if ( i != m_styles.end() ) { @@ -322,7 +322,7 @@ void StyleManager::changeName( TQString const & oldName, TQString const & newNam ++iter; } - iter = m_styles.tqfind( oldName ); + iter = m_styles.find( oldName ); if ( iter != end ) { CustomStyle * s = iter.data(); @@ -366,7 +366,7 @@ TQDict<Style> StyleManager::loadOasisAutoStyles( KoOasisStyles& oasisStyles ) if ( it.current()->hasAttributeNS( KoXmlNS::style, "tqparent-style-name" ) ) { TQString parentStyleName = it.current()->attributeNS( KoXmlNS::style, "tqparent-style-name", TQString() ); - if ( m_oasisStyles.tqcontains( parentStyleName ) ) + if ( m_oasisStyles.contains( parentStyleName ) ) { autoStyles[name]->setParent( m_oasisStyles[parentStyleName] ); } diff --git a/kspread/kspread_undo.cc b/kspread/kspread_undo.cc index f88c35fc..6036344c 100644 --- a/kspread/kspread_undo.cc +++ b/kspread/kspread_undo.cc @@ -2055,7 +2055,7 @@ void UndoChangeAreaTextCell::undo() const TQPoint location(x,y); - if ( m_lstTextCell.tqcontains(location) ) + if ( m_lstTextCell.contains(location) ) cell->setCellText( m_lstTextCell[location] ); else cell->setCellText( "",true ); @@ -2121,7 +2121,7 @@ void UndoChangeAreaTextCell::redo() const TQPoint location(x,y); - if (m_lstRedoTextCell.tqcontains(location)) + if (m_lstRedoTextCell.contains(location)) cell->setCellText( m_lstRedoTextCell[location] ); else cell->setCellText( "" , true ); diff --git a/kspread/kspread_util.cc b/kspread/kspread_util.cc index 43c2581b..47edd2ac 100644 --- a/kspread/kspread_util.cc +++ b/kspread/kspread_util.cc @@ -248,7 +248,7 @@ void Point::init(const TQString & _str) } TQString str( _str ); - int n = _str.tqfind( '!' ); + int n = _str.find( '!' ); if ( n != -1 ) { _sheetName = _str.left( n ); @@ -284,7 +284,7 @@ void Point::init(const TQString & _str) //default is error int x = -1; //search for the first character != text - int result = str.tqfind( TQRegExp("[^A-Za-z]+"), p ); + int result = str.find( TQRegExp("[^A-Za-z]+"), p ); //get the colomn number for the character between actual position and the first non text charakter if ( result != -1 ) @@ -381,7 +381,7 @@ Point::Point( const TQString & str, Map * map, { uint p = 0; - int p2 = str.tqfind( '!' ); + int p2 = str.find( '!' ); if ( p2 != -1 ) { _sheetName = str.left( p2++ ); @@ -464,7 +464,7 @@ Range::Range(const TQString & _str) _range.setLeft(-1); _sheet = 0; - int p = _str.tqfind(':'); + int p = _str.find(':'); // if (p == -1) // return; @@ -554,7 +554,7 @@ Range::Range(const TQString & str, Map * map, _sheet = 0; int p = 0; - int p2 = str.tqfind('!'); + int p2 = str.find('!'); if (p2 != -1) { _sheetName = str.left(p2++); @@ -574,7 +574,7 @@ Range::Range(const TQString & str, Map * map, _sheet = sheet; - int p3 = str.tqfind(':', p); + int p3 = str.find(':', p); if (p3 == -1) return; @@ -603,7 +603,7 @@ TQString Range::toString() const //Insert $ characters to show fixed parts of range - int pos=result.tqfind("!")+1; + int pos=result.find("!")+1; Q_ASSERT(pos != -1); if (_leftFixed) @@ -616,7 +616,7 @@ TQString Range::toString() const result.insert(pos+Cell::columnName(_range.left()).length(),'$'); } - pos=result.tqfind(":")+1; + pos=result.find(":")+1; Q_ASSERT(pos != -1); if (_rightFixed) @@ -657,9 +657,9 @@ void Range::getEndPoint(Point* pt) pt->setSheetName(_sheetName); } -bool Range::tqcontains (const Point &cell) const +bool Range::contains (const Point &cell) const { - return _range.tqcontains (cell.pos()); + return _range.contains (cell.pos()); } bool Range::intersects (const Range &r) const @@ -1007,10 +1007,10 @@ TQPen KSpread::convertOasisStringToPen( const TQString &border ) //Return true when it's a reference to cell from sheet. bool KSpread::localReferenceAnchor( const TQString &_ref ) { - bool isLocalRef = (_ref.tqfind("http://") != 0 && - _ref.tqfind("mailto:") != 0 && - _ref.tqfind("ftp://") != 0 && - _ref.tqfind("file:") != 0 ); + bool isLocalRef = (_ref.find("http://") != 0 && + _ref.find("mailto:") != 0 && + _ref.find("ftp://") != 0 && + _ref.find("file:") != 0 ); return isLocalRef; } diff --git a/kspread/kspread_util.h b/kspread/kspread_util.h index 5418f118..fc39708b 100644 --- a/kspread/kspread_util.h +++ b/kspread/kspread_util.h @@ -173,7 +173,7 @@ public: TQRect range() const; /** Returns true if this range includes the specified cell */ - bool tqcontains (const Point &cell) const; + bool contains (const Point &cell) const; /** * Returns true if this range intersects Range @p r (ie. there is at least one cell * which is common to both Ranges ) diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc index 3244a11d..8d1d8ddf 100644 --- a/kspread/kspread_view.cc +++ b/kspread/kspread_view.cc @@ -213,9 +213,9 @@ public: TQStringList replaceStrings; FindOption::searchTypeValue typeValue; FindOption::searchDirectionValue directionValue; - // Current "tqfind" operation - KFind* tqfind; - KReplace* tqreplace; + // Current "find" operation + KFind* find; + KReplace* replace; int findLeftColumn; int findRightColumn; TQPoint findPos; @@ -411,8 +411,8 @@ public: KAction* paste; KAction* specialPaste; KAction* insertCellCopy; - KAction* tqfind; - KAction* tqreplace; + KAction* find; + KAction* replace; // navigation KAction* gotoCell; @@ -967,11 +967,11 @@ void View::Private::initActions() 0, TQT_TQOBJECT(view), TQT_SLOT( slotInsertCellCopy() ), ac, "insertCellCopy" ); actions->insertCellCopy->setToolTip(i18n("Inserts a cell from the clipboard into the spreadsheet.")); - actions->tqfind = KStdAction::find( TQT_TQOBJECT(view), TQT_SLOT(tqfind()), ac ); + actions->find = KStdAction::find( TQT_TQOBJECT(view), TQT_SLOT(find()), ac ); /*actions->findNext =*/ KStdAction::findNext( TQT_TQOBJECT(view), TQT_SLOT( findNext() ), ac ); /*actions->findPrevious =*/ KStdAction::findPrev( TQT_TQOBJECT(view), TQT_SLOT( findPrevious() ), ac ); - actions->tqreplace = KStdAction::replace( TQT_TQOBJECT(view), TQT_SLOT(tqreplace()), ac ); + actions->replace = KStdAction::replace( TQT_TQOBJECT(view), TQT_SLOT(replace()), ac ); actions->fillRight = new KAction( i18n( "&Right" ), 0, 0, TQT_TQOBJECT(view), TQT_SLOT( fillRight() ), ac, "fillRight" ); @@ -1152,7 +1152,7 @@ void View::Private::initActions() void View::Private::adjustActions( bool mode ) { - actions->tqreplace->setEnabled( mode ); + actions->replace->setEnabled( mode ); actions->insertSeries->setEnabled( mode ); actions->insertLink->setEnabled( mode ); actions->insertSpecialChar->setEnabled( mode ); @@ -1444,7 +1444,7 @@ void KPSheetSelectPage::setOptions( const TQMap<TQString,TQString>& opts ) { unsigned int i = 0; TQStringList sheetlist; - while (opts.tqcontains(printOptionForIndex(i))) + while (opts.contains(printOptionForIndex(i))) { sheetlist.prepend(opts[printOptionForIndex(i++)]); } @@ -1506,7 +1506,7 @@ TQStringList KPSheetSelectPage::selectedSheets(KPrinter &prt) TQStringList list; unsigned int index; const TQMap<TQString,TQString>& options = prt.options(); - for (index = 0; options.tqcontains(KPSheetSelectPage::printOptionForIndex(index)); index++) + for (index = 0; options.contains(KPSheetSelectPage::printOptionForIndex(index)); index++) { list.append(options[KPSheetSelectPage::printOptionForIndex(index)]); } @@ -1759,8 +1759,8 @@ View::View( TQWidget *_parent, const char *_name, d->findRightColumn = 0; d->typeValue = FindOption::Value; d->directionValue = FindOption::Row; - d->tqfind = 0; - d->tqreplace = 0; + d->find = 0; + d->replace = 0; d->popupMenuFirstToolId = 0; d->popupMenu = 0; @@ -2452,7 +2452,7 @@ bool View::spellSwitchToOtherSheet() // for optimization TQPtrList<Sheet> sheetList = doc()->map()->sheetList(); - unsigned int curIndex = sheetList.tqfindRef(d->spell.currentSpellSheet); + unsigned int curIndex = sheetList.findRef(d->spell.currentSpellSheet); ++curIndex; // last sheet? then start at the beginning @@ -2536,7 +2536,7 @@ void View::spellCheckerCorrected( const TQString & old, const TQString & corr, d->spell.spellCurrCellX, d->spell.spellCurrCellY, cell->formatType()); - content.tqreplace( pos, old.length(), corr ); + content.replace( pos, old.length(), corr ); cell->setCellText( content ); d->editWidget->setText( content ); @@ -2838,8 +2838,8 @@ void View::updateReadWrite( bool readwrite ) d->actions->gotoCell->setEnabled( true ); d->actions->viewZoom->setEnabled( true ); d->actions->showPageBorders->setEnabled( true ); - d->actions->tqfind->setEnabled( true); - d->actions->tqreplace->setEnabled( readwrite ); + d->actions->find->setEnabled( true); + d->actions->replace->setEnabled( readwrite ); if ( !doc()->isReadWrite()) d->actions->copy->setEnabled( true ); // d->actions->newView->setEnabled( true ); @@ -3846,9 +3846,9 @@ void View::setActiveSheet( Sheet * _t, bool updateSheet ) d->adjustWorkbookActions( !doc()->map()->isProtected() ); /* see if there was a previous selection on this other sheet */ - TQMapIterator<Sheet*, TQPoint> it = d->savedAnchors.tqfind(d->activeSheet); - TQMapIterator<Sheet*, TQPoint> it2 = d->savedMarkers.tqfind(d->activeSheet); - TQMapIterator<Sheet*, KoPoint> it3 = d->savedOffsets.tqfind(d->activeSheet); + TQMapIterator<Sheet*, TQPoint> it = d->savedAnchors.find(d->activeSheet); + TQMapIterator<Sheet*, TQPoint> it2 = d->savedMarkers.find(d->activeSheet); + TQMapIterator<Sheet*, KoPoint> it3 = d->savedOffsets.find(d->activeSheet); // TODO Stefan: store the save markers/anchors in the Selection? TQPoint newAnchor = (it == d->savedAnchors.end()) ? TQPoint(1,1) : *it; @@ -4027,7 +4027,7 @@ void View::hideSheet() } TQStringList vs = doc()->map()->visibleSheets(); - int i = vs.tqfindIndex( d->activeSheet->tableName() ) - 1; + int i = vs.findIndex( d->activeSheet->tableName() ) - 1; if( i < 0 ) i = 1; TQString sn = vs[i]; @@ -4452,7 +4452,7 @@ void View::gotoCell() dlg.exec(); } -void View::tqfind() +void View::find() { if (!activeSheet()) return; @@ -4469,10 +4469,10 @@ void View::tqfind() d->directionValue = dlg.searchDirection(); // Create the KFind object - delete d->tqfind; - delete d->tqreplace; - d->tqfind = new KFind( dlg.pattern(), dlg.options(), this ); - d->tqreplace = 0L; + delete d->find; + delete d->replace; + d->find = new KFind( dlg.pattern(), dlg.options(), this ); + d->replace = 0L; d->searchInSheets.currentSheet = activeSheet(); d->searchInSheets.firstSheet = d->searchInSheets.currentSheet; @@ -4481,11 +4481,11 @@ void View::tqfind() findNext(); } -// Initialize a find or replace operation, using d->find or d->tqreplace, +// Initialize a find or replace operation, using d->find or d->replace, // and d->findOptions. void View::initFindReplace() { - KFind* findObj = d->tqfind ? d->tqfind : d->tqreplace; + KFind* findObj = d->find ? d->find : d->replace; Q_ASSERT( findObj ); connect(findObj, TQT_SIGNAL( highlight( const TQString &, int, int ) ), this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) ); @@ -4518,9 +4518,9 @@ void View::initFindReplace() void View::findNext() { - KFind* findObj = d->tqfind ? d->tqfind : d->tqreplace; + KFind* findObj = d->find ? d->find : d->replace; if ( !findObj ) { - tqfind(); + find(); return; } KFind::Result res = KFind::NoMatch; @@ -4539,10 +4539,10 @@ void View::findNext() } // Let KFind inspect the text fragment, and display a dialog if a match is found - if ( d->tqfind ) - res = d->tqfind->find(); + if ( d->find ) + res = d->find->find(); else - res = d->tqreplace->replace(); + res = d->replace->replace(); if ( res == KFind::NoMatch ) { // Go to next cell, skipping unwanted cells @@ -4574,10 +4574,10 @@ void View::findNext() findNext(); } else { // done, close the 'find next' dialog - if ( d->tqfind ) - d->tqfind->closeFindNextDialog(); + if ( d->find ) + d->find->closeFindNextDialog(); else - d->tqreplace->closeReplaceNextDialog(); + d->replace->closeReplaceNextDialog(); } } } @@ -4660,9 +4660,9 @@ Cell* View::findNextCell() void View::findPrevious() { - KFind* findObj = d->tqfind ? d->tqfind : d->tqreplace; + KFind* findObj = d->find ? d->find : d->replace; if ( !findObj ) { - tqfind(); + find(); return; } //kdDebug() << "findPrevious" << endl; @@ -4678,7 +4678,7 @@ void View::findPrevious() d->findOptions = opt; // restore initial options } -void View::tqreplace() +void View::replace() { if (!d->activeSheet) return; @@ -4694,21 +4694,21 @@ void View::tqreplace() d->replaceStrings = dlg.replacementHistory(); d->typeValue = dlg.searchType(); - delete d->tqfind; - delete d->tqreplace; - d->tqfind = 0L; + delete d->find; + delete d->replace; + d->find = 0L; // NOTE Stefan: Avoid beginning of line replacements with nothing which // will lead to an infinite loop (Bug #125535). The reason // for this is unclear to me, but who cares and who would // want to do something like this, häh?! if (dlg.pattern() == "^" && dlg.replacement().isEmpty()) return; - d->tqreplace = new KReplace( dlg.pattern(), dlg.replacement(), dlg.options() ); + d->replace = new KReplace( dlg.pattern(), dlg.replacement(), dlg.options() ); d->searchInSheets.currentSheet = activeSheet(); d->searchInSheets.firstSheet = d->searchInSheets.currentSheet; initFindReplace(); - connect( d->tqreplace, TQT_SIGNAL( tqreplace( const TQString &, int, int, int ) ), + connect( d->replace, TQT_SIGNAL( replace( const TQString &, int, int, int ) ), this, TQT_SLOT( slotReplace( const TQString &, int, int, int ) ) ); if ( !doc()->undoLocked() ) @@ -4737,10 +4737,10 @@ void View::slotHighlight( const TQString &/*text*/, int /*matchingIndex*/, int / { d->selection->initialize( d->findPos ); KDialogBase *baseDialog=0L; - if ( d->tqfind ) - baseDialog = d->tqfind->findNextDialog(); + if ( d->find ) + baseDialog = d->find->findNextDialog(); else - baseDialog = d->tqreplace->replaceNextDialog(); + baseDialog = d->replace->replaceNextDialog(); kdDebug()<<" baseDialog :"<<baseDialog<<endl; TQRect globalRect( d->findPos, d->findEnd ); globalRect.moveTopLeft( canvasWidget()->mapToGlobal( globalRect.topLeft() ) ); @@ -5477,11 +5477,11 @@ KoDocument * View::hitTest( const TQPoint& /*pos*/ ) // { // if ( ( viewChild = child( docChild->document() ) ) ) // { -// if ( viewChild->frameRegion( m ).tqcontains( pos ) ) +// if ( viewChild->frameRegion( m ).contains( pos ) ) // return 0; // } // else -// if ( docChild->frameRegion( m ).tqcontains( pos ) ) +// if ( docChild->frameRegion( m ).contains( pos ) ) // return 0; // } // @@ -5490,11 +5490,11 @@ KoDocument * View::hitTest( const TQPoint& /*pos*/ ) // { // if ( ( viewChild = child( docChild->document() ) ) ) // { -// if ( viewChild->frameRegion( m ).tqcontains( pos ) ) +// if ( viewChild->frameRegion( m ).contains( pos ) ) // return 0; // } // else -// if ( docChild->frameRegion( m ).tqcontains( pos ) ) +// if ( docChild->frameRegion( m ).contains( pos ) ) // return 0; // } // @@ -5847,7 +5847,7 @@ void View::slotListChoosePopupMenu( ) { if ( c->value().isString() && c->text() != tmp && !c->text().isEmpty() ) { - if ( itemList.tqfindIndex( c->text() ) == -1 ) + if ( itemList.findIndex( c->text() ) == -1 ) itemList.append(c->text()); } } @@ -6830,11 +6830,11 @@ void View::slotRename() i18n("Change Sheet Name") ); newName = newName.simplifyWhiteSpace(); - int n = newName.tqfind('-'); + int n = newName.find('-'); if ( n > -1 ) newName[n] = '_'; - n = newName.tqfind('!'); + n = newName.find('!'); if ( n > -1 ) newName[n] = '_'; - n = newName.tqfind('$'); + n = newName.find('$'); if ( n > -1 ) newName[n] = '_'; newName = KInputDialog::getText( i18n("Rename Sheet"),i18n("Enter name:"), newName, &ok, this ); @@ -7444,19 +7444,19 @@ void View::commandExecuted() void View::initialiseMarkerFromSheet( Sheet *_sheet, const TQPoint &point ) { - d->savedMarkers.tqreplace( _sheet, point); + d->savedMarkers.replace( _sheet, point); } TQPoint View::markerFromSheet( Sheet* sheet ) const { - TQMapIterator<Sheet*, TQPoint> it = d->savedMarkers.tqfind(sheet); + TQMapIterator<Sheet*, TQPoint> it = d->savedMarkers.find(sheet); TQPoint newMarker = (it == d->savedMarkers.end()) ? TQPoint(1,1) : *it; return newMarker; } KoPoint View::offsetFromSheet( Sheet* sheet ) const { - TQMapIterator<Sheet*, KoPoint> it = d->savedOffsets.tqfind(sheet); + TQMapIterator<Sheet*, KoPoint> it = d->savedOffsets.find(sheet); KoPoint offset = (it == d->savedOffsets.end()) ? KoPoint() : *it; return offset; } @@ -7466,11 +7466,11 @@ void View::saveCurrentSheetSelection() /* save the current selection on this sheet */ if (d->activeSheet != NULL) { - d->savedAnchors.tqreplace(d->activeSheet, d->selection->anchor()); + d->savedAnchors.replace(d->activeSheet, d->selection->anchor()); kdDebug() << " Current scrollbar vert value: " << d->canvas->vertScrollBar()->value() << endl; kdDebug() << "Saving marker pos: " << d->selection->marker() << endl; - d->savedMarkers.tqreplace(d->activeSheet, d->selection->marker()); - d->savedOffsets.tqreplace(d->activeSheet, KoPoint(d->canvas->xOffset(), + d->savedMarkers.replace(d->activeSheet, d->selection->marker()); + d->savedOffsets.replace(d->activeSheet, KoPoint(d->canvas->xOffset(), d->canvas->yOffset())); } } diff --git a/kspread/kspread_view.h b/kspread/kspread_view.h index 4a64a52e..4d6eb96f 100644 --- a/kspread/kspread_view.h +++ b/kspread/kspread_view.h @@ -407,10 +407,10 @@ public slots: void toggleProtectSheet( bool ); void toggleProtectDoc( bool ); void viewZoom( const TQString & ); - void tqfind(); + void find(); void findNext(); void findPrevious(); - void tqreplace(); + void replace(); void conditional(); void validity(); void insertSeries(); @@ -638,7 +638,7 @@ protected slots: void slotListChoosePopupMenu( ); /** - * Called by tqfind/tqreplace (findNext) when it found a match + * Called by find/replace (findNext) when it found a match */ void slotHighlight( const TQString &text, int matchingIndex, int matchedLength ); /** diff --git a/kspread/ksprsavinginfo.h b/kspread/ksprsavinginfo.h index 0dff20e2..46bdd2cc 100644 --- a/kspread/ksprsavinginfo.h +++ b/kspread/ksprsavinginfo.h @@ -45,7 +45,7 @@ public: sheetDef pageDef( const TQString &name) { return m_masterPageStyle[name]; } - bool findStyleName(const TQString & name) const { return (m_masterPageStyle.tqfind( name ) != m_masterPageStyle.end());} + bool findStyleName(const TQString & name) const { return (m_masterPageStyle.find( name ) != m_masterPageStyle.end());} StylePageMap stylePageMap() const { return m_masterPageStyle;} diff --git a/kspread/manipulator.cc b/kspread/manipulator.cc index 5d501798..bed111ba 100644 --- a/kspread/manipulator.cc +++ b/kspread/manipulator.cc @@ -1224,7 +1224,7 @@ bool AdjustColumnRowManipulator::process(Element* element) int col = cell->column(); if ( !cell->isEmpty() && !cell->isObscured()) { - if (widths.tqcontains(col) && widths[col] != -1.0) + if (widths.contains(col) && widths[col] != -1.0) { ColumnFormat* format = sheet->nonDefaultColumnFormat(col); if ( kAbs(format->dblWidth() - widths[col] ) > DBL_EPSILON ) @@ -1241,7 +1241,7 @@ bool AdjustColumnRowManipulator::process(Element* element) { for (int col = range.left(); col <= range.right(); ++col) { - if (widths.tqcontains(col) && widths[col] != -1.0) + if (widths.contains(col) && widths[col] != -1.0) { ColumnFormat* format = sheet->nonDefaultColumnFormat(col); if ( kAbs(format->dblWidth() - widths[col] ) > DBL_EPSILON ) @@ -1264,7 +1264,7 @@ bool AdjustColumnRowManipulator::process(Element* element) int row = cell->row(); if ( !cell->isEmpty() && !cell->isObscured()) { - if (heights.tqcontains(row) && heights[row] != -1.0) + if (heights.contains(row) && heights[row] != -1.0) { RowFormat* format = sheet->nonDefaultRowFormat(row); if ( kAbs(format->dblHeight() - heights[row] ) > DBL_EPSILON ) @@ -1281,7 +1281,7 @@ bool AdjustColumnRowManipulator::process(Element* element) { for (int row = range.top(); row <= range.bottom(); ++row) { - if (heights.tqcontains(row) && heights[row] != -1.0) + if (heights.contains(row) && heights[row] != -1.0) { RowFormat* format = sheet->nonDefaultRowFormat(row); if ( kAbs(format->dblHeight() - heights[row] ) > DBL_EPSILON ) @@ -1323,7 +1323,7 @@ bool AdjustColumnRowManipulator::preProcessing() int row = cell->row(); if (m_adjustColumn) { - if (!m_newWidths.tqcontains(col)) + if (!m_newWidths.contains(col)) { m_newWidths[col] = -1.0; ColumnFormat* format = m_sheet->columnFormat(col); @@ -1337,7 +1337,7 @@ bool AdjustColumnRowManipulator::preProcessing() } if (m_adjustRow) { - if (!m_newHeights.tqcontains(row)) + if (!m_newHeights.contains(row)) { m_newHeights[row] = -1.0; RowFormat* format = m_sheet->rowFormat(row); @@ -1363,7 +1363,7 @@ bool AdjustColumnRowManipulator::preProcessing() int col = cell->column(); if (m_adjustColumn) { - if (!m_newWidths.tqcontains(col)) + if (!m_newWidths.contains(col)) { m_newWidths[col] = -1.0; ColumnFormat* format = m_sheet->columnFormat(col); @@ -1377,7 +1377,7 @@ bool AdjustColumnRowManipulator::preProcessing() } if (m_adjustRow) { - if (!m_newHeights.tqcontains(row)) + if (!m_newHeights.contains(row)) { m_newHeights[row] = -1.0; RowFormat* format = m_sheet->rowFormat(row); @@ -1403,7 +1403,7 @@ bool AdjustColumnRowManipulator::preProcessing() cell = m_sheet->cellAt( col, row ); if (m_adjustColumn) { - if (!m_newWidths.tqcontains(col)) + if (!m_newWidths.contains(col)) { m_newWidths[col] = -1.0; ColumnFormat* format = m_sheet->columnFormat(col); @@ -1417,7 +1417,7 @@ bool AdjustColumnRowManipulator::preProcessing() } if (m_adjustRow) { - if (!m_newHeights.tqcontains(row)) + if (!m_newHeights.contains(row)) { m_newHeights[row] = -1.0; RowFormat* format = m_sheet->rowFormat(row); diff --git a/kspread/manipulator_data.cc b/kspread/manipulator_data.cc index 827c610a..5b829de3 100644 --- a/kspread/manipulator_data.cc +++ b/kspread/manipulator_data.cc @@ -48,7 +48,7 @@ bool AbstractDataManipulator::process (Element* element) FormatType fmtType = No_format; if (m_reverse) { // reverse - use the stored value - if (oldData.tqcontains (col) && oldData[col].tqcontains (row)) { + if (oldData.contains (col) && oldData[col].contains (row)) { val = oldData[col][row].val; text = oldData[col][row].text; fmtType = oldData[col][row].format; diff --git a/kspread/plugins/calculator/kcalc_core.cpp b/kspread/plugins/calculator/kcalc_core.cpp index e82e56c9..7a6f8209 100644 --- a/kspread/plugins/calculator/kcalc_core.cpp +++ b/kspread/plugins/calculator/kcalc_core.cpp @@ -575,7 +575,7 @@ void TQtCalculator::EnterNegate() TQString string; string = display_str; int pos; - pos = string.tqfindRev('e',-1,false); + pos = string.findRev('e',-1,false); if(pos == -1) return; diff --git a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py index 8217a751..f434bce5 100755 --- a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py +++ b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py @@ -813,7 +813,7 @@ class SampleDialog(qt.QDialog): widget = self.samplechild.widgets[widgetname] value = widget.value() if value != None: - code = code.tqreplace("{%s}" % widgetname, str(value)) + code = code.replace("{%s}" % widgetname, str(value)) return code class MainDialog(qt.QDialog): diff --git a/kspread/region.cc b/kspread/region.cc index 4b31554c..92c408ef 100644 --- a/kspread/region.cc +++ b/kspread/region.cc @@ -75,7 +75,7 @@ Region::Region(View* view, const TQString& string, Sheet* sheet) sheet = filterSheetName(sRegion); } - int delimiterPos = sRegion.tqfind(':'); + int delimiterPos = sRegion.find(':'); if (delimiterPos > -1) { // range @@ -335,7 +335,7 @@ Region::Element* Region::eor(const TQPoint& point, Sheet* sheet) Iterator endOfList = cells().end(); while (it != endOfList) { - if (!(*it)->tqcontains(point)) + if (!(*it)->contains(point)) { ++it; continue; @@ -420,7 +420,7 @@ Region::Iterator Region::insert(Region::Iterator pos, const TQPoint& point, Shee { continue; } - if (element->tqcontains(point)) + if (element->contains(point)) { containsPoint = true; break; @@ -430,7 +430,7 @@ Region::Iterator Region::insert(Region::Iterator pos, const TQPoint& point, Shee neighbour = element->rect().normalize(); neighbour.setTopLeft(neighbour.topLeft() - TQPoint(1,1)); neighbour.setBottomRight(neighbour.bottomRight() + TQPoint(1,1)); - if (neighbour.tqcontains(point)) + if (neighbour.contains(point)) { adjacentPoint = true; // TODO Stefan: Implement! break; @@ -471,11 +471,11 @@ Region::Iterator Region::insert(Region::Iterator pos, const TQRect& range, Sheet ++it; continue; } - if ((*it)->tqcontains(range)) + if ((*it)->contains(range)) { containsRange = true; } - else if (range.tqcontains((*it)->rect())) + else if (range.contains((*it)->rect())) { delete *it; it = d->cells.remove(it); @@ -570,7 +570,7 @@ bool Region::isColumnOrRowSelected() const return false; } -bool Region::tqcontains(const TQPoint& point, Sheet* sheet) const +bool Region::contains(const TQPoint& point, Sheet* sheet) const { if (d->cells.isEmpty()) { @@ -580,7 +580,7 @@ bool Region::tqcontains(const TQPoint& point, Sheet* sheet) const for (ConstIterator it = d->cells.constBegin(); it != endOfList; ++it) { Element *element = *it; - if (element->tqcontains(point)) + if (element->contains(point)) { if (sheet && element->sheet() != sheet) { @@ -691,7 +691,7 @@ void Region::operator=(const Region& other) Sheet* Region::filterSheetName(TQString& sRegion) { Sheet* sheet = 0; - int delimiterPos = sRegion.tqfind( '!' ); + int delimiterPos = sRegion.find( '!' ); if (delimiterPos > -1) { TQString sheetName = sRegion.left(delimiterPos); @@ -801,7 +801,7 @@ Region::Point::Point(const TQString& sCell) //default is error int x = -1; //search for the first character != text - int result = string.tqfind( TQRegExp("[^A-Za-z]+"), p ); + int result = string.find( TQRegExp("[^A-Za-z]+"), p ); //get the colomn number for the character between actual position and the first non text charakter if ( result != -1 ) @@ -885,12 +885,12 @@ TQString Region::Point::name(Sheet* originSheet) const return name + Cell::name(m_point.x(), m_point.y()); } -bool Region::Point::tqcontains(const TQPoint& point) const +bool Region::Point::contains(const TQPoint& point) const { return (m_point == point); } -bool Region::Point::tqcontains(const TQRect& range) const +bool Region::Point::contains(const TQRect& range) const { return (range.width() == 1) && (range.height() == 1) && (range.topLeft() == m_point); } @@ -910,7 +910,7 @@ Region::Range::Range(const TQString& sRange) : Region::Element(), m_range() { - int delimiterPos = sRange.tqfind(':'); + int delimiterPos = sRange.find(':'); if (delimiterPos == -1) { return; @@ -943,14 +943,14 @@ TQString Region::Range::name(Sheet* originSheet) const Cell::name(m_range.right(), m_range.bottom() ); } -bool Region::Range::tqcontains(const TQPoint& point) const +bool Region::Range::contains(const TQPoint& point) const { - return m_range.normalize().tqcontains(point); + return m_range.normalize().contains(point); } -bool Region::Range::tqcontains(const TQRect& range) const +bool Region::Range::contains(const TQRect& range) const { - return m_range.normalize().tqcontains(range.normalize()); + return m_range.normalize().contains(range.normalize()); } } // namespace KSpread diff --git a/kspread/region.h b/kspread/region.h index 2459dc8e..35972683 100644 --- a/kspread/region.h +++ b/kspread/region.h @@ -184,7 +184,7 @@ public: * @param sheet the sheet the point belongs to * @return @c true, if the region contains the point @p point */ - bool tqcontains(const TQPoint& point, Sheet* sheet = 0) const; + bool contains(const TQPoint& point, Sheet* sheet = 0) const; @@ -334,8 +334,8 @@ public: virtual bool isColumn() const { return false; } virtual bool isRow() const { return false; } - virtual bool tqcontains(const TQPoint&) const { return false; } - virtual bool tqcontains(const TQRect&) const { return false; } + virtual bool contains(const TQPoint&) const { return false; } + virtual bool contains(const TQRect&) const { return false; } virtual TQString name(Sheet* = 0) const { return TQString(""); } virtual TQRect rect() const { return TQRect(); } @@ -379,8 +379,8 @@ public: virtual bool isColumn() const { return false; } virtual bool isRow() const { return false; } - virtual bool tqcontains(const TQPoint&) const; - virtual bool tqcontains(const TQRect&) const; + virtual bool contains(const TQPoint&) const; + virtual bool contains(const TQRect&) const; virtual TQString name(Sheet* originSheet = 0) const; @@ -419,8 +419,8 @@ public: virtual bool isColumn() const { return (m_range.normalize().top() == 1 && m_range.normalize().bottom() == KS_rowMax); } virtual bool isRow() const { return (m_range.normalize().left() == 1 && m_range.normalize().right() == KS_colMax); } - virtual bool tqcontains(const TQPoint&) const; - virtual bool tqcontains(const TQRect&) const; + virtual bool contains(const TQPoint&) const; + virtual bool contains(const TQRect&) const; virtual TQString name(Sheet* originSheet = 0) const; diff --git a/kspread/selection.cc b/kspread/selection.cc index 3a0346b6..f05a6db5 100644 --- a/kspread/selection.cc +++ b/kspread/selection.cc @@ -952,7 +952,7 @@ Selection::Point::Point(const TQString& string) } //search for the first character != text - int result = string.tqfind( TQRegExp("[^A-Za-z]+"), p ); + int result = string.find( TQRegExp("[^A-Za-z]+"), p ); if (string[result] == '$') { m_rowFixed = true; @@ -986,7 +986,7 @@ Selection::Range::Range(const TQString& string) return; } - int delimiterPos = string.tqfind(':'); + int delimiterPos = string.find(':'); if (delimiterPos == -1) { return; diff --git a/kspread/tests/generate-openformula-tests b/kspread/tests/generate-openformula-tests index 39b93811..f39ce2aa 100755 --- a/kspread/tests/generate-openformula-tests +++ b/kspread/tests/generate-openformula-tests @@ -4,7 +4,7 @@ # Requires an open instance of KSpread, with openformula-test.ods loaded. # -KSPREAD=`dcoptqfind 'kspread*'` +KSPREAD=`dcopfind 'kspread*'` KSPREAD=`echo $KSPREAD | sed s/DCOPRef\(// | sed s/,\)//` for i in `seq 51 514` do diff --git a/kspread/tests/inspector.cc b/kspread/tests/inspector.cc index 72410f53..17179793 100644 --- a/kspread/tests/inspector.cc +++ b/kspread/tests/inspector.cc @@ -98,7 +98,7 @@ void Inspector::Private::handleCell() new TQListViewItem( cellView, "Style Properties", longAsHexstring( static_cast<long>( cell->format()->style()->features() ) ) ); new TQListViewItem( cellView, "Text", cell->text() ); new TQListViewItem( cellView, "Text (Displayed)", - cell->strOutText().tqreplace( TQChar('\n'), "\\n" ) ); + cell->strOutText().replace( TQChar('\n'), "\\n" ) ); TQTextStream ts( &str, IO_WriteOnly ); ts << cell->value(); diff --git a/kspread/tests/testrunner.cc b/kspread/tests/testrunner.cc index 71d3fcdb..53fe60b3 100644 --- a/kspread/tests/testrunner.cc +++ b/kspread/tests/testrunner.cc @@ -104,7 +104,7 @@ void TestRunner::addTester( Tester* tester ) void TestRunner::runTest() { TQString testName = d->testType->currentText(); - Tester* tester = d->testers.tqfind( testName ); + Tester* tester = d->testers.find( testName ); if( tester ) { d->logView->clear(); diff --git a/kspread/valueconverter.cc b/kspread/valueconverter.cc index 1aeb25db..8dda86d1 100644 --- a/kspread/valueconverter.cc +++ b/kspread/valueconverter.cc @@ -197,8 +197,8 @@ Value ValueConverter::asString (const Value &value) const //convert the number, change decimal point from English to local s = TQString::number (value.asFloat(), 'g', 10); decimal_point = parser->locale()->decimalSymbol()[0]; - if (decimal_point && ((pos = s.tqfind ('.')) != -1)) - s = s.tqreplace (pos, 1, decimal_point); + if (decimal_point && ((pos = s.find ('.')) != -1)) + s = s.replace (pos, 1, decimal_point); if (fmt == Value::fmt_Percent) s += " %"; val.setValue (s); diff --git a/kspread/valueformatter.cc b/kspread/valueformatter.cc index 1bef11e2..9e3c57da 100644 --- a/kspread/valueformatter.cc +++ b/kspread/valueformatter.cc @@ -201,18 +201,18 @@ FormatType ValueFormatter::determineFormatting (const Value &value, void ValueFormatter::removeTrailingZeros (TQString &str, TQChar decimal_point) { - if (str.tqfind (decimal_point) < 0) + if (str.find (decimal_point) < 0) //no decimal point -> nothing to do return; int start = 0; int cslen = converter->locale()->currencySymbol().length(); - if (str.tqfind ('%') != -1) + if (str.find ('%') != -1) start = 2; - else if (str.tqfind (converter->locale()->currencySymbol()) == + else if (str.find (converter->locale()->currencySymbol()) == ((int) (str.length() - cslen))) start = cslen + 1; - else if ((start = str.tqfind ('E')) != -1) + else if ((start = str.find ('E')) != -1) start = str.length() - start; else start = 0; @@ -277,8 +277,8 @@ TQString ValueFormatter::createNumberFormat ( double value, int precision, case Scientific_format: decimal_point = converter->locale()->decimalSymbol()[0]; localizedNumber = TQString::number (value, 'E', p); - if ((pos = localizedNumber.tqfind ('.')) != -1) - localizedNumber = localizedNumber.tqreplace (pos, 1, decimal_point); + if ((pos = localizedNumber.find ('.')) != -1) + localizedNumber = localizedNumber.replace (pos, 1, decimal_point); break; default : //other formatting? diff --git a/kspread/valueparser.cc b/kspread/valueparser.cc index 9acd3705..ff5b4b8c 100644 --- a/kspread/valueparser.cc +++ b/kspread/valueparser.cc @@ -202,7 +202,7 @@ Value ValueParser::tryParseBool (const TQString& str, bool *ok) double ValueParser::readNumber(const TQString &_str, bool * ok, bool * isInt) { TQString str = _str.stripWhiteSpace(); - bool neg = str.tqfind(parserLocale->negativeSign()) == 0; + bool neg = str.find(parserLocale->negativeSign()) == 0; if (neg) str.remove( 0, parserLocale->negativeSign().length() ); @@ -212,7 +212,7 @@ double ValueParser::readNumber(const TQString &_str, bool * ok, bool * isInt) TQString exponentialPart; int EPos; - EPos = str.tqfind('E', 0, false); + EPos = str.find('E', 0, false); if (EPos != -1) { @@ -220,7 +220,7 @@ double ValueParser::readNumber(const TQString &_str, bool * ok, bool * isInt) str = str.left(EPos); } - int pos = str.tqfind(parserLocale->decimalSymbol()); + int pos = str.find(parserLocale->decimalSymbol()); TQString major; TQString minor; if ( pos == -1 ) @@ -238,7 +238,7 @@ double ValueParser::readNumber(const TQString &_str, bool * ok, bool * isInt) // Remove thousand separators int thlen = parserLocale->thousandsSeparator().length(); int lastpos = 0; - while ( ( pos = major.tqfind( parserLocale->thousandsSeparator() ) ) > 0 ) + while ( ( pos = major.find( parserLocale->thousandsSeparator() ) ) > 0 ) { // e.g. 12,,345,,678,,922 Acceptable positions (from the end) are 5, 10, 15... i.e. (3+thlen)*N int fromEnd = major.length() - pos; @@ -290,7 +290,7 @@ Value ValueParser::tryParseNumber (const TQString& str, bool *ok) if (!(*ok)) { val = str2.toDouble(ok); - if (str.tqcontains('.')) + if (str.contains('.')) isInt = false; else isInt = true; @@ -315,7 +315,7 @@ Value ValueParser::tryParseNumber (const TQString& str, bool *ok) else value.setValue (val); - if ( str2.tqcontains('E') || str2.tqcontains('e') ) + if ( str2.contains('E') || str2.contains('e') ) fmtType = Scientific_format; else { @@ -342,7 +342,7 @@ Value ValueParser::tryParseDate (const TQString& str, bool *ok) // If the year is in the middle, say %m-%Y/%d, we'll remove the sep. // before it (%m/%d). TQString fmt = parserLocale->dateFormatShort(); - int yearPos = fmt.tqfind ("%Y", 0, false); + int yearPos = fmt.find ("%Y", 0, false); if ( yearPos > -1 ) { if ( yearPos == 0 ) @@ -370,7 +370,7 @@ Value ValueParser::tryParseDate (const TQString& str, bool *ok) // The following fixes the problem, 3/4/1955 will always be 1955 TQString fmt = parserLocale->dateFormatShort(); - if( ( fmt.tqcontains( "%y" ) == 1 ) && ( tmpDate.year() > 2999 ) ) + if( ( fmt.contains( "%y" ) == 1 ) && ( tmpDate.year() > 2999 ) ) tmpDate = tmpDate.addYears( -1900 ); // this is another HACK ! @@ -388,8 +388,8 @@ Value ValueParser::tryParseDate (const TQString& str, bool *ok) // if year is 2045, check to see if "2045" isn't there --> actual // input is "45" - if( ( str.tqcontains( yearTwoDigits ) >= 1 ) && - ( str.tqcontains( yearFourDigits ) == 0 ) ) + if( ( str.contains( yearTwoDigits ) >= 1 ) && + ( str.contains( yearFourDigits ) == 0 ) ) tmpDate = tmpDate.addYears( -100 ); } @@ -436,7 +436,7 @@ Value ValueParser::tryParseTime (const TQString& str, bool *ok) TQString stringPm = parserLocale->translate("pm"); TQString stringAm = parserLocale->translate("am"); int pos=0; - if((pos=str.tqfind(stringPm))!=-1) + if((pos=str.find(stringPm))!=-1) { TQString tmp=str.mid(0,str.length()-stringPm.length()); tmp=tmp.simplifyWhiteSpace(); @@ -444,7 +444,7 @@ Value ValueParser::tryParseTime (const TQString& str, bool *ok) if (!valid) tm = parserLocale->readTime(tmp+":00 "+stringPm, &valid); } - else if((pos=str.tqfind(stringAm))!=-1) + else if((pos=str.find(stringAm))!=-1) { TQString tmp = str.mid(0,str.length()-stringAm.length()); tmp = tmp.simplifyWhiteSpace(); @@ -482,7 +482,7 @@ TQDateTime ValueParser::readTime (const TQString & intstr, bool withSeconds, TQString format = parserLocale->timeFormat().simplifyWhiteSpace(); if ( !withSeconds ) { - int n = format.tqfind("%S"); + int n = format.find("%S"); format = format.left( n - 1 ); } diff --git a/kugar/kudesigner_lib/band.cpp b/kugar/kudesigner_lib/band.cpp index 09e62dbe..ffc56fe4 100644 --- a/kugar/kudesigner_lib/band.cpp +++ b/kugar/kudesigner_lib/band.cpp @@ -101,7 +101,7 @@ TQString Band::getXml() int Band::isInHolder( const TQPoint p ) { - if ( bottomMiddleResizableRect().tqcontains( p ) ) + if ( bottomMiddleResizableRect().contains( p ) ) return ( ResizeBottom ); return ResizeNothing; } diff --git a/kugar/kudesigner_lib/reportitem.cpp b/kugar/kudesigner_lib/reportitem.cpp index 78446a9e..4ca541df 100644 --- a/kugar/kudesigner_lib/reportitem.cpp +++ b/kugar/kudesigner_lib/reportitem.cpp @@ -121,21 +121,21 @@ TQString ReportItem::getXml() int ReportItem::isInHolder( const TQPoint p ) { - if ( topLeftResizableRect().tqcontains( p ) ) + if ( topLeftResizableRect().contains( p ) ) return ( ResizeTop | ResizeLeft ); - if ( bottomLeftResizableRect().tqcontains( p ) ) + if ( bottomLeftResizableRect().contains( p ) ) return ( ResizeBottom | ResizeLeft ); - if ( leftMiddleResizableRect().tqcontains( p ) ) + if ( leftMiddleResizableRect().contains( p ) ) return ( ResizeLeft ); - if ( bottomMiddleResizableRect().tqcontains( p ) ) + if ( bottomMiddleResizableRect().contains( p ) ) return ( ResizeBottom ); - if ( topMiddleResizableRect().tqcontains( p ) ) + if ( topMiddleResizableRect().contains( p ) ) return ( ResizeTop ); - if ( topRightResizableRect().tqcontains( p ) ) + if ( topRightResizableRect().contains( p ) ) return ( ResizeTop | ResizeRight ); - if ( bottomRightResizableRect().tqcontains( p ) ) + if ( bottomRightResizableRect().contains( p ) ) return ( ResizeBottom | ResizeRight ); - if ( rightMiddleResizableRect().tqcontains( p ) ) + if ( rightMiddleResizableRect().contains( p ) ) return ( ResizeRight ); return ResizeNothing; @@ -238,9 +238,9 @@ bool ReportItem::intersects( ReportItem *item ) TQString ReportItem::escape( TQString string ) { - string.tqreplace( TQRegExp( "&" ), "&" ); - string.tqreplace( TQRegExp( "<" ), "<" ); - string.tqreplace( TQRegExp( ">" ), ">" ); + string.replace( TQRegExp( "&" ), "&" ); + string.replace( TQRegExp( "<" ), "<" ); + string.replace( TQRegExp( ">" ), ">" ); return string; } diff --git a/kugar/kudesigner_lib/structurewidget.cpp b/kugar/kudesigner_lib/structurewidget.cpp index e629beca..945d3b71 100644 --- a/kugar/kudesigner_lib/structurewidget.cpp +++ b/kugar/kudesigner_lib/structurewidget.cpp @@ -174,7 +174,7 @@ void StructureWidget::refreshSectionContents( Kudesigner::Band *section, Structu name = tqtr( "Calculated Field: %1" ).tqarg( box->props[ "Field" ].value().toString() ); break; case Kudesigner::Rtti_Special: - idx = box->props[ "Type" ].listData()->keys.tqfindIndex( + 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() ); break; @@ -194,7 +194,7 @@ void StructureWidget::selectionMade() BoxList sel = m_doc->selected; for ( BoxList::iterator it = sel.begin(); it != sel.end(); ++it ) { - if ( m_items.tqcontains( *it ) ) + if ( m_items.contains( *it ) ) { StructureItem * item = static_cast<StructureItem*>( m_items[ *it ] ); item->setBold( true ); @@ -220,7 +220,7 @@ void StructureWidget::selectItem( TQListViewItem *item ) { if ( !item ) return ; - int idx = m_items.values().tqfindIndex( static_cast<StructureItem*>( item ) ); + int idx = m_items.values().findIndex( static_cast<StructureItem*>( item ) ); if ( idx == -1 ) return ; Kudesigner::Box *box = m_items.keys() [ idx ]; diff --git a/kugar/kudesigner_lib/view.cpp b/kugar/kudesigner_lib/view.cpp index 6c5c4404..70bf22ca 100644 --- a/kugar/kudesigner_lib/view.cpp +++ b/kugar/kudesigner_lib/view.cpp @@ -149,7 +149,7 @@ void View::selectItemFromList( TQCanvasItemList &l ) if ( ( *it ) ->rtti() >= 1800 ) //include bands and the template itself { Kudesigner::Box * b = static_cast<Kudesigner::Box*>( *it ); - if ( !m_canvas->selected.tqcontains( b ) ) + if ( !m_canvas->selected.contains( b ) ) { m_canvas->unselectAll(); m_canvas->selectItem( b, false ); @@ -158,7 +158,7 @@ void View::selectItemFromList( TQCanvasItemList &l ) // selected->drawHolders(); return ; } - if ( m_canvas->selected.tqcontains( b ) ) + if ( m_canvas->selected.contains( b ) ) { if ( m_canvas->selected.count() > 1 ) { @@ -465,7 +465,7 @@ void View::contentsMouseMoveEvent( TQMouseEvent* e ) if ((*it)->rtti() > 2000) { CanvasReportItem *item = (CanvasReportItem*)(*it); - if (item->bottomRightResizableRect().tqcontains(e->pos())) + if (item->bottomRightResizableRect().contains(e->pos())) setCursor(TQCursor(TQt::SizeFDiagCursor)); } }*/ @@ -598,7 +598,7 @@ void View::contentsMouseMoveEvent( TQMouseEvent* e ) r.setBottom( top < bottom ? bottom : top ); if ( ( ( *it ) ->rtti() > 2001 ) && - ( r.tqcontains( static_cast<Kudesigner::Box*>( *it ) ->rect() ) ) ) + ( r.contains( static_cast<Kudesigner::Box*>( *it ) ->rect() ) ) ) { m_canvas->selectItem( static_cast<Kudesigner::Box*>( *it ) ); m_canvas->update(); @@ -613,7 +613,7 @@ void View::contentsMouseMoveEvent( TQMouseEvent* e ) for (TQCanvasItemList::Iterator it=l.begin(); it!=l.end(); ++it) { if ( ((*it)->rtti() > 2001) && - (selectionRect->rect().tqcontains(((CanvasKudesigner::Box*)(*it))->rect())) ) + (selectionRect->rect().contains(((CanvasKudesigner::Box*)(*it))->rect())) ) { selectItem((CanvasKudesigner::Box*)(*it)); m_canvas->update(); diff --git a/kugar/lib/inputmask.cpp b/kugar/lib/inputmask.cpp index 8194a211..6fb49220 100644 --- a/kugar/lib/inputmask.cpp +++ b/kugar/lib/inputmask.cpp @@ -255,7 +255,7 @@ TQString InputMask::maskString( uint pos, const TQString &str, bool clear ) cons if ( str.length() != 1 || i == 0 || ( i > 0 && ( !m_maskData[ i - 1 ].separator || m_maskData[ i - 1 ].maskChar != str[ ( int ) strIndex ] ) ) ) { s += fill.mid( i, n - i + 1 ); - i = n + 1; // update i to tqfind + 1 + i = n + 1; // update i to find + 1 } } else @@ -276,7 +276,7 @@ TQString InputMask::maskString( uint pos, const TQString &str, bool clear ) cons default: s += str[ ( int ) strIndex ]; } - i = n + 1; // updates i to tqfind + 1 + i = n + 1; // updates i to find + 1 } } } diff --git a/kugar/lib/mfieldobject.cpp b/kugar/lib/mfieldobject.cpp index b0918c8c..7f7b994a 100644 --- a/kugar/lib/mfieldobject.cpp +++ b/kugar/lib/mfieldobject.cpp @@ -203,7 +203,7 @@ void MFieldObject::formatNegValue() /** Formats the string representation of a number with comma separators */ void MFieldObject::formatCommas() { - // text = text.tqreplace(".", ","); + // text = text.replace(".", ","); TQString tmp; int i, j; int offset; @@ -215,7 +215,7 @@ void MFieldObject::formatCommas() offset = 0; // Look for decimal point - int pos = text.tqfindRev( "." ); + int pos = text.findRev( "." ); // If a decimal was not found, start at end of string if ( pos == -1 ) diff --git a/kugar/lib/mreportengine.cpp b/kugar/lib/mreportengine.cpp index 654e1fff..4e1544d3 100644 --- a/kugar/lib/mreportengine.cpp +++ b/kugar/lib/mreportengine.cpp @@ -933,9 +933,9 @@ void MReportEngine::setLineAttributes( MLineObject* line, TQDomNamedNodeMap* att TQString tmp = attr->namedItem( "Color" ).nodeValue(); - line->setColor( tmp.left( tmp.tqfind( "," ) ).toInt(), - tmp.mid( tmp.tqfind( "," ) + 1, ( tmp.tqfindRev( "," ) - tmp.tqfind( "," ) ) - 1 ).toInt(), - tmp.right( tmp.length() - tmp.tqfindRev( "," ) - 1 ).toInt() ); + line->setColor( tmp.left( tmp.find( "," ) ).toInt(), + tmp.mid( tmp.find( "," ) + 1, ( tmp.findRev( "," ) - tmp.find( "," ) ) - 1 ).toInt(), + tmp.right( tmp.length() - tmp.findRev( "," ) - 1 ).toInt() ); line->setWidth( attr->namedItem( "Width" ).nodeValue().toInt() ); line->setStyle( attr->namedItem( "Style" ).nodeValue().toInt() ); @@ -953,19 +953,19 @@ void MReportEngine::setLabelAttributes( MLabelObject* label, TQDomNamedNodeMap* scaleDeltaHeight( attr->namedItem( "Height" ).nodeValue().toInt() ) ); tmp = attr->namedItem( "BackgroundColor" ).nodeValue(); - label->setBackgroundColor( tmp.left( tmp.tqfind( "," ) ).toInt(), - tmp.mid( tmp.tqfind( "," ) + 1, ( tmp.tqfindRev( "," ) - tmp.tqfind( "," ) ) - 1 ).toInt(), - tmp.right( tmp.length() - tmp.tqfindRev( "," ) - 1 ).toInt() ); + label->setBackgroundColor( tmp.left( tmp.find( "," ) ).toInt(), + tmp.mid( tmp.find( "," ) + 1, ( tmp.findRev( "," ) - tmp.find( "," ) ) - 1 ).toInt(), + tmp.right( tmp.length() - tmp.findRev( "," ) - 1 ).toInt() ); tmp = attr->namedItem( "ForegroundColor" ).nodeValue(); - label->setForegroundColor( tmp.left( tmp.tqfind( "," ) ).toInt(), - tmp.mid( tmp.tqfind( "," ) + 1, ( tmp.tqfindRev( "," ) - tmp.tqfind( "," ) ) - 1 ).toInt(), - tmp.right( tmp.length() - tmp.tqfindRev( "," ) - 1 ).toInt() ); + label->setForegroundColor( tmp.left( tmp.find( "," ) ).toInt(), + tmp.mid( tmp.find( "," ) + 1, ( tmp.findRev( "," ) - tmp.find( "," ) ) - 1 ).toInt(), + tmp.right( tmp.length() - tmp.findRev( "," ) - 1 ).toInt() ); tmp = attr->namedItem( "BorderColor" ).nodeValue(); - label->setBorderColor( tmp.left( tmp.tqfind( "," ) ).toInt(), - tmp.mid( tmp.tqfind( "," ) + 1, ( tmp.tqfindRev( "," ) - tmp.tqfind( "," ) ) - 1 ).toInt(), - tmp.right( tmp.length() - tmp.tqfindRev( "," ) - 1 ).toInt() ); + label->setBorderColor( tmp.left( tmp.find( "," ) ).toInt(), + tmp.mid( tmp.find( "," ) + 1, ( tmp.findRev( "," ) - tmp.find( "," ) ) - 1 ).toInt(), + tmp.right( tmp.length() - tmp.findRev( "," ) - 1 ).toInt() ); label->setBorderWidth( attr->namedItem( "BorderWidth" ).nodeValue().toInt() ); label->setBorderStyle( attr->namedItem( "BorderStyle" ).nodeValue().toInt() ); @@ -1008,9 +1008,9 @@ void MReportEngine::setFieldAttributes( MFieldObject* field, TQDomNamedNodeMap* TQString tmp = attr->namedItem( "NegValueColor" ).nodeValue(); - field->setNegValueColor( tmp.left( tmp.tqfind( "," ) ).toInt(), - tmp.mid( tmp.tqfind( "," ) + 1, ( tmp.tqfindRev( "," ) - tmp.tqfind( "," ) ) - 1 ).toInt(), - tmp.right( tmp.length() - tmp.tqfindRev( "," ) - 1 ).toInt() ); + field->setNegValueColor( tmp.left( tmp.find( "," ) ).toInt(), + tmp.mid( tmp.find( "," ) + 1, ( tmp.findRev( "," ) - tmp.find( "," ) ) - 1 ).toInt(), + tmp.right( tmp.length() - tmp.findRev( "," ) - 1 ).toInt() ); setLabelAttributes( ( MLabelObject * ) field, attr ); } diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp index 06395a75..c8249505 100644 --- a/kugar/part/kugar_part.cpp +++ b/kugar/part/kugar_part.cpp @@ -156,7 +156,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl ) if ( !url.isValid() ) { /* kdDebug() << "mailformed url" << endl;*/ - if ( tpl.tqfind( '/' ) >= 0 ) + if ( tpl.find( '/' ) >= 0 ) { if ( tpl.startsWith( "." ) ) { diff --git a/kword/DESIGN b/kword/DESIGN index d0a4e64d..a920c8db 100644 --- a/kword/DESIGN +++ b/kword/DESIGN @@ -16,7 +16,7 @@ text, and the frames define where on the pages this text is displayed. * About text framesets: they hold a text document (KWTextDocument, which is a QTextDocument from the KoText classes - more on KoText later). -* About Tables; one table is a KWTableFrameset. This tableframeset tqcontains +* About Tables; one table is a KWTableFrameset. This tableframeset contains all the cells as its frames. But because the cells have a different text per cell, we contain the cells in their own KWTextFrameset. diff --git a/kword/HACKING b/kword/HACKING index 0cf5be76..85363e4c 100644 --- a/kword/HACKING +++ b/kword/HACKING @@ -184,7 +184,7 @@ FILES: contents: contents.h/cc - table of contents search: - searchdia.h/cc - text find and tqreplace + searchdia.h/cc - text find and replace other features: bookmarks: diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index 1551026c..04575514 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -398,7 +398,7 @@ void KWCanvas::mpCreatePixmap( const TQPoint& normalPoint, bool noGrid ) TQPoint vPoint = m_viewMode->normalToView( nPoint ); vPoint = contentsToViewport( vPoint ); TQRect viewportRect( contentsX(), contentsY(), visibleWidth(), visibleHeight() ); - if ( viewportRect.tqcontains( vPoint ) ) // Don't move the mouse out of the viewport + if ( viewportRect.contains( vPoint ) ) // Don't move the mouse out of the viewport TQCursor::setPos( viewport()->mapToGlobal( vPoint ) ); } emit docStructChanged(Pictures); @@ -743,7 +743,7 @@ void KWCanvas::mmCreate( const TQPoint& normalPoint, bool noGrid ) // Mouse move // But not out of the page KoRect r = m_insRect.normalize(); - if ( !m_doc->pageManager()->page(page)->rect().tqcontains(r) ) + if ( !m_doc->pageManager()->page(page)->rect().contains(r) ) { // Even better would be to go to the limit of the page boundary, so that the result, // when moving the mouse of the page, doesn't depend on how fast we're moving it... @@ -865,7 +865,7 @@ void KWCanvas::contentsMouseMoveEvent( TQMouseEvent *e ) //show the link target in the status bar TQString link = frameset->linkVariableUnderMouse(docPoint)->url(); if ( link.startsWith("bkm://") ) - link.tqreplace( 0, 6, i18n("Bookmark target: ") ); + link.replace( 0, 6, i18n("Bookmark target: ") ); gui()->getView()->setTemporaryStatusBarText( link ); m_temporaryStatusBarTextShown = true; } @@ -1533,7 +1533,7 @@ void KWCanvas::contentsDropEvent( TQDropEvent *e ) if ( res && res->isValid() ) { TQString mimetype = res->name(); - if ( mimetype.tqcontains( "image" ) ) { + if ( mimetype.contains( "image" ) ) { KoPictureKey key; key.setKeyFromFile( filename ); KoPicture newKoPicture; @@ -2382,7 +2382,7 @@ void FrameMovePolicy::handleMouseMove(TQt::ButtonState keyState, const KoPoint & KWFrameSet *fs = frame->frameSet(); if ( fs->type() == FT_TABLE ) { - if ( tablesMoved.tqfindRef( static_cast<KWTableFrameSet *> (fs) ) == -1 ) + if ( tablesMoved.findRef( static_cast<KWTableFrameSet *> (fs) ) == -1 ) tablesMoved.append( static_cast<KWTableFrameSet *> (fs)); } else { diff --git a/kword/KWCommand.cpp b/kword/KWCommand.cpp index e68e1c99..47fda3e6 100644 --- a/kword/KWCommand.cpp +++ b/kword/KWCommand.cpp @@ -405,7 +405,7 @@ void KWFrameBorderCommand::execute() doc = frameSet->kWordDocument(); KWFrame *frame=frameSet->frame(tmp->m_iFrameIndex); KWTableFrameSet::Cell *cell = dynamic_cast<KWTableFrameSet::Cell *>(frame->frameSet()); - FrameBorderTypeStruct *tmpFrameStruct=m_oldBorderFrameType.at(m_indexFrame.tqfind(tmp)); + FrameBorderTypeStruct *tmpFrameStruct=m_oldBorderFrameType.at(m_indexFrame.find(tmp)); switch( tmpFrameStruct->m_EFrameType) { @@ -460,7 +460,7 @@ void KWFrameBorderCommand::unexecute() doc = frameSet->kWordDocument(); KWFrame *frame=frameSet->frame(tmp->m_iFrameIndex); KWTableFrameSet::Cell *cell = dynamic_cast<KWTableFrameSet::Cell *>(frame->frameSet()); - FrameBorderTypeStruct *tmpFrameStruct=m_oldBorderFrameType.at(m_indexFrame.tqfind(tmp)); + FrameBorderTypeStruct *tmpFrameStruct=m_oldBorderFrameType.at(m_indexFrame.find(tmp)); switch(tmpFrameStruct->m_EFrameType) { case KoBorder::LeftBorder: @@ -550,7 +550,7 @@ void KWFrameBackGroundColorCommand::unexecute() { doc = frameSet->kWordDocument(); KWFrame *frame=frameSet->frame(tmp->m_iFrameIndex); - TQBrush *tmpFrameStruct=m_oldBackGroundColor.at(m_indexFrame.tqfind(tmp)); + TQBrush *tmpFrameStruct=m_oldBackGroundColor.at(m_indexFrame.find(tmp)); frame->setBackgroundColor(*tmpFrameStruct); } } diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp index 7decd25d..a8a3f6c7 100644 --- a/kword/KWConfig.cpp +++ b/kword/KWConfig.cpp @@ -992,17 +992,17 @@ void ConfigurePathPage::slotModifyPath() void ConfigurePathPage::slotDefault() { - TQListViewItem * item = m_pPathView->tqfindItem(i18n("Personal Expression"), 0); + TQListViewItem * item = m_pPathView->findItem(i18n("Personal Expression"), 0); if ( item ) item->setText(1, KWFactory::instance()->dirs()->resourceDirs("expression").join(";")); - item = m_pPathView->tqfindItem(i18n("Backup Path"), 0); + item = m_pPathView->findItem(i18n("Backup Path"), 0); if ( item ) item->setText(1, TQString() ); } void ConfigurePathPage::apply() { - TQListViewItem * item = m_pPathView->tqfindItem(i18n("Personal Expression"), 0); + TQListViewItem * item = m_pPathView->findItem(i18n("Personal Expression"), 0); if ( item ) { TQStringList lst = TQStringList::split(TQString(";"), item->text(1)); @@ -1013,7 +1013,7 @@ void ConfigurePathPage::apply() config->writePathEntry( "expression path", lst); } } - item = m_pPathView->tqfindItem(i18n("Backup Path"), 0); + item = m_pPathView->findItem(i18n("Backup Path"), 0); if ( item ) { TQString res = item->text(1 ); diff --git a/kword/KWCreateBookmarkDia.cpp b/kword/KWCreateBookmarkDia.cpp index 19089366..6c124b6a 100644 --- a/kword/KWCreateBookmarkDia.cpp +++ b/kword/KWCreateBookmarkDia.cpp @@ -60,7 +60,7 @@ void KWCreateBookmarkDia::init() void KWCreateBookmarkDia::slotOk() { - if ( listBookMark.tqfindIndex(m_bookmarkName->text() ) != -1 ) + if ( listBookMark.findIndex(m_bookmarkName->text() ) != -1 ) { KMessageBox::error(this, i18n("That name already exists, please choose another name.")); } diff --git a/kword/KWDocStruct.cpp b/kword/KWDocStruct.cpp index 62925918..1aa56d5e 100644 --- a/kword/KWDocStruct.cpp +++ b/kword/KWDocStruct.cpp @@ -235,7 +235,7 @@ void KWDocStructTextFrameItem::setupTextParags() while (item) { delItem = item; item = dynamic_cast<KWDocStructParagItem *>(item->nextSibling()); - if (paragPtrs.tqcontainsRef(delItem->parag()) == 0) delete delItem; + if (paragPtrs.containsRef(delItem->parag()) == 0) delete delItem; } // Add new paragraphs to the list or update existing ones. @@ -372,7 +372,7 @@ void KWDocStructTextFrameSetItem::setupTextFrames() while (item) { delItem = item; item = dynamic_cast<KWDocStructTextFrameItem *>(item->nextSibling()); - if (framePtrs.tqcontainsRef(delItem->frame()) == 0) delete delItem; + if (framePtrs.containsRef(delItem->frame()) == 0) delete delItem; } // Add new frames to the list or update existing ones. @@ -494,7 +494,7 @@ void KWDocStructTableItem::setupCells() while (item) { delItem = item; item = dynamic_cast<KWDocStructTextFrameItem *>(item->nextSibling()); - if (cellPtrs.tqcontainsRef(delItem->frameSet()) == 0) delete delItem; + if (cellPtrs.containsRef(delItem->frameSet()) == 0) delete delItem; } // Add new cells to the list or update existing ones. @@ -803,18 +803,18 @@ void KWDocStructRootItem::setupArrangement() if ( _depth == 0 ) { if ( item->childCount() == 0 ) - parags.tqreplace( _depth, new KWDocStructParagItem( item,TQString( tmpCounter->text(parag) + " " +parag->string()->toString().mid( 0, parag->string()->length() ) ),parag) ); + parags.replace( _depth, new KWDocStructParagItem( item,TQString( tmpCounter->text(parag) + " " +parag->string()->toString().mid( 0, parag->string()->length() ) ),parag) ); else - parags.tqreplace( _depth, new KWDocStructParagItem( item, parags[ _depth ],TQString( tmpCounter->text(parag) + " " +parag->string()->toString().mid( 0, parag->string()->length() ) ),parag) ); + parags.replace( _depth, new KWDocStructParagItem( item, parags[ _depth ],TQString( tmpCounter->text(parag) + " " +parag->string()->toString().mid( 0, parag->string()->length() ) ),parag) ); } else { if (parags[ _depth - 1 ]==0) - parags.tqreplace( _depth, new KWDocStructParagItem( item,TQString( tmpCounter->text(parag) + " " +parag->string()->toString().mid( 0, parag->string()->length() ) ), parag) ); + parags.replace( _depth, new KWDocStructParagItem( item,TQString( tmpCounter->text(parag) + " " +parag->string()->toString().mid( 0, parag->string()->length() ) ), parag) ); else if ( parags[ _depth - 1 ]->childCount() == 0 ) - parags.tqreplace( _depth, new KWDocStructParagItem( parags[ _depth - 1 ],TQString( tmpCounter->text(parag) + " " +parag->string()->toString().mid( 0, parag->string()->length() ) ), parag) ); + parags.replace( _depth, new KWDocStructParagItem( parags[ _depth - 1 ],TQString( tmpCounter->text(parag) + " " +parag->string()->toString().mid( 0, parag->string()->length() ) ), parag) ); else - parags.tqreplace( _depth, new KWDocStructParagItem( parags[ _depth - 1 ], parags[ _depth ],TQString( tmpCounter->text(parag) + " " +parag->string()->toString().mid( 0, parag->string()->length() ) ), parag) ); + parags.replace( _depth, new KWDocStructParagItem( parags[ _depth - 1 ], parags[ _depth ],TQString( tmpCounter->text(parag) + " " +parag->string()->toString().mid( 0, parag->string()->length() ) ), parag) ); } } parag = static_cast<KWTextParag *>(parag->next()); @@ -858,7 +858,7 @@ void KWDocStructRootItem::setupTextFrameSets() while (item) { delItem = item; item = dynamic_cast<KWDocStructTextFrameSetItem *>(item->nextSibling()); - if (frameSetPtrs.tqcontainsRef(delItem->frameSet()) == 0) delete delItem; + if (frameSetPtrs.containsRef(delItem->frameSet()) == 0) delete delItem; } // Add new framesets to the list or update existing ones. @@ -936,7 +936,7 @@ void KWDocStructRootItem::setupTables() while (item) { delItem = item; item = dynamic_cast<KWDocStructTableItem *>(item->nextSibling()); - if (frameSetPtrs.tqcontainsRef(delItem->table()) == 0) delete delItem; + if (frameSetPtrs.containsRef(delItem->table()) == 0) delete delItem; } // Add new framesets to the list or update existing ones. @@ -1104,7 +1104,7 @@ void KWDocStructTree::refreshTree(int type) if(((int)Embedded) & type) embedded->setupEmbedded(); if (!curItemText.isEmpty()) { - TQListViewItem* item = tqfindItem(curItemText, 0); + TQListViewItem* item = findItem(curItemText, 0); if (item) setCurrentItem(item); } } diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp index 72fd0555..5942c28b 100644 --- a/kword/KWDocument.cpp +++ b/kword/KWDocument.cpp @@ -2493,7 +2493,7 @@ void KWDocument::processAnchorRequests() for ( ; itanch != m_anchorRequests.end(); ++itanch ) { TQString fsname = itanch.key(); - if ( m_pasteFramesetsMap && m_pasteFramesetsMap->tqcontains( fsname ) ) + if ( m_pasteFramesetsMap && m_pasteFramesetsMap->contains( fsname ) ) fsname = (*m_pasteFramesetsMap)[ fsname ]; kdDebug(32001) << "KWDocument::processAnchorRequests anchoring frameset " << fsname << endl; KWFrameSet * fs = frameSetByName( fsname ); @@ -2511,7 +2511,7 @@ bool KWDocument::processFootNoteRequests() for ( ; itvar != m_footnoteVarRequests.end(); ++itvar ) { TQString fsname = itvar.key(); - if ( m_pasteFramesetsMap && m_pasteFramesetsMap->tqcontains( fsname ) ) + if ( m_pasteFramesetsMap && m_pasteFramesetsMap->contains( fsname ) ) fsname = (*m_pasteFramesetsMap)[ fsname ]; //kdDebug(32001) << "KWDocument::processFootNoteRequests binding footnote var " << itvar.data() << " and frameset " << fsname << endl; KWFrameSet * fs = frameSetByName( fsname ); @@ -2546,12 +2546,12 @@ 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}") ); - searchString = searchString.tqreplace(TQRegExp("\\-"), "\\-"); // escape the '-' + searchString = searchString.replace(TQRegExp("\\-"), "\\-"); // escape the '-' TQRegExp searcher(searchString); int count=0; do { newName=oldName; - newName.tqreplace(searcher,i18n("Copy%1-%2").tqarg(count > 0? TQString("%1").tqarg(count):"").tqarg("")); + newName.replace(searcher,i18n("Copy%1-%2").tqarg(count > 0? TQString("%1").tqarg(count):"").tqarg("")); count++; } while ( frameSetByName( newName ) ); } @@ -2635,7 +2635,7 @@ void KWDocument::pasteFrames( TQDomElement topElem, KMacroCommand * macroCmd, bo if ( fs ) { - //if ( frameSetsToFinalize.tqfindRef( fs ) == -1 ) + //if ( frameSetsToFinalize.findRef( fs ) == -1 ) // frameSetsToFinalize.append( fs ); // Load the frame @@ -2867,7 +2867,7 @@ bool KWDocument::saveOasisHelper( KoStore* store, KoXmlWriter* manifestWriter, S << KWFrameSet::FI_FIRST_FOOTER << KWFrameSet::FI_ODD_FOOTER << KWFrameSet::FI_EVEN_FOOTER; for (uint i=0; i<order.count(); ++i) { KWFrameSet::Info info = order[i]; - if (tempmap.tqcontains(info)) { + if (tempmap.contains(info)) { const KWFrameSet* fs = tempmap[info]; // Save content @@ -2916,7 +2916,7 @@ bool KWDocument::saveOasisHelper( KoStore* store, KoXmlWriter* manifestWriter, S case FT_PICTURE: { const KoPictureKey key = static_cast<KWPictureFrameSet *>( *it )->key(); - if ( !pictureList.tqcontains( key ) ) + if ( !pictureList.contains( key ) ) pictureList.append( key ); } break; @@ -3087,7 +3087,7 @@ void KWDocument::saveSelectedFrames( KoXmlWriter& bodyWriter, KoSavingContext& s kdDebug(32001) << "found non-inline picture framesets" << endl; const KoPictureKey key = static_cast<KWPictureFrameSet *>( fs )->key(); - if ( !pictureList.tqcontains( key ) ) + if ( !pictureList.contains( key ) ) pictureList.append( key ); } if ( isTable ) // Copy tables only once, even if they have many cells selected @@ -3530,7 +3530,7 @@ TQDomDocument KWDocument::saveXML() if ( !frameSet->isDeleted() && ( frameSet->type() == FT_PICTURE ) ) { KoPictureKey key = static_cast<KWPictureFrameSet *>( frameSet )->key(); - if ( !savePictures.tqcontains( key ) ) + if ( !savePictures.contains( key ) ) savePictures.append( key ); } } @@ -3541,7 +3541,7 @@ TQDomDocument KWDocument::saveXML() { KoPictureKey key = textIt.current()->getKey(); kdDebug(32001) << "KWDocument::saveXML registering text image " << key.toString() << endl; - if ( !savePictures.tqcontains( key ) ) + if ( !savePictures.contains( key ) ) savePictures.append( key ); } @@ -3674,7 +3674,7 @@ TQValueList<KoPictureKey> KWDocument::savePictureList() { KoPictureKey key = textIt.current()->getKey(); kdDebug(32001) << "KWDocument::saveXML registering text image " << key.toString() << endl; - if ( !savePictures.tqcontains( key ) ) + if ( !savePictures.contains( key ) ) savePictures.append( key ); } m_textImageRequests.clear(); // Save some memory! @@ -3688,7 +3688,7 @@ TQValueList<KoPictureKey> KWDocument::savePictureList() if ( !frameSet->isDeleted() && ( frameSet->type() == FT_PICTURE ) ) { KoPictureKey key = static_cast<KWPictureFrameSet *>( frameSet )->key(); - if ( !savePictures.tqcontains( key ) ) + if ( !savePictures.contains( key ) ) savePictures.append( key ); } } @@ -4438,7 +4438,7 @@ void KWDocument::recalcVariables( int type ) TQMap<KoTextDocument *, bool> modifiedTextDocuments; // TQt4: TQSet for ( TQValueList<KoVariable *>::const_iterator it = modifiedVariables.begin(), end = modifiedVariables.end() ; it != end ; ++it ) { KoTextDocument* textdoc = (*it)->textDocument(); - if ( modifiedTextDocuments.tqfind( textdoc ) != modifiedTextDocuments.end() ) // TQt4: !tqcontains + if ( modifiedTextDocuments.find( textdoc ) != modifiedTextDocuments.end() ) // TQt4: !contains { modifiedTextDocuments.insert( textdoc, true ); KWTextFrameSet * textfs = static_cast<KWTextDocument *>(textdoc)->textFrameSet(); @@ -4466,7 +4466,7 @@ void KWDocument::getPageLayout( KoPageLayout& tqlayout, KoColumns& cl, KoKWHeade void KWDocument::addFrameSet( KWFrameSet *f, bool finalize /*= true*/ ) { - if(m_lstFrameSet.tqcontains(f) > 0) { + if(m_lstFrameSet.contains(f) > 0) { kdWarning(32001) << "Frameset " << f << " " << f->name() << " already in list!" << endl; return; } @@ -4483,7 +4483,7 @@ void KWDocument::addFrameSet( KWFrameSet *f, bool finalize /*= true*/ ) void KWDocument::removeFrameSet( KWFrameSet *f ) { emit sig_terminateEditing( f ); - m_lstFrameSet.take( m_lstFrameSet.tqfind(f) ); + m_lstFrameSet.take( m_lstFrameSet.find(f) ); setModified( true ); emit sigFrameSetRemoved(f); } @@ -4957,7 +4957,7 @@ void KWDocument::setSpellCheckIgnoreList( const TQStringList& lst ) void KWDocument::addSpellCheckIgnoreWord( const TQString & word ) { // ### missing: undo/redo support - if( m_spellCheckIgnoreList.tqfindIndex( word ) == -1 ) + if( m_spellCheckIgnoreList.findIndex( word ) == -1 ) m_spellCheckIgnoreList.append( word ); setSpellCheckIgnoreList( m_spellCheckIgnoreList ); if ( backgroundSpellCheckEnabled() ) @@ -5005,7 +5005,7 @@ TQValueList<KoTextDocument *> KWDocument::allTextDocuments() const int KWDocument::numberOfTextFrameSet( KWFrameSet* fs, bool onlyReadWrite ) { TQPtrList<KWTextFrameSet> textFramesets = allTextFramesets( onlyReadWrite ); - return textFramesets.tqfindRef( static_cast<KWTextFrameSet*>(fs) ); + return textFramesets.findRef( static_cast<KWTextFrameSet*>(fs) ); } KWFrameSet * KWDocument::textFrameSetFromIndex( unsigned int num, bool onlyReadWrite ) @@ -5062,7 +5062,7 @@ void KWDocument::changeFootNoteConfig() parag->setChanged( true ); } KoTextDocument* textdoc = parag->textDocument(); - if ( modifiedTextDocuments.tqfind( textdoc ) != modifiedTextDocuments.end() ) // TQt4: !tqcontains + if ( modifiedTextDocuments.find( textdoc ) != modifiedTextDocuments.end() ) // TQt4: !contains modifiedTextDocuments.insert( textdoc, true ); } } @@ -5382,7 +5382,7 @@ void KWDocument::addWordToDictionary( const TQString& word ) { if ( m_bgSpellCheck ) { - if( m_spellCheckPersonalDict.tqfindIndex( word ) == -1 ) + if( m_spellCheckPersonalDict.findIndex( word ) == -1 ) m_spellCheckPersonalDict.append( word ); m_bgSpellCheck->settings()->setCurrentIgnoreList( m_spellCheckIgnoreList + m_spellCheckPersonalDict ); if ( backgroundSpellCheckEnabled() ) @@ -5445,14 +5445,14 @@ KWDocument::FramesChangedHandler::FramesChangedHandler(KWDocument *tqparent) { void KWDocument::FramesChangedHandler::addFrame(KWFrame *frame) { if(frame == 0) return; - if(m_frameSets.tqcontains(frame->frameSet())) return; + if(m_frameSets.contains(frame->frameSet())) return; m_frameSets.append(frame->frameSet()); if( frame->runAround() != KWFrame::RA_NO ) m_needLayout = true; } void KWDocument::FramesChangedHandler::addFrameSet(KWFrameSet *fs) { - if(m_frameSets.tqcontains(fs)) return; + if(m_frameSets.contains(fs)) return; m_frameSets.append(fs); m_needLayout = true; } diff --git a/kword/KWDocument.h b/kword/KWDocument.h index cab789f8..983b3add 100644 --- a/kword/KWDocument.h +++ b/kword/KWDocument.h @@ -385,7 +385,7 @@ public: bool tryRemovingPages(); ProcessingType processingType()const { return m_processingType; } - int frameSetNum( KWFrameSet* fs ) { return m_lstFrameSet.tqfindRef( fs ); } + int frameSetNum( KWFrameSet* fs ) { return m_lstFrameSet.findRef( fs ); } void lowerMainFrames( int pageNum ); void lowerMainFrames( int pageNum, int lowestZOrder ); diff --git a/kword/KWEditPersonnalExpression.cpp b/kword/KWEditPersonnalExpression.cpp index 59b79f97..3af07a3e 100644 --- a/kword/KWEditPersonnalExpression.cpp +++ b/kword/KWEditPersonnalExpression.cpp @@ -129,7 +129,7 @@ void KWEditPersonnalExpression::slotGroupSelected() m_groupLineEdit->blockSignals(true); m_delExpression->setEnabled(m_groupList->currentItem()!=-1); m_groupLineEdit->setText(m_groupList->currentText()); - list::Iterator it= listExpression.tqfind(m_groupList->currentText()); + list::Iterator it= listExpression.find(m_groupList->currentText()); TQStringList lst(it.data()); m_ExpressionsList->blockSignals(true); m_ExpressionsList->clear(); @@ -147,7 +147,7 @@ void KWEditPersonnalExpression::slotUpdateGroupName(const TQString &newGroupName return; m_addGroup->setEnabled( true ); - list::Iterator it= listExpression.tqfind(m_groupList->currentText()); + list::Iterator it= listExpression.find(m_groupList->currentText()); TQStringList lst(it.data()); listExpression.insert(newGroupName,lst); listExpression.remove(m_groupList->currentText()); @@ -162,12 +162,12 @@ void KWEditPersonnalExpression::slotUpdateExpression(const TQString &newExpressi if(newExpression.isEmpty() || m_groupList->currentItem()==-1 || m_ExpressionsList->currentText().isEmpty()) return; - list::Iterator it= listExpression.tqfind(m_groupList->currentText()); + list::Iterator it= listExpression.find(m_groupList->currentText()); TQStringList lst = it.data(); - TQStringList::Iterator it2=lst.tqfind(m_ExpressionsList->currentText()); + TQStringList::Iterator it2=lst.find(m_ExpressionsList->currentText()); lst.insert(it2,TQString(newExpression)); lst.remove(it2); - listExpression.tqreplace(m_groupList->currentText(),lst); + listExpression.replace(m_groupList->currentText(),lst); lst.remove(m_ExpressionsList->currentText()); m_ExpressionsList->blockSignals(true); @@ -246,13 +246,13 @@ void KWEditPersonnalExpression::slotOk() } void KWEditPersonnalExpression::slotAddExpression() { - list::Iterator it= listExpression.tqfind(m_groupList->currentText()); + list::Iterator it= listExpression.find(m_groupList->currentText()); TQStringList lst(it.data()); TQString newWord = i18n("empty"); - if ( lst.tqcontains( newWord )) + if ( lst.contains( newWord )) return; lst<< newWord; - listExpression.tqreplace(m_groupList->currentText(),lst); + listExpression.replace(m_groupList->currentText(),lst); m_ExpressionsList->blockSignals(true); m_ExpressionsList->insertItem(newWord); @@ -272,10 +272,10 @@ void KWEditPersonnalExpression::slotRemoveExpression() { TQString text=m_ExpressionsList->currentText (); if(!text.isEmpty()) { - list::Iterator it= listExpression.tqfind(m_groupList->currentText()); + list::Iterator it= listExpression.find(m_groupList->currentText()); TQStringList lst(it.data()); lst.remove(text); - listExpression.tqreplace(m_groupList->currentText(),lst); + listExpression.replace(m_groupList->currentText(),lst); m_ExpressionsList->blockSignals(true); m_ExpressionsList->clear(); diff --git a/kword/KWFindReplace.h b/kword/KWFindReplace.h index 270bc10b..c7bdf795 100644 --- a/kword/KWFindReplace.h +++ b/kword/KWFindReplace.h @@ -34,8 +34,8 @@ class KWTextFrameSet; class KMacroCommand; class KWTextFrameSetEdit; /** - * This class implements the 'tqfind' functionality ( the "search next, prompt" loop ) - * and the 'tqreplace' functionality. Same class, to allow centralizing the code that + * This class implements the 'find' functionality ( the "search next, prompt" loop ) + * and the 'replace' functionality. Same class, to allow centralizing the code that * finds the framesets and paragraphs to look into. */ class KWFindReplace : public KoFindReplace diff --git a/kword/KWFootNoteDia.cpp b/kword/KWFootNoteDia.cpp index 254260c8..76076ff8 100644 --- a/kword/KWFootNoteDia.cpp +++ b/kword/KWFootNoteDia.cpp @@ -129,7 +129,7 @@ void KWFootNoteDia::slotConfigurate() bool KWFootNoteDia::footNoteAlreadyExists( const TQString & text ) { - return manualFootNotes.tqcontains( text ); + return manualFootNotes.contains( text ); } void KWFootNoteDia::appendManualFootNote( const TQString & text ) diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp index 2130e235..0d722d15 100644 --- a/kword/KWFrameDia.cpp +++ b/kword/KWFrameDia.cpp @@ -1325,7 +1325,7 @@ void KWFrameDia::slotPressEvent(TQMouseEvent *ev) { TQRect r = m_prev3->contentsRect(); TQRect rect(r.x()+OFFSETX,r.y()+OFFSETY,r.width()-OFFSETX,r.y()+OFFSETY+Ko_SPACE); - if(rect.tqcontains(TQPoint(ev->x(),ev->y()))) + if(rect.contains(TQPoint(ev->x(),ev->y()))) { if( ( ((int)m_topBorder.penWidth() != m_cWidth->currentText().toInt()) ||(m_topBorder.color != m_bColor->color() ) ||(m_topBorder.getStyle()!=KoBorder::getStyle(m_cStyle->currentText()) )) && m_bTop->isOn() ) @@ -1339,7 +1339,7 @@ void KWFrameDia::slotPressEvent(TQMouseEvent *ev) m_bTop->setOn(!m_bTop->isOn()); } rect.setCoords(r.x()+OFFSETX,r.height()-OFFSETY-Ko_SPACE,r.width()-OFFSETX,r.height()-OFFSETY); - if(rect.tqcontains(TQPoint(ev->x(),ev->y()))) + if(rect.contains(TQPoint(ev->x(),ev->y()))) { if( ( ((int)m_bottomBorder.penWidth() != m_cWidth->currentText().toInt()) ||(m_bottomBorder.color != m_bColor->color() ) ||(m_bottomBorder.getStyle()!=KoBorder::getStyle(m_cStyle->currentText()) )) && m_bBottom->isOn() ) @@ -1354,7 +1354,7 @@ void KWFrameDia::slotPressEvent(TQMouseEvent *ev) } rect.setCoords(r.x()+OFFSETX,r.y()+OFFSETY,r.x()+Ko_SPACE+OFFSETX,r.height()-OFFSETY); - if(rect.tqcontains(TQPoint(ev->x(),ev->y()))) + if(rect.contains(TQPoint(ev->x(),ev->y()))) { if( ( ((int)m_leftBorder.penWidth() != m_cWidth->currentText().toInt()) ||(m_leftBorder.color != m_bColor->color() ) @@ -1369,7 +1369,7 @@ void KWFrameDia::slotPressEvent(TQMouseEvent *ev) m_bLeft->setOn(!m_bLeft->isOn()); } rect.setCoords(r.width()-OFFSETX-Ko_SPACE,r.y()+OFFSETY,r.width()-OFFSETX,r.height()-OFFSETY); - if(rect.tqcontains(TQPoint(ev->x(),ev->y()))) + if(rect.contains(TQPoint(ev->x(),ev->y()))) { if( ( ((int)m_rightBorder.penWidth() != m_cWidth->currentText().toInt()) ||(m_rightBorder.color != m_bColor->color() ) @@ -2099,7 +2099,7 @@ bool KWFrameDia::applyChanges() KWTextFrameSet *frameSet = new KWTextFrameSet( m_doc, name ); frameSet->addFrame( m_frame ); KWPage *page = m_doc->pageManager()->page(m_frame); - if( page->rect().tqcontains(rect) ) { + if( page->rect().contains(rect) ) { m_frame->setRect( px, py, pw, ph ); //don't change margins when frame is protected. if ( m_paddingConfigWidget && ( !m_tab1 || (m_tab1 && m_cbProtectContent && !m_cbProtectContent->isChecked())) ) @@ -2198,7 +2198,7 @@ bool KWFrameDia::applyChanges() //kdDebug() << "New geom: " << m_sx->text().toDouble() << ", " << m_sy->text().toDouble() // << " " << m_sw->text().toDouble() << "x" << m_sh->text().toDouble() << endl; - if( m_doc->pageManager()->page(f)->rect().tqcontains(rect) ) + if( m_doc->pageManager()->page(f)->rect().contains(rect) ) { FrameIndex index( f ); KoRect initialRect = f->normalize(); diff --git a/kword/KWFrameList.cpp b/kword/KWFrameList.cpp index 3628df05..d0f5682e 100644 --- a/kword/KWFrameList.cpp +++ b/kword/KWFrameList.cpp @@ -96,7 +96,7 @@ void KWFrameList::setFrames(const TQPtrList<KWFrame> &frames) { // ## might need a for loop for the case of inline-inside-inline, // or maybe calling isPaintedBy instead [depending on what should happen for tables] if ( daFrame->frameSet()->isFloating() && - (parentFramesets.tqcontains(daFrame->frameSet()->anchorFrameset()) || + (parentFramesets.contains(daFrame->frameSet()->anchorFrameset()) || daFrame->frameSet()->isPaintedBy(m_frame->frameSet())) ) continue; // Floating frames are not "on top", they are "inside". diff --git a/kword/KWFrameSet.cpp b/kword/KWFrameSet.cpp index b8b9f8d0..d1129b1f 100644 --- a/kword/KWFrameSet.cpp +++ b/kword/KWFrameSet.cpp @@ -76,7 +76,7 @@ KWFrameSet::~KWFrameSet() void KWFrameSet::addFrame( KWFrame *frame, bool recalc ) { - if ( m_frames.tqfindRef( frame ) != -1 ) + if ( m_frames.findRef( frame ) != -1 ) return; //kdDebug(32001) << k_funcinfo << name() << " adding frame" << frame << " recalc=" << recalc << endl; @@ -96,7 +96,7 @@ void KWFrameSet::deleteFrame( unsigned int num, bool remove, bool recalc ) KWFrame *frm = m_frames.at( num ); Q_ASSERT( frm ); m_frames.take( num ); - Q_ASSERT( !m_frames.tqcontains(frm) ); + Q_ASSERT( !m_frames.contains(frm) ); unsigned int index = frm->pageNumber() - m_firstPage; if(m_framesInPage.count() >= index) { @@ -127,7 +127,7 @@ void KWFrameSet::deleteFrame( unsigned int num, bool remove, bool recalc ) void KWFrameSet::deleteFrame( KWFrame *frm, bool remove, bool recalc ) { //kdDebug(32001) << "KWFrameSet::deleteFrame " << frm << " remove=" << remove << endl; - int num = m_frames.tqfindRef( frm ); + int num = m_frames.findRef( frm ); Q_ASSERT( num != -1 ); if ( num == -1 ) return; @@ -505,7 +505,7 @@ KWFrame * KWFrameSet::frameAtPos( double x, double y ) const KoPoint docPoint( x, y ); TQPtrListIterator<KWFrame> frameIt = frameIterator(); for ( ; frameIt.current(); ++frameIt ) - if ( frameIt.current()->tqcontains( docPoint ) ) + if ( frameIt.current()->contains( docPoint ) ) return frameIt.current(); return 0L; } @@ -518,7 +518,7 @@ KWFrame *KWFrameSet::frame( unsigned int num ) const int KWFrameSet::frameFromPtr( KWFrame *frame ) { - return m_frames.tqfindRef( frame ); + return m_frames.findRef( frame ); } KWFrame * KWFrameSet::settingsFrame( const KWFrame* frame ) @@ -971,9 +971,9 @@ KWFrame* KWFrameSet::loadOasisFrame( const TQDomElement& tag, KoOasisContext& co // A frame with protected size means that the frameset is size-protected (hmm, kword did it that way) // TODO implement position protection TQString protectList = context.styleStack().attributeNS( KoXmlNS::style, "protect" ); - if ( protectList.tqcontains( "content" ) ) + if ( protectList.contains( "content" ) ) setProtectContent( true ); - if ( protectList.tqcontains( "size" ) ) + if ( protectList.contains( "size" ) ) m_protectSize = true; // TODO m_visible ? User-toggeable or internal? @@ -1164,14 +1164,14 @@ bool KWFrameSet::isFrameAtPos( const KWFrame* frame, const TQPoint& point, bool outerRect.rTop() -= margin; outerRect.rRight() += margin; outerRect.rBottom() += margin; - if ( outerRect.tqcontains( point ) ) { + if ( outerRect.contains( point ) ) { if(borderOfFrameOnly) { TQRect innerRect( m_doc->zoomRect( *frame ) ); innerRect.rLeft() += margin; innerRect.rTop() += margin; innerRect.rRight() -= margin; innerRect.rBottom() -= margin; - return (!innerRect.tqcontains(point) ); + return (!innerRect.contains(point) ); } return true; } diff --git a/kword/KWFrameStyle.cpp b/kword/KWFrameStyle.cpp index fd6fd26a..816afa9b 100644 --- a/kword/KWFrameStyle.cpp +++ b/kword/KWFrameStyle.cpp @@ -249,7 +249,7 @@ void KWFrameStyle::saveOasis( KoGenStyles& mainStyles, KoSavingContext& savingCo // try to preserve existing internal name, if it looks adequate (no spaces) // ## TODO: check XML-Schemacs NCName conformity - const bool nameIsConform = !m_name.isEmpty() && m_name.tqfind( ' ' ) == -1; + const bool nameIsConform = !m_name.isEmpty() && m_name.find( ' ' ) == -1; TQString newName = m_name; if ( nameIsConform ) newName = mainStyles.lookup( frameStyle, m_name, KoGenStyles::DontForceNumbering ); diff --git a/kword/KWFrameStyleManager.cpp b/kword/KWFrameStyleManager.cpp index b0395d24..0a770770 100644 --- a/kword/KWFrameStyleManager.cpp +++ b/kword/KWFrameStyleManager.cpp @@ -151,7 +151,7 @@ KWFrameStyleManager::KWFrameStyleManager( TQWidget *_parent, KWDocument *_doc, KWFrameStyleBackgroundTab *bgTab = new KWFrameStyleBackgroundTab( m_tabs ); addTab( bgTab ); - TQListBoxItem * item = m_stylesList->tqfindItem( activeStyleName ); + TQListBoxItem * item = m_stylesList->findItem( activeStyleName ); m_stylesList->setCurrentItem( item ? m_stylesList->index(item) : 0 ); noSignals=false; @@ -428,7 +428,7 @@ void KWFrameStyleManager::moveUpStyle() TQString currentStyleName = m_stylesList->currentText(); if ( currentStyleName.isEmpty() ) return; - int pos2 = m_styleOrder.tqfindIndex( currentStyleName ); + int pos2 = m_styleOrder.findIndex( currentStyleName ); if ( pos2 > 0 ) // neither -1 nor 0 { m_styleOrder.remove( m_styleOrder.at(pos2)); @@ -457,7 +457,7 @@ void KWFrameStyleManager::moveDownStyle() if ( currentStyleName.isEmpty() ) return; - int pos2 = m_styleOrder.tqfindIndex( currentStyleName ); + int pos2 = m_styleOrder.findIndex( currentStyleName ); if ( pos2 != -1 ) { m_styleOrder.remove( m_styleOrder.at(pos2)); diff --git a/kword/KWFrameView.cpp b/kword/KWFrameView.cpp index 7506e02a..4904ec98 100644 --- a/kword/KWFrameView.cpp +++ b/kword/KWFrameView.cpp @@ -67,7 +67,7 @@ bool KWFrameView::isBorderHit(const KoPoint &point) const { return hit(point, true, true); } -bool KWFrameView::tqcontains(const KoPoint &point, bool fuzzy) const { +bool KWFrameView::contains(const KoPoint &point, bool fuzzy) const { return hit(point, fuzzy, false); } diff --git a/kword/KWFrameView.h b/kword/KWFrameView.h index d4dcabde..d7b63aba 100644 --- a/kword/KWFrameView.h +++ b/kword/KWFrameView.h @@ -105,7 +105,7 @@ public: /// returns if the @p point is on the border bool isBorderHit(const KoPoint &point) const; /// returns if the @p point is anywhere in te frame, if fuzzy is true; also a little outside - bool tqcontains(const KoPoint &point, bool fuzzy = true) const; + bool contains(const KoPoint &point, bool fuzzy = true) const; /** * Return the MouseMeaning enum value for the tqparent view. @@ -138,7 +138,7 @@ public: private: /** - * Helper method for isBorderHit() and tqcontains() + * Helper method for isBorderHit() and contains() * @param point the point * @param borderOnly if true; exclude the range inside the frame * @param fuzzy don't take all the coordinates too strict, allow for some margin diff --git a/kword/KWFrameViewManager.cpp b/kword/KWFrameViewManager.cpp index 168a5d7c..c4349ae8 100644 --- a/kword/KWFrameViewManager.cpp +++ b/kword/KWFrameViewManager.cpp @@ -245,7 +245,7 @@ TQValueVector<KWFrameView*> KWFrameViewManager::framesAt(const KoPoint &point, b if(! (*frames)->frame()->frameSet()->isVisible()) continue; if(borderOnly && (*frames)->isBorderHit(point) || - !borderOnly && (*frames)->tqcontains(point)) + !borderOnly && (*frames)->contains(point)) framesThatAreHit.append(*frames); } // sort on z-ordering; top on first diff --git a/kword/KWImportStyleDia.cpp b/kword/KWImportStyleDia.cpp index b8341d20..c7660993 100644 --- a/kword/KWImportStyleDia.cpp +++ b/kword/KWImportStyleDia.cpp @@ -134,7 +134,7 @@ void KWImportStyleDia::loadFile() unsigned int i=0; for( TQValueList<TQString>::Iterator it = followingStyles.begin(); it != followingStyles.end(); ++it ) { TQString newName =*it; - if ( insertStyle.tqcontains( *it ) ) + if ( insertStyle.contains( *it ) ) newName = (insertStyle)[ *it ]; KoParagStyle * style = m_styleList.findStyle(newName); @@ -197,7 +197,7 @@ TQString KWImportFrameTableStyleDia::generateStyleName( const TQString & templat bool exists; do { name = templateName.tqarg( num ); - exists = (m_list.tqfindIndex( name )!=-1); + exists = (m_list.findIndex( name )!=-1); ++num; } while ( exists ); return name; @@ -240,7 +240,7 @@ void KWImportFrameTableStyleDia::loadFile() KWFrameStyle *sty = new KWFrameStyle( styleElem ); TQString name =sty->name(); - if ( m_list.tqfindIndex( name )!=-1 ) + if ( m_list.findIndex( name )!=-1 ) sty->setDisplayName(generateStyleName( sty->displayName() + TQString( "-%1"))); m_frameStyleList.append( sty); } @@ -252,7 +252,7 @@ void KWImportFrameTableStyleDia::loadFile() TQDomElement styleElem = listStyles.item( item ).toElement(); KWTableStyle *sty = new KWTableStyle( styleElem,m_doc,2 ); TQString name =sty->name(); - if ( m_list.tqfindIndex( name )!=-1 ) + if ( m_list.findIndex( name )!=-1 ) sty->setName(generateStyleName( sty->displayName() + TQString( "-%1"))); m_tableStyleList.append( sty); } diff --git a/kword/KWOasisLoader.cpp b/kword/KWOasisLoader.cpp index 99f5ee62..42d72b5e 100644 --- a/kword/KWOasisLoader.cpp +++ b/kword/KWOasisLoader.cpp @@ -257,7 +257,7 @@ KWFrame* KWOasisLoader::loadFrame( const TQDomElement& frameTag, KoOasisContext& break; } else if ( localName == "object" ) { - TQDomElement mathElem; // will be set if we tqfind <math:math> + TQDomElement mathElem; // will be set if we find <math:math> TQDomElement childElem; forEachElement( childElem, elem ) { diff --git a/kword/KWPageManager.cpp b/kword/KWPageManager.cpp index 7058e5ac..9dc797a6 100644 --- a/kword/KWPageManager.cpp +++ b/kword/KWPageManager.cpp @@ -224,7 +224,7 @@ KoPoint KWPageManager::clipToDocument(const KoPoint &point) { } page = TQMIN(page, lastPageNumber()); KoRect rect = this->page(page)->rect(); - if(rect.tqcontains(point)) + if(rect.contains(point)) return point; KoPoint rc(point); diff --git a/kword/KWPictureFrameSet.cpp b/kword/KWPictureFrameSet.cpp index 7ea4e955..3d04fda0 100644 --- a/kword/KWPictureFrameSet.cpp +++ b/kword/KWPictureFrameSet.cpp @@ -193,7 +193,7 @@ void KWPictureFrameSet::loadOasis( const TQDomElement& frame, const TQDomElement if ( !href.isEmpty() /*&& href[0] == '#'*/ ) { TQString strExtension; - const int result=href.tqfindRev("."); + const int result=href.findRev("."); if (result>=0) { strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. diff --git a/kword/KWTableFrameSet.cpp b/kword/KWTableFrameSet.cpp index 9d6aa58e..892bc822 100644 --- a/kword/KWTableFrameSet.cpp +++ b/kword/KWTableFrameSet.cpp @@ -981,7 +981,7 @@ void KWTableFrameSet::reInsertRow(RemovedRow &rr) // put back m_frames that were removed for(uint i = 0; i < rlen; i++){ - if( m_frames.tqfindRef((*r)[i]->frame(0)) == -1 ) + if( m_frames.findRef((*r)[i]->frame(0)) == -1 ) m_frames.append( (*r)[i]->frame(0) ); } diff --git a/kword/KWTableFrameSet.h b/kword/KWTableFrameSet.h index f572a1ba..d3f0ad31 100644 --- a/kword/KWTableFrameSet.h +++ b/kword/KWTableFrameSet.h @@ -393,7 +393,7 @@ public: /** returns the number of columns */ unsigned int getColumns() const { return m_cols; } - /** returns the number of cells the table tqcontains, this includes + /** returns the number of cells the table contains, this includes * temporary headers. */ unsigned int getNumCells()const { return m_nr_cells; } diff --git a/kword/KWTableStyle.cpp b/kword/KWTableStyle.cpp index 99ecfacb..47f9029b 100644 --- a/kword/KWTableStyle.cpp +++ b/kword/KWTableStyle.cpp @@ -181,7 +181,7 @@ void KWTableStyle::saveOasis( KoGenStyles& mainStyles, KoSavingContext& /*saving // try to preserve existing internal name, if it looks adequate (no spaces) // ## TODO: check XML-Schemacs NCName conformity - const bool nameIsConform = !m_name.isEmpty() && m_name.tqfind( ' ' ) == -1; + const bool nameIsConform = !m_name.isEmpty() && m_name.find( ' ' ) == -1; TQString newName; if ( nameIsConform ) newName = mainStyles.lookup( tableCellStyle, m_name, KoGenStyles::DontForceNumbering ); diff --git a/kword/KWTableStyleManager.cpp b/kword/KWTableStyleManager.cpp index d2a0c1ea..7bd70eb6 100644 --- a/kword/KWTableStyleManager.cpp +++ b/kword/KWTableStyleManager.cpp @@ -501,7 +501,7 @@ void KWTableStyleManager::moveUpStyle() const TQString currentStyleName = m_currentTableStyle->name(); const TQString currentStyleDisplayName = m_stylesList->currentText(); - int pos2 = m_styleOrder.tqfindIndex( currentStyleName ); + int pos2 = m_styleOrder.findIndex( currentStyleName ); if ( pos2 != -1 ) { m_styleOrder.remove( m_styleOrder.at(pos2) ); @@ -529,7 +529,7 @@ void KWTableStyleManager::moveDownStyle() const TQString currentStyleName = m_currentTableStyle->name(); const TQString currentStyleDisplayName = m_stylesList->currentText(); - int pos2 = m_styleOrder.tqfindIndex( currentStyleName ); + int pos2 = m_styleOrder.findIndex( currentStyleName ); if ( pos2 != -1 ) { m_styleOrder.remove( m_styleOrder.at(pos2) ); @@ -677,12 +677,12 @@ void KWTableStyleManager::updateAllStyleCombos() // - 1. Count is the same, but the user has delete the same number as he added // - 2. Old name is not in new list, old index is wrong index in new list if ( ( static_cast<unsigned int>(m_style->count())!=m_doc->styleCollection()->styleList().count() ) && - ( m_style->listBox()->tqfindItem( oldS ) ) ) { - oldSindex = m_style->listBox()->index( m_style->listBox()->tqfindItem( oldS ) ); + ( m_style->listBox()->findItem( oldS ) ) ) { + oldSindex = m_style->listBox()->index( m_style->listBox()->findItem( oldS ) ); } if ( ( m_frameStyle->count() != m_doc->frameStyleCollection()->count() ) && - ( m_frameStyle->listBox()->tqfindItem( oldFS ) ) ) { - oldFSindex = m_frameStyle->listBox()->index( m_frameStyle->listBox()->tqfindItem( oldFS ) ); + ( m_frameStyle->listBox()->findItem( oldFS ) ) ) { + oldFSindex = m_frameStyle->listBox()->index( m_frameStyle->listBox()->findItem( oldFS ) ); } // Update the comboboxes diff --git a/kword/KWTableTemplateSelector.cpp b/kword/KWTableTemplateSelector.cpp index fe4cb1c5..7fd642e2 100644 --- a/kword/KWTableTemplateSelector.cpp +++ b/kword/KWTableTemplateSelector.cpp @@ -596,7 +596,7 @@ KWTableTemplateSelector::KWTableTemplateSelector( KWDocument *_doc, TQWidget *_p connect( cbBody, TQT_SIGNAL( toggled( bool ) ), preview, TQT_SLOT( cbBodyChanged( bool ) ) ); connect( lbTemplates, TQT_SIGNAL( selectionChanged () ), this, TQT_SLOT( changeTableTemplate() ) ); - TQListBoxItem * item = lbTemplates->tqfindItem( _tableTemplate ); + TQListBoxItem * item = lbTemplates->findItem( _tableTemplate ); int index = 0; if ( item ) index = lbTemplates->index ( item ); diff --git a/kword/KWTextDocument.cpp b/kword/KWTextDocument.cpp index 580e378d..a1b0a57a 100644 --- a/kword/KWTextDocument.cpp +++ b/kword/KWTextDocument.cpp @@ -241,7 +241,7 @@ bool KWTextDocument::loadSpanTag( const TQDomElement& tag, KoOasisContext& conte else if ( localName == "bookmark-end" ) { KWLoadingInfo* loadingInfo = m_textfs->kWordDocument()->loadingInfo(); TQString bkName = tag.attributeNS( KoXmlNS::text, "name", TQString() ); - KWLoadingInfo::BookmarkStartsMap::iterator it = loadingInfo->m_bookmarkStarts.tqfind( bkName ); + KWLoadingInfo::BookmarkStartsMap::iterator it = loadingInfo->m_bookmarkStarts.find( bkName ); if ( it == loadingInfo->m_bookmarkStarts.end() ) { // bookmark end without start. This seems to happen.. // insert simple bookmark then appendBookmark( parag, pos, parag, pos, tag.attributeNS( KoXmlNS::text, "name", TQString() ) ); diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp index 58d5af9a..c19da8f0 100644 --- a/kword/KWTextFrameSet.cpp +++ b/kword/KWTextFrameSet.cpp @@ -238,7 +238,7 @@ KWFrame * KWTextFrameSet::documentToInternal( const KoPoint &dPoint, TQPoint &iP for ( ; frameIt.current(); ++frameIt ) { KWFrame *theFrame = frameIt.current(); - if ( theFrame->tqcontains( dPoint ) ) + if ( theFrame->contains( dPoint ) ) { iPoint.setX( m_doc->ptToLayoutUnitPixX( dPoint.x() - theFrame->innerRect().x() ) ); iPoint.setY( m_doc->ptToLayoutUnitPixY( dPoint.y() - theFrame->innerRect().y() + theFrame->internalY() ) ); @@ -278,7 +278,7 @@ KWFrame * KWTextFrameSet::documentToInternalMouseSelection( const KoPoint &dPoin for ( ; frameIt.current(); ++frameIt ) { KWFrame *theFrame = frameIt.current(); - if ( theFrame->tqcontains( dPoint ) ) + if ( theFrame->contains( dPoint ) ) { iPoint.setX( m_doc->ptToLayoutUnitPixX( dPoint.x() - theFrame->innerRect().x() ) ); iPoint.setY( m_doc->ptToLayoutUnitPixY( dPoint.y() - theFrame->innerRect().y() + theFrame->internalY() ) ); @@ -300,7 +300,7 @@ KWFrame * KWTextFrameSet::documentToInternalMouseSelection( const KoPoint &dPoin #ifdef DEBUG_DTI kdDebug() << "documentToInternal: openLeftRect=" << openLeftRect << endl; #endif - if ( openLeftRect.tqcontains( dPoint ) ) + if ( openLeftRect.contains( dPoint ) ) { // We are at the left of this frame (and not in any other frame of this frameset) iPoint.setX( m_doc->ptToLayoutUnitPixX(theFrame->innerRect().left() )); @@ -317,7 +317,7 @@ KWFrame * KWTextFrameSet::documentToInternalMouseSelection( const KoPoint &dPoin #ifdef DEBUG_DTI kdDebug() << "documentToInternal: openTopRect=" << openTopRect << endl; #endif - if ( openTopRect.tqcontains( dPoint ) ) + if ( openTopRect.contains( dPoint ) ) { // We are at the top of this frame (...) iPoint.setX( m_doc->ptToLayoutUnitPixX( dPoint.x() - theFrame->innerRect().left() ) ); @@ -355,7 +355,7 @@ KWFrame * KWTextFrameSet::documentToInternalMouseSelection( const KoPoint &dPoin KWFrame *theFrame = frameIt.current(); KoRect openTopRect( theFrame->innerRect() ); openTopRect.setTop( 0 ); - if ( openTopRect.tqcontains( dPoint ) ) // We are at the top of this frame + if ( openTopRect.contains( dPoint ) ) // We are at the top of this frame iPoint.setX( m_doc->ptToLayoutUnitPixX( dPoint.x() - theFrame->left() ) ); else iPoint.setX( 0 ); // We are, hmm, on the left or right of the frames @@ -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.tqcontains( iPoint ) ) // both r and p are in tqlayout units (aka internal) + if ( r.contains( iPoint ) ) // both r and p are in tqlayout units (aka internal) { dPoint = internalToDocumentKnowingFrame( iPoint, theFrame ); #ifdef DEBUG_ITD @@ -881,7 +881,7 @@ TQValueList<KWFrame*> KWTextFrameSet::framesFromTo( int y1, int y2 ) const if ( !firstFrame ) return framesList; framesList.append( firstFrame ); - uint frameIndex = const_cast<KWTextFrameSet *>(this)->m_frames.tqfindRef( firstFrame ); + uint frameIndex = const_cast<KWTextFrameSet *>(this)->m_frames.findRef( firstFrame ); while ( ++frameIndex < m_frames.count() ) { KWFrame* f = frame( frameIndex ); if ( f->internalY() > y2 ) // too far down, we're done @@ -1636,7 +1636,7 @@ KWFrame * KWTextFrameSet::internalToDocument( const KoPoint &relPoint, KoPoint & #ifdef DEBUG_ITD kdDebug() << "KWTextFrameSet::internalToDocument frame's relative rect:" << relRect << endl; #endif - if ( relRect.tqcontains( relPoint ) ) // both relRect and relPoint are in "relative coordinates" + if ( relRect.contains( relPoint ) ) // both relRect and relPoint are in "relative coordinates" { dPoint = internalToDocumentKnowingFrame( relPoint, theFrame ); return theFrame; @@ -1797,7 +1797,7 @@ void KWTextFrameSet::saveOasisContent( KoXmlWriter& writer, KoSavingContext& con // I want TQt4's TQMap/TQHash::value()! KoSavingContext::BookmarkPositions bookmarkStarts, bookmarkEnds; - TQMap<const KoTextParag*, KoTextBookmarkList>::const_iterator bkit = bookmarksPerParagraph.tqfind( parag ); + TQMap<const KoTextParag*, KoTextBookmarkList>::const_iterator bkit = bookmarksPerParagraph.find( parag ); if ( bkit != bookmarksPerParagraph.end() ) { // Massage a bit the bookmarks data; KoTextParag wants it ordered by position, for speed. const KoTextBookmarkList& bookmarks = *bkit; @@ -2966,7 +2966,7 @@ void KWTextFrameSet::renumberFootNotes( bool tqrepaint ) } if ( var->numberingType()==KWFootNoteVariable::Auto ) { - if ( addedNums.tqcontains( numDisplay ) != 0 ) // the automatic generated number should not be equal to a manual one + if ( addedNums.contains( numDisplay ) != 0 ) // the automatic generated number should not be equal to a manual one { numDisplay++; continue; //try with the next number diff --git a/kword/KWTextFrameSet.h b/kword/KWTextFrameSet.h index b8cdd3f9..58b7730e 100644 --- a/kword/KWTextFrameSet.h +++ b/kword/KWTextFrameSet.h @@ -214,7 +214,7 @@ public: KCommand *deleteAnchoredFrame( KWAnchor * anchor ); void findPosition( const KoPoint &dPoint, KoTextParag * & parag, int & index ); - /** Highlighting support (for search/tqreplace, spellchecking etc.) */ + /** 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 ); diff --git a/kword/KWView.cpp b/kword/KWView.cpp index 03f6ba6d..f23e634a 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -161,7 +161,7 @@ class TableInfo { if(cell->protectContent()) m_protectContent=true; - if(! tableRows.tqcontains(fs->groupmanager())) { // create empty lists. + if(! tableRows.contains(fs->groupmanager())) { // create empty lists. TQValueList<unsigned int> rows; for(unsigned int i=fs->groupmanager()->getRows(); i != 0; i--) rows.append(0); @@ -421,7 +421,7 @@ KWView::~KWView() if ( m_specialCharDlg ) m_specialCharDlg->closeDialog(); // will call slotSpecialCharDlgClosed - // Abort any tqfind/tqreplace + // Abort any find/replace delete m_findReplace; // Delete gui while we still exist ( it needs documentDeleted() ) delete m_gui; @@ -575,10 +575,10 @@ void KWView::setupActions() m_actionEditCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( editCut() ), actionCollection(), "edit_cut" ); m_actionEditCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( editCopy() ), actionCollection(), "edit_copy" ); m_actionEditPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( editPaste() ), actionCollection(), "edit_paste" ); - m_actionEditFind = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( editFind() ), actionCollection(), "edit_tqfind" ); + m_actionEditFind = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( editFind() ), actionCollection(), "edit_find" ); m_actionEditFindNext = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( editFindNext() ), actionCollection(), "edit_findnext" ); m_actionEditFindPrevious = KStdAction::findPrev( TQT_TQOBJECT(this), TQT_SLOT( editFindPrevious() ), actionCollection(), "edit_findprevious" ); - m_actionEditReplace = KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( editReplace() ), actionCollection(), "edit_tqreplace" ); + m_actionEditReplace = KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( editReplace() ), actionCollection(), "edit_replace" ); m_actionEditSelectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( editSelectAll() ), actionCollection(), "edit_selectall" ); new KAction( i18n( "Select All Frames" ), 0, TQT_TQOBJECT(this), TQT_SLOT( editSelectAllFrames() ), actionCollection(), "edit_selectallframes" ); m_actionEditSelectCurrentFrame = new KAction( i18n( "Select Frame" ), 0, @@ -1492,7 +1492,7 @@ void KWView::createExpressionActions( KActionMenu * parentMenu,const TQString& f KAction * act = new KAction( text, 0, TQT_TQOBJECT(this), TQT_SLOT( insertExpression() ), actionCollection(), TQString("expression-action_%1").tqarg(i).latin1() ); - if ( personalShortCut.tqcontains(text) ) + if ( personalShortCut.contains(text) ) act->setShortcut( personalShortCut[text] ); i++; act->setGroup("expression-action"); @@ -1580,7 +1580,7 @@ void KWView::refreshCustomMenu() if ( var->type() == VT_CUSTOM ) { varName=( (KoCustomVariable*) var )->name(); - if ( !lst.tqcontains( varName) ) + if ( !lst.contains( varName) ) { lst.append( varName ); TQCString name = TQString("custom-action_%1").tqarg(i).latin1(); @@ -1744,9 +1744,9 @@ int KWView::checkClipboard( TQMimeSource *data ) if ( TQImageDrag::canDecode( data ) ) provides |= ProvidesImage; - if ( formats.tqfindIndex( KFormula::MimeSource::selectionMimeType() ) != -1 ) + if ( formats.findIndex( KFormula::MimeSource::selectionMimeType() ) != -1 ) provides |= ProvidesFormula; - if ( formats.tqfindIndex( "text/plain" ) != -1 ) + if ( formats.findIndex( "text/plain" ) != -1 ) provides |= ProvidesPlainText; TQCString returnedTypeMime = KoTextObject::providesOasis( data ); if ( !returnedTypeMime.isEmpty() ) @@ -2122,7 +2122,7 @@ void KWView::updateReadWrite( bool readwrite ) act->setEnabled( true ); // In fact the new view could be readwrite, so this is too dangerous - // (e.g. during spellchecking or during search-n-tqreplace) + // (e.g. during spellchecking or during search-n-replace) //act = actionCollection()->action("view_newview"); //if (act) // act->setEnabled( true ); @@ -2198,7 +2198,7 @@ void KWView::updateStyleList() TQString currentStyle = m_actionFormatStyle->currentText(); // Generate list of styles const TQStringList lst = m_doc->styleCollection()->displayNameList(); - const int pos = lst.tqfindIndex( currentStyle ); + const int pos = lst.findIndex( currentStyle ); // Fill the combo - using a KSelectAction m_actionFormatStyle->setItems( lst ); if ( pos > -1 ) @@ -2261,7 +2261,7 @@ void KWView::updateFrameStyleList() const TQString currentStyle = m_actionFrameStyle->currentText(); // Generate list of styles const TQStringList lst = m_doc->frameStyleCollection()->displayNameList(); - const int pos = lst.tqfindIndex( currentStyle ); + const int pos = lst.findIndex( currentStyle ); // Fill the combo m_actionFrameStyle->setItems( lst ); if ( pos > -1 ) @@ -2314,7 +2314,7 @@ void KWView::updateTableStyleList() const TQString currentStyle = m_actionTableStyle->currentText(); // Generate list of styles const TQStringList lst = m_doc->tableStyleCollection()->displayNameList(); - const int pos = lst.tqfindIndex( currentStyle ); + const int pos = lst.findIndex( currentStyle ); // Fill the combo m_actionTableStyle->setItems( lst ); if ( pos > -1 ) @@ -2503,7 +2503,7 @@ void KWView::editFind() bool hasSelection = edit && edit->textFrameSet()->hasSelection(); bool hasCursor = edit != 0L; - KoSearchDia dialog( m_gui->canvasWidget(), "tqfind", m_searchEntry, hasSelection, hasCursor ); + KoSearchDia dialog( m_gui->canvasWidget(), "find", m_searchEntry, hasSelection, hasCursor ); if ( dialog.exec() == TQDialog::Accepted ) { delete m_findReplace; @@ -2523,7 +2523,7 @@ void KWView::editReplace() bool hasSelection = edit && edit->textFrameSet()->hasSelection(); bool hasCursor = edit != 0L; - KoReplaceDia dialog( m_gui->canvasWidget(), "tqreplace", m_searchEntry, m_replaceEntry, hasSelection, hasCursor ); + KoReplaceDia dialog( m_gui->canvasWidget(), "replace", m_searchEntry, m_replaceEntry, hasSelection, hasCursor ); if ( dialog.exec() == TQDialog::Accepted ) { delete m_findReplace; @@ -2568,7 +2568,7 @@ void KWView::adjustZOrderOfSelectedFrames(MoveFrameType moveType) { if(table) { for (TQPtrListIterator<KWFrame> cellIt(table->frameIterator() ); cellIt.current() ; ++cellIt ) { KWFrame *frame = cellIt.current(); - if(page->rect().tqcontains(*frame) && !frames.tqcontains(frame)) + if(page->rect().contains(*frame) && !frames.contains(frame)) frames.append(frame); } } @@ -2642,7 +2642,7 @@ void KWView::adjustZOrderOfSelectedFrames(MoveFrameType moveType) { void KWView::increaseAllZOrdersAbove(int refZOrder, int pageNum, const TQPtrList<KWFrame>& frameSelection) { TQPtrList<KWFrame> framesInPage = m_doc->framesInPage( pageNum, false ); for ( TQPtrListIterator<KWFrame> frameIt( framesInPage ); frameIt.current(); ++frameIt ) { - if(frameSelection.tqcontains(frameIt.current()) > 0) continue; // ignore frames we selected. + if(frameSelection.contains(frameIt.current()) > 0) continue; // ignore frames we selected. if(frameIt.current()->zOrder() >= refZOrder) { frameIt.current()->setZOrder( frameIt.current()->zOrder() + 1 ); } @@ -2653,7 +2653,7 @@ void KWView::increaseAllZOrdersAbove(int refZOrder, int pageNum, const TQPtrList void KWView::decreaseAllZOrdersUnder(int refZOrder, int pageNum, const TQPtrList<KWFrame>& frameSelection) { TQPtrList<KWFrame> framesInPage = m_doc->framesInPage( pageNum, false ); for ( TQPtrListIterator<KWFrame> frameIt( framesInPage ); frameIt.current(); ++frameIt ) { - if(frameSelection.tqcontains(frameIt.current()) > 0) continue; // ignore frames we selected. + if(frameSelection.contains(frameIt.current()) > 0) continue; // ignore frames we selected. if(frameIt.current()->zOrder() <= refZOrder) { frameIt.current()->setZOrder( frameIt.current()->zOrder() - 1 ); } @@ -2665,7 +2665,7 @@ int KWView::raiseFrame(const TQPtrList<KWFrame>& frameSelection, const KWFrame * TQValueList<int> zorders; TQPtrList<KWFrame> framesInPage = m_doc->framesInPage( frame->pageNumber(), false ); for ( TQPtrListIterator<KWFrame> frameIt( framesInPage ); frameIt.current(); ++frameIt ) { - if(frameSelection.tqcontains(frameIt.current()) > 0) continue; // ignore other frames we selected. + if(frameSelection.contains(frameIt.current()) > 0) continue; // ignore other frames we selected. if(! frameIt.current()->intersects(*frame)) continue; // only frames that I intersect with. int z = frameIt.current()->zOrder(); if(z > frame->zOrder()) { @@ -2675,7 +2675,7 @@ int KWView::raiseFrame(const TQPtrList<KWFrame>& frameSelection, const KWFrame * } if(newZOrder==10000) return frame->zOrder(); // Ensure that newZOrder is "free" - if ( zorders.tqfind( newZOrder ) != zorders.end() ) + if ( zorders.find( newZOrder ) != zorders.end() ) increaseAllZOrdersAbove( newZOrder, frame->pageNumber(), frameSelection ); return newZOrder; } @@ -2685,7 +2685,7 @@ int KWView::lowerFrame(const TQPtrList<KWFrame>& frameSelection, const KWFrame * TQValueList<int> zorders; TQPtrList<KWFrame> framesInPage = m_doc->framesInPage( frame->pageNumber(), false ); for ( TQPtrListIterator<KWFrame> frameIt( framesInPage ); frameIt.current(); ++frameIt ) { - if(frameSelection.tqcontains(frameIt.current()) > 0) continue; // ignore other frames we selected. + if(frameSelection.contains(frameIt.current()) > 0) continue; // ignore other frames we selected. if(frameIt.current()->frameSet()->isMainFrameset()) continue; // ignore main frameset. if(! frameIt.current()->intersects(*frame)) continue; // only frames that I intersect with. int z = frameIt.current()->zOrder(); @@ -2696,7 +2696,7 @@ int KWView::lowerFrame(const TQPtrList<KWFrame>& frameSelection, const KWFrame * } if(newZOrder==-10000) return frame->zOrder(); // Ensure that newZOrder is "free" - if ( zorders.tqfind( newZOrder ) != zorders.end() ) + if ( zorders.find( newZOrder ) != zorders.end() ) decreaseAllZOrdersUnder( newZOrder, frame->pageNumber(), frameSelection ); return newZOrder; } @@ -2705,7 +2705,7 @@ int KWView::bringToFront(const TQPtrList<KWFrame>& frameSelection, const KWFrame int newZOrder = frame->zOrder(); TQPtrList<KWFrame> framesInPage = m_doc->framesInPage( frame->pageNumber(), false ); for ( TQPtrListIterator<KWFrame> frameIt( framesInPage ); frameIt.current(); ++frameIt ) { - if(frameSelection.tqcontains(frameIt.current()) > 0) continue; // ignore other frames we selected. + if(frameSelection.contains(frameIt.current()) > 0) continue; // ignore other frames we selected. if(! frameIt.current()->intersects(*frame)) continue; // only frames that I intersect with. newZOrder=TQMAX(newZOrder, frameIt.current()->zOrder()+1); } @@ -2716,7 +2716,7 @@ int KWView::sendToBack(const TQPtrList<KWFrame>& frameSelection, const KWFrame * int newZOrder = frame->zOrder(); TQPtrList<KWFrame> framesInPage = m_doc->framesInPage( frame->pageNumber(), false ); for ( TQPtrListIterator<KWFrame> frameIt( framesInPage ); frameIt.current(); ++frameIt ) { - if(frameSelection.tqcontains(frameIt.current()) > 0) continue; // ignore other frames we selected. + if(frameSelection.contains(frameIt.current()) > 0) continue; // ignore other frames we selected. if(frameIt.current()->frameSet()->isMainFrameset()) continue; // ignore main frameset. if(! frameIt.current()->intersects(*frame)) continue; // only frames that I intersect with. newZOrder=TQMIN(newZOrder, frameIt.current()->zOrder()-1); @@ -3063,12 +3063,12 @@ void KWView::changeZoomMenu( int zoom ) regexp.search(*it); const int val=regexp.cap(1).toInt(&ok); //zoom : limit inferior=10 - if(ok && val>9 && list.tqcontains(val)==0) + if(ok && val>9 && list.contains(val)==0) list.append( val ); } //necessary at the beginning when we read config //this value is not in combo list - if(list.tqcontains(zoom)==0) + if(list.contains(zoom)==0) list.append( zoom ); qHeapSort( list ); @@ -3098,13 +3098,13 @@ void KWView::showZoom( int zoom ) { TQStringList list = m_actionViewZoom->items(); TQString zoomStr( i18n("%1%").tqarg( zoom ) ); - m_actionViewZoom->setCurrentItem( list.tqfindIndex(zoomStr) ); + m_actionViewZoom->setCurrentItem( list.findIndex(zoomStr) ); } void KWView::showZoom( const TQString& zoom ) { TQStringList list = m_actionViewZoom->items(); - m_actionViewZoom->setCurrentItem( list.tqfindIndex( zoom ) ); + m_actionViewZoom->setCurrentItem( list.findIndex( zoom ) ); } void KWView::slotViewFormattingChars() @@ -3530,7 +3530,7 @@ void KWView::insertLink() if ( edit->textFrameSet()->hasSelection() ) { TQString selectedText = edit->textFrameSet()->textObject()->selectedText(); - if ( edit->textFrameSet()->textObject()->selectionHasCustomItems() || selectedText.tqcontains('\n') ) + if ( edit->textFrameSet()->textObject()->selectionHasCustomItems() || selectedText.contains('\n') ) return; if ( selectedText.startsWith( "mailto:/" ) || selectedText.startsWith( "ftp:/" ) || @@ -3581,7 +3581,7 @@ void KWView::insertVariable() if ( edit ) { KAction * act = (KAction *)(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))); - VariableDefMap::Iterator it = m_variableDefMap.tqfind( act ); + VariableDefMap::Iterator it = m_variableDefMap.find( act ); if ( it == m_variableDefMap.end() ) kdWarning() << "Action not found in m_variableDefMap." << endl; else @@ -4763,7 +4763,7 @@ TQPtrList<KoTextFormatInterface> KWView::applicableTextInterfaces() const TQValueListIterator<KWFrameView*> framesIterator = selectedFrames.begin(); while(framesIterator != selectedFrames.end()) { KWTextFrameSet* fs = dynamic_cast<KWTextFrameSet *>( (*framesIterator)->frame()->frameSet() ); - if ( fs && !lst.tqcontains( fs )&& !fs->protectContent() ) + if ( fs && !lst.contains( fs )&& !fs->protectContent() ) lst.append( fs ); ++framesIterator; } @@ -5572,7 +5572,7 @@ void KWView::startKSpell() TQObject::connect( m_spell.dlg, TQT_SIGNAL(misspelling(const TQString&, int)), TQT_TQOBJECT(this), TQT_SLOT(spellCheckerMisspelling(const TQString&, int)) ); - TQObject::connect( m_spell.dlg, TQT_SIGNAL(tqreplace(const TQString&, int, const TQString&)), + TQObject::connect( m_spell.dlg, TQT_SIGNAL(replace(const TQString&, int, const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(spellCheckerCorrected(const TQString&, int, const TQString&)) ); TQObject::connect( m_spell.dlg, TQT_SIGNAL(done(const TQString&) ), TQT_TQOBJECT(this), TQT_SLOT(spellCheckerDone(const TQString&)) ); @@ -6934,7 +6934,7 @@ void KWView::insertFile(const KURL& url) TQString name = framesetElem.attribute( "name" ); TQString grpMgr = framesetElem.attribute( "grpMgr" ); - if ( !inlineFsNames.tqcontains(name) && !inlineFsNames.tqcontains(grpMgr) ) + if ( !inlineFsNames.contains(name) && !inlineFsNames.contains(grpMgr) ) { // fixed frameset if ( !grpMgr.isEmpty() ) { // Table cell @@ -6973,7 +6973,7 @@ void KWView::insertFile(const KURL& url) TQString name = framesetElem.attribute("name"); TQString grpMgr = framesetElem.attribute( "grpMgr" ); // We skip headers, footers and framsets/tables inside theese - if ( !fsInHeader.tqcontains(name) && !fsInHeader.tqcontains(grpMgr) && + if ( !fsInHeader.contains(name) && !fsInHeader.contains(grpMgr) && !( frameSetType == FT_TEXT && (info == KWFrameSet::FI_FIRST_HEADER || info == KWFrameSet::FI_EVEN_HEADER || @@ -7347,12 +7347,12 @@ void KWView::addPersonalExpression() doc = TQDomDocument( "KWordExpression" ); TQDomElement begin = doc.createElement( "KWordExpression" ); doc.appendChild( begin ); - TQMapIterator<TQString, TQStringList> itPersonalExp = lstOfPersonalExp.tqfind(i18n("Normal")); + TQMapIterator<TQString, TQStringList> itPersonalExp = lstOfPersonalExp.find(i18n("Normal")); if ( itPersonalExp != lstOfPersonalExp.end()) { list = itPersonalExp.data(); list<<newExpression; - lstOfPersonalExp.tqreplace( i18n("Normal"), list); + lstOfPersonalExp.replace( i18n("Normal"), list); } else { @@ -7441,7 +7441,7 @@ TQPtrList<KAction> KWView::listOfResultOfCheckWord( const TQString &word ) TQPtrList<KAction> listAction; DefaultDictionary *dict = m_broker->defaultDictionary(); const TQStringList lst = dict->suggest( word ); - if ( !lst.tqcontains( word ) ) + if ( !lst.contains( word ) ) { TQStringList::ConstIterator it = lst.begin(); const TQStringList::ConstIterator end = lst.end(); diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp index 1e54d0b9..508eb74f 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp +++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp @@ -98,9 +98,9 @@ void KWMailMergeKABCConfig::acceptSelection() void KWMailMergeKABCConfig::addSelectedContacts() { TQListViewItemIterator it( _ui->mAvailableView, TQListViewItemIterator::Selected ); - TQListViewItem* selected = _ui->mSelectedView->tqfindItem( + TQListViewItem* selected = _ui->mSelectedView->findItem( i18n("Single Entries"), 0, TQt::ExactMatch ); - TQListViewItem* selectedLists = _ui->mSelectedView->tqfindItem( + TQListViewItem* selectedLists = _ui->mSelectedView->findItem( i18n("Distribution Lists"), 0, TQt::ExactMatch ); while ( it.current() ) { @@ -175,7 +175,7 @@ void KWMailMergeKABCConfig::filterChanged( const TQString& txt ) } else { - item->setVisible( item->text(0).tqcontains( txt, false ) ); + item->setVisible( item->text(0).contains( txt, false ) ); } item = item->nextSibling(); } @@ -195,7 +195,7 @@ void KWMailMergeKABCConfig::initSelectedAddressees() TQStringList records = _db->singleRecords(); TQListViewItem* category = _ui->mAvailableView->firstChild(); - TQListViewItem* selected = _ui->mSelectedView->tqfindItem( + TQListViewItem* selected = _ui->mSelectedView->findItem( i18n("Single Entries"), 0, TQt::ExactMatch ); while ( category && (records.count()>0) ) { @@ -239,9 +239,9 @@ void KWMailMergeKABCConfig::initSelectedLists() kdDebug() << "::initSelectedLists()" << lists.join(",") << endl; - TQListViewItem* l = _ui->mAvailableView->tqfindItem( + TQListViewItem* l = _ui->mAvailableView->findItem( i18n("Distribution Lists"), 0, TQt::ExactMatch ); - TQListViewItem* selected = _ui->mSelectedView->tqfindItem( + TQListViewItem* selected = _ui->mSelectedView->findItem( i18n("Distribution Lists"), 0, TQt::ExactMatch ); TQListViewItem* item = ( l->firstChild() ); @@ -293,7 +293,7 @@ void KWMailMergeKABCConfig::launchAddressbook() const void KWMailMergeKABCConfig::removeContact( TQListViewItem* item ) { TQStringList& categories = _usedCategories; - TQListViewItem* availableLists = _ui->mAvailableView->tqfindItem( + TQListViewItem* availableLists = _ui->mAvailableView->findItem( i18n("Distribution Lists"), 0, TQt::ExactMatch ); if( item->depth() > 0 ) { @@ -306,7 +306,7 @@ void KWMailMergeKABCConfig::removeContact( TQListViewItem* item ) for ( TQStringList::Iterator itEntryCat = entryCategories.begin(); itEntryCat != entryCategories.end(); ++itEntryCat ) { - int i = categories.tqfindIndex(*itEntryCat); + int i = categories.findIndex(*itEntryCat); if( i == -1 ) { TQListViewItem* category = new TQListViewItem( _ui->mAvailableView, @@ -320,7 +320,7 @@ void KWMailMergeKABCConfig::removeContact( TQListViewItem* item ) { KWMailMergeKABCConfigListItem* leftItem = new KWMailMergeKABCConfigListItem( - _ui->mAvailableView->tqfindItem( + _ui->mAvailableView->findItem( *itEntryCat, 0, TQt::ExactMatch), rightItem->addressee() ); @@ -330,7 +330,7 @@ void KWMailMergeKABCConfig::removeContact( TQListViewItem* item ) { TQString noCat = i18n("no category"); KWMailMergeKABCConfigListItem* leftItem = new KWMailMergeKABCConfigListItem( - _ui->mAvailableView->tqfindItem( + _ui->mAvailableView->findItem( noCat, 0, TQt::ExactMatch), rightItem->addressee() ); } @@ -381,7 +381,7 @@ void KWMailMergeKABCConfig::saveDistributionList() } KABC::DistributionList *distList = new KABC::DistributionList( &dlm, listName ); - TQListViewItem* newListItem = new TQListViewItem( _ui->mSelectedView->tqfindItem( + TQListViewItem* newListItem = new TQListViewItem( _ui->mSelectedView->findItem( i18n("Distribution Lists"),0 , TQt::ExactMatch), listName ); TQListViewItem* category = _ui->mSelectedView->firstChild(); @@ -443,7 +443,7 @@ void KWMailMergeKABCConfig::updateAvailable() for ( TQStringList::Iterator itCat = entryCategories.begin(); itCat != entryCategories.end(); ++itCat ) { - int i = categories.tqfindIndex(*itCat); + int i = categories.findIndex(*itCat); // Create category, if not yet in listview and append item to it. if( i == -1 ) @@ -458,7 +458,7 @@ void KWMailMergeKABCConfig::updateAvailable() else { KWMailMergeKABCConfigListItem* item = new KWMailMergeKABCConfigListItem( - _ui->mAvailableView->tqfindItem( + _ui->mAvailableView->findItem( *itCat, 0, TQt::ExactMatch), *itAddr ); } diff --git a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp index 8444b65c..aec361a3 100644 --- a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp +++ b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp @@ -11,7 +11,7 @@ KWQtSqlEasyFilter::KWQtSqlEasyFilter( TQWidget *tqparent) { m_fieldList << "" <<"one" << "two" << "three" << "four"; m_sortingList << ""<<i18n("ascending")<<i18n("descending"); - m_operationList <<"="<<i18n("tqcontains")<< "<" << ">"; + m_operationList <<"="<<i18n("contains")<< "<" << ">"; m_table=new TQTable(6,3,this); setMainWidget(m_table); diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp index f3129420..c091184e 100644 --- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp +++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp @@ -79,7 +79,7 @@ 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->tqcontains(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<<<").tqarg(name); return (myquery->value(name)).toString(); } diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp index 47ce94cf..45ff85bc 100644 --- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp +++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp @@ -59,7 +59,7 @@ 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->tqcontains(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<<<").tqarg(name); return (myquery->value(name)).toString(); } diff --git a/kword/tests/FrameViewTester.cpp b/kword/tests/FrameViewTester.cpp index f486e11c..e3444bd5 100644 --- a/kword/tests/FrameViewTester.cpp +++ b/kword/tests/FrameViewTester.cpp @@ -271,11 +271,11 @@ void KWFrameViewTester::testMouseMeaning() { for(int y = 50; y <= 100; y += 25) { for(int offset2=-6; offset2 <= 6; offset2+=6) { point.setY(y + offset2); - CHECK(fv->tqcontains(point, true), true); + CHECK(fv->contains(point, true), true); if(x < 50 || x > 100 || y < 50 || y > 100) - CHECK(fv->tqcontains(point), false); + CHECK(fv->contains(point), false); else - CHECK(fv->tqcontains(point), true); + CHECK(fv->contains(point), true); if(x > 60 && x < 90 && y > 60 && y < 90) CHECK(fv->isBorderHit(point), false); else diff --git a/lib/kformula/basicelement.cc b/lib/kformula/basicelement.cc index da961df3..1d36193a 100644 --- a/lib/kformula/basicelement.cc +++ b/lib/kformula/basicelement.cc @@ -289,39 +289,39 @@ TQString BasicElement::toLatex() */ double BasicElement::getSize( const TQString& str, SizeType* st ) { - int index = str.tqfind( "%" ); + int index = str.find( "%" ); if ( index != -1 ) { return str2size( str, st, index, RelativeSize ) / 100.0; } - index = str.tqfind( "pt", 0, false ); + index = str.find( "pt", 0, false ); if ( index != -1 ) { return str2size( str, st, index, AbsoluteSize ); } - index = str.tqfind( "mm", 0, false ); + index = str.find( "mm", 0, false ); if ( index != -1 ) { return str2size( str, st, index, AbsoluteSize ) * 72.0 / 20.54; } - index = str.tqfind( "cm", 0, false ); + index = str.find( "cm", 0, false ); if ( index != -1 ) { return str2size( str, st, index, AbsoluteSize ) * 72.0 / 2.54; } - index = str.tqfind( "in", 0, false ); + index = str.find( "in", 0, false ); if ( index != -1 ) { return str2size( str, st, index, AbsoluteSize ) * 72.0; } - index = str.tqfind( "em", 0, false ); + index = str.find( "em", 0, false ); if ( index != -1 ) { return str2size( str, st, index, RelativeSize ); } - index = str.tqfind( "ex", 0, false ); + index = str.find( "ex", 0, false ); if ( index != -1 ) { return str2size( str, st, index, RelativeSize ); } - index = str.tqfind( "pc", 0, false ); + index = str.find( "pc", 0, false ); if ( index != -1 ) { return str2size( str, st, index, AbsoluteSize ) * 12.0; } - index = str.tqfind( "px", 0, false ); + index = str.find( "px", 0, false ); if ( index != -1 ) { return str2size( str, st, index, PixelSize ); } diff --git a/lib/kformula/fontstyle.cc b/lib/kformula/fontstyle.cc index 57088fef..0e37028a 100644 --- a/lib/kformula/fontstyle.cc +++ b/lib/kformula/fontstyle.cc @@ -56,11 +56,11 @@ public: const TQStringList lst = db.tqfamilies(); for ( TQStringList::const_iterator it = lst.begin(), end = lst.end() ; it != end ; ++it ) { const TQString name = *it; - int i = name.tqfind('['); + int i = name.find('['); TQString family = name; // Remove foundry if ( i > -1 ) { - const int li = name.tqfindRev(']'); + const int li = name.findRev(']'); if (i < li) { if (name[i - 1] == ' ') i--; @@ -71,7 +71,7 @@ public: } } bool hasFont( const TQString& fontName ) const { - return m_fontNames.tqfind( fontName ) != m_fontNames.end(); + return m_fontNames.find( fontName ) != m_fontNames.end(); } TQStringList m_fontNames; }; diff --git a/lib/kformula/formulacursor.cc b/lib/kformula/formulacursor.cc index 6545b18c..b406a002 100644 --- a/lib/kformula/formulacursor.cc +++ b/lib/kformula/formulacursor.cc @@ -403,7 +403,7 @@ BasicElement* FormulaCursor::replaceByMainChildContent(Direction direction) /** - * Trys to find the element we are the main child of and tqreplace + * Trys to find the element we are the main child of and replace * it with our content. * * This is simply another form of replaceByMainChildContent. You diff --git a/lib/kformula/formulacursor.h b/lib/kformula/formulacursor.h index 1aa5d8bf..9843abfa 100644 --- a/lib/kformula/formulacursor.h +++ b/lib/kformula/formulacursor.h @@ -182,7 +182,7 @@ public: BasicElement* replaceByMainChildContent(Direction = beforeCursor); /** - * Trys to find the element we are the main child of and tqreplace + * Trys to find the element we are the main child of and replace * it with our content. * * This is simply another form of replaceByMainChildContent. You diff --git a/lib/kformula/formulaelement.cc b/lib/kformula/formulaelement.cc index 29ae7cdd..19081093 100644 --- a/lib/kformula/formulaelement.cc +++ b/lib/kformula/formulaelement.cc @@ -282,7 +282,7 @@ void FormulaElement::convertNames( TQDomNode node ) TQDomNode sequence = node.parentNode(); TQDomDocument doc = sequence.ownerDocument(); TQDomElement nameseq = doc.createElement( "NAMESEQUENCE" ); - sequence.tqreplaceChild( nameseq, node ); + sequence.replaceChild( nameseq, node ); bool inName = true; while ( inName ) { diff --git a/lib/kformula/kformulacommand.cc b/lib/kformula/kformulacommand.cc index 2a5e7ddd..178ec399 100644 --- a/lib/kformula/kformulacommand.cc +++ b/lib/kformula/kformulacommand.cc @@ -207,7 +207,7 @@ void KFCAddToken::execute() BasicElement* current = cursor->getElement(); while ( (element = it.current()) != 0 ) { element->goInside( cursor ); - cursor->insert( *contentList.tqfind( element ), beforeCursor ); + cursor->insert( *contentList.find( element ), beforeCursor ); ++it; } setUnexecuteCursor( cursor ); @@ -249,7 +249,7 @@ void KFCAddToken::addToken( BasicElement* element ) { tokenList.append( element ); contentList.insert( element, new TQPtrList< BasicElement > ); - contentList.tqfind( element )->setAutoDelete( true ); + contentList.find( element )->setAutoDelete( true ); } KFCReplaceToken::KFCReplaceToken(const TQString &name, Container* document) diff --git a/lib/kformula/kformulacommand.h b/lib/kformula/kformulacommand.h index 8b1d2555..a63053d7 100644 --- a/lib/kformula/kformulacommand.h +++ b/lib/kformula/kformulacommand.h @@ -256,7 +256,7 @@ public: * Collect content for each token */ void addContent( BasicElement* element, BasicElement* content ) { - contentList.tqfind( element )->append( content ); + contentList.find( element )->append( content ); } diff --git a/lib/kformula/kformulaconfigpage.cc b/lib/kformula/kformulaconfigpage.cc index 143ce49d..add9c840 100644 --- a/lib/kformula/kformulaconfigpage.cc +++ b/lib/kformula/kformulaconfigpage.cc @@ -451,7 +451,7 @@ void ConfigurePage::slotChanged() // TQValueVector<TQString>::iterator MathFontsConfigurePage::findUsedFont( TQString name ) // { -// return std::tqfind( usedFontList.begin(), usedFontList.end(), name ); +// return std::find( usedFontList.begin(), usedFontList.end(), name ); // } // void MathFontsConfigurePage::setupLists( const TQStringList& usedFonts ) @@ -463,7 +463,7 @@ void ConfigurePage::slotChanged() // // symbolTable.findAvailableFonts( &fontMap ); // for ( TQStringList::const_iterator it = usedFonts.begin(); it != usedFonts.end(); ++it ) { -// TQMap<TQString, TQString>::iterator font = fontMap.tqfind( *it ); +// TQMap<TQString, TQString>::iterator font = fontMap.find( *it ); // if ( font != fontMap.end() ) { // fontMap.erase( font ); // new UsedFontItem( this, requestedFonts, *it ); @@ -493,7 +493,7 @@ void ConfigurePage::slotChanged() // TQListViewItem* fontItem = requestedFonts->selectedItem(); // if ( fontItem ) { // TQString fontName = fontItem->text( 0 ); -// TQValueVector<TQString>::iterator it = std::tqfind( usedFontList.begin(), usedFontList.end(), fontName ); +// TQValueVector<TQString>::iterator it = std::find( usedFontList.begin(), usedFontList.end(), fontName ); // if ( it != usedFontList.end() ) { // usedFontList.erase( it ); // } @@ -508,7 +508,7 @@ void ConfigurePage::slotChanged() // TQListViewItem* fontItem = requestedFonts->selectedItem(); // if ( fontItem ) { // TQString fontName = fontItem->text( 0 ); -// TQValueVector<TQString>::iterator it = std::tqfind( usedFontList.begin(), usedFontList.end(), fontName ); +// TQValueVector<TQString>::iterator it = std::find( usedFontList.begin(), usedFontList.end(), fontName ); // if ( it != usedFontList.end() ) { // uint pos = it - usedFontList.begin(); // if ( pos > 0 ) { @@ -525,7 +525,7 @@ void ConfigurePage::slotChanged() // TQListViewItem* fontItem = requestedFonts->selectedItem(); // if ( fontItem ) { // TQString fontName = fontItem->text( 0 ); -// TQValueVector<TQString>::iterator it = std::tqfind( usedFontList.begin(), usedFontList.end(), fontName ); +// TQValueVector<TQString>::iterator it = std::find( usedFontList.begin(), usedFontList.end(), fontName ); // if ( it != usedFontList.end() ) { // uint pos = it - usedFontList.begin(); // if ( pos < usedFontList.size()-1 ) { diff --git a/lib/kformula/kformuladocument.cc b/lib/kformula/kformuladocument.cc index 3a19ac70..228b4017 100644 --- a/lib/kformula/kformuladocument.cc +++ b/lib/kformula/kformuladocument.cc @@ -106,7 +106,7 @@ TQPtrListIterator<Container> Document::formulas() int Document::formulaPos( Container* formula ) { - return formulae.tqfind( formula ); + return formulae.find( formula ); } @@ -968,7 +968,7 @@ void DocumentWrapper::makeGreek() void DocumentWrapper::insertSymbol() { if ( hasFormula() && - m_document->m_contextStyle->symbolTable().tqcontains( m_selectedName ) ) { + m_document->m_contextStyle->symbolTable().contains( m_selectedName ) ) { TQChar ch = m_document->m_contextStyle->symbolTable().tqunicode( m_selectedName ); if ( ch != TQChar::null ) { TextCharRequest r( ch, true ); @@ -984,7 +984,7 @@ void DocumentWrapper::insertSymbol() void DocumentWrapper::insertSymbol( TQString name ) { if ( hasFormula() ) { - if ( m_document->m_contextStyle->symbolTable().tqcontains( name ) ) { + if ( m_document->m_contextStyle->symbolTable().contains( name ) ) { TQChar ch = m_document->m_contextStyle->symbolTable().tqunicode( name ); if ( ch != TQChar::null ) { TextCharRequest r( ch, true ); diff --git a/lib/kformula/kformulamathmlread.cc b/lib/kformula/kformulamathmlread.cc index f42e3ae1..fd3e43d2 100644 --- a/lib/kformula/kformulamathmlread.cc +++ b/lib/kformula/kformulamathmlread.cc @@ -1475,7 +1475,7 @@ bool MathML2KFormula::processElement( TQDomNode node, TQDomDocument& doc, TQDomN TQDomNode n = element.firstChild(); TQDomElement op = n.toElement(); uint count = element.childNodes().count(); - //adding explicit brackets to tqreplace "apply"s implicit ones + //adding explicit brackets to replace "apply"s implicit ones TQDomElement brackets = doc.createElement("BRACKET"); brackets.setAttribute("RIGHT", "41"); brackets.setAttribute("LEFT", "40"); diff --git a/lib/kformula/matrixelement.cc b/lib/kformula/matrixelement.cc index 38020904..56062dcd 100644 --- a/lib/kformula/matrixelement.cc +++ b/lib/kformula/matrixelement.cc @@ -866,22 +866,22 @@ bool MatrixElement::readAttributesFromMathMLDom( const TQDomElement& element ) TQString alignStr = element.attribute( "align" ).lower(); if ( ! alignStr.isNull() ) { - if ( alignStr.tqfind( "top" ) != -1 ) { + if ( alignStr.find( "top" ) != -1 ) { m_align = TopAlign; } - else if ( alignStr.tqfind( "bottom" ) != -1 ) { + else if ( alignStr.find( "bottom" ) != -1 ) { m_align = BottomAlign; } - else if ( alignStr.tqfind( "center" ) != -1 ) { + else if ( alignStr.find( "center" ) != -1 ) { m_align = CenterAlign; } - else if ( alignStr.tqfind( "baseline" ) != -1 ) { + else if ( alignStr.find( "baseline" ) != -1 ) { m_align = BaselineAlign; } - else if ( alignStr.tqfind( "axis" ) != -1 ) { + else if ( alignStr.find( "axis" ) != -1 ) { m_align = AxisAlign; } - int index = alignStr.tqfindRev( ' ' ); + int index = alignStr.findRev( ' ' ); if ( index != -1 ) { m_rowNumber = alignStr.right( index + 1 ).toInt(); } @@ -1891,7 +1891,7 @@ void KFCNewLine::execute() { FormulaCursor* cursor = getExecuteCursor(); MultilineElement* tqparent = static_cast<MultilineElement*>( m_line->getParent() ); - int linePos = tqparent->content.tqfind( m_line ); + int linePos = tqparent->content.find( m_line ); tqparent->content.insert( linePos+1, m_newline ); // If there are tqchildren to be moved. @@ -1926,7 +1926,7 @@ void KFCNewLine::unexecute() { FormulaCursor* cursor = getExecuteCursor(); MultilineElement* tqparent = static_cast<MultilineElement*>( m_line->getParent() ); - int linePos = tqparent->content.tqfind( m_line ); + int linePos = tqparent->content.find( m_line ); // Now the command owns the new line again. m_newline = tqparent->content.at( linePos+1 ); @@ -2225,7 +2225,7 @@ void MultilineElement::moveLeft( FormulaCursor* cursor, BasicElement* from ) else { // Coming from one of the lines we go to the previous line // or to the tqparent if there is none. - int pos = content.tqfind( static_cast<MultilineSequenceElement*>( from ) ); + int pos = content.find( static_cast<MultilineSequenceElement*>( from ) ); if ( pos > -1 ) { if ( pos > 0 ) { content.at( pos-1 )->moveLeft( cursor, this ); @@ -2252,7 +2252,7 @@ void MultilineElement::moveRight( FormulaCursor* cursor, BasicElement* from ) content.at( 0 )->moveRight(cursor, this); } else { - int pos = content.tqfind( static_cast<MultilineSequenceElement*>( from ) ); + int pos = content.find( static_cast<MultilineSequenceElement*>( from ) ); if ( pos > -1 ) { uint upos = pos; if ( upos < content.count() ) { @@ -2287,7 +2287,7 @@ void MultilineElement::moveUp( FormulaCursor* cursor, BasicElement* from ) else { // Coming from one of the lines we go to the previous line // or to the tqparent if there is none. - int pos = content.tqfind( static_cast<MultilineSequenceElement*>( from ) ); + int pos = content.find( static_cast<MultilineSequenceElement*>( from ) ); if ( pos > -1 ) { if ( pos > 0 ) { //content.at( pos-1 )->moveLeft( cursor, this ); @@ -2343,7 +2343,7 @@ void MultilineElement::moveDown( FormulaCursor* cursor, BasicElement* from ) content.at( 0 )->moveRight(cursor, this); } else { - int pos = content.tqfind( static_cast<MultilineSequenceElement*>( from ) ); + int pos = content.find( static_cast<MultilineSequenceElement*>( from ) ); if ( pos > -1 ) { uint upos = pos; if ( upos < content.count() ) { @@ -2566,7 +2566,7 @@ SequenceElement* MultilineElement::getMainChild() void MultilineElement::selectChild(FormulaCursor* cursor, BasicElement* child) { - int pos = content.tqfind( dynamic_cast<MultilineSequenceElement*>( child ) ); + int pos = content.find( dynamic_cast<MultilineSequenceElement*>( child ) ); if ( pos > -1 ) { cursor->setTo( this, pos ); //content.at( pos )->moveRight( cursor, this ); diff --git a/lib/kformula/oasiscreationstrategy.cc b/lib/kformula/oasiscreationstrategy.cc index 9f7949cb..7d7a65cc 100644 --- a/lib/kformula/oasiscreationstrategy.cc +++ b/lib/kformula/oasiscreationstrategy.cc @@ -185,7 +185,7 @@ BasicElement* OasisCreationStrategy::createOperatorElement( const TQDomElement& } if ( n.isText() ) { TQString text = n.toText().data(); - if ( text.length() == 1 && TQString("()[]{}").tqcontains(text[0]) ) { + if ( text.length() == 1 && TQString("()[]{}").contains(text[0]) ) { return new BracketElement(); } } diff --git a/lib/kformula/paddedelement.cc b/lib/kformula/paddedelement.cc index d84bb064..5270a4f7 100644 --- a/lib/kformula/paddedelement.cc +++ b/lib/kformula/paddedelement.cc @@ -152,55 +152,55 @@ double PaddedElement::readSizeAttribute( const TQString& str, SizeType* st, bool if ( str[0] == '+' || str[0] == '-' ) { *relative = true; } - int index = str.tqfind( "width" ); + int index = str.find( "width" ); if ( index != -1 ) { - int index2 = str.tqfind( "%" ); + int index2 = str.find( "%" ); if ( index2 != -1 ) { return str2size( str.left( index2 ).stripWhiteSpace(), st, WidthRelativeSize ) / 100.0; } return str2size( str.left( index ).stripWhiteSpace(), st, WidthRelativeSize ); } - index = str.tqfind( "height" ); + index = str.find( "height" ); if ( index != -1 ) { - int index2 = str.tqfind( "%" ); + int index2 = str.find( "%" ); if ( index2 != -1 ) { return str2size( str.left( index2 ).stripWhiteSpace(), st, HeightRelativeSize ) / 100.0; } return str2size( str.left( index ).stripWhiteSpace(), st, HeightRelativeSize ); } - index = str.tqfind( "%" ); + index = str.find( "%" ); if ( index != -1 ) { return str2size( str.left( index ).stripWhiteSpace(), st, RelativeSize ) / 100.0; } - index = str.tqfind( "pt", 0, false ); + index = str.find( "pt", 0, false ); if ( index != -1 ) { return str2size( str.left( index ).stripWhiteSpace(), st, AbsoluteSize ); } - index = str.tqfind( "mm", 0, false ); + index = str.find( "mm", 0, false ); if ( index != -1 ) { return str2size( str.left( index ).stripWhiteSpace(), st, AbsoluteSize ) * 72.0 / 20.54; } - index = str.tqfind( "cm", 0, false ); + index = str.find( "cm", 0, false ); if ( index != -1 ) { return str2size( str.left( index ).stripWhiteSpace(), st, AbsoluteSize ) * 72.0 / 2.54; } - index = str.tqfind( "in", 0, false ); + index = str.find( "in", 0, false ); if ( index != -1 ) { return str2size( str.left( index ).stripWhiteSpace(), st, AbsoluteSize ) * 72.0; } - index = str.tqfind( "em", 0, false ); + index = str.find( "em", 0, false ); if ( index != -1 ) { return str2size( str.left( index ).stripWhiteSpace(), st, RelativeSize ); } - index = str.tqfind( "ex", 0, false ); + index = str.find( "ex", 0, false ); if ( index != -1 ) { return str2size( str.left( index ).stripWhiteSpace(), st, RelativeSize ); } - index = str.tqfind( "pc", 0, false ); + index = str.find( "pc", 0, false ); if ( index != -1 ) { return str2size( str.left( index ).stripWhiteSpace(), st, AbsoluteSize ) * 12.0; } - index = str.tqfind( "px", 0, false ); + index = str.find( "px", 0, false ); if ( index != -1 ) { return str2size( str.left( index ).stripWhiteSpace(), st, PixelSize ); } diff --git a/lib/kformula/prototype/gensymbolfontmap.py b/lib/kformula/prototype/gensymbolfontmap.py index c06376d8..0f9f3a11 100644 --- a/lib/kformula/prototype/gensymbolfontmap.py +++ b/lib/kformula/prototype/gensymbolfontmap.py @@ -145,7 +145,7 @@ def make_tqunicode_table(): for key in tqunicodetable: latexName, charClass = tqunicodetable[key] if len(latexName) > 0: - codes[key] = key + ', ' + charClass + ', ' + latexName.tqreplace('\\', '') + codes[key] = key + ', ' + charClass + ', ' + latexName.replace('\\', '') else: codes[key] = key + ', ' + charClass diff --git a/lib/kformula/prototype/unicode.py b/lib/kformula/prototype/unicode.py index 5f5f2138..2265635a 100755 --- a/lib/kformula/prototype/unicode.py +++ b/lib/kformula/prototype/unicode.py @@ -48,7 +48,7 @@ class Form1(QWidget): return list def setFont(self, fontName, font): - fontName = fontName.tqreplace("%20", " ") + fontName = fontName.replace("%20", " ") self.fontName = fontName for i in self.chars: charLabel, number, latexName, charClass = self.chars[i] diff --git a/lib/kformula/scripts/bycodes.py b/lib/kformula/scripts/bycodes.py index f5da0ae0..35b79a55 100755 --- a/lib/kformula/scripts/bycodes.py +++ b/lib/kformula/scripts/bycodes.py @@ -23,18 +23,18 @@ import string import qt def decode( fd, font, line ): - begin = string.tqfind( line, '"' ) - end = string.tqfind( line, '"', begin + 1) + begin = string.find( line, '"' ) + end = string.find( line, '"', begin + 1) tqunicode = line[begin + 2:end] # Remove 'U' from string aswell char_list = [] - separation = string.tqfind( tqunicode, '-' ) + separation = string.find( tqunicode, '-' ) if separation != -1: second = tqunicode while separation != -1: first = second[0:separation] second = second[separation + 2:] char_list.append( string.atoi( first, 16 ) ) - separation = string.tqfind( second, '-' ) + separation = string.find( second, '-' ) if separation == -1: char_list.append( string.atoi( second, 16 ) ) else: @@ -51,7 +51,7 @@ def parse( file, font ): fd2 = open( 'mathml.list', 'w' ) line = fd.readline() while line != "": - if string.tqfind( line, 'name' ) != -1: + if string.find( line, 'name' ) != -1: decode( fd2, font, line ) line = fd.readline() diff --git a/lib/kformula/scripts/bynames.py b/lib/kformula/scripts/bynames.py index 50fac994..0829cf90 100755 --- a/lib/kformula/scripts/bynames.py +++ b/lib/kformula/scripts/bynames.py @@ -109,14 +109,14 @@ def name_cmp( a, b ): def parse( fr, fw ): line = fr.readline() - while line != "" and string.tqfind( line, '<pre>' ) == -1: + while line != "" and string.find( line, '<pre>' ) == -1: line = fr.readline() - pos = string.tqfind( line, '<pre>' ) ### Ad-hoc detection + pos = string.find( line, '<pre>' ) ### Ad-hoc detection if pos == -1: return line = line[pos + len('<pre>'):].strip() ### Ad-hoc detection entries = [] - while line != "" and string.tqfind( line, ',' ) != -1: + while line != "" and string.find( line, ',' ) != -1: fields = line.split(',') name = fields[0].strip() number = fields[1].strip() @@ -124,7 +124,7 @@ def parse( fr, fw ): # TODO: Support multicharacter entities, should also be supported by # application. The best solution would probably to map to a single # character provided by the font in the private area of Unicode - if string.tqfind( number, '-' ) == -1: + if string.find( number, '-' ) == -1: entries.append( [name, '0x' + number[1:]] ) line = fr.readline().strip() diff --git a/lib/kformula/scripts/oper-dict.py b/lib/kformula/scripts/oper-dict.py index a91a7971..49191ef6 100755 --- a/lib/kformula/scripts/oper-dict.py +++ b/lib/kformula/scripts/oper-dict.py @@ -190,12 +190,12 @@ def parse( fr, fw, entities ): attr_list[10]: '"false"' } fields = line.split() - name = string.tqreplace( fields[0], '&', '&' ) + name = string.replace( fields[0], '&', '&' ) fields.pop(0) # Remove name entities_found = True while True: - begin = string.tqfind( name, '&' ) - end = string.tqfind( name, ';' ) + begin = string.find( name, '&' ) + end = string.find( name, ';' ) if begin == -1 or end == -1: break ### @@ -204,7 +204,7 @@ def parse( fr, fw, entities ): # character provided by the font in the private area of Unicode entity_name = name[begin + 1:end] if entities.has_key( entity_name ) : - name = name.tqreplace( '&' + entity_name + ';', unichr(entities[entity_name])); + name = name.replace( '&' + entity_name + ';', unichr(entities[entity_name])); else: entities_found = False break diff --git a/lib/kformula/sequenceelement.cc b/lib/kformula/sequenceelement.cc index 46c00817..78a95d95 100644 --- a/lib/kformula/sequenceelement.cc +++ b/lib/kformula/sequenceelement.cc @@ -129,10 +129,10 @@ BasicElement* SequenceElement::goToPos( FormulaCursor* cursor, bool& handled, if (!handled) { handled = true; if ((point.x() - myPos.x()) < (e->getX() + e->getWidth()*2/3)) { - cursor->setTo(this, tqchildren.tqfind(e)); + cursor->setTo(this, tqchildren.find(e)); } else { - cursor->setTo(this, tqchildren.tqfind(e)+1); + cursor->setTo(this, tqchildren.find(e)+1); } } return e; @@ -482,7 +482,7 @@ void SequenceElement::moveLeft(FormulaCursor* cursor, BasicElement* from) // The cursor came from one of our tqchildren or // something is wrong. else { - int fromPos = tqchildren.tqfind(from); + int fromPos = tqchildren.find(from); if ( fromPos > 0 ) { tqchildren.at( fromPos - 1)->moveLeft( cursor, this ); } @@ -533,7 +533,7 @@ void SequenceElement::moveRight(FormulaCursor* cursor, BasicElement* from) // The cursor came from one of our tqchildren or // something is wrong. else { - int fromPos = tqchildren.tqfind(from); + int fromPos = tqchildren.find(from); if ( fromPos < tqchildren.count() - 1 ) { tqchildren.at( fromPos + 1 )->moveDown( cursor, this ); } @@ -658,7 +658,7 @@ void SequenceElement::moveHome(FormulaCursor* cursor) while (element->getParent() != this) { element = element->getParent(); } - cursor->setMark(tqchildren.tqfind(element)+1); + cursor->setMark(tqchildren.find(element)+1); } } cursor->setTo(this, 0); @@ -681,7 +681,7 @@ void SequenceElement::moveEnd(FormulaCursor* cursor) } } if (element != 0) { - cursor->setMark(tqchildren.tqfind(element)); + cursor->setMark(tqchildren.find(element)); } } } @@ -735,7 +735,7 @@ bool SequenceElement::insert( uint index, BasicElement *child ) */ // void SequenceElement::removeChild(FormulaCursor* cursor, BasicElement* child) // { -// int pos = tqchildren.tqfind(child); +// int pos = tqchildren.find(child); // formula()->elementRemoval(child, pos); // cursor->setTo(this, pos); // tqchildren.remove(pos); @@ -890,7 +890,7 @@ BasicElement* SequenceElement::getChild( FormulaCursor* cursor, Direction direct */ void SequenceElement::selectChild(FormulaCursor* cursor, BasicElement* child) { - int pos = tqchildren.tqfind(child); + int pos = tqchildren.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.tqfind(child); + int childPos = tqchildren.find(child); if (childPos > -1) { int pos = cursor->getPos(); if (pos > childPos) { @@ -1182,7 +1182,7 @@ KCommand* SequenceElement::buildCommand( Container* container, Request* request if ((element != 0) && !element->isSymbol()) { cursor->selectActiveElement(); const SymbolTable& table = container->document()->getSymbolTable(); - if (table.greekLetters().tqfind(element->getCharacter()) != -1) { + 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 ); command->addElement( symbol ); diff --git a/lib/kformula/sequenceelement.h b/lib/kformula/sequenceelement.h index ab6828fd..9696d3ad 100644 --- a/lib/kformula/sequenceelement.h +++ b/lib/kformula/sequenceelement.h @@ -318,7 +318,7 @@ public: BasicElement* getChild(uint i) { return tqchildren.at(i); } const BasicElement* getChild(uint i) const; - int childPos( BasicElement* child ) { return tqchildren.tqfind( child ); } + int childPos( BasicElement* child ) { return tqchildren.find( child ); } int childPos( const BasicElement* child ) const; class ChildIterator { diff --git a/lib/kformula/sequenceparser.cc b/lib/kformula/sequenceparser.cc index 9a4ee8a2..bbc2f0b1 100644 --- a/lib/kformula/sequenceparser.cc +++ b/lib/kformula/sequenceparser.cc @@ -196,7 +196,7 @@ ElementType* SequenceParser::getPrimitive() switch ( type ) { case ORDINARY: { // TQString text = getText(); -// if ( table.tqcontains( text ) || ( text == "\\quad" ) ) { +// if ( table.contains( text ) || ( text == "\\quad" ) ) { // return new NameType( this, text ); // } // else { diff --git a/lib/kformula/symboltable.cc b/lib/kformula/symboltable.cc index 74f160e6..42c4a8e6 100644 --- a/lib/kformula/symboltable.cc +++ b/lib/kformula/symboltable.cc @@ -51,7 +51,7 @@ SymbolFontHelper::SymbolFontHelper() TQChar SymbolFontHelper::tqunicodeFromSymbolFont( TQChar pos ) const { - if ( compatibility.tqcontains( pos ) ) { + if ( compatibility.contains( pos ) ) { return compatibility[ pos.latin1() ]; } return TQChar::null; @@ -80,9 +80,9 @@ void SymbolTable::init( const TQFont& font ) } } -bool SymbolTable::tqcontains(TQString name) const +bool SymbolTable::contains(TQString name) const { - return entries.tqfind( name ) != entries.end(); + return entries.find( name ) != entries.end(); } TQChar SymbolTable::tqunicode(TQString name) const diff --git a/lib/kformula/symboltable.h b/lib/kformula/symboltable.h index a7776adc..d4a19f03 100644 --- a/lib/kformula/symboltable.h +++ b/lib/kformula/symboltable.h @@ -85,7 +85,7 @@ public: */ void init( const TQFont& font ); - bool tqcontains( TQString name ) const; + bool contains( TQString name ) const; /** * @returns the char in the symbol font that belongs to diff --git a/lib/kofficecore/KoApplication.cpp b/lib/kofficecore/KoApplication.cpp index 2be62bbe..d127f444 100644 --- a/lib/kofficecore/KoApplication.cpp +++ b/lib/kofficecore/KoApplication.cpp @@ -108,7 +108,7 @@ bool KoApplication::start() KCmdLineArgs *koargs = KCmdLineArgs::parsedArgs("koffice"); TQCString dpiValues = koargs->getOption( "dpi" ); if ( !dpiValues.isEmpty() ) { - int sep = dpiValues.tqfind( TQRegExp( "[x, ]" ) ); + int sep = dpiValues.find( TQRegExp( "[x, ]" ) ); int dpiX; int dpiY = 0; bool ok = true; diff --git a/lib/kofficecore/KoChild.cpp b/lib/kofficecore/KoChild.cpp index 85d54939..8394f59a 100644 --- a/lib/kofficecore/KoChild.cpp +++ b/lib/kofficecore/KoChild.cpp @@ -104,9 +104,9 @@ TQPointArray KoChild::pointArray( const TQWMatrix &matrix ) const return pointArray( TQRect( 0, 0, d->m_tqgeometry.width(), d->m_tqgeometry.height() ), matrix ); } -//bool KoChild::tqcontains( const TQPoint &point ) const +//bool KoChild::contains( const TQPoint &point ) const //{ -// return region().tqcontains( point ); +// return region().contains( point ); //} TQRect KoChild::boundingRect() const @@ -338,26 +338,26 @@ bool KoChild::isTransparent() const KoChild::Gadget KoChild::gadgetHitTest( const TQPoint &p ) { - if ( !frameRegion().tqcontains( p ) ) + if ( !frameRegion().contains( p ) ) return NoGadget; - if ( TQRegion( pointArray( TQRect( -5, -5, 5, 5 ) ) ).tqcontains( 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 ) ) ).tqcontains( p ) ) + if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width() / 2 - 3, -5, 5, 5 ) ) ).contains( p ) ) return TopMid; - if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width(), -5, 5, 5 ) ) ).tqcontains( p ) ) + if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width(), -5, 5, 5 ) ) ).contains( p ) ) return TopRight; - if ( TQRegion( pointArray( TQRect( -5, d->m_tqgeometry.height() / 2 - 3, 5, 5 ) ) ).tqcontains( p ) ) + if ( TQRegion( pointArray( TQRect( -5, d->m_tqgeometry.height() / 2 - 3, 5, 5 ) ) ).contains( p ) ) return MidLeft; - if ( TQRegion( pointArray( TQRect( -5, d->m_tqgeometry.height(), 5, 5 ) ) ).tqcontains( p ) ) + if ( TQRegion( pointArray( TQRect( -5, d->m_tqgeometry.height(), 5, 5 ) ) ).contains( p ) ) return BottomLeft; if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width() / 2 - 3, - d->m_tqgeometry.height(), 5, 5 ) ) ).tqcontains( p ) ) + d->m_tqgeometry.height(), 5, 5 ) ) ).contains( p ) ) return BottomMid; - if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width(), d->m_tqgeometry.height(), 5, 5 ) ) ).tqcontains( p ) ) + if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width(), d->m_tqgeometry.height(), 5, 5 ) ) ).contains( p ) ) return BottomRight; if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width(), - d->m_tqgeometry.height() / 2 - 3, 5, 5 ) ) ).tqcontains( p ) ) + d->m_tqgeometry.height() / 2 - 3, 5, 5 ) ) ).contains( p ) ) return MidRight; return Move; diff --git a/lib/kofficecore/KoChild.h b/lib/kofficecore/KoChild.h index 4734bbd4..0dbc74be 100644 --- a/lib/kofficecore/KoChild.h +++ b/lib/kofficecore/KoChild.h @@ -96,7 +96,7 @@ public: * Tests whether the part contains a certain point. The point is * in the coordinate system of the tqparent. */ - //virtual bool tqcontains( const TQPoint& ) const; + //virtual bool contains( const TQPoint& ) const; /** * @return the effective bounding rect after all transformations. diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp index 85d9c3d6..efddc96a 100644 --- a/lib/kofficecore/KoDetailsPane.cpp +++ b/lib/kofficecore/KoDetailsPane.cpp @@ -305,7 +305,7 @@ KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* tqparent, KInstance* inst // Support for kdelibs-3.5's new RecentFiles format: name[url] if(path.endsWith("]")) { - int pos = path.tqfind("["); + int pos = path.find("["); name = path.mid(0, pos - 1); path = path.mid(pos + 1, path.length() - pos - 2); } diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index e9d985aa..a579e925 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -747,7 +747,7 @@ KoDocumentInfo *KoDocument::documentInfo() const void KoDocument::setViewBuildDocument( KoView *view, const TQDomDocument &doc ) { - if ( d->m_views.tqfind( view ) == -1 ) + if ( d->m_views.find( view ) == -1 ) return; uint viewIdx = d->m_views.at(); @@ -762,7 +762,7 @@ TQDomDocument KoDocument::viewBuildDocument( KoView *view ) { TQDomDocument res; - if ( d->m_views.tqfind( view ) == -1 ) + if ( d->m_views.find( view ) == -1 ) return res; uint viewIdx = d->m_views.at(); @@ -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 tqfind %1" ).tqarg( filename ); + d->lastErrorMessage = i18n( "Could not find %1" ).tqarg( filename ); return false; } // Error variables for TQDomDocument::setContent @@ -2199,7 +2199,7 @@ TQCString KoDocument::nativeFormatMimeType() const TQCString nativeMimeType = service->property( "X-KDE-NativeMimeType" ).toString().latin1(); if ( nativeMimeType.isEmpty() ) { // shouldn't happen, let's find out why it happened - if ( !service->serviceTypes().tqcontains( "KOfficePart" ) ) + if ( !service->serviceTypes().contains( "KOfficePart" ) ) kdWarning(30003) << "Wrong desktop file, KOfficePart isn't mentionned" << endl; else if ( !KServiceType::serviceType( "KOfficePart" ) ) kdWarning(30003) << "The KOfficePart service type isn't installed!" << endl; @@ -2290,7 +2290,7 @@ bool KoDocument::isNativeFormat( const TQCString& mimetype ) const { if ( mimetype == nativeFormatMimeType() ) return true; - return extraNativeMimeTypes().tqcontains( mimetype ); + return extraNativeMimeTypes().contains( mimetype ); } TQStringList KoDocument::extraNativeMimeTypes() const @@ -2315,7 +2315,7 @@ int KoDocument::supportedSpecialFormats() const void KoDocument::addShell( KoMainWindow *shell ) { - if ( d->m_shells.tqfindRef( shell ) == -1 ) + if ( d->m_shells.findRef( shell ) == -1 ) { //kdDebug(30003) << "addShell: shell " << (void*)shell << " added to doc " << this << endl; d->m_shells.append( shell ); diff --git a/lib/kofficecore/KoDocumentChild.cpp b/lib/kofficecore/KoDocumentChild.cpp index 27d4a673..38c4439a 100644 --- a/lib/kofficecore/KoDocumentChild.cpp +++ b/lib/kofficecore/KoDocumentChild.cpp @@ -109,7 +109,7 @@ KoDocument* KoDocumentChild::parentDocument() const KoDocument* KoDocumentChild::hitTest( const TQPoint &p, const TQWMatrix &_matrix ) { - if ( !region( _matrix ).tqcontains( p ) || !d->m_doc ) + if ( !region( _matrix ).contains( p ) || !d->m_doc ) return 0L; TQWMatrix m( _matrix ); @@ -357,7 +357,7 @@ bool KoDocumentChild::loadDocumentInternal( KoStore* store, const KoDocumentEntr { KParts::PartManager *manager = tqparent->manager(); - if ( !manager->parts()->tqcontainsRef( d->m_doc ) && + if ( !manager->parts()->containsRef( d->m_doc ) && !tqparent->isSingleViewMode() ) manager->addPart( d->m_doc, false ); } diff --git a/lib/kofficecore/KoDocumentInfo.cpp b/lib/kofficecore/KoDocumentInfo.cpp index ccec3424..f6a3fe69 100644 --- a/lib/kofficecore/KoDocumentInfo.cpp +++ b/lib/kofficecore/KoDocumentInfo.cpp @@ -920,7 +920,7 @@ bool KoDocumentInfoUserMetadata::loadOasis( const TQDomNode& metaDoc ) if ( e.namespaceURI() == KoXmlNS::meta && e.localName() == "user-defined" && !e.text().isEmpty() ) { TQString name = e.attributeNS( KoXmlNS::meta, "name", TQString() ); - if ( !m_reserved.tqcontains( name ) ) + if ( !m_reserved.contains( name ) ) m_metaList[ name ] = e.text(); } } diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp index 8fa70f07..786e3982 100644 --- a/lib/kofficecore/KoDocumentInfoDlg.cpp +++ b/lib/kofficecore/KoDocumentInfoDlg.cpp @@ -487,7 +487,7 @@ void KoDocumentInfoPropsPage::applyChanges() assert( entry ); if ( entry->name() == "documentinfo.xml" || - ( !docInfoSaved && !entries.tqcontains( "documentinfo.xml" ) ) ) + ( !docInfoSaved && !entries.contains( "documentinfo.xml" ) ) ) { d->m_dlg->save(); diff --git a/lib/kofficecore/KoFilter.cpp b/lib/kofficecore/KoFilter.cpp index ba37191c..628d5f17 100644 --- a/lib/kofficecore/KoFilter.cpp +++ b/lib/kofficecore/KoFilter.cpp @@ -106,7 +106,7 @@ void KoEmbeddingFilter::endInternalEmbedding() int KoEmbeddingFilter::internalPartReference( const TQString& key ) const { - TQMapConstIterator<TQString, PartReference> it = m_partStack.top()->m_partReferences.tqfind( key ); + TQMapConstIterator<TQString, PartReference> it = m_partStack.top()->m_partReferences.find( key ); if ( it == m_partStack.top()->m_partReferences.end() ) return -1; return it.data().m_index; @@ -114,7 +114,7 @@ int KoEmbeddingFilter::internalPartReference( const TQString& key ) const TQCString KoEmbeddingFilter::internalPartMimeType( const TQString& key ) const { - TQMapConstIterator<TQString, PartReference> it = m_partStack.top()->m_partReferences.tqfind( key ); + TQMapConstIterator<TQString, PartReference> it = m_partStack.top()->m_partReferences.find( key ); if ( it == m_partStack.top()->m_partReferences.end() ) return TQCString(); return it.data().m_mimeType; diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp index bc4d48bc..91522fbb 100644 --- a/lib/kofficecore/KoFilterManager.cpp +++ b/lib/kofficecore/KoFilterManager.cpp @@ -78,7 +78,7 @@ KoFilterChooser::KoFilterChooser (TQWidget *tqparent, const TQStringList &mimeTy if (nativeFormat == "application/x-kword") { - const int index = m_mimeTypes.tqfindIndex ("text/plain"); + const int index = m_mimeTypes.findIndex ("text/plain"); if (index > -1) m_filterList->setCurrentItem (index); } @@ -370,7 +370,7 @@ namespace // in order not to mess with the global namespace ;) TQStringList::ConstIterator testIt = ( *it )->export_.begin(); TQStringList::ConstIterator testEnd = ( *it )->export_.end(); for ( ; testIt != testEnd ; ++testIt ) { - if ( stopList.tqfind( *testIt ) == stopEnd ) { + if ( stopList.find( *testIt ) == stopEnd ) { expList.append( *testIt ); } } @@ -381,7 +381,7 @@ namespace // in order not to mess with the global namespace ;) TQStringList::ConstIterator testIt = ( *it )->import.begin(); const TQStringList::ConstIterator testEnd = ( *it )->import.end(); for ( ; testIt != testEnd ; ++testIt ) { - if ( stopList.tqfind( *testIt ) == stopEnd ) { + if ( stopList.find( *testIt ) == stopEnd ) { impList.append( *testIt ); } } @@ -493,7 +493,7 @@ TQStringList KoFilterManager::mimeFilter( const TQCString& mimetype, Direction d const TQStringList outMimes = connected( vertices, (*natit).latin1() ); //kdDebug(s_area) << k_funcinfo << "output formats connected to mime " << *natit << " : " << outMimes << endl; for ( TQStringList::ConstIterator mit = outMimes.begin(); mit != outMimes.end(); ++mit ) - if ( lst.tqfind( *mit ) == lst.end() ) // append only if not there already. TQt4: TQSet<TQString>? + if ( lst.find( *mit ) == lst.end() ) // append only if not there already. TQt4: TQSet<TQString>? lst.append( *mit ); } return lst; @@ -511,7 +511,7 @@ TQStringList KoFilterManager::mimeFilter() if ( partIt == partEnd ) return TQStringList(); - // To tqfind *all* reachable mimetypes, we have to resort to + // To find *all* reachable mimetypes, we have to resort to // a small hat trick, in order to avoid multiple searches: // We introduce a fake vertex, which is connected to every // single KOffice mimetype. Due to that one BFS is enough :) @@ -550,7 +550,7 @@ bool KoFilterManager::filterAvailable( KoFilterEntry::Ptr entry ) key += " - "; key += entry->service()->library(); - if ( !m_filterAvailable.tqcontains( key ) ) { + if ( !m_filterAvailable.contains( key ) ) { //kdDebug( 30500 ) << "Not cached, checking..." << endl; KLibrary* library = KLibLoader::self()->library( TQFile::encodeName( entry->service()->library() ) ); diff --git a/lib/kofficecore/KoFrame.cpp b/lib/kofficecore/KoFrame.cpp index 2662169e..f11ba9f0 100644 --- a/lib/kofficecore/KoFrame.cpp +++ b/lib/kofficecore/KoFrame.cpp @@ -217,21 +217,21 @@ void KoFrame::mousePressEvent( TQMouseEvent* ev ) TQRect r7( 0, height() / 2 - 3, 5, 5 ); TQRect r8( width()- 5, height() / 2 - 3, 5, 5 ); - if ( r1.tqcontains( ev->pos() ) ) + if ( r1.contains( ev->pos() ) ) d->m_mode = 1; - else if ( r2.tqcontains( ev->pos() ) ) + else if ( r2.contains( ev->pos() ) ) d->m_mode = 2; - else if ( r3.tqcontains( ev->pos() ) ) + else if ( r3.contains( ev->pos() ) ) d->m_mode = 3; - else if ( r4.tqcontains( ev->pos() ) ) + else if ( r4.contains( ev->pos() ) ) d->m_mode = 4; - else if ( r5.tqcontains( ev->pos() ) ) + else if ( r5.contains( ev->pos() ) ) d->m_mode = 5; - else if ( r6.tqcontains( ev->pos() ) ) + else if ( r6.contains( ev->pos() ) ) d->m_mode = 6; - else if ( r7.tqcontains( ev->pos() ) ) + else if ( r7.contains( ev->pos() ) ) d->m_mode = 7; - else if ( r8.tqcontains( ev->pos() ) ) + else if ( r8.contains( ev->pos() ) ) d->m_mode = 8; else d->m_mode = 0; @@ -327,13 +327,13 @@ void KoFrame::mouseMoveEvent( TQMouseEvent* ev ) TQRect r7( 0, height() / 2 - 3, 5, 5 ); TQRect r8( width()- 5, height() / 2 - 3, 5, 5 ); - if ( r1.tqcontains( ev->pos() ) || r3.tqcontains( ev->pos() ) ) + if ( r1.contains( ev->pos() ) || r3.contains( ev->pos() ) ) setCursor( sizeFDiagCursor ); - else if ( r2.tqcontains( ev->pos() ) || r4.tqcontains( ev->pos() ) ) + else if ( r2.contains( ev->pos() ) || r4.contains( ev->pos() ) ) setCursor( sizeBDiagCursor ); - else if ( r5.tqcontains( ev->pos() ) || r6.tqcontains( ev->pos() ) ) + else if ( r5.contains( ev->pos() ) || r6.contains( ev->pos() ) ) setCursor( sizeVerCursor ); - else if ( r7.tqcontains( ev->pos() ) || r8.tqcontains( ev->pos() ) ) + else if ( r7.contains( ev->pos() ) || r8.contains( ev->pos() ) ) setCursor( sizeHorCursor ); else setCursor( KCursor::handCursor() ); diff --git a/lib/kofficecore/KoGenStyles.cpp b/lib/kofficecore/KoGenStyles.cpp index 68b8477a..221288df 100644 --- a/lib/kofficecore/KoGenStyles.cpp +++ b/lib/kofficecore/KoGenStyles.cpp @@ -31,7 +31,7 @@ KoGenStyles::~KoGenStyles() TQString KoGenStyles::lookup( const KoGenStyle& style, const TQString& name, int flags ) { - StyleMap::iterator it = m_styleMap.tqfind( style ); + StyleMap::iterator it = m_styleMap.find( style ); if ( it == m_styleMap.end() ) { // Not found, try if this style is in fact equal to its tqparent (the find above // wouldn't have found it, due to m_parentName being set). @@ -52,7 +52,7 @@ TQString KoGenStyles::lookup( const KoGenStyle& style, const TQString& name, int testStyle.m_type = parentStyle->m_type; // Also it's ok to not have the display name of the tqparent style // in the auto style - TQMap<TQString, TQString>::const_iterator it = parentStyle->m_attributes.tqfind( "style:display-name" ); + TQMap<TQString, TQString>::const_iterator it = parentStyle->m_attributes.find( "style:display-name" ); if ( it != parentStyle->m_attributes.end() ) testStyle.addAttribute( "style:display-name", *it ); @@ -84,16 +84,16 @@ TQString KoGenStyles::makeUniqueName( const TQString& base, int flags ) const { // If this name is not used yet, and numbering isn't forced, then the given name is ok. if ( ( flags & DontForceNumbering ) - && m_autoStylesInStylesDotXml.tqfind( base ) == m_autoStylesInStylesDotXml.end() - && m_styleNames.tqfind( base ) == m_styleNames.end() ) + && m_autoStylesInStylesDotXml.find( base ) == m_autoStylesInStylesDotXml.end() + && m_styleNames.find( base ) == m_styleNames.end() ) return base; int num = 1; TQString name; do { name = base; name += TQString::number( num++ ); - } while ( m_autoStylesInStylesDotXml.tqfind( name ) != m_autoStylesInStylesDotXml.end() - || m_styleNames.tqfind( name ) != m_styleNames.end() ); + } while ( m_autoStylesInStylesDotXml.find( name ) != m_autoStylesInStylesDotXml.end() + || m_styleNames.find( name ) != m_styleNames.end() ); return name; } @@ -105,7 +105,7 @@ TQValueList<KoGenStyles::NamedStyle> KoGenStyles::styles( int type, bool markedF const StyleArray::const_iterator end = m_styleArray.end(); for ( ; it != end ; ++it ) { // Look up if it's marked for styles.xml or not by looking up in the corresponding style map. - if ( (*it).style->type() == type && nameMap.tqfind((*it).name) != nameMap.end() ) { + if ( (*it).style->type() == type && nameMap.find((*it).name) != nameMap.end() ) { lst.append( *it ); } } @@ -130,7 +130,7 @@ KoGenStyle* KoGenStyles::styleForModification( const TQString& name ) void KoGenStyles::markStyleForStylesXml( const TQString& name ) { - Q_ASSERT( m_styleNames.tqfind( name ) != m_styleNames.end() ); + Q_ASSERT( m_styleNames.find( name ) != m_styleNames.end() ); m_styleNames.remove( name ); m_autoStylesInStylesDotXml.insert( name, true ); styleForModification( name )->setAutoStyleInStylesDotXml( true ); diff --git a/lib/kofficecore/KoGenStyles.h b/lib/kofficecore/KoGenStyles.h index ad25609e..67f46da1 100644 --- a/lib/kofficecore/KoGenStyles.h +++ b/lib/kofficecore/KoGenStyles.h @@ -420,14 +420,14 @@ public: private: TQString property( const TQString& propName, PropertyType type ) const { - TQMap<TQString, TQString>::const_iterator it = m_properties[type].tqfind( propName ); + TQMap<TQString, TQString>::const_iterator it = m_properties[type].find( propName ); if ( it != m_properties[type].end() ) return it.data(); return TQString(); } TQString attribute( const TQString& propName ) const { - TQMap<TQString, TQString>::const_iterator it = m_attributes.tqfind( propName ); + TQMap<TQString, TQString>::const_iterator it = m_attributes.find( propName ); if ( it != m_attributes.end() ) return it.data(); return TQString(); diff --git a/lib/kofficecore/KoGlobal.cpp b/lib/kofficecore/KoGlobal.cpp index 57868746..8ba1c077 100644 --- a/lib/kofficecore/KoGlobal.cpp +++ b/lib/kofficecore/KoGlobal.cpp @@ -142,12 +142,12 @@ void KoGlobal::createListOfLanguages() { // Extract the language tag from the directory name TQString tag = *it; - int index = tag.tqfindRev('/'); + int index = tag.findRev('/'); tag = tag.left(index); - index = tag.tqfindRev('/'); + index = tag.findRev('/'); tag = tag.mid(index+1); - if ( seenLanguages.tqfind( tag ) == seenLanguages.end() ) { + if ( seenLanguages.find( tag ) == seenLanguages.end() ) { KSimpleConfig entry(*it); entry.setGroup("KCM Locale"); @@ -169,7 +169,7 @@ void KoGlobal::createListOfLanguages() TQString KoGlobal::tagOfLanguage( const TQString & _lang) { const LanguageMap& map = self()->m_langMap; - TQMap<TQString,TQString>::ConstIterator it = map.tqfind( _lang ); + TQMap<TQString,TQString>::ConstIterator it = map.find( _lang ); if ( it != map.end() ) return *it; return TQString(); diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index be8a0fa2..4e30d64a 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -322,7 +322,7 @@ KoMainWindow::~KoMainWindow() // safety first ;) d->m_manager->setActivePart(0); - if(d->m_rootViews.tqfindRef(d->m_activeView)==-1) { + if(d->m_rootViews.findRef(d->m_activeView)==-1) { delete d->m_activeView; d->m_activeView=0L; } @@ -375,7 +375,7 @@ void KoMainWindow::setRootDocument( KoDocument *doc ) d->m_rootViews.current()->show(); // The addShell has been done already if using openURL - if ( !d->m_rootDoc->shells().tqcontains( this ) ) + if ( !d->m_rootDoc->shells().contains( this ) ) d->m_rootDoc->addShell( this ); d->m_removeView->setEnabled(false); d->m_orientation->setEnabled(false); @@ -445,7 +445,7 @@ void KoMainWindow::addRecentURL( const KURL& url ) TQString path = url.path( -1 ); TQStringList tmpDirs = KGlobal::dirs()->resourceDirs( "tmp" ); for ( TQStringList::Iterator it = tmpDirs.begin() ; ok && it != tmpDirs.end() ; ++it ) - if ( path.tqcontains( *it ) ) + if ( path.contains( *it ) ) ok = false; // it's in the tmp resource if ( ok ) KRecentDocument::add(path); @@ -530,7 +530,7 @@ KoDocument *KoMainWindow::rootDocument() const KoView *KoMainWindow::rootView() const { - if(d->m_rootViews.tqfind(d->m_activeView)!=-1) + if(d->m_rootViews.find(d->m_activeView)!=-1) return d->m_activeView; return d->m_rootViews.first(); } @@ -743,7 +743,7 @@ bool KoMainWindow::saveDocument( bool saveas, bool silent ) KURL suggestedURL = pDoc->url(); TQStringList mimeFilter = KoFilterManager::mimeFilter( _native_format, KoFilterManager::Export, pDoc->extraNativeMimeTypes() ); - if (mimeFilter.tqfindIndex (oldOutputFormat) < 0 && !isExporting()) + if (mimeFilter.findIndex (oldOutputFormat) < 0 && !isExporting()) { kdDebug(30003) << "KoMainWindow::saveDocument no export filter for '" << oldOutputFormat << "'" << endl; @@ -754,7 +754,7 @@ bool KoMainWindow::saveDocument( bool saveas, bool silent ) TQString suggestedFilename = suggestedURL.fileName (); if ( !suggestedFilename.isEmpty () ) // ".kwd" looks strange for a name { - int c = suggestedFilename.tqfindRev ('.'); + int c = suggestedFilename.findRev ('.'); KMimeType::Ptr mime = KMimeType::mimeType( _native_format ); TQString ext = mime->property( "X-KDE-NativeExtension" ).toString(); @@ -1296,7 +1296,7 @@ void KoMainWindow::slotNewToolbarConfig() d->m_veryHackyActionList); // This one only for root views - if(d->m_rootViews.tqfindRef(d->m_activeView)!=-1) + if(d->m_rootViews.findRef(d->m_activeView)!=-1) factory->plugActionList(d->m_activeView, "view_split", d->m_splitViewActionList ); plugActionList( "toolbarlist", d->m_toolbarList ); @@ -1388,7 +1388,7 @@ void KoMainWindow::slotCloseAllViews() { void KoMainWindow::slotRemoveView() { KoView *view; - if(d->m_rootViews.tqfindRef(d->m_activeView)!=-1) + if(d->m_rootViews.findRef(d->m_activeView)!=-1) view=d->m_rootViews.current(); else view=d->m_rootViews.first(); @@ -1514,7 +1514,7 @@ void KoMainWindow::slotActivePartChanged( KParts::Part *newPart ) factory->plugActionList(d->m_activeView, "view_closeallviews", d->m_veryHackyActionList); // This one only for root views - if(d->m_rootViews.tqfindRef(d->m_activeView)!=-1) + if(d->m_rootViews.findRef(d->m_activeView)!=-1) factory->plugActionList(d->m_activeView, "view_split", d->m_splitViewActionList ); // Position and show toolbars according to user's preference diff --git a/lib/kofficecore/KoMainWindow.h b/lib/kofficecore/KoMainWindow.h index f1dd6419..8913e1a8 100644 --- a/lib/kofficecore/KoMainWindow.h +++ b/lib/kofficecore/KoMainWindow.h @@ -43,7 +43,7 @@ namespace KParts * @brief Main window for a KOffice application * * This class is used to represent a main window - * of a KOffice component. Each main window tqcontains + * of a KOffice component. Each main window contains * a menubar and some toolbars. * * @note This class does NOT need to be subclassed in your application. diff --git a/lib/kofficecore/KoOasisStore.cpp b/lib/kofficecore/KoOasisStore.cpp index 7eec46a5..ea99ce8a 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 tqfind %1" ).tqarg( fileName ); + errorMessage = i18n( "Could not find %1" ).tqarg( fileName ); return false; } // Error variables for TQDomDocument::setContent diff --git a/lib/kofficecore/KoOasisStyles.cpp b/lib/kofficecore/KoOasisStyles.cpp index d135a501..fe4ee658 100644 --- a/lib/kofficecore/KoOasisStyles.cpp +++ b/lib/kofficecore/KoOasisStyles.cpp @@ -180,7 +180,7 @@ void KoOasisStyles::insertStyle( const TQDomElement& e, bool styleAutoStyles ) if ( styleAutoStyles ) { TQDict<TQDomElement>& dict = d->m_stylesAutoStyles[ family ]; dict.setAutoDelete( true ); - if ( dict.tqfind( name ) != 0 ) + if ( dict.find( name ) != 0 ) kdDebug(30003) << "Auto-style: '" << name << "' already exists" << endl; dict.insert( name, new TQDomElement( e ) ); //kdDebug(30003) << "Style: '" << name << "' loaded as a style auto style" << endl; @@ -188,7 +188,7 @@ void KoOasisStyles::insertStyle( const TQDomElement& e, bool styleAutoStyles ) TQDict<TQDomElement>& dict = d->m_styles[ family ]; dict.setAutoDelete( true ); - if ( dict.tqfind( name ) != 0 ) + if ( dict.find( name ) != 0 ) kdDebug(30003) << "Style: '" << name << "' already exists" << endl; dict.insert( name, new TQDomElement( e ) ); //kdDebug(30003) << "Style: '" << name << "' loaded " << endl; @@ -198,7 +198,7 @@ void KoOasisStyles::insertStyle( const TQDomElement& e, bool styleAutoStyles ) || localName == "font-decl" || localName == "presentation-page-tqlayout" ) ) { - if ( m_styles.tqfind( name ) != 0 ) + if ( m_styles.find( name ) != 0 ) kdDebug(30003) << "Style: '" << name << "' already exists" << endl; m_styles.insert( name, new TQDomElement( e ) ); } else if ( localName == "default-style" && ns == KoXmlNS::style ) { diff --git a/lib/kofficecore/KoPictureCollection.cpp b/lib/kofficecore/KoPictureCollection.cpp index 3d680bf7..835beafb 100644 --- a/lib/kofficecore/KoPictureCollection.cpp +++ b/lib/kofficecore/KoPictureCollection.cpp @@ -37,7 +37,7 @@ KoPicture KoPictureCollection::findPicture(const KoPictureKey& key) const #ifdef DEBUG_PICTURES kdDebug(30003) << "KoPictureCollection::findPicture " << key.toString() << endl; #endif - ConstIterator it = tqfind( key ); + ConstIterator it = find( key ); if ( it == end() ) { KoPicture picture; @@ -285,7 +285,7 @@ void KoPictureCollection::readFromStore( KoStore * store, const StoreMap & store } } - const int pos=u.tqfindRev('.'); + const int pos=u.findRev('.'); if (pos==-1) { kdError(30003) << "File with no extension! Not supported!" << endl; @@ -305,7 +305,7 @@ void KoPictureCollection::readFromStore( KoStore * store, const StoreMap & store KoPicture KoPictureCollection::findOrLoad(const TQString& fileName, const TQDateTime& dateTime) { // As now all KoPictureKey objects have a valid TQDateTime, we must do it without a date/time check. - ConstIterator it = tqfind( KoPictureKey ( fileName, dateTime ) ); + ConstIterator it = find( KoPictureKey ( fileName, dateTime ) ); if ( it == end() ) { return loadPicture( fileName ); diff --git a/lib/kofficecore/KoPictureShared.cpp b/lib/kofficecore/KoPictureShared.cpp index 16fea2ef..6bc69345 100644 --- a/lib/kofficecore/KoPictureShared.cpp +++ b/lib/kofficecore/KoPictureShared.cpp @@ -299,7 +299,7 @@ bool KoPictureShared::loadXpm(TQIODevice* io) int pos=0; - while ((pos=array.tqfind(char(1),pos))!=-1) + while ((pos=array.find(char(1),pos))!=-1) { array[pos]='"'; } @@ -436,7 +436,7 @@ bool KoPictureShared::loadFromFile(const TQString& fileName) return false; bool flag = false; - const int pos=fileName.tqfindRev('.'); + const int pos=fileName.findRev('.'); if (pos==-1) { kdDebug(30003) << "File with no extension!" << endl; diff --git a/lib/kofficecore/KoQueryTrader.h b/lib/kofficecore/KoQueryTrader.h index ff2a5100..54fa811e 100644 --- a/lib/kofficecore/KoQueryTrader.h +++ b/lib/kofficecore/KoQueryTrader.h @@ -64,7 +64,7 @@ public: * @return TRUE if the document can handle the requested mimetype. */ bool supportsMimeType( const TQString & _mimetype ) const - { return mimeTypes().tqcontains( _mimetype ); } + { return mimeTypes().contains( _mimetype ); } /** * Uses the factory of the component to create @@ -152,13 +152,13 @@ public: * @return TRUE if the filter can import the requested mimetype. */ bool imports( const TQString& _mimetype ) const - { return ( import.tqcontains( _mimetype ) ); } + { return ( import.contains( _mimetype ) ); } /** * @return TRUE if the filter can export the requested mimetype. */ bool exports( const TQString& _m ) const - { return ( export_.tqcontains( _m ) ); } + { return ( export_.contains( _m ) ); } /** * This function will query KDED to find all available filters. diff --git a/lib/kofficecore/KoRect.cpp b/lib/kofficecore/KoRect.cpp index 78a63992..2a3259a9 100644 --- a/lib/kofficecore/KoRect.cpp +++ b/lib/kofficecore/KoRect.cpp @@ -166,15 +166,15 @@ KoRect &KoRect::operator&=(const KoRect &rhs) { return *this; } -bool KoRect::tqcontains(const KoPoint &p) const { +bool KoRect::contains(const KoPoint &p) const { return (p.x() >= m_tl.x() && p.x() <= m_br.x() && p.y() >= m_tl.y() && p.y() <= m_br.y()); } -bool KoRect::tqcontains(const double &x, const double &y) const { +bool KoRect::contains(const double &x, const double &y) const { return (x >= m_tl.x() && x <= m_br.x() && y >= m_tl.y() && y <= m_br.y()); } -bool KoRect::tqcontains(const KoRect &r) const { +bool KoRect::contains(const KoRect &r) const { return (r.left() >= m_tl.x() && r.right() <= m_br.x() && r.top() >= m_tl.y() && r.bottom() <= m_br.y()); } diff --git a/lib/kofficecore/KoRect.h b/lib/kofficecore/KoRect.h index b4289088..bb4f1161 100644 --- a/lib/kofficecore/KoRect.h +++ b/lib/kofficecore/KoRect.h @@ -108,11 +108,11 @@ public: * Note that for KoRect(0, 0, 100, 100) the KoPoint(0, 0) as well as KoPoint(100, 100) are * mathmatically contained in the rect, this in contrary to pixel based rectangles. */ - bool tqcontains(const KoPoint &p) const; + bool contains(const KoPoint &p) const; /// Helper function for the above function. - bool tqcontains(const double &x, const double &y) const; + bool contains(const double &x, const double &y) const; /// Helper function for the above function. - bool tqcontains(const KoRect &r) const; + bool contains(const KoRect &r) const; KoRect unite(const KoRect &r) const; KoRect intersect(const KoRect &r) const; bool intersects(const KoRect &r) const; diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp index fd42bcf3..75c8fec8 100644 --- a/lib/kofficecore/KoSpeaker.cpp +++ b/lib/kofficecore/KoSpeaker.cpp @@ -307,7 +307,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/) if (pos == TQPoint()) item = iv->currentItem(); else - item = iv->tqfindItem(iv->viewportToContents(iv->viewport()->mapFromGlobal(pos))); + item = iv->findItem(iv->viewportToContents(iv->viewport()->mapFromGlobal(pos))); if (item) { id = item->index(); text = item->text(); @@ -431,7 +431,7 @@ bool KoSpeaker::sayWidget(const TQString& msg) { TQString s = msg; if (d->m_speakFlags & SpeakAccelerator) { - int amp = s.tqfind("&"); + int amp = s.find("&"); if (amp >= 0) { TQString acc = s.mid(++amp,1); acc = acc.stripWhiteSpace(); @@ -442,20 +442,20 @@ bool KoSpeaker::sayWidget(const TQString& msg) s.remove("&"); if (TQStyleSheet::mightBeRichText(s)) { // kdDebug() << "richtext" << endl; - s.tqreplace(TQRegExp("</?[pbius]>"), ""); - s.tqreplace(TQRegExp("</?h\\d>"), ""); - s.tqreplace(TQRegExp("<(br|hr)>"), " "); - s.tqreplace(TQRegExp( + s.replace(TQRegExp("</?[pbius]>"), ""); + s.replace(TQRegExp("</?h\\d>"), ""); + s.replace(TQRegExp("<(br|hr)>"), " "); + s.replace(TQRegExp( "</?(qt|center|li|pre|div|span|em|strong|big|small|sub|sup|code|tt|font|nobr|ul|ol|dl|dt)>"), ""); - s.tqreplace(TQRegExp("</?(table|tr|th|td).*>"), ""); - s.tqreplace(TQRegExp("</?a\\s.+>"), ""); + s.replace(TQRegExp("</?(table|tr|th|td).*>"), ""); + s.replace(TQRegExp("</?a\\s.+>"), ""); // Replace <img source="small|frame_text"> with "small frame_text image. " - s.tqreplace(TQRegExp("<img\\s.*(?:source=|src=)\"([^|\"]+)[|]?([^|\"]*)\">"), "\\1 \\2 image. "); + s.replace(TQRegExp("<img\\s.*(?:source=|src=)\"([^|\"]+)[|]?([^|\"]*)\">"), "\\1 \\2 image. "); } if (s.isEmpty()) return false; - s.tqreplace("Ctrl+", i18n("control plus ")); - s.tqreplace("Alt+", i18n("alt plus ")); - s.tqreplace("+", i18n(" plus ")); + s.replace("Ctrl+", i18n("control plus ")); + s.replace("Alt+", i18n("alt plus ")); + s.replace("+", i18n(" plus ")); sayScreenReaderOutput(s, ""); return true; } @@ -468,7 +468,7 @@ bool KoSpeaker::sayWidget(const TQString& msg) // int id = m->idAt(i); // TQMenuItem* mi = m->findItem(id); // TQWidget* w = mi->widget(); -// if (w->rect().tqcontains(w->mapFromGlobal(p))) return id; +// if (w->rect().contains(w->mapFromGlobal(p))) return id; // } // return -1; // } diff --git a/lib/kofficecore/KoStyleStack.h b/lib/kofficecore/KoStyleStack.h index 4e6cfa7e..4fbc1793 100644 --- a/lib/kofficecore/KoStyleStack.h +++ b/lib/kofficecore/KoStyleStack.h @@ -98,7 +98,7 @@ public: /** * Check if any of the styles on the stack has an attribute called 'name'-'detail' * where detail is e.g. left, right, top or bottom. - * This allows to also tqfind 'name' alone (e.g. padding implies padding-left, padding-right etc.) + * This allows to also find 'name' alone (e.g. padding implies padding-left, padding-right etc.) */ bool hasAttribute( const TQString& name, const TQString& detail = TQString() ) const KDE_DEPRECATED; @@ -111,7 +111,7 @@ public: /** * Check if any of the styles on the stack has an attribute called 'name'-'detail' * where detail is e.g. left, right, top or bottom. - * This allows to also tqfind 'name' alone (e.g. padding implies padding-left, padding-right etc.) + * This allows to also find 'name' alone (e.g. padding implies padding-left, padding-right etc.) */ bool hasAttributeNS( const char* nsURI, const char* localName, const char* detail = 0 ) const; diff --git a/lib/kofficecore/KoTemplates.cpp b/lib/kofficecore/KoTemplates.cpp index 178c6271..62c8358d 100644 --- a/lib/kofficecore/KoTemplates.cpp +++ b/lib/kofficecore/KoTemplates.cpp @@ -101,7 +101,7 @@ void KoTemplateGroup::setHidden(bool hidden) const { bool KoTemplateGroup::add(KoTemplate *t, bool force, bool touch) { - KoTemplate *myTemplate=tqfind(t->name()); + KoTemplate *myTemplate=find(t->name()); if(myTemplate==0L) { m_templates.append(t); m_touched=touch; @@ -120,7 +120,7 @@ bool KoTemplateGroup::add(KoTemplate *t, bool force, bool touch) { return false; } -KoTemplate *KoTemplateGroup::tqfind(const TQString &name) const { +KoTemplate *KoTemplateGroup::find(const TQString &name) const { TQPtrListIterator<KoTemplate> it(m_templates); while(it.current() && it.current()->name()!=name) @@ -192,14 +192,14 @@ void KoTemplateTree::writeTemplateTree() { void KoTemplateTree::add(KoTemplateGroup *g) { - KoTemplateGroup *group=tqfind(g->name()); + KoTemplateGroup *group=find(g->name()); if(group==0L) m_groups.append(g); else group->addDir(g->dirs().first()); // "...there can be only one..." (Queen) } -KoTemplateGroup *KoTemplateTree::tqfind(const TQString &name) const { +KoTemplateGroup *KoTemplateTree::find(const TQString &name) const { TQPtrListIterator<KoTemplateGroup> it(m_groups); while(it.current() && it.current()->name()!=name) diff --git a/lib/kofficecore/KoTemplates.h b/lib/kofficecore/KoTemplates.h index 7547fd60..98c3ef72 100644 --- a/lib/kofficecore/KoTemplates.h +++ b/lib/kofficecore/KoTemplates.h @@ -92,7 +92,7 @@ public: KoTemplate *current() { return m_templates.current(); } bool add(KoTemplate *t, bool force=false, bool touch=true); - KoTemplate *tqfind(const TQString &name) const; + KoTemplate *find(const TQString &name) const; bool touched() const { return m_touched; } @@ -124,7 +124,7 @@ public: KoTemplateGroup *current() { return m_groups.current(); } void add(KoTemplateGroup *g); - KoTemplateGroup *tqfind(const TQString &name) const; + KoTemplateGroup *find(const TQString &name) const; KoTemplateGroup *defaultGroup() const { return m_defaultGroup; } KoTemplate *defaultTemplate() const { return m_defaultTemplate; } diff --git a/lib/kofficecore/KoUnit.cpp b/lib/kofficecore/KoUnit.cpp index 51c63499..cc882345 100644 --- a/lib/kofficecore/KoUnit.cpp +++ b/lib/kofficecore/KoUnit.cpp @@ -153,7 +153,7 @@ double KoUnit::parseValue( TQString value, double defaultVal ) if( value.isEmpty() ) return defaultVal; - int index = value.tqfind( TQRegExp( "[a-z]+$" ) ); + int index = value.find( TQRegExp( "[a-z]+$" ) ); if ( index == -1 ) return value.toDouble(); diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp index 87751a34..e2b9775e 100644 --- a/lib/kofficecore/KoView.cpp +++ b/lib/kofficecore/KoView.cpp @@ -203,7 +203,7 @@ void KoView::setPartManager( KParts::PartManager *manager ) { d->m_manager = manager; if ( !koDocument()->isSingleViewMode() && - manager->parts()->tqcontainsRef( koDocument() ) == 0 ) // is there another view registered? + manager->parts()->containsRef( koDocument() ) == 0 ) // is there another view registered? { d->m_registered = true; // no, so we have to register now and ungregister again in the DTOR manager->addPart( koDocument(), false ); @@ -241,11 +241,11 @@ KoDocument *KoView::hitTest( const TQPoint &viewPos ) { if ( ( viewChild = child( docChild->document() ) ) ) { - if ( viewChild->frameRegion().tqcontains( pos ) ) + if ( viewChild->frameRegion().contains( pos ) ) return 0; } else - if ( docChild->frameRegion().tqcontains( pos ) ) + if ( docChild->frameRegion().contains( pos ) ) return 0; } @@ -254,11 +254,11 @@ KoDocument *KoView::hitTest( const TQPoint &viewPos ) { if ( ( viewChild = child( docChild->document() ) ) ) { - if ( viewChild->frameRegion().tqcontains( pos ) ) + if ( viewChild->frameRegion().contains( pos ) ) return 0; } else - if ( docChild->frameRegion().tqcontains( pos ) ) + if ( docChild->frameRegion().contains( pos ) ) return 0; } diff --git a/lib/kofficecore/KoXmlReader.cpp b/lib/kofficecore/KoXmlReader.cpp index 371b4d29..52e6d8ae 100644 --- a/lib/kofficecore/KoXmlReader.cpp +++ b/lib/kofficecore/KoXmlReader.cpp @@ -421,7 +421,7 @@ TQString KoXmlNodeData::attribute( const TQString& name ) bool KoXmlNodeData::hasAttribute( const TQString& name ) { - return attr.tqcontains( name ); + return attr.contains( name ); } void KoXmlNodeData::setAttributeNS( const TQString& nsURI, @@ -429,7 +429,7 @@ const TQString& name, const TQString& value ) { TQString prefix; TQString localName = name; - int i = name.tqfind( ':' ); + int i = name.find( ':' ); if( i != -1 ) { localName = name.mid( i + 1 ); @@ -451,7 +451,7 @@ TQString KoXmlNodeData::attributeNS( const TQString& nsURI, const TQString& name bool KoXmlNodeData::hasAttributeNS( const TQString& nsURI, const TQString& name ) { DTQString key( nsURI, name ); - return attrNS.tqcontains( key ); + return attrNS.contains( key ); } TQString KoXmlNodeData::data() const @@ -665,7 +665,7 @@ const TQString& name, const TQXmlAttributes& atts ) nodeTagName = name; nodeLocalName = name; nodePrefix = nsURI.isNull() ? TQString() : TQString(""); - int i = name.tqfind( ':' ); + int i = name.find( ':' ); if( i != -1 ) { nodeTagName = name.mid( i + 1 ); @@ -695,7 +695,7 @@ const TQString& name, const TQXmlAttributes& atts ) TQString name; // without prefix, i.e. local name name = qName = atts.qName(c); - int i = qName.tqfind( ':' ); + int i = qName.find( ':' ); if( i != -1 ) prefix = qName.left( i ); if( i != -1 ) name = qName.mid( i + 1 ); element->setAttributeNS( atts.uri(c), qName, atts.value(c) ); @@ -720,7 +720,7 @@ const TQString& name, const TQXmlAttributes& atts ) { TQString prefix; TQString name = atts.qName(c); // qName contains the prefix - int i = name.tqfind( ':' ); + int i = name.find( ':' ); if( i != -1 ) prefix = name.left( i ); if( i != -1 ) name = atts.qName(c).mid( i + 1 ); if( !atts.uri(c).isEmpty() ) diff --git a/lib/kofficecore/THOUGHTS b/lib/kofficecore/THOUGHTS index 33befa05..fc936fdc 100644 --- a/lib/kofficecore/THOUGHTS +++ b/lib/kofficecore/THOUGHTS @@ -77,7 +77,7 @@ as inactive child. ### If a part doesn't support zooming natively we have to fall back to WMartix -hacks (don't know how we can "ask" a part about that, but I'm sure we tqfind +hacks (don't know how we can "ask" a part about that, but I'm sure we find some BC way). 2.2) Widget embedding: diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp index a45e1334..dccc913a 100644 --- a/lib/kofficecore/kkbdaccessextensions.cpp +++ b/lib/kofficecore/kkbdaccessextensions.cpp @@ -310,7 +310,7 @@ void KKbdAccessExtensions::nextHandle() advance = (d->handleNdx > 2 || !dynamic_cast<TQDockWindow *>(panel)->area()); if (advance) { TQWidgetList* allWidgets = getAllPanels(); - allWidgets->tqfindRef(panel); + allWidgets->findRef(panel); panel = 0; if (allWidgets->current()) panel = allWidgets->next(); delete allWidgets; @@ -340,7 +340,7 @@ void KKbdAccessExtensions::prevHandle() rewind = (d->handleNdx < 1); if (rewind) { TQWidgetList* allWidgets = getAllPanels(); - allWidgets->tqfindRef(panel); + allWidgets->findRef(panel); panel = 0; if (allWidgets->current()) panel = allWidgets->prev(); delete allWidgets; @@ -563,7 +563,7 @@ void KKbdAccessExtensions::displayAccessKeys() KKeySequence seq = sc.seq(i); if (seq.count() == 1) { TQString s = seq.toString(); - if (availableAccessKeys.tqcontains(s)) + if (availableAccessKeys.contains(s)) availableAccessKeys.remove(s); } } diff --git a/lib/kofficecore/tests/filter_graph.cpp b/lib/kofficecore/tests/filter_graph.cpp index ac25c8d7..baead627 100644 --- a/lib/kofficecore/tests/filter_graph.cpp +++ b/lib/kofficecore/tests/filter_graph.cpp @@ -53,7 +53,7 @@ int main( int /*argc*/, char ** /*argv*/ ) output += " \""; output += key.latin1(); output += "\" [tqshape=box, style=filled, fillcolor=lightblue];\n"; - if ( vertices.tqfind( key ) == vertices.end() ) + if ( vertices.find( key ) == vertices.end() ) vertices.append( key ); } } @@ -71,7 +71,7 @@ int main( int /*argc*/, char ** /*argv*/ ) TQStringList::ConstIterator importEnd = ( *it )->import.end(); for ( ; importIt != importEnd; ++importIt ) { // already there? - if ( vertices.tqfind( *importIt ) == vertices.end() ) { + if ( vertices.find( *importIt ) == vertices.end() ) { vertices.append( *importIt ); output += " \""; output += ( *importIt ).latin1(); @@ -84,7 +84,7 @@ int main( int /*argc*/, char ** /*argv*/ ) for ( ; exportIt != exportEnd; ++exportIt ) { // First make sure the export vertex is in place - if ( vertices.tqfind( *exportIt ) == vertices.end() ) { + if ( vertices.find( *exportIt ) == vertices.end() ) { output += " \""; output += ( *exportIt ).latin1(); output += "\";\n"; diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp index 22e8599b..cfde2802 100644 --- a/lib/kofficeui/KoCommandHistory.cpp +++ b/lib/kofficeui/KoCommandHistory.cpp @@ -173,7 +173,7 @@ void KoCommandHistory::addCommand(KCommand *command, bool execute) { return; int index; - if(d->m_present!=0L && (index=m_commands.tqfindRef(d->m_present))!=-1) { + if(d->m_present!=0L && (index=m_commands.findRef(d->m_present))!=-1) { if (m_first) --index; m_commands.insert(index+1, command); @@ -232,7 +232,7 @@ void KoCommandHistory::undo() { m_redo->setText(i18n("&Redo: %1").tqarg(d->m_present->name())); } int index; - if((index=m_commands.tqfindRef(d->m_present))!=-1 && m_commands.prev()!=0) { + if((index=m_commands.findRef(d->m_present))!=-1 && m_commands.prev()!=0) { d->m_present=m_commands.current(); emit commandExecuted(); emit commandExecuted(commandUndone); @@ -270,7 +270,7 @@ void KoCommandHistory::redo() { if(d->m_savedAt==0) emit documentRestored(); } - else if((index=m_commands.tqfindRef(d->m_present))!=-1 && m_commands.next()!=0) { + else if((index=m_commands.findRef(d->m_present))!=-1 && m_commands.next()!=0) { d->m_present=m_commands.current(); d->m_present->execute(); emit commandExecuted(); @@ -301,7 +301,7 @@ void KoCommandHistory::redo() { void KoCommandHistory::documentSaved() { if(d->m_present!=0 && !m_first) - d->m_savedAt=m_commands.tqfindRef(d->m_present); + d->m_savedAt=m_commands.findRef(d->m_present); else if(d->m_present==0 && !m_first) d->m_savedAt=-42; // this value signals that the document has // been saved with an empty history. @@ -331,7 +331,7 @@ void KoCommandHistory::clipCommands() { if(count<=m_undoLimit && count<=m_redoLimit) return; - int index=m_commands.tqfindRef(d->m_present); + int index=m_commands.findRef(d->m_present); if(index>=m_undoLimit) { for(int i=0; i<=(index-m_undoLimit); ++i) { m_commands.removeFirst(); @@ -339,7 +339,7 @@ void KoCommandHistory::clipCommands() { if(d->m_savedAt==-1) d->m_savedAt=-42; } - index=m_commands.tqfindRef(d->m_present); // calculate the new + index=m_commands.findRef(d->m_present); // calculate the new count=m_commands.count(); // values (for the redo-branch :) // make it easier for us... d->m_savedAt==-1 -> invalid if(d->m_savedAt!=-42 && d->m_savedAt<-1) @@ -362,7 +362,7 @@ void KoCommandHistory::slotUndoAboutToShow() slotChangeUndoNumberOfSelectedItem( -1 ); int i = 0; TQStringList lst; - if (m_commands.tqfindRef(d->m_present)!=-1) + 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())); @@ -413,7 +413,7 @@ void KoCommandHistory::slotRedoAboutToShow() d->m_present = m_commands.first(); lst.append(i18n("Redo: %1").tqarg(d->m_present->name())); } - if (m_commands.tqfindRef(d->m_present)!=-1 && m_commands.next()) + 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())); @@ -436,7 +436,7 @@ void KoCommandHistory::updateActions() if ( m_undo && m_redo ) { m_undo->setEnabled( !m_first && ( d->m_present != 0L ) ); - m_redo->setEnabled(m_first || (m_commands.tqfindRef(d->m_present)!=-1 && m_commands.next()!=0)); + m_redo->setEnabled(m_first || (m_commands.findRef(d->m_present)!=-1 && m_commands.next()!=0)); } } diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp index 830dded4..c2a237bd 100644 --- a/lib/kofficeui/KoContextCelp.cpp +++ b/lib/kofficeui/KoContextCelp.cpp @@ -227,7 +227,7 @@ void KoHelpView::mouseReleaseEvent( TQMouseEvent* e ) TQString helpapp=currentAnchor.right(currentAnchor.length()-7); TQString helpanchor; int pos; - if ((pos=helpapp.tqfind("#"))!=-1) { + if ((pos=helpapp.find("#"))!=-1) { helpanchor=helpapp.right(helpapp.length()-pos-1); helpapp=helpapp.left(pos); } diff --git a/lib/kofficeui/KoGuides.cpp b/lib/kofficeui/KoGuides.cpp index a7e85bcf..01f6e745 100644 --- a/lib/kofficeui/KoGuides.cpp +++ b/lib/kofficeui/KoGuides.cpp @@ -134,7 +134,7 @@ bool KoGuides::mousePressEvent( TQMouseEvent *e ) m_mouseSelected = false; KoPoint p( mapFromScreen( e->pos() ) ); - KoGuideLine * guideLine = tqfind( p, m_zoomHandler->unzoomItY( 2 ) ); + KoGuideLine * guideLine = find( p, m_zoomHandler->unzoomItY( 2 ) ); if ( guideLine ) { m_lastPoint = e->pos(); @@ -216,7 +216,7 @@ bool KoGuides::mouseMoveEvent( TQMouseEvent *e ) else if ( e->state() == Qt::NoButton ) { KoPoint p( mapFromScreen( e->pos() ) ); - KoGuideLine * guideLine = tqfind( p, m_zoomHandler->unzoomItY( 2 ) ); + KoGuideLine * guideLine = find( p, m_zoomHandler->unzoomItY( 2 ) ); if ( guideLine ) { m_view->canvas()->setCursor( guideLine->orientation == Qt::Vertical ? TQt::sizeHorCursor : TQt::sizeVerCursor ); @@ -249,7 +249,7 @@ bool KoGuides::mouseReleaseEvent( TQMouseEvent *e ) removeSelected(); } } - KoGuideLine * guideLine = tqfind( p, m_zoomHandler->unzoomItY( 2 ) ); + KoGuideLine * guideLine = find( p, m_zoomHandler->unzoomItY( 2 ) ); if ( guideLine ) { m_view->canvas()->setCursor( guideLine->orientation == Qt::Vertical ? TQt::sizeHorCursor : TQt::sizeVerCursor ); @@ -722,7 +722,7 @@ void KoGuides::addGuide( const TQPoint &pos, bool /* horizontal */, int rulerWid void KoGuides::slotChangePosition() { KoPoint p( mapFromScreen( m_lastPoint ) ); - KoGuideLine * guideLine = tqfind( p, m_zoomHandler->unzoomItY( 2 ) ); + KoGuideLine * guideLine = find( p, m_zoomHandler->unzoomItY( 2 ) ); const KoPageLayout& pl = m_view->koDocument()->pageLayout(); double max = 0.0; @@ -819,7 +819,7 @@ bool KoGuides::hasSelected() } -KoGuides::KoGuideLine * KoGuides::tqfind( KoPoint &p, double diff ) +KoGuides::KoGuideLine * KoGuides::find( KoPoint &p, double diff ) { TQValueList<KoGuideLine *>::iterator it = m_guideLines[GL_SELECTED].begin(); for ( ; it != m_guideLines[GL_SELECTED].end(); ++it ) diff --git a/lib/kofficeui/KoGuides.h b/lib/kofficeui/KoGuides.h index 15d99ca2..b98b0472 100644 --- a/lib/kofficeui/KoGuides.h +++ b/lib/kofficeui/KoGuides.h @@ -351,7 +351,7 @@ private: * @return the fould guide * @return 0 if none is found */ - KoGuideLine * tqfind( KoPoint &p, double diff ); + KoGuideLine * find( KoPoint &p, double diff ); /** * @brief Move selected guides. diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp index 947624b9..4c863935 100644 --- a/lib/kofficeui/KoInsertLink.cpp +++ b/lib/kofficeui/KoInsertLink.cpp @@ -129,25 +129,25 @@ void KoInsertLinkDia::setHrefLinkName(const TQString &_href, const TQString &_li } return; } - if(_href.tqfind("http://")!=-1 || _href.tqfind("https://")!=-1 ||_href.tqfind("ftp://")!=-1 ) + if(_href.find("http://")!=-1 || _href.find("https://")!=-1 ||_href.find("ftp://")!=-1 ) { internetLink->setHrefName(_href); internetLink->setLinkName(_link); showPage(0); } - else if(_href.tqfind("file:/")!=-1) + else if(_href.find("file:/")!=-1) { fileLink->setHrefName(_href); fileLink->setLinkName(_link); showPage(2); } - else if(_href.tqfind("mailto:")!=-1 || _href.tqfind("news:")!=-1) + else if(_href.find("mailto:")!=-1 || _href.find("news:")!=-1) { mailLink->setHrefName(_href); mailLink->setLinkName(_link); showPage(1); } - else if(_href.tqfind("bkm://")!=-1) + else if(_href.find("bkm://")!=-1) { if ( bookmarkLink ) { @@ -259,7 +259,7 @@ TQString internetLinkPage::createInternetLink() if(result.isEmpty()) return result; - if(result.tqfind("http://")==-1 && result.tqfind("https://")==-1 && result.tqfind("ftp://")==-1) + if(result.find("http://")==-1 && result.find("https://")==-1 && result.find("ftp://")==-1) result = "http://"+result; return result; } @@ -332,7 +332,7 @@ TQString bookmarkLinkPage::createBookmarkLink() if(result.isEmpty()) return result; - if(result.tqfind("bkm://")==-1) + if(result.find("bkm://")==-1) result = "bkm://"+result; return result; } @@ -411,7 +411,7 @@ TQString mailLinkPage::createMailLink() if(result.isEmpty()) return result; - if(result.tqfind("mailto:")==-1 && result.tqfind("news:")==-1) + if(result.find("mailto:")==-1 && result.find("news:")==-1) result = "mailto:"+result; return result; } @@ -516,7 +516,7 @@ TQString fileLinkPage::createFileLink() if(result.isEmpty()) return result; - if(result.tqfind("file:/")==-1) + if(result.find("file:/")==-1) result = "file://"+result; return result; } diff --git a/lib/kofficeui/KoPartSelectAction.cpp b/lib/kofficeui/KoPartSelectAction.cpp index 0e574725..d563e906 100644 --- a/lib/kofficeui/KoPartSelectAction.cpp +++ b/lib/kofficeui/KoPartSelectAction.cpp @@ -52,7 +52,7 @@ void KoPartSelectAction::init() for( ; it != m_lstEntries.end(); ++it ) { KService::Ptr serv = (*it).service(); if (!serv->genericName().isEmpty()) { - KAction *action = new KAction( serv->genericName().tqreplace('&',"&&"), serv->icon(), 0, + KAction *action = new KAction( serv->genericName().replace('&',"&&"), serv->icon(), 0, this, TQT_SLOT( slotActionActivated() ), parentCollection(), serv->name().latin1() ); insert( action ); diff --git a/lib/kofficeui/KoRuler.cpp b/lib/kofficeui/KoRuler.cpp index 8e936874..212becd7 100644 --- a/lib/kofficeui/KoRuler.cpp +++ b/lib/kofficeui/KoRuler.cpp @@ -843,7 +843,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e ) p.drawLine( pt_fr, 0, pt_fr, d->canvas->height() ); } - KoTabulatorList::Iterator it = d->tabList.tqfind( d->currTab ); + KoTabulatorList::Iterator it = d->tabList.find( d->currTab ); Q_ASSERT( it != d->tabList.end() ); if ( it != d->tabList.end() ) (*it).ptPos = newValue; diff --git a/lib/kofficeui/KoTabBar.cpp b/lib/kofficeui/KoTabBar.cpp index b2e7c94b..7c0beeeb 100644 --- a/lib/kofficeui/KoTabBar.cpp +++ b/lib/kofficeui/KoTabBar.cpp @@ -245,7 +245,7 @@ int KoTabBarPrivate::tabAt( const TQPoint& pos ) { TQRect rect = tabRects[ i ]; if( rect.isNull() ) continue; - if( rect.tqcontains( pos ) ) return i; + if( rect.contains( pos ) ) return i; } return -1; // not found @@ -396,7 +396,7 @@ void KoTabBar::addTab( const TQString& text ) // removes a tab void KoTabBar::removeTab( const TQString& text ) { - int i = d->tabs.tqfindIndex( text ); + int i = d->tabs.findIndex( text ); if ( i == -1 ) return; if ( d->activeTab == i + 1 ) @@ -457,7 +457,7 @@ void KoTabBar::setTabs( const TQStringList& list ) if( !left.isNull() ) { - d->firstTab = d->tabs.tqfindIndex( left ) + 1; + d->firstTab = d->tabs.findIndex( left ) + 1; if( d->firstTab > (int)d->tabs.count() ) d->firstTab = 1; if( d->firstTab <= 0 ) @@ -572,7 +572,7 @@ void KoTabBar::scrollLast() void KoTabBar::ensureVisible( const TQString& tab ) { - int i = d->tabs.tqfindIndex( tab ); + int i = d->tabs.findIndex( tab ); if ( i == -1 ) return; i++; @@ -612,7 +612,7 @@ void KoTabBar::moveTab( unsigned tab, unsigned target ) void KoTabBar::setActiveTab( const TQString& text ) { - int i = d->tabs.tqfindIndex( text ); + int i = d->tabs.findIndex( text ); if ( i == -1 ) return; @@ -729,7 +729,7 @@ TQSize KoTabBar::tqsizeHint() const void KoTabBar::renameTab( const TQString& old_name, const TQString& new_name ) { - TQStringList::Iterator it = d->tabs.tqfind( old_name ); + TQStringList::Iterator it = d->tabs.find( old_name ); (*it) = new_name; update(); diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp index bd7a63f8..280a875c 100644 --- a/lib/kofficeui/KoTemplateChooseDia.cpp +++ b/lib/kofficeui/KoTemplateChooseDia.cpp @@ -319,7 +319,7 @@ void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout TQString s = value; if ( s.endsWith("]") ) { - int pos = s.tqfind("["); + int pos = s.find("["); s = s.mid( pos + 1, s.length() - pos - 2); } KURL url(s); diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp index 756c6e2a..213e694f 100644 --- a/lib/kofficeui/KoTemplateCreateDia.cpp +++ b/lib/kofficeui/KoTemplateCreateDia.cpp @@ -228,7 +228,7 @@ void KoTemplateCreateDia::slotOk() { return; } - KoTemplateGroup *group=d->m_tree->tqfind(item->text(0)); + KoTemplateGroup *group=d->m_tree->find(item->text(0)); if(!group) { // even safer d->m_tree->writeTemplateTree(); KDialogBase::slotCancel(); @@ -254,7 +254,7 @@ void KoTemplateCreateDia::slotOk() { icon+=".png"; // try to find the extension for the template file :P - const int pos = m_file.tqfindRev( '.' ); + const int pos = m_file.findRev( '.' ); TQString ext; if ( pos > -1 ) ext = m_file.mid( pos ); @@ -278,7 +278,7 @@ void KoTemplateCreateDia::slotOk() { kdDebug(30004) << "Trying to create template: " << d->m_name->text() << "URL=" << ".source/"+file+ext << " ICON=" << tmpIcon << endl; KoTemplate *t=new KoTemplate(d->m_name->text(), TQString(), ".source/"+file+ext, tmpIcon, "", "", false, true); if(!group->add(t)) { - KoTemplate *existingTemplate=group->tqfind(d->m_name->text()); + KoTemplate *existingTemplate=group->find(d->m_name->text()); if(existingTemplate && !existingTemplate->isHidden()) { if(KMessageBox::warningYesNo(this, i18n("Do you really want to overwrite" " the existing '%1' template?"). @@ -321,7 +321,7 @@ void KoTemplateCreateDia::slotOk() { bool ready=false; TQStringList tmp=group->dirs(); for(TQStringList::ConstIterator it=tmp.begin(); it!=tmp.end() && !ready; ++it) { - if((*it).tqcontains(dir)==0) { + if((*it).contains(dir)==0) { orig.setPath( (*it)+".directory" ); // Check if we can read the file if( KIO::NetAccess::exists(orig, true, this) ) { @@ -395,7 +395,7 @@ void KoTemplateCreateDia::slotAddGroup() { const TQString name ( KInputDialog::getText( i18n("Add Group"), i18n("Enter group name:"), TQString(), &ok, this ) ); if(!ok) return; - KoTemplateGroup *group=d->m_tree->tqfind(name); + KoTemplateGroup *group=d->m_tree->find(name); if(group && !group->isHidden()) { KMessageBox::information( this, i18n("This name is already used."), i18n("Add Group") ); @@ -436,14 +436,14 @@ void KoTemplateCreateDia::slotRemove() { } if(item->depth()==0) { - KoTemplateGroup *group=d->m_tree->tqfind(item->text(0)); + KoTemplateGroup *group=d->m_tree->find(item->text(0)); if(group) group->setHidden(true); } else { bool done=false; for(KoTemplateGroup *g=d->m_tree->first(); g!=0L && !done; g=d->m_tree->next()) { - KoTemplate *t=g->tqfind(item->text(0)); + KoTemplate *t=g->find(item->text(0)); if(t) { t->setHidden(true); done=true; diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp index ca7db5a7..eea6a290 100644 --- a/lib/kofficeui/KoToolBox.cpp +++ b/lib/kofficeui/KoToolBox.cpp @@ -172,7 +172,7 @@ void KoToolBox::enableTools(bool enable) } m_buttonGroup->setEnabled(enable); for (TQ_UINT32 i = 0; i < m_numberOfButtons; ++i) { - m_buttonGroup->tqfind( i )->setEnabled( enable ); + m_buttonGroup->find( i )->setEnabled( enable ); } } diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp index 4b5b1b4d..9f500bb1 100644 --- a/lib/kofficeui/KoTooluButton.cpp +++ b/lib/kofficeui/KoTooluButton.cpp @@ -377,7 +377,7 @@ void KoColorPanel::paintEvent( TQPaintEvent* e ) if ( !m_colorMap.isEmpty() ) { int currentRow = startRow, currentCol = startCol; while ( currentRow < endRow && currentCol < endCol ) { - TQMap<Position, TQColor>::ConstIterator it = m_colorMap.tqfind( Position( currentCol, currentRow ) ); + TQMap<Position, TQColor>::ConstIterator it = m_colorMap.find( Position( currentCol, currentRow ) ); if( it != m_colorMap.end() ) p.fillRect( ( currentCol << 4 ) + 2, ( currentRow << 4 ) + 2, 12, 12, it.data() ); @@ -516,7 +516,7 @@ TQColor KoColorPanel::mapToColor( const TQPoint& point ) const TQColor KoColorPanel::mapToColor( const KoColorPanel::Position& position ) const { - TQMap<Position, TQColor>::ConstIterator it = m_colorMap.tqfind( position ); + TQMap<Position, TQColor>::ConstIterator it = m_colorMap.find( position ); if ( it != m_colorMap.end() ) return it.data(); return TQColor(); @@ -576,7 +576,7 @@ void KoColorPanel::updateFocusPosition( const Position& newPosition ) m_focusPosition = newPosition; - TQMap<Position, TQColor>::ConstIterator it = m_colorMap.tqfind( m_focusPosition ); + TQMap<Position, TQColor>::ConstIterator it = m_colorMap.find( m_focusPosition ); 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 ), @@ -588,7 +588,7 @@ void KoColorPanel::updateFocusPosition( const Position& newPosition ) void KoColorPanel::paint( const Position& position ) { - TQMap<Position, TQColor>::ConstIterator it = m_colorMap.tqfind( position ); + TQMap<Position, TQColor>::ConstIterator it = m_colorMap.find( position ); if ( it == m_colorMap.end() ) return; @@ -852,7 +852,7 @@ void KoToolButton::buttonShift( int& dx, int& dy ) bool KoToolButton::hitArrow( const TQPoint& pos ) { - return TQRect( width() - ARROW_WIDTH, 0, ARROW_WIDTH, height() ).tqcontains( pos ); + return TQRect( width() - ARROW_WIDTH, 0, ARROW_WIDTH, height() ).contains( pos ); } #include <KoTooluButton.moc> diff --git a/lib/kofficeui/KoZoomAction.cpp b/lib/kofficeui/KoZoomAction.cpp index 5455a159..bebe7055 100644 --- a/lib/kofficeui/KoZoomAction.cpp +++ b/lib/kofficeui/KoZoomAction.cpp @@ -60,7 +60,7 @@ void KoZoomAction::setZoom( const TQString& text ) const int val=regexp.cap(1).toInt( &ok ); //zoom : limit inferior=10 - if( ok && val>9 && list.tqcontains( val )==0 ) + if( ok && val>9 && list.contains( val )==0 ) list.append( val ); } @@ -73,7 +73,7 @@ void KoZoomAction::setZoom( const TQString& text ) setItems( values ); TQString zoomStr = i18n("%1%").tqarg( zoom ); - setCurrentItem( values.tqfindIndex( zoomStr ) ); + setCurrentItem( values.findIndex( zoomStr ) ); } void KoZoomAction::setZoom( int zoom ) @@ -106,7 +106,7 @@ void KoZoomAction::init() values << i18n("%1%").tqarg("500"); setItems( values ); - setCurrentItem( values.tqfindIndex( i18n("%1%").tqarg( 100 ) ) ); + setCurrentItem( values.findIndex( i18n("%1%").tqarg( 100 ) ) ); connect( this, TQT_SIGNAL( activated( const TQString& ) ), TQT_SLOT( activated( const TQString& ) ) ); diff --git a/lib/kofficeui/tktoolbarbutton.cpp b/lib/kofficeui/tktoolbarbutton.cpp index d3def7c9..fa36390e 100644 --- a/lib/kofficeui/tktoolbarbutton.cpp +++ b/lib/kofficeui/tktoolbarbutton.cpp @@ -332,7 +332,7 @@ bool TKToolBarButton::eventFilter(TQObject *o, TQEvent *ev) case TQEvent::Hide: on(false); setDown(false); - if ( !tqgeometry().tqcontains(parentWidget()->mapFromGlobal(TQCursor::pos())) ) + if ( !tqgeometry().contains(parentWidget()->mapFromGlobal(TQCursor::pos())) ) leaveEvent(0L); return false; break; diff --git a/lib/kopainter/koIconChooser.cc b/lib/kopainter/koIconChooser.cc index 4c7aab32..06efc8cf 100644 --- a/lib/kopainter/koIconChooser.cc +++ b/lib/kopainter/koIconChooser.cc @@ -125,7 +125,7 @@ void KoIconChooser::addItem(KoIconItem *item) bool KoIconChooser::removeItem(KoIconItem *item) { - int index = mIconList.tqfind(item); + int index = mIconList.find(item); bool ok = mIconList.remove(item); if( ok ) { @@ -155,7 +155,7 @@ KoIconItem *KoIconChooser::currentItem() // does NOT emit selected() (should it?) void KoIconChooser::setCurrentItem(KoIconItem *item) { - int index = mIconList.tqfind(item); + int index = mIconList.find(item); // item is available if(index != -1 && mNCols > 0) diff --git a/lib/kopainter/kogradientmanager.cc b/lib/kopainter/kogradientmanager.cc index 242b5470..c95a5671 100644 --- a/lib/kopainter/kogradientmanager.cc +++ b/lib/kopainter/kogradientmanager.cc @@ -38,7 +38,7 @@ KoGradientManager::~KoGradientManager() KoGradient* KoGradientManager::loadGradient(const TQString& filename) { TQString strExt; - const int result=filename.tqfindRev('.'); + const int result=filename.findRev('.'); if (result>=0) { strExt=filename.mid(result).lower(); @@ -466,7 +466,7 @@ KoGradient* KoGradientManager::parseSvgGradient(const TQDomElement& element) TQColor c; float off; TQString temp = colorstop.attribute( "offset" ); - if( temp.tqcontains( '%' ) ) + if( temp.contains( '%' ) ) { temp = temp.left( temp.length() - 1 ); off = temp.toFloat() / 100.0; @@ -521,19 +521,19 @@ void KoGradientManager::parseSvgColor(TQColor &color, const TQString &s) TQString g = colors[1]; TQString b = colors[2].left( ( colors[2].length() - 1 ) ); - if( r.tqcontains( "%" ) ) + if( r.contains( "%" ) ) { r = r.left( r.length() - 1 ); r = TQString::number( int( ( double( 255 * r.toDouble() ) / 100.0 ) ) ); } - if( g.tqcontains( "%" ) ) + if( g.contains( "%" ) ) { g = g.left( g.length() - 1 ); g = TQString::number( int( ( double( 255 * g.toDouble() ) / 100.0 ) ) ); } - if( b.tqcontains( "%" ) ) + if( b.contains( "%" ) ) { b = b.left( b.length() - 1 ); b = TQString::number( int( ( double( 255 * b.toDouble() ) / 100.0 ) ) ); diff --git a/lib/kopainter/svgpathparser.cc b/lib/kopainter/svgpathparser.cc index 1bdc3095..9295cdd2 100644 --- a/lib/kopainter/svgpathparser.cc +++ b/lib/kopainter/svgpathparser.cc @@ -93,7 +93,7 @@ SVGPathParser::parseSVG( const TQString &s, bool process ) if( !s.isEmpty() ) { TQString d = s; - d = d.tqreplace( ',', ' ' ); + d = d.replace( ',', ' ' ); d = d.simplifyWhiteSpace(); const char *ptr = d.latin1(); diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cc index 839a6187..94ea8d4d 100644 --- a/lib/kopalette/kopalettemanager.cc +++ b/lib/kopalette/kopalettemanager.cc @@ -141,7 +141,7 @@ void KoPaletteManager::addWidget(TQWidget * widget, TQString pname = paletteName; - TQWidget * w = m_widgets->tqfind(name); + TQWidget * w = m_widgets->find(name); if (w != 0 ) { removeWidget(name); @@ -157,7 +157,7 @@ void KoPaletteManager::addWidget(TQWidget * widget, visible = cfg->readBoolEntry("visible"); } - KoPalette * palette = m_palettes->tqfind(pname); + KoPalette * palette = m_palettes->find(pname); if (palette == 0) { palette = createPalette(pname, widget->caption(), style); @@ -181,11 +181,11 @@ void KoPaletteManager::addWidget(TQWidget * widget, m_defaultWidgetOrder.append(name); // Find out the hidden state - if(m_widgetNames->tqcontains(name)) + if(m_widgetNames->contains(name)) { // The widget has already been added (and removed) during this session - if(m_hiddenWidgets.tqcontains(name)) + if(m_hiddenWidgets.contains(name)) palette->hidePage( widget ); else { @@ -241,13 +241,13 @@ void KoPaletteManager::slotReset() for (it = m_defaultWidgetOrder.begin(); it != m_defaultWidgetOrder.end(); ++it) { TQString widgetName = *it; - TQWidget * w = m_widgets->tqfind(widgetName); + TQWidget * w = m_widgets->find(widgetName); if (!w) { continue; } - TQString paletteName = *m_defaultMapping->tqfind(widgetName); - KoPalette * p = m_palettes->tqfind(paletteName); + TQString paletteName = *m_defaultMapping->find(widgetName); + KoPalette * p = m_palettes->find(paletteName); if (p == 0) { // Funny -- we should have a consistent set of palettes without holes! @@ -271,48 +271,48 @@ void KoPaletteManager::slotResetFont() TQWidget * KoPaletteManager::widget(const TQString & name) { - return m_widgets->tqfind(name); + return m_widgets->find(name); } void KoPaletteManager::showWidget(const TQString & name) { - TQWidget * w = m_widgets->tqfind(name); + TQWidget * w = m_widgets->find(name); if (!w) return; - TQString pname = *m_currentMapping->tqfind(name); + TQString pname = *m_currentMapping->find(name); if (pname.isNull()) return; - KoPalette * p = m_palettes->tqfind(pname); + KoPalette * p = m_palettes->find(pname); p->showPage(w); - KToggleAction * a = m_actions->tqfind(name); + KToggleAction * a = m_actions->find(name); a->setChecked(true); } void KoPaletteManager::hideWidget(const TQString & name) { - TQWidget * w = m_widgets->tqfind(name); + TQWidget * w = m_widgets->find(name); if (!w) return; - TQString pname = *m_currentMapping->tqfind(name); + TQString pname = *m_currentMapping->find(name); if (pname.isNull()) return; - KoPalette * p = m_palettes->tqfind(pname); + KoPalette * p = m_palettes->find(pname); p->hidePage(w); - KToggleAction * a = m_actions->tqfind(name); + KToggleAction * a = m_actions->find(name); a->setChecked(false); } void KoPaletteManager::removeWidget(const TQString & name) { - TQString palette = *(m_currentMapping->tqfind(name)); + TQString palette = *(m_currentMapping->find(name)); if (palette.isNull()) return; - TQWidget * w = m_widgets->tqfind(name); + TQWidget * w = m_widgets->find(name); if (!w) return; - KoPalette * p = m_palettes->tqfind(palette); + KoPalette * p = m_palettes->find(palette); if (!p) return; p->showPage(w); @@ -331,7 +331,7 @@ KoPalette * KoPaletteManager::createPalette(const TQString & name, const TQStrin KoPalette * palette = 0; - palette = m_palettes->tqfind(name); + palette = m_palettes->find(name); if (palette) return palette; @@ -362,7 +362,7 @@ KoPalette * KoPaletteManager::createPalette(const TQString & name, const TQStrin void KoPaletteManager::placePalette(const TQString & name, TQt::Dock location) { Q_ASSERT(!name.isNull()); - KoPalette * palette = m_palettes->tqfind(name); + KoPalette * palette = m_palettes->find(name); if (!palette) return; @@ -441,9 +441,9 @@ void KoPaletteManager::slotTogglePalette(int paletteIndex) { // Toggle the right palette TQString name = *m_widgetNames->at(paletteIndex); - TQWidget * w = m_widgets->tqfind(name); - TQString pname = *m_currentMapping->tqfind(name); - KoPalette * p = m_palettes->tqfind(pname); + TQWidget * w = m_widgets->find(name); + TQString pname = *m_currentMapping->find(name); + KoPalette * p = m_palettes->find(pname); p->togglePageHidden( w ); m_hiddenWidgets.clear(); @@ -457,12 +457,12 @@ void KoPaletteManager::slotToggleAllPalettes() while(!m_hiddenWidgets.isEmpty()) { TQString name = m_hiddenWidgets.pop(); - TQWidget *w = m_widgets->tqfind(name); - KToggleAction * a = m_actions->tqfind(name); + TQWidget *w = m_widgets->find(name); + KToggleAction * a = m_actions->find(name); a->setChecked(true); - TQString pname = *m_currentMapping->tqfind(name); - KoPalette * p = m_palettes->tqfind(pname); + TQString pname = *m_currentMapping->find(name); + KoPalette * p = m_palettes->find(pname); p->showPage(w); } } @@ -473,14 +473,14 @@ void KoPaletteManager::slotToggleAllPalettes() TQDictIterator<TQWidget> it(*m_widgets); for (; it.current(); ++it) { - KToggleAction * a = m_actions->tqfind(it.currentKey()); + KToggleAction * a = m_actions->find(it.currentKey()); if(a->isChecked()) { a->setChecked(false); m_hiddenWidgets.push(it.currentKey()); - TQString pname = *m_currentMapping->tqfind(it.currentKey()); - KoPalette * p = m_palettes->tqfind(pname); + TQString pname = *m_currentMapping->find(it.currentKey()); + KoPalette * p = m_palettes->find(pname); p->hidePage(it.current()); } } @@ -570,7 +570,7 @@ void KoPaletteManager::save() TQStringList::iterator it; bool inserted = false; for (it = paletteList.begin(); it != paletteList.end(); ++it) { - KoPalette * p2 = m_palettes->tqfind((*it)); + KoPalette * p2 = m_palettes->find((*it)); if (p2->y() > p->y()) { paletteList.insert(it, itP.currentKey()); inserted = true; @@ -592,15 +592,15 @@ void KoPaletteManager::save() TQDictIterator<TQWidget> itW(*m_widgets); for (; itW.current(); ++itW) { cfg->setGroup("palettetab-" + itW.currentKey()); - TQString pname = *m_currentMapping->tqfind(itW.currentKey()); - KoPalette * p = m_palettes->tqfind(pname); + TQString pname = *m_currentMapping->find(itW.currentKey()); + KoPalette * p = m_palettes->find(pname); TQWidget * w = itW.current(); cfg->writeEntry("docker", pname); if(palettesShown) cfg->writeEntry("visible", !p->isHidden(w)); else - if(m_hiddenWidgets.tqcontains(itW.currentKey())) + if(m_hiddenWidgets.contains(itW.currentKey())) cfg->writeEntry("visible", true); else cfg->writeEntry("visible", false); diff --git a/lib/kopalette/kotabpalette.cc b/lib/kopalette/kotabpalette.cc index 972a8144..c1b7a8a2 100644 --- a/lib/kopalette/kotabpalette.cc +++ b/lib/kopalette/kotabpalette.cc @@ -70,9 +70,9 @@ void KoTabPalette::unplug(const TQWidget * w) void KoTabPalette::showPage(TQWidget *w) { m_page->showPage(w); - if (m_hiddenPages.tqfind(w) == m_hiddenPages.end()) return; + if (m_hiddenPages.find(w) == m_hiddenPages.end()) return; - int i = *m_hiddenPages.tqfind(w); + int i = *m_hiddenPages.find(w); m_page->insertTab(w, w->caption(), i); m_hiddenPages.erase(w); show(); @@ -89,7 +89,7 @@ void KoTabPalette::makeVisible(bool v) int KoTabPalette::indexOf(TQWidget *w) { - if (m_hiddenPages.tqfind(w) != m_hiddenPages.end()) { + if (m_hiddenPages.find(w) != m_hiddenPages.end()) { int i = m_page->indexOf(w); return -i; } @@ -100,12 +100,12 @@ int KoTabPalette::indexOf(TQWidget *w) bool KoTabPalette::isHidden(TQWidget * w) { - return (m_hiddenPages.tqfind(w) != m_hiddenPages.end()); + return (m_hiddenPages.find(w) != m_hiddenPages.end()); } void KoTabPalette::hidePage( TQWidget *w) { - if (m_hiddenPages.tqfind(w) != m_hiddenPages.end()) return; + if (m_hiddenPages.find(w) != m_hiddenPages.end()) return; int i = m_page->indexOf(w); m_page->removePage(w); @@ -117,8 +117,8 @@ void KoTabPalette::hidePage( TQWidget *w) void KoTabPalette::togglePageHidden(TQWidget *w) { - if (m_hiddenPages.tqfind(w) != m_hiddenPages.end()) { - int i = *m_hiddenPages.tqfind(w); + if (m_hiddenPages.find(w) != m_hiddenPages.end()) { + int i = *m_hiddenPages.find(w); m_page->insertTab(w, w->caption(), i); m_hiddenPages.erase(w); show(); diff --git a/lib/kopalette/kotoolboxpalette.cc b/lib/kopalette/kotoolboxpalette.cc index c41382cf..2ba9f3bb 100644 --- a/lib/kopalette/kotoolboxpalette.cc +++ b/lib/kopalette/kotoolboxpalette.cc @@ -65,7 +65,7 @@ void KoToolBoxPalette::showPage(TQWidget *w) int KoToolBoxPalette::indexOf(TQWidget *w) { - if (m_hiddenPages.tqfind(w) != m_hiddenPages.end()) { + if (m_hiddenPages.find(w) != m_hiddenPages.end()) { return m_page->indexOf(w); } else { @@ -86,13 +86,13 @@ void KoToolBoxPalette::makeVisible(bool v) bool KoToolBoxPalette::isHidden(TQWidget * w) { - return (m_hiddenPages.tqfind(w) != m_hiddenPages.end()); + return (m_hiddenPages.find(w) != m_hiddenPages.end()); } void KoToolBoxPalette::togglePageHidden(TQWidget *w) { - if (m_hiddenPages.tqfind(w) != m_hiddenPages.end()) { - int i = *m_hiddenPages.tqfind(w); + if (m_hiddenPages.find(w) != m_hiddenPages.end()) { + int i = *m_hiddenPages.find(w); m_page->insertItem(i, w, w->caption()); show(); } @@ -109,7 +109,7 @@ void KoToolBoxPalette::togglePageHidden(TQWidget *w) void KoToolBoxPalette::hidePage( TQWidget * w) { - if (m_hiddenPages.tqfind(w) != m_hiddenPages.end()) return; + if (m_hiddenPages.find(w) != m_hiddenPages.end()) return; int i = m_page->indexOf(w); m_page->removeItem(w); m_hiddenPages[w] = i; diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp index 3c0a0940..f15cab20 100644 --- a/lib/koproperty/editor.cpp +++ b/lib/koproperty/editor.cpp @@ -250,7 +250,7 @@ Editor::fill() void Editor::addItem(const TQCString &name, EditorItem *tqparent) { - if(!d->set || !d->set->tqcontains(name)) + if(!d->set || !d->set->contains(name)) return; Property *property = &(d->set->property(name)); @@ -950,7 +950,7 @@ Editor::handleKeyPress(TQKeyEvent* ev) else if( (s==Qt::NoButton) && (k==Key_Home) ) { if (d->currentWidget && d->currentWidget->hasFocus()) return false; - //tqfind 1st visible + //find 1st visible item = firstChild(); while (item && (!item->isSelectable() || !item->isVisible())) item = item->itemBelow(); diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp index ca6fe6c7..1c0e1b72 100644 --- a/lib/koproperty/editoritem.cpp +++ b/lib/koproperty/editoritem.cpp @@ -239,7 +239,7 @@ void GroupContainer::setContents( TQWidget* contents ) bool GroupContainer::event( TQEvent * e ) { if (e->type()==TQEvent::MouseButtonPress) { TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if (me->button() == Qt::LeftButton && d->contents && TQT_TQRECT_OBJECT(d->groupWidget->rect()).tqcontains(me->pos())) { + if (me->button() == Qt::LeftButton && d->contents && TQT_TQRECT_OBJECT(d->groupWidget->rect()).contains(me->pos())) { d->groupWidget->setOpen(!d->groupWidget->isOpen()); if (d->groupWidget->isOpen()) d->contents->show(); diff --git a/lib/koproperty/editors/combobox.cpp b/lib/koproperty/editors/combobox.cpp index f1206f2d..661aa1e0 100644 --- a/lib/koproperty/editors/combobox.cpp +++ b/lib/koproperty/editors/combobox.cpp @@ -71,7 +71,7 @@ ComboBox::value() const if (idx<0 || idx>=(int)property()->listData()->keys.count()) return TQVariant(); return TQVariant( property()->listData()->keys[idx] ); -// if(property()->listData() && property()->listData()->tqcontains(m_edit->currentText())) +// if(property()->listData() && property()->listData()->contains(m_edit->currentText())) // return (*(property()->valueList()))[m_edit->currentText()]; // return TQVariant(); } @@ -85,7 +85,7 @@ ComboBox::setValue(const TQVariant &value, bool emitChange) } if (!m_setValueEnabled) return; - int idx = property()->listData()->keys.tqfindIndex( value ); + int idx = property()->listData()->keys.findIndex( value ); if (idx>=0 && idx<m_edit->count()) { m_edit->setCurrentItem(idx); } @@ -120,7 +120,7 @@ ComboBox::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, cons { TQString txt; if (property()->listData()) { - const int idx = property()->listData()->keys.tqfindIndex( value ); + const int idx = property()->listData()->keys.findIndex( value ); if (idx>=0) txt = property()->listData()->names[ idx ]; } diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp index 95cdbb9d..edc19c80 100644 --- a/lib/koproperty/editors/pixmapedit.cpp +++ b/lib/koproperty/editors/pixmapedit.cpp @@ -104,7 +104,7 @@ PixmapEdit::setValue(const TQVariant &value, bool emitChange) } else { TQImage img(m_pixmap.convertToImage()); - if (!TQRect(TQPoint(0,0), m_edit->size()*3).tqcontains(m_pixmap.rect())) { + if (!TQRect(TQPoint(0,0), m_edit->size()*3).contains(m_pixmap.rect())) { img = img.smoothScale(m_edit->size()*3, TQ_ScaleMin); m_previewPixmap.convertFromImage(img);//preview pixmap is a bit larger } diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp index c72a060d..8ae4e30a 100644 --- a/lib/koproperty/editors/spinbox.cpp +++ b/lib/koproperty/editors/spinbox.cpp @@ -291,7 +291,7 @@ DoubleEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, co } } if (valueText.isEmpty()) - valueText = TQString(value.toString()).tqreplace('.', KGlobal::locale()->decimalSymbol()); + valueText = TQString(value.toString()).replace('.', KGlobal::locale()->decimalSymbol()); Widget::drawViewer(p, cg, r, valueText); // p->eraseRect(r); diff --git a/lib/koproperty/factory.cpp b/lib/koproperty/factory.cpp index a042ca28..864d4895 100644 --- a/lib/koproperty/factory.cpp +++ b/lib/koproperty/factory.cpp @@ -104,10 +104,10 @@ FactoryManager::registerFactoryForEditor(int editorType, CustomPropertyFactory * { if(!widgetFactory) return; - if(d->registeredWidgets.tqfind(editorType)) + if(d->registeredWidgets.find(editorType)) kopropertywarn << "FactoryManager::registerFactoryForEditor(): " "Overriding already registered custom widget type \"" << editorType << "\"" << endl; - d->registeredWidgets.tqreplace(editorType, widgetFactory); + d->registeredWidgets.replace(editorType, widgetFactory); } void @@ -121,7 +121,7 @@ FactoryManager::registerFactoryForEditors(const TQValueList<int> &editorTypes, C CustomPropertyFactory * FactoryManager::factoryForEditorType(int type) { - return d->registeredWidgets.tqfind(type); + return d->registeredWidgets.find(type); } Widget* @@ -132,7 +132,7 @@ FactoryManager::createWidgetForProperty(Property *property) const int type = property->type(); - CustomPropertyFactory *factory = d->registeredWidgets.tqfind(type); + CustomPropertyFactory *factory = d->registeredWidgets.find(type); if (factory) return factory->createCustomWidget(property); @@ -224,11 +224,11 @@ FactoryManager::registerFactoryForProperty(int propertyType, CustomPropertyFacto { if(!factory) return; - if(d->registeredCustomProperties.tqfind(propertyType)) + if(d->registeredCustomProperties.find(propertyType)) kopropertywarn << "FactoryManager::registerFactoryForProperty(): " "Overriding already registered custom property type \"" << propertyType << "\"" << endl; - d->registeredCustomProperties.tqreplace(propertyType, factory); + d->registeredCustomProperties.replace(propertyType, factory); } void @@ -244,7 +244,7 @@ CustomProperty* FactoryManager::createCustomProperty(Property *tqparent) { const int type = tqparent->type(); - CustomPropertyFactory *factory = d->registeredWidgets.tqfind(type); + CustomPropertyFactory *factory = d->registeredWidgets.find(type); if (factory) return factory->createCustomProperty(tqparent); diff --git a/lib/koproperty/property.cpp b/lib/koproperty/property.cpp index 87d12a6d..0add7b91 100644 --- a/lib/koproperty/property.cpp +++ b/lib/koproperty/property.cpp @@ -529,7 +529,7 @@ Property::setOption(const char* name, const TQVariant& val) TQVariant Property::option(const char* name) const { - if (d->options.tqcontains(name)) + if (d->options.contains(name)) return d->options[name]; return TQVariant(); } @@ -685,7 +685,7 @@ Property::addSet(Set *set) } if ((Set*)d->set==set) return; - TQGuardedPtr<Set> *pset = d->sets ? d->sets->tqfind(set) : 0; + TQGuardedPtr<Set> *pset = d->sets ? d->sets->find(set) : 0; if (pset && (Set*)*pset == set) return; if (!d->sets) { @@ -693,7 +693,7 @@ Property::addSet(Set *set) d->sets->setAutoDelete(true); } - d->sets->tqreplace(set, new TQGuardedPtr<Set>( set )); + d->sets->replace(set, new TQGuardedPtr<Set>( set )); // TQValueList<Set*>::iterator it = tqFind( d->sets.begin(), d->sets.end(), set); // if(it == d->sets.end()) // not in our list diff --git a/lib/koproperty/set.cpp b/lib/koproperty/set.cpp index 3193a50f..d508fc0a 100644 --- a/lib/koproperty/set.cpp +++ b/lib/koproperty/set.cpp @@ -73,7 +73,7 @@ class SetPrivate inline KoProperty::Property& property(const TQCString &name) const { - KoProperty::Property *p = dict.tqfind(name); + KoProperty::Property *p = dict.find(name); if (p) return *p; Set_nonConstNull.setName(0); //to ensure returned property is null @@ -178,7 +178,7 @@ Set::addPropertyInternal(Property *property, TQCString group, bool updateSorting return; } - Property *p = d->dict.tqfind(property->name()); + Property *p = d->dict.find(property->name()); if(p) { p->addRelatedProperty(property); } @@ -218,7 +218,7 @@ Set::removeProperty(const TQCString &name) if(name.isNull()) return; - Property *p = d->dict.tqfind(name); + Property *p = d->dict.find(name); removeProperty(p); } @@ -255,10 +255,10 @@ Set::addToGroup(const TQCString &group, Property *property) return; //do not add the same property to the group twice - if(d->groupForProperty.tqcontains(property) && (d->groupForProperty[property] == group)) + if(d->groupForProperty.contains(property) && (d->groupForProperty[property] == group)) return; - if(!d->propertiesOfGroup.tqcontains(group)) { // group doesn't exist + if(!d->propertiesOfGroup.contains(group)) { // group doesn't exist TQValueList<TQCString> l; l.append(property->name()); d->propertiesOfGroup.insert(group, l); @@ -280,7 +280,7 @@ Set::removeFromGroup(Property *property) if (d->propertiesOfGroup[group].isEmpty()) { //remove group as well d->propertiesOfGroup.remove(group); - TQValueListIterator<TQCString> it = d->groupNames.tqfind(group); + TQValueListIterator<TQCString> it = d->groupNames.find(group); if (it != d->groupNames.end()) { d->groupNames.remove(it); } @@ -309,7 +309,7 @@ Set::setGroupDescription(const TQCString &group, const TQString& desc) TQString Set::groupDescription(const TQCString &group) const { - if(d->groupDescriptions.tqcontains(group)) + if(d->groupDescriptions.contains(group)) return d->groupDescriptions[group]; return group; } @@ -353,9 +353,9 @@ Set::setReadOnly(bool readOnly) } bool -Set::tqcontains(const TQCString &name) const +Set::contains(const TQCString &name) const { - return d->dict.tqfind(name); + return d->dict.find(name); } Property& @@ -497,7 +497,7 @@ void Buffer::intersectedChanged(KoProperty::Set& set, KoProperty::Property& prop { Q_UNUSED(set); TQCString propertyName = prop.name(); - if ( !tqcontains( propertyName ) ) + if ( !contains( propertyName ) ) return; const TQValueList<Property*> *props = prop.related(); @@ -511,7 +511,7 @@ void Buffer::intersectedReset(KoProperty::Set& set, KoProperty::Property& prop) { Q_UNUSED(set); TQCString propertyName = prop.name(); - if ( !tqcontains( propertyName ) ) + if ( !contains( propertyName ) ) return; const TQValueList<Property*> *props = prop.related(); diff --git a/lib/koproperty/set.h b/lib/koproperty/set.h index 567bcdad..9004c2c4 100644 --- a/lib/koproperty/set.h +++ b/lib/koproperty/set.h @@ -107,7 +107,7 @@ class KOPROPERTY_EXPORT Set : public TQObject void setReadOnly(bool readOnly); /*! \return true if the set contains property names \a name. */ - bool tqcontains(const TQCString &name) const; + bool contains(const TQCString &name) const; /*! \return property named with \a name. If no such property is found, null property (Property::null) is returned. */ @@ -116,12 +116,12 @@ class KOPROPERTY_EXPORT Set : public TQObject /*! Accesses a property by it's name. Property reference is returned, so all property modifications are allowed. If there is no such property, null property is returned, - so it's good practice to use tqcontains() is you're unsure if the property exists. + so it's good practice to use contains() is you're unsure if the property exists. For example, to set a value of a property, use: /code Set set; ... - if (!set.tqcontains("myProperty")) { + if (!set.contains("myProperty")) { dosomething; } set["myProperty"].setValue("My Value"); diff --git a/lib/kotext/DateFormatWidget.cpp b/lib/kotext/DateFormatWidget.cpp index bff1f86c..0c1b3575 100644 --- a/lib/kotext/DateFormatWidget.cpp +++ b/lib/kotext/DateFormatWidget.cpp @@ -155,7 +155,7 @@ TQString DateFormatWidget::resultString() { const TQString lookup(combo1->currentText()); const TQStringList listTranslated( KoVariableDateFormat::staticTranslatedFormatPropsList() ); - const int index = listTranslated.tqfindIndex(lookup); + const int index = listTranslated.findIndex(lookup); if (index==-1) return (lookup); // Either costum or non-locale diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/KFontDialog_local.cpp index bcbdde6b..6dbb498f 100644 --- a/lib/kotext/KFontDialog_local.cpp +++ b/lib/kotext/KFontDialog_local.cpp @@ -287,7 +287,7 @@ KFontChooser_local::KFontChooser_local(TQWidget *tqparent, const char *name, connect( sizeListBox, TQT_SIGNAL(highlighted(const TQString&)), TQT_SLOT(size_chosen_slot(const TQString&)) ); - sizeListBox->setSelected(sizeListBox->tqfindItem(TQString::number(10)), true); // default to 10pt. + sizeListBox->setSelected(sizeListBox->findItem(TQString::number(10)), true); // default to 10pt. row ++; @@ -478,13 +478,13 @@ void KFontChooser_local::family_chosen_slot(const TQString& family) currentStyles.clear(); for ( TQStringList::Iterator it = styles.begin(); it != styles.end(); ++it ) { TQString style = *it; - int pos = style.tqfind("Plain"); - if(pos >=0) style = style.tqreplace(pos,5,i18n("Regular")); - pos = style.tqfind("Normal"); - if(pos >=0) style = style.tqreplace(pos,6,i18n("Regular")); - pos = style.tqfind("Oblique"); - if(pos >=0) style = style.tqreplace(pos,7,i18n("Italic")); - if(!styleListBox->tqfindItem(style)) { + int pos = style.find("Plain"); + if(pos >=0) style = style.replace(pos,5,i18n("Regular")); + pos = style.find("Normal"); + if(pos >=0) style = style.replace(pos,6,i18n("Regular")); + pos = style.find("Oblique"); + if(pos >=0) style = style.replace(pos,7,i18n("Italic")); + if(!styleListBox->findItem(style)) { styleListBox->insertItem(i18n(style.utf8())); currentStyles.insert(i18n(style.utf8()), *it); } @@ -495,9 +495,9 @@ void KFontChooser_local::family_chosen_slot(const TQString& family) } styleListBox->blockSignals(true); - TQListBoxItem *item = styleListBox->tqfindItem(selectedStyle); + TQListBoxItem *item = styleListBox->findItem(selectedStyle); if (item) - styleListBox->setSelected(styleListBox->tqfindItem(selectedStyle), true); + styleListBox->setSelected(styleListBox->findItem(selectedStyle), true); else styleListBox->setSelected(0, true); styleListBox->blockSignals(false); @@ -551,7 +551,7 @@ void KFontChooser_local::style_chosen_slot(const TQString& style) fillSizeList(); } sizeListBox->blockSignals(true); - sizeListBox->setSelected(sizeListBox->tqfindItem(TQString::number(selectedSize)), true); + sizeListBox->setSelected(sizeListBox->findItem(TQString::number(selectedSize)), true); sizeListBox->blockSignals(false); sizeListBox->ensureCurrentVisible(); @@ -598,9 +598,9 @@ void KFontChooser_local::setupDisplay() // 1st Fallback if ( (i == numEntries) ) { - if (family.tqcontains('[')) + if (family.contains('[')) { - family = family.left(family.tqfind('[')).stripWhiteSpace(); + family = family.left(family.find('[')).stripWhiteSpace(); for (i = 0; i < numEntries; i++) { if (family == familyListBox->text(i).lower()) { familyListBox->setCurrentItem(i); @@ -697,10 +697,10 @@ void KFontChooser_local::addFont( TQStringList &list, const char *xfont ) TQString font = TQString::tqfromLatin1(ptr + 1); int pos; - if ( ( pos = font.tqfind( '-' ) ) > 0 ) { + if ( ( pos = font.find( '-' ) ) > 0 ) { font.truncate( pos ); - if ( font.tqfind( TQString::tqfromLatin1("open look"), 0, false ) >= 0 ) + if ( font.find( TQString::tqfromLatin1("open look"), 0, false ) >= 0 ) return; TQStringList::Iterator it = list.begin(); diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp index b6529b8f..dfe6c6df 100644 --- a/lib/kotext/KoAutoFormat.cpp +++ b/lib/kotext/KoAutoFormat.cpp @@ -75,8 +75,8 @@ void KoCompletionBox::setLastWord( TQString const &lastword) m_lastWord = lastword; } -KoAutoFormatEntry::KoAutoFormatEntry(const TQString& tqreplace) - : m_tqreplace( tqreplace ) +KoAutoFormatEntry::KoAutoFormatEntry(const TQString& replace) + : m_replace( replace ) { m_formatOptions= 0L; } @@ -296,11 +296,11 @@ void KoAutoFormat::readConfig(bool force) TQString beginDoubleQuote = config->readEntry( "TypographicQuotesBegin" ); TQString endDoubleQuote = config->readEntry( "TypographicQuotesEnd" ); - m_typographicDoubleQuotes.tqreplace = config->readBoolEntry( "TypographicQuotesEnabled", false ); + m_typographicDoubleQuotes.replace = config->readBoolEntry( "TypographicQuotesEnabled", false ); TQString begin = config->readEntry( "TypographicSimpleQuotesBegin" ); TQString end = config->readEntry( "TypographicSimpleQuotesEnd" ); - m_typographicSimpleQuotes.tqreplace = config->readBoolEntry( "TypographicSimpleQuotesEnabled", false ); + m_typographicSimpleQuotes.replace = config->readBoolEntry( "TypographicSimpleQuotesEnabled", false ); m_bAutoSuperScript = config->readBoolEntry( "AutoSuperScript", true ); @@ -352,7 +352,7 @@ void KoAutoFormat::readConfig(bool force) else m_typographicDoubleQuotes.end = endDoubleQuote[0]; - m_typographicDoubleQuotes.tqreplace = m_typographicDoubleQuotes.tqreplace + m_typographicDoubleQuotes.replace = m_typographicDoubleQuotes.replace && !m_typographicDoubleQuotes.begin.isNull() && !m_typographicDoubleQuotes.end.isNull(); @@ -377,7 +377,7 @@ void KoAutoFormat::readConfig(bool force) else m_typographicSimpleQuotes.end = end[0]; - m_typographicSimpleQuotes.tqreplace = m_typographicSimpleQuotes.tqreplace + m_typographicSimpleQuotes.replace = m_typographicSimpleQuotes.replace && !m_typographicSimpleQuotes.end.isNull() && !m_typographicSimpleQuotes.begin.isNull(); @@ -404,7 +404,7 @@ void KoAutoFormat::readAutoCorrectConfig() { if ( fname.isEmpty() && !kdelang.isEmpty() ) fname = locate( "data", "koffice/autocorrect/" + kdelang + ".xml", m_doc->instance() ); - if ( fname.isEmpty() && kdelang.tqcontains("_") ) + if ( fname.isEmpty() && kdelang.contains("_") ) { kdelang.remove( TQRegExp( "_.*" ) ); fname = locate( "data", "koffice/autocorrect/" + kdelang + ".xml", m_doc->instance() ); @@ -456,7 +456,7 @@ void KoAutoFormat::readAutoCorrectConfig() for(uint i = 0; i < nl.count() ; i++) { //bug in qmap we overwrite = false doesn't work //so we can't add multiple "othernb" - m_superScriptEntries.insert( nl.item(i).toElement().attribute("tqfind"), KoAutoFormatEntry(nl.item(i).toElement().attribute("super")),FALSE ); + m_superScriptEntries.insert( nl.item(i).toElement().attribute("find"), KoAutoFormatEntry(nl.item(i).toElement().attribute("super")),FALSE ); } } @@ -527,7 +527,7 @@ void KoAutoFormat::loadAutoCorrection( const TQDomElement & _de, bool _allLangua void KoAutoFormat::loadEntry( const TQDomElement &nl, bool _allLanguages) { - KoAutoFormatEntry *tmp =new KoAutoFormatEntry(nl.attribute("tqreplace")); + KoAutoFormatEntry *tmp =new KoAutoFormatEntry(nl.attribute("replace")); if ( nl.hasAttribute("FONT")) { tmp->createNewEntryContext(); @@ -607,9 +607,9 @@ void KoAutoFormat::loadEntry( const TQDomElement &nl, bool _allLanguages) tmp->formatEntryContext()->m_backGroundColor = col; } if ( !_allLanguages ) - m_entries.insert( nl.attribute("tqfind"), tmp ); + m_entries.insert( nl.attribute("find"), tmp ); else - m_allLanguages.insert( nl.attribute("tqfind"), tmp ); + m_allLanguages.insert( nl.attribute("find"), tmp ); } @@ -628,10 +628,10 @@ void KoAutoFormat::saveConfig() config->writeEntry( "TypographicQuotesBegin", TQString( m_typographicDoubleQuotes.begin ) ); config->writeEntry( "TypographicQuotesEnd", TQString( m_typographicDoubleQuotes.end ) ); - config->writeEntry( "TypographicQuotesEnabled", m_typographicDoubleQuotes.tqreplace ); + config->writeEntry( "TypographicQuotesEnabled", m_typographicDoubleQuotes.replace ); config->writeEntry( "TypographicSimpleQuotesBegin", TQString( m_typographicSimpleQuotes.begin ) ); config->writeEntry( "TypographicSimpleQuotesEnd", TQString( m_typographicSimpleQuotes.end ) ); - config->writeEntry( "TypographicSimpleQuotesEnabled", m_typographicSimpleQuotes.tqreplace ); + config->writeEntry( "TypographicSimpleQuotesEnabled", m_typographicSimpleQuotes.replace ); config->writeEntry( "AdvancedAutocorrect", m_advancedAutoCorrect ); config->writeEntry( "AutoCorrectionWithFormat", m_bAutoCorrectionWithFormat ); @@ -709,8 +709,8 @@ void KoAutoFormat::saveConfig() for ( ; it2 != m_superScriptEntries.end() ; ++it2 ) { data = doc.createElement("superscript"); - data.setAttribute("tqfind", it2.key()); - data.setAttribute("super", it2.data().tqreplace()); + data.setAttribute("find", it2.key()); + data.setAttribute("super", it2.data().replace()); super.appendChild(data); } begin.appendChild(super); @@ -751,8 +751,8 @@ TQDomElement KoAutoFormat::saveEntry( TQDictIterator<KoAutoFormatEntry> _entry, { TQDomElement data; data = doc.createElement("item"); - data.setAttribute("tqfind", _entry.currentKey()); - data.setAttribute("tqreplace", _entry.current()->tqreplace()); + data.setAttribute("find", _entry.currentKey()); + data.setAttribute("replace", _entry.current()->replace()); if ( _entry.current()->formatEntryContext() ) { KoSearchContext *tmp = _entry.current()->formatEntryContext(); @@ -847,16 +847,16 @@ TQDomElement KoAutoFormat::saveEntry( TQDictIterator<KoAutoFormatEntry> _entry, return data; } -void KoAutoFormat::addAutoFormatEntry( const TQString &key, const TQString &tqreplace ) +void KoAutoFormat::addAutoFormatEntry( const TQString &key, const TQString &replace ) { - KoAutoFormatEntry *findEntry = m_entries.tqfind( key); + KoAutoFormatEntry *findEntry = m_entries.find( key); if ( findEntry ) { - if ( findEntry->tqreplace().lower() == tqreplace.lower() ) + if ( findEntry->replace().lower() == replace.lower() ) return; } - KoAutoFormatEntry *tmp = new KoAutoFormatEntry( tqreplace ); + KoAutoFormatEntry *tmp = new KoAutoFormatEntry( replace ); m_entries.insert( key, tmp ); saveConfig(); buildMaxLen(); @@ -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.tqfind(*it) == new_wordlist.end() ) //the completion words that begin with lastWord + if ( (*it).tqstartsWith( lastWord, false ) && new_wordlist.find(*it) == new_wordlist.end() ) //the completion words that begin with lastWord { if ( (*it).length() > maxlength ) maxlength = (*it).length(); @@ -1092,8 +1092,8 @@ void KoAutoFormat::autoFormatIsActive() m_autoReplaceNumber || m_autoChangeFormat || m_completion || - m_typographicDoubleQuotes.tqreplace || - m_typographicSimpleQuotes.tqreplace || + m_typographicDoubleQuotes.replace || + m_typographicSimpleQuotes.replace || m_entries.count()!=0 || m_allLanguages.count()!=0; } @@ -1323,13 +1323,13 @@ void KoAutoFormat::doAutoFormat( KoTextCursor* textEditCursor, KoTextParag *para } else { - if ( ch == '"' && m_typographicDoubleQuotes.tqreplace ) + if ( ch == '"' && m_typographicDoubleQuotes.replace ) { KCommand *cmd = doTypographicQuotes( textEditCursor, parag, index, txtObj, true /*double quote*/ ); if ( cmd ) txtObj->emitNewCommand( cmd ); } - else if ( ch == '\'' && m_typographicDoubleQuotes.tqreplace ) + else if ( ch == '\'' && m_typographicDoubleQuotes.replace ) { KCommand *cmd = doTypographicQuotes( textEditCursor, parag, index, txtObj, false /* simple quote*/ ); if ( cmd ) @@ -1400,10 +1400,10 @@ KCommand *KoAutoFormat::autoFormatWord( KoTextCursor* textEditCursor, KoTextPara cursor.setIndex( start + length ); textdoc->setSelectionEnd( KoTextDocument::HighlightSelection, &cursor ); KCommand *cmd = 0L; - kdDebug()<<"it->tqreplace() :"<<it->tqreplace()<<endl; + kdDebug()<<"it->replace() :"<<it->replace()<<endl; if (!it->formatEntryContext() || !m_bAutoCorrectionWithFormat) { - cmd = txtObj->replaceSelectionCommand( textEditCursor, it->tqreplace(), + cmd = txtObj->replaceSelectionCommand( textEditCursor, it->replace(), i18n("Autocorrect Word"), KoTextDocument::HighlightSelection ); } @@ -1414,7 +1414,7 @@ KCommand *KoAutoFormat::autoFormatWord( KoTextCursor* textEditCursor, KoTextPara KoTextFormat * newFormat = new KoTextFormat(*lastFormat); changeTextFormat(it->formatEntryContext(), newFormat, flags ); KMacroCommand *macro = new KMacroCommand( i18n("Autocorrect Word with Format")); - KCommand *cmd2=txtObj->replaceSelectionCommand( textEditCursor, it->tqreplace(), + KCommand *cmd2=txtObj->replaceSelectionCommand( textEditCursor, it->replace(), i18n("Autocorrect Word"), KoTextDocument::HighlightSelection ); if ( cmd2 ) @@ -1423,13 +1423,13 @@ KCommand *KoAutoFormat::autoFormatWord( KoTextCursor* textEditCursor, KoTextPara cursor.setParag( parag ); cursor.setIndex( start ); textdoc->setSelectionStart( KoTextDocument::HighlightSelection, &cursor ); - cursor.setIndex( start + it->tqreplace().length()/*+ length + 1*/ ); + cursor.setIndex( start + it->replace().length()/*+ length + 1*/ ); textdoc->setSelectionEnd( KoTextDocument::HighlightSelection, &cursor ); cmd2 =txtObj->setFormatCommand( textEditCursor, &lastFormat, newFormat, flags, false, KoTextDocument::HighlightSelection ); macro->addCommand( cmd2); - index = index - length + it->tqreplace().length(); + index = index - length + it->replace().length(); textEditCursor->setIndex(index+1); cmd2 =txtObj->setFormatCommand( textEditCursor, &newFormat, lastFormat, 0 ); macro->addCommand( cmd2); @@ -1448,7 +1448,7 @@ KCommand *KoAutoFormat::autoFormatWord( KoTextCursor* textEditCursor, KoTextPara txtObj->emitHideCursor(); textEditCursor->gotoRight(); txtObj->emitShowCursor(); - index = index - length + it->tqreplace().length(); + index = index - length + it->replace().length(); return cmd; } } @@ -1557,7 +1557,7 @@ KCommand * KoAutoFormat::doUpperCase( KoTextCursor *textEditCursor, KoTextParag // Go back over any space/tab/CR while ( backCursor.index() > 0 || backCursor.parag()->prev() ) { - beginningOfSentence = false; // we could go back -> false unless we'll tqfind '.' + beginningOfSentence = false; // we could go back -> false unless we'll find '.' backCursor.gotoLeft(); if ( !backCursor.parag()->at( backCursor.index() )->c.isSpace() ) break; @@ -1578,7 +1578,7 @@ KCommand * KoAutoFormat::doUpperCase( KoTextCursor *textEditCursor, KoTextParag + punct; kdDebug() << "text: " << text << endl; // text has the word at the end of the 'sentence', including the termination. Example: "Mr." - beginningOfSentence = (m_upperCaseExceptions.tqfindIndex(text)==-1); // Ok if we can't find it + beginningOfSentence = (m_upperCaseExceptions.findIndex(text)==-1); // Ok if we can't find it } if ( beginningOfSentence ) @@ -1605,7 +1605,7 @@ KCommand * KoAutoFormat::doUpperCase( KoTextCursor *textEditCursor, KoTextParag // Check next letter - we still want to be able to write fully uppercase words... backCursor.setIndex( backCursor.index() + 1 ); TQChar thirdChar = backCursor.parag()->at( backCursor.index() )->c; - if ( isLower( thirdChar ) && (m_twoUpperLetterException.tqfindIndex(word)==-1)) + if ( isLower( thirdChar ) && (m_twoUpperLetterException.findIndex(word)==-1)) { // Ok, convert KoTextCursor cursor( parag->document() ); @@ -1681,13 +1681,13 @@ void KoAutoFormat::detectStartOfLink(KoTextParag * parag, int const index, bool word.append( s->at( i ).c ); } - if (word.tqfind("http")!=-1 || word.tqfind("https")!=-1 || word.tqfind("mailto")!=-1 || word.tqfind("ftp")!=-1 || word.tqfind("file")!=-1 - || word.tqfind("news")!=-1 || word.tqfind('@')!=-1) + if (word.find("http")!=-1 || word.find("https")!=-1 || word.find("mailto")!=-1 || word.find("ftp")!=-1 || word.find("file")!=-1 + || word.find("news")!=-1 || word.find('@')!=-1) m_ignoreUpperCase=true; else { - int const tmp_pos=word.tqfind("www."); - if (tmp_pos!=-1 && (word.tqfind('.',tmp_pos+4)!=-1 || insertedDot) ) + int const tmp_pos=word.find("www."); + if (tmp_pos!=-1 && (word.find('.',tmp_pos+4)!=-1 || insertedDot) ) m_ignoreUpperCase=true; } } @@ -1696,35 +1696,35 @@ void KoAutoFormat::doAutoDetectUrl( KoTextCursor *textEditCursor, KoTextParag *p { kdDebug() << "link:" << word << endl; char link_type = 0; - int pos = word.tqfind("http://"); - int tmp_pos = word.tqfind("https://"); + int pos = word.find("http://"); + int tmp_pos = word.find("https://"); if(tmp_pos<pos && tmp_pos!=-1) pos = tmp_pos; - tmp_pos = word.tqfind("mailto:/"); + tmp_pos = word.find("mailto:/"); if((tmp_pos<pos || pos==-1 ) && tmp_pos!=-1) pos = tmp_pos; - tmp_pos = word.tqfind("ftp://"); + tmp_pos = word.find("ftp://"); if((tmp_pos<pos || pos==-1 ) && tmp_pos!=-1) pos = tmp_pos; - tmp_pos = word.tqfind("ftp."); + tmp_pos = word.find("ftp."); if((tmp_pos<pos || pos==-1 ) && tmp_pos!=-1) { pos = tmp_pos; link_type = 3; } - tmp_pos = word.tqfind("file:/"); + tmp_pos = word.find("file:/"); if((tmp_pos<pos || pos==-1 ) && tmp_pos!=-1) pos = tmp_pos; - tmp_pos = word.tqfind("news:"); + tmp_pos = word.find("news:"); if((tmp_pos<pos || pos==-1 ) && tmp_pos!=-1) pos = tmp_pos; - tmp_pos = word.tqfind("www."); - if((tmp_pos<pos || pos==-1 ) && tmp_pos!=-1 && word.tqfind('.',tmp_pos+4)!=-1 ) + tmp_pos = word.find("www."); + if((tmp_pos<pos || pos==-1 ) && tmp_pos!=-1 && word.find('.',tmp_pos+4)!=-1 ) { pos = tmp_pos; link_type = 2; } - tmp_pos = word.tqfind('@'); + tmp_pos = word.find('@'); if ( pos == -1 && tmp_pos != -1 ) { pos = tmp_pos-1; @@ -1821,7 +1821,7 @@ void KoAutoFormat::doAutoIncludeUpperUpper(KoTextCursor* /*textEditCursor*/, KoT } if( word.length() > 2 && word.left(2)==word.left(2).upper() && word.tqat(3)!=word.tqat(3).upper() ) { - if ( m_twoUpperLetterException.tqfindIndex(word )==-1) + if ( m_twoUpperLetterException.findIndex(word )==-1) m_twoUpperLetterException.append( word); } i+=word.length(); @@ -1858,7 +1858,7 @@ void KoAutoFormat::doAutoIncludeAbbreviation(KoTextCursor* /*textEditCursor*/, K } if( word.length()>1 && !wordAfter.isEmpty() && wordAfter.tqat(0)==wordAfter.tqat(0).lower()) { - if ( m_upperCaseExceptions.tqfindIndex(word )==-1) + if ( m_upperCaseExceptions.findIndex(word )==-1) m_upperCaseExceptions.append( word ); } } @@ -2151,7 +2151,7 @@ KCommand *KoAutoFormat::doCapitalizeNameOfDays( KoTextCursor* textEditCursor, Ko { //m_cacheNameOfDays //todo - int pos = m_cacheNameOfDays.tqfindIndex( word.lower() ); + int pos = m_cacheNameOfDays.findIndex( word.lower() ); if ( pos == -1 ) return 0L; KoTextDocument * textdoc = parag->textDocument(); @@ -2183,19 +2183,19 @@ KCommand *KoAutoFormat::doAutoSuperScript( KoTextCursor* textEditCursor, KoTextP { KoAutoFormatEntryMap::Iterator it = m_superScriptEntries.begin(); bool found = false; - TQString tqreplace; + TQString replace; for ( ; it != m_superScriptEntries.end() ; ++it ) { if( it.key()==word) { - tqreplace = it.data().tqreplace(); + replace = it.data().replace(); found = true; break; } else if ( it.key()=="othernb") { - TQString tmp = it.data().tqreplace(); - int pos = word.tqfind( tmp ); + TQString tmp = it.data().replace(); + int pos = word.find( tmp ); if( pos != -1) { if( pos + tmp.length() == word.length()) @@ -2204,7 +2204,7 @@ KCommand *KoAutoFormat::doAutoSuperScript( KoTextCursor* textEditCursor, KoTextP word.left( pos ).toInt( &ok); if( ok ) { - tqreplace = tmp; + replace = tmp; found = true; break; } @@ -2216,7 +2216,7 @@ KCommand *KoAutoFormat::doAutoSuperScript( KoTextCursor* textEditCursor, KoTextP { KoTextDocument * textdoc = parag->textDocument(); - int start = index - tqreplace.length(); + int start = index - replace.length(); KoTextFormat * lastFormat = parag->at( start )->format(); KoTextFormat * newFormat = new KoTextFormat(*lastFormat); KoTextCursor cursor( parag->document() ); diff --git a/lib/kotext/KoAutoFormat.h b/lib/kotext/KoAutoFormat.h index 4f59fbaa..8f4199a2 100644 --- a/lib/kotext/KoAutoFormat.h +++ b/lib/kotext/KoAutoFormat.h @@ -72,11 +72,11 @@ class KoAutoFormatEntry { public: // The text to find is actually the key in KWAutoFormat's map. - // What we replace it with is tqreplace(). - KoAutoFormatEntry(const TQString& tqreplace = TQString()); + // What we replace it with is replace(). + KoAutoFormatEntry(const TQString& replace = TQString()); ~KoAutoFormatEntry(); - TQString tqreplace() const { return m_tqreplace; } - void changeReplace(const TQString & rep){ m_tqreplace = rep; } + TQString replace() const { return m_replace; } + void changeReplace(const TQString & rep){ m_replace = rep; } KoSearchContext *formatEntryContext()const; void createNewEntryContext(); @@ -84,7 +84,7 @@ public: void clearFormatEntryContext( ); protected: - TQString m_tqreplace; + TQString m_replace; // For formatting in the replacement - not implemented yet KoSearchContext *m_formatOptions; }; @@ -145,7 +145,7 @@ public: struct TypographicQuotes { TQChar begin, end; - bool tqreplace; // aka enabled + bool replace; // aka enabled }; // Configuration (on/off/settings). Called by the dialog. @@ -289,7 +289,7 @@ public: buildMaxLen(); } - void addAutoFormatEntry( const TQString &key, const TQString &tqreplace ); + void addAutoFormatEntry( const TQString &key, const TQString &replace ); void removeAutoFormatEntry( const TQString &key ) { diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp index 6a602c92..90b1a97d 100644 --- a/lib/kotext/KoAutoFormatDia.cpp +++ b/lib/kotext/KoAutoFormatDia.cpp @@ -114,7 +114,7 @@ void KoAutoFormatExceptionWidget::slotAddException() { if(text.at(text.length()-1)!='.' && m_bAbbreviation) text=text+"."; - if( m_listException.tqfindIndex( text )==-1) + if( m_listException.findIndex( text )==-1) { m_listException<<text; @@ -468,13 +468,13 @@ void KoAutoFormatDia::setupTab2() void KoAutoFormatDia::initTab2() { - bool state=m_autoFormat.getConfigTypographicDoubleQuotes().tqreplace; + bool state=m_autoFormat.getConfigTypographicDoubleQuotes().replace; cbTypographicDoubleQuotes->setChecked( state ); pbDoubleQuote1->setText( oDoubleBegin ); pbDoubleQuote2->setText(oDoubleEnd ); slotChangeStateDouble(state); - state=m_autoFormat.getConfigTypographicSimpleQuotes().tqreplace; + state=m_autoFormat.getConfigTypographicSimpleQuotes().replace; cbTypographicSimpleQuotes->setChecked( state ); pbSimpleQuote1->setText( oSimpleBegin ); pbSimpleQuote2->setText(oSimpleEnd ); @@ -510,7 +510,7 @@ void KoAutoFormatDia::setupTab3() tmp =dir.entryList (TQDir::Files); for ( TQStringList::Iterator it = tmp.begin(); it != tmp.end(); ++it ) { - if ( !(*it).tqcontains("autocorrect")) + if ( !(*it).contains("autocorrect")) { TQString readableName = KGlobal::locale()->twoAlphaToCountryName((*it).left((*it).length()-4)); TQString tmp; @@ -542,14 +542,14 @@ void KoAutoFormatDia::setupTab3() lblFind = new TQLabel( i18n( "&Find:" ), tab3 ); grid->addWidget( lblFind, 3, 0 ); - m_tqfind = new KoAutoFormatLineEdit( tab3 ); - grid->addWidget( m_tqfind, 3, 1 ); + m_find = new KoAutoFormatLineEdit( tab3 ); + grid->addWidget( m_find, 3, 1 ); - lblFind->setBuddy( m_tqfind ); + lblFind->setBuddy( m_find ); - connect( m_tqfind, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( slottqfind( const TQString & ) ) ); - connect( m_tqfind, TQT_SIGNAL( keyReturnPressed() ), + connect( m_find, TQT_SIGNAL( textChanged( const TQString & ) ), + TQT_SLOT( slotfind( const TQString & ) ) ); + connect( m_find, TQT_SIGNAL( keyReturnPressed() ), TQT_SLOT( slotAddEntry())); pbSpecialChar1 = new TQPushButton( "...", tab3 ); @@ -562,14 +562,14 @@ void KoAutoFormatDia::setupTab3() lblReplace = new TQLabel( i18n( "&Replace:" ), tab3 ); grid->addWidget( lblReplace, 3, 3 ); - m_tqreplace = new KoAutoFormatLineEdit( tab3 ); - grid->addWidget( m_tqreplace, 3, 4 ); + m_replace = new KoAutoFormatLineEdit( tab3 ); + grid->addWidget( m_replace, 3, 4 ); - lblReplace->setBuddy( m_tqreplace ); + lblReplace->setBuddy( m_replace ); - connect( m_tqreplace, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( slottqfind2( const TQString & ) ) ); - connect( m_tqreplace, TQT_SIGNAL( keyReturnPressed() ), + connect( m_replace, TQT_SIGNAL( textChanged( const TQString & ) ), + TQT_SLOT( slotfind2( const TQString & ) ) ); + connect( m_replace, TQT_SIGNAL( keyReturnPressed() ), TQT_SLOT( slotAddEntry())); pbSpecialChar2 = new TQPushButton( "...", tab3 ); @@ -655,7 +655,7 @@ void KoAutoFormatDia::initTab3() TQDictIterator<KoAutoFormatEntry> it( m_docAutoFormat->getAutoFormatEntries()); for( ; it.current(); ++it ) { - ( void )new TQListViewItem( m_pListView, it.currentKey(), it.current()->tqreplace() ); + ( void )new TQListViewItem( m_pListView, it.currentKey(), it.current()->replace() ); } } @@ -665,12 +665,12 @@ void KoAutoFormatDia::slotChangeAdvancedAutoCorrection() cbAutoCorrectionWithFormat->setEnabled( state ); pbSpecialChar2->setEnabled( state ); pbSpecialChar1->setEnabled( state ); - m_tqreplace->setEnabled( state); - m_tqfind->setEnabled( state); + m_replace->setEnabled( state); + m_find->setEnabled( state); m_pListView->setEnabled( state); - state = state && !m_tqreplace->text().isEmpty() && !m_tqfind->text().isEmpty(); - KoAutoFormatEntry * entry=m_docAutoFormat->findFormatEntry(m_tqfind->text()); + state = state && !m_replace->text().isEmpty() && !m_find->text().isEmpty(); + KoAutoFormatEntry * entry=m_docAutoFormat->findFormatEntry(m_find->text()); pbRemove->setEnabled(state && entry); pbChangeFormat->setEnabled(state && entry); pbClearFormat->setEnabled(state && entry); @@ -684,7 +684,7 @@ void KoAutoFormatDia::changeAutoformatLanguage(const TQString & text) m_docAutoFormat->configAutoFormatLanguage( TQString()); else { - m_docAutoFormat->configAutoFormatLanguage( exceptionLanguageName.tqfind(text).data()); + m_docAutoFormat->configAutoFormatLanguage( exceptionLanguageName.find(text).data()); } if ( !noSignal ) { @@ -765,10 +765,10 @@ void KoAutoFormatDia::slotChangeTextFormatEntry() KoAutoFormatEntry *entry = 0L; if ( addNewEntry ) { - if ( m_tqreplace->text().isEmpty() ) + if ( m_replace->text().isEmpty() ) return; if ( !newEntry ) - newEntry = new KoAutoFormatEntry( m_tqreplace->text()); + newEntry = new KoAutoFormatEntry( m_replace->text()); entry =newEntry; } else @@ -813,28 +813,28 @@ void KoAutoFormatDia::slotRemoveEntry() } -void KoAutoFormatDia::slottqfind( const TQString & ) +void KoAutoFormatDia::slotfind( const TQString & ) { - KoAutoFormatEntry *entry = m_docAutoFormat->findFormatEntry(m_tqfind->text()); + KoAutoFormatEntry *entry = m_docAutoFormat->findFormatEntry(m_find->text()); if ( entry ) { - m_tqreplace->setText(entry->tqreplace().latin1()); + m_replace->setText(entry->replace().latin1()); pbAdd->setText(i18n("&Modify")); - m_pListView->setCurrentItem(m_pListView->tqfindItem(m_tqfind->text(),0)); + m_pListView->setCurrentItem(m_pListView->findItem(m_find->text(),0)); } else { - m_tqreplace->clear(); + m_replace->clear(); pbAdd->setText(i18n("&Add")); m_pListView->setCurrentItem(0L); } - slottqfind2(""); + slotfind2(""); } -void KoAutoFormatDia::slottqfind2( const TQString & ) +void KoAutoFormatDia::slotfind2( const TQString & ) { - bool state = !m_tqreplace->text().isEmpty() && !m_tqfind->text().isEmpty(); - KoAutoFormatEntry * entry=m_docAutoFormat->findFormatEntry(m_tqfind->text()); + bool state = !m_replace->text().isEmpty() && !m_find->text().isEmpty(); + KoAutoFormatEntry * entry=m_docAutoFormat->findFormatEntry(m_find->text()); pbRemove->setEnabled(state && entry); if ( state && entry ) { @@ -853,10 +853,10 @@ void KoAutoFormatDia::refreshEntryList() TQDictIterator<KoAutoFormatEntry> it( m_docAutoFormat->getAutoFormatEntries()); for( ; it.current(); ++it ) { - ( void )new TQListViewItem( m_pListView, it.currentKey(), it.current()->tqreplace() ); + ( void )new TQListViewItem( m_pListView, it.currentKey(), it.current()->replace() ); } m_pListView->setCurrentItem(m_pListView->firstChild ()); - bool state = !(m_tqreplace->text().isEmpty()) && !(m_tqfind->text().isEmpty()); + bool state = !(m_replace->text().isEmpty()) && !(m_find->text().isEmpty()); //we can delete item, as we search now in listbox and not in m_find lineedit pbRemove->setEnabled(m_pListView->currentItem() && m_pListView->selectedItem()!=0 ); pbChangeFormat->setEnabled(state && m_pListView->currentItem() && m_pListView->selectedItem()!=0 ); @@ -886,14 +886,14 @@ void KoAutoFormatDia::slotAddEntry() { if(!pbAdd->isEnabled()) return; - TQString repl = m_tqreplace->text(); - TQString tqfind = m_tqfind->text(); - if(repl.isEmpty() || tqfind.isEmpty()) + TQString repl = m_replace->text(); + TQString find = m_find->text(); + if(repl.isEmpty() || find.isEmpty()) { KMessageBox::sorry( 0L, i18n( "An area is empty" ) ); return; } - if(repl==tqfind) + if(repl==find) { KMessageBox::sorry( 0L, i18n( "Find string is the same as replace string!" ) ); return; @@ -904,18 +904,18 @@ void KoAutoFormatDia::slotAddEntry() { if ( newEntry ) { - newEntry->changeReplace( m_tqreplace->text()); - addEntryList(tqfind, newEntry); + newEntry->changeReplace( m_replace->text()); + addEntryList(find, newEntry); delete tmp; newEntry = 0L; } else - addEntryList(tqfind, tmp); + addEntryList(find, tmp); } else - editEntryList(tqfind, tqfind, tmp); - m_tqreplace->clear(); - m_tqfind->clear(); + editEntryList(find, find, tmp); + m_replace->clear(); + m_find->clear(); refreshEntryList(); autocorrectionEntryChanged= true; @@ -926,15 +926,15 @@ void KoAutoFormatDia::chooseSpecialChar1() { TQString f = font().family(); TQChar c = ' '; - bool const focus = m_tqfind->hasFocus(); + bool const focus = m_find->hasFocus(); if ( KoCharSelectDia::selectChar( f, c, false ) ) { - int const cursorpos = m_tqfind->cursorPosition(); + int const cursorpos = m_find->cursorPosition(); if (focus) - m_tqfind->setText( m_tqfind->text().insert( cursorpos, c ) ); + m_find->setText( m_find->text().insert( cursorpos, c ) ); else - m_tqfind->setText( m_tqfind->text().append(c) ); - m_tqfind->setCursorPosition( cursorpos+1 ); + m_find->setText( m_find->text().append(c) ); + m_find->setCursorPosition( cursorpos+1 ); } } @@ -943,15 +943,15 @@ void KoAutoFormatDia::chooseSpecialChar2() { TQString f = font().family(); TQChar c = ' '; - bool const focus = m_tqreplace->hasFocus(); + bool const focus = m_replace->hasFocus(); if ( KoCharSelectDia::selectChar( f, c, false ) ) { - int const cursorpos = m_tqreplace->cursorPosition(); + int const cursorpos = m_replace->cursorPosition(); if (focus) - m_tqreplace->setText( m_tqreplace->text().insert(m_tqreplace->cursorPosition(), c ) ); + m_replace->setText( m_replace->text().insert(m_replace->cursorPosition(), c ) ); else - m_tqreplace->setText( m_tqreplace->text().append(c) ); - m_tqreplace->setCursorPosition( cursorpos+1 ); + m_replace->setText( m_replace->text().append(c) ); + m_replace->setCursorPosition( cursorpos+1 ); } } @@ -969,9 +969,9 @@ void KoAutoFormatDia::slotEditEntry() return; delete newEntry; newEntry=0L; - m_tqfind->setText(m_pListView->currentItem()->text(0)); - m_tqreplace->setText(m_pListView->currentItem()->text(1)); - bool state = !m_tqreplace->text().isEmpty() && !m_tqfind->text().isEmpty(); + m_find->setText(m_pListView->currentItem()->text(0)); + m_replace->setText(m_pListView->currentItem()->text(1)); + bool state = !m_replace->text().isEmpty() && !m_find->text().isEmpty(); pbRemove->setEnabled(state); pbChangeFormat->setEnabled( state ); pbClearFormat->setEnabled(state); @@ -983,13 +983,13 @@ bool KoAutoFormatDia::applyConfig() { // First tab KoAutoFormat::TypographicQuotes tq = m_autoFormat.getConfigTypographicSimpleQuotes(); - tq.tqreplace = cbTypographicSimpleQuotes->isChecked(); + tq.replace = cbTypographicSimpleQuotes->isChecked(); tq.begin = pbSimpleQuote1->text()[ 0 ]; tq.end = pbSimpleQuote2->text()[ 0 ]; m_docAutoFormat->configTypographicSimpleQuotes( tq ); tq = m_autoFormat.getConfigTypographicDoubleQuotes(); - tq.tqreplace = cbTypographicDoubleQuotes->isChecked(); + tq.replace = cbTypographicDoubleQuotes->isChecked(); tq.begin = pbDoubleQuote1->text()[ 0 ]; tq.end = pbDoubleQuote2->text()[ 0 ]; m_docAutoFormat->configTypographicDoubleQuotes( tq ); @@ -1024,7 +1024,7 @@ bool KoAutoFormatDia::applyConfig() m_docAutoFormat->configIncludeTwoUpperUpperLetterException( twoUpperLetter->autoInclude()); m_docAutoFormat->configIncludeAbbreviation( abbreviation->autoInclude()); - TQString lang = exceptionLanguageName.tqfind(autoFormatLanguage->currentText()).data(); + TQString lang = exceptionLanguageName.find(autoFormatLanguage->currentText()).data(); if ( lang == i18n("Default") ) m_docAutoFormat->configAutoFormatLanguage(TQString()); else diff --git a/lib/kotext/KoAutoFormatDia.h b/lib/kotext/KoAutoFormatDia.h index 38a9ecb3..3e8020e7 100644 --- a/lib/kotext/KoAutoFormatDia.h +++ b/lib/kotext/KoAutoFormatDia.h @@ -121,7 +121,7 @@ protected: TQPushButton *pbSimpleQuote1, *pbSimpleQuote2, *pbSimpleDefault; TQPushButton *pbChangeFormat, *pbClearFormat; KCharSelect *charselect; - KoAutoFormatLineEdit *m_tqfind, *m_tqreplace; + KoAutoFormatLineEdit *m_find, *m_replace; KListView *m_pListView; TQChar oSimpleBegin, oSimpleEnd; @@ -149,8 +149,8 @@ protected slots: void slotItemRenamed(TQListViewItem * item, const TQString & newText, int column); void slotRemoveEntry(); void slotEditEntry(); - void slottqfind( const TQString & ); - void slottqfind2( const TQString & ); + void slotfind( const TQString & ); + void slotfind2( const TQString & ); void chooseSpecialChar1(); void chooseSpecialChar2(); void chooseDoubleQuote1(); diff --git a/lib/kotext/KoCompletionDia.cpp b/lib/kotext/KoCompletionDia.cpp index f2860cf1..6289675d 100644 --- a/lib/kotext/KoCompletionDia.cpp +++ b/lib/kotext/KoCompletionDia.cpp @@ -130,7 +130,7 @@ void KoCompletion::slotAddCompletionEntry() { TQString const newWord = KInputDialog::getText( i18n("Add Completion Entry"), i18n("Enter entry:"), TQString(), &ok, this ).lower(); if ( ok ) { - if ( !m_listCompletion.tqcontains( newWord )) + if ( !m_listCompletion.contains( newWord )) { m_listCompletion.append( newWord ); m_lbListCompletion->insertItem( newWord ); diff --git a/lib/kotext/KoComplexText.cpp b/lib/kotext/KoComplexText.cpp index e3196085..4239bf47 100644 --- a/lib/kotext/KoComplexText.cpp +++ b/lib/kotext/KoComplexText.cpp @@ -120,7 +120,7 @@ static inline const TQChar *prevChar( const TQString &str, int pos ) pos--; ch--; } - return &TQChar::tqreplacement; + return &TQChar::replacement; } static inline const TQChar *nextChar( const TQString &str, int pos) @@ -136,7 +136,7 @@ static inline const TQChar *nextChar( const TQString &str, int pos) pos++; ch++; } - return &TQChar::tqreplacement; + return &TQChar::replacement; } static inline bool prevVisualCharJoins( const TQString &str, int pos) diff --git a/lib/kotext/KoCreateStyleDia.cpp b/lib/kotext/KoCreateStyleDia.cpp index cf9130af..648dc252 100644 --- a/lib/kotext/KoCreateStyleDia.cpp +++ b/lib/kotext/KoCreateStyleDia.cpp @@ -42,7 +42,7 @@ KoCreateStyleDia::KoCreateStyleDia( const TQStringList & _list, TQWidget *tqpare void KoCreateStyleDia::slotOk() { - if ( styleList.tqfindIndex(m_styleName->text() ) != -1 ) + if ( styleList.findIndex(m_styleName->text() ) != -1 ) { KMessageBox::error(this, i18n("Name already exists! Please choose another name")); m_styleName->clear(); diff --git a/lib/kotext/KoCustomVariablesDia.cpp b/lib/kotext/KoCustomVariablesDia.cpp index af709678..fd28bfe6 100644 --- a/lib/kotext/KoCustomVariablesDia.cpp +++ b/lib/kotext/KoCustomVariablesDia.cpp @@ -218,7 +218,7 @@ KoCustomVariablesDia::KoCustomVariablesDia( TQWidget *tqparent, const TQPtrList< KoVariable *var = it.current(); if ( var->type() == VT_CUSTOM ) { KoCustomVariable *v = (KoCustomVariable*)var; - if ( !lst.tqcontains( v->name() ) ) { + if ( !lst.contains( v->name() ) ) { lst.append( v->name() ); KoCustomVariablesListItem *item = new KoCustomVariablesListItem( list ); item->setVariable( v ); diff --git a/lib/kotext/KoLanguageTab.cpp b/lib/kotext/KoLanguageTab.cpp index 47fb045e..2ec9fede 100644 --- a/lib/kotext/KoLanguageTab.cpp +++ b/lib/kotext/KoLanguageTab.cpp @@ -42,7 +42,7 @@ KoLanguageTab::KoLanguageTab( KSpell2::Broker::Ptr broker, TQWidget* tqparent, c TQStringList::ConstIterator itTag = langTags.begin(); for ( ; itName != langNames.end() && itTag != langTags.end(); ++itName, ++itTag ) { - if ( spellCheckLanguages.tqfind( *itTag ) != spellCheckLanguages.end() ) + if ( spellCheckLanguages.find( *itTag ) != spellCheckLanguages.end() ) languageKComboBox->insertItem( SmallIcon( "spellcheck" ), *itName ); else languageKComboBox->insertItem( *itName ); diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp index 65cc1f2e..3ee02617 100644 --- a/lib/kotext/KoParagDia.cpp +++ b/lib/kotext/KoParagDia.cpp @@ -1454,7 +1454,7 @@ void KoParagDecorationWidget::slotPressEvent(TQMouseEvent *_ev) TQRect r = wPreview->contentsRect(); TQRect rect(r.x() + OFFSETX, r.y() + OFFSETY, r.width() - OFFSETX, r.y() + OFFSETY + Ko_SPACE); - if(rect.tqcontains(TQPoint(_ev->x(),_ev->y()))) + if(rect.contains(TQPoint(_ev->x(),_ev->y()))) { clickedBorderPreview( m_topBorder, KoBorder::TopBorder, wDeco->bBorderTop ); @@ -1462,7 +1462,7 @@ void KoParagDecorationWidget::slotPressEvent(TQMouseEvent *_ev) rect.setCoords(r.x() + OFFSETX, r.height() - OFFSETY - Ko_SPACE, r.width() - OFFSETX, r.height() - OFFSETY); - if(rect.tqcontains(TQPoint(_ev->x(),_ev->y()))) + if(rect.contains(TQPoint(_ev->x(),_ev->y()))) { clickedBorderPreview( m_bottomBorder, KoBorder::BottomBorder, wDeco->bBorderBottom ); @@ -1470,7 +1470,7 @@ void KoParagDecorationWidget::slotPressEvent(TQMouseEvent *_ev) rect.setCoords(r.x() + OFFSETX, r.y() + OFFSETY, r.x() + Ko_SPACE + OFFSETX, r.height() - OFFSETY); - if(rect.tqcontains(TQPoint(_ev->x(),_ev->y()))) + if(rect.contains(TQPoint(_ev->x(),_ev->y()))) { clickedBorderPreview( m_leftBorder, KoBorder::LeftBorder, wDeco->bBorderLeft ); @@ -1478,7 +1478,7 @@ void KoParagDecorationWidget::slotPressEvent(TQMouseEvent *_ev) rect.setCoords(r.width() - OFFSETX - Ko_SPACE, r.y() + OFFSETY, r.width() - OFFSETX, r.height() - OFFSETY); - if(rect.tqcontains(TQPoint(_ev->x(),_ev->y()))) + if(rect.contains(TQPoint(_ev->x(),_ev->y()))) { clickedBorderPreview( m_rightBorder, KoBorder::RightBorder, wDeco->bBorderRight ); @@ -1960,7 +1960,7 @@ void KoParagTabulatorsWidget::newClicked() { newTab.ptWidth=m_tabList[selected].ptWidth; m_tabList.insert(m_tabList.at(selected), newTab); lstTabs->insertItem( tabToString(newTab), selected); - lstTabs->setCurrentItem(lstTabs->tqfindItem(tabToString(newTab))); + lstTabs->setCurrentItem(lstTabs->findItem(tabToString(newTab))); sortLists(); } } @@ -2113,7 +2113,7 @@ void KoParagTabulatorsWidget::sortLists() { for ( ; it != m_tabList.end(); ++it ) lstTabs->insertItem( KoUnit::toUserStringValue( (*it).ptPos, m_unit ) ); - lstTabs->setCurrentItem(lstTabs->tqfindItem(curValue)); + lstTabs->setCurrentItem(lstTabs->findItem(curValue)); noSignals=false; } diff --git a/lib/kotext/KoParagLayout.cpp b/lib/kotext/KoParagLayout.cpp index 129c4d4a..fd1a9453 100644 --- a/lib/kotext/KoParagLayout.cpp +++ b/lib/kotext/KoParagLayout.cpp @@ -488,7 +488,7 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex tqlayout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; else if( value=="200%") tqlayout.lineSpacingType = KoParagLayout::LS_DOUBLE; - else if ( value.tqfind('%') > -1 ) + else if ( value.find('%') > -1 ) { value = value.remove( '%' ); double percent = value.toDouble(); diff --git a/lib/kotext/KoParagStyle.cpp b/lib/kotext/KoParagStyle.cpp index f44bcd59..96209cba 100644 --- a/lib/kotext/KoParagStyle.cpp +++ b/lib/kotext/KoParagStyle.cpp @@ -220,7 +220,7 @@ TQString KoParagStyle::saveStyle( KoGenStyles& genStyles, int styleType, const T // try to preserve existing internal name, if it looks adequate (no spaces) // ## TODO: check XML-Schemacs NCName conformity - bool nameIsConform = !m_name.isEmpty() && m_name.tqfind( ' ' ) == -1; + bool nameIsConform = !m_name.isEmpty() && m_name.find( ' ' ) == -1; TQString newName; if ( nameIsConform ) newName = genStyles.lookup( gs, m_name, KoGenStyles::DontForceNumbering ); diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp index 157f79a8..5df4c93d 100644 --- a/lib/kotext/KoRichText.cpp +++ b/lib/kotext/KoRichText.cpp @@ -381,10 +381,10 @@ void KoTextCursor::insert( const TQString &str, bool checkNewLine, TQMemArray<Ko TQString s( str ); #if defined(TQ_WS_WIN) if ( checkNewLine ) - s = s.tqreplace( TQRegExp( "\\r" ), "" ); + s = s.replace( TQRegExp( "\\r" ), "" ); #endif if ( checkNewLine ) - justInsert = s.tqfind( '\n' ) == -1; + justInsert = s.find( '\n' ) == -1; if ( justInsert ) { string->insert( idx, s ); if ( formatting ) { @@ -1635,7 +1635,7 @@ void KoTextParag::insertLineStart( int index, KoTextParagLineStart *ls ) // we could loop forever (e.g. if one char is wider than the page...) #ifndef NDEBUG TQMap<int, KoTextParagLineStart*>::Iterator it; - if ( ( it = lineStarts.tqfind( index ) ) == lineStarts.end() ) { + if ( ( it = lineStarts.find( index ) ) == lineStarts.end() ) { lineStarts.insert( index, ls ); } else { kdWarning(32500) << "insertLineStart: there's already a line for char index=" << index << endl; @@ -1742,10 +1742,10 @@ void KoTextFlow::unregisterFloatingItem( KoTextCustomItem* item ) void KoTextFlow::registerFloatingItem( KoTextCustomItem* item ) { if ( item->placement() == KoTextCustomItem::PlaceRight ) { - if ( !rightItems.tqcontains( item ) ) + if ( !rightItems.contains( item ) ) rightItems.append( item ); } else if ( item->placement() == KoTextCustomItem::PlaceLeft && - !leftItems.tqcontains( item ) ) { + !leftItems.contains( item ) ) { leftItems.append( item ); } } diff --git a/lib/kotext/KoSearchDia.cpp b/lib/kotext/KoSearchDia.cpp index 915ef4f7..0acd88cc 100644 --- a/lib/kotext/KoSearchDia.cpp +++ b/lib/kotext/KoSearchDia.cpp @@ -100,11 +100,11 @@ void KoSearchContextUI::setCtxHistory( const TQStringList & history ) m_ctx->m_strings = history; } -KoSearchDia::KoSearchDia( TQWidget * tqparent,const char *name, KoSearchContext *tqfind, bool hasSelection, bool hasCursor ) - : KFindDialog( tqparent, name, tqfind->m_options, tqfind->m_strings ) +KoSearchDia::KoSearchDia( TQWidget * tqparent,const char *name, KoSearchContext *find, bool hasSelection, bool hasCursor ) + : KFindDialog( tqparent, name, find->m_options, find->m_strings ) { // The dialog extension. - m_findUI = new KoSearchContextUI( tqfind, findExtension() ); + m_findUI = new KoSearchContextUI( find, findExtension() ); setHasSelection(hasSelection); setHasCursor(hasCursor); } @@ -119,12 +119,12 @@ void KoSearchDia::slotOk() m_findUI->setCtxHistory( findHistory() ); } -KoReplaceDia::KoReplaceDia( TQWidget *tqparent, const char *name, KoSearchContext *tqfind, KoSearchContext *tqreplace, bool hasSelection, bool hasCursor ) - : KReplaceDialog( tqparent, name, tqfind->m_options, tqfind->m_strings, tqreplace->m_strings ) +KoReplaceDia::KoReplaceDia( TQWidget *tqparent, const char *name, KoSearchContext *find, KoSearchContext *replace, bool hasSelection, bool hasCursor ) + : KReplaceDialog( tqparent, name, find->m_options, find->m_strings, replace->m_strings ) { // The dialog extension. - m_findUI = new KoSearchContextUI( tqfind, findExtension() ); - m_replaceUI = new KoSearchContextUI( tqreplace, replaceExtension() ); + m_findUI = new KoSearchContextUI( find, findExtension() ); + m_replaceUI = new KoSearchContextUI( replace, replaceExtension() ); // Look whether we have a selection, and/or a cursor setHasSelection(hasSelection); setHasCursor(hasCursor); @@ -147,8 +147,8 @@ void KoReplaceDia::slotOk() KoFindReplace::KoFindReplace( TQWidget * tqparent, KoSearchDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView ) - : m_tqfind( new KoTextFind( dialog->pattern(), dialog->options(), this, tqparent ) ), - m_tqreplace( 0L ), + : m_find( new KoTextFind( dialog->pattern(), dialog->options(), this, tqparent ) ), + m_replace( 0L ), m_searchContext( *dialog->searchContext() ), m_replaceContext(), m_searchContextEnabled( dialog->optionSelected() ), @@ -158,12 +158,12 @@ KoFindReplace::KoFindReplace( TQWidget * tqparent, KoSearchDia * dialog, const T m_textIterator( lstObject, textView, dialog->options() ), m_lastTextObjectHighlighted( 0 ) { - connectFind( m_tqfind ); + connectFind( m_find ); } KoFindReplace::KoFindReplace( TQWidget * tqparent, KoReplaceDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView ) - : m_tqfind( 0L ), - m_tqreplace( new KoTextReplace( dialog->pattern(), dialog->replacement(), dialog->options(), this, tqparent ) ), + : m_find( 0L ), + m_replace( new KoTextReplace( dialog->pattern(), dialog->replacement(), dialog->options(), this, tqparent ) ), m_searchContext( *dialog->searchContext() ), m_replaceContext( *dialog->replaceContext() ), m_searchContextEnabled( dialog->optionFindSelected() ), @@ -173,23 +173,23 @@ KoFindReplace::KoFindReplace( TQWidget * tqparent, KoReplaceDia * dialog, const m_textIterator( lstObject, textView, dialog->options() ), m_lastTextObjectHighlighted( 0 ) { - connectFind( m_tqreplace ); - connect( m_tqreplace, TQT_SIGNAL( tqreplace( const TQString &, int , int, int ) ), - this, TQT_SLOT( tqreplace( const TQString &, int , int,int ) ) ); + connectFind( m_replace ); + connect( m_replace, TQT_SIGNAL( replace( const TQString &, int , int, int ) ), + this, TQT_SLOT( replace( const TQString &, int , int,int ) ) ); } -void KoFindReplace::connectFind( KFind* tqfind ) +void KoFindReplace::connectFind( KFind* find ) { - connect( tqfind, TQT_SIGNAL( optionsChanged() ), + connect( find, TQT_SIGNAL( optionsChanged() ), this, TQT_SLOT( optionsChanged() ) ); - connect( tqfind, TQT_SIGNAL( dialogClosed() ), + connect( find, TQT_SIGNAL( dialogClosed() ), this, TQT_SLOT( dialogClosed() ) ); // Connect highlight signal to code which handles highlighting // of found text. - connect( tqfind, TQT_SIGNAL( highlight( const TQString &, int, int ) ), + connect( find, TQT_SIGNAL( highlight( const TQString &, int, int ) ), this, TQT_SLOT( highlight( const TQString &, int, int ) ) ); // Connect findNext signal - called when pressing the button in the dialog - connect( tqfind, TQT_SIGNAL( findNext() ), + connect( find, TQT_SIGNAL( findNext() ), this, TQT_SLOT( slotFindNext() ) ); m_bInit = true; m_currentParagraphModified = false; @@ -204,8 +204,8 @@ KoFindReplace::~KoFindReplace() { removeHighlight(); //kdDebug(32500) << "KoFindReplace::~KoFindReplace" << endl; - delete m_tqfind; - delete m_tqreplace; + delete m_find; + delete m_replace; } void KoFindReplace::optionsChanged() @@ -270,11 +270,11 @@ bool KoFindReplace::findNext() m_currentParagraphModified = false; } - if ( m_tqfind ) + if ( m_find ) // Let KFind inspect the text fragment, and display a dialog if a match is found - res = m_tqfind->find(); + res = m_find->find(); else - res = m_tqreplace->replace(); + res = m_replace->replace(); } //kdDebug(32500) << k_funcinfo << "we're done. res=" << res << endl; @@ -286,17 +286,17 @@ bool KoFindReplace::findNext() m_textIterator.setOptions( m_textIterator.options() & ~KFindDialog::FromCursor ); m_textIterator.restart(); m_bInit = true; - if ( m_tqfind ) - m_tqfind->resetCounts(); + if ( m_find ) + m_find->resetCounts(); else - m_tqreplace->resetCounts(); + m_replace->resetCounts(); return findNext(); } else { // done, close the 'find next' dialog - if ( m_tqfind ) - m_tqfind->closeFindNextDialog(); + if ( m_find ) + m_find->closeFindNextDialog(); else - m_tqreplace->closeReplaceNextDialog(); + m_replace->closeReplaceNextDialog(); } return false; } @@ -327,15 +327,15 @@ bool KoFindReplace::findPrevious() long KoFindReplace::options() const { - return m_tqfind ? m_tqfind->options() : m_tqreplace->options(); + return m_find ? m_find->options() : m_replace->options(); } void KoFindReplace::setOptions(long opt) { - if ( m_tqfind ) - m_tqfind->setOptions(opt); + if ( m_find ) + m_find->setOptions(opt); else - m_tqreplace->setOptions(opt); + m_replace->setOptions(opt); m_textIterator.setOptions( opt ); } @@ -354,19 +354,19 @@ void KoFindReplace::highlight( const TQString &, int matchingIndex, int matching m_lastTextObjectHighlighted->removeHighlight(true); m_lastTextObjectHighlighted = m_textIterator.currentTextObject(); //kdDebug(32500) << "KoFindReplace::highlight " << matchingIndex << "," << matchingLength << endl; - KDialogBase* dialog = m_tqfind ? m_tqfind->findNextDialog() : m_tqreplace->replaceNextDialog(); + KDialogBase* dialog = m_find ? m_find->findNextDialog() : m_replace->replaceNextDialog(); highlightPortion(m_textIterator.currentParag(), m_offset + matchingIndex, matchingLength, m_lastTextObjectHighlighted->textDocument(), dialog ); } -// slot connected to the 'tqreplace' signal -void KoFindReplace::tqreplace( const TQString &text, int matchingIndex, +// slot connected to the 'replace' signal +void KoFindReplace::replace( const TQString &text, int matchingIndex, int replacementLength, int matchedLength ) { //kdDebug(32500) << "KoFindReplace::replace m_offset=" << m_offset << " matchingIndex=" << matchingIndex << " matchedLength=" << matchedLength << " options=" << options() << endl; m_matchingIndex = matchingIndex; int index = m_offset + matchingIndex; - // highlight might not have happened (if 'prompt on tqreplace' is off) + // highlight might not have happened (if 'prompt on replace' is off) if ( (options() & KReplaceDialog::PromptOnReplace) == 0 ) highlight( text, matchingIndex, matchedLength ); @@ -493,19 +493,19 @@ KMacroCommand* KoFindReplace::macroCommand() void KoFindReplace::setActiveWindow() { - KDialogBase* dialog = m_tqfind ? m_tqfind->findNextDialog() : m_tqreplace->replaceNextDialog(); + KDialogBase* dialog = m_find ? m_find->findNextDialog() : m_replace->replaceNextDialog(); if ( dialog ) dialog->setActiveWindow(); } /*int KoFindReplace::numMatches() const { - return m_tqfind->numMatches(); + return m_find->numMatches(); } int KoFindReplace::numReplacements() const { - return m_tqreplace->numReplacements(); + return m_replace->numReplacements(); }*/ //// @@ -921,10 +921,10 @@ bool KoFindReplace::validateMatch( const TQString & /*text*/, int index, int mat bool KoFindReplace::shouldRestart() { - if ( m_tqfind ) - return m_tqfind->shouldRestart( true /*since text is editable*/, m_doCounting ); + if ( m_find ) + return m_find->shouldRestart( true /*since text is editable*/, m_doCounting ); else - return m_tqreplace->shouldRestart( true /*since text is editable*/, m_doCounting ); + return m_replace->shouldRestart( true /*since text is editable*/, m_doCounting ); } #include "KoSearchDia.moc" diff --git a/lib/kotext/KoSearchDia.h b/lib/kotext/KoSearchDia.h index 56570f4d..49eb75d1 100644 --- a/lib/kotext/KoSearchDia.h +++ b/lib/kotext/KoSearchDia.h @@ -128,7 +128,7 @@ class KOTEXT_EXPORT KoSearchDia: TQ_OBJECT public: - KoSearchDia( TQWidget *tqparent, const char *name, KoSearchContext *tqfind, bool hasSelection, bool hasCursor ); + KoSearchDia( TQWidget *tqparent, const char *name, KoSearchContext *find, bool hasSelection, bool hasCursor ); KoSearchContext * searchContext() { return m_findUI->context(); } @@ -152,7 +152,7 @@ class KOTEXT_EXPORT KoReplaceDia: public: - KoReplaceDia( TQWidget *tqparent, const char *name, KoSearchContext *tqfind, KoSearchContext *tqreplace, bool hasSelection, bool hasCursor ); + KoReplaceDia( TQWidget *tqparent, const char *name, KoSearchContext *find, KoSearchContext *replace, bool hasSelection, bool hasCursor ); KoSearchContext * searchContext() { return m_findUI->context(); } @@ -201,8 +201,8 @@ private: }; /** - * This class implements the 'tqfind' functionality ( the "search next, prompt" loop ) - * and the 'tqreplace' functionality. Same class, to allow centralizing the findNext() code. + * This class implements the 'find' functionality ( the "search next, prompt" loop ) + * and the 'replace' functionality. Same class, to allow centralizing the findNext() code. */ class KOTEXT_EXPORT KoFindReplace : public TQObject { @@ -217,7 +217,7 @@ public: return m_textIterator.currentParag(); } - bool isReplace() const { return m_tqreplace != 0L; } + bool isReplace() const { return m_replace != 0L; } bool shouldRestart(); @@ -252,10 +252,10 @@ protected: long options() const; void setOptions(long opt); void removeHighlight(); - bool needData() const { return m_tqfind ? m_tqfind->needData() : m_tqreplace->needData(); } + bool needData() const { return m_find ? m_find->needData() : m_replace->needData(); } void setData( const TQString& data, int startPos = -1 ) { - if ( m_tqfind ) m_tqfind->setData( data, startPos ); - else m_tqreplace->setData( data, startPos ); + if ( m_find ) m_find->setData( data, startPos ); + else m_replace->setData( data, startPos ); } protected slots: @@ -263,15 +263,15 @@ protected slots: void optionsChanged(); void dialogClosed(); void highlight( const TQString &text, int matchingIndex, int matchingLength ); - void tqreplace( const TQString &text, int replacementIndex, int replacedLength, int searchLength ); + void replace( const TQString &text, int replacementIndex, int replacedLength, int searchLength ); void slotCurrentParagraphModified( int, int, int ); private: - void connectFind( KFind* tqfind ); + void connectFind( KFind* find ); // Only one of those two will be set - KoTextFind * m_tqfind; - KoTextReplace * m_tqreplace; + KoTextFind * m_find; + KoTextReplace * m_replace; KoSearchContext m_searchContext; KoSearchContext m_replaceContext; @@ -282,7 +282,7 @@ private: KMacroCommand *m_macroCmd; int m_offset; - int m_matchingIndex; // can be removed once we use kde-3.2 (for ktqfind::index()) + int m_matchingIndex; // can be removed once we use kde-3.2 (for kfind::index()) KoTextIterator m_textIterator; diff --git a/lib/kotext/KoStyleManager.cpp b/lib/kotext/KoStyleManager.cpp index ef925289..e921ff1e 100644 --- a/lib/kotext/KoStyleManager.cpp +++ b/lib/kotext/KoStyleManager.cpp @@ -98,7 +98,7 @@ KoStyleManager::KoStyleManager( TQWidget *_parent, KoUnit::Unit unit, newTab->setWidget( new KoParagTabulatorsWidget( unit, -1, newTab ) ); addTab( newTab ); - TQListBoxItem * item = m_stylesList->tqfindItem( activeStyleName ); + TQListBoxItem * item = m_stylesList->findItem( activeStyleName ); m_stylesList->setCurrentItem( item ? m_stylesList->index(item) : 0 ); noSignals=false; @@ -475,7 +475,7 @@ void KoStyleManager::deleteStyle() { m_stylesList->removeItem(curItem); m_styleCombo->removeItem(curItem); - m_inheritCombo->listBox()->removeItem( m_inheritCombo->listBox()->index(m_inheritCombo->listBox()->tqfindItem(name ))); + m_inheritCombo->listBox()->removeItem( m_inheritCombo->listBox()->index(m_inheritCombo->listBox()->findItem(name ))); numStyles--; m_stylesList->setSelected( m_stylesList->currentItem(), true ); @@ -488,7 +488,7 @@ void KoStyleManager::moveUpStyle() save(); const TQString currentStyleName = m_currentStyle->name(); const TQString currentStyleDisplayName = m_stylesList->currentText(); - int pos2 = m_styleOrder.tqfindIndex( currentStyleName ); + int pos2 = m_styleOrder.findIndex( currentStyleName ); if ( pos2 != -1 ) { m_styleOrder.remove( m_styleOrder.at(pos2)); @@ -516,7 +516,7 @@ void KoStyleManager::moveDownStyle() save(); const TQString currentStyleName = m_currentStyle->name(); const TQString currentStyleDisplayName = m_stylesList->currentText(); - int pos2 = m_styleOrder.tqfindIndex( currentStyleName ); + int pos2 = m_styleOrder.findIndex( currentStyleName ); if ( pos2 != -1 ) { m_styleOrder.remove( m_styleOrder.at(pos2)); diff --git a/lib/kotext/KoTextCustomItem.cpp b/lib/kotext/KoTextCustomItem.cpp index f6eaf7de..4b567e0b 100644 --- a/lib/kotext/KoTextCustomItem.cpp +++ b/lib/kotext/KoTextCustomItem.cpp @@ -125,7 +125,7 @@ void CustomItemsMap::insertItems( const KoTextCursor & startCursor, int size ) KoTextCursor cursor( startCursor ); for ( int i = 0; i < size; ++i ) { - CustomItemsMap::Iterator it = tqfind( i ); + CustomItemsMap::Iterator it = find( i ); if ( it != end() ) { kdDebug(32500) << "CustomItemsMap::insertItems setting custom item " << it.data() << endl; diff --git a/lib/kotext/KoTextDocument.cpp b/lib/kotext/KoTextDocument.cpp index b5de2a73..de81299c 100644 --- a/lib/kotext/KoTextDocument.cpp +++ b/lib/kotext/KoTextDocument.cpp @@ -191,7 +191,7 @@ void KoTextDocument::setPlainText( const TQString &text ) //oText = text; int lastNl = 0; - int nl = text.tqfind( '\n' ); + int nl = text.find( '\n' ); if ( nl == -1 ) { lParag = createParag( this, lParag, 0 ); if ( !fParag ) @@ -216,7 +216,7 @@ void KoTextDocument::setPlainText( const TQString &text ) if ( nl == 0xffffff ) break; lastNl = nl + 1; - nl = text.tqfind( '\n', nl + 1 ); + nl = text.find( '\n', nl + 1 ); if ( nl == -1 ) nl = 0xffffff; } @@ -283,7 +283,7 @@ void KoTextDocument::informParagraphDeleted( KoTextParag* parag ) void KoTextDocument::selectionStart( int id, int ¶gId, int &index ) { - TQMap<int, KoTextDocumentSelection>::Iterator it = selections.tqfind( id ); + TQMap<int, KoTextDocumentSelection>::Iterator it = selections.find( id ); if ( it == selections.end() ) return; KoTextDocumentSelection &sel = *it; @@ -293,7 +293,7 @@ void KoTextDocument::selectionStart( int id, int ¶gId, int &index ) KoTextCursor KoTextDocument::selectionStartCursor( int id) { - TQMap<int, KoTextDocumentSelection>::Iterator it = selections.tqfind( id ); + TQMap<int, KoTextDocumentSelection>::Iterator it = selections.find( id ); if ( it == selections.end() ) return KoTextCursor( this ); KoTextDocumentSelection &sel = *it; @@ -304,7 +304,7 @@ KoTextCursor KoTextDocument::selectionStartCursor( int id) KoTextCursor KoTextDocument::selectionEndCursor( int id) { - TQMap<int, KoTextDocumentSelection>::Iterator it = selections.tqfind( id ); + TQMap<int, KoTextDocumentSelection>::Iterator it = selections.find( id ); if ( it == selections.end() ) return KoTextCursor( this ); KoTextDocumentSelection &sel = *it; @@ -315,7 +315,7 @@ KoTextCursor KoTextDocument::selectionEndCursor( int id) void KoTextDocument::selectionEnd( int id, int ¶gId, int &index ) { - TQMap<int, KoTextDocumentSelection>::Iterator it = selections.tqfind( id ); + TQMap<int, KoTextDocumentSelection>::Iterator it = selections.find( id ); if ( it == selections.end() ) return; KoTextDocumentSelection &sel = *it; @@ -325,7 +325,7 @@ void KoTextDocument::selectionEnd( int id, int ¶gId, int &index ) bool KoTextDocument::isSelectionSwapped( int id ) { - TQMap<int, KoTextDocumentSelection>::Iterator it = selections.tqfind( id ); + TQMap<int, KoTextDocumentSelection>::Iterator it = selections.find( id ); if ( it == selections.end() ) return false; KoTextDocumentSelection &sel = *it; @@ -334,7 +334,7 @@ bool KoTextDocument::isSelectionSwapped( int id ) KoTextParag *KoTextDocument::selectionStart( int id ) { - TQMap<int, KoTextDocumentSelection>::Iterator it = selections.tqfind( id ); + TQMap<int, KoTextDocumentSelection>::Iterator it = selections.find( id ); if ( it == selections.end() ) return 0; KoTextDocumentSelection &sel = *it; @@ -345,7 +345,7 @@ KoTextParag *KoTextDocument::selectionStart( int id ) KoTextParag *KoTextDocument::selectionEnd( int id ) { - TQMap<int, KoTextDocumentSelection>::Iterator it = selections.tqfind( id ); + TQMap<int, KoTextDocumentSelection>::Iterator it = selections.find( id ); if ( it == selections.end() ) return 0; KoTextDocumentSelection &sel = *it; @@ -385,7 +385,7 @@ static void setSelectionEndHelper( int id, KoTextDocumentSelection &sel, KoTextC bool KoTextDocument::setSelectionEnd( int id, KoTextCursor *cursor ) { - TQMap<int, KoTextDocumentSelection>::Iterator it = selections.tqfind( id ); + TQMap<int, KoTextDocumentSelection>::Iterator it = selections.find( id ); if ( it == selections.end() ) return FALSE; KoTextDocumentSelection &sel = *it; @@ -532,7 +532,7 @@ void KoTextDocument::selectAll( int id ) bool KoTextDocument::removeSelection( int id ) { - TQMap<int, KoTextDocumentSelection>::Iterator it = selections.tqfind( id ); + TQMap<int, KoTextDocumentSelection>::Iterator it = selections.find( id ); if ( it == selections.end() ) return FALSE; @@ -584,7 +584,7 @@ bool KoTextDocument::removeSelection( int id ) TQString KoTextDocument::selectedText( int id, bool withCustom ) const { // ######## TODO: look at textFormat() and return rich text or plain text (like the text() method!) - TQMap<int, KoTextDocumentSelection>::ConstIterator it = selections.tqfind( id ); + TQMap<int, KoTextDocumentSelection>::ConstIterator it = selections.find( id ); if ( it == selections.end() ) return TQString(); @@ -696,7 +696,7 @@ TQString KoTextDocument::copySelection( KoXmlWriter& writer, KoSavingContext& co void KoTextDocument::setFormat( int id, const KoTextFormat *f, int flags ) { - TQMap<int, KoTextDocumentSelection>::ConstIterator it = selections.tqfind( id ); + TQMap<int, KoTextDocumentSelection>::ConstIterator it = selections.find( id ); if ( it == selections.end() ) return; @@ -735,7 +735,7 @@ void KoTextDocument::setFormat( int id, const KoTextFormat *f, int flags ) void KoTextDocument::removeSelectedText( int id, KoTextCursor *cursor ) { - TQMap<int, KoTextDocumentSelection>::Iterator it = selections.tqfind( id ); + TQMap<int, KoTextDocumentSelection>::Iterator it = selections.find( id ); if ( it == selections.end() ) return; @@ -813,7 +813,7 @@ KoTextCursor *KoTextDocument::redo( KoTextCursor *c ) return commandHistory->redo( c ); } -bool KoTextDocument::tqfind( const TQString &expr, bool cs, bool wo, bool forward, +bool KoTextDocument::find( const TQString &expr, bool cs, bool wo, bool forward, int *parag, int *index, KoTextCursor *cursor ) { KoTextParag *p = forward ? fParag : lParag; @@ -842,7 +842,7 @@ bool KoTextDocument::tqfind( const TQString &expr, bool cs, bool wo, bool forwar first = FALSE; for ( ;; ) { - int res = forward ? s.tqfind( expr, start, cs ) : s.tqfindRev( expr, start, cs ); + int res = forward ? s.find( expr, start, cs ) : s.findRev( expr, start, cs ); if ( res == -1 ) break; @@ -883,7 +883,7 @@ bool KoTextDocument::tqfind( const TQString &expr, bool cs, bool wo, bool forwar bool KoTextDocument::inSelection( int selId, const TQPoint &pos ) const { - TQMap<int, KoTextDocumentSelection>::ConstIterator it = selections.tqfind( selId ); + TQMap<int, KoTextDocumentSelection>::ConstIterator it = selections.find( selId ); if ( it == selections.end() ) return FALSE; @@ -900,7 +900,7 @@ bool KoTextDocument::inSelection( int selId, const TQPoint &pos ) const KoTextParag *p = startParag; while ( p ) { - if ( p->rect().tqcontains( pos ) ) { + if ( p->rect().contains( pos ) ) { bool inSel = FALSE; int selStart = p->selectionStart( selId ); int selEnd = p->selectionEnd( selId ); @@ -912,8 +912,8 @@ bool KoTextDocument::inSelection( int selId, const TQPoint &pos ) const if ( i == selEnd ) break; if ( p->at( i )->lineStart ) { - y = (*p->lineStarts.tqfind( i ))->y; - h = (*p->lineStarts.tqfind( i ))->h; + y = (*p->lineStarts.find( i ))->y; + h = (*p->lineStarts.find( i ))->h; } if ( pos.y() - p->rect().y() >= y && pos.y() - p->rect().y() <= y + h ) { if ( inSel && pos.x() >= p->at( i )->x && @@ -989,7 +989,7 @@ bool KoTextDocument::visitSelection( int selectionId, KoParagVisitor* visitor, b bool KoTextDocument::hasSelection( int id, bool visible ) const { - return ( selections.tqfind( id ) != selections.end() && + return ( selections.find( id ) != selections.end() && ( !visible || ( (KoTextDocument*)this )->selectionStartCursor( id ) != ( (KoTextDocument*)this )->selectionEndCursor( id ) ) ); diff --git a/lib/kotext/KoTextDocument.h b/lib/kotext/KoTextDocument.h index 44bb0001..1f7739aa 100644 --- a/lib/kotext/KoTextDocument.h +++ b/lib/kotext/KoTextDocument.h @@ -55,7 +55,7 @@ public: enum SelectionId { Standard = 0, InputMethodPreedit = 1, - HighlightSelection = 2, // used to highlight during search/tqreplace + HighlightSelection = 2, // used to highlight during search/replace Temp = 32000 // This selection must not be drawn, it's used e.g. by undo/redo to // remove multiple lines with removeSelectedText() }; @@ -135,7 +135,7 @@ public: KoTextFormatCollection *formatCollection() const; - bool tqfind( const TQString &expr, bool cs, bool wo, bool forward, int *parag, int *index, KoTextCursor *cursor ); + bool find( const TQString &expr, bool cs, bool wo, bool forward, int *parag, int *index, KoTextCursor *cursor ); //void setTextFormat( TQt::TextFormat f ); //TQt::TextFormat textFormat() const; diff --git a/lib/kotext/KoTextFormat.cpp b/lib/kotext/KoTextFormat.cpp index 5a1570ac..27556ed6 100644 --- a/lib/kotext/KoTextFormat.cpp +++ b/lib/kotext/KoTextFormat.cpp @@ -189,7 +189,7 @@ KoTextFormat::~KoTextFormat() // It should have been removed from the collection before being deleted. #ifndef NDEBUG if ( tqparent() && tqparent()->defaultFormat() ) // not when destroying the collection - assert( ! ( tqparent()->dict().tqfind( key() ) == this ) ); + assert( ! ( tqparent()->dict().find( key() ) == this ) ); // (has to be the same pointer, not only the same key) #endif delete d; @@ -645,7 +645,7 @@ void KoTextFormat::save( KoGenStyle& gs, KoSavingContext& context, KoTextFormat { TQString lang = m_language; TQString country; - const int pos = lang.tqfind( '_' ); + const int pos = lang.find( '_' ); if ( pos != -1 ) { country = lang.mid( pos + 1 ); lang = lang.left( pos ); @@ -1737,7 +1737,7 @@ KoTextFormat *KoTextFormatCollection::format( const KoTextFormat *f ) } #endif - KoTextFormat *fm = cKey.tqfind( f->key() ); + KoTextFormat *fm = cKey.find( f->key() ); if ( fm ) { #ifdef DEBUG_COLLECTION kdDebug(32500) << " format(f) need '" << f->key() << "', normal case!" << endl; @@ -1783,7 +1783,7 @@ KoTextFormat *KoTextFormatCollection::format( const KoTextFormat *of, const KoTe #endif cres->copyFormat( *nf, flags ); - KoTextFormat *fm = cKey.tqfind( cres->key() ); + KoTextFormat *fm = cKey.find( cres->key() ); if ( !fm ) { #ifdef DEBUG_COLLECTION kdDebug(32500) << " format(of,nf,flags) mix of '" << of->key() << "' and '" << nf->key() << ", worst case!" << endl; @@ -1814,7 +1814,7 @@ KoTextFormat *KoTextFormatCollection::format( const TQFont &f, const TQColor &c, } TQString key = KoTextFormat::getKey( f, c, FALSE, KoTextFormat::AlignNormal ); - cachedFormat = cKey.tqfind( key ); + cachedFormat = cKey.find( key ); cfont = f; ccol = c; diff --git a/lib/kotext/KoTextIterator.cpp b/lib/kotext/KoTextIterator.cpp index ed320ed1..73468f7e 100644 --- a/lib/kotext/KoTextIterator.cpp +++ b/lib/kotext/KoTextIterator.cpp @@ -89,7 +89,7 @@ void KoTextIterator::init( const TQValueList<KoTextObject *> & lstObjects, KoTex m_lstObjects.pop_front(); m_lstObjects.push_back( textobj ); if ( m_lstObjects.first() == initialFirst ) { // safety - kdWarning(32500) << "Didn't manage to tqfind " << textView->textObject() << " in the list of textobjects!!!" << endl; + kdWarning(32500) << "Didn't manage to find " << textView->textObject() << " in the list of textobjects!!!" << endl; break; } } @@ -99,7 +99,7 @@ void KoTextIterator::init( const TQValueList<KoTextObject *> & lstObjects, KoTex m_lstObjects.pop_back(); m_lstObjects.push_front( textobj ); if ( m_lstObjects.first() == initialFirst ) { // safety - kdWarning(32500) << "Didn't manage to tqfind " << textView->textObject() << " in the list of textobjects!!!" << endl; + kdWarning(32500) << "Didn't manage to find " << textView->textObject() << " in the list of textobjects!!!" << endl; break; } } diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp index 6289482b..d9a2f054 100644 --- a/lib/kotext/KoTextObject.cpp +++ b/lib/kotext/KoTextObject.cpp @@ -508,7 +508,7 @@ void KoTextObject::doKeyboardAction( KoTextCursor * cursor, KoTextFormat * & /*c if ( cursor->parag() ) { TQString last_line = cursor->parag()->toString(); - last_line.remove(0,last_line.tqfind(' ')+1); + last_line.remove(0,last_line.find(' ')+1); if( last_line.isEmpty() && cursor->parag()->counter() && cursor->parag()->counter()->numbering() == KoParagCounter::NUM_LIST ) //if the previous line the in paragraph is empty { @@ -635,7 +635,7 @@ void KoTextObject::insert( KoTextCursor * cursor, KoTextFormat * currentFormat, clearUndoRedoInfo(); checkUndoRedoInfo( cursor, UndoRedoInfo::Insert ); if ( !undoRedoInfo.valid() ) { - if ( !commandName.isNull() ) // see tqreplace-selection + if ( !commandName.isNull() ) // see replace-selection newPlaceHolderCommand( commandName ); undoRedoInfo.id = cursor->parag()->paragId(); undoRedoInfo.index = cursor->index(); @@ -726,7 +726,7 @@ void KoTextObject::insert( KoTextCursor * cursor, KoTextFormat * currentFormat, selectionChangedNotify(); // does the tqrepaint } if ( !customItemsMap.isEmpty() - && !commandName.isNull() /* see tqreplace-selection; #139890 */ ) { + && !commandName.isNull() /* see replace-selection; #139890 */ ) { clearUndoRedoInfo(); } @@ -749,7 +749,7 @@ void KoTextObject::pasteText( KoTextCursor * cursor, const TQString & text, KoTe TQString t = text; // Need to convert CRLF to NL TQRegExp crlf( TQString::tqfromLatin1("\r\n") ); - t.tqreplace( crlf, TQChar('\n') ); + t.replace( crlf, TQChar('\n') ); // Convert non-printable chars for ( int i=0; (uint) i<t.length(); i++ ) { if ( t[ i ] < ' ' && t[ i ] != '\n' && t[ i ] != '\t' ) @@ -949,7 +949,7 @@ void KoTextObject::applyStyleChange( KoStyleChangeDefMap changed ) KoTextParag *p = textdoc->firstParag(); while ( p ) { - KoStyleChangeDefMap::Iterator it = changed.tqfind( p->style() ); + KoStyleChangeDefMap::Iterator it = changed.find( p->style() ); if ( it != changed.end() ) { if ( (*it).paragLayoutChanged == -1 || (*it).formatChanged == -1 ) // Style has been deleted @@ -1592,7 +1592,7 @@ 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/tqreplace + const bool tqrepaint = ( insertFlags & DoNotRepaint ) == 0; // DoNotRepaint is set during search/replace if ( tqrepaint ) emit hideCursor(); // This could be improved to use a macro command only when there's a selection to remove. @@ -1699,7 +1699,7 @@ void KoTextObject::selectionChangedNotify( bool enableActions /* = true */) void KoTextObject::setViewArea( TQWidget* w, int maxY ) { - m_mapViewAreas.tqreplace( w, maxY ); + m_mapViewAreas.replace( w, maxY ); } void KoTextObject::setLastFormattedParag( KoTextParag *parag ) @@ -2045,9 +2045,9 @@ TQString KoTextObject::textChangedCase(const TQString& _text,KoChangeCaseDia::Ty { TQChar prev = text.tqat(TQMAX(i-1,0)); if(i==0 || prev == ' ' || prev == '\n' || prev == '\t') - text=text.tqreplace(i, 1, text.tqat(i).upper() ); + text=text.replace(i, 1, text.tqat(i).upper() ); else - text=text.tqreplace(i, 1, text.tqat(i).lower() ); + text=text.replace(i, 1, text.tqat(i).lower() ); } } break; @@ -2059,7 +2059,7 @@ TQString KoTextObject::textChangedCase(const TQString& _text,KoChangeCaseDia::Ty repl=repl.upper(); else if(text.tqat(i).lower()!=text.tqat(i)) repl=repl.lower(); - text=text.tqreplace(i, 1, repl ); + text=text.replace(i, 1, repl ); } break; case KoChangeCaseDia::SentenceCase: @@ -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.tqreplace(i, 1, text.tqat(i).upper() ); + text=text.replace(i, 1, text.tqat(i).upper() ); } } break; @@ -2343,21 +2343,21 @@ bool KoTextObject::statistics( TQProgressDialog *progress, ulong & charsWithSpac TQStringList syls = TQStringList::split(re, word); int word_syllables = 0; for ( TQStringList::Iterator it = subs_syl.begin(); it != subs_syl.end(); ++it ) { - if( word.tqfind(*it, 0, false) != -1 ) + if( word.find(*it, 0, false) != -1 ) word_syllables--; } for ( TQStringList::Iterator it = subs_syl_regexp.begin(); it != subs_syl_regexp.end(); ++it ) { re.setPattern(*it); - if( word.tqfind(re) != -1 ) + if( word.find(re) != -1 ) word_syllables--; } for ( TQStringList::Iterator it = add_syl.begin(); it != add_syl.end(); ++it ) { - if( word.tqfind(*it, 0, false) != -1 ) + if( word.find(*it, 0, false) != -1 ) word_syllables++; } for ( TQStringList::Iterator it = add_syl_regexp.begin(); it != add_syl_regexp.end(); ++it ) { re.setPattern(*it); - if( word.tqfind(re) != -1 ) + if( word.find(re) != -1 ) word_syllables++; } word_syllables += syls.count(); @@ -2375,11 +2375,11 @@ bool KoTextObject::statistics( TQProgressDialog *progress, ulong & charsWithSpac s = s + "."; } re.setPattern("[.?!]+"); // count "..." as only one "." - s.tqreplace(re, "."); + s.replace(re, "."); re.setPattern("\\d\\.\\d"); // don't count floating point numbers as sentences - s.tqreplace(re, "0,0"); + s.replace(re, "0,0"); re.setPattern("[A-Z]\\.+"); // don't count "U.S.A." as three sentences - s.tqreplace(re, "*"); + s.replace(re, "*"); for ( uint i = 0 ; i < s.length() ; ++i ) { TQChar ch = s[i]; diff --git a/lib/kotext/KoTextObject.h b/lib/kotext/KoTextObject.h index e1519ff4..a463d0fc 100644 --- a/lib/kotext/KoTextObject.h +++ b/lib/kotext/KoTextObject.h @@ -305,7 +305,7 @@ public: bool removeSelected ); void selectAll( bool select ); - /** Highlighting support (for search/tqreplace, spellchecking etc.). + /** 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 ); diff --git a/lib/kotext/KoTextParag.cpp b/lib/kotext/KoTextParag.cpp index f516b7ca..633bdb58 100644 --- a/lib/kotext/KoTextParag.cpp +++ b/lib/kotext/KoTextParag.cpp @@ -510,7 +510,7 @@ KoTextStringChar *KoTextParag::lineStartOfChar( int i, int *index, int *line ) c --l; } - kdWarning(32500) << "KoTextParag::lineStartOfChar: couldn't tqfind " << i << endl; + kdWarning(32500) << "KoTextParag::lineStartOfChar: couldn't find " << i << endl; return 0; } @@ -537,7 +537,7 @@ KoTextStringChar *KoTextParag::lineStartOfLine( int line, int *index ) const return &str->at( i ); } - kdWarning(32500) << "KoTextParag::lineStartOfLine: couldn't tqfind " << line << endl; + kdWarning(32500) << "KoTextParag::lineStartOfLine: couldn't find " << line << endl; return 0; } @@ -705,7 +705,7 @@ TQChar::Direction KoTextParag::direction() const void KoTextParag::setSelection( int id, int start, int end ) { - TQMap<int, KoTextParagSelection>::ConstIterator it = selections().tqfind( id ); + TQMap<int, KoTextParagSelection>::ConstIterator it = selections().find( id ); if ( it != mSelections->end() ) { if ( start == ( *it ).start && end == ( *it ).end ) return; @@ -731,7 +731,7 @@ int KoTextParag::selectionStart( int id ) const { if ( !mSelections ) return -1; - TQMap<int, KoTextParagSelection>::ConstIterator it = mSelections->tqfind( id ); + TQMap<int, KoTextParagSelection>::ConstIterator it = mSelections->find( id ); if ( it == mSelections->end() ) return -1; return ( *it ).start; @@ -741,7 +741,7 @@ int KoTextParag::selectionEnd( int id ) const { if ( !mSelections ) return -1; - TQMap<int, KoTextParagSelection>::ConstIterator it = mSelections->tqfind( id ); + TQMap<int, KoTextParagSelection>::ConstIterator it = mSelections->find( id ); if ( it == mSelections->end() ) return -1; return ( *it ).end; @@ -751,7 +751,7 @@ bool KoTextParag::hasSelection( int id ) const { if ( !mSelections ) return FALSE; - TQMap<int, KoTextParagSelection>::ConstIterator it = mSelections->tqfind( id ); + TQMap<int, KoTextParagSelection>::ConstIterator it = mSelections->find( id ); if ( it == mSelections->end() ) return FALSE; return ( *it ).start != ( *it ).end || length() == 1; @@ -761,7 +761,7 @@ bool KoTextParag::fullSelected( int id ) const { if ( !mSelections ) return FALSE; - TQMap<int, KoTextParagSelection>::ConstIterator it = mSelections->tqfind( id ); + TQMap<int, KoTextParagSelection>::ConstIterator it = mSelections->find( id ); if ( it == mSelections->end() ) return FALSE; return ( *it ).start == 0 && ( *it ).end == str->length() - 1; @@ -1509,7 +1509,7 @@ void KoTextParag::paintLines( TQPainter &painter, const TQColorGroup &cg, KoText int xstart, xend = 0; TQString qstr = str->toString(); - qstr.tqreplace( TQChar(0x00a0U), ' ' ); // Not all fonts have non-breakable-space glyph + qstr.replace( TQChar(0x00a0U), ' ' ); // Not all fonts have non-breakable-space glyph const int nSels = doc ? doc->numSelections() : 1; TQMemArray<int> selectionStarts( nSels ); @@ -1927,7 +1927,7 @@ void KoTextParag::drawParagStringInternal( TQPainter &painter, const TQString &s painter.drawText( startX, posY, str, start, len, dir ); } } - if ( str[ start ] == '\t' && m_tabCache.tqcontains( start ) ) { + if ( str[ start ] == '\t' && m_tabCache.contains( start ) ) { painter.save(); KoTextZoomHandler * zh = textDocument()->paintingZoomHandler(); const KoTabulator& tab = m_layout.tabList()[ m_tabCache[ start ] ]; @@ -2381,7 +2381,7 @@ void KoTextParag::printRTDebug( int info ) static const char * const tabtype[] = { "T_LEFT", "T_CENTER", "T_RIGHT", "T_DEC_PNT", "error!!!" }; KoTabulatorList tabList = m_layout.tabList(); if ( tabList.isEmpty() ) { - if ( str->toString().tqfind( '\t' ) != -1 ) + if ( str->toString().find( '\t' ) != -1 ) kdDebug(32500) << "Tab width: " << textDocument()->tabStopWidth() << endl; } else { KoTabulatorList::Iterator it = tabList.begin(); diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp index cea0fae1..32e82b73 100644 --- a/lib/kotext/KoTextView.cpp +++ b/lib/kotext/KoTextView.cpp @@ -1095,7 +1095,7 @@ TQPtrList<KAction> KoTextView::dataToolActionList(KInstance * instance, const TQ if ( textObject()->hasSelection() ) { text = textObject()->selectedText(); - if ( text.tqfind(' ') == -1 && text.tqfind('\t') == -1 && text.tqfind(KoTextObject::customItemChar()) == -1 ) + if ( text.find(' ') == -1 && text.find('\t') == -1 && text.find(KoTextObject::customItemChar()) == -1 ) { m_singleWord = true; } @@ -1103,7 +1103,7 @@ TQPtrList<KAction> KoTextView::dataToolActionList(KInstance * instance, const TQ { m_singleWord = false; //laurent : don't try to search thesaurus when we have a customItemChar. - if( text.tqfind(KoTextObject::customItemChar())!=-1) + if( text.find(KoTextObject::customItemChar())!=-1) text = TQString(); } } @@ -1166,13 +1166,13 @@ void KoTextView::slotToolActivated( const KDataToolInfo & info, const TQString & TQString mimetype = "application/x-qrichtext"; TQString datatype = "KoTextString"; // If unsupported, try text/plain - if ( !info.mimeTypes().tqcontains( mimetype ) ) + if ( !info.mimeTypes().contains( mimetype ) ) { mimetype = "text/plain"; datatype = TQSTRING_OBJECT_NAME_STRING; } // If unsupported (and if we have a single word indeed), try application/x-singleword - if ( !info.mimeTypes().tqcontains( mimetype ) && m_singleWord ) + if ( !info.mimeTypes().contains( mimetype ) && m_singleWord ) mimetype = "application/x-singleword"; kdDebug(32500) << "Running tool with datatype=" << datatype << " mimetype=" << mimetype << endl; diff --git a/lib/kotext/KoUserStyleCollection.h b/lib/kotext/KoUserStyleCollection.h index 9330ca4d..e9a771a9 100644 --- a/lib/kotext/KoUserStyleCollection.h +++ b/lib/kotext/KoUserStyleCollection.h @@ -61,7 +61,7 @@ public: /** * @return the index of @p style in the collection */ - int indexOf( KoUserStyle* style ) const { return m_styleList.tqfindIndex( style ); } + int indexOf( KoUserStyle* style ) const { return m_styleList.findIndex( style ); } /** * Return the list of all styles in the collection. diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp index bd03ecf9..0f8edaf8 100644 --- a/lib/kotext/KoVariable.cpp +++ b/lib/kotext/KoVariable.cpp @@ -245,8 +245,8 @@ TQString KoVariableDateFormat::convert( const TQVariant& data ) const TQString tmp ( dateTime.toString(m_strFormat) ); const int month = dateTime.date().month(); - tmp.tqreplace("PPPP", KGlobal::locale()->calendar()->monthNamePossessive(month, false)); //long possessive month name - tmp.tqreplace("PPP", KGlobal::locale()->calendar()->monthNamePossessive(month, true)); //short possessive month name + tmp.replace("PPPP", KGlobal::locale()->calendar()->monthNamePossessive(month, false)); //long possessive month name + tmp.replace("PPP", KGlobal::locale()->calendar()->monthNamePossessive(month, true)); //short possessive month name return tmp; } @@ -508,7 +508,7 @@ void KoVariableCollection::registerVariable( KoVariable *var ) void KoVariableCollection::unregisterVariable( KoVariable *var ) { - variables.take( variables.tqfindRef( var ) ); + variables.take( variables.findRef( var ) ); } TQValueList<KoVariable *> KoVariableCollection::recalcVariables(int type) @@ -554,14 +554,14 @@ void KoVariableCollection::setVariableValue( const TQString &name, const TQStrin TQString KoVariableCollection::getVariableValue( const TQString &name ) const { - if ( !varValues.tqcontains( name ) ) + if ( !varValues.contains( name ) ) return i18n( "No value" ); return varValues[ name ]; } bool KoVariableCollection::customVariableExist(const TQString &varname) const { - return varValues.tqcontains( varname ); + return varValues.contains( varname ); } void KoVariableCollection::setVariableSelected(KoVariable * var) @@ -757,7 +757,7 @@ KoVariable* KoVariableCollection::loadOasisField( KoTextDocument* textdoc, const TQString dataStyleName = tag.attributeNS( KoXmlNS::style, "data-style-name", TQString() ); TQString dateFormat = "locale"; const KoOasisStyles::DataFormatsMap& map = context.oasisStyles().dataFormats(); - KoOasisStyles::DataFormatsMap::const_iterator it = map.tqfind( dataStyleName ); + KoOasisStyles::DataFormatsMap::const_iterator it = map.find( dataStyleName ); if ( it != map.end() ) dateFormat = (*it).formatStr; @@ -1402,7 +1402,7 @@ TQCString KoDateVariable::formatStr(int & correct) const TQString tmpString(config->readEntry("Last Used"+num)); if(tmpString.startsWith("locale")) continue; - else if(stringList.tqcontains(tmpString)) + else if(stringList.contains(tmpString)) continue; else if(!tmpString.isEmpty()) { @@ -1614,7 +1614,7 @@ TQCString KoTimeVariable::formatStr(int & _correct) TQString tmpString(config->readEntry("Last Used"+num)); if(tmpString.startsWith("locale")) continue; - else if(stringList.tqcontains(tmpString)) + else if(stringList.contains(tmpString)) continue; else if(!tmpString.isEmpty()) { @@ -2225,7 +2225,7 @@ void KoFieldVariable::recalc() case VST_FILENAMEWITHOUTEXTENSION: { TQString file=m_doc->url().fileName(); - int pos=file.tqfindRev("."); + int pos=file.findRev("."); if(pos !=-1) value=file.mid(0,pos); else diff --git a/lib/kotext/TimeFormatWidget.cpp b/lib/kotext/TimeFormatWidget.cpp index 187b2929..34fd7cb2 100644 --- a/lib/kotext/TimeFormatWidget.cpp +++ b/lib/kotext/TimeFormatWidget.cpp @@ -116,7 +116,7 @@ TQString TimeFormatWidget::resultString() { const TQString lookup(combo1->currentText()); const TQStringList listTranslated( KoVariableTimeFormat::staticTranslatedFormatPropsList() ); - const int index = listTranslated.tqfindIndex(lookup); + const int index = listTranslated.findIndex(lookup); if (index==-1) return (lookup); // Either costum or non-locale diff --git a/lib/kotext/kohyphen/hyphdicts/hyph_da.dic b/lib/kotext/kohyphen/hyphdicts/hyph_da.dic index 2a7154fb..77d0666f 100644 --- a/lib/kotext/kohyphen/hyphdicts/hyph_da.dic +++ b/lib/kotext/kohyphen/hyphdicts/hyph_da.dic @@ -540,7 +540,7 @@ le4mo 4leu l1f lfin4 -ltqfind5 +lfind5 l1go1 l3h li4ga diff --git a/lib/kotext/kohyphen/hyphdicts/hyph_hu.dic b/lib/kotext/kohyphen/hyphdicts/hyph_hu.dic index 8b1bdce4..2137b1f9 100644 --- a/lib/kotext/kohyphen/hyphdicts/hyph_hu.dic +++ b/lib/kotext/kohyphen/hyphdicts/hyph_hu.dic @@ -25668,7 +25668,7 @@ fimeg1 fi1me 2f1i2nas fi1na -2tqfind +2find fin1os2z fi1no fi2n1ó diff --git a/lib/kotext/kohyphen/hyphdicts/hyph_nl.dic b/lib/kotext/kohyphen/hyphdicts/hyph_nl.dic index a5b6f05c..0a5b745b 100644 --- a/lib/kotext/kohyphen/hyphdicts/hyph_nl.dic +++ b/lib/kotext/kohyphen/hyphdicts/hyph_nl.dic @@ -3408,7 +3408,7 @@ fik4st fil4m3a film5on fi3lo -4tqfind +4find 3fini f3inj 4fink diff --git a/lib/kotext/kohyphen/kohyphen.cpp b/lib/kotext/kohyphen/kohyphen.cpp index 29d13c37..d8a0374e 100644 --- a/lib/kotext/kohyphen/kohyphen.cpp +++ b/lib/kotext/kohyphen/kohyphen.cpp @@ -71,7 +71,7 @@ KoHyphenator::KoHyphenator() for (uint i = 0; i < records.count(); i++) { TQDomNamedNodeMap attr = records.item(i).attributes(); - if (attr.tqcontains("lang") && attr.tqcontains("encoding")) { + if (attr.contains("lang") && attr.contains("encoding")) { TQString lang = attr.namedItem("lang").nodeValue(); TQString encoding = attr.namedItem("encoding").nodeValue(); #ifdef DEBUG_HYPHENATOR @@ -171,18 +171,18 @@ HyphenDict *KoHyphenator::dict(const TQString &_lang) const { TQString lang( _lang ); //only load dictionary when encoding info is present - if (encodings.tqfind(lang) == encodings.end()) + if (encodings.find(lang) == encodings.end()) { - int underscore = lang.tqfind('_'); + int underscore = lang.find('_'); if ( underscore > -1 ) { lang.truncate( underscore ); - if (encodings.tqfind(lang) == encodings.end()) + if (encodings.find(lang) == encodings.end()) throw KoHyphenatorException( TQString("No dictionary for %1").tqarg(lang) ); } else throw KoHyphenatorException( TQString("No dictionary for %1").tqarg(lang) ); } - if (dicts.tqfind(lang) == dicts.end()) + if (dicts.find(lang) == dicts.end()) { #ifdef DEBUG_HYPHENATOR kdDebug() << "Searching dictionary for '" << lang << "' language..." << endl; @@ -194,7 +194,7 @@ HyphenDict *KoHyphenator::dict(const TQString &_lang) const kdDebug() << "Loading dictionary for '" << lang << "' language: path = " << path << endl; #endif const_cast<KoHyphenator*>(this)->dicts.insert( lang, hnj_hyphen_load(TQFile::encodeName(path)) ); - if (dicts.tqfind(lang) == dicts.end()) + if (dicts.find(lang) == dicts.end()) { #ifdef DEBUG_HYPHENATOR kdDebug() << "No dictionary loaded" << endl; @@ -210,14 +210,14 @@ HyphenDict *KoHyphenator::dict(const TQString &_lang) const TQTextCodec* KoHyphenator::codecForLang(const TQString& lang) const { - EncodingMap::Iterator it = encodings.tqfind(lang); + EncodingMap::Iterator it = encodings.find(lang); if (it == encodings.end()) { - int underscore = lang.tqfind('_'); + int underscore = lang.find('_'); if ( underscore > -1 ) { TQString _lang( lang ); _lang.truncate( underscore ); - it = encodings.tqfind(_lang); + it = encodings.find(_lang); } } if (it != encodings.end()) diff --git a/lib/kotext/kohyphen/kohyphentest.cpp b/lib/kotext/kohyphen/kohyphentest.cpp index d5d8daff..96e0bd2d 100644 --- a/lib/kotext/kohyphen/kohyphentest.cpp +++ b/lib/kotext/kohyphen/kohyphentest.cpp @@ -34,7 +34,7 @@ void check_hyphenation( const TQStringList& tests, const TQStringList& results, for ( it = tests.begin(), itres = results.begin(); it != tests.end() ; ++it, ++itres ) { TQString result = hypher->hyphenate((*it), lang); kdDebug() << (*it) << " hyphenates like this: " << result << endl; - check( result.tqreplace(TQChar(0xad),'-'), *itres ); + check( result.replace(TQChar(0xad),'-'), *itres ); } } diff --git a/lib/kross/api/callable.cpp b/lib/kross/api/callable.cpp index a7a394ba..f095f596 100644 --- a/lib/kross/api/callable.cpp +++ b/lib/kross/api/callable.cpp @@ -47,7 +47,7 @@ const TQString Callable::getClassName() const bool Callable::hasChild(const TQString& name) const { - return m_tqchildren.tqcontains(name); + return m_tqchildren.contains(name); } Object::Ptr Callable::getChild(const TQString& name) const @@ -66,7 +66,7 @@ bool Callable::addChild(const TQString& name, Object* object) krossdebug( TQString("Kross::Api::Callable::addChild() object.name='%1' object.classname='%2'") .tqarg(name).tqarg(object->getClassName()) ); #endif - m_tqchildren.tqreplace(name, Object::Ptr(object)); + m_tqchildren.replace(name, Object::Ptr(object)); return true; } diff --git a/lib/kross/api/event.h b/lib/kross/api/event.h index e378052b..26a92117 100644 --- a/lib/kross/api/event.h +++ b/lib/kross/api/event.h @@ -97,7 +97,7 @@ namespace Kross { namespace Api { */ inline void addFunction(const TQString& name, FunctionPtr function) { - m_functions.tqreplace(name, new Function0<T>(static_cast<T*>(this), function)); + m_functions.replace(name, new Function0<T>(static_cast<T*>(this), function)); } /** @@ -114,7 +114,7 @@ namespace Kross { namespace Api { */ inline void addFunction(const TQString& name, Function* function) { - m_functions.tqreplace(name, function); + m_functions.replace(name, function); } /** @@ -124,7 +124,7 @@ namespace Kross { namespace Api { template<class RETURNOBJ, class ARG1OBJ, class ARG2OBJ, class ARG3OBJ, class ARG4OBJ, class INSTANCE, typename METHOD> inline void addFunction4(const TQString& name, INSTANCE* instance, METHOD method, ARG1OBJ* arg1 = 0, ARG2OBJ* arg2 = 0, ARG3OBJ* arg3 = 0, ARG4OBJ* arg4 = 0) { - m_functions.tqreplace(name, + m_functions.replace(name, new Kross::Api::ProxyFunction<INSTANCE, METHOD, RETURNOBJ, ARG1OBJ, ARG2OBJ, ARG3OBJ, ARG4OBJ> (instance, method, arg1, arg2, arg3, arg4) ); @@ -134,7 +134,7 @@ namespace Kross { namespace Api { template<class RETURNOBJ, class ARG1OBJ, class ARG2OBJ, class ARG3OBJ, class INSTANCE, typename METHOD> inline void addFunction3(const TQString& name, INSTANCE* instance, METHOD method, ARG1OBJ* arg1 = 0, ARG2OBJ* arg2 = 0, ARG3OBJ* arg3 = 0) { - m_functions.tqreplace(name, + m_functions.replace(name, new Kross::Api::ProxyFunction<INSTANCE, METHOD, RETURNOBJ, ARG1OBJ, ARG2OBJ, ARG3OBJ> (instance, method, arg1, arg2, arg3) ); @@ -144,7 +144,7 @@ namespace Kross { namespace Api { template<class RETURNOBJ, class ARG1OBJ, class ARG2OBJ, class INSTANCE, typename METHOD> inline void addFunction2(const TQString& name, INSTANCE* instance, METHOD method, ARG1OBJ* arg1 = 0, ARG2OBJ* arg2 = 0) { - m_functions.tqreplace(name, + m_functions.replace(name, new Kross::Api::ProxyFunction<INSTANCE, METHOD, RETURNOBJ, ARG1OBJ, ARG2OBJ> (instance, method, arg1, arg2) ); @@ -154,7 +154,7 @@ namespace Kross { namespace Api { template<class RETURNOBJ, class ARG1OBJ, class INSTANCE, typename METHOD> inline void addFunction1(const TQString& name, INSTANCE* instance, METHOD method, ARG1OBJ* arg1 = 0) { - m_functions.tqreplace(name, + m_functions.replace(name, new Kross::Api::ProxyFunction<INSTANCE, METHOD, RETURNOBJ, ARG1OBJ> (instance, method, arg1) ); @@ -164,7 +164,7 @@ namespace Kross { namespace Api { template<class RETURNOBJ, class INSTANCE, typename METHOD> inline void addFunction0(const TQString& name, INSTANCE* instance, METHOD method) { - m_functions.tqreplace(name, + m_functions.replace(name, new Kross::Api::ProxyFunction<INSTANCE, METHOD, RETURNOBJ> (instance, method) ); @@ -177,7 +177,7 @@ namespace Kross { namespace Api { */ bool isAFunction(const TQString & name) const { - return m_functions.tqcontains(name); + return m_functions.contains(name); } /** diff --git a/lib/kross/api/eventsignal.cpp b/lib/kross/api/eventsignal.cpp index c3e94620..e3a8e54f 100644 --- a/lib/kross/api/eventsignal.cpp +++ b/lib/kross/api/eventsignal.cpp @@ -54,7 +54,7 @@ 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()->tqfindSignal(n.latin1(), false); + int signalid = m_sender->tqmetaObject()->findSignal(n.latin1(), false); if(signalid < 0) throw new Exception(TQString("No such signal '%1'.").tqarg(n)); diff --git a/lib/kross/api/eventslot.cpp b/lib/kross/api/eventslot.cpp index fed92ea0..fd566d31 100644 --- a/lib/kross/api/eventslot.cpp +++ b/lib/kross/api/eventslot.cpp @@ -54,7 +54,7 @@ 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()->tqfindSlot(n.latin1(), false); + int slotid = m_receiver->tqmetaObject()->findSlot(n.latin1(), false); if(slotid < 0) throw Exception::Ptr( new Exception(TQString("No such slot '%1'.").tqarg(n)) ); @@ -69,8 +69,8 @@ Object::Ptr EventSlot::call(const TQString& /*name*/, List::Ptr arguments) TQCString EventSlot::getSlot(const TQCString& signal) { TQString signature = TQString(signal).mid(1); - int startpos = signature.tqfind("("); - int endpos = signature.tqfindRev(")"); + int startpos = signature.find("("); + int endpos = signature.findRev(")"); if(startpos < 0 || startpos > endpos) { krosswarning( TQString("EventSlot::getSlot(%1) Invalid signal.").tqarg(signal) ); return TQCString(); diff --git a/lib/kross/api/interpreter.cpp b/lib/kross/api/interpreter.cpp index c6796e1f..8d266930 100644 --- a/lib/kross/api/interpreter.cpp +++ b/lib/kross/api/interpreter.cpp @@ -71,7 +71,7 @@ const TQStringList InterpreterInfo::getMimeTypes() bool InterpreterInfo::hasOption(const TQString& key) { - return m_options.tqcontains(key); + return m_options.contains(key); } InterpreterInfo::Option* InterpreterInfo::getOption(const TQString name) diff --git a/lib/kross/api/qtobject.cpp b/lib/kross/api/qtobject.cpp index 2aa8f408..243f0503 100644 --- a/lib/kross/api/qtobject.cpp +++ b/lib/kross/api/qtobject.cpp @@ -90,8 +90,8 @@ TQObject* QtObject::getObject() TQUObject* QtObject::toTQUObject(const TQString& signature, List::Ptr arguments) { - int startpos = signature.tqfind("("); - int endpos = signature.tqfindRev(")"); + 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)) ); @@ -112,7 +112,7 @@ TQUObject* QtObject::toTQUObject(const TQString& signature, List::Ptr arguments) // Fill parameters. uint argcount = arguments ? arguments->count() : 0; for(uint i = 0; i < paramcount; i++) { - if(paramlist[i].tqfind(TQSTRING_OBJECT_NAME_STRING) >= 0) { + 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)); static_TQUType_TQString.set( &(uo[i + 1]), s ); @@ -135,7 +135,7 @@ Kross::Api::Object::Ptr QtObject::propertyNames(Kross::Api::List::Ptr) Kross::Api::Object::Ptr QtObject::hasProperty(Kross::Api::List::Ptr args) { return new Kross::Api::Variant( - m_object->tqmetaObject()->tqfindProperty(Kross::Api::Variant::toString(args->item(0)).latin1(), false)); + m_object->tqmetaObject()->findProperty(Kross::Api::Variant::toString(args->item(0)).latin1(), false)); } Kross::Api::Object::Ptr QtObject::getProperty(Kross::Api::List::Ptr args) @@ -164,7 +164,7 @@ Kross::Api::Object::Ptr QtObject::slotNames(Kross::Api::List::Ptr) Kross::Api::Object::Ptr QtObject::hasSlot(Kross::Api::List::Ptr args) { return new Kross::Api::Variant( - bool(m_object->tqmetaObject()->slotNames(false).tqfind( + bool(m_object->tqmetaObject()->slotNames(false).find( Kross::Api::Variant::toString(args->item(0)).latin1() ) != -1)); } @@ -173,7 +173,7 @@ 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()->tqfindSlot(name.latin1(), false); + int slotid = m_object->tqmetaObject()->findSlot(name.latin1(), false); if(slotid < 0) throw Exception::Ptr( new Exception(TQString("No such slot '%1'.").tqarg(name)) ); @@ -193,7 +193,7 @@ Kross::Api::Object::Ptr QtObject::signalNames(Kross::Api::List::Ptr) Kross::Api::Object::Ptr QtObject::hasSignal(Kross::Api::List::Ptr args) { return new Kross::Api::Variant( - bool(m_object->tqmetaObject()->signalNames(false).tqfind( + bool(m_object->tqmetaObject()->signalNames(false).find( Kross::Api::Variant::toString(args->item(0)).latin1() ) != -1)); } @@ -201,7 +201,7 @@ 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()->tqfindSignal(name.latin1(), false); + int signalid = m_object->tqmetaObject()->findSignal(name.latin1(), false); if(signalid < 0) throw Exception::Ptr( new Exception(TQString("No such signal '%1'.").tqarg(name)) ); m_object->qt_invoke(signalid, 0); //TODO convert Kross::Api::List::Ptr => TQUObject* diff --git a/lib/kross/main/manager.cpp b/lib/kross/main/manager.cpp index b966a1cc..646a8746 100644 --- a/lib/kross/main/manager.cpp +++ b/lib/kross/main/manager.cpp @@ -83,10 +83,10 @@ Manager::Manager() TQString pythonlib = TQFile::encodeName( KLibLoader::self()->findLibrary(KROSS_PYTHON_LIBRARY) ); if(! pythonlib.isEmpty()) { // If the Kross Python plugin exists we offer it as supported scripting language. InterpreterInfo::Option::Map pythonoptions; - pythonoptions.tqreplace("restricted", + pythonoptions.replace("restricted", new InterpreterInfo::Option("Restricted", "Restricted Python interpreter", TQVariant(false,0)) ); - d->interpreterinfos.tqreplace("python", + d->interpreterinfos.replace("python", new InterpreterInfo("python", pythonlib, // library "*.py", // file filter-wildcard @@ -100,10 +100,10 @@ Manager::Manager() TQString rubylib = TQFile::encodeName( KLibLoader::self()->findLibrary(KROSS_RUBY_LIBRARY) ); if(! rubylib.isEmpty()) { // If the Kross Ruby plugin exists we offer it as supported scripting language. InterpreterInfo::Option::Map rubyoptions; - rubyoptions.tqreplace("safelevel", + rubyoptions.replace("safelevel", new InterpreterInfo::Option("safelevel", "Level of safety of the Ruby interpreter", TQVariant(0)) // 0 -> unsafe, 4 -> very safe ); - d->interpreterinfos.tqreplace("ruby", + d->interpreterinfos.replace("ruby", new InterpreterInfo("ruby", rubylib, // library "*.rb", // file filter-wildcard @@ -131,7 +131,7 @@ TQMap<TQString, InterpreterInfo*> Manager::getInterpreterInfos() bool Manager::hasInterpreterInfo(const TQString& interpretername) const { - return d->interpreterinfos.tqcontains(interpretername); + return d->interpreterinfos.contains(interpretername); } InterpreterInfo* Manager::getInterpreterInfo(const TQString& interpretername) @@ -145,7 +145,7 @@ const TQString Manager::getInterpreternameForFile(const TQString& file) rx.setWildcard(true); for(TQMap<TQString, InterpreterInfo*>::Iterator it = d->interpreterinfos.begin(); it != d->interpreterinfos.end(); ++it) { rx.setPattern((*it)->getWildcard()); - if( file.tqfind(rx) >= 0 ) + if( file.find(rx) >= 0 ) return (*it)->getInterpretername(); } return TQString(); @@ -155,11 +155,11 @@ ScriptContainer::Ptr Manager::getScriptContainer(const TQString& scriptname) { //TODO at the moment we don't share ScriptContainer instances. - //if(d->m_scriptcontainers.tqcontains(scriptname)) + //if(d->m_scriptcontainers.contains(scriptname)) // return d->m_scriptcontainers[scriptname]; ScriptContainer* scriptcontainer = new ScriptContainer(scriptname); //ScriptContainer script(this, scriptname); - //d->m_scriptcontainers.tqreplace(scriptname, scriptcontainer); + //d->m_scriptcontainers.replace(scriptname, scriptcontainer); return scriptcontainer; } @@ -168,7 +168,7 @@ Interpreter* Manager::getInterpreter(const TQString& interpretername) { setException(0); // clear previous exceptions - if(! d->interpreterinfos.tqcontains(interpretername)) { + if(! d->interpreterinfos.contains(interpretername)) { setException( new Exception(i18n("No such interpreter '%1'").tqarg(interpretername)) ); return 0; } @@ -192,8 +192,8 @@ const TQStringList Manager::getInterpreters() bool Manager::addModule(Module::Ptr module) { TQString name = module->getName(); - //if( d->modules.tqcontains(name) ) return false; - d->modules.tqreplace(name, module); + //if( d->modules.contains(name) ) return false; + d->modules.replace(name, module); return true; } @@ -201,7 +201,7 @@ Module::Ptr Manager::loadModule(const TQString& modulename) { Module::Ptr module = 0; - if(d->modules.tqcontains(modulename)) { + if(d->modules.contains(modulename)) { module = d->modules[modulename]; if(module) return module; @@ -240,7 +240,7 @@ Module::Ptr Manager::loadModule(const TQString& modulename) } // Don't remember module cause we like to have freeing it handled by the caller. - //d->modules.tqreplace(modulename, module); + //d->modules.replace(modulename, module); //krossdebug( TQString("Kross::Api::Manager::loadModule modulename='%1' module='%2'").tqarg(modulename).tqarg(module->toString()) ); return module; diff --git a/lib/kross/main/scriptaction.h b/lib/kross/main/scriptaction.h index 27f910d0..4b78d611 100644 --- a/lib/kross/main/scriptaction.h +++ b/lib/kross/main/scriptaction.h @@ -174,7 +174,7 @@ namespace Kross { namespace Api { /** * This signal got emitted after the try to execute this - * \a ScriptAction failed. The \p errormessage tqcontains + * \a ScriptAction failed. The \p errormessage contains * the error message. */ void failed(const TQString& errormessage, const TQString& tracedetails); diff --git a/lib/kross/main/scriptcontainer.cpp b/lib/kross/main/scriptcontainer.cpp index 5acde9db..a345dd02 100644 --- a/lib/kross/main/scriptcontainer.cpp +++ b/lib/kross/main/scriptcontainer.cpp @@ -151,7 +151,7 @@ TQMap<TQString, TQVariant>& ScriptContainer::getOptions() TQVariant ScriptContainer::getOption(const TQString name, TQVariant defaultvalue, bool /*recursive*/) { - if(d->options.tqcontains(name)) + if(d->options.contains(name)) return d->options[name]; Kross::Api::InterpreterInfo* info = Kross::Api::Manager::scriptManager()->getInterpreterInfo( d->interpretername ); return info ? info->getOptionValue(name, defaultvalue) : defaultvalue; @@ -162,7 +162,7 @@ bool ScriptContainer::setOption(const TQString name, const TQVariant& value) Kross::Api::InterpreterInfo* info = Kross::Api::Manager::scriptManager()->getInterpreterInfo( d->interpretername ); if(info) { if(info->hasOption(name)) { - d->options.tqreplace(name, value); + 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()) ); diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp index 36d81151..ebcf0b00 100644 --- a/lib/kross/main/scriptguiclient.cpp +++ b/lib/kross/main/scriptguiclient.cpp @@ -82,11 +82,11 @@ ScriptGUIClient::ScriptGUIClient(KXMLGUIClient* guiclient, TQWidget* tqparent) new KAction(i18n("Scripts Manager..."), 0, 0, this, TQT_SLOT(showScriptManager()), actionCollection(), "configurescripts"); // The predefined ScriptActionCollection's this ScriptGUIClient provides. - d->collections.tqreplace("installedscripts", + d->collections.replace("installedscripts", new ScriptActionCollection(i18n("Scripts"), actionCollection(), "installedscripts") ); - d->collections.tqreplace("loadedscripts", + d->collections.replace("loadedscripts", new ScriptActionCollection(i18n("Loaded"), actionCollection(), "loadedscripts") ); - d->collections.tqreplace("executedscripts", + d->collections.replace("executedscripts", new ScriptActionCollection(i18n("History"), actionCollection(), "executedscripts") ); reloadInstalledScripts(); @@ -102,7 +102,7 @@ ScriptGUIClient::~ScriptGUIClient() bool ScriptGUIClient::hasActionCollection(const TQString& name) { - return d->collections.tqcontains(name); + return d->collections.contains(name); } ScriptActionCollection* ScriptGUIClient::getActionCollection(const TQString& name) @@ -118,12 +118,12 @@ TQMap<TQString, ScriptActionCollection*> ScriptGUIClient::getActionCollections() void ScriptGUIClient::addActionCollection(const TQString& name, ScriptActionCollection* collection) { removeActionCollection(name); - d->collections.tqreplace(name, collection); + d->collections.replace(name, collection); } bool ScriptGUIClient::removeActionCollection(const TQString& name) { - if(d->collections.tqcontains(name)) { + if(d->collections.contains(name)) { ScriptActionCollection* c = d->collections[name]; d->collections.remove(name); delete c; diff --git a/lib/kross/python/pythonextension.cpp b/lib/kross/python/pythonextension.cpp index aab781ab..f13cf93a 100644 --- a/lib/kross/python/pythonextension.cpp +++ b/lib/kross/python/pythonextension.cpp @@ -177,7 +177,7 @@ Kross::Api::Dict::Ptr PythonExtension::toObject(const Py::Dict& dict) uint length = l.length(); for(Py::List::size_type i = 0; i < length; ++i) { const char* n = l[i].str().as_string().c_str(); - map.tqreplace(n, toObject( dict[n] )); + map.replace(n, toObject( dict[n] )); } return new Kross::Api::Dict(map); } diff --git a/lib/kross/python/pythonmodule.cpp b/lib/kross/python/pythonmodule.cpp index 9c3353ea..24b43159 100644 --- a/lib/kross/python/pythonmodule.cpp +++ b/lib/kross/python/pythonmodule.cpp @@ -84,7 +84,7 @@ Py::Object PythonModule::import(const Py::Tuple& args) #ifdef KROSS_PYTHON_MODULE_DEBUG krossdebug( TQString("Kross::Python::PythonModule::import() module=%1").tqarg(modname) ); #endif - if( modname.tqfind( TQRegExp("[^a-zA-Z0-9\\_\\-]") ) >= 0 ) { + if( modname.find( TQRegExp("[^a-zA-Z0-9\\_\\-]") ) >= 0 ) { krosswarning( TQString("Denied import of Kross module '%1' cause of untrusted chars.").tqarg(modname) ); } else { diff --git a/lib/kross/python/pythonobject.cpp b/lib/kross/python/pythonobject.cpp index f765cbbd..9689d222 100644 --- a/lib/kross/python/pythonobject.cpp +++ b/lib/kross/python/pythonobject.cpp @@ -67,7 +67,7 @@ Kross::Api::Object::Ptr PythonObject::call(const TQString& name, Kross::Api::Lis krossdebug( TQString("PythonObject::call(%1)").tqarg(name) ); if(m_pyobject.isInstance()) { - //if(! m_calls.tqcontains(n)) throw ... + //if(! m_calls.contains(n)) throw ... 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 !!! diff --git a/lib/kross/python/pythonscript.cpp b/lib/kross/python/pythonscript.cpp index 4bf37c74..7d34a6fb 100644 --- a/lib/kross/python/pythonscript.cpp +++ b/lib/kross/python/pythonscript.cpp @@ -386,7 +386,7 @@ Kross::Api::Object::Ptr PythonScript::callFunction(const TQString& name, Kross:: // Try to determinate the function we like to execute. PyObject* func = PyDict_GetItemString(moduledict.ptr(), name.latin1()); - if( (! d->m_functions.tqcontains(name)) || (! func) ) + if( (! d->m_functions.contains(name)) || (! func) ) throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("No such function '%1'.").tqarg(name)) ); Py::Callable funcobject(func, true); // the funcobject takes care of freeing our func pyobject. @@ -432,7 +432,7 @@ 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.tqcontains(name)) || (! pyclass) ) + if( (! d->m_classes.contains(name)) || (! pyclass) ) throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(TQString("No such class '%1'.").tqarg(name)) ); PyObject *pyobj = PyInstance_New(pyclass, 0, 0);//aclarg, 0); diff --git a/lib/kross/python/scripts/gui.py b/lib/kross/python/scripts/gui.py index 89a07066..997e9849 100755 --- a/lib/kross/python/scripts/gui.py +++ b/lib/kross/python/scripts/gui.py @@ -197,7 +197,7 @@ class QtDialog: class Label(qt.QLabel): def __init__(self, dialog, tqparent, caption): qt.QLabel.__init__(self, tqparent) - self.setText("<qt>%s</qt>" % caption.tqreplace("\n","<br>")) + self.setText("<qt>%s</qt>" % caption.replace("\n","<br>")) class Frame(qt.QHBox): def __init__(self, dialog, tqparent): diff --git a/lib/kross/ruby/rubyextension.cpp b/lib/kross/ruby/rubyextension.cpp index c989976d..6c2cb40f 100644 --- a/lib/kross/ruby/rubyextension.cpp +++ b/lib/kross/ruby/rubyextension.cpp @@ -141,7 +141,7 @@ int RubyExtension::convertHash_i(VALUE key, VALUE value, VALUE vmap) if (key != Qundef) { Kross::Api::Object::Ptr o = RubyExtension::toObject( value ); - if(o) map->tqreplace(STR2CSTR(key), o); + if(o) map->replace(STR2CSTR(key), o); } return ST_CONTINUE; } diff --git a/lib/kross/ruby/rubyinterpreter.cpp b/lib/kross/ruby/rubyinterpreter.cpp index d1fbec01..4a4df32f 100644 --- a/lib/kross/ruby/rubyinterpreter.cpp +++ b/lib/kross/ruby/rubyinterpreter.cpp @@ -122,7 +122,7 @@ VALUE RubyInterpreter::require (VALUE obj, VALUE name) TQString modname = StringValuePtr(name); if(modname.startsWith("kross")) { krossdebug( TQString("RubyInterpreter::require() module=%1").tqarg(modname) ); - if( modname.tqfind( TQRegExp("[^a-zA-Z0-9\\_\\-]") ) >= 0 ) { + if( modname.find( TQRegExp("[^a-zA-Z0-9\\_\\-]") ) >= 0 ) { krosswarning( TQString("Denied import of Kross module '%1' cause of untrusted chars.").tqarg(modname) ); } else { diff --git a/lib/store/KoDirectoryStore.cpp b/lib/store/KoDirectoryStore.cpp index 8cf30788..76e5aa72 100644 --- a/lib/store/KoDirectoryStore.cpp +++ b/lib/store/KoDirectoryStore.cpp @@ -27,7 +27,7 @@ KoDirectoryStore::KoDirectoryStore( const TQString& path, Mode _mode ) : m_basePath( path ) { - const int pos = path.tqfindRev( '/' ); + const int pos = path.findRev( '/' ); // The parameter must include "maindoc.xml" or "content.xml" if ( pos != -1 && pos != (int)m_basePath.length()-1 ) m_basePath = m_basePath.left( pos ); @@ -60,7 +60,7 @@ bool KoDirectoryStore::init( Mode _mode ) bool KoDirectoryStore::openReadOrWrite( const TQString& name, int iomode ) { //kdDebug(s_area) << "KoDirectoryStore::openReadOrWrite m_currentPath=" << m_currentPath << " name=" << name << endl; - int pos = name.tqfindRev('/'); + int pos = name.findRev('/'); if ( pos != -1 ) // there are subdirs in the name -> maybe need to create them, when writing { pushDirectory(); // remember where we were diff --git a/lib/store/KoStore.cpp b/lib/store/KoStore.cpp index a027bf7e..4a98aa11 100644 --- a/lib/store/KoStore.cpp +++ b/lib/store/KoStore.cpp @@ -208,7 +208,7 @@ bool KoStore::open( const TQString & _name ) if ( m_mode == Write ) { kdDebug(s_area) << "KoStore: opening for writing '" << m_sName << "'" << endl; - if ( m_strFiles.tqfindIndex( m_sName ) != -1 ) // just check if it's there + if ( m_strFiles.findIndex( m_sName ) != -1 ) // just check if it's there { kdWarning(s_area) << "KoStore: Duplicate filename " << m_sName << endl; //return KIO::ERR_FILE_ALREADY_EXIST; @@ -379,7 +379,7 @@ bool KoStore::enterDirectory( const TQString& directory ) bool success = true; TQString tmp( directory ); - while ( ( pos = tmp.tqfind( '/' ) ) != -1 && + while ( ( pos = tmp.find( '/' ) ) != -1 && ( success = enterDirectoryInternal( tmp.left( pos ) ) ) ) tmp = tmp.mid( pos + 1 ); @@ -562,7 +562,7 @@ TQString KoStore::expandEncodedPath( TQString intern ) const TQString result; int pos; - if ( ( pos = intern.tqfindRev( '/', -1 ) ) != -1 ) { + if ( ( pos = intern.findRev( '/', -1 ) ) != -1 ) { result = expandEncodedDirectory( intern.left( pos ) ) + '/'; intern = intern.mid( pos + 1 ); } @@ -595,7 +595,7 @@ TQString KoStore::expandEncodedDirectory( TQString intern ) const TQString result; int pos; - while ( ( pos = intern.tqfind( '/' ) ) != -1 ) { + while ( ( pos = intern.find( '/' ) ) != -1 ) { if ( TQChar(intern.at(0)).isDigit() ) result += "part"; result += intern.left( pos + 1 ); // copy numbers (or "pictures") + "/" diff --git a/lib/store/KoXmlWriter.cpp b/lib/store/KoXmlWriter.cpp index 4260f76f..dca95d8a 100644 --- a/lib/store/KoXmlWriter.cpp +++ b/lib/store/KoXmlWriter.cpp @@ -393,7 +393,7 @@ void KoXmlWriter::addTextSpan( const TQString& text, const TQMap<int, int>& tabC addTextNode( str ); str = TQString(); startElement( "text:tab" ); - if ( tabCache.tqcontains( i ) ) + if ( tabCache.contains( i ) ) addAttribute( "text:tab-ref", tabCache[i] + 1 ); endElement(); break; diff --git a/lib/store/tests/xmlwritertest.h b/lib/store/tests/xmlwritertest.h index b3d305ea..cdafe8a5 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.tqreplace( TQRegExp( TQString::tqfromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \ - s2.tqreplace( TQRegExp( TQString::tqfromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \ + s1.replace( TQRegExp( TQString::tqfromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \ + s2.replace( TQRegExp( TQString::tqfromLatin1( "[x]{1000}" ) ), "[x]*1000" ); \ qDebug( "%s", s1.data() ); \ qDebug( "Expected:\n%s", s2.data() ); \ return 1; /*exit*/ \ diff --git a/tools/kfile-plugins/abiword/kfile_abiword.cpp b/tools/kfile-plugins/abiword/kfile_abiword.cpp index f643a649..ca130b15 100644 --- a/tools/kfile-plugins/abiword/kfile_abiword.cpp +++ b/tools/kfile-plugins/abiword/kfile_abiword.cpp @@ -66,7 +66,7 @@ bool AbiwordPlugin::readInfo( KFileMetaInfo& info, uint what) //Find the last extension TQString strExt; - const int result=info.path().tqfindRev('.'); + const int result=info.path().findRev('.'); if (result>=0) { strExt=info.path().mid(result); diff --git a/tools/kfile-plugins/ooo/kfile_ooo.cpp b/tools/kfile-plugins/ooo/kfile_ooo.cpp index 8d72d076..8b873ac1 100644 --- a/tools/kfile-plugins/ooo/kfile_ooo.cpp +++ b/tools/kfile-plugins/ooo/kfile_ooo.cpp @@ -391,7 +391,7 @@ bool KOfficePlugin::writeTextNode(TQDomDocument & doc, if (nodeA.firstChild().isNull()) nodeA.appendChild(txtNode); else - nodeA.tqreplaceChild( txtNode, nodeA.firstChild()); + nodeA.replaceChild( txtNode, nodeA.firstChild()); return true; } @@ -436,7 +436,7 @@ bool KOfficePlugin::writeInfo( const KFileMetaInfo& info) const if (s != el.text()){ TQDomText txt = doc.createTextNode(s); if (!el.firstChild().isNull()) - el.tqreplaceChild(txt, el.firstChild()); + el.replaceChild(txt, el.firstChild()); else el.appendChild(txt); } diff --git a/tools/thesaurus/main.cc b/tools/thesaurus/main.cc index e7edffa7..53ef6080 100644 --- a/tools/thesaurus/main.cc +++ b/tools/thesaurus/main.cc @@ -185,10 +185,10 @@ Thesaurus::Thesaurus(TQObject* tqparent, const char* name, const TQStringList &) connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotGotoHistory(int))); TQHBoxLayout *row2 = new TQHBoxLayout( m_top_layout ); - m_tqreplace = new KLineEdit(m_page); - m_replace_label = new TQLabel(m_tqreplace, i18n("&Replace with:"), m_page); + m_replace = new KLineEdit(m_page); + m_replace_label = new TQLabel(m_replace, i18n("&Replace with:"), m_page); row2->addWidget(m_replace_label, 0); - row2->addWidget(m_tqreplace, 1); + row2->addWidget(m_replace, 1); // Set focus m_edit->setFocus(); @@ -255,7 +255,7 @@ bool Thesaurus::run(const TQString& command, void* data, const TQString& datatyp m_replacement = false; m_dialog->showButtonOK(false); m_dialog->setButtonCancelText(i18n("&Close")); - m_tqreplace->setEnabled(false); + m_replace->setEnabled(false); m_replace_label->setEnabled(false); } else { kdDebug(31000) << "Thesaurus does only accept the command 'thesaurus' or 'thesaurus_standalone'" << endl; @@ -281,7 +281,7 @@ bool Thesaurus::run(const TQString& command, void* data, const TQString& datatyp } if( m_dialog->exec() == TQDialog::Accepted ) { // "Replace" - *((TQString*)data) = m_tqreplace->text(); + *((TQString*)data) = m_replace->text(); } return TRUE; @@ -350,13 +350,13 @@ void Thesaurus::slotSetReplaceTerm(TQListBoxItem *item) { if( ! item ) return; - m_tqreplace->setText(item->text()); + m_replace->setText(item->text()); } void Thesaurus::slotSetReplaceTerm(const TQString &term) { if( m_replacement && term != m_no_match ) { - m_tqreplace->setText(term); + m_replace->setText(term); } } @@ -446,7 +446,7 @@ void Thesaurus::thesExited(KProcess *) if( line.startsWith(" ") ) { // ignore license (two spaces) continue; } - int sep_pos = line.tqfind("#"); + int sep_pos = line.find("#"); TQString syn_part = line.left(sep_pos); TQString hyper_part = line.right(line.length()-sep_pos-1); TQStringList syn_tmp = TQStringList::split(TQChar(';'), syn_part); @@ -456,13 +456,13 @@ void Thesaurus::thesExited(KProcess *) for ( TQStringList::Iterator it2 = syn_tmp.begin(); it2 != syn_tmp.end(); ++it2 ) { // add if it's not the term itself and if it's not yet in the list TQString term = (*it2); - if( term.lower() != search_term.lower() && syn.tqcontains(term) == 0 ) { + if( term.lower() != search_term.lower() && syn.contains(term) == 0 ) { syn.append(term); } } for ( TQStringList::Iterator it2 = hyper_tmp.begin(); it2 != hyper_tmp.end(); ++it2 ) { TQString term = (*it2); - if( term.lower() != search_term.lower() && hyper.tqcontains(term) == 0 ) { + if( term.lower() != search_term.lower() && hyper.contains(term) == 0 ) { hyper.append(term); } } @@ -471,7 +471,7 @@ void Thesaurus::thesExited(KProcess *) // match on the right side of the '#' -- hypernyms for ( TQStringList::Iterator it2 = syn_tmp.begin(); it2 != syn_tmp.end(); ++it2 ) { TQString term = (*it2); - if( term.lower() != search_term && hypo.tqcontains(term) == 0 ) { + if( term.lower() != search_term && hypo.contains(term) == 0 ) { hypo.append(term); } } @@ -671,9 +671,9 @@ void Thesaurus::wnExited(KProcess *) continue; } // Escape XML: - l = l.tqreplace('&', "&"); - l = l.tqreplace('<', "<"); - l = l.tqreplace('>', ">"); + l = l.replace('&', "&"); + l = l.replace('<', "<"); + l = l.replace('>', ">"); // TODO?: // move "=>" in own column? l = formatLine(l); @@ -768,7 +768,7 @@ TQString Thesaurus::formatLine(TQString l) re.setPattern("(.*)(=>|HAS \\w+:|PART OF:)(.*) --"); re.setMinimal(true); // non-greedy if( re.search(l) != -1 ) { - int dash_pos = l.tqfind("--"); + int dash_pos = l.find("--"); TQString line_end = l.mid(dash_pos+2, l.length()-dash_pos); l = re.cap(1); l += re.cap(2) + " "; diff --git a/tools/thesaurus/main.h b/tools/thesaurus/main.h index 9225bb55..6a6460c3 100644 --- a/tools/thesaurus/main.h +++ b/tools/thesaurus/main.h @@ -144,7 +144,7 @@ protected: TQLabel *m_edit_label; TQLabel *m_replace_label; - KLineEdit *m_tqreplace; + KLineEdit *m_replace; TQString m_data_file; diff --git a/tools/thesaurus/thesaurus.txt b/tools/thesaurus/thesaurus.txt index 8b182981..e7b38dd7 100644 --- a/tools/thesaurus/thesaurus.txt +++ b/tools/thesaurus/thesaurus.txt @@ -4091,8 +4091,8 @@ ;encounter;coming upon;#;joining;connection;connexion; ;junction;adjunction;#;joining;connection;connexion; ;lick;lap;#;touch;touching; -;discovery;tqfind;uncovering;#;deed;feat;effort;exploit; -;determination;finding;#;discovery;tqfind;uncovering; +;discovery;find;uncovering;#;deed;feat;effort;exploit; +;determination;finding;#;discovery;find;uncovering; ;designation;identification;#;determination;finding; ;diagnosis;diagnosing;#;designation;identification; ;prognosis;prospect;medical prognosis;#;medical diagnosis; @@ -6109,7 +6109,7 @@ ;filter;#;electrical device; ;finger;#;covering; ;fipple flute;fipple pipe;recorder;vertical flute;#;woodwind;woodwind instrument;wood; -;fire;#;fitqreplace;hearth;open fitqreplace; +;fire;#;fireplace;hearth;open fireplace; ;firearm;piece;small-arm;#;gun; ;first gear;first;low gear;low;#;gear;gear mechanism; ;fishing gear;tackle;fishing tackle;#;gear;paraphernalia;appurtenances; @@ -8257,7 +8257,7 @@ ;realization;realisation;recognition;#;understanding;apprehension;discernment;savvy; ;light;#;insight;brainstorm;brainwave; ;revelation;#;insight;brainstorm;brainwave; -;discovery;breakthrough;tqfind;#;insight;brainstorm;brainwave; +;discovery;breakthrough;find;#;insight;brainstorm;brainwave; ;flash;#;insight;brainstorm;brainwave; ;linguistic process;language;#;higher cognitive process; ;reading;#;linguistic process;language; @@ -15155,10 +15155,10 @@ ;advance;gain;#;wax;mount;climb;rise; ;raise;#;increase; ;accumulate;cumulate;conglomerate;pile up;gather;amass;#;increase; -;change;exchange;commute;convert;#;tqreplace; +;change;exchange;commute;convert;#;replace; ;commute;convert;exchange;#;change;alter; -;tqreplace;#;regenerate;renew; -;change;#;tqreplace; +;replace;#;regenerate;renew; +;change;#;replace; ;proof;#;strengthen; ;shake;#;weaken; ;reform;straighten out;see the light;#;better;improve;ameliorate;meliorate; @@ -15320,7 +15320,7 @@ ;age;#;change;alter; ;mature;maturate;grow;#;develop; ;grow;#;change; -;find oneself;tqfind;#;mature;maturate;grow; +;find oneself;find;#;mature;maturate;grow; ;evolve;#;develop; ;evolve;work out;work up;#;develop;make grow; ;elaborate;work out;#;develop;make grow; @@ -15797,8 +15797,8 @@ ;blue;#;discolor;discolour;colour;color; ;translate;#;move;displace; ;inform;#;change;alter; -;receive;get;tqfind;obtain;incur;#;change; -;take;#;receive;get;tqfind;obtain;incur; +;receive;get;find;obtain;incur;#;change; +;take;#;receive;get;find;obtain;incur; ;assume;acquire;adopt;take on;take;#;change; ;parallel;collimate;#;change;alter; ;camp;#;change;alter; @@ -15844,7 +15844,7 @@ ;come back;return;be restored;#;reappear;re-emerge; ;drop;#;change; ;mangle;mutilate;murder;#;disfigure;distort; -;shift;#;substitute;tqreplace; +;shift;#;substitute;replace; ;run;#;become;go;get; ;clear;#;change;alter; ;save;make unnecessary;#;prevent;forestall;foreclose;preclude;forbid; @@ -16201,7 +16201,7 @@ ;identify;#;associate;tie in;relate;link;link up;connect; ;debate;#;deliberate;cogitate; ;conclude;#;end;terminate;cease; -;tqfind;feel;#;conclude; +;find;feel;#;conclude; ;pin down;peg down;nail down;narrow down;narrow;specify;#;determine; ;rule;decree;#;decide;make up one's mind;determine; ;overrule;overturn;override;overthrow;reverse;#;rule;decree; @@ -16222,7 +16222,7 @@ ;divine;#;think;opine;suppose;imagine;reckon;guess; ;tell;#;guess;infer; ;believe;trust;#;expect;anticipate; -;discover;tqfind;#;learn;hear;get word;get wind;pick up;find out;get a line;discover;see; +;discover;find;#;learn;hear;get word;get wind;pick up;find out;get a line;discover;see; ;price;#;ascertain; ;concentrate;focus;center;centre;pore;rivet;#;think;cogitate;cerebrate; ;recall;#;concentrate;focus;center;centre;pore;rivet; @@ -16235,7 +16235,7 @@ ;mind;worry;#;think about; ;beware;mind;#;watch;look out;watch out; ;catch;#;surprise; -;catch;#;witness;tqfind;see; +;catch;#;witness;find;see; ;impute;ascribe;assign;attribute;#;judge; ;credit;#;impute;ascribe;assign;attribute; ;accredit;credit;#;impute;ascribe;assign;attribute; @@ -16660,7 +16660,7 @@ ;suppose;say;#;speculate; ;predict;foretell;prognosticate;call;forebode;anticipate;promise;#;guess;venture;hazard; ;bet;wager;#;predict;foretell;prognosticate;call;forebode;anticipate;promise; -;determine;tqfind;find out;ascertain;# +;determine;find;find out;ascertain;# ;determine;check;find out;see;ascertain;watch;learn;# ;test;#;determine;check;find out;see;ascertain;watch;learn; ;suspect;surmise;#;guess;venture;hazard; @@ -16728,7 +16728,7 @@ ;specify;set;determine;fix;#;choose;take;select;pick out; ;name;#;specify;set;determine;fix; ;count;#;recite; -;count;number;enumerate;#;determine;tqfind;find out;ascertain; +;count;number;enumerate;#;determine;find;find out;ascertain; ;census;#;count;number;enumerate; ;number;#;designate;denominate; ;foliate;paginate;page;#;number; @@ -16776,7 +16776,7 @@ ;go around;spread;circulate;#;travel;go;move;locomote; ;call;#;label; ;pronounce;label;judge;#;declare;adjudge;hold; -;rule;tqfind;#;pronounce;label;judge; +;rule;find;#;pronounce;label;judge; ;qualify;#;pronounce;label;judge; ;air;send;broadcast;beam;transmit;#;publicize;publicise;air;bare; ;announce;annunciate;harbinger;foretell;herald;#;tell; @@ -17513,7 +17513,7 @@ ;level;even out;even;#;change surface; ;grade;#;level;even out;even; ;strickle;strike;#;level;even out;even; -;tqreplace;put back;#;put;set;place;pose;position;lay; +;replace;put back;#;put;set;place;pose;position;lay; ;scratch;scrape;scratch up;#;incise; ;skin;scrape;#;injure;wound; ;dig;delve;cut into;turn over;#;remove;take;take away;withdraw; @@ -18186,7 +18186,7 @@ ;imagine;conceive of;ideate;envisage;#;create by mental act;create mentally; ;think;#;imagine;conceive of;ideate;envisage; ;dream;daydream;woolgather;stargaze;#;imagine;conceive of;ideate;envisage; -;discover;tqfind;#;conceive;conceptualize;conceptualise; +;discover;find;#;conceive;conceptualize;conceptualise; ;plan;project;contrive;design;#;create by mental act;create mentally; ;concert;#;plan;project;contrive;design; ;mint;coin;strike;#;create from raw material;create from raw stuff; @@ -18979,7 +18979,7 @@ ;foray into;raid;#;intrude on;invade;obtrude upon;encroach upon; ;reach;attain;make;hit;arrive at;gain;# ;make;#;reach;attain;make;hit;arrive at;gain; -;tqfind;#;reach;attain;make;hit;arrive at;gain; +;find;#;reach;attain;make;hit;arrive at;gain; ;reach;make;get to;progress to;#;achieve;accomplish;attain;reach; ;ground;run aground;#;reach;attain;make;hit;arrive at;gain; ;ground;run aground;#;land; @@ -19231,7 +19231,7 @@ ;miss;lose;# ;witness;#;watch; ;watch;look on;# -;witness;tqfind;see;#;experience;undergo;see;go through; +;witness;find;see;#;experience;undergo;see;go through; ;see;#;perceive;comprehend; ;see;#;see; ;view;consider;look at;#;analyze;analyse;study;examine;canvass; @@ -19293,9 +19293,9 @@ ;search;look;#;examine;see; ;prospect;#;search;look; ;descry;spot;espy;spy;#;sight; -;detect;observe;tqfind;discover;notice;#;sight; -;trace;#;detect;observe;tqfind;discover;notice; -;see;#;detect;observe;tqfind;discover;notice; +;detect;observe;find;discover;notice;#;sight; +;trace;#;detect;observe;find;discover;notice; +;see;#;detect;observe;find;discover;notice; ;vanish;disappear;go away;#;end;finish;terminate;cease; ;clear;#;vanish;disappear;go away; ;produce;bring on;bring out;# @@ -19371,7 +19371,7 @@ ;salt;#;season;flavor;flavour; ;come;#;experience;undergo;see;go through; ;track;#;observe; -;tqfind;#;perceive;comprehend; +;find;#;perceive;comprehend; ;roll;#;sound;go; ;seem;#;appear;seem; ;block;#;anesthetize;anaesthetize;anesthetise;anaesthetise;put to sleep;put under;put out; @@ -19407,10 +19407,10 @@ ;get;acquire;# ;turn;#;get;acquire; ;buy;#;get;acquire; -;tqfind;#;get;acquire; +;find;#;get;acquire; ;deny;refuse;#;keep;hold on; ;deny;#;control;hold in;hold;contain;check;curb;moderate; -;line up;get hold;come up;tqfind;#;get;acquire; +;line up;get hold;come up;find;#;get;acquire; ;deny;#;withhold;keep back; ;reserve;#;withhold;keep back; ;dock;#;withhold;deduct;recoup; @@ -19492,10 +19492,10 @@ ;deal;#;pass;hand;reach;pass on;turn over;give; ;retail;#;sell; ;fetch;bring in;bring;# -;recover;retrieve;tqfind;regain;#;get;acquire; +;recover;retrieve;find;regain;#;get;acquire; ;catch;#;get;acquire; -;tqfind;happen;chance;bump;encounter;# -;access;#;recover;retrieve;tqfind;regain; +;find;happen;chance;bump;encounter;# +;access;#;recover;retrieve;find;regain; ;recover;recoup;#;get;acquire; ;compensate;recompense;remunerate;#;pay; ;compensate;recompense;indemnify;#;pay; @@ -19517,8 +19517,8 @@ ;prize;value;treasure;appreciate;#;see;consider;reckon;view;regard; ;cash;cash in;#;exchange;change;interchange; ;exchange;change;interchange;#;transfer; -;substitute;tqreplace;#;exchange;change;interchange; -;reduce;#;substitute;tqreplace; +;substitute;replace;#;exchange;change;interchange; +;reduce;#;substitute;replace; ;substitute;sub;stand in;fill in;#;exchange;change;interchange; ;trade;swap;swop;switch;#;exchange;change;interchange; ;dicker;bargain;#;negociate;negotiate;talk terms; @@ -19585,10 +19585,10 @@ ;bribe;corrupt;buy;#;pay; ;refund;return;repay;give back;#;pay; ;stock;carry;stockpile;#;have;have got;hold; -;tqfind;regain;#;get;acquire; -;feel;#;tqfind;regain; -;locate;turn up;#;tqfind;regain; -;fall upon;strike;come upon;light upon;chance upon;come across;chance on;happen upon;attain;discover;#;tqfind;regain; +;find;regain;#;get;acquire; +;feel;#;find;regain; +;locate;turn up;#;find;regain; +;fall upon;strike;come upon;light upon;chance upon;come across;chance on;happen upon;attain;discover;#;find;regain; ;foot;pick;#;pay; ;pinpoint;nail;#;locate;turn up; ;win;gain;#;get;acquire; @@ -19837,7 +19837,7 @@ ;exchange;#;transfer;reassign; ;fill;#;hire;engage;employ; ;fill;take;#;work;do work; -;substitute;deputize;deputise;stand in;step in;#;supplant;tqreplace;supersede;supervene upon; +;substitute;deputize;deputise;stand in;step in;#;supplant;replace;supersede;supervene upon; ;cover;#;protect; ;cover;#;substitute;deputize;deputise;stand in;step in; ;delegate;depute;#;delegate;designate;depute;assign; @@ -19862,7 +19862,7 @@ ;fire;give notice;can;dismiss;give the axe;send away;sack;force out;terminate;#;remove; ;drop;#;remove; ;take out;move out;remove;# -;supplant;tqreplace;supersede;supervene upon;#;succeed;come after;follow; +;supplant;replace;supersede;supervene upon;#;succeed;come after;follow; ;succeed;come after;follow;# ;tug;labor;labour;push;drive;#;fight;struggle; ;fight;struggle;#;try;seek;attempt;essay;assay; @@ -20552,7 +20552,7 @@ ;back;#;lie; ;head;#;lie; ;crown;#;head; -;situate;locate;#;determine;tqfind;find out;ascertain; +;situate;locate;#;determine;find;find out;ascertain; ;map;#;situate;locate; ;place;localize;localise;#;situate;locate; ;dominate;command;overlook;overtop;#;lie; |