Rename a number of old tq methods that are no longer tq specific

33 files changed, 220 insertions, 220 deletions

diff --git a/libktorrent/torrent/announcelist.cpp b/libktorrent/torrent/announcelist.cpp
index 4d3d4fa..d20873d 100644
--- a/libktorrent/torrent/announcelist.cpp
+++ b/libktorrent/torrent/announcelist.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <tqstringlist.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 namespace bt
 {
diff --git a/libktorrent/torrent/bdecoder.cpp b/libktorrent/torrent/bdecoder.cpp
index 778cf8a..e965eb5 100644
--- a/libktorrent/torrent/bdecoder.cpp
+++ b/libktorrent/torrent/bdecoder.cpp
@@ -59,7 +59,7 @@ namespace bt
 		}
 		else
 		{
-			throw Error(i18n("Illegal token: %1").tqarg(data[pos]));
+			throw Error(i18n("Illegal token: %1").arg(data[pos]));
 		}
 	}
 
@@ -161,7 +161,7 @@ namespace bt
 			Int64 bi = 0LL;
 			bi = n.toLongLong(&ok);
 			if (!ok)
-				throw Error(i18n("Cannot convert %1 to an int").tqarg(n));
+				throw Error(i18n("Cannot convert %1 to an int").arg(n));
 
 			pos++;
 			if (verbose) Out() << "INT64 = " << n << endl;
@@ -195,7 +195,7 @@ namespace bt
 		len = n.toInt(&ok);
 		if (!ok)
 		{
-			throw Error(i18n("Cannot convert %1 to an int").tqarg(n));
+			throw Error(i18n("Cannot convert %1 to an int").arg(n));
 		}
 		// move pos to the first part of the string
 		pos++;
@@ -204,7 +204,7 @@ namespace bt
 			
 		TQByteArray arr(len);
 		for (unsigned int i = pos;i < pos + len;i++)
-			arr.tqat(i-pos) = data[i];
+			arr.at(i-pos) = data[i];
 		pos += len;
 		// read the string into n
 
diff --git a/libktorrent/torrent/bencoder.cpp b/libktorrent/torrent/bencoder.cpp
index ef01123..cb82db7 100644
--- a/libktorrent/torrent/bencoder.cpp
+++ b/libktorrent/torrent/bencoder.cpp
@@ -87,7 +87,7 @@ namespace bt
 	{
 		if (!out) return;
 		
-		TQCString s = TQString("i%1e").tqarg(val).utf8();
+		TQCString s = TQString("i%1e").arg(val).utf8();
 		out->write(s,s.length());
 	}
 
@@ -95,7 +95,7 @@ namespace bt
 	{
 		if (!out) return;
 		
-		TQCString s = TQString("i%1e").tqarg(val).utf8();
+		TQCString s = TQString("i%1e").arg(val).utf8();
 		out->write(s,s.length());
 	}
 	
@@ -104,7 +104,7 @@ namespace bt
 		if (!out) return;
 		
 		TQCString u = str.utf8();
-		TQCString s = TQString("%1:").tqarg(u.length()).utf8();
+		TQCString s = TQString("%1:").arg(u.length()).utf8();
 		out->write(s,s.length());
 		out->write(u,u.length());
 	}
@@ -123,7 +123,7 @@ namespace bt
 	{
 		if (!out) return;
 		
-		TQCString s = TQString("%1:").tqarg(size).utf8();
+		TQCString s = TQString("%1:").arg(size).utf8();
 		out->write(s,s.length());
 		out->write((const char*)data,size);
 	}
