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 | 937b2991d8e78166eea904c80ad04d34607017a4 (patch) | |
tree | 2accb8161eab09df5d7a5484ea9ea080ad123168 /kfile-plugins | |
parent | dba26cb985af370c33d1767037851705cc561726 (diff) | |
download | tdenetwork-937b2991d8e78166eea904c80ad04d34607017a4.tar.gz tdenetwork-937b2991d8e78166eea904c80ad04d34607017a4.zip |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kfile-plugins')
-rw-r--r-- | kfile-plugins/torrent/bdict.cpp | 10 | ||||
-rw-r--r-- | kfile-plugins/torrent/bdict.h | 4 | ||||
-rw-r--r-- | kfile-plugins/torrent/bint.cpp | 4 | ||||
-rw-r--r-- | kfile-plugins/torrent/bstring.cpp | 6 | ||||
-rw-r--r-- | kfile-plugins/torrent/kfile_torrent.cpp | 12 |
5 files changed, 18 insertions, 18 deletions
diff --git a/kfile-plugins/torrent/bdict.cpp b/kfile-plugins/torrent/bdict.cpp index f19c70b9..75bda831 100644 --- a/kfile-plugins/torrent/bdict.cpp +++ b/kfile-plugins/torrent/bdict.cpp @@ -114,7 +114,7 @@ BDict::~BDict () BInt *BDict::findInt (const char *key) { - BBase *base = tqfind(key); + BBase *base = find(key); if (base && base->type_id() == bInt) return dynamic_cast<BInt*>(base); @@ -124,7 +124,7 @@ BInt *BDict::findInt (const char *key) BList *BDict::findList (const char *key) { - BBase *base = tqfind(key); + BBase *base = find(key); if (base && base->type_id() == bList) return dynamic_cast<BList*>(base); @@ -134,7 +134,7 @@ BList *BDict::findList (const char *key) BDict *BDict::findDict (const char *key) { - BBase *base = tqfind(key); + BBase *base = find(key); if (base && base->type_id() == bDict) return dynamic_cast<BDict*>(base); @@ -144,7 +144,7 @@ BDict *BDict::findDict (const char *key) BString *BDict::findStr (const char *key) { - BBase *base = tqfind(key); + BBase *base = find(key); if (base && base->type_id() == bString) return dynamic_cast<BString*>(base); @@ -199,7 +199,7 @@ bool BDict::writeToDevice(TQIODevice &device) device.writeBlock(utfString.data(), utfString.size() - 1); // Write out the key's data - BBase *base = m_map.tqfind(*key_iter); + BBase *base = m_map.find(*key_iter); if (!base->writeToDevice (device)) return false; } diff --git a/kfile-plugins/torrent/bdict.h b/kfile-plugins/torrent/bdict.h index b50e46eb..61be065b 100644 --- a/kfile-plugins/torrent/bdict.h +++ b/kfile-plugins/torrent/bdict.h @@ -106,7 +106,7 @@ class BDict : public BBase * @return true, if there is a value for the @p key in the * dictionary, false otherwise */ - virtual bool tqcontains (const char *key) { return m_map.tqfind(key) != 0; } + virtual bool contains (const char *key) { return m_map.find(key) != 0; } /** * Returns a pointer to the BBase descendant keyed by @p key. You @@ -118,7 +118,7 @@ class BDict : public BBase * matches the key * @see BBase */ - virtual BBase *tqfind (const char *key) { return m_map.tqfind(key); } + virtual BBase *find (const char *key) { return m_map.find(key); } /** * Convienience function to find and return a BInt keyed by @p key. diff --git a/kfile-plugins/torrent/bint.cpp b/kfile-plugins/torrent/bint.cpp index 0e23731c..db73aa72 100644 --- a/kfile-plugins/torrent/bint.cpp +++ b/kfile-plugins/torrent/bint.cpp @@ -46,12 +46,12 @@ void BInt::init (ByteTape &tape) tape ++; // Move to start of digits TQByteArray &dict (tape.data()); - if (dict.tqfind('e', tape.pos()) == -1) + if (dict.find('e', tape.pos()) == -1) return; // Copy the part from the start to the e. The values in-between // should be digits, perhaps preceded by a negative sign. - int length = dict.tqfind('e', tape.pos()) - tape.pos(); + int length = dict.find('e', tape.pos()) - tape.pos(); char *ptr = dict.data(); // Get start of buffer ptr += tape.pos(); // Advance to current position in tape diff --git a/kfile-plugins/torrent/bstring.cpp b/kfile-plugins/torrent/bstring.cpp index acf16190..258c97c7 100644 --- a/kfile-plugins/torrent/bstring.cpp +++ b/kfile-plugins/torrent/bstring.cpp @@ -44,15 +44,15 @@ void BString::init (ByteTape &tape) { TQByteArray &dict(tape.data()); - if (dict.tqfind(':', tape.pos()) == -1) + if (dict.find(':', tape.pos()) == -1) { - kdDebug(7034) << "Can't tqfind : for string!" << endl; + kdDebug(7034) << "Can't find : for string!" << endl; return; } // Copy the part from start to :, as it will be a number // That number is the number of characters to read - int length = dict.tqfind(':', tape.pos()) - tape.pos(); + int length = dict.find(':', tape.pos()) - tape.pos(); char *ptr = dict.data(); ptr += tape.pos(); diff --git a/kfile-plugins/torrent/kfile_torrent.cpp b/kfile-plugins/torrent/kfile_torrent.cpp index a5de60f0..a4cff355 100644 --- a/kfile-plugins/torrent/kfile_torrent.cpp +++ b/kfile-plugins/torrent/kfile_torrent.cpp @@ -166,7 +166,7 @@ bool KTorrentPlugin::readInfo (KFileMetaInfo &info, unsigned int) // If a torrent has a key, but it is of the wrong type, then it isn't a valid // torrent, and so we should just die. - if (m_dict->tqcontains("announce")) + if (m_dict->contains("announce")) { BString *str = m_dict->findStr ("announce"); if (!str) @@ -174,7 +174,7 @@ bool KTorrentPlugin::readInfo (KFileMetaInfo &info, unsigned int) appendItem (group, "announce", TQString(str->get_string())); } - if (m_dict->tqcontains("creation date")) + if (m_dict->contains("creation date")) { BInt *the_data = m_dict->findInt ("creation date"); TQDateTime my_date; @@ -198,7 +198,7 @@ bool KTorrentPlugin::readInfo (KFileMetaInfo &info, unsigned int) if (!info_dict) return false; - if (!info_dict->tqcontains("length")) + if (!info_dict->contains("length")) { /* Has more than one file. The list of files is contained in a * list called, appropriately enough, 'files' @@ -223,7 +223,7 @@ bool KTorrentPlugin::readInfo (KFileMetaInfo &info, unsigned int) appendItem (group, "NumFiles", num_files); appendItem (group, "length", length); - if (info_dict->tqcontains("name")) + if (info_dict->contains("name")) { BString *str = info_dict->findStr("name"); if (!str) @@ -244,7 +244,7 @@ bool KTorrentPlugin::readInfo (KFileMetaInfo &info, unsigned int) appendItem (group, "piece length", piece_length->get_value()); - if (m_dict->tqcontains("comment")) + if (m_dict->contains("comment")) { BString *comment = m_dict->findStr("comment"); if (!comment) @@ -383,7 +383,7 @@ bool KTorrentPlugin::writeInfo(const KFileMetaInfo &info) const TQString the_name = info[*it][key].value().toString(); // Remove trailing slashes - the_name.tqreplace (TQRegExp("/*$"), ""); + the_name.replace (TQRegExp("/*$"), ""); name_str->setValue (the_name); } |