summaryrefslogtreecommitdiffstats
path: root/libktorrent
diff options
context:
space:
mode:
Diffstat (limited to 'libktorrent')
-rw-r--r--libktorrent/expandablewidget.cpp4
-rw-r--r--libktorrent/expandablewidget.h8
-rw-r--r--libktorrent/interfaces/filetreediritem.cpp20
-rw-r--r--libktorrent/interfaces/filetreediritem.h8
-rw-r--r--libktorrent/interfaces/filetreeitem.cpp6
-rw-r--r--libktorrent/interfaces/filetreeitem.h4
-rw-r--r--libktorrent/interfaces/plugin.cpp4
-rw-r--r--libktorrent/interfaces/plugin.h2
-rw-r--r--libktorrent/interfaces/prefpageinterface.h4
-rw-r--r--libktorrent/kademlia/rpcserver.cpp2
-rw-r--r--libktorrent/kademlia/rpcserver.h2
-rw-r--r--libktorrent/labelview.cpp6
-rw-r--r--libktorrent/labelview.h2
-rw-r--r--libktorrent/pluginmanagerprefpage.cpp8
-rw-r--r--libktorrent/pluginmanagerprefpage.h2
-rw-r--r--libktorrent/torrent/cachefile.cpp2
-rw-r--r--libktorrent/torrent/ipblocklist.cpp86
-rw-r--r--libktorrent/torrent/ipblocklist.h8
-rw-r--r--libktorrent/torrent/torrentcreator.cpp2
-rw-r--r--libktorrent/util/log.cpp6
-rw-r--r--libktorrent/util/profiler.cpp2
-rw-r--r--libktorrent/util/profiler.h8
22 files changed, 98 insertions, 98 deletions
diff --git a/libktorrent/expandablewidget.cpp b/libktorrent/expandablewidget.cpp
index 8c06357..a6ec44d 100644
--- a/libktorrent/expandablewidget.cpp
+++ b/libktorrent/expandablewidget.cpp
@@ -24,8 +24,8 @@
namespace kt
{
- ExpandableWidget::ExpandableWidget(TQWidget* child,TQWidget *tqparent, const char *name)
- : TQWidget(tqparent, name)
+ ExpandableWidget::ExpandableWidget(TQWidget* child,TQWidget *parent, const char *name)
+ : TQWidget(parent, name)
{
top_layout = new TQHBoxLayout(this);
child->reparent(this,TQPoint(),true);
diff --git a/libktorrent/expandablewidget.h b/libktorrent/expandablewidget.h
index 02e6cf8..bf76dbb 100644
--- a/libktorrent/expandablewidget.h
+++ b/libktorrent/expandablewidget.h
@@ -48,23 +48,23 @@ namespace kt
/**
* Constructor, the first child must be provided.
* @param child The first child
- * @param tqparent The tqparent
+ * @param parent The parent
* @param name The name
*/
- ExpandableWidget(TQWidget* child,TQWidget *tqparent = 0, const char *name = 0);
+ ExpandableWidget(TQWidget* child,TQWidget *parent = 0, const char *name = 0);
virtual ~ExpandableWidget();
/**
- * Expand the widget. This will ensure the proper tqparent child relations.
+ * Expand the widget. This will ensure the proper parent child relations.
* @param w The widget
* @param pos It's position relative to the current widget
*/
void expand(TQWidget* w,Position pos);
/**
- * Remove a widget. This will ensure the proper tqparent child relations.
+ * Remove a widget. This will ensure the proper parent child relations.
* The widget w will become parentless. Note the first child will never be removed.
* @param w The widget
*/
diff --git a/libktorrent/interfaces/filetreediritem.cpp b/libktorrent/interfaces/filetreediritem.cpp
index 7cb78ca..86481f2 100644
--- a/libktorrent/interfaces/filetreediritem.cpp
+++ b/libktorrent/interfaces/filetreediritem.cpp
@@ -37,7 +37,7 @@ namespace kt
FileTreeDirItem::FileTreeDirItem(KListView* klv,const TQString & name,FileTreeRootListener* rl)
: TQCheckListItem(klv,TQString(),TQCheckListItem::CheckBox),name(name),root_listener(rl)
{
- tqparent = 0;
+ parent = 0;
size = 0;
setPixmap(0,KGlobal::iconLoader()->loadIcon("folder",KIcon::Small));
setText(0,name);
@@ -48,9 +48,9 @@ namespace kt
manual_change = false;
}
- FileTreeDirItem::FileTreeDirItem(FileTreeDirItem* tqparent,const TQString & name)
- : TQCheckListItem(tqparent,TQString(),TQCheckListItem::CheckBox),
- name(name),tqparent(tqparent)
+ FileTreeDirItem::FileTreeDirItem(FileTreeDirItem* parent,const TQString & name)
+ : TQCheckListItem(parent,TQString(),TQCheckListItem::CheckBox),
+ name(name),parent(parent)
{
size = 0;
setPixmap(0,KGlobal::iconLoader()->loadIcon("folder",KIcon::Small));
@@ -161,8 +161,8 @@ namespace kt
return;
}
}
- if (tqparent)
- tqparent->childStateChange();
+ if (parent)
+ parent->childStateChange();
}
setText(2,on ? i18n("Yes") : i18n("No"));
}
@@ -219,8 +219,8 @@ namespace kt
setOn(allChildrenOn());
manual_change = false;
- if (tqparent)
- tqparent->childStateChange();
+ if (parent)
+ parent->childStateChange();
else if (root_listener)
root_listener->treeItemChanged();
@@ -286,10 +286,10 @@ namespace kt
TQString FileTreeDirItem::getPath() const
{
- if (!tqparent)
+ if (!parent)
return bt::DirSeparator();
else
- return tqparent->getPath() + name + bt::DirSeparator();
+ return parent->getPath() + name + bt::DirSeparator();
}
}
diff --git a/libktorrent/interfaces/filetreediritem.h b/libktorrent/interfaces/filetreediritem.h
index 9afdbd1..37de320 100644
--- a/libktorrent/interfaces/filetreediritem.h
+++ b/libktorrent/interfaces/filetreediritem.h
@@ -51,12 +51,12 @@ namespace kt
Uint64 size;
bt::PtrMap<TQString,FileTreeItem> tqchildren;
bt::PtrMap<TQString,FileTreeDirItem> subdirs;
- FileTreeDirItem* tqparent;
+ FileTreeDirItem* parent;
bool manual_change;
FileTreeRootListener* root_listener;
public:
FileTreeDirItem(KListView* klv,const TQString & name,FileTreeRootListener* rl = 0);
- FileTreeDirItem(FileTreeDirItem* tqparent,const TQString & name);
+ FileTreeDirItem(FileTreeDirItem* parent,const TQString & name);
virtual ~FileTreeDirItem();
/// Get the path of the directory (if this is the root directory / will be returned)
@@ -93,11 +93,11 @@ namespace kt
void invertChecked();
/**
- * Called by the child to notify the tqparent it's state has changed.
+ * Called by the child to notify the parent it's state has changed.
*/
void childStateChange();
- FileTreeDirItem* getParent() {return tqparent;}
+ FileTreeDirItem* getParent() {return parent;}
/// Recusively get the total number of bytes to download
Uint64 bytesToDownload() const;
diff --git a/libktorrent/interfaces/filetreeitem.cpp b/libktorrent/interfaces/filetreeitem.cpp
index 666c1a0..6431152 100644
--- a/libktorrent/interfaces/filetreeitem.cpp
+++ b/libktorrent/interfaces/filetreeitem.cpp
@@ -35,7 +35,7 @@ namespace kt
FileTreeItem::FileTreeItem(FileTreeDirItem* item,const TQString & name,kt::TorrentFileInterface & file)
: TQCheckListItem(item,TQString(),TQCheckListItem::CheckBox),name(name),file(file)
{
- tqparent = item;
+ parent = item;
manual_change = false;
init();
}
@@ -66,7 +66,7 @@ namespace kt
}
updatePriorityText();
- tqparent->childStateChange();
+ parent->childStateChange();
}
void FileTreeItem::updatePriorityText()
@@ -141,7 +141,7 @@ namespace kt
}
updatePriorityText();
- tqparent->childStateChange();
+ parent->childStateChange();
}
int FileTreeItem::compare(TQListViewItem* i, int col, bool ascending) const
diff --git a/libktorrent/interfaces/filetreeitem.h b/libktorrent/interfaces/filetreeitem.h
index 6d6ed79..9d32253 100644
--- a/libktorrent/interfaces/filetreeitem.h
+++ b/libktorrent/interfaces/filetreeitem.h
@@ -45,11 +45,11 @@ namespace kt
protected:
TQString name;
TorrentFileInterface & file;
- FileTreeDirItem* tqparent;
+ FileTreeDirItem* parent;
bool manual_change;
public:
/**
- * Constructor, set the tqparent, name and file
+ * Constructor, set the parent, name and file
* @param item Parent item
* @param name Name of file
* @param file THe TorrentFileInterface
diff --git a/libktorrent/interfaces/plugin.cpp b/libktorrent/interfaces/plugin.cpp
index 50903d7..92a4f22 100644
--- a/libktorrent/interfaces/plugin.cpp
+++ b/libktorrent/interfaces/plugin.cpp
@@ -22,11 +22,11 @@
namespace kt
{
- Plugin::Plugin(TQObject *tqparent, const char* qt_name,const TQStringList & /*args*/,
+ Plugin::Plugin(TQObject *parent, const char* qt_name,const TQStringList & /*args*/,
const TQString & name,const TQString & gui_name,const TQString & author,
const TQString & email,const TQString & description,
const TQString & icon)
- : KParts::Plugin(tqparent,qt_name),
+ : KParts::Plugin(parent,qt_name),
name(name),author(author),email(email),description(description),icon(icon),gui_name(gui_name)
{
core = 0;
diff --git a/libktorrent/interfaces/plugin.h b/libktorrent/interfaces/plugin.h
index d147d46..9c72a0f 100644
--- a/libktorrent/interfaces/plugin.h
+++ b/libktorrent/interfaces/plugin.h
@@ -60,7 +60,7 @@ namespace kt
* @param description What does the plugin do
* @param icon Name of the plugin's icon
*/
- Plugin(TQObject *tqparent,const char* qt_name,const TQStringList & args,
+ Plugin(TQObject *parent,const char* qt_name,const TQStringList & args,
const TQString & name,const TQString & gui_name,const TQString & author,
const TQString & email,const TQString & description,
const TQString & icon);
diff --git a/libktorrent/interfaces/prefpageinterface.h b/libktorrent/interfaces/prefpageinterface.h
index b27390e..850a344 100644
--- a/libktorrent/interfaces/prefpageinterface.h
+++ b/libktorrent/interfaces/prefpageinterface.h
@@ -58,9 +58,9 @@ namespace kt
/**
* Create the actual widget.
- * @param tqparent The tqparent of the widget
+ * @param parent The parent of the widget
*/
- virtual void createWidget(TQWidget* tqparent)=0;
+ virtual void createWidget(TQWidget* parent)=0;
/**
* Update all data on the widget, gets called before
diff --git a/libktorrent/kademlia/rpcserver.cpp b/libktorrent/kademlia/rpcserver.cpp
index 0be22a8..8157f9b 100644
--- a/libktorrent/kademlia/rpcserver.cpp
+++ b/libktorrent/kademlia/rpcserver.cpp
@@ -42,7 +42,7 @@ namespace dht
- RPCServer::RPCServer(DHT* dh_table,Uint16 port,TQObject *tqparent) : TQObject(tqparent),dh_table(dh_table),next_mtid(0),port(port)
+ RPCServer::RPCServer(DHT* dh_table,Uint16 port,TQObject *parent) : TQObject(parent),dh_table(dh_table),next_mtid(0),port(port)
{
sock = new KDatagramSocket(this);
sock->setBlocking(false);
diff --git a/libktorrent/kademlia/rpcserver.h b/libktorrent/kademlia/rpcserver.h
index 393db7a..0af88be 100644
--- a/libktorrent/kademlia/rpcserver.h
+++ b/libktorrent/kademlia/rpcserver.h
@@ -57,7 +57,7 @@ namespace dht
Q_OBJECT
TQ_OBJECT
public:
- RPCServer(DHT* dh_table,Uint16 port,TQObject *tqparent = 0);
+ RPCServer(DHT* dh_table,Uint16 port,TQObject *parent = 0);
virtual ~RPCServer();
/// Start the server
diff --git a/libktorrent/labelview.cpp b/libktorrent/labelview.cpp
index e33d448..b46de3a 100644
--- a/libktorrent/labelview.cpp
+++ b/libktorrent/labelview.cpp
@@ -107,7 +107,7 @@ namespace kt
{
TQVBoxLayout* tqlayout;
public:
- LabelViewBox(TQWidget* tqparent) : TQWidget(tqparent)
+ LabelViewBox(TQWidget* parent) : TQWidget(parent)
{
setPaletteBackgroundColor(KGlobalSettings::baseColor());
tqlayout = new TQVBoxLayout(this);
@@ -145,8 +145,8 @@ namespace kt
///////////////////////////////////////
- LabelView::LabelView ( TQWidget *tqparent, const char *name )
- : TQScrollView ( tqparent, name ),selected(0)
+ LabelView::LabelView ( TQWidget *parent, const char *name )
+ : TQScrollView ( parent, name ),selected(0)
{
item_box = new LabelViewBox(this->viewport());
setResizePolicy(TQScrollView::AutoOneFit);
diff --git a/libktorrent/labelview.h b/libktorrent/labelview.h
index 04ddf92..550e2d5 100644
--- a/libktorrent/labelview.h
+++ b/libktorrent/labelview.h
@@ -85,7 +85,7 @@ namespace kt
Q_OBJECT
TQ_OBJECT
public:
- LabelView(TQWidget *tqparent = 0, const char *name = 0);
+ LabelView(TQWidget *parent = 0, const char *name = 0);
virtual ~LabelView();
/// Add an item to the label view
diff --git a/libktorrent/pluginmanagerprefpage.cpp b/libktorrent/pluginmanagerprefpage.cpp
index 0dfc9cc..66b1166 100644
--- a/libktorrent/pluginmanagerprefpage.cpp
+++ b/libktorrent/pluginmanagerprefpage.cpp
@@ -38,8 +38,8 @@ namespace kt
{
Plugin* p;
public:
- PluginViewItem(Plugin* p,LabelView* tqparent)
- : LabelViewItem(p->getIcon(),p->getGuiName(),p->getDescription(),tqparent),p(p)
+ PluginViewItem(Plugin* p,LabelView* parent)
+ : LabelViewItem(p->getIcon(),p->getGuiName(),p->getDescription(),parent),p(p)
{
update();
}
@@ -74,9 +74,9 @@ namespace kt
return true;
}
- void PluginManagerPrefPage::createWidget(TQWidget* tqparent)
+ void PluginManagerPrefPage::createWidget(TQWidget* parent)
{
- pmw = new PluginManagerWidget(tqparent);
+ pmw = new PluginManagerWidget(parent);
connect(pmw->load_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onLoad()));
connect(pmw->unload_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onUnload()));
diff --git a/libktorrent/pluginmanagerprefpage.h b/libktorrent/pluginmanagerprefpage.h
index 9b78394..8585246 100644
--- a/libktorrent/pluginmanagerprefpage.h
+++ b/libktorrent/pluginmanagerprefpage.h
@@ -45,7 +45,7 @@ namespace kt
virtual ~PluginManagerPrefPage();
virtual bool apply();
- virtual void createWidget(TQWidget* tqparent);
+ virtual void createWidget(TQWidget* parent);
virtual void updateData();
virtual void deleteWidget();
diff --git a/libktorrent/torrent/cachefile.cpp b/libktorrent/torrent/cachefile.cpp
index da5ecae..678124a 100644
--- a/libktorrent/torrent/cachefile.cpp
+++ b/libktorrent/torrent/cachefile.cpp
@@ -46,7 +46,7 @@
// Not all systems have an O_LARGEFILE - Solaris depending
// on command-line defines, FreeBSD never - so in those cases,
-// make it a zero bittqmask. As long as it's only OR'ed into
+// make it a zero bitmask. As long as it's only OR'ed into
// open(2) flags, that's fine.
//
#ifndef O_LARGEFILE
diff --git a/libktorrent/torrent/ipblocklist.cpp b/libktorrent/torrent/ipblocklist.cpp
index 632f42c..547b6ad 100644
--- a/libktorrent/torrent/ipblocklist.cpp
+++ b/libktorrent/torrent/ipblocklist.cpp
@@ -75,7 +75,7 @@ namespace bt
Uint32 ipi = toUint32(ip, &ok);
if(!ok)
return;
- IPKey key(ipi,0xFFFFFFFF); //-- you can test ranges here. Just specify your tqmask.
+ IPKey key(ipi,0xFFFFFFFF); //-- you can test ranges here. Just specify your mask.
insertRangeIP(key, state);
Out(SYS_IPF|LOG_NOTICE) << "IP " << ip << " banned." << endl;
}
@@ -85,13 +85,13 @@ namespace bt
bool ok;
int tmp = 0;
Uint32 addr = 0;
- Uint32 tqmask = 0xFFFFFFFF;
+ Uint32 mask = 0xFFFFFFFF;
tmp = ip.section('.',0,0).toInt(&ok);
if(!ok)
{
if(ip.section('.',0,0) == "*")
- tqmask &= 0x00FFFFFF;
+ mask &= 0x00FFFFFF;
else return; //illegal character
}
else
@@ -102,7 +102,7 @@ namespace bt
{
addr <<= 8;
if(ip.section('.',1,1) == "*")
- tqmask &= 0xFF00FFFF;
+ mask &= 0xFF00FFFF;
else return; //illegal character
}
else
@@ -116,7 +116,7 @@ namespace bt
{
addr <<= 8;
if(ip.section('.',2,2) == "*")
- tqmask &= 0xFFFF00FF;
+ mask &= 0xFFFF00FF;
else return; //illegal character
}
else
@@ -130,7 +130,7 @@ namespace bt
{
addr <<= 8;
if(ip.section('.',3,3) == "*")
- tqmask &=0xFFFFFF00;
+ mask &=0xFFFFFF00;
else return; //illegal character
}
else
@@ -139,21 +139,21 @@ namespace bt
addr |= tmp;
}
- IPKey key(addr, tqmask);
+ IPKey key(addr, mask);
this->insertRangeIP(key);
}
void IPBlocklist::insertRangeIP(IPKey& key, int state)
{
-// Out() << "Blocked range: " << key.m_ip << " - " << key.m_tqmask << endl;
+// Out() << "Blocked range: " << key.m_ip << " - " << key.m_mask << endl;
TQMap<IPKey, int>::iterator it;
if ((it = m_peers.find(key)) != m_peers.end())
{
- if(it.key().m_tqmask != key.m_tqmask)
+ if(it.key().m_mask != key.m_mask)
{
int st = it.data();
- IPKey key1(key.m_ip, it.key().m_tqmask | key.m_tqmask);
+ IPKey key1(key.m_ip, it.key().m_mask | key.m_mask);
m_peers.insert(key1, state+st);
return;
}
@@ -168,13 +168,13 @@ namespace bt
bool ok;
int tmp = 0;
Uint32 addr = 0;
- Uint32 tqmask = 0xFFFFFFFF;
+ Uint32 mask = 0xFFFFFFFF;
tmp = ip.section('.',0,0).toInt(&ok);
if(!ok)
{
if(ip.section('.',0,0) == "*")
- tqmask &= 0x00FFFFFF;
+ mask &= 0x00FFFFFF;
else return; //illegal character
}
else
@@ -185,7 +185,7 @@ namespace bt
{
addr <<= 8;
if(ip.section('.',1,1) == "*")
- tqmask &= 0xFF00FFFF;
+ mask &= 0xFF00FFFF;
else return; //illegal character
}
else
@@ -199,7 +199,7 @@ namespace bt
{
addr <<= 8;
if(ip.section('.',2,2) == "*")
- tqmask &= 0xFFFF00FF;
+ mask &= 0xFFFF00FF;
else return; //illegal character
}
else
@@ -213,7 +213,7 @@ namespace bt
{
addr <<= 8;
if(ip.section('.',3,3) == "*")
- tqmask &=0xFFFFFF00;
+ mask &=0xFFFFFF00;
else return; //illegal character
}
else
@@ -222,7 +222,7 @@ namespace bt
addr |= tmp;
}
- IPKey key(addr, tqmask);
+ IPKey key(addr, mask);
TQMap<IPKey, int>::iterator it = m_peers.find(key);
if (it == m_peers.end())
@@ -304,11 +304,11 @@ namespace bt
IPKey::IPKey()
{
m_ip = 0;
- m_tqmask = 0xFFFFFFFF;
+ m_mask = 0xFFFFFFFF;
}
- IPKey::IPKey(TQString& ip, Uint32 tqmask)
- : m_tqmask(tqmask)
+ IPKey::IPKey(TQString& ip, Uint32 mask)
+ : m_mask(mask)
{
bool ok;
this->m_ip = toUint32(ip, &ok);
@@ -317,55 +317,55 @@ namespace bt
IPKey::IPKey(const IPKey& ip)
{
m_ip = ip.m_ip;
- m_tqmask = ip.m_tqmask;
+ m_mask = ip.m_mask;
}
- IPKey::IPKey(Uint32 ip, Uint32 tqmask)
- : m_ip(ip), m_tqmask(tqmask)
+ IPKey::IPKey(Uint32 ip, Uint32 mask)
+ : m_ip(ip), m_mask(mask)
{}
TQString IPKey::toString()
{
- Uint32 tmp, tmptqmask;
+ Uint32 tmp, tmpmask;
Uint32 ip = m_ip;
- Uint32 tqmask = m_tqmask;
+ Uint32 mask = m_mask;
TQString out;
tmp = ip;
- tmptqmask = tqmask;
+ tmpmask = mask;
tmp &= 0x000000FF;
- tmptqmask &= 0x000000FF;
- if(tmptqmask == 0)
+ tmpmask &= 0x000000FF;
+ if(tmpmask == 0)
out.prepend("*");
else
out.prepend(TQString("%1").tqarg(tmp));
ip >>= 8;
- tqmask >>= 8;
+ mask >>= 8;
tmp = ip;
- tmptqmask = tqmask;
+ tmpmask = mask;
tmp &= 0x000000FF;
- tmptqmask &= 0x000000FF;
- if(tmptqmask == 0)
+ tmpmask &= 0x000000FF;
+ if(tmpmask == 0)
out.prepend("*.");
else
out.prepend(TQString("%1.").tqarg(tmp));
ip >>= 8;
- tqmask >>= 8;
+ mask >>= 8;
tmp = ip;
- tmptqmask = tqmask;
+ tmpmask = mask;
tmp &= 0x000000FF;
- tmptqmask &= 0x000000FF;
- if(tmptqmask == 0)
+ tmpmask &= 0x000000FF;
+ if(tmpmask == 0)
out.prepend("*.");
else
out.prepend(TQString("%1.").tqarg(tmp));
ip >>= 8;
- tqmask >>= 8;
+ mask >>= 8;
tmp = ip;
- tmptqmask = tqmask;
+ tmpmask = mask;
tmp &= 0x000000FF;
- tmptqmask &= 0x000000FF;
- if(tmptqmask == 0)
+ tmpmask &= 0x000000FF;
+ if(tmpmask == 0)
out.prepend("*.");
else
out.prepend(TQString("%1.").tqarg(tmp));
@@ -375,23 +375,23 @@ namespace bt
bool IPKey::operator ==(const IPKey& ip) const
{
- return (m_ip & m_tqmask) == m_tqmask & ip.m_ip;
+ return (m_ip & m_mask) == m_mask & ip.m_ip;
}
bool IPKey::operator !=(const IPKey& ip) const
{
- return (m_ip & m_tqmask) != m_tqmask & ip.m_ip;
+ return (m_ip & m_mask) != m_mask & ip.m_ip;
}
bool IPKey::operator < (const IPKey& ip) const
{
- return (m_ip & m_tqmask) < (m_tqmask & ip.m_ip);
+ return (m_ip & m_mask) < (m_mask & ip.m_ip);
}
IPKey& IPKey::operator =(const IPKey& ip)
{
m_ip = ip.m_ip;
- m_tqmask = ip.m_tqmask;
+ m_mask = ip.m_mask;
return *this;
}
diff --git a/libktorrent/torrent/ipblocklist.h b/libktorrent/torrent/ipblocklist.h
index 51e5aa5..6439972 100644
--- a/libktorrent/torrent/ipblocklist.h
+++ b/libktorrent/torrent/ipblocklist.h
@@ -35,8 +35,8 @@ namespace bt
{
public:
IPKey();
- IPKey(TQString& ip, Uint32 tqmask = 0xFFFFFFFF);
- IPKey(Uint32 ip, Uint32 tqmask = 0xFFFFFFFF);
+ IPKey(TQString& ip, Uint32 mask = 0xFFFFFFFF);
+ IPKey(Uint32 ip, Uint32 mask = 0xFFFFFFFF);
IPKey(const IPKey& ip);
~IPKey();
@@ -48,7 +48,7 @@ namespace bt
TQString toString();
Uint32 m_ip;
- Uint32 m_tqmask;
+ Uint32 m_mask;
};
/**
@@ -143,7 +143,7 @@ namespace bt
kt::IPBlockingInterface* pluginInterface;
/**
- * @param IPKey - Key: Peer IP address and bit tqmask if it is a range
+ * @param IPKey - Key: Peer IP address and bit mask if it is a range
* @param int - Number of bad chunks sent.
**/
TQMap<IPKey, int> m_peers;
diff --git a/libktorrent/torrent/torrentcreator.cpp b/libktorrent/torrent/torrentcreator.cpp
index 6ccbd63..5538b9e 100644
--- a/libktorrent/torrent/torrentcreator.cpp
+++ b/libktorrent/torrent/torrentcreator.cpp
@@ -350,7 +350,7 @@ namespace bt
TorrentControl* tc = new TorrentControl();
try
{
- // get the tqparent dir of target
+ // get the parent dir of target
TQFileInfo fi = TQFileInfo(target);
TQString odir;
diff --git a/libktorrent/util/log.cpp b/libktorrent/util/log.cpp
index 6935a45..6030e99 100644
--- a/libktorrent/util/log.cpp
+++ b/libktorrent/util/log.cpp
@@ -45,7 +45,7 @@ namespace bt
class Log::Private
{
public:
- Log* tqparent;
+ Log* parent;
TQTextStream* out;
TQFile fptr;
bool to_cout;
@@ -55,7 +55,7 @@ namespace bt
unsigned int m_filter;
AutoRotateLogJob* rotate_job;
public:
- Private(Log* tqparent) : tqparent(tqparent),out(0),to_cout(false),rotate_job(0)
+ Private(Log* parent) : parent(parent),out(0),to_cout(false),rotate_job(0)
{
out = new TQTextStream();
}
@@ -146,7 +146,7 @@ namespace bt
fptr.close(); // close the log file
out->setDevice(0);
// start the rotate job
- rotate_job = new AutoRotateLogJob(file,tqparent);
+ rotate_job = new AutoRotateLogJob(file,parent);
}
}
diff --git a/libktorrent/util/profiler.cpp b/libktorrent/util/profiler.cpp
index 766012d..a0f42d2 100644
--- a/libktorrent/util/profiler.cpp
+++ b/libktorrent/util/profiler.cpp
@@ -25,7 +25,7 @@
namespace bt
{
- Profile::Profile(Profile* tqparent,const TQString & name) : tqparent(tqparent),name(name)
+ Profile::Profile(Profile* parent,const TQString & name) : parent(parent),name(name)
{
min = max = avg = 0.0;
count = 0;
diff --git a/libktorrent/util/profiler.h b/libktorrent/util/profiler.h
index 836f4ba..917a671 100644
--- a/libktorrent/util/profiler.h
+++ b/libktorrent/util/profiler.h
@@ -34,7 +34,7 @@ namespace bt
*/
class Profile
{
- Profile* tqparent;
+ Profile* parent;
TQPtrList<Profile> tqchildren;
TQString name;
@@ -42,7 +42,7 @@ namespace bt
Uint32 count;
double start_time;
public:
- Profile(Profile* tqparent,const TQString & name);
+ Profile(Profile* parent,const TQString & name);
virtual ~Profile();
/**
@@ -63,9 +63,9 @@ namespace bt
Profile* child(const TQString & name);
/**
- * Get the tqparent of the current profile.
+ * Get the parent of the current profile.
*/
- Profile* getParent() const {return tqparent;}
+ Profile* getParent() const {return parent;}
/**
* Save profile information to a file.
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-25 14:37:32 +0000