diff --git a/libktorrent/torrent/bnode.cpp b/libktorrent/torrent/bnode.cpp
index 07b7ba0..c32f09b 100644
--- a/libktorrent/torrent/bnode.cpp
+++ b/libktorrent/torrent/bnode.cpp
@@ -56,8 +56,8 @@ namespace bt
 	
 	BDictNode::~BDictNode()
 	{
-		TQValueList<DictEntry>::iterator i = tqchildren.begin();
-		while (i != tqchildren.end())
+		TQValueList<DictEntry>::iterator i = children.begin();
+		while (i != children.end())
 		{
 			DictEntry & e = *i;
 			delete e.node;
@@ -70,13 +70,13 @@ namespace bt
 		DictEntry entry;
 		entry.key = key;
 		entry.node = node;
-		tqchildren.append(entry);
+		children.append(entry);
 	}
 	
 	BNode* BDictNode::getData(const TQString & key)
 	{
-		TQValueList<DictEntry>::iterator i = tqchildren.begin();
-		while (i != tqchildren.end())
+		TQValueList<DictEntry>::iterator i = children.begin();
+		while (i != children.end())
 		{
 			DictEntry & e = *i;
 			if (TQString(e.key) == key)
@@ -88,8 +88,8 @@ namespace bt
 	
 	BDictNode* BDictNode::getDict(const TQByteArray & key)
 	{
-		TQValueList<DictEntry>::iterator i = tqchildren.begin();
-		while (i != tqchildren.end())
+		TQValueList<DictEntry>::iterator i = children.begin();
+		while (i != children.end())
 		{
 			DictEntry & e = *i;
 			if (e.key == key)
@@ -120,8 +120,8 @@ namespace bt
 	void BDictNode::printDebugInfo()
 	{
 		Out() << "DICT" << endl;
-		TQValueList<DictEntry>::iterator i = tqchildren.begin();
-		while (i != tqchildren.end())
+		TQValueList<DictEntry>::iterator i = children.begin();
+		while (i != children.end())
 		{
 			DictEntry & e = *i;
 			Out() << TQString(e.key) << ": " << endl;
@@ -135,7 +135,7 @@ namespace bt
 
 	BListNode::BListNode(Uint32 off) : BNode(LIST,off)
 	{
-		tqchildren.setAutoDelete(true);
+		children.setAutoDelete(true);
 	}
 	
 	
@@ -145,7 +145,7 @@ namespace bt
 	
 	void BListNode::append(BNode* node)
 	{
-		tqchildren.append(node);
+		children.append(node);
 	}
 
 	BListNode* BListNode::getList(Uint32 idx)
@@ -165,10 +165,10 @@ namespace bt
 	
 	void BListNode::printDebugInfo()
 	{
-		Out() << "LIST " <<  tqchildren.count() << endl;
-		for (Uint32 i = 0;i < tqchildren.count();i++)
+		Out() << "LIST " <<  children.count() << endl;
+		for (Uint32 i = 0;i < children.count();i++)
 		{
-			BNode* n = tqchildren.at(i);
+			BNode* n = children.at(i);
 			n->printDebugInfo();
 		}
 		Out() << "END" << endl;
diff --git a/libktorrent/torrent/bnode.h b/libktorrent/torrent/bnode.h
index ccd2c94..84b306e 100644
--- a/libktorrent/torrent/bnode.h
+++ b/libktorrent/torrent/bnode.h
@@ -102,7 +102,7 @@ namespace bt
 			TQByteArray key;
 			BNode* node;
 		};
-		TQValueList<DictEntry> tqchildren;
+		TQValueList<DictEntry> children;
 	public:
 		BDictNode(Uint32 off);
 		virtual ~BDictNode();
@@ -159,7 +159,7 @@ namespace bt
 	 */
 	class BListNode : public BNode
 	{
-		TQPtrList<BNode> tqchildren;
+		TQPtrList<BNode> children;
 	public:
 		BListNode(Uint32 off);
 		virtual ~BListNode();
@@ -172,14 +172,14 @@ namespace bt
 		void printDebugInfo();
 
 		/// Get the number of nodes in the list.
-		Uint32 getNumChildren() const {return tqchildren.count();}
+		Uint32 getNumChildren() const {return children.count();}
 		
 		/**
 		 * Get a node from the list
 		 * @param idx The index
 		 * @return The node or 0 if idx is out of bounds
 		 */
-		BNode* getChild(Uint32 idx) {return tqchildren.at(idx);}
+		BNode* getChild(Uint32 idx) {return children.at(idx);}
 
 		/**
 		 * Get a BListNode.
diff --git a/libktorrent/torrent/cachefile.cpp b/libktorrent/torrent/cachefile.cpp
index 678124a..7f02b6b 100644
--- a/libktorrent/torrent/cachefile.cpp
+++ b/libktorrent/torrent/cachefile.cpp
@@ -92,7 +92,7 @@ namespace bt
 		
 		if (fd < 0)
 		{
-			throw Error(i18n("Cannot open %1 : %2").tqarg(path).tqarg(strerror(errno)));
+			throw Error(i18n("Cannot open %1 : %2").arg(path).arg(strerror(errno)));
 		}
 		
 		file_size = FileSize(fd);
@@ -118,7 +118,7 @@ namespace bt
 		
 		if (read_only && mode != READ)
 		{
-			throw Error(i18n("Cannot open %1 for writing : readonly filesystem").tqarg(path));
+			throw Error(i18n("Cannot open %1 for writing : readonly filesystem").arg(path));
 		}
 		
 		if (off + size > max_size)
@@ -217,7 +217,7 @@ namespace bt
 		}
 		
 		if (read_only)
-			throw Error(i18n("Cannot open %1 for writing : readonly filesystem").tqarg(path));
+			throw Error(i18n("Cannot open %1 for writing : readonly filesystem").arg(path));
 		
 		// jump to the end of the file
 		SeekFile(fd,0,SEEK_END);
@@ -237,22 +237,22 @@ namespace bt
 			int nb = to_write > 1024 ? 1024 : to_write;
 			int ret = ::write(fd,buf,nb);
 			if (ret < 0)
-				throw Error(i18n("Cannot expand file %1 : %2").tqarg(path).tqarg(strerror(errno)));
+				throw Error(i18n("Cannot expand file %1 : %2").arg(path).arg(strerror(errno)));
 			else if (ret != nb)
-				throw Error(i18n("Cannot expand file %1 : incomplete write").tqarg(path));
+				throw Error(i18n("Cannot expand file %1 : incomplete write").arg(path));
 			to_write -= nb;
 		}
 		file_size += num;
 //		
-	//	Out() << TQString("growing %1 = %2").tqarg(path).tqarg(kt::BytesToString(file_size)) << endl;
+	//	Out() << TQString("growing %1 = %2").arg(path).arg(kt::BytesToString(file_size)) << endl;
 
 		if (file_size != FileSize(fd))
 		{
-//			Out() << TQString("Homer Simpson %1 %2").tqarg(file_size).tqarg(sb.st_size) << endl;
+//			Out() << TQString("Homer Simpson %1 %2").arg(file_size).arg(sb.st_size) << endl;
 			fsync(fd);
 			if (file_size != FileSize(fd))
 			{
-				throw Error(i18n("Cannot expand file %1").tqarg(path));
+				throw Error(i18n("Cannot expand file %1").arg(path));
 			}
 		}
 	}
@@ -292,7 +292,7 @@ namespace bt
 		
 		if (ret < 0)
 		{
-			Out(SYS_DIO|LOG_IMPORTANT) << TQString("Munmap failed with error %1 : %2").tqarg(errno).tqarg(strerror(errno)) << endl;
+			Out(SYS_DIO|LOG_IMPORTANT) << TQString("Munmap failed with error %1 : %2").arg(errno).arg(strerror(errno)) << endl;
 		}
 	}
 		
@@ -326,7 +326,7 @@ namespace bt
 						
 			if (ret < 0)
 			{
-				Out(SYS_DIO|LOG_IMPORTANT) << TQString("Munmap failed with error %1 : %2").tqarg(errno).tqarg(strerror(errno)) << endl;
+				Out(SYS_DIO|LOG_IMPORTANT) << TQString("Munmap failed with error %1 : %2").arg(errno).arg(strerror(errno)) << endl;
 			}	
 		}
 		::close(fd);
@@ -348,7 +348,7 @@ namespace bt
 		
 		if (off >= file_size || off >= max_size)
 		{
-			throw Error(i18n("Error : Reading past the end of the file %1").tqarg(path));
+			throw Error(i18n("Error : Reading past the end of the file %1").arg(path));
 		}
 		
 		// jump to right position
@@ -358,7 +358,7 @@ namespace bt
 			if (close_again)
 				closeTemporary();
 			
-			throw Error(i18n("Error reading from %1").tqarg(path));
+			throw Error(i18n("Error reading from %1").arg(path));
 		}
 		
 		if (close_again)
@@ -379,7 +379,7 @@ namespace bt
 		}
 		
 		if (read_only)
-			throw Error(i18n("Cannot open %1 for writing : readonly filesystem").tqarg(path));
+			throw Error(i18n("Cannot open %1 for writing : readonly filesystem").arg(path));
 		
 		if (off + size > max_size)
 		{
@@ -389,7 +389,7 @@ namespace bt
 		
 		if (file_size < off)
 		{
-			//Out() << TQString("Writing %1 bytes at %2").tqarg(size).tqarg(off) << endl;
+			//Out() << TQString("Writing %1 bytes at %2").arg(size).arg(off) << endl;
 			growFile(off - file_size);
 		}
 		
@@ -400,11 +400,11 @@ namespace bt
 			closeTemporary();
 		
 		if (ret == -1)
-			throw Error(i18n("Error writing to %1 : %2").tqarg(path).tqarg(strerror(errno)));
+			throw Error(i18n("Error writing to %1 : %2").arg(path).arg(strerror(errno)));
 		else if ((Uint32)ret != size)
 		{
-			Out() << TQString("Incomplete write of %1 bytes, should be %2").tqarg(ret).tqarg(size) << endl;
-			throw Error(i18n("Error writing to %1").tqarg(path));
+			Out() << TQString("Incomplete write of %1 bytes, should be %2").arg(ret).arg(size) << endl;
+			throw Error(i18n("Error writing to %1").arg(path));
 		}
 		
 		if (off + size > file_size)
@@ -445,7 +445,7 @@ namespace bt
 			if (close_again)
 				closeTemporary();
 			
-			throw Error(i18n("Cannot open %1 for writing : readonly filesystem").tqarg(path));
+			throw Error(i18n("Cannot open %1 for writing : readonly filesystem").arg(path));
 		}
 
 		try
@@ -472,7 +472,7 @@ namespace bt
 				if (close_again)
 					closeTemporary();
 				
-				throw Error(i18n("Cannot preallocate diskspace : %1").tqarg(strerror(errno)));
+				throw Error(i18n("Cannot preallocate diskspace : %1").arg(strerror(errno)));
 			}
 		}
 
diff --git a/libktorrent/torrent/chunk.cpp b/libktorrent/torrent/chunk.cpp
index aaee35e..6873713 100644
--- a/libktorrent/torrent/chunk.cpp
+++ b/libktorrent/torrent/chunk.cpp
@@ -37,7 +37,7 @@ namespace bt
 		clear();
 	}
 
-	void Chunk::setData(Uint8* d,tqStatus nstatus)
+	void Chunk::setData(Uint8* d,Status nstatus)
 	{
 		clear();
 		status = nstatus;
diff --git a/libktorrent/torrent/chunk.h b/libktorrent/torrent/chunk.h
index 08d63c3..0896e96 100644
--- a/libktorrent/torrent/chunk.h
+++ b/libktorrent/torrent/chunk.h
@@ -45,7 +45,7 @@ namespace bt
 		Chunk(unsigned int index,Uint32 size);
 		~Chunk();
 
-		enum tqStatus
+		enum Status
 		{
 			MMAPPED,
 			BUFFERED,
@@ -54,13 +54,13 @@ namespace bt
 		};
 
 		/// Get the chunks status.
-		tqStatus gettqStatus() const;
+		Status getStatus() const;
 
 		/**
 		 * Set the chunks status
 		 * @param s 
 		 */
-		void settqStatus(tqStatus s);
+		void setStatus(Status s);
 
 		/// Get the data
 		const Uint8* getData() const;
@@ -69,7 +69,7 @@ namespace bt
 		Uint8* getData();
 
 		/// Set the data and the new status
-		void setData(Uint8* d,tqStatus nstatus);
+		void setData(Uint8* d,Status nstatus);
 
 		/// Clear the chunk (delete data depending on the mode)
 		void clear();
@@ -118,7 +118,7 @@ namespace bt
 		virtual void unmapped();
 		
 	private:
-		tqStatus status;
+		Status status;
 		Uint32 index;
 		Uint8* data;
 		Uint32 size;
@@ -126,12 +126,12 @@ namespace bt
 		Priority priority;
 	};
 
-	inline Chunk::tqStatus Chunk::gettqStatus() const
+	inline Chunk::Status Chunk::getStatus() const
 	{
 		return status;
 	}
 
-	inline void Chunk::settqStatus(Chunk::tqStatus s)
+	inline void Chunk::setStatus(Chunk::Status s)
 	{
 		status = s;
 	}
diff --git a/libktorrent/torrent/chunkdownload.cpp b/libktorrent/torrent/chunkdownload.cpp
index 04eb87f..38e4fec 100644
--- a/libktorrent/torrent/chunkdownload.cpp
+++ b/libktorrent/torrent/chunkdownload.cpp
@@ -35,17 +35,17 @@
 namespace bt
 {	
 
-	class DownloadtqStatus : public std::set<Uint32>
+	class DownloadStatus : public std::set<Uint32>
 	{
 	public:
 	//	typedef std::set<Uint32>::iterator iterator;
 		
-		DownloadtqStatus()
+		DownloadStatus()
 		{
 	
 		}
 
-		~DownloadtqStatus()
+		~DownloadStatus()
 		{
 		}
 
@@ -111,7 +111,7 @@ namespace bt
 			return false;
 
 	
-		DownloadtqStatus* ds = dstatus.find(p.getPeer());
+		DownloadStatus* ds = dstatus.find(p.getPeer());
 		if (ds)
 			ds->remove(pp);
 		
@@ -169,7 +169,7 @@ namespace bt
 			
 		pd->grab();
 		pdown.append(pd);
-		dstatus.insert(pd->getPeer()->getID(),new DownloadtqStatus());
+		dstatus.insert(pd->getPeer()->getID(),new DownloadStatus());
 		sendRequests(pd);
 		connect(pd,TQT_SIGNAL(timedout(const Request& )),this,TQT_SLOT(onTimeout(const Request& )));
 		connect(pd,TQT_SIGNAL(rejected( const Request& )),this,TQT_SLOT(onRejected( const Request& )));
@@ -179,7 +179,7 @@ namespace bt
 	void ChunkDownload::notDownloaded(const Request & r,bool reject)
 	{
 		// find the peer 
-		DownloadtqStatus* ds = dstatus.find(r.getPeer());
+		DownloadStatus* ds = dstatus.find(r.getPeer());
 		if (ds)
 		{
 			//	Out() << "ds != 0"  << endl;
@@ -196,7 +196,7 @@ namespace bt
 	{
 		if (chunk->getIndex() == r.getIndex())
 		{
-//			Out(SYS_CON|LOG_DEBUG) << TQString("Request rejected %1 %2 %3 %4").tqarg(r.getIndex()).tqarg(r.getOffset()).tqarg(r.getLength()).tqarg(r.getPeer()) << endl;
+//			Out(SYS_CON|LOG_DEBUG) << TQString("Request rejected %1 %2 %3 %4").arg(r.getIndex()).arg(r.getOffset()).arg(r.getLength()).arg(r.getPeer()) << endl;
 		
 			notDownloaded(r,true);
 		}
@@ -207,7 +207,7 @@ namespace bt
 		// see if we are dealing with a piece of ours
 		if (chunk->getIndex() == r.getIndex())
 		{
-			Out(SYS_CON|LOG_DEBUG) << TQString("Request timed out %1 %2 %3 %4").tqarg(r.getIndex()).tqarg(r.getOffset()).tqarg(r.getLength()).tqarg(r.getPeer()) << endl;
+			Out(SYS_CON|LOG_DEBUG) << TQString("Request timed out %1 %2 %3 %4").arg(r.getIndex()).arg(r.getOffset()).arg(r.getLength()).arg(r.getPeer()) << endl;
 		
 			notDownloaded(r,false);
 		}
@@ -216,7 +216,7 @@ namespace bt
 	void ChunkDownload::sendRequests(PeerDownloader* pd)
 	{
 		timer.update();
-		DownloadtqStatus* ds = dstatus.find(pd->getPeer()->getID());
+		DownloadStatus* ds = dstatus.find(pd->getPeer()->getID());
 		if (!ds)
 			return;
 			
@@ -262,11 +262,11 @@ namespace bt
 	
 	void ChunkDownload::sendCancels(PeerDownloader* pd)
 	{
-		DownloadtqStatus* ds = dstatus.find(pd->getPeer()->getID());
+		DownloadStatus* ds = dstatus.find(pd->getPeer()->getID());
 		if (!ds)
 			return;
 		
-		DownloadtqStatus::iterator itr = ds->begin();
+		DownloadStatus::iterator itr = ds->begin();
 		while (itr != ds->end())
 		{
 			Uint32 i = *itr;
@@ -287,7 +287,7 @@ namespace bt
 		while (i != pdown.end())
 		{
 			PeerDownloader* pd = *i;
-			DownloadtqStatus* ds = dstatus.find(pd->getPeer()->getID());
+			DownloadStatus* ds = dstatus.find(pd->getPeer()->getID());
 			Uint32 pp = p.getOffset() / MAX_PIECE_LEN;
 			if (ds && ds->contains(pp))
 			{
@@ -360,7 +360,7 @@ namespace bt
 		ChunkDownloadHeader hdr;
 		hdr.index = chunk->getIndex();
 		hdr.num_bits = pieces.getNumBits();
-		hdr.buffered = chunk->gettqStatus() == Chunk::BUFFERED ? 1 : 0;
+		hdr.buffered = chunk->getStatus() == Chunk::BUFFERED ? 1 : 0;
 		// save the chunk header
 		file.write(&hdr,sizeof(ChunkDownloadHeader));
 		// save the bitset
@@ -370,7 +370,7 @@ namespace bt
 			// if it's a buffered chunk, save the contents to
 			file.write(chunk->getData(),chunk->getSize());
 			chunk->clear();
-			chunk->settqStatus(Chunk::ON_DISK);
+			chunk->setStatus(Chunk::ON_DISK);
 		}
 	}
 		
diff --git a/libktorrent/torrent/chunkdownload.h b/libktorrent/torrent/chunkdownload.h
index c8bd2ae..83fd3e3 100644
--- a/libktorrent/torrent/chunkdownload.h
+++ b/libktorrent/torrent/chunkdownload.h
@@ -41,7 +41,7 @@ namespace bt
 	class Peer;
 	class Request;
 	class PeerDownloader;
-	class DownloadtqStatus;
+	class DownloadStatus;
 	
 	struct ChunkDownloadHeader
 	{
@@ -193,7 +193,7 @@ namespace bt
 		Uint32 last_size;
 		Timer timer;
 		TQPtrList<PeerDownloader> pdown;
-		PtrMap<Uint32,DownloadtqStatus> dstatus;
+		PtrMap<Uint32,DownloadStatus> dstatus;
 		std::set<Uint32> piece_providers;
 		
 
diff --git a/libktorrent/torrent/chunkmanager.cpp b/libktorrent/torrent/chunkmanager.cpp
index ac45be5..e98c58b 100644
--- a/libktorrent/torrent/chunkmanager.cpp
+++ b/libktorrent/torrent/chunkmanager.cpp
@@ -189,7 +189,7 @@ namespace bt
 				Chunk* c = getChunk(hdr.index);
 				if (c)
 				{
-					c->settqStatus(Chunk::ON_DISK);
+					c->setStatus(Chunk::ON_DISK);
 					bitset.set(hdr.index,true);
 					todo.set(hdr.index,false);
 					recalc_chunks_left = true;
@@ -204,12 +204,12 @@ namespace bt
 	{
 		File fptr;
 		if (!fptr.open(index_file,"wb"))
-			throw Error(i18n("Cannot open index file %1 : %2").tqarg(index_file).tqarg(fptr.errorString()));
+			throw Error(i18n("Cannot open index file %1 : %2").arg(index_file).arg(fptr.errorString()));
 		
 		for (unsigned int i = 0;i < tor.getNumChunks();i++)
 		{
 			Chunk* c = getChunk(i);
-			if (c->gettqStatus() != Chunk::NOT_DOWNLOADED)
+			if (c->getStatus() != Chunk::NOT_DOWNLOADED)
 			{
 				NewChunkHeader hdr;
 				hdr.index = i;
@@ -267,16 +267,16 @@ namespace bt
 		for (Uint32 i = 0;i < bitset.getNumBits();i++)
 		{
 			Chunk* c = chunks[i];
-			if (c->gettqStatus() == Chunk::MMAPPED)
+			if (c->getStatus() == Chunk::MMAPPED)
 			{
 				cache->save(c);
 				c->clear();
-				c->settqStatus(Chunk::ON_DISK);
+				c->setStatus(Chunk::ON_DISK);
 			}
-			else if (c->gettqStatus() == Chunk::BUFFERED)
+			else if (c->getStatus() == Chunk::BUFFERED)
 			{
 				c->clear();
-				c->settqStatus(Chunk::ON_DISK);
+				c->setStatus(Chunk::ON_DISK);
 			}
 		}
 		cache->close();
@@ -288,11 +288,11 @@ namespace bt
 			return 0;
 		
 		Chunk* c = chunks[i];
-		if (c->gettqStatus() == Chunk::NOT_DOWNLOADED || c->isExcluded())
+		if (c->getStatus() == Chunk::NOT_DOWNLOADED || c->isExcluded())
 		{
 			return 0;
 		}
-		else if (c->gettqStatus() == Chunk::ON_DISK)
+		else if (c->getStatus() == Chunk::ON_DISK)
 		{
 			// load the chunk if it is on disk
 			cache->load(c);
@@ -338,10 +338,10 @@ namespace bt
 		Chunk* c = chunks[i];
 		if (!c->taken())
 		{
-			if (c->gettqStatus() == Chunk::MMAPPED)
+			if (c->getStatus() == Chunk::MMAPPED)
 				cache->save(c);
 			c->clear();
-			c->settqStatus(Chunk::ON_DISK);
+			c->setStatus(Chunk::ON_DISK);
 			loaded.remove(i);
 		}
 	}
@@ -352,10 +352,10 @@ namespace bt
 			return;
 		
 		Chunk* c = chunks[i];
-		if (c->gettqStatus() == Chunk::MMAPPED)
+		if (c->getStatus() == Chunk::MMAPPED)
 			cache->save(c);
 		c->clear();
-		c->settqStatus(Chunk::NOT_DOWNLOADED);
+		c->setStatus(Chunk::NOT_DOWNLOADED);
 		bitset.set(i,false);
 		todo.set(i,!excluded_chunks.get(i) && !only_seed_chunks.get(i));
 		loaded.remove(i);
@@ -372,10 +372,10 @@ namespace bt
 			// get rid of chunk if nobody asked for it in the last 5 seconds
 			if (!c->taken() && bt::GetCurrentTime() - i.data() > 5000)
 			{
-				if (c->gettqStatus() == Chunk::MMAPPED)
+				if (c->getStatus() == Chunk::MMAPPED)
 					cache->save(c);
 				c->clear();
-				c->settqStatus(Chunk::ON_DISK);
+				c->setStatus(Chunk::ON_DISK);
 				TQMap<Uint32,TimeStamp>::iterator j = i;
 				i++;
 				loaded.erase(j);
@@ -387,7 +387,7 @@ namespace bt
 			}
 		}
 	//	Uint32 num_in_mem = loaded.count();
-	//	Out() << TQString("Cleaned %1 chunks, %2 still in memory").tqarg(num_removed).tqarg(num_in_mem) << endl;
+	//	Out() << TQString("Cleaned %1 chunks, %2 still in memory").arg(num_removed).arg(num_in_mem) << endl;
 	}
 	
 	void ChunkManager::saveChunk(unsigned int i,bool update_index)
@@ -413,7 +413,7 @@ namespace bt
 		else
 		{
 			c->clear();
-			c->settqStatus(Chunk::NOT_DOWNLOADED);
+			c->setStatus(Chunk::NOT_DOWNLOADED);
 			Out(SYS_DIO|LOG_IMPORTANT) << "Warning: attempted to save a chunk which was excluded" << endl;
 		}
 	}
@@ -429,7 +429,7 @@ namespace bt
 			// try again
 			if (!fptr.open(index_file,"r+b"))
 				// panick if it failes
-				throw Error(i18n("Cannot open index file %1 : %2").tqarg(index_file).tqarg(fptr.errorString()));
+				throw Error(i18n("Cannot open index file %1 : %2").arg(index_file).arg(fptr.errorString()));
 		}
 
 		
@@ -1016,7 +1016,7 @@ namespace bt
 	
 	bool ChunkManager::prepareChunk(Chunk* c,bool allways)
 	{
-		if (!allways && c->gettqStatus() != Chunk::NOT_DOWNLOADED)
+		if (!allways && c->getStatus() != Chunk::NOT_DOWNLOADED)
 			return false;
 		
 		return cache->prep(c);
@@ -1044,7 +1044,7 @@ namespace bt
 				bitset.set(i,true);
 				todo.set(i,false);
 				// the chunk must be on disk
-				c->settqStatus(Chunk::ON_DISK);
+				c->setStatus(Chunk::ON_DISK);
 				tor.updateFilePercentage(i,bitset); 
 			}
 			else if (!ok_chunks.get(i) && bitset.get(i))
@@ -1053,12 +1053,12 @@ namespace bt
 				// We think we have a chunk, but we don't
 				bitset.set(i,false);
 				todo.set(i,!only_seed_chunks.get(i) && !excluded_chunks.get(i));
-				if (c->gettqStatus() == Chunk::ON_DISK)
+				if (c->getStatus() == Chunk::ON_DISK)
 				{
-					c->settqStatus(Chunk::NOT_DOWNLOADED);
+					c->setStatus(Chunk::NOT_DOWNLOADED);
 					tor.updateFilePercentage(i,bitset);
 				}
-				else if (c->gettqStatus() == Chunk::MMAPPED || c->gettqStatus() == Chunk::BUFFERED)
+				else if (c->getStatus() == Chunk::MMAPPED || c->getStatus() == Chunk::BUFFERED)
 				{
 					resetChunk(i);
 				}
diff --git a/libktorrent/torrent/chunkselector.cpp b/libktorrent/torrent/chunkselector.cpp
index 9c05629..b1c42fa 100644
--- a/libktorrent/torrent/chunkselector.cpp
+++ b/libktorrent/torrent/chunkselector.cpp
@@ -165,7 +165,7 @@ namespace bt
 		for (Uint32 i = from;i <= to;i++)
 		{
 			bool in_chunks = std::find(chunks.begin(),chunks.end(),i) != chunks.end();
-			if (!in_chunks && cman.getChunk(i)->gettqStatus() != Chunk::ON_DISK)
+			if (!in_chunks && cman.getChunk(i)->getStatus() != Chunk::ON_DISK)
 			{
 			//	Out(SYS_DIO|LOG_DEBUG) << "ChunkSelector::reIncluded " << i << endl;
 				chunks.push_back(i);
diff --git a/libktorrent/torrent/dndfile.cpp b/libktorrent/torrent/dndfile.cpp
index 2ca669b..dffb763 100644
--- a/libktorrent/torrent/dndfile.cpp
+++ b/libktorrent/torrent/dndfile.cpp
@@ -105,7 +105,7 @@ namespace bt
 		
 		File fptr;
 		if (!fptr.open(path,"wb"))
-			throw Error(i18n("Cannot create file %1 : %2").tqarg(path).tqarg(fptr.errorString()));
+			throw Error(i18n("Cannot create file %1 : %2").arg(path).arg(fptr.errorString()));
 		
 		fptr.write(&hdr,sizeof(DNDFileHeader));
 		fptr.close();
@@ -172,7 +172,7 @@ namespace bt
 			create();
 			if (!fptr.open(path,"r+b"))
 			{
-				throw Error(i18n("Failed to write first chunk to DND file : %1").tqarg(fptr.errorString()));
+				throw Error(i18n("Failed to write first chunk to DND file : %1").arg(fptr.errorString()));
 			}
 		}
 		
@@ -230,7 +230,7 @@ namespace bt
 			create();
 			if (!fptr.open(path,"r+b"))
 			{
-				throw Error(i18n("Failed to write last chunk to DND file : %1").tqarg(fptr.errorString()));
+				throw Error(i18n("Failed to write last chunk to DND file : %1").arg(fptr.errorString()));
 			}
 		}
 		
diff --git a/libktorrent/torrent/downloader.cpp b/libktorrent/torrent/downloader.cpp
index a63163e..582fa7e 100644
--- a/libktorrent/torrent/downloader.cpp
+++ b/libktorrent/torrent/downloader.cpp
@@ -87,7 +87,7 @@ namespace bt
 		}
 		
 		// if the chunk is not in memory, reload it
-		if (cd->getChunk()->gettqStatus() == Chunk::ON_DISK)
+		if (cd->getChunk()->getStatus() == Chunk::ON_DISK)
 		{
 			cman.prepareChunk(cd->getChunk(),true);
 		}
@@ -119,7 +119,7 @@ namespace bt
 				downloaded += p.getLength();
 			
 			// save to disk again, if it is idle
-			if (cd->isIdle() && cd->getChunk()->gettqStatus() == Chunk::MMAPPED)
+			if (cd->isIdle() && cd->getChunk()->getStatus() == Chunk::MMAPPED)
 			{
 				cman.saveChunk(cd->getChunk()->getIndex(),false);
 			}
@@ -160,7 +160,7 @@ namespace bt
 			if (cd->isIdle()) // idle chunks do not need to be in memory
 			{
 				Chunk* c = cd->getChunk();
-				if (c->gettqStatus() == Chunk::MMAPPED)
+				if (c->getStatus() == Chunk::MMAPPED)
 				{
 					cman.saveChunk(cd->getChunk()->getIndex(),false);
 				}
@@ -169,7 +169,7 @@ namespace bt
 			{
 				cd->releaseAllPDs();
 				Chunk* c = cd->getChunk();
-				if (c->gettqStatus() == Chunk::MMAPPED)
+				if (c->getStatus() == Chunk::MMAPPED)
 				{
 					cman.saveChunk(cd->getChunk()->getIndex(),false);
 				}
@@ -277,7 +277,7 @@ namespace bt
 		if (sel)
 		{
 			// if it is on disk, reload it
-			if (sel->getChunk()->gettqStatus() == Chunk::ON_DISK)
+			if (sel->getChunk()->getStatus() == Chunk::ON_DISK)
 				cman.prepareChunk(sel->getChunk(),true);
 			
 			sel->assignPeer(pd);
@@ -341,7 +341,7 @@ namespace bt
 			if (cdmin) 
 			{
 				// if it is on disk, reload it
-				if (cdmin->getChunk()->gettqStatus() == Chunk::ON_DISK)
+				if (cdmin->getChunk()->getStatus() == Chunk::ON_DISK)
 				{
 					cman.prepareChunk(cdmin->getChunk(),true);
 				}
@@ -438,10 +438,10 @@ namespace bt
 		{
 			Uint32 ch = i->first;
 			Chunk* c = i->second->getChunk();
-			if (c->gettqStatus() == Chunk::MMAPPED)
+			if (c->getStatus() == Chunk::MMAPPED)
 				cman.saveChunk(ch,false);
 			
-			c->settqStatus(Chunk::NOT_DOWNLOADED);
+			c->setStatus(Chunk::NOT_DOWNLOADED);
 		}
 		current_chunks.clear();
 	}
diff --git a/libktorrent/torrent/ipblocklist.cpp b/libktorrent/torrent/ipblocklist.cpp
index 547b6ad..f524d6b 100644
--- a/libktorrent/torrent/ipblocklist.cpp
+++ b/libktorrent/torrent/ipblocklist.cpp
@@ -338,7 +338,7 @@ namespace bt
 		if(tmpmask == 0)
 			out.prepend("*");
 		else
-			out.prepend(TQString("%1").tqarg(tmp));
+			out.prepend(TQString("%1").arg(tmp));
 		ip >>= 8;
 		mask >>= 8;
 		tmp = ip;
@@ -348,7 +348,7 @@ namespace bt
 		if(tmpmask == 0)
 			out.prepend("*.");
 		else
-			out.prepend(TQString("%1.").tqarg(tmp));
+			out.prepend(TQString("%1.").arg(tmp));
 		ip >>= 8;
 		mask >>= 8;
 		tmp = ip;
@@ -358,7 +358,7 @@ namespace bt
 		if(tmpmask == 0)
 			out.prepend("*.");
 		else
-			out.prepend(TQString("%1.").tqarg(tmp));
+			out.prepend(TQString("%1.").arg(tmp));
 		ip >>= 8;
 		mask >>= 8;
 		tmp = ip;
@@ -368,7 +368,7 @@ namespace bt
 		if(tmpmask == 0)
 			out.prepend("*.");
 		else
-			out.prepend(TQString("%1.").tqarg(tmp));
+			out.prepend(TQString("%1.").arg(tmp));
 	
 		return out;
 	}
diff --git a/libktorrent/torrent/multifilecache.cpp b/libktorrent/torrent/multifilecache.cpp
index b7dae26..9d41fb8 100644
--- a/libktorrent/torrent/multifilecache.cpp
+++ b/libktorrent/torrent/multifilecache.cpp
@@ -425,7 +425,7 @@ namespace bt
 			{
 				// if mmap fails or is not possible use buffered mode
 				c->allocate();
-				c->settqStatus(Chunk::BUFFERED);
+				c->setStatus(Chunk::BUFFERED);
 			}
 			else
 			{
@@ -436,7 +436,7 @@ namespace bt
 		{
 			// just allocate it
 			c->allocate();
-			c->settqStatus(Chunk::BUFFERED);
+			c->setStatus(Chunk::BUFFERED);
 		}
 		return true;
 	}
@@ -446,7 +446,7 @@ namespace bt
 		TQValueList<Uint32> tflist;
 		tor.calcChunkPos(c->getIndex(),tflist);
 		
-		if (c->gettqStatus() == Chunk::MMAPPED)
+		if (c->getStatus() == Chunk::MMAPPED)
 		{
 			// mapped chunks are easy
 			CacheFile* fd = files.find(tflist[0]);
@@ -455,7 +455,7 @@ namespace bt
 			
 			fd->unmap(c->getData(),c->getSize());
 			c->clear();
-			c->settqStatus(Chunk::ON_DISK);
+			c->setStatus(Chunk::ON_DISK);
 			return;
 		}
 	
@@ -506,7 +506,7 @@ namespace bt
 		
 		// set the chunk to on disk and clear it
 		c->clear();
-		c->settqStatus(Chunk::ON_DISK);
+		c->setStatus(Chunk::ON_DISK);
 	}
 	
 	void MultiFileCache::downloadStatusChanged(TorrentFile* tf, bool download)
@@ -592,7 +592,7 @@ namespace bt
 		DNDFile out(dst_file);
 		File fptr;
 		if (!fptr.open(src_file,"rb"))
-			throw Error(i18n("Cannot open file %1 : %2").tqarg(src_file).tqarg(fptr.errorString()));
+			throw Error(i18n("Cannot open file %1 : %2").arg(src_file).arg(fptr.errorString()));
 		
 		Uint32 cs = 0;
 		if (tf->getFirstChunk() == tor.getNumChunks() - 1)
@@ -654,7 +654,7 @@ namespace bt
 			// first attempt failed, must be fat so try that
 			if (!FatPreallocate(output_file,tf->getSize()))
 			{	
-				throw Error(i18n("Cannot preallocate diskspace : %1").tqarg(strerror(errno)));
+				throw Error(i18n("Cannot preallocate diskspace : %1").arg(strerror(errno)));
 			}
 		}
 		
@@ -670,7 +670,7 @@ namespace bt
 		
 		File fptr;
 		if (!fptr.open(output_file,"r+b"))
-			throw Error(i18n("Cannot open file %1 : %2").tqarg(output_file).tqarg(fptr.errorString()));
+			throw Error(i18n("Cannot open file %1 : %2").arg(output_file).arg(fptr.errorString()));
 			
 		
 		Uint32 ts = cs - tf->getFirstChunkOffset() > tf->getLastChunkSize() ? 
@@ -782,7 +782,7 @@ namespace bt
 			else
 			{
 				
-				// tqchildren, so we cannot delete any more directories higher up
+				// children, so we cannot delete any more directories higher up
 				return;
 			}
 		}
diff --git a/libktorrent/torrent/packet.cpp b/libktorrent/torrent/packet.cpp
index 4e6cf01..e5b1aa0 100644
--- a/libktorrent/torrent/packet.cpp
+++ b/libktorrent/torrent/packet.cpp
@@ -138,16 +138,16 @@ namespace bt
 		
 		switch (data[4])
 		{
-			case CHOKE : return TQString("CHOKE %1 %2").tqarg(hdr_length).tqarg(data_length);
-			case UNCHOKE : return TQString("UNCHOKE %1 %2").tqarg(hdr_length).tqarg(data_length);
-			case INTERESTED : return TQString("INTERESTED %1 %2").tqarg(hdr_length).tqarg(data_length);
-			case NOT_INTERESTED : return TQString("NOT_INTERESTED %1 %2").tqarg(hdr_length).tqarg(data_length);
-			case HAVE : return TQString("HAVE %1 %2").tqarg(hdr_length).tqarg(data_length);
-			case BITFIELD : return TQString("BITFIELD %1 %2").tqarg(hdr_length).tqarg(data_length);
-			case PIECE : return TQString("PIECE %1 %2").tqarg(hdr_length).tqarg(data_length);
-			case REQUEST : return TQString("REQUEST %1 %2").tqarg(hdr_length).tqarg(data_length);
-			case CANCEL : return TQString("CANCEL %1 %2").tqarg(hdr_length).tqarg(data_length);
-			default: return TQString("UNKNOWN %1 %2").tqarg(hdr_length).tqarg(data_length);
+			case CHOKE : return TQString("CHOKE %1 %2").arg(hdr_length).arg(data_length);
+			case UNCHOKE : return TQString("UNCHOKE %1 %2").arg(hdr_length).arg(data_length);
+			case INTERESTED : return TQString("INTERESTED %1 %2").arg(hdr_length).arg(data_length);
+			case NOT_INTERESTED : return TQString("NOT_INTERESTED %1 %2").arg(hdr_length).arg(data_length);
+			case HAVE : return TQString("HAVE %1 %2").arg(hdr_length).arg(data_length);
+			case BITFIELD : return TQString("BITFIELD %1 %2").arg(hdr_length).arg(data_length);
+			case PIECE : return TQString("PIECE %1 %2").arg(hdr_length).arg(data_length);
+			case REQUEST : return TQString("REQUEST %1 %2").arg(hdr_length).arg(data_length);
+			case CANCEL : return TQString("CANCEL %1 %2").arg(hdr_length).arg(data_length);
+			default: return TQString("UNKNOWN %1 %2").arg(hdr_length).arg(data_length);
 		}
 	}
 	*/
diff --git a/libktorrent/torrent/packetreader.cpp b/libktorrent/torrent/packetreader.cpp
index 3d4910a..b17becc 100644
--- a/libktorrent/torrent/packetreader.cpp
+++ b/libktorrent/torrent/packetreader.cpp
@@ -36,13 +36,13 @@ namespace bt
 #ifdef LOG_PACKET
 	static void LogPacket(const Uint8* data,Uint32 size,Uint32 len)
 	{
-		TQString file = TQString("/tmp/kt-packetreader-%1.log").tqarg(getpid());
+		TQString file = TQString("/tmp/kt-packetreader-%1.log").arg(getpid());
 		File fptr;
 		if (!fptr.open(file,"a"))
 			return;
 		
 		
-		TQString tmp = TQString("PACKET len = %1, type = %2\nDATA: \n").tqarg(len).tqarg(data[0]);
+		TQString tmp = TQString("PACKET len = %1, type = %2\nDATA: \n").arg(len).arg(data[0]);
 		
 		fptr.write(tmp.ascii(),tmp.length());
 		
@@ -51,7 +51,7 @@ namespace bt
 		{
 			for (Uint32 i = 0;i < size;i++)
 			{
-				tmp = TQString("0x%1 ").tqarg(data[i],0,16);
+				tmp = TQString("0x%1 ").arg(data[i],0,16);
 				fptr.write(tmp.ascii(),tmp.length());
 				j++;
 				if (j > 10)
@@ -65,7 +65,7 @@ namespace bt
 		{
 			for (Uint32 i = 0;i < 20;i++)
 			{
-				tmp = TQString("0x%1 ").tqarg(data[i],0,16);
+				tmp = TQString("0x%1 ").arg(data[i],0,16);
 				fptr.write(tmp.ascii(),tmp.length());
 				j++;
 				if (j > 10)
@@ -78,7 +78,7 @@ namespace bt
 			fptr.write(tmp.ascii(),tmp.length());
 			for (Uint32 i = size - 20;i < size;i++)
 			{
-				tmp = TQString("0x%1 ").tqarg(data[i],0,16);
+				tmp = TQString("0x%1 ").arg(data[i],0,16);
 				fptr.write(tmp.ascii(),tmp.length());
 				j++;
 				if (j > 10)
diff --git a/libktorrent/torrent/packetwriter.cpp b/libktorrent/torrent/packetwriter.cpp
index 6c186dc..21d26cf 100644
--- a/libktorrent/torrent/packetwriter.cpp
+++ b/libktorrent/torrent/packetwriter.cpp
@@ -195,7 +195,7 @@ namespace bt
 		else
 		{
 	/*		Out(SYS_CON|LOG_DEBUG) << TQString("Uploading %1 %2 %3 %4 %5")
-					.tqarg(index).tqarg(begin).tqarg(len).tqarg((TQ_ULLONG)ch,0,16).tqarg((TQ_ULLONG)ch->getData(),0,16) 
+					.arg(index).arg(begin).arg(len).arg((TQ_ULLONG)ch,0,16).arg((TQ_ULLONG)ch->getData(),0,16) 
 					<< endl;;
 	*/
 			queuePacket(new Packet(index,begin,len,ch));
@@ -218,7 +218,7 @@ namespace bt
 			enc.write(TQString("p")); 
 			enc.write((Uint32)port);
 		}
-		enc.write(TQString("v")); enc.write(TQString("KTorrent %1").tqarg(kt::VERSION_STRING));
+		enc.write(TQString("v")); enc.write(TQString("KTorrent %1").arg(kt::VERSION_STRING));
 		enc.end();
 		sendExtProtMsg(0,arr);
 	}
diff --git a/libktorrent/torrent/peerid.cpp b/libktorrent/torrent/peerid.cpp
index 09b4bff..e6a3387 100644
--- a/libktorrent/torrent/peerid.cpp
+++ b/libktorrent/torrent/peerid.cpp
@@ -174,7 +174,7 @@ namespace bt
 			Map["TS"] = "Torrent Storm";
 			Map["TT"] = "TuoTu";
 			Map["UL"] = "uLeecher!";
-			Map["UT"] = TQString("%1Torrent").tqarg(TQChar(0x00B5)); // µTorrent, 0x00B5 is tqunicode for µ
+			Map["UT"] = TQString("%1Torrent").arg(TQChar(0x00B5)); // µTorrent, 0x00B5 is unicode for µ
 			Map["WT"] = "BitLet";
 			Map["WY"] = "FireTorrent";
 			Map["XL"] = "Xunlei";
@@ -201,31 +201,31 @@ namespace bt
 		}
 
 		TQString name = i18n("Unknown client");
-		if (peer_id.tqat(0) == '-' &&
-			peer_id.tqat(1).isLetter() &&
-			peer_id.tqat(2).isLetter() ) //AZ style
+		if (peer_id.at(0) == '-' &&
+			peer_id.at(1).isLetter() &&
+			peer_id.at(2).isLetter() ) //AZ style
 		{
 			TQString ID(peer_id.mid(1,2));
 			if (Map.contains(ID))
-				name = Map[ID] + " " + peer_id.tqat(3) + "." + peer_id.tqat(4) + "."
-					+ peer_id.tqat(5) + "." + peer_id.tqat(6);
+				name = Map[ID] + " " + peer_id.at(3) + "." + peer_id.at(4) + "."
+					+ peer_id.at(5) + "." + peer_id.at(6);
 		}
-		else if (peer_id.tqat(0).isLetter() &&
-				peer_id.tqat(1).isDigit() &&
-				peer_id.tqat(2).isDigit() )  //Shadow's style
+		else if (peer_id.at(0).isLetter() &&
+				peer_id.at(1).isDigit() &&
+				peer_id.at(2).isDigit() )  //Shadow's style
 		{
-			TQString ID = TQString(peer_id.tqat(0));
+			TQString ID = TQString(peer_id.at(0));
 			if (Map.contains(ID))
-				name = Map[ID] + " " + peer_id.tqat(1) + "." +
-						peer_id.tqat(2) + "." + peer_id.tqat(3);
+				name = Map[ID] + " " + peer_id.at(1) + "." +
+						peer_id.at(2) + "." + peer_id.at(3);
 		}
-		else if (peer_id.tqat(0) == 'M' && peer_id.tqat(2) == '-' && (peer_id.tqat(4) == '-' || peer_id.tqat(5) == '-'))
+		else if (peer_id.at(0) == 'M' && peer_id.at(2) == '-' && (peer_id.at(4) == '-' || peer_id.at(5) == '-'))
 		{
-			name = Map["M"] + " " + peer_id.tqat(1) + "." + peer_id.tqat(3);
-			if(peer_id.tqat(4) == '-')
-				name += "." + peer_id.tqat(5);
+			name = Map["M"] + " " + peer_id.at(1) + "." + peer_id.at(3);
+			if(peer_id.at(4) == '-')
+				name += "." + peer_id.at(5);
 			else
-				name += peer_id.tqat(4) + "." + peer_id.tqat(6);
+				name += peer_id.at(4) + "." + peer_id.at(6);
 		}
 		else if (peer_id.startsWith("OP"))
 		{
@@ -245,7 +245,7 @@ namespace bt
 		}
 		else if ( peer_id.startsWith("Mbrst"))
 		{
-			name = Map["Mbrst"] + " " + peer_id.tqat(5) + "." + peer_id.tqat(7);
+			name = Map["Mbrst"] + " " + peer_id.at(5) + "." + peer_id.at(7);
 		}
 			
 		return name;
diff --git a/libktorrent/torrent/peermanager.cpp b/libktorrent/torrent/peermanager.cpp
index adacbae..eefd246 100644
--- a/libktorrent/torrent/peermanager.cpp
+++ b/libktorrent/torrent/peermanager.cpp
@@ -475,10 +475,10 @@ namespace bt
 				
 				// convert IP address to string 
 				pp.ip = TQString("%1.%2.%3.%4")
-						.tqarg((e.ip & 0xFF000000) >> 24)
-						.tqarg((e.ip & 0x00FF0000) >> 16)
-						.tqarg((e.ip & 0x0000FF00) >> 8)
-						.tqarg( e.ip & 0x000000FF);
+						.arg((e.ip & 0xFF000000) >> 24)
+						.arg((e.ip & 0x00FF0000) >> 16)
+						.arg((e.ip & 0x0000FF00) >> 8)
+						.arg( e.ip & 0x000000FF);
 				pp.port = e.port;
 				addPotentialPeer(pp);
 			}
@@ -564,10 +564,10 @@ namespace bt
 			pp.port = ReadUint16(tmp,4);
 			Uint32 ip = ReadUint32(tmp,0);
 			pp.ip = TQString("%1.%2.%3.%4")
-						.tqarg((ip & 0xFF000000) >> 24)
-						.tqarg((ip & 0x00FF0000) >> 16)
-						.tqarg((ip & 0x0000FF00) >> 8)
-						.tqarg( ip & 0x000000FF);
+						.arg((ip & 0xFF000000) >> 24)
+						.arg((ip & 0x00FF0000) >> 16)
+						.arg((ip & 0x0000FF00) >> 8)
+						.arg( ip & 0x000000FF);
 			pp.local = false;
 			
 			addPotentialPeer(pp);
diff --git a/libktorrent/torrent/peersourcemanager.cpp b/libktorrent/torrent/peersourcemanager.cpp
index 44303c4..136d9e5 100644
--- a/libktorrent/torrent/peersourcemanager.cpp
+++ b/libktorrent/torrent/peersourcemanager.cpp
@@ -386,7 +386,7 @@ namespace bt
 				// 30 minutes
 				curr->setInterval(FINAL_WAIT_TIME);
 				timer.start(FINAL_WAIT_TIME * 1000,true);
-				request_time = TQDateTime::tqcurrentDateTime();
+				request_time = TQDateTime::currentDateTime();
 			}
 			else if (curr->failureCount() > 2)
 			{
@@ -394,14 +394,14 @@ namespace bt
 				// a minute or 5, no need for hammering every 30 seconds
 				curr->setInterval(LONGER_WAIT_TIME);
 				timer.start(LONGER_WAIT_TIME * 1000,true);
-				request_time = TQDateTime::tqcurrentDateTime();
+				request_time = TQDateTime::currentDateTime();
 			}
 			else
 			{
 				// lets not hammer and wait 30 seconds
 				curr->setInterval(INITIAL_WAIT_TIME);
 				timer.start(INITIAL_WAIT_TIME * 1000,true);
-				request_time = TQDateTime::tqcurrentDateTime();
+				request_time = TQDateTime::currentDateTime();
 			}
 		}
 		else
@@ -418,7 +418,7 @@ namespace bt
 			{
 				curr->setInterval(FINAL_WAIT_TIME);
 				timer.start(FINAL_WAIT_TIME * 1000,true);
-				request_time = TQDateTime::tqcurrentDateTime();
+				request_time = TQDateTime::currentDateTime();
 			}
 			else if (trk->failureCount() > 2)
 			{
@@ -426,14 +426,14 @@ namespace bt
 				// wait 5 minutes and try again
 				curr->setInterval(LONGER_WAIT_TIME);
 				timer.start(LONGER_WAIT_TIME * 1000,true);
-				request_time = TQDateTime::tqcurrentDateTime();
+				request_time = TQDateTime::currentDateTime();
 			}
 			else
 			{
 				// wait 30 seconds and try again
 				curr->setInterval(INITIAL_WAIT_TIME);
 				timer.start(INITIAL_WAIT_TIME * 1000,true);
-				request_time = TQDateTime::tqcurrentDateTime();
+				request_time = TQDateTime::currentDateTime();
 			}
 		}
 	}
@@ -449,7 +449,7 @@ namespace bt
 		pending = false;
 		if (started)
 			statusChanged(i18n("OK"));
-		request_time = TQDateTime::tqcurrentDateTime();
+		request_time = TQDateTime::currentDateTime();
 	}
 		
 	void PeerSourceManager::onTrackerRequestPending()
@@ -504,7 +504,7 @@ namespace bt
 		if (pending || !started || !curr)
 			return 0;
 		
-		return curr->getInterval() - request_time.secsTo(TQDateTime::tqcurrentDateTime());
+		return curr->getInterval() - request_time.secsTo(TQDateTime::currentDateTime());
 	}
 	
 	Uint32 PeerSourceManager::getNumSeeders() const
diff --git a/libktorrent/torrent/peersourcemanager.h b/libktorrent/torrent/peersourcemanager.h
index c46bbb8..d256397 100644
--- a/libktorrent/torrent/peersourcemanager.h
+++ b/libktorrent/torrent/peersourcemanager.h
@@ -165,7 +165,7 @@ namespace bt
 		
 	signals:
 		/**
-		 * tqStatus has changed of the tracker.
+		 * Status has changed of the tracker.
 		 * @param ns The new status
 		 */
 		void statusChanged(const TQString & ns);
diff --git a/libktorrent/torrent/peeruploader.cpp b/libktorrent/torrent/peeruploader.cpp
index 4881dc8..2de899b 100644
--- a/libktorrent/torrent/peeruploader.cpp
+++ b/libktorrent/torrent/peeruploader.cpp
@@ -45,7 +45,7 @@ namespace bt
 	void PeerUploader::addRequest(const Request & r)
 	{
 	//	Out(SYS_CON|LOG_DEBUG) << 
-	//			TQString("PeerUploader::addRequest %1 %2 %3\n").tqarg(r.getIndex()).tqarg(r.getOffset()).tqarg(r.getLength()) << endl;
+	//			TQString("PeerUploader::addRequest %1 %2 %3\n").arg(r.getIndex()).arg(r.getOffset()).arg(r.getLength()) << endl;
 		
 		// allowed fast chunks go to the front of the queue
 		requests.append(r);
@@ -54,7 +54,7 @@ namespace bt
 	void PeerUploader::removeRequest(const Request & r)
 	{
 	//	Out(SYS_CON|LOG_DEBUG) << 
-	//			TQString("PeerUploader::removeRequest %1 %2 %3\n").tqarg(r.getIndex()).tqarg(r.getOffset()).tqarg(r.getLength()) << endl;
+	//			TQString("PeerUploader::removeRequest %1 %2 %3\n").arg(r.getIndex()).arg(r.getOffset()).arg(r.getLength()) << endl;
 		requests.remove(r);
 		peer->getPacketWriter().doNotSendPiece(r,peer->getStats().fast_extensions);
 	}
diff --git a/libktorrent/torrent/queuemanager.cpp b/libktorrent/torrent/queuemanager.cpp
index affedf5..0c76b8a 100644
--- a/libktorrent/torrent/queuemanager.cpp
+++ b/libktorrent/torrent/queuemanager.cpp
@@ -132,7 +132,7 @@ namespace bt
 							return kt::NOT_ENOUGH_DISKSPACE;
 
 						case 1: //ask user
-							if (KMessageBox::questionYesNo(0, i18n("You don't have enough disk space to download this torrent. Are you sure you want to continue?"), i18n("Insufficient disk space for %1").tqarg(s.torrent_name)) == KMessageBox::No)
+							if (KMessageBox::questionYesNo(0, i18n("You don't have enough disk space to download this torrent. Are you sure you want to continue?"), i18n("Insufficient disk space for %1").arg(s.torrent_name)) == KMessageBox::No)
 							{
 								tc->setPriority(0);
 								return kt::USER_CANCELED;
@@ -154,7 +154,7 @@ namespace bt
 
 			if (s.completed && max_ratio > 0 && ratio >= max_ratio)
 			{
-				if (KMessageBox::questionYesNo(0, i18n("Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start seeding anyway?").tqarg(s.torrent_name), i18n("Maximum share ratio limit reached.")) == KMessageBox::Yes)
+				if (KMessageBox::questionYesNo(0, i18n("Torrent \"%1\" has reached its maximum share ratio. Ignore the limit and start seeding anyway?").arg(s.torrent_name), i18n("Maximum share ratio limit reached.")) == KMessageBox::Yes)
 				{
 					tc->setMaxShareRatio(0.00f);
 					startSafely(tc);
@@ -234,7 +234,7 @@ namespace bt
 				{
 					TQString msg =
 						i18n("Error stopping torrent %1 : %2")
-						.tqarg(s.torrent_name).tqarg(err.toString());
+						.arg(s.torrent_name).arg(err.toString());
 					KMessageBox::error(0, msg, i18n("Error"));
 				}
 			}
@@ -740,7 +740,7 @@ namespace bt
 
 			TQString msg =
 				i18n("Error starting torrent %1 : %2")
-				.tqarg(s.torrent_name).tqarg(err.toString());
+				.arg(s.torrent_name).arg(err.toString());
 
 			KMessageBox::error(0, msg, i18n("Error"));
 		}
@@ -758,7 +758,7 @@ namespace bt
 
 			TQString msg =
 				i18n("Error stopping torrent %1 : %2")
-				.tqarg(s.torrent_name).tqarg(err.toString());
+				.arg(s.torrent_name).arg(err.toString());
 
 			KMessageBox::error(0, msg, i18n("Error"));
 		}
diff --git a/libktorrent/torrent/singlefilecache.cpp b/libktorrent/torrent/singlefilecache.cpp
index 4843c1f..8986f98 100644
--- a/libktorrent/torrent/singlefilecache.cpp
+++ b/libktorrent/torrent/singlefilecache.cpp
@@ -76,7 +76,7 @@ namespace bt
 		{
 			// mmap continuously fails, so stop using it
 			c->allocate();
-			c->settqStatus(Chunk::BUFFERED);
+			c->setStatus(Chunk::BUFFERED);
 		}
 		else
 		{
@@ -88,7 +88,7 @@ namespace bt
 				// buffer it if mmapping fails
 				Out(SYS_GEN|LOG_IMPORTANT) << "Warning : mmap failure, falling back to buffered mode" << endl;
 				c->allocate();
-				c->settqStatus(Chunk::BUFFERED);
+				c->setStatus(Chunk::BUFFERED);
 			}
 			else
 			{
@@ -105,7 +105,7 @@ namespace bt
 		if (mmap_failures >= 3 || !(buf = (Uint8*)fd->map(c,off,c->getSize(),CacheFile::READ)))
 		{
 			c->allocate();
-			c->settqStatus(Chunk::BUFFERED);
+			c->setStatus(Chunk::BUFFERED);
 			fd->read(c->getData(),c->getSize(),off);
 			if (mmap_failures < 3)
 				mmap_failures++;
@@ -119,18 +119,18 @@ namespace bt
 	void SingleFileCache::save(Chunk* c)
 	{
 		// unmap the chunk if it is mapped
-		if (c->gettqStatus() == Chunk::MMAPPED)
+		if (c->getStatus() == Chunk::MMAPPED)
 		{
 			fd->unmap(c->getData(),c->getSize());
 			c->clear();
-			c->settqStatus(Chunk::ON_DISK);
+			c->setStatus(Chunk::ON_DISK);
 		}
-		else if (c->gettqStatus() == Chunk::BUFFERED)
+		else if (c->getStatus() == Chunk::BUFFERED)
 		{
 			Uint64 off = c->getIndex() * tor.getChunkSize();
 			fd->write(c->getData(),c->getSize(),off);
 			c->clear();
-			c->settqStatus(Chunk::ON_DISK);
+			c->setStatus(Chunk::ON_DISK);
 		}
 	}
 
diff --git a/libktorrent/torrent/statsfile.cpp b/libktorrent/torrent/statsfile.cpp
index 772f6be..6a6e6c0 100644
--- a/libktorrent/torrent/statsfile.cpp
+++ b/libktorrent/torrent/statsfile.cpp
@@ -25,7 +25,7 @@
 
 #include <tqstring.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 namespace bt
 {
diff --git a/libktorrent/torrent/torrent.cpp b/libktorrent/torrent/torrent.cpp
index c5d8459..c175be9 100644
--- a/libktorrent/torrent/torrent.cpp
+++ b/libktorrent/torrent/torrent.cpp
@@ -101,7 +101,7 @@ namespace bt
 		TQFile fptr(file);
 		if (!fptr.open(IO_ReadOnly))
 			throw Error(i18n(" Unable to open torrent file %1 : %2")
-					.tqarg(file).tqarg(fptr.errorString()));
+					.arg(file).arg(fptr.errorString()));
 		
 		TQByteArray data(fptr.size());
 	//	Out() << "File size = " << fptr.size() << endl;
@@ -366,7 +366,7 @@ namespace bt
 	const SHA1Hash & Torrent::getHash(Uint32 idx) const
 	{
 		if (idx >= hash_pieces.count())
-			throw Error(TQString("Torrent::getHash %1 is out of bounds").tqarg(idx));
+			throw Error(TQString("Torrent::getHash %1 is out of bounds").arg(idx));
 		
 		return hash_pieces[idx];
 	}
diff --git a/libktorrent/torrent/torrentcontrol.cpp b/libktorrent/torrent/torrentcontrol.cpp
index a586356..a123803 100644
--- a/libktorrent/torrent/torrentcontrol.cpp
+++ b/libktorrent/torrent/torrentcontrol.cpp
@@ -23,7 +23,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kfiledialog.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <util/log.h>
 #include <util/error.h>
 #include <util/bitset.h>
@@ -200,7 +200,7 @@ namespace bt
 			if (stats.completed && !comp)
 			{
 				pman->killSeeders();
-				TQDateTime now = TQDateTime::tqcurrentDateTime();
+				TQDateTime now = TQDateTime::currentDateTime();
 				istats.running_time_dl += istats.time_started_dl.secsTo(now);
 				updateStatusMsg();
 				updateStats();
@@ -228,7 +228,7 @@ namespace bt
 				else
 					psman->manualUpdate();
 				istats.last_announce = bt::GetCurrentTime();
-				istats.time_started_dl = TQDateTime::tqcurrentDateTime();
+				istats.time_started_dl = TQDateTime::currentDateTime();
 			}
 			updateStatusMsg();
 			
@@ -351,7 +351,7 @@ namespace bt
 			throw;
 		}
 		
-		istats.time_started_ul = istats.time_started_dl = TQDateTime::tqcurrentDateTime();
+		istats.time_started_ul = istats.time_started_dl = TQDateTime::currentDateTime();
 		resetTrackerStats();
 		
 		if (prealloc)
@@ -408,7 +408,7 @@ namespace bt
 
 	void TorrentControl::stop(bool user,WaitJob* wjob)
 	{
-		TQDateTime now = TQDateTime::tqcurrentDateTime();
+		TQDateTime now = TQDateTime::currentDateTime();
 		if(!stats.completed)
 			istats.running_time_dl += istats.time_started_dl.secsTo(now);
 		istats.running_time_ul += istats.time_started_ul.secsTo(now);
@@ -506,7 +506,7 @@ namespace bt
 			delete tor;
 			tor = 0;
 			throw Error(i18n("An error occurred while loading the torrent."
-					" The torrent is probably corrupt or is not a torrent file.\n%1").tqarg(torrent));
+					" The torrent is probably corrupt or is not a torrent file.\n%1").arg(torrent));
 		}
 		
 		initInternal(qman,tmpdir,ddir,default_save_dir,torrent.startsWith(tmpdir));
@@ -544,7 +544,7 @@ namespace bt
 		TQFile fptr(tor_copy);
 		if (!fptr.open(IO_WriteOnly))
 			throw Error(i18n("Unable to create %1 : %2")
-					.tqarg(tor_copy).tqarg(fptr.errorString()));
+					.arg(tor_copy).arg(fptr.errorString()));
 	
 		fptr.writeBlock(data.data(),data.size());
 	}
@@ -559,12 +559,12 @@ namespace bt
 			{
 				qman->mergeAnnounceList(tor->getInfoHash(),tor->getTrackerList());
 
-				throw Error(i18n("You are already downloading this torrent %1, the list of trackers of both torrents has been merged.").tqarg(tor->getNameSuggestion()));
+				throw Error(i18n("You are already downloading this torrent %1, the list of trackers of both torrents has been merged.").arg(tor->getNameSuggestion()));
 			}
 			else
 			{
 				throw Error(i18n("You are already downloading the torrent %1")
-						.tqarg(tor->getNameSuggestion()));
+						.arg(tor->getNameSuggestion()));
 			}
 		}
 	}
@@ -670,7 +670,7 @@ namespace bt
 				
 				throw Error(
 						i18n("Cannot migrate %1 : %2")
-						.tqarg(tor->getNameSuggestion()).tqarg(err.toString()));
+						.arg(tor->getNameSuggestion()).arg(err.toString()));
 			}
 		}
 		setupData(ddir);
@@ -992,21 +992,21 @@ namespace bt
 		
 		if (stats.running)
 		{
-			TQDateTime now = TQDateTime::tqcurrentDateTime();
-			st.write("RUNNING_TIME_DL",TQString("%1").tqarg(istats.running_time_dl + istats.time_started_dl.secsTo(now)));
-			st.write("RUNNING_TIME_UL",TQString("%1").tqarg(istats.running_time_ul + istats.time_started_ul.secsTo(now)));
+			TQDateTime now = TQDateTime::currentDateTime();
+			st.write("RUNNING_TIME_DL",TQString("%1").arg(istats.running_time_dl + istats.time_started_dl.secsTo(now)));
+			st.write("RUNNING_TIME_UL",TQString("%1").arg(istats.running_time_ul + istats.time_started_ul.secsTo(now)));
 		}
 		else
 		{
-			st.write("RUNNING_TIME_DL", TQString("%1").tqarg(istats.running_time_dl));
-			st.write("RUNNING_TIME_UL", TQString("%1").tqarg(istats.running_time_ul));
+			st.write("RUNNING_TIME_DL", TQString("%1").arg(istats.running_time_dl));
+			st.write("RUNNING_TIME_UL", TQString("%1").arg(istats.running_time_ul));
 		}
 		
-		st.write("PRIORITY", TQString("%1").tqarg(istats.priority));
-		st.write("AUTOSTART", TQString("%1").tqarg(stats.autostart));
-		st.write("IMPORTED", TQString("%1").tqarg(stats.imported_bytes));
+		st.write("PRIORITY", TQString("%1").arg(istats.priority));
+		st.write("AUTOSTART", TQString("%1").arg(stats.autostart));
+		st.write("IMPORTED", TQString("%1").arg(stats.imported_bytes));
 		st.write("CUSTOM_OUTPUT_NAME",istats.custom_output_name ? "1" : "0");
-		st.write("MAX_RATIO", TQString("%1").tqarg(stats.max_share_ratio,0,'f',2));
+		st.write("MAX_RATIO", TQString("%1").arg(stats.max_share_ratio,0,'f',2));
 		st.write("MAX_SEED_TIME",TQString::number(stats.max_seed_time));
 		st.write("RESTART_DISK_PREALLOCATION",prealloc ? "1" : "0");
 		
@@ -1222,7 +1222,7 @@ namespace bt
 		if (!stats.running || stats.completed)
 			return istats.running_time_dl;
 		else
-			return istats.running_time_dl + istats.time_started_dl.secsTo(TQDateTime::tqcurrentDateTime());
+			return istats.running_time_dl + istats.time_started_dl.secsTo(TQDateTime::currentDateTime());
 	}
 
 	Uint32 TorrentControl::getRunningTimeUL() const
@@ -1230,7 +1230,7 @@ namespace bt
 		if (!stats.running)
 			return istats.running_time_ul;
 		else
-			return istats.running_time_ul + istats.time_started_ul.secsTo(TQDateTime::tqcurrentDateTime());
+			return istats.running_time_ul + istats.time_started_ul.secsTo(TQDateTime::currentDateTime());
 	}
 
 	Uint32 TorrentControl::getNumFiles() const
@@ -1274,7 +1274,7 @@ namespace bt
 							" To make sure this torrent still works with this version of KTorrent, "
 							"we will migrate this torrent. You will be asked for a location to save "
 							"the torrent to. If you press cancel, we will select your home directory.")
-								.tqarg(tor->getNameSuggestion()));
+								.arg(tor->getNameSuggestion()));
 					outputdir = KFileDialog::getExistingDirectory(TQString(), 0,i18n("Select Folder to Save To"));
 					if (outputdir.isNull())
 						outputdir = TQDir::homeDirPath();
diff --git a/libktorrent/torrent/torrentcreator.cpp b/libktorrent/torrent/torrentcreator.cpp
index 5538b9e..fae7d75 100644
--- a/libktorrent/torrent/torrentcreator.cpp
+++ b/libktorrent/torrent/torrentcreator.cpp
@@ -120,7 +120,7 @@ namespace bt
 	{
 		File fptr;
 		if (!fptr.open(url,"wb"))
-			throw Error(i18n("Cannot open file %1: %2").tqarg(url).tqarg(fptr.errorString()));
+			throw Error(i18n("Cannot open file %1: %2").arg(url).arg(fptr.errorString()));
 
 		BEncoder enc(&fptr);
 		enc.beginDict(); // top dict
@@ -147,7 +147,7 @@ namespace bt
 			enc.write(TQString("comments"));
 			enc.write(comments);
 		}
-		enc.write(TQString("created by"));enc.write(TQString("KTorrent %1").tqarg(kt::VERSION_STRING));
+		enc.write(TQString("created by"));enc.write(TQString("KTorrent %1").arg(kt::VERSION_STRING));
 		enc.write(TQString("creation date"));enc.write((Uint64)time(0));
 		enc.write(TQString("info"));
 		saveInfo(enc);
@@ -237,7 +237,7 @@ namespace bt
 		File fptr;
 		if (!fptr.open(target,"rb"))
 			throw Error(i18n("Cannot open file %1: %2")
-					.tqarg(target).tqarg(fptr.errorString()));
+					.arg(target).arg(fptr.errorString()));
 
 		Uint32 s = cur_chunk != num_chunks - 1 ? chunk_size : last_size;
 		fptr.seek(File::BEGIN,(Int64)cur_chunk*chunk_size);
@@ -275,7 +275,7 @@ namespace bt
 			if (!fptr.open(target + f.getPath(),"rb"))
 			{
 				throw Error(i18n("Cannot open file %1: %2")
-						.tqarg(f.getPath()).tqarg(fptr.errorString()));
+						.arg(f.getPath()).arg(fptr.errorString()));
 			}
 
 			// first calculate offset into file
@@ -336,7 +336,7 @@ namespace bt
 		// write full index file
 		File fptr;
 		if (!fptr.open(dd + "index","wb"))
-			throw Error(i18n("Cannot create index file: %1").tqarg(fptr.errorString()));
+			throw Error(i18n("Cannot create index file: %1").arg(fptr.errorString()));
 
 		for (Uint32 i = 0;i < num_chunks;i++)
 		{
diff --git a/libktorrent/torrent/udptracker.cpp b/libktorrent/torrent/udptracker.cpp
index 6597349..ab33771 100644
--- a/libktorrent/torrent/udptracker.cpp
+++ b/libktorrent/torrent/udptracker.cpp
@@ -144,10 +144,10 @@ namespace bt
 		{
 			Uint32 ip = ReadUint32(buf,i);
 			addPeer(TQString("%1.%2.%3.%4")
-					.tqarg((ip & (0xFF000000)) >> 24)
-					.tqarg((ip & (0x00FF0000)) >> 16)
-					.tqarg((ip & (0x0000FF00)) >> 8)
-					.tqarg(ip & 0x000000FF),
+					.arg((ip & (0xFF000000)) >> 24)
+					.arg((ip & (0x00FF0000)) >> 16)
+					.arg((ip & (0x0000FF00)) >> 8)
+					.arg(ip & 0x000000FF),
 					ReadUint16(buf,i+4));
 		}
 		
diff --git a/libktorrent/torrent/udptrackersocket.cpp b/libktorrent/torrent/udptrackersocket.cpp
index e440e3c..78be6ad 100644
--- a/libktorrent/torrent/udptrackersocket.cpp
+++ b/libktorrent/torrent/udptrackersocket.cpp
@@ -59,7 +59,7 @@ namespace bt
 		if (!bound)
 		{
 			KMessageBox::error(0,
-				i18n("Cannot bind to udp port %1 or the 10 following ports.").tqarg(port));
+				i18n("Cannot bind to udp port %1 or the 10 following ports.").arg(port));
 		}
 		else
 		{
diff --git a/libktorrent/torrent/value.cpp b/libktorrent/torrent/value.cpp
index 4d8641c..bf73cb0 100644
--- a/libktorrent/torrent/value.cpp
+++ b/libktorrent/torrent/value.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include "value.h"
 
 namespace bt