TDE
/
ktorrent
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/ktorrent
0
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent 0ad9f974f4
commit f96f74ffa7
186 changed files with 1207 additions and 1207 deletions
Show Stats Download Patch File Download Diff File

4
apps/ktcachecheck/cachechecker.cpp
Unescape View File

@ -44,7 +44,7 @@ namespace ktdebug
this->index_file = index_file; this->index_file = index_file;
File fptr; File fptr;
if (!fptr.open(index_file,"rb")) if (!fptr.open(index_file,"rb"))
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()));
if (fptr.seek(File::END,0) != 0) if (fptr.seek(File::END,0) != 0)
{ {
@ -73,7 +73,7 @@ namespace ktdebug
File fptr; File fptr;
if (!fptr.open(index_file,"wb")) 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()));
std::set<bt::Uint32>::iterator i; std::set<bt::Uint32>::iterator i;
// first remove failed chunks from downloaded // first remove failed chunks from downloaded

4
apps/ktcachecheck/multicachechecker.cpp
Unescape View File

@ -79,7 +79,7 @@ namespace ktdebug
// we can read the chunk from this file // we can read the chunk from this file
File fptr; File fptr;
if (!fptr.open(cache + tf.getPath(),"rb")) if (!fptr.open(cache + tf.getPath(),"rb"))
throw Error(TQString("Cannot open %1 : %2").tqarg(cache + tf.getPath()).tqarg(fptr.errorString())); throw Error(TQString("Cannot open %1 : %2").arg(cache + tf.getPath()).arg(fptr.errorString()));
fptr.seek(File::BEGIN,curr_file_off); fptr.seek(File::BEGIN,curr_file_off);
fptr.read(buf + bytes_offset,to_read); fptr.read(buf + bytes_offset,to_read);
@ -94,7 +94,7 @@ namespace ktdebug
// Out() << "Partially reading " << to_read << endl; // Out() << "Partially reading " << to_read << endl;
File fptr; File fptr;
if (!fptr.open(cache + tf.getPath(),"rb")) if (!fptr.open(cache + tf.getPath(),"rb"))
throw Error(TQString("Cannot open %1 : %2").tqarg(cache + tf.getPath()).tqarg(fptr.errorString())); throw Error(TQString("Cannot open %1 : %2").arg(cache + tf.getPath()).arg(fptr.errorString()));
fptr.seek(File::BEGIN,curr_file_off); fptr.seek(File::BEGIN,curr_file_off);
fptr.read(buf + bytes_offset,to_read); fptr.read(buf + bytes_offset,to_read);

2
apps/ktcachecheck/singlecachechecker.cpp
Unescape View File

@ -48,7 +48,7 @@ namespace ktdebug
if (!fptr.open(cache,"rb")) if (!fptr.open(cache,"rb"))
{ {
throw Error(TQString("Cannot open file : %1 : %2") throw Error(TQString("Cannot open file : %1 : %2")
.tqarg(cache).tqarg( fptr.errorString())); .arg(cache).arg( fptr.errorString()));
} }
Uint32 num_ok = 0,num_not_ok = 0,num_not_downloaded = 0,extra_ok = 0; Uint32 num_ok = 0,num_not_ok = 0,num_not_downloaded = 0,extra_ok = 0;

6
apps/ktorrent/addpeerwidgetbase.ui
Unescape View File

@ -21,7 +21,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout10</cstring> <cstring>layout10</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -77,7 +77,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -86,7 +86,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget" row="2" column="0"> <widget class="TQLayoutWidget" row="2" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout11</cstring> <cstring>layout11</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

36
apps/ktorrent/advancedpref.ui
Unescape View File

@ -32,7 +32,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout15</cstring> <cstring>layout15</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -108,7 +108,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>148</width> <width>148</width>
<height>20</height> <height>20</height>
@ -127,7 +127,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout25</cstring> <cstring>layout25</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -179,7 +179,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout5</cstring> <cstring>layout5</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -223,7 +223,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>111</width> <width>111</width>
<height>20</height> <height>20</height>
@ -234,7 +234,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout5_2</cstring> <cstring>layout5_2</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -283,7 +283,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>111</width> <width>111</width>
<height>20</height> <height>20</height>
@ -294,7 +294,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout8</cstring> <cstring>layout8</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -359,7 +359,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -405,7 +405,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -416,7 +416,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout10</cstring> <cstring>layout10</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -459,7 +459,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>41</width> <width>41</width>
<height>20</height> <height>20</height>
@ -483,7 +483,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout33</cstring> <cstring>layout33</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -491,7 +491,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout32</cstring> <cstring>layout32</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -553,7 +553,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>383</width> <width>383</width>
<height>20</height> <height>20</height>
@ -572,7 +572,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -601,7 +601,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>81</width> <width>81</width>
<height>20</height> <height>20</height>
@ -622,7 +622,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>30</height> <height>30</height>

40
apps/ktorrent/downloadpref.ui
Unescape View File

@ -29,7 +29,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout49</cstring> <cstring>layout49</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -37,7 +37,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout42</cstring> <cstring>layout42</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -45,7 +45,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout16</cstring> <cstring>layout16</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -69,7 +69,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -106,7 +106,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout46</cstring> <cstring>layout46</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -164,7 +164,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout45</cstring> <cstring>layout45</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -214,7 +214,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout48</cstring> <cstring>layout48</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -222,7 +222,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout14</cstring> <cstring>layout14</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -246,7 +246,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>10</width> <width>10</width>
<height>20</height> <height>20</height>
@ -273,7 +273,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>191</width> <width>191</width>
<height>20</height> <height>20</height>
@ -290,7 +290,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>207</width> <width>207</width>
<height>20</height> <height>20</height>
@ -316,7 +316,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout42</cstring> <cstring>layout42</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -356,7 +356,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout18</cstring> <cstring>layout18</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -380,7 +380,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -425,7 +425,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout41</cstring> <cstring>layout41</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -546,7 +546,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout40</cstring> <cstring>layout40</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -594,7 +594,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>208</width> <width>208</width>
<height>20</height> <height>20</height>
@ -611,7 +611,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>208</width> <width>208</width>
<height>20</height> <height>20</height>
@ -628,7 +628,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>208</width> <width>208</width>
<height>20</height> <height>20</height>
@ -697,7 +697,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

4
apps/ktorrent/fileselectdlg.cpp
Unescape View File

@ -217,9 +217,9 @@ void FileSelectDlg::updateSizeLabels()
lblRequired->setText(kt::BytesToString(bytes_to_download)); lblRequired->setText(kt::BytesToString(bytes_to_download));
if (bytes_to_download > bytes_free) if (bytes_to_download > bytes_free)
lbltqStatus->setText("<font color=\"#ff0000\">" + kt::BytesToString(-1*(long long)(bytes_free - bytes_to_download)) + i18n(" short!")); lblStatus->setText("<font color=\"#ff0000\">" + kt::BytesToString(-1*(long long)(bytes_free - bytes_to_download)) + i18n(" short!"));
else else
lbltqStatus->setText(kt::BytesToString(bytes_free - bytes_to_download)); lblStatus->setText(kt::BytesToString(bytes_free - bytes_to_download));
} }
void FileSelectDlg::treeItemChanged() void FileSelectDlg::treeItemChanged()

18
apps/ktorrent/fileselectdlgbase.ui
Unescape View File

@ -21,7 +21,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3"> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
<property name="name"> <property name="name">
<cstring>tqlayout4</cstring> <cstring>layout4</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -44,7 +44,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="3"> <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
<property name="name"> <property name="name">
<cstring>tqlayout6</cstring> <cstring>layout6</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -52,7 +52,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout5</cstring> <cstring>layout5</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -207,7 +207,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>135</height> <height>135</height>
@ -237,7 +237,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Preferred</enum> <enum>Preferred</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -246,7 +246,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout33</cstring> <cstring>layout33</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -280,7 +280,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="1"> <widget class="TQLayoutWidget" row="0" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout34</cstring> <cstring>layout34</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -298,7 +298,7 @@
</widget> </widget>
<widget class="TQLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>lbltqStatus</cstring> <cstring>lblStatus</cstring>
</property> </property>
</widget> </widget>
</vbox> </vbox>
@ -315,7 +315,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>220</width> <width>220</width>
<height>20</height> <height>20</height>

22
apps/ktorrent/filterbar.cpp
Unescape View File

@ -20,7 +20,7 @@
#include "filterbar.h" #include "filterbar.h"
#include <tqlabel.h> #include <tqlabel.h>
#include <tqlayout.h> #include <layout.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <kdialog.h> #include <kdialog.h>
@ -42,30 +42,30 @@ FilterBar::FilterBar(TQWidget *parent, const char *name) :
TQVBoxLayout* foo = new TQVBoxLayout(this); TQVBoxLayout* foo = new TQVBoxLayout(this);
foo->addSpacing(gap); foo->addSpacing(gap);
TQHBoxLayout* tqlayout = new TQHBoxLayout(foo); TQHBoxLayout* layout = new TQHBoxLayout(foo);
tqlayout->addSpacing(gap); layout->addSpacing(gap);
m_close = new KToolBarButton("fileclose",0,this); m_close = new KToolBarButton("fileclose",0,this);
connect(m_close,TQT_SIGNAL(clicked()),this,TQT_SLOT(hide())); connect(m_close,TQT_SIGNAL(clicked()),this,TQT_SLOT(hide()));
tqlayout->addWidget(m_close); layout->addWidget(m_close);
m_filter = new TQLabel(i18n("Find:"), this); m_filter = new TQLabel(i18n("Find:"), this);
tqlayout->addWidget(m_filter); layout->addWidget(m_filter);
tqlayout->addSpacing(KDialog::spacingHint()); layout->addSpacing(KDialog::spacingHint());
m_filterInput = new KLineEdit(this); m_filterInput = new KLineEdit(this);
tqlayout->addWidget(m_filterInput); layout->addWidget(m_filterInput);
m_clear = new KPushButton(this); m_clear = new KPushButton(this);
m_clear->setIconSet(SmallIcon("clear_left")); m_clear->setIconSet(SmallIcon("clear_left"));
m_clear->setFlat(true); m_clear->setFlat(true);
tqlayout->addWidget(m_clear); layout->addWidget(m_clear);
tqlayout->addSpacing(gap); layout->addSpacing(gap);
m_case_sensitive = new TQCheckBox(i18n("Case sensitive"),this); m_case_sensitive = new TQCheckBox(i18n("Case sensitive"),this);
m_case_sensitive->setChecked(true); m_case_sensitive->setChecked(true);
tqlayout->addWidget(m_case_sensitive); layout->addWidget(m_case_sensitive);
tqlayout->addItem(new TQSpacerItem(10,10,TQSizePolicy::Expanding)); layout->addItem(new TQSpacerItem(10,10,TQSizePolicy::Expanding));
connect(m_filterInput, TQT_SIGNAL(textChanged(const TQString&)), connect(m_filterInput, TQT_SIGNAL(textChanged(const TQString&)),
this, TQT_SLOT(slotChangeFilter(const TQString&))); this, TQT_SLOT(slotChangeFilter(const TQString&)));

14
apps/ktorrent/generalpref.ui
Unescape View File

@ -29,7 +29,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>50</height> <height>50</height>
@ -104,7 +104,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -142,7 +142,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -174,7 +174,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout3</cstring> <cstring>layout3</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -237,7 +237,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1"> <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
<property name="name"> <property name="name">
<cstring>tqlayout13</cstring> <cstring>layout13</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -310,7 +310,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>tqlayout24</cstring> <cstring>layout24</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -355,7 +355,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="1" column="1" rowspan="3" colspan="1"> <widget class="TQLayoutWidget" row="1" column="1" rowspan="3" colspan="1">
<property name="name"> <property name="name">
<cstring>tqlayout14</cstring> <cstring>layout14</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">

4
apps/ktorrent/groups/groupview.cpp
Unescape View File

@ -163,7 +163,7 @@ namespace kt
if (gman->find(name)) if (gman->find(name))
{ {
KMessageBox::error(this,i18n("The group %1 already exists.").tqarg(name)); KMessageBox::error(this,i18n("The group %1 already exists.").arg(name));
return; return;
} }
@ -214,7 +214,7 @@ namespace kt
if (gman->find(name)) if (gman->find(name))
{ {
KMessageBox::error(this,i18n("The group %1 already exists.").tqarg(name)); KMessageBox::error(this,i18n("The group %1 already exists.").arg(name));
} }
else else
{ {

2
apps/ktorrent/groups/torrentgroup.cpp
Unescape View File

@ -51,7 +51,7 @@ namespace kt
if (hashes.count(tor->getInfoHash())) if (hashes.count(tor->getInfoHash()))
{ {
/* bt::Out(SYS_GEN|LOG_DEBUG) << /* bt::Out(SYS_GEN|LOG_DEBUG) <<
TQString("TG %1 : Torrent %2 from hashes list").tqarg(groupName()).tqarg(tor->getStats().torrent_name) << endl; TQString("TG %1 : Torrent %2 from hashes list").arg(groupName()).arg(tor->getStats().torrent_name) << endl;
*/ */
hashes.erase(tor->getInfoHash()); hashes.erase(tor->getInfoHash());
torrents.insert(tor); torrents.insert(tor);

2
apps/ktorrent/ipfilterwidget.cpp
Unescape View File

@ -140,7 +140,7 @@ void IPFilterWidget::saveFilter(TQString& fn)
if (!fptr.open(IO_WriteOnly)) if (!fptr.open(IO_WriteOnly))
{ {
Out(SYS_GEN|LOG_NOTICE) << TQString("Could not open file %1 for writing.").tqarg(fn) << endl; Out(SYS_GEN|LOG_NOTICE) << TQString("Could not open file %1 for writing.").arg(fn) << endl;
return; return;
} }

14
apps/ktorrent/ipfilterwidgetbase.ui
Unescape View File

@ -29,7 +29,7 @@
<property name="text"> <property name="text">
<string>Note: Blacklist applies to current session only. Use save/open to save your entries or use IPFilter plugin (PeerGuardian).</string> <string>Note: Blacklist applies to current session only. Use save/open to save your entries or use IPFilter plugin (PeerGuardian).</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -73,7 +73,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -82,7 +82,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout8</cstring> <cstring>layout8</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -111,7 +111,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="1" rowspan="3" colspan="1"> <widget class="TQLayoutWidget" row="0" column="1" rowspan="3" colspan="1">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -144,7 +144,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -192,7 +192,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -234,7 +234,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>30</height> <height>30</height>

10
apps/ktorrent/ktorrent.cpp
Unescape View File

@ -791,14 +791,14 @@ void KTorrent::updatedStats()
//m_statusInfo->setText(i18n("Some info here e.g. connected/disconnected")); //m_statusInfo->setText(i18n("Some info here e.g. connected/disconnected"));
TQString tmp = i18n("Speed down: %1 / up: %2") TQString tmp = i18n("Speed down: %1 / up: %2")
.tqarg(KBytesPerSecToString((double)stats.download_speed/1024.0)) .arg(KBytesPerSecToString((double)stats.download_speed/1024.0))
.tqarg(KBytesPerSecToString((double)stats.upload_speed/1024.0)); .arg(KBytesPerSecToString((double)stats.upload_speed/1024.0));
m_statusSpeed->setText(tmp); m_statusSpeed->setText(tmp);
TQString tmp1 = i18n("Transferred down: %1 / up: %2") TQString tmp1 = i18n("Transferred down: %1 / up: %2")
.tqarg(BytesToString(stats.bytes_downloaded)) .arg(BytesToString(stats.bytes_downloaded))
.tqarg(BytesToString(stats.bytes_uploaded)); .arg(BytesToString(stats.bytes_uploaded));
m_statusTransfer->setText(tmp1); m_statusTransfer->setText(tmp1);
if (ServerAuthenticate::isFirewalled() && m_core->getNumTorrentsRunning() > 0) if (ServerAuthenticate::isFirewalled() && m_core->getNumTorrentsRunning() > 0)
@ -817,7 +817,7 @@ void KTorrent::updatedStats()
{ {
const dht::Stats & s = Globals::instance().getDHT().getStats(); const dht::Stats & s = Globals::instance().getDHT().getStats();
m_statusDHT->setText(i18n("DHT: %1 nodes, %2 tasks") m_statusDHT->setText(i18n("DHT: %1 nodes, %2 tasks")
.tqarg(s.num_peers).tqarg(s.num_tasks)); .arg(s.num_peers).arg(s.num_tasks));
} }
else else
m_statusDHT->setText(i18n("DHT: off")); m_statusDHT->setText(i18n("DHT: off"));

20
apps/ktorrent/ktorrentcore.cpp
Unescape View File

@ -114,7 +114,7 @@ KTorrentCore::KTorrentCore(kt::GUIInterface* gui) : max_downloads(0),keep_seedin
KMessageBox::information(0, KMessageBox::information(0,
i18n("Specified port (%1) is unavailable or in" i18n("Specified port (%1) is unavailable or in"
" use by another application. KTorrent is now using port %2.") " use by another application. KTorrent is now using port %2.")
.tqarg(port).tqarg(port + i - 1)); .arg(port).arg(port + i - 1));
Out(SYS_GEN|LOG_NOTICE) << "Bound to port " << (port + i - 1) << endl; Out(SYS_GEN|LOG_NOTICE) << "Bound to port " << (port + i - 1) << endl;
} }
@ -122,7 +122,7 @@ KTorrentCore::KTorrentCore(kt::GUIInterface* gui) : max_downloads(0),keep_seedin
{ {
KMessageBox::error(0, KMessageBox::error(0,
i18n("KTorrent is unable to accept connections because the ports %1 to %2 are " i18n("KTorrent is unable to accept connections because the ports %1 to %2 are "
"already in use by another program.").tqarg(port).tqarg(port + i - 1)); "already in use by another program.").arg(port).arg(port + i - 1));
Out(SYS_GEN|LOG_IMPORTANT) << "Cannot find free port" << endl; Out(SYS_GEN|LOG_IMPORTANT) << "Cannot find free port" << endl;
} }
@ -465,7 +465,7 @@ TQString KTorrentCore::findNewTorrentDir() const
while (true) while (true)
{ {
TQDir d; TQDir d;
TQString dir = data_dir + TQString("tor%1/").tqarg(i); TQString dir = data_dir + TQString("tor%1/").arg(i);
if (!d.exists(dir)) if (!d.exists(dir))
{ {
return dir; return dir;
@ -764,7 +764,7 @@ void KTorrentCore::makeTorrent(const TQString & file,const TQStringList & tracke
// Show error message // Show error message
KMessageBox::error(0, KMessageBox::error(0,
i18n("Cannot create torrent: %1").tqarg(e.toString()), i18n("Cannot create torrent: %1").arg(e.toString()),
i18n("Error")); i18n("Error"));
} }
} }
@ -889,7 +889,7 @@ void KTorrentCore::queue(kt::TorrentInterface* tc)
TorrentInterface* KTorrentCore::getTorFromNumber(int tornumber) TorrentInterface* KTorrentCore::getTorFromNumber(int tornumber)
{ {
TQString tordir = data_dir + "tor" + TQString("%1").tqarg(tornumber) + "/"; TQString tordir = data_dir + "tor" + TQString("%1").arg(tornumber) + "/";
Out() << "tordir " << tordir << endl; Out() << "tordir " << tordir << endl;
TQPtrList<TorrentInterface>::iterator i = qman->begin(); TQPtrList<TorrentInterface>::iterator i = qman->begin();
while(i != qman->end()) while(i != qman->end())
@ -1025,7 +1025,7 @@ void KTorrentCore::aboutToBeStarted(kt::TorrentInterface* tc,bool & ret)
if (tc->getStats().multi_file_torrent) if (tc->getStats().multi_file_torrent)
{ {
TQString msg = i18n("Several data files of the torrent \"%1\" are missing, do you want to recreate them, or do you want to not download them?").tqarg(tc->getStats().torrent_name); TQString msg = i18n("Several data files of the torrent \"%1\" are missing, do you want to recreate them, or do you want to not download them?").arg(tc->getStats().torrent_name);
int ret = KMessageBox::warningYesNoCancelList(0,msg,missing,TQString(), int ret = KMessageBox::warningYesNoCancelList(0,msg,missing,TQString(),
KGuiItem(i18n("Recreate")),KGuiItem(i18n("Do Not Download"))); KGuiItem(i18n("Recreate")),KGuiItem(i18n("Do Not Download")));
@ -1038,7 +1038,7 @@ void KTorrentCore::aboutToBeStarted(kt::TorrentInterface* tc,bool & ret)
} }
catch (bt::Error & e) catch (bt::Error & e)
{ {
KMessageBox::error(0,i18n("Cannot recreate missing files: %1").tqarg(e.toString())); KMessageBox::error(0,i18n("Cannot recreate missing files: %1").arg(e.toString()));
tc->handleError(i18n("Data files are missing")); tc->handleError(i18n("Data files are missing"));
ret = false; ret = false;
} }
@ -1052,7 +1052,7 @@ void KTorrentCore::aboutToBeStarted(kt::TorrentInterface* tc,bool & ret)
} }
catch (bt::Error & e) catch (bt::Error & e)
{ {
KMessageBox::error(0,i18n("Cannot deselect missing files: %1").tqarg(e.toString())); KMessageBox::error(0,i18n("Cannot deselect missing files: %1").arg(e.toString()));
tc->handleError(i18n("Data files are missing")); tc->handleError(i18n("Data files are missing"));
ret = false; ret = false;
} }
@ -1065,7 +1065,7 @@ void KTorrentCore::aboutToBeStarted(kt::TorrentInterface* tc,bool & ret)
} }
else else
{ {
TQString msg = i18n("The file where the data is saved of the torrent \"%1\" is missing, do you want to recreate it?").tqarg(tc->getStats().torrent_name); TQString msg = i18n("The file where the data is saved of the torrent \"%1\" is missing, do you want to recreate it?").arg(tc->getStats().torrent_name);
int ret = KMessageBox::warningYesNo(0,msg, i18n("Recreate"),KGuiItem(i18n("Recreate")),KGuiItem(i18n("Do Not Recreate"))); int ret = KMessageBox::warningYesNo(0,msg, i18n("Recreate"),KGuiItem(i18n("Recreate")),KGuiItem(i18n("Do Not Recreate")));
if (ret == KMessageBox::Yes) if (ret == KMessageBox::Yes)
{ {
@ -1075,7 +1075,7 @@ void KTorrentCore::aboutToBeStarted(kt::TorrentInterface* tc,bool & ret)
} }
catch (bt::Error & e) catch (bt::Error & e)
{ {
KMessageBox::error(0,i18n("Cannot recreate data file: %1").tqarg(e.toString())); KMessageBox::error(0,i18n("Cannot recreate data file: %1").arg(e.toString()));
tc->handleError(i18n("Data file is missing")); tc->handleError(i18n("Data file is missing"));
ret = false; ret = false;
} }

28
apps/ktorrent/ktorrentview.cpp
Unescape View File

@ -40,7 +40,7 @@
#include <tqcursor.h> #include <tqcursor.h>
#include <tqheader.h> #include <tqheader.h>
#include <tqvaluelist.h> #include <tqvaluelist.h>
#include <tqlayout.h> #include <layout.h>
#include "ktorrentview.h" #include "ktorrentview.h"
#include "ktorrentviewitem.h" #include "ktorrentviewitem.h"
@ -85,8 +85,8 @@ bool TorrentView::eventFilter(TQObject* watched, TQEvent* e)
KTorrentView::KTorrentView(TQWidget *parent) KTorrentView::KTorrentView(TQWidget *parent)
: TQWidget(parent),menu(0),current_group(0),running(0),total(0),view(0),filter_bar(0) : TQWidget(parent),menu(0),current_group(0),running(0),total(0),view(0),filter_bar(0)
{ {
TQVBoxLayout* tqlayout = new TQVBoxLayout(this); TQVBoxLayout* layout = new TQVBoxLayout(this);
tqlayout->setAutoAdd(true); layout->setAutoAdd(true);
view = new TorrentView(this); view = new TorrentView(this);
filter_bar = new FilterBar(this); filter_bar = new FilterBar(this);
filter_bar->setHidden(true); filter_bar->setHidden(true);
@ -198,9 +198,9 @@ void KTorrentView::setCurrentGroup(Group* group)
} }
if (current_group) if (current_group)
setCaption(TQString("%1 %2/%3").tqarg(current_group->groupName()).tqarg(running).tqarg(total)); setCaption(TQString("%1 %2/%3").arg(current_group->groupName()).arg(running).arg(total));
else else
setCaption(i18n("All Torrents %1/%2").tqarg(running).tqarg(total)); setCaption(i18n("All Torrents %1/%2").arg(running).arg(total));
onSelectionChanged(); onSelectionChanged();
onExecuted(view->currentItem()); onExecuted(view->currentItem());
@ -208,7 +208,7 @@ void KTorrentView::setCurrentGroup(Group* group)
void KTorrentView::saveSettings(KConfig* cfg,int idx) void KTorrentView::saveSettings(KConfig* cfg,int idx)
{ {
TQString group = TQString("KTorrentView-%1").tqarg(idx); TQString group = TQString("KTorrentView-%1").arg(idx);
view->saveLayout(cfg,group); view->saveLayout(cfg,group);
cfg->setGroup(group); cfg->setGroup(group);
filter_bar->saveSettings(cfg); filter_bar->saveSettings(cfg);
@ -217,7 +217,7 @@ void KTorrentView::saveSettings(KConfig* cfg,int idx)
void KTorrentView::loadSettings(KConfig* cfg,int idx) void KTorrentView::loadSettings(KConfig* cfg,int idx)
{ {
TQString group = TQString("KTorrentView-%1").tqarg(idx); TQString group = TQString("KTorrentView-%1").arg(idx);
view->restoreLayout(cfg,group); view->restoreLayout(cfg,group);
view->setDragEnabled(true); view->setDragEnabled(true);
@ -373,7 +373,7 @@ void KTorrentView::removeDownloads()
if (!s.completed) if (!s.completed)
{ {
TQString msg = i18n("The torrent %1 has not finished downloading, " TQString msg = i18n("The torrent %1 has not finished downloading, "
"do you want to delete the incomplete data, too?").tqarg(s.torrent_name); "do you want to delete the incomplete data, too?").arg(s.torrent_name);
int ret = KMessageBox::questionYesNoCancel( int ret = KMessageBox::questionYesNoCancel(
this,msg,i18n("Remove Download"), this,msg,i18n("Remove Download"),
i18n("Delete Data"),i18n("Keep Data")); i18n("Delete Data"),i18n("Keep Data"));
@ -546,9 +546,9 @@ void KTorrentView::update()
total = t; total = t;
if (current_group) if (current_group)
setCaption(TQString("%1 %2/%3").tqarg(current_group->groupName()).tqarg(running).tqarg(total)); setCaption(TQString("%1 %2/%3").arg(current_group->groupName()).arg(running).arg(total));
else else
setCaption(i18n("All Torrents %1/%2").tqarg(running).tqarg(total)); setCaption(i18n("All Torrents %1/%2").arg(running).arg(total));
onSelectionChanged(); onSelectionChanged();
} }
@ -628,7 +628,7 @@ void KTorrentView::checkDataIntegrity()
} }
else else
{ {
KMessageBox::error(0,i18n("You are already checking the data of the torrent %1 !").tqarg(tc->getStats().torrent_name)); KMessageBox::error(0,i18n("You are already checking the data of the torrent %1 !").arg(tc->getStats().torrent_name));
} }
} }
@ -748,7 +748,7 @@ void KTorrentView::setDownloadLocationSlot()
if (tc) if (tc)
{ {
TQString dn; TQString dn;
dn = KFileDialog::getExistingDirectory(tc->getStats().output_path, this, i18n("Choose download location for %1").tqarg(tc->getStats().torrent_name)); dn = KFileDialog::getExistingDirectory(tc->getStats().output_path, this, i18n("Choose download location for %1").arg(tc->getStats().torrent_name));
if(dn.isNull() || dn.isEmpty()) if(dn.isNull() || dn.isEmpty())
continue; continue;
@ -872,9 +872,9 @@ void KTorrentView::updateCaption()
total = t; total = t;
if (current_group) if (current_group)
setCaption(TQString("%1 %2/%3").tqarg(current_group->groupName()).tqarg(running).tqarg(total)); setCaption(TQString("%1 %2/%3").arg(current_group->groupName()).arg(running).arg(total));
else else
setCaption(i18n("All Torrents %1/%2").tqarg(running).tqarg(total)); setCaption(i18n("All Torrents %1/%2").arg(running).arg(total));
} }
} }

16
apps/ktorrent/ktorrentviewitem.cpp
Unescape View File

@ -30,7 +30,7 @@
using namespace bt; using namespace bt;
using namespace kt; using namespace kt;
/* /*
static TQString StatusToString(TorrentInterface* tc,TorrenttqStatus s) static TQString StatusToString(TorrentInterface* tc,TorrentStatus s)
{ {
switch (s) switch (s)
{ {
@ -55,7 +55,7 @@ static TQString StatusToString(TorrentInterface* tc,TorrenttqStatus s)
} }
*/ */
static TQColor StatusToColor(TorrenttqStatus s,const TQColorGroup & cg) static TQColor StatusToColor(TorrentStatus s,const TQColorGroup & cg)
{ {
TQColor green(40,205,40); TQColor green(40,205,40);
TQColor yellow(255,174,0); TQColor yellow(255,174,0);
@ -222,7 +222,7 @@ void KTorrentViewItem::update()
Uint32 secs = tc->getETA(); Uint32 secs = tc->getETA();
if(secs == -1) if(secs == -1)
{ {
setText(7,TQString("%1").tqarg(TQChar(0x221E))); setText(7,TQString("%1").arg(TQChar(0x221E)));
eta = -2; eta = -2;
} }
else else
@ -233,7 +233,7 @@ void KTorrentViewItem::update()
} }
else else
{ {
setText(7,TQString("%1").tqarg(TQChar(0x221E))); setText(7,TQString("%1").arg(TQChar(0x221E)));
eta = -2; eta = -2;
} }
} }
@ -242,23 +242,23 @@ void KTorrentViewItem::update()
if(m_parent->columnVisible(8)) if(m_parent->columnVisible(8))
{ {
setText(8,TQString("%1 (%2)").tqarg(TQString::number(s.seeders_connected_to)).tqarg(TQString::number(s.seeders_total))); setText(8,TQString("%1 (%2)").arg(TQString::number(s.seeders_connected_to)).arg(TQString::number(s.seeders_total)));
} }
if(m_parent->columnVisible(9)) if(m_parent->columnVisible(9))
{ {
setText(9,TQString("%1 (%2)").tqarg(TQString::number(s.leechers_connected_to)).tqarg(TQString::number(s.leechers_total))); setText(9,TQString("%1 (%2)").arg(TQString::number(s.leechers_connected_to)).arg(TQString::number(s.leechers_total)));
} }
if(m_parent->columnVisible(10)) if(m_parent->columnVisible(10))
{ {
setText(10,i18n("%1 %").tqarg(KGlobal::locale()->formatNumber(Percentage(s),2))); setText(10,i18n("%1 %").arg(KGlobal::locale()->formatNumber(Percentage(s),2)));
} }
if(m_parent->columnVisible(11)) if(m_parent->columnVisible(11))
{ {
float ratio = kt::ShareRatio(s); float ratio = kt::ShareRatio(s);
setText(11,TQString("%1").tqarg(KGlobal::locale()->formatNumber(ratio,2))); setText(11,TQString("%1").arg(KGlobal::locale()->formatNumber(ratio,2)));
} }
if (m_parent->columnVisible(12)) if (m_parent->columnVisible(12))

8
apps/ktorrent/leaktrace.cpp
Unescape View File

@ -91,7 +91,7 @@ static void WriteLeakReport()
fclose(report); fclose(report);
} }
static void PrinttqStatus() static void PrintStatus()
{ {
if (mtree.count == 0) if (mtree.count == 0)
{ {
@ -124,7 +124,7 @@ static void RegisterAlloc(void* ptr,Uint32 size)
for (Uint32 b = 0;b < SOME_PRIME;b++) for (Uint32 b = 0;b < SOME_PRIME;b++)
mtree.buckets[b] = 0; mtree.buckets[b] = 0;
mtree.num_buckets = SOME_PRIME; mtree.num_buckets = SOME_PRIME;
atexit(PrinttqStatus); atexit(PrintStatus);
} }
// hash the address // hash the address
@ -180,7 +180,7 @@ static void DeregisterAlloc(void* ptr)
if (!p->left && !p->right) if (!p->left && !p->right)
{ {
// no tqchildren so just free p // no children so just free p
if (prev->left == p) if (prev->left == p)
{ {
free(prev->left); free(prev->left);
@ -214,7 +214,7 @@ static void DeregisterAlloc(void* ptr)
} }
else else
{ {
// both tqchildren exist // both children exist
if (prev->left == p) if (prev->left == p)
{ {
// attach the left child of p // attach the left child of p

2
apps/ktorrent/main.cpp
Unescape View File

@ -79,7 +79,7 @@ static const char description[] =
bool GrabPIDLock() bool GrabPIDLock()
{ {
// create a lock file in /tmp/ with the user id of the current user included in the name // create a lock file in /tmp/ with the user id of the current user included in the name
TQString pid_file = TQString("/tmp/.ktorrent_%1.lock").tqarg(getuid()); TQString pid_file = TQString("/tmp/.ktorrent_%1.lock").arg(getuid());
int fd = open(TQFile::encodeName(pid_file),O_RDWR|O_CREAT,0640); int fd = open(TQFile::encodeName(pid_file),O_RDWR|O_CREAT,0640);
if (fd < 0) if (fd < 0)

40
apps/ktorrent/newui/button.cpp
Unescape View File

@ -49,8 +49,8 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon,
setToggleButton(true); setToggleButton(true);
setFocusPolicy(TQ_NoFocus); setFocusPolicy(TQ_NoFocus);
setDescription(m_description); setDescription(m_description);
tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
resize(tqsizeHint()); resize(sizeHint());
fixDimensions(Ideal::Bottom); fixDimensions(Ideal::Bottom);
TQToolTip::add(this, m_realText); TQToolTip::add(this, m_realText);
@ -62,9 +62,9 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon,
KConfig *config = kapp->config(); KConfig *config = kapp->config();
config->setGroup("UI"); config->setGroup("UI");
TQString accel = config->readEntry(TQString("button_%1").tqarg(text), ""); TQString accel = config->readEntry(TQString("button_%1").arg(text), "");
if (!accel.isEmpty()) if (!accel.isEmpty())
setRealText(TQString("&%1 %2").tqarg(accel).tqarg(m_realText)); setRealText(TQString("&%1 %2").arg(accel).arg(m_realText));
} }
Button::~Button() Button::~Button()
@ -80,11 +80,11 @@ Button::~Button()
TQString text = m_realText; TQString text = m_realText;
if (text.contains(r2)) if (text.contains(r2))
text.remove(r2); text.remove(r2);
config->writeEntry(TQString("button_%1").tqarg(text), r.cap(1)); config->writeEntry(TQString("button_%1").arg(text), r.cap(1));
} }
else else
{ {
config->writeEntry(TQString("button_%1").tqarg(m_realText), ""); config->writeEntry(TQString("button_%1").arg(m_realText), "");
} }
} }
@ -131,11 +131,11 @@ void Button::drawButton(TQPainter *p)
pm.fill(eraseColor()); pm.fill(eraseColor());
TQPainter p2(&pm); TQPainter p2(&pm);
tqstyle().tqdrawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), tqcolorGroup(),flags); tqstyle().drawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), colorGroup(),flags);
tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel, &p2, this, tqstyle().drawControl(TQStyle::CE_PushButtonLabel, &p2, this,
TQRect(0,0,pm.width(),pm.height()), TQRect(0,0,pm.width(),pm.height()),
tqcolorGroup(), flags, TQStyleOption()); colorGroup(), flags, TQStyleOption());
switch (m_place) switch (m_place)
{ {
@ -178,7 +178,7 @@ void Button::fixDimensions(Place oldPlace)
if ((oldPlace == Ideal::Bottom) || (oldPlace == Ideal::Top)) if ((oldPlace == Ideal::Bottom) || (oldPlace == Ideal::Top))
{ {
setFixedWidth(height()); setFixedWidth(height());
setMinimumHeight(tqsizeHint().width()); setMinimumHeight(sizeHint().width());
setMaximumHeight(32767); setMaximumHeight(32767);
} }
break; break;
@ -187,19 +187,19 @@ void Button::fixDimensions(Place oldPlace)
if ((oldPlace == Ideal::Left) || (oldPlace == Ideal::Right)) if ((oldPlace == Ideal::Left) || (oldPlace == Ideal::Right))
{ {
setFixedHeight(width()); setFixedHeight(width());
setMinimumWidth(tqsizeHint().height()); setMinimumWidth(sizeHint().height());
setMaximumWidth(32767); setMaximumWidth(32767);
} }
break; break;
} }
} }
TQSize Button::tqsizeHint() const TQSize Button::sizeHint() const
{ {
return tqsizeHint(text()); return sizeHint(text());
} }
TQSize Button::tqsizeHint(const TQString &text) const TQSize Button::sizeHint(const TQString &text) const
{ {
constPolish(); constPolish();
int w = 0, h = 0; int w = 0, h = 0;
@ -211,7 +211,7 @@ TQSize Button::tqsizeHint(const TQString &text) const
h = TQMAX( h, ih ); h = TQMAX( h, ih );
} }
if ( isMenuButton() ) if ( isMenuButton() )
w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this); w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
if ( pixmap() ) { if ( pixmap() ) {
TQPixmap *pm = (TQPixmap *)pixmap(); TQPixmap *pm = (TQPixmap *)pixmap();
w += pm->width(); w += pm->width();
@ -220,7 +220,7 @@ TQSize Button::tqsizeHint(const TQString &text) const
TQString s( text ); TQString s( text );
bool empty = s.isEmpty(); bool empty = s.isEmpty();
if ( empty ) if ( empty )
s = TQString::tqfromLatin1("XXXX"); s = TQString::fromLatin1("XXXX");
TQFontMetrics fm = fontMetrics(); TQFontMetrics fm = fontMetrics();
TQSize sz = fm.size( ShowPrefix, s ); TQSize sz = fm.size( ShowPrefix, s );
if(!empty || !w) if(!empty || !w)
@ -239,12 +239,12 @@ void Button::updateSize()
{ {
case Ideal::Left: case Ideal::Left:
case Ideal::Right: case Ideal::Right:
setMinimumHeight(tqsizeHint().width()); setMinimumHeight(sizeHint().width());
resize(tqsizeHint().height(), tqsizeHint().width()); resize(sizeHint().height(), sizeHint().width());
break; break;
case Ideal::Top: case Ideal::Top:
case Ideal::Bottom: case Ideal::Bottom:
resize(tqsizeHint().width(), tqsizeHint().height()); resize(sizeHint().width(), sizeHint().height());
break; break;
} }
} }
@ -320,7 +320,7 @@ void Button::assignAccel()
if (ok) if (ok)
{ {
TQString text = realTextWithoutAccel(); TQString text = realTextWithoutAccel();
text = TQString("&%1 %2").tqarg(num).tqarg(text); text = TQString("&%1 %2").arg(num).arg(text);
setRealText(text); setRealText(text);
} }
} }

4
apps/ktorrent/newui/button.h
Unescape View File

@ -54,8 +54,8 @@ public:
/**Sets the mode of a button.*/ /**Sets the mode of a button.*/
void setMode(Ideal::ButtonMode mode); void setMode(Ideal::ButtonMode mode);
TQSize tqsizeHint() const; TQSize sizeHint() const;
TQSize tqsizeHint(const TQString &text) const; TQSize sizeHint(const TQString &text) const;
/**Updates size of a widget. Used after squeezing button's text.*/ /**Updates size of a widget. Used after squeezing button's text.*/
void updateSize(); void updateSize();

22
apps/ktorrent/newui/buttonbar.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/ ***************************************************************************/
#include "buttonbar.h" #include "buttonbar.h"
#include <tqlayout.h> #include <layout.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <kconfig.h>
@ -37,9 +37,9 @@ ButtonLayout::ButtonLayout(ButtonBar *parent, Direction d, int margin, int spaci
{ {
} }
TQSize ButtonLayout::tqminimumSize() const TQSize ButtonLayout::minimumSize() const
{ {
TQSize size = TQBoxLayout::tqminimumSize(); TQSize size = TQBoxLayout::minimumSize();
if (!m_buttonBar->autoResize()) if (!m_buttonBar->autoResize())
return size; return size;
@ -54,7 +54,7 @@ TQSize ButtonLayout::tqminimumSize() const
case Ideal::Bottom: case Ideal::Bottom:
return TQSize(0,size.height()); return TQSize(0,size.height());
} }
return TQBoxLayout::tqminimumSize(); return TQBoxLayout::minimumSize();
} }
@ -128,14 +128,14 @@ void ButtonBar::fixDimensions()
{ {
case Ideal::Left: case Ideal::Left:
case Ideal::Right: case Ideal::Right:
setFixedWidth(tqsizeHint().width()); setFixedWidth(sizeHint().width());
setMinimumHeight(tqsizeHint().height()); setMinimumHeight(sizeHint().height());
setMaximumHeight(32767); setMaximumHeight(32767);
break; break;
case Ideal::Top: case Ideal::Top:
case Ideal::Bottom: case Ideal::Bottom:
setFixedHeight(tqsizeHint().height()); setFixedHeight(sizeHint().height());
setMinimumWidth(tqsizeHint().width()); setMinimumWidth(sizeHint().width());
setMaximumWidth(32767); setMaximumWidth(32767);
break; break;
} }
@ -156,13 +156,13 @@ void ButtonBar::resizeEvent(TQResizeEvent *ev)
{ {
case Ideal::Left: case Ideal::Left:
case Ideal::Right: case Ideal::Right:
preferredDimension = l->TQBoxLayout::tqminimumSize().height(); preferredDimension = l->TQBoxLayout::minimumSize().height();
actualDimension = size().height(); actualDimension = size().height();
oldDimension = ev->oldSize().height(); oldDimension = ev->oldSize().height();
break; break;
case Ideal::Top: case Ideal::Top:
case Ideal::Bottom: case Ideal::Bottom:
preferredDimension = l->TQBoxLayout::tqminimumSize().width(); preferredDimension = l->TQBoxLayout::minimumSize().width();
actualDimension = size().width(); actualDimension = size().width();
oldDimension = ev->oldSize().width(); oldDimension = ev->oldSize().width();
break; break;
@ -285,7 +285,7 @@ int ButtonBar::originalDimension()
int size = 0; int size = 0;
for (ButtonList::const_iterator it = m_buttons.constBegin(); it != m_buttons.constEnd(); ++it) for (ButtonList::const_iterator it = m_buttons.constBegin(); it != m_buttons.constEnd(); ++it)
{ {
size += (*it)->tqsizeHint((*it)->realText()).width(); size += (*it)->sizeHint((*it)->realText()).width();
} }
return size; return size;
} }

8
apps/ktorrent/newui/buttonbar.h
Unescape View File

@ -25,21 +25,21 @@
#include "comdefs.h" #include "comdefs.h"
#include <tqlayout.h> #include <layout.h>
namespace Ideal { namespace Ideal {
class Button; class Button;
class ButtonBar; class ButtonBar;
/**@short A tqlayout for a ButtonBar class. /**@short A layout for a ButtonBar class.
Overrides tqminimumSize method to allow shrinking button bar buttons.*/ Overrides minimumSize method to allow shrinking button bar buttons.*/
class ButtonLayout: public TQBoxLayout{ class ButtonLayout: public TQBoxLayout{
public: public:
ButtonLayout(ButtonBar *parent, Direction d, int margin = 0, int spacing = -1, const char * name = 0); ButtonLayout(ButtonBar *parent, Direction d, int margin = 0, int spacing = -1, const char * name = 0);
virtual TQSize tqminimumSize() const; virtual TQSize minimumSize() const;
private: private:
ButtonBar *m_buttonBar; ButtonBar *m_buttonBar;

20
apps/ktorrent/newui/ddockwindow.cpp
Unescape View File

@ -20,7 +20,7 @@
#include "ddockwindow.h" #include "ddockwindow.h"
#include <tqtoolbutton.h> #include <tqtoolbutton.h>
#include <tqlayout.h> #include <layout.h>
#include <tqstyle.h> #include <tqstyle.h>
#include <tqwidgetstack.h> #include <tqwidgetstack.h>
#include <tqimage.h> #include <tqimage.h>
@ -104,7 +104,7 @@ void DDockWindow::setVisible(bool v)
{ {
//write dock width to the config file //write dock width to the config file
KConfig *config = kapp->config(); KConfig *config = kapp->config();
TQString group = TQString("%1").tqarg(m_name); TQString group = TQString("%1").arg(m_name);
config->setGroup(group); config->setGroup(group);
if (m_visible) if (m_visible)
@ -115,13 +115,13 @@ void DDockWindow::setVisible(bool v)
v ? m_widgetStack->show() : m_widgetStack->hide(); v ? m_widgetStack->show() : m_widgetStack->hide();
m_visible = v; m_visible = v;
m_internalLayout->tqinvalidate(); m_internalLayout->invalidate();
if (!m_visible) if (!m_visible)
{ {
if (m_position == DDockWindow::Bottom) if (m_position == DDockWindow::Bottom)
setFixedExtentHeight(m_internalLayout->tqsizeHint().height()); setFixedExtentHeight(m_internalLayout->sizeHint().height());
else else
setFixedExtentWidth(m_internalLayout->tqsizeHint().width()); setFixedExtentWidth(m_internalLayout->sizeHint().width());
emit hidden(); emit hidden();
} }
else else
@ -130,12 +130,12 @@ void DDockWindow::setVisible(bool v)
int size = 0; int size = 0;
if (m_position == DDockWindow::Bottom) if (m_position == DDockWindow::Bottom)
{ {
size = config->readNumEntry("ViewWidth", m_internalLayout->tqminimumSize().height()); size = config->readNumEntry("ViewWidth", m_internalLayout->minimumSize().height());
setFixedExtentHeight(size); setFixedExtentHeight(size);
} }
else else
{ {
size = config->readNumEntry("ViewWidth", m_internalLayout->tqminimumSize().width()); size = config->readNumEntry("ViewWidth", m_internalLayout->minimumSize().width());
setFixedExtentWidth(size); setFixedExtentWidth(size);
} }
} }
@ -148,7 +148,7 @@ void DDockWindow::loadSettings()
void DDockWindow::saveSettings() void DDockWindow::saveSettings()
{ {
KConfig *config = kapp->config(); KConfig *config = kapp->config();
TQString group = TQString("%1").tqarg(m_name); TQString group = TQString("%1").arg(m_name);
int invisibleWidth = 0; int invisibleWidth = 0;
config->setGroup(group); config->setGroup(group);
if (config->hasKey("ViewWidth")) if (config->hasKey("ViewWidth"))
@ -200,7 +200,7 @@ void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipAc
//if the widget was selected last time the dock is deleted //if the widget was selected last time the dock is deleted
//we need to show it //we need to show it
KConfig *config = kapp->config(); KConfig *config = kapp->config();
TQString group = TQString("%1").tqarg(m_name); TQString group = TQString("%1").arg(m_name);
config->setGroup(group); config->setGroup(group);
if (config->readEntry("ViewLastWidget") == title) if (config->readEntry("ViewLastWidget") == title)
{ {
@ -338,7 +338,7 @@ bool DDockWindow::isActive()
{ {
if (m_toggledButton) if (m_toggledButton)
{ {
TQWidget *w = tqApp->tqfocusWidget(); TQWidget *w = tqApp->focusWidget();
if (!w) if (!w)
return false; return false;
TQWidget *toolWidget = m_widgets[m_toggledButton]; TQWidget *toolWidget = m_widgets[m_toggledButton];

4
apps/ktorrent/newui/dmainwindow.cpp
Unescape View File

@ -189,8 +189,8 @@ DTabWidget *DMainWindow::splitVertical()
void DMainWindow::invalidateActiveTabWidget() void DMainWindow::invalidateActiveTabWidget()
{ {
/* TQWidget *focused = m_central->tqfocusWidget(); /* TQWidget *focused = m_central->focusWidget();
kdDebug(9000) << "tqinvalidate: " << focused << endl; kdDebug(9000) << "invalidate: " << focused << endl;
if (focused == 0) if (focused == 0)
return; return;
if (!m_widgets.contains(focused)) if (!m_widgets.contains(focused))

2
apps/ktorrent/newui/docksplitter.cpp
Unescape View File

@ -113,7 +113,7 @@ void DockSplitter::removeDock(uint row, uint col, bool alsoDelete)
w->hide(); w->hide();
} }
m_splitters[row]->setMinimumSize(m_splitters[row]->tqminimumSizeHint()); m_splitters[row]->setMinimumSize(m_splitters[row]->minimumSizeHint());
if (isRowEmpty(row)) if (isRowEmpty(row))
{ {

4
apps/ktorrent/newui/dtabwidget.cpp
Unescape View File

@ -90,7 +90,7 @@ void DTabWidget::insertTab(TQWidget *child, const TQString &label, int index)
if (m_closeButton && m_closeButtonShown) if (m_closeButton && m_closeButtonShown)
m_closeButton->show(); m_closeButton->show();
KTabWidget::insertTab(child, label, index); KTabWidget::insertTab(child, label, index);
if (index != -1) tabBar()->tqrepaint(); if (index != -1) tabBar()->repaint();
} }
void DTabWidget::insertTab(TQWidget *child, const TQIconSet &iconset, void DTabWidget::insertTab(TQWidget *child, const TQIconSet &iconset,
@ -99,7 +99,7 @@ void DTabWidget::insertTab(TQWidget *child, const TQIconSet &iconset,
if (m_closeButton && m_closeButtonShown) if (m_closeButton && m_closeButtonShown)
m_closeButton->show(); m_closeButton->show();
KTabWidget::insertTab(child, iconset, label, index); KTabWidget::insertTab(child, iconset, label, index);
if (index != -1) tabBar()->tqrepaint(); if (index != -1) tabBar()->repaint();
} }
/*void DTabWidget::updateHistory(TQWidget *w) /*void DTabWidget::updateHistory(TQWidget *w)

4
apps/ktorrent/pastedialog.cpp
Unescape View File

@ -22,7 +22,7 @@
#include "ktorrentcore.h" #include "ktorrentcore.h"
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kstdguiitem.h> #include <kstdguiitem.h>
#include <tqclipboard.h> #include <clipboard.h>
#include <tqapplication.h> #include <tqapplication.h>
#include <kurl.h> #include <kurl.h>
#include <klineedit.h> #include <klineedit.h>
@ -33,7 +33,7 @@ PasteDialog::PasteDialog(KTorrentCore* core, TQWidget *parent, const char *name)
:PasteDlgBase(parent, name) :PasteDlgBase(parent, name)
{ {
m_core = core; m_core = core;
TQClipboard *cb = TQApplication::tqclipboard(); TQClipboard *cb = TQApplication::clipboard();
TQString text = cb->text(TQClipboard::Clipboard); TQString text = cb->text(TQClipboard::Clipboard);
KURL url = KURL::fromPathOrURL(text); KURL url = KURL::fromPathOrURL(text);
if ( url.isValid() ) if ( url.isValid() )

10
apps/ktorrent/pastedlgbase.ui
Unescape View File

@ -20,7 +20,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -38,7 +38,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout2</cstring> <cstring>layout2</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -64,7 +64,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>400</width> <width>400</width>
<height>0</height> <height>0</height>
@ -75,7 +75,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout4</cstring> <cstring>layout4</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -91,7 +91,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>297</width> <width>297</width>
<height>20</height> <height>20</height>

4
apps/ktorrent/pref.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <kactivelabel.h> #include <kactivelabel.h>
#include <kglobal.h> #include <kglobal.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <tqlayout.h> #include <layout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <knuminput.h> #include <knuminput.h>
@ -281,7 +281,7 @@ bool GeneralPrefPage::apply()
{ {
TQString err = KResolver::errorString(res.error()); TQString err = KResolver::errorString(res.error());
TQString msg = i18n("Cannot lookup %1: %2\n" TQString msg = i18n("Cannot lookup %1: %2\n"
"Please provide a valid IP address or hostname.").tqarg(externalIP).tqarg(err); "Please provide a valid IP address or hostname.").arg(externalIP).arg(err);
KMessageBox::error(0, msg, i18n("Error")); KMessageBox::error(0, msg, i18n("Error"));
return false; return false;
} }

16
apps/ktorrent/queuedialog.cpp
Unescape View File

@ -30,7 +30,7 @@
#include <tqtabwidget.h> #include <tqtabwidget.h>
#include <tqgroupbox.h> #include <tqgroupbox.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <tqlayout.h> #include <layout.h>
#include <klocale.h> #include <klocale.h>
#include <kglobal.h> #include <kglobal.h>
@ -123,7 +123,7 @@ QueueDialog::QueueDialog(bt::QueueManager* qm, TQWidget *parent, const char *nam
for( ; it != qman->end(); ++it) for( ; it != qman->end(); ++it)
{ {
TorrentInterface* tc = *it; TorrentInterface* tc = *it;
TorrenttqStatus ts = tc->getStats().status; TorrentStatus ts = tc->getStats().status;
if(ts == kt::SEEDING || ts == kt::DOWNLOAD_COMPLETE || if(ts == kt::SEEDING || ts == kt::DOWNLOAD_COMPLETE ||
ts == kt::SEEDING_COMPLETE || tc->getStats().completed) ts == kt::SEEDING_COMPLETE || tc->getStats().completed)
@ -288,7 +288,7 @@ void QueueDialog::downloadList_currentChanged(TQListViewItem* item)
{ {
if(!item) if(!item)
{ {
dltqStatus->clear(); dlStatus->clear();
dlTracker->clear(); dlTracker->clear();
dlRatio->clear(); dlRatio->clear();
dlDHT->clear(); dlDHT->clear();
@ -298,9 +298,9 @@ void QueueDialog::downloadList_currentChanged(TQListViewItem* item)
const TorrentInterface* tc = ((QueueItem*)item)->getTC(); const TorrentInterface* tc = ((QueueItem*)item)->getTC();
TorrentStats s = tc->getStats(); TorrentStats s = tc->getStats();
dltqStatus->setText(tc->statusToString()); dlStatus->setText(tc->statusToString());
dlTracker->setText(tc->getTrackersList()->getTrackerURL().prettyURL()); dlTracker->setText(tc->getTrackersList()->getTrackerURL().prettyURL());
dlRatio->setText(TQString("%1").tqarg((float)s.bytes_uploaded / s.bytes_downloaded,0,'f',2)); dlRatio->setText(TQString("%1").arg((float)s.bytes_uploaded / s.bytes_downloaded,0,'f',2));
dlBytes->setText(BytesToString(s.bytes_left_to_download)); dlBytes->setText(BytesToString(s.bytes_left_to_download));
dlDHT->setText(s.priv_torrent ? i18n("No (private torrent)") : i18n("Yes")); dlDHT->setText(s.priv_torrent ? i18n("No (private torrent)") : i18n("Yes"));
} }
@ -309,7 +309,7 @@ void QueueDialog::seedList_currentChanged(TQListViewItem* item)
{ {
if(!item) if(!item)
{ {
ultqStatus->clear(); ulStatus->clear();
ulTracker->clear(); ulTracker->clear();
ulRatio->clear(); ulRatio->clear();
ulDHT->clear(); ulDHT->clear();
@ -319,9 +319,9 @@ void QueueDialog::seedList_currentChanged(TQListViewItem* item)
const TorrentInterface* tc = ((QueueItem*)item)->getTC(); const TorrentInterface* tc = ((QueueItem*)item)->getTC();
TorrentStats s = tc->getStats(); TorrentStats s = tc->getStats();
ultqStatus->setText(tc->statusToString()); ulStatus->setText(tc->statusToString());
ulTracker->setText(tc->getTrackersList()->getTrackerURL().prettyURL()); ulTracker->setText(tc->getTrackersList()->getTrackerURL().prettyURL());
ulRatio->setText(TQString("%1").tqarg((float)s.bytes_uploaded / s.bytes_downloaded,0,'f',2)); ulRatio->setText(TQString("%1").arg((float)s.bytes_uploaded / s.bytes_downloaded,0,'f',2));
ulBytes->setText(BytesToString(s.bytes_uploaded)); ulBytes->setText(BytesToString(s.bytes_uploaded));
ulDHT->setText(s.priv_torrent ? i18n("No (private torrent)") : i18n("Yes")); ulDHT->setText(s.priv_torrent ? i18n("No (private torrent)") : i18n("Yes"));
} }

28
apps/ktorrent/queuedlg.ui
Unescape View File

@ -47,7 +47,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout25</cstring> <cstring>layout25</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -121,7 +121,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="1"> <widget class="TQLayoutWidget" row="0" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout26</cstring> <cstring>layout26</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -129,7 +129,7 @@
</property> </property>
<widget class="TQLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>dltqStatus</cstring> <cstring>dlStatus</cstring>
</property> </property>
<property name="text"> <property name="text">
<string></string> <string></string>
@ -263,7 +263,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout15</cstring> <cstring>layout15</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -337,7 +337,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="1"> <widget class="TQLayoutWidget" row="0" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout27</cstring> <cstring>layout27</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -345,7 +345,7 @@
</property> </property>
<widget class="TQLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>ultqStatus</cstring> <cstring>ulStatus</cstring>
</property> </property>
<property name="text"> <property name="text">
<string></string> <string></string>
@ -392,7 +392,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="1"> <widget class="TQLayoutWidget" row="0" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -400,7 +400,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout49</cstring> <cstring>layout49</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -416,7 +416,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Preferred</enum> <enum>Preferred</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -452,7 +452,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Preferred</enum> <enum>Preferred</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -471,7 +471,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>30</height> <height>30</height>
@ -504,7 +504,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -540,7 +540,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Preferred</enum> <enum>Preferred</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -573,7 +573,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

4
apps/ktorrent/scandialog.cpp
Unescape View File

@ -67,14 +67,14 @@ void ScanDialog::scan()
} }
catch (bt::Error & err) catch (bt::Error & err)
{ {
KMessageBox::error(0,i18n("Error scanning data: %1").tqarg(err.toString())); KMessageBox::error(0,i18n("Error scanning data: %1").arg(err.toString()));
} }
} }
void ScanDialog::execute(kt::TorrentInterface* tc,bool silently) void ScanDialog::execute(kt::TorrentInterface* tc,bool silently)
{ {
m_torrent_label->setText(i18n("Scanning data of <b>%1</b> :").tqarg(tc->getStats().torrent_name)); m_torrent_label->setText(i18n("Scanning data of <b>%1</b> :").arg(tc->getStats().torrent_name));
adjustSize(); adjustSize();
m_cancel->setEnabled(true); m_cancel->setEnabled(true);
this->silently = silently; this->silently = silently;

18
apps/ktorrent/scandlgbase.ui
Unescape View File

@ -40,7 +40,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout5</cstring> <cstring>layout5</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -48,7 +48,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout3</cstring> <cstring>layout3</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -74,7 +74,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout4</cstring> <cstring>layout4</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -84,7 +84,7 @@
<property name="name"> <property name="name">
<cstring>m_chunks_found</cstring> <cstring>m_chunks_found</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -96,7 +96,7 @@
<property name="text"> <property name="text">
<string>0</string> <string>0</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -104,7 +104,7 @@
<property name="name"> <property name="name">
<cstring>m_chunks_failed</cstring> <cstring>m_chunks_failed</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -119,7 +119,7 @@
<property name="text"> <property name="text">
<string>0</string> <string>0</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -148,7 +148,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout8</cstring> <cstring>layout8</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -164,7 +164,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>181</width> <width>181</width>
<height>20</height> <height>20</height>

2
apps/ktorrent/speedlimitsdlg.cpp
Unescape View File

@ -33,7 +33,7 @@ using namespace kt;
SpeedLimitsDlg::SpeedLimitsDlg(kt::TorrentInterface* ti,TQWidget* parent, const char* name) SpeedLimitsDlg::SpeedLimitsDlg(kt::TorrentInterface* ti,TQWidget* parent, const char* name)
: SpeedLimitsDlgBase(parent,name,true,0),tor(ti) : SpeedLimitsDlgBase(parent,name,true,0),tor(ti)
{ {
m_main_caption->setText(i18n("Speed limits for <b>%1</b>:").tqarg(tor->getStats().torrent_name)); m_main_caption->setText(i18n("Speed limits for <b>%1</b>:").arg(tor->getStats().torrent_name));
Uint32 up,down; Uint32 up,down;
tor->getTrafficLimits(up,down); tor->getTrafficLimits(up,down);
m_upload_rate->setValue(up / 1024); m_upload_rate->setValue(up / 1024);

12
apps/ktorrent/speedlimitsdlgbase.ui
Unescape View File

@ -29,7 +29,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout8</cstring> <cstring>layout8</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -37,7 +37,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -63,7 +63,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout5</cstring> <cstring>layout5</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -83,7 +83,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout6</cstring> <cstring>layout6</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -125,7 +125,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout3</cstring> <cstring>layout3</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -141,7 +141,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>121</width> <width>121</width>
<height>20</height> <height>20</height>

6
apps/ktorrent/torrentcreatordlg.cpp
Unescape View File

@ -46,7 +46,7 @@ TorrentCreatorDlg::TorrentCreatorDlg(KTorrentCore* core,TQWidget *parent, const
TQMap<TQString, int> n = bt::Globals::instance().getDHT().getClosestGoodNodes(10); TQMap<TQString, int> n = bt::Globals::instance().getDHT().getClosestGoodNodes(10);
for(TQMap<TQString, int>::iterator it = n.begin(); it!=n.end(); ++it) for(TQMap<TQString, int>::iterator it = n.begin(); it!=n.end(); ++it)
new TQListViewItem(m_nodeList, it.key(), TQString("%1").tqarg(it.data())); new TQListViewItem(m_nodeList, it.key(), TQString("%1").arg(it.data()));
} }
TorrentCreatorDlg::~TorrentCreatorDlg() TorrentCreatorDlg::~TorrentCreatorDlg()
@ -105,7 +105,7 @@ void TorrentCreatorDlg::onCreate()
s += ".torrent"; s += ".torrent";
KProgressDialog* dlg = new KProgressDialog(this,0); KProgressDialog* dlg = new KProgressDialog(this,0);
dlg->setLabel(i18n("Creating %1...").tqarg(s)); dlg->setLabel(i18n("Creating %1...").arg(s));
dlg->setModal(true); dlg->setModal(true);
dlg->setAllowCancel(false); dlg->setAllowCancel(false);
dlg->show(); dlg->show();
@ -136,7 +136,7 @@ void TorrentCreatorDlg::btnRemoveNode_clicked()
void TorrentCreatorDlg::btnAddNode_clicked() void TorrentCreatorDlg::btnAddNode_clicked()
{ {
new TQListViewItem(m_nodeList, m_node->text(), TQString("%1").tqarg(m_port->value())); new TQListViewItem(m_nodeList, m_node->text(), TQString("%1").arg(m_port->value()));
} }
void TorrentCreatorDlg::m_nodeList_selectionChanged(TQListViewItem*) void TorrentCreatorDlg::m_nodeList_selectionChanged(TQListViewItem*)

18
apps/ktorrent/torrentcreatordlgbase.ui
Unescape View File

@ -24,7 +24,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout2</cstring> <cstring>layout2</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -66,7 +66,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -148,7 +148,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>20</height> <height>20</height>
@ -188,7 +188,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="5" column="0"> <widget class="TQLayoutWidget" row="5" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout9</cstring> <cstring>layout9</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -233,7 +233,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -319,7 +319,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout9</cstring> <cstring>layout9</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -372,7 +372,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Maximum</enum> <enum>Maximum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -422,7 +422,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>
@ -436,7 +436,7 @@
<property name="text"> <property name="text">
<string>NOTE: Some known good DHT nodes are already inserted. You should probably insert your own IP address and port too if you plan to seed this torrent.</string> <string>NOTE: Some known good DHT nodes are already inserted. You should probably insert your own IP address and port too if you plan to seed this torrent.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>

6
apps/ktorrent/trayhoverpopup.cpp
Unescape View File

@ -114,7 +114,7 @@ void TrayHoverPopup::create()
hb->setSpacing(KDialog::spacingHint()); hb->setSpacing(KDialog::spacingHint());
TQLabel* pix_lbl = new TQLabel(hb,"title_icon"); TQLabel* pix_lbl = new TQLabel(hb,"title_icon");
pix_lbl->setPixmap(pix); pix_lbl->setPixmap(pix);
pix_lbl->tqsetAlignment(AlignLeft); pix_lbl->setAlignment(AlignLeft);
} }
@ -122,13 +122,13 @@ void TrayHoverPopup::create()
TQFont fnt = title->font(); TQFont fnt = title->font();
fnt.setBold( true ); fnt.setBold( true );
title->setFont( fnt ); title->setFont( fnt );
title->tqsetAlignment( TQt::AlignHCenter ); title->setAlignment( TQt::AlignHCenter );
if ( hb ) if ( hb )
hb->setStretchFactor(title, 10 ); // enforce centering hb->setStretchFactor(title, 10 ); // enforce centering
// text will be filled later // text will be filled later
text = new TQLabel( "Dummy", vb, "msg_label" ); text = new TQLabel( "Dummy", vb, "msg_label" );
text->tqsetAlignment( AlignLeft ); text->setAlignment( AlignLeft );
setView(vb); setView(vb);
} }

52
apps/ktorrent/trayicon.cpp
Unescape View File

@ -88,24 +88,24 @@ void TrayIcon::leaveEvent(TQEvent* )
void TrayIcon::updateStats(const CurrentStats stats, bool showBars,int downloadBandwidth, int uploadBandwidth ) void TrayIcon::updateStats(const CurrentStats stats, bool showBars,int downloadBandwidth, int uploadBandwidth )
{ {
TQString tip = i18n("<table cellpadding='2' cellspacing='2' align='center'><tr><td><b>Speed:</b></td><td></td></tr><tr><td>Download: <font color='#1c9a1c'>%1</font></td><td>Upload: <font color='#990000'>%2</font></td></tr><tr><td><b>Transfer:</b></td><td></td></tr><tr><td>Download: <font color='#1c9a1c'>%3</font></td><td>Upload: <font color='#990000'>%4</font></td></tr></table>") TQString tip = i18n("<table cellpadding='2' cellspacing='2' align='center'><tr><td><b>Speed:</b></td><td></td></tr><tr><td>Download: <font color='#1c9a1c'>%1</font></td><td>Upload: <font color='#990000'>%2</font></td></tr><tr><td><b>Transfer:</b></td><td></td></tr><tr><td>Download: <font color='#1c9a1c'>%3</font></td><td>Upload: <font color='#990000'>%4</font></td></tr></table>")
.tqarg(KBytesPerSecToString((double)stats.download_speed/1024.0)) .arg(KBytesPerSecToString((double)stats.download_speed/1024.0))
.tqarg(KBytesPerSecToString((double)stats.upload_speed/1024.0)) .arg(KBytesPerSecToString((double)stats.upload_speed/1024.0))
.tqarg(BytesToString(stats.bytes_downloaded)) .arg(BytesToString(stats.bytes_downloaded))
.tqarg(BytesToString(stats.bytes_uploaded)); .arg(BytesToString(stats.bytes_uploaded));
m_hover_popup->updateText(tip); m_hover_popup->updateText(tip);
if(showBars) if(showBars)
drawSpeedBar(stats.download_speed/1024,stats.upload_speed/1024, downloadBandwidth, uploadBandwidth); drawSpeedBar(stats.download_speed/1024,stats.upload_speed/1024, downloadBandwidth, uploadBandwidth);
else if (previousDownloadHeight > 0 || previousUploadHeight > 0) else if (previousDownloadHeight > 0 || previousUploadHeight > 0)
{ {
tqrepaint(); // clear the bars if they are disabled repaint(); // clear the bars if they are disabled
previousDownloadHeight = previousUploadHeight = 0; previousDownloadHeight = previousUploadHeight = 0;
} }
} }
void TrayIcon::drawSpeedBar(int downloadSpeed, int uploadSpeed, int downloadBandwidth, int uploadBandwidth ) void TrayIcon::drawSpeedBar(int downloadSpeed, int uploadSpeed, int downloadBandwidth, int uploadBandwidth )
{ {
//check if need tqrepaint //check if need repaint
if (uploadBandwidth == 0) if (uploadBandwidth == 0)
uploadBandwidth = 1; uploadBandwidth = 1;
if (downloadBandwidth == 0) if (downloadBandwidth == 0)
@ -116,7 +116,7 @@ void TrayIcon::drawSpeedBar(int downloadSpeed, int uploadSpeed, int downloadBand
if(previousDownloadHeight==DownloadHeight && previousUploadHeight==UploadHeight) if(previousDownloadHeight==DownloadHeight && previousUploadHeight==UploadHeight)
return; return;
tqrepaint (); repaint ();
TQBrush brushD(green); TQBrush brushD(green);
TQBrush brushU(red); TQBrush brushU(red);
@ -146,9 +146,9 @@ void TrayIcon::finished(TorrentInterface* tc)
TQString msg = i18n("<b>%1</b> has completed downloading." TQString msg = i18n("<b>%1</b> has completed downloading."
"<br>Average speed: %2 DL / %3 UL.") "<br>Average speed: %2 DL / %3 UL.")
.tqarg(s.torrent_name) .arg(s.torrent_name)
.tqarg(KBytesPerSecToString(speed_down / tc->getRunningTimeDL())) .arg(KBytesPerSecToString(speed_down / tc->getRunningTimeDL()))
.tqarg(KBytesPerSecToString(speed_up / tc->getRunningTimeUL())); .arg(KBytesPerSecToString(speed_up / tc->getRunningTimeUL()));
showPassivePopup(msg,i18n("Download completed")); showPassivePopup(msg,i18n("Download completed"));
} }
@ -164,10 +164,10 @@ void TrayIcon::maxShareRatioReached(kt::TorrentInterface* tc)
TQString msg = i18n("<b>%1</b> has reached its maximum share ratio of %2 and has been stopped." TQString msg = i18n("<b>%1</b> has reached its maximum share ratio of %2 and has been stopped."
"<br>Uploaded %3 at an average speed of %4.") "<br>Uploaded %3 at an average speed of %4.")
.tqarg(s.torrent_name) .arg(s.torrent_name)
.tqarg(loc->formatNumber(s.max_share_ratio,2)) .arg(loc->formatNumber(s.max_share_ratio,2))
.tqarg(BytesToString(s.bytes_uploaded)) .arg(BytesToString(s.bytes_uploaded))
.tqarg(KBytesPerSecToString(speed_up / tc->getRunningTimeUL())); .arg(KBytesPerSecToString(speed_up / tc->getRunningTimeUL()));
showPassivePopup(msg,i18n("Seeding completed")); showPassivePopup(msg,i18n("Seeding completed"));
} }
@ -183,10 +183,10 @@ void TrayIcon::maxSeedTimeReached(kt::TorrentInterface* tc)
TQString msg = i18n("<b>%1</b> has reached its maximum seed time of %2 hours and has been stopped." TQString msg = i18n("<b>%1</b> has reached its maximum seed time of %2 hours and has been stopped."
"<br>Uploaded %3 at an average speed of %4.") "<br>Uploaded %3 at an average speed of %4.")
.tqarg(s.torrent_name) .arg(s.torrent_name)
.tqarg(loc->formatNumber(s.max_seed_time,2)) .arg(loc->formatNumber(s.max_seed_time,2))
.tqarg(BytesToString(s.bytes_uploaded)) .arg(BytesToString(s.bytes_uploaded))
.tqarg(KBytesPerSecToString(speed_up / tc->getRunningTimeUL())); .arg(KBytesPerSecToString(speed_up / tc->getRunningTimeUL()));
showPassivePopup(msg,i18n("Seeding completed")); showPassivePopup(msg,i18n("Seeding completed"));
} }
@ -198,7 +198,7 @@ void TrayIcon::torrentStoppedByError(kt::TorrentInterface* tc, TQString msg)
const TorrentStats & s = tc->getStats(); const TorrentStats & s = tc->getStats();
TQString err_msg = i18n("<b>%1</b> has been stopped with the following error: <br>%2") TQString err_msg = i18n("<b>%1</b> has been stopped with the following error: <br>%2")
.tqarg(s.torrent_name).tqarg(msg); .arg(s.torrent_name).arg(msg);
showPassivePopup(err_msg,i18n("Error")); showPassivePopup(err_msg,i18n("Error"));
} }
@ -211,7 +211,7 @@ void TrayIcon::corruptedData(kt::TorrentInterface* tc)
const TorrentStats & s = tc->getStats(); const TorrentStats & s = tc->getStats();
TQString err_msg = i18n("Corrupted data has been found in the torrent <b>%1</b>" TQString err_msg = i18n("Corrupted data has been found in the torrent <b>%1</b>"
"<br>It would be a good idea to do a data integrity check on the torrent.") "<br>It would be a good idea to do a data integrity check on the torrent.")
.tqarg(s.torrent_name); .arg(s.torrent_name);
showPassivePopup(err_msg,i18n("Error")); showPassivePopup(err_msg,i18n("Error"));
} }
@ -227,10 +227,10 @@ void TrayIcon::queuingNotPossible(kt::TorrentInterface* tc)
if (tc->overMaxRatio()) if (tc->overMaxRatio())
msg = i18n("<b>%1</b> has reached its maximum share ratio of %2 and cannot be enqueued. Remove the limit manually if you want to continue seeding.") msg = i18n("<b>%1</b> has reached its maximum share ratio of %2 and cannot be enqueued. Remove the limit manually if you want to continue seeding.")
.tqarg(s.torrent_name).tqarg(loc->formatNumber(s.max_share_ratio,2)); .arg(s.torrent_name).arg(loc->formatNumber(s.max_share_ratio,2));
else else
msg = i18n("<b>%1</b> has reached its maximum seed time of %2 hours and cannot be enqueued. Remove the limit manually if you want to continue seeding.") msg = i18n("<b>%1</b> has reached its maximum seed time of %2 hours and cannot be enqueued. Remove the limit manually if you want to continue seeding.")
.tqarg(s.torrent_name).tqarg(loc->formatNumber(s.max_seed_time,2)); .arg(s.torrent_name).arg(loc->formatNumber(s.max_seed_time,2));
showPassivePopup(msg,i18n("Torrent cannot be enqueued.")); showPassivePopup(msg,i18n("Torrent cannot be enqueued."));
} }
@ -240,7 +240,7 @@ void TrayIcon::canNotStart(kt::TorrentInterface* tc,kt::TorrentStartResponse rea
if (!Settings::showPopups()) if (!Settings::showPopups())
return; return;
TQString msg = i18n("Cannot start <b>%1</b> : <br>").tqarg(tc->getStats().torrent_name); TQString msg = i18n("Cannot start <b>%1</b> : <br>").arg(tc->getStats().torrent_name);
switch (reason) switch (reason)
{ {
case kt::TQM_LIMITS_REACHED: case kt::TQM_LIMITS_REACHED:
@ -274,7 +274,7 @@ void TrayIcon::lowDiskSpace(kt::TorrentInterface * tc, bool stopped)
const TorrentStats & s = tc->getStats(); const TorrentStats & s = tc->getStats();
TQString msg = i18n("Your disk is running out of space.<br /><b>%1</b> is being downloaded to '%2'.").tqarg(s.torrent_name).tqarg(tc->getDataDir()); TQString msg = i18n("Your disk is running out of space.<br /><b>%1</b> is being downloaded to '%2'.").arg(s.torrent_name).arg(tc->getDataDir());
if(stopped) if(stopped)
msg.prepend(i18n("Torrent has been stopped.<br />")); msg.prepend(i18n("Torrent has been stopped.<br />"));
@ -335,10 +335,10 @@ void SetMaxRate::makeMenu()
{ {
if(rate == valuePair[j] && j==0) if(rate == valuePair[j] && j==0)
{ {
setItemChecked(insertItem(TQString("%1").tqarg(valuePair[j]),-1, (j == 0) ? 2 : count()), true); setItemChecked(insertItem(TQString("%1").arg(valuePair[j]),-1, (j == 0) ? 2 : count()), true);
} }
else else
insertItem(TQString("%1").tqarg(valuePair[j]),-1, (j == 0) ? 2 : count()); insertItem(TQString("%1").arg(valuePair[j]),-1, (j == 0) ? 2 : count());
} }
} }

4
apps/ktupnptest/mainwidget.ui
Unescape View File

@ -23,7 +23,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout1</cstring> <cstring>layout1</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -39,7 +39,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>61</width> <width>61</width>
<height>20</height> <height>20</height>

2
apps/ktupnptest/upnptestapp.cpp
Unescape View File

@ -21,7 +21,7 @@
#include <klocale.h> #include <klocale.h>
#include <kapplication.h> #include <kapplication.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <tqtextbrowser.h> #include <textbrowser.h>
#include <util/error.h> #include <util/error.h>
#include "upnptestapp.h" #include "upnptestapp.h"
#include "mainwidget.h" #include "mainwidget.h"

20
estimation-scripts/enable-logging.diff
Unescape View File

@ -45,7 +45,7 @@ Index: estimation-scripts/enable-logging.diff
-+ { -+ {
-+ if(!started) -+ if(!started)
-+ { -+ {
-+ Out() << "{" << tc->getTorrentName() << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << tc->getDownloadRate() << "," << tc->getBytesDownloaded() << "," << tc->getBytesLeft() << "," << tc->getNumPeers() << ",ACTIVATED" << endl; -+ Out() << "{" << tc->getTorrentName() << "}," << QDateTime::currentDateTime().toTime_t() << "," << tc->getDownloadRate() << "," << tc->getBytesDownloaded() << "," << tc->getBytesLeft() << "," << tc->getNumPeers() << ",ACTIVATED" << endl;
-+ tmpLog = false; -+ tmpLog = false;
-+ started = true; -+ started = true;
-+ toLog = true; -+ toLog = true;
@ -56,7 +56,7 @@ Index: estimation-scripts/enable-logging.diff
-+ { -+ {
-+ if(started) -+ if(started)
-+ { -+ {
-+ Out() << "{" << tc->getTorrentName() << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << tc->getDownloadRate() << "," << tc->getBytesDownloaded() << "," << tc->getBytesLeft() << "," << tc->getNumPeers() << ",DEACTIVATED" <<endl; -+ Out() << "{" << tc->getTorrentName() << "}," << QDateTime::currentDateTime().toTime_t() << "," << tc->getDownloadRate() << "," << tc->getBytesDownloaded() << "," << tc->getBytesLeft() << "," << tc->getNumPeers() << ",DEACTIVATED" <<endl;
-+ tmpLog = false; -+ tmpLog = false;
-+ started = false; -+ started = false;
-+ } -+ }
@ -71,7 +71,7 @@ Index: estimation-scripts/enable-logging.diff
- if (tc->getBytesLeft() == 0) - if (tc->getBytesLeft() == 0)
- { - {
-+ if(toLog && tmpLog) -+ if(toLog && tmpLog)
-+ Out() << "{" << tc->getTorrentName() << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << tc->getDownloadRate() << "," << tc->getBytesDownloaded() << "," << 0 << "," << tc->getNumPeers() << ",FINISHED" << endl; -+ Out() << "{" << tc->getTorrentName() << "}," << QDateTime::currentDateTime().toTime_t() << "," << tc->getDownloadRate() << "," << tc->getBytesDownloaded() << "," << 0 << "," << tc->getNumPeers() << ",FINISHED" << endl;
-+ toLog = false; -+ toLog = false;
-+ -+
- setText(7,i18n("finished")); - setText(7,i18n("finished"));
@ -83,13 +83,13 @@ Index: estimation-scripts/enable-logging.diff
- if (tc->getDownloadRate() == 0) - if (tc->getDownloadRate() == 0)
-+ { -+ {
-+ if(toLog && tmpLog) -+ if(toLog && tmpLog)
-+ Out() << "{" << tc->getTorrentName() << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << 0 << "," << tc->getBytesDownloaded() << "," << tc->getBytesLeft() << "," << tc->getNumPeers() << ",RUNNING" << endl; -+ Out() << "{" << tc->getTorrentName() << "}," << QDateTime::currentDateTime().toTime_t() << "," << 0 << "," << tc->getBytesDownloaded() << "," << tc->getBytesLeft() << "," << tc->getNumPeers() << ",RUNNING" << endl;
- setText(7,i18n("infinity")); - setText(7,i18n("infinity"));
-+ } -+ }
- else - else
- { - {
-+ if(toLog && tmpLog) -+ if(toLog && tmpLog)
-+ Out() << "{" << tc->getTorrentName() << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << tc->getDownloadRate() << "," << tc->getBytesDownloaded() << "," << tc->getBytesLeft() << "," << tc->getNumPeers() << ",RUNNING" << endl; -+ Out() << "{" << tc->getTorrentName() << "}," << QDateTime::currentDateTime().toTime_t() << "," << tc->getDownloadRate() << "," << tc->getBytesDownloaded() << "," << tc->getBytesLeft() << "," << tc->getNumPeers() << ",RUNNING" << endl;
-+ -+
- Uint32 secs = (int)floor( (float)tc->getBytesLeft() / (float)tc->getDownloadRate() ); - Uint32 secs = (int)floor( (float)tc->getBytesLeft() / (float)tc->getDownloadRate() );
- QTime t; - QTime t;
@ -155,7 +155,7 @@ Index: apps/ktorrent/ktorrentviewitem.cpp
+ { + {
+ if(!started) + if(!started)
+ { + {
+ Out() << "{" << s.torrent_name << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << s.download_rate << "," << s.bytes_downloaded << "," << s.bytes_left << "," << s.num_peers << ",ACTIVATED" << endl; + Out() << "{" << s.torrent_name << "}," << QDateTime::currentDateTime().toTime_t() << "," << s.download_rate << "," << s.bytes_downloaded << "," << s.bytes_left << "," << s.num_peers << ",ACTIVATED" << endl;
+ tmpLog = false; + tmpLog = false;
+ started = true; + started = true;
+ toLog = true; + toLog = true;
@ -166,7 +166,7 @@ Index: apps/ktorrent/ktorrentviewitem.cpp
+ { + {
+ if(started) + if(started)
+ { + {
+ Out() << "{" << s.torrent_name << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << s.download_rate << "," << s.bytes_downloaded << "," << s.bytes_left << "," << s.num_peers << ",DEACTIVATED" <<endl; + Out() << "{" << s.torrent_name << "}," << QDateTime::currentDateTime().toTime_t() << "," << s.download_rate << "," << s.bytes_downloaded << "," << s.bytes_left << "," << s.num_peers << ",DEACTIVATED" <<endl;
+ tmpLog = false; + tmpLog = false;
+ started = false; + started = false;
+ } + }
@ -182,7 +182,7 @@ Index: apps/ktorrent/ktorrentviewitem.cpp
if (s.bytes_left == 0) if (s.bytes_left == 0)
{ {
+ if(toLog && tmpLog) + if(toLog && tmpLog)
+ Out() << "{" << s.torrent_name << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << s.download_rate << "," << s.bytes_downloaded << "," << 0 << "," << s.num_peers << ",FINISHED" << endl; + Out() << "{" << s.torrent_name << "}," << QDateTime::currentDateTime().toTime_t() << "," << s.download_rate << "," << s.bytes_downloaded << "," << 0 << "," << s.num_peers << ",FINISHED" << endl;
+ toLog = false; + toLog = false;
+ +
+ +
@ -195,14 +195,14 @@ Index: apps/ktorrent/ktorrentviewitem.cpp
if (s.download_rate == 0) if (s.download_rate == 0)
+ { + {
+ if(toLog && tmpLog) + if(toLog && tmpLog)
+ Out() << "{" << s.torrent_name << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << 0 << "," << s.bytes_downloaded << "," << s.bytes_left << "," << s.num_peers << ",RUNNING" << endl; + Out() << "{" << s.torrent_name << "}," << QDateTime::currentDateTime().toTime_t() << "," << 0 << "," << s.bytes_downloaded << "," << s.bytes_left << "," << s.num_peers << ",RUNNING" << endl;
+ +
setText(7,i18n("infinity")); setText(7,i18n("infinity"));
+ } + }
else else
{ {
+ if(toLog && tmpLog) + if(toLog && tmpLog)
+ Out() << "{" << s.torrent_name << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << s.download_rate << "," << s.bytes_downloaded << "," << s.bytes_left << "," << s.num_peers << ",RUNNING" << endl; + Out() << "{" << s.torrent_name << "}," << QDateTime::currentDateTime().toTime_t() << "," << s.download_rate << "," << s.bytes_downloaded << "," << s.bytes_left << "," << s.num_peers << ",RUNNING" << endl;
+ +
Uint32 secs = (int)floor( (float)s.bytes_left / (float)s.download_rate); Uint32 secs = (int)floor( (float)s.bytes_left / (float)s.download_rate);
setText(7,DurationToString(secs)); setText(7,DurationToString(secs));

8
libktorrent/datachecker/multidatachecker.cpp
Unescape View File

@ -109,8 +109,8 @@ namespace bt
File fptr; File fptr;
if (!fptr.open(cache + tf.getPath(), "rb")) if (!fptr.open(cache + tf.getPath(), "rb"))
{ {
Out() << TQString("Warning : Cannot open %1 : %2").tqarg(cache + Out() << TQString("Warning : Cannot open %1 : %2").arg(cache +
tf.getPath()).tqarg(fptr.errorString()) << endl; tf.getPath()).arg(fptr.errorString()) << endl;
return 0; return 0;
} }
@ -183,8 +183,8 @@ namespace bt
File fptr; File fptr;
if (!fptr.open(cache + f.getPath(), "rb")) if (!fptr.open(cache + f.getPath(), "rb"))
{ {
Out() << TQString("Warning : Cannot open %1 : %2").tqarg(cache + Out() << TQString("Warning : Cannot open %1 : %2").arg(cache +
f.getPath()).tqarg(fptr.errorString()) << endl; f.getPath()).arg(fptr.errorString()) << endl;
return false; return false;
} }
else else

2
libktorrent/datachecker/singledatachecker.cpp
Unescape View File

@ -48,7 +48,7 @@ namespace bt
if (!fptr.open(path,"rb")) if (!fptr.open(path,"rb"))
{ {
throw Error(i18n("Cannot open file : %1 : %2") throw Error(i18n("Cannot open file : %1 : %2")
.tqarg(path).tqarg( fptr.errorString())); .arg(path).arg( fptr.errorString()));
} }
// initialize the bitsets // initialize the bitsets

6
libktorrent/expandablewidget.cpp
Unescape View File

@ -17,7 +17,7 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
#include <tqlayout.h> #include <layout.h>
#include <tqsplitter.h> #include <tqsplitter.h>
#include "expandablewidget.h" #include "expandablewidget.h"
@ -53,7 +53,7 @@ namespace kt
se->pos = pos; se->pos = pos;
se->next = begin; se->next = begin;
// remove old top from tqlayout // remove old top from layout
top_layout->remove(begin->w); top_layout->remove(begin->w);
// create new toplevel splitter // create new toplevel splitter
@ -84,7 +84,7 @@ namespace kt
// make se new top of stack // make se new top of stack
begin = se; begin = se;
// add toplevel splitter to tqlayout // add toplevel splitter to layout
top_layout->add(s); top_layout->add(s);
// show s // show s

24
libktorrent/interfaces/filetreediritem.cpp
Unescape View File

@ -73,7 +73,7 @@ namespace kt
int p = path.find(bt::DirSeparator()); int p = path.find(bt::DirSeparator());
if (p == -1) if (p == -1)
{ {
tqchildren.insert(path,newFileTreeItem(path,file)); children.insert(path,newFileTreeItem(path,file));
} }
else else
{ {
@ -98,8 +98,8 @@ namespace kt
manual_change = false; manual_change = false;
} }
// first set all the child items // first set all the child items
bt::PtrMap<TQString,FileTreeItem>::iterator i = tqchildren.begin(); bt::PtrMap<TQString,FileTreeItem>::iterator i = children.begin();
while (i != tqchildren.end()) while (i != children.end())
{ {
i->second->setChecked(on,keep_data); i->second->setChecked(on,keep_data);
i++; i++;
@ -118,8 +118,8 @@ namespace kt
void FileTreeDirItem::invertChecked() void FileTreeDirItem::invertChecked()
{ {
// first set all the child items // first set all the child items
bt::PtrMap<TQString,FileTreeItem>::iterator i = tqchildren.begin(); bt::PtrMap<TQString,FileTreeItem>::iterator i = children.begin();
while (i != tqchildren.end()) while (i != children.end())
{ {
FileTreeItem* item = i->second; FileTreeItem* item = i->second;
item->setChecked(!item->isOn()); item->setChecked(!item->isOn());
@ -171,8 +171,8 @@ namespace kt
{ {
Uint64 tot = 0; Uint64 tot = 0;
// first check all the child items // first check all the child items
bt::PtrMap<TQString,FileTreeItem>::const_iterator i = tqchildren.begin(); bt::PtrMap<TQString,FileTreeItem>::const_iterator i = children.begin();
while (i != tqchildren.end()) while (i != children.end())
{ {
const FileTreeItem* item = i->second; const FileTreeItem* item = i->second;
tot += item->bytesToDownload(); tot += item->bytesToDownload();
@ -192,8 +192,8 @@ namespace kt
bool FileTreeDirItem::allChildrenOn() bool FileTreeDirItem::allChildrenOn()
{ {
// first check all the child items // first check all the child items
bt::PtrMap<TQString,FileTreeItem>::iterator i = tqchildren.begin(); bt::PtrMap<TQString,FileTreeItem>::iterator i = children.begin();
while (i != tqchildren.end()) while (i != children.end())
{ {
FileTreeItem* item = i->second; FileTreeItem* item = i->second;
if (!item->isOn()) if (!item->isOn())
@ -214,7 +214,7 @@ namespace kt
void FileTreeDirItem::childStateChange() void FileTreeDirItem::childStateChange()
{ {
// only set this dir on if all tqchildren are on // only set this dir on if all children are on
manual_change = true; manual_change = true;
setOn(allChildrenOn()); setOn(allChildrenOn());
manual_change = false; manual_change = false;
@ -248,8 +248,8 @@ namespace kt
{ {
// first check all the child items // first check all the child items
TorrentFileInterface & nullfile = (TorrentFileInterface &)TorrentFile::null; TorrentFileInterface & nullfile = (TorrentFileInterface &)TorrentFile::null;
bt::PtrMap<TQString,FileTreeItem>::iterator i = tqchildren.begin(); bt::PtrMap<TQString,FileTreeItem>::iterator i = children.begin();
while (i != tqchildren.end()) while (i != children.end())
{ {
FileTreeItem* file = i->second; FileTreeItem* file = i->second;
if (file == (FileTreeItem*)item) if (file == (FileTreeItem*)item)

2
libktorrent/interfaces/filetreediritem.h
Unescape View File

@ -49,7 +49,7 @@ namespace kt
protected: protected:
TQString name; TQString name;
Uint64 size; Uint64 size;
bt::PtrMap<TQString,FileTreeItem> tqchildren; bt::PtrMap<TQString,FileTreeItem> children;
bt::PtrMap<TQString,FileTreeDirItem> subdirs; bt::PtrMap<TQString,FileTreeDirItem> subdirs;
FileTreeDirItem* parent; FileTreeDirItem* parent;
bool manual_change; bool manual_change;

10
libktorrent/interfaces/functions.cpp
Unescape View File

@ -32,19 +32,19 @@ namespace kt
{ {
KLocale* loc = KGlobal::locale(); KLocale* loc = KGlobal::locale();
if (bytes >= 1024 * 1024 * 1024) if (bytes >= 1024 * 1024 * 1024)
return i18n("%1 GB").tqarg(loc->formatNumber(bytes / TO_GIG,precision < 0 ? 2 : precision)); return i18n("%1 GB").arg(loc->formatNumber(bytes / TO_GIG,precision < 0 ? 2 : precision));
else if (bytes >= 1024*1024) else if (bytes >= 1024*1024)
return i18n("%1 MB").tqarg(loc->formatNumber(bytes / TO_MEG,precision < 0 ? 1 : precision)); return i18n("%1 MB").arg(loc->formatNumber(bytes / TO_MEG,precision < 0 ? 1 : precision));
else if (bytes >= 1024) else if (bytes >= 1024)
return i18n("%1 KB").tqarg(loc->formatNumber(bytes / TO_KB,precision < 0 ? 1 : precision)); return i18n("%1 KB").arg(loc->formatNumber(bytes / TO_KB,precision < 0 ? 1 : precision));
else else
return i18n("%1 B").tqarg(bytes); return i18n("%1 B").arg(bytes);
} }
TQString KBytesPerSecToString(double speed,int precision) TQString KBytesPerSecToString(double speed,int precision)
{ {
KLocale* loc = KGlobal::locale(); KLocale* loc = KGlobal::locale();
return i18n("%1 KB/s").tqarg(loc->formatNumber(speed,precision)); return i18n("%1 KB/s").arg(loc->formatNumber(speed,precision));
} }
TQString DurationToString(Uint32 nsecs) TQString DurationToString(Uint32 nsecs)

6
libktorrent/interfaces/torrentinterface.h
Unescape View File

@ -44,7 +44,7 @@ namespace kt
class TorrentFileInterface; class TorrentFileInterface;
class PeerSource; class PeerSource;
enum TorrenttqStatus enum TorrentStatus
{ {
NOT_STARTED, NOT_STARTED,
SEEDING_COMPLETE, SEEDING_COMPLETE,
@ -118,8 +118,8 @@ namespace kt
Uint32 leechers_total; Uint32 leechers_total;
/// Num leechers connected to /// Num leechers connected to
Uint32 leechers_connected_to; Uint32 leechers_connected_to;
/// tqStatus of the download /// Status of the download
TorrenttqStatus status; TorrentStatus status;
/// The status of the tracker /// The status of the tracker
TQString trackerstatus; TQString trackerstatus;
/// The number of bytes downloaded in this session /// The number of bytes downloaded in this session

2
libktorrent/kademlia/dhttrackerbackend.cpp
Unescape View File

@ -137,7 +137,7 @@ namespace dht
{ {
Out(SYS_DHT|LOG_NOTICE) << Out(SYS_DHT|LOG_NOTICE) <<
TQString("DHT: Got %1 potential peers for torrent %2") TQString("DHT: Got %1 potential peers for torrent %2")
.tqarg(cnt).tqarg(tor->getStats().torrent_name) << endl; .arg(cnt).arg(tor->getStats().torrent_name) << endl;
peersReady(this); peersReady(this);
} }
} }

20
libktorrent/kademlia/rpcmsg.cpp
Unescape View File

@ -192,7 +192,7 @@ namespace dht
if (mt_id.length() == 0) if (mt_id.length() == 0)
return 0; return 0;
Uint8 mtid = (char)mt_id.tqat(0).latin1(); Uint8 mtid = (char)mt_id.at(0).latin1();
TQString str = vn->data().toString(); TQString str = vn->data().toString();
return new ErrMsg(mtid,id,str); return new ErrMsg(mtid,id,str);
@ -266,7 +266,7 @@ namespace dht
void PingReq::print() void PingReq::print()
{ {
Out(SYS_DHT|LOG_DEBUG) << TQString("REQ: %1 %2 : ping").tqarg(mtid).tqarg(id.toString()) << endl; Out(SYS_DHT|LOG_DEBUG) << TQString("REQ: %1 %2 : ping").arg(mtid).arg(id.toString()) << endl;
} }
void PingReq::encode(TQByteArray & arr) void PingReq::encode(TQByteArray & arr)
@ -303,7 +303,7 @@ namespace dht
void FindNodeReq::print() void FindNodeReq::print()
{ {
Out(SYS_DHT|LOG_NOTICE) << TQString("REQ: %1 %2 : find_node %3") Out(SYS_DHT|LOG_NOTICE) << TQString("REQ: %1 %2 : find_node %3")
.tqarg(mtid).tqarg(id.toString()).tqarg(target.toString()) << endl; .arg(mtid).arg(id.toString()).arg(target.toString()) << endl;
} }
void FindNodeReq::encode(TQByteArray & arr) void FindNodeReq::encode(TQByteArray & arr)
@ -342,7 +342,7 @@ namespace dht
void GetPeersReq::print() void GetPeersReq::print()
{ {
Out(SYS_DHT|LOG_DEBUG) << TQString("REQ: %1 %2 : get_peers %3") Out(SYS_DHT|LOG_DEBUG) << TQString("REQ: %1 %2 : get_peers %3")
.tqarg(mtid).tqarg(id.toString()).tqarg(info_hash.toString()) << endl; .arg(mtid).arg(id.toString()).arg(info_hash.toString()) << endl;
} }
void GetPeersReq::encode(TQByteArray & arr) void GetPeersReq::encode(TQByteArray & arr)
@ -381,8 +381,8 @@ namespace dht
void AnnounceReq::print() void AnnounceReq::print()
{ {
Out(SYS_DHT|LOG_DEBUG) << TQString("REQ: %1 %2 : announce_peer %3 %4 %5") Out(SYS_DHT|LOG_DEBUG) << TQString("REQ: %1 %2 : announce_peer %3 %4 %5")
.tqarg(mtid).tqarg(id.toString()).tqarg(info_hash.toString()) .arg(mtid).arg(id.toString()).arg(info_hash.toString())
.tqarg(port).tqarg(token.toString()) << endl; .arg(port).arg(token.toString()) << endl;
} }
void AnnounceReq::encode(TQByteArray & arr) void AnnounceReq::encode(TQByteArray & arr)
@ -421,7 +421,7 @@ namespace dht
void PingRsp::print() void PingRsp::print()
{ {
Out(SYS_DHT|LOG_DEBUG) << TQString("RSP: %1 %2 : ping") Out(SYS_DHT|LOG_DEBUG) << TQString("RSP: %1 %2 : ping")
.tqarg(mtid).tqarg(id.toString()) << endl; .arg(mtid).arg(id.toString()) << endl;
} }
void PingRsp::encode(TQByteArray & arr) void PingRsp::encode(TQByteArray & arr)
@ -456,7 +456,7 @@ namespace dht
void FindNodeRsp::print() void FindNodeRsp::print()
{ {
Out(SYS_DHT|LOG_DEBUG) << TQString("RSP: %1 %2 : find_node") Out(SYS_DHT|LOG_DEBUG) << TQString("RSP: %1 %2 : find_node")
.tqarg(mtid).tqarg(id.toString()) << endl; .arg(mtid).arg(id.toString()) << endl;
} }
void FindNodeRsp::encode(TQByteArray & arr) void FindNodeRsp::encode(TQByteArray & arr)
@ -498,7 +498,7 @@ namespace dht
void GetPeersRsp::print() void GetPeersRsp::print()
{ {
Out() << TQString("RSP: %1 %2 : get_peers(%3)") Out() << TQString("RSP: %1 %2 : get_peers(%3)")
.tqarg(mtid).tqarg(id.toString()).tqarg(data.size() > 0 ? "nodes" : "values") << endl; .arg(mtid).arg(id.toString()).arg(data.size() > 0 ? "nodes" : "values") << endl;
} }
void GetPeersRsp::encode(TQByteArray & arr) void GetPeersRsp::encode(TQByteArray & arr)
@ -552,7 +552,7 @@ namespace dht
void AnnounceRsp::print() void AnnounceRsp::print()
{ {
Out() << TQString("RSP: %1 %2 : announce_peer") Out() << TQString("RSP: %1 %2 : announce_peer")
.tqarg(mtid).tqarg(id.toString()) << endl; .arg(mtid).arg(id.toString()) << endl;
} }
void AnnounceRsp::encode(TQByteArray & arr) void AnnounceRsp::encode(TQByteArray & arr)

22
libktorrent/labelview.cpp
Unescape View File

@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
#include <algorithm> #include <algorithm>
#include <tqlayout.h> #include <layout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
@ -105,13 +105,13 @@ namespace kt
class LabelViewBox : public TQWidget class LabelViewBox : public TQWidget
{ {
TQVBoxLayout* tqlayout; TQVBoxLayout* layout;
public: public:
LabelViewBox(TQWidget* parent) : TQWidget(parent) LabelViewBox(TQWidget* parent) : TQWidget(parent)
{ {
setPaletteBackgroundColor(KGlobalSettings::baseColor()); setPaletteBackgroundColor(KGlobalSettings::baseColor());
tqlayout = new TQVBoxLayout(this); layout = new TQVBoxLayout(this);
tqlayout->setMargin(0); layout->setMargin(0);
} }
virtual ~LabelViewBox() virtual ~LabelViewBox()
@ -120,24 +120,24 @@ namespace kt
void add(LabelViewItem* item) void add(LabelViewItem* item)
{ {
item->reparent(this,TQPoint(0,0)); item->reparent(this,TQPoint(0,0));
tqlayout->add(item); layout->add(item);
item->show(); item->show();
} }
void remove(LabelViewItem* item) void remove(LabelViewItem* item)
{ {
item->hide(); item->hide();
tqlayout->remove(item); layout->remove(item);
item->reparent(0,TQPoint(0,0)); item->reparent(0,TQPoint(0,0));
} }
void sorted(const std::list<LabelViewItem*> items) void sorted(const std::list<LabelViewItem*> items)
{ {
for (LabelViewCItr i = items.begin();i != items.end();i++) for (LabelViewCItr i = items.begin();i != items.end();i++)
tqlayout->remove(*i); layout->remove(*i);
for (LabelViewCItr i = items.begin();i != items.end();i++) for (LabelViewCItr i = items.begin();i != items.end();i++)
tqlayout->add(*i); layout->add(*i);
} }
}; };
@ -184,11 +184,11 @@ namespace kt
selected = 0; selected = 0;
// update odd status of each item // update odd status of each item
updateOddtqStatus(); updateOddStatus();
} }
} }
void LabelView::updateOddtqStatus() void LabelView::updateOddStatus()
{ {
bool odd = true; bool odd = true;
LabelViewItr i = items.begin(); LabelViewItr i = items.begin();
@ -250,7 +250,7 @@ namespace kt
{ {
items.sort(LabelViewItemCmp()); items.sort(LabelViewItemCmp());
item_box->sorted(items); item_box->sorted(items);
updateOddtqStatus(); updateOddStatus();
} }
} }

2
libktorrent/labelview.h
Unescape View File

@ -110,7 +110,7 @@ namespace kt
void onItemClicked(LabelViewItem* it); void onItemClicked(LabelViewItem* it);
private: private:
void updateOddtqStatus(); void updateOddStatus();
signals: signals:
/// The current item has changed /// The current item has changed

4
libktorrent/labelviewitembase.ui
Unescape View File

@ -23,7 +23,7 @@
<property name="name"> <property name="name">
<cstring>icon_lbl</cstring> <cstring>icon_lbl</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>64</width> <width>64</width>
<height>64</height> <height>64</height>
@ -35,7 +35,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout3</cstring> <cstring>layout3</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">

4
libktorrent/migrate/ccmigrate.cpp
Unescape View File

@ -116,13 +116,13 @@ namespace bt
// open the old current_chunks file // open the old current_chunks file
File old_cc; File old_cc;
if (!old_cc.open(current_chunks,"rb")) if (!old_cc.open(current_chunks,"rb"))
throw Error(i18n("Cannot open file %1 : %2").tqarg(current_chunks).tqarg(old_cc.errorString())); throw Error(i18n("Cannot open file %1 : %2").arg(current_chunks).arg(old_cc.errorString()));
// open a new file in the /tmp dir // open a new file in the /tmp dir
File new_cc; File new_cc;
TQString tmp = current_chunks + ".tmp"; TQString tmp = current_chunks + ".tmp";
if (!new_cc.open(tmp,"wb")) if (!new_cc.open(tmp,"wb"))
throw Error(i18n("Cannot open file %1 : %2").tqarg(tmp).tqarg(old_cc.errorString())); throw Error(i18n("Cannot open file %1 : %2").arg(tmp).arg(old_cc.errorString()));
// read the number of chunks // read the number of chunks
Uint32 num = 0; Uint32 num = 0;

2
libktorrent/migrate/migrate.cpp
Unescape View File

@ -42,7 +42,7 @@ namespace bt
{ {
// check if directory exists // check if directory exists
if (!bt::Exists(tor_dir)) if (!bt::Exists(tor_dir))
throw Error(i18n("The directory %1 does not exist").tqarg(tor_dir)); throw Error(i18n("The directory %1 does not exist").arg(tor_dir));
// make sure it ends with a / // make sure it ends with a /
TQString tdir = tor_dir; TQString tdir = tor_dir;

2
libktorrent/mse/functions.cpp
Unescape View File

@ -66,7 +66,7 @@ namespace mse
lg << name << " (" << nb << ") = "; lg << name << " (" << nb << ") = ";
for (Uint32 i = 0;i < nb;i++) for (Uint32 i = 0;i < nb;i++)
{ {
lg << TQString("0x%1 ").tqarg(buf[i],0,16); lg << TQString("0x%1 ").arg(buf[i],0,16);
} }
lg << endl; lg << endl;
} }

8
libktorrent/net/address.cpp
Unescape View File

@ -58,10 +58,10 @@ namespace net
TQString Address::toString() const TQString Address::toString() const
{ {
return TQString("%1.%2.%3.%4") return TQString("%1.%2.%3.%4")
.tqarg((m_ip & 0xFF000000) >> 24) .arg((m_ip & 0xFF000000) >> 24)
.tqarg((m_ip & 0x00FF0000) >> 16) .arg((m_ip & 0x00FF0000) >> 16)
.tqarg((m_ip & 0x0000FF00) >> 8) .arg((m_ip & 0x0000FF00) >> 8)
.tqarg(m_ip & 0x000000FF); .arg(m_ip & 0x000000FF);
} }
} }

16
libktorrent/net/socket.cpp
Unescape View File

@ -60,7 +60,7 @@ namespace net
int val = 1; int val = 1;
if (setsockopt(m_fd,SOL_SOCKET,SO_NOSIGPIPE,&val,sizeof(int)) < 0) if (setsockopt(m_fd,SOL_SOCKET,SO_NOSIGPIPE,&val,sizeof(int)) < 0)
{ {
Out(SYS_CON|LOG_NOTICE) << TQString("Failed to set the NOSIGPIPE option : %1").tqarg(strerror(errno)) << endl; Out(SYS_CON|LOG_NOTICE) << TQString("Failed to set the NOSIGPIPE option : %1").arg(strerror(errno)) << endl;
} }
#endif #endif
cacheAddress(); cacheAddress();
@ -71,14 +71,14 @@ namespace net
int fd = socket(PF_INET,tcp ? SOCK_STREAM : SOCK_DGRAM,0); int fd = socket(PF_INET,tcp ? SOCK_STREAM : SOCK_DGRAM,0);
if (fd < 0) if (fd < 0)
{ {
Out(SYS_GEN|LOG_IMPORTANT) << TQString("Cannot create socket : %1").tqarg(strerror(errno)) << endl; Out(SYS_GEN|LOG_IMPORTANT) << TQString("Cannot create socket : %1").arg(strerror(errno)) << endl;
} }
m_fd = fd; m_fd = fd;
#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && !defined(__DragonFly__) && __FreeBSD_version < 600020) #if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && !defined(__DragonFly__) && __FreeBSD_version < 600020)
int val = 1; int val = 1;
if (setsockopt(m_fd,SOL_SOCKET,SO_NOSIGPIPE,&val,sizeof(int)) < 0) if (setsockopt(m_fd,SOL_SOCKET,SO_NOSIGPIPE,&val,sizeof(int)) < 0)
{ {
Out(SYS_CON|LOG_NOTICE) << TQString("Failed to set the NOSIGPIPE option : %1").tqarg(strerror(errno)) << endl; Out(SYS_CON|LOG_NOTICE) << TQString("Failed to set the NOSIGPIPE option : %1").arg(strerror(errno)) << endl;
} }
#endif #endif
} }
@ -127,7 +127,7 @@ namespace net
else else
{ {
Out(SYS_CON|LOG_NOTICE) << TQString("Cannot connect to host %1:%2 : %3") Out(SYS_CON|LOG_NOTICE) << TQString("Cannot connect to host %1:%2 : %3")
.tqarg(a.toString()).tqarg(a.port()).tqarg(strerror(errno)) << endl; .arg(a.toString()).arg(a.port()).arg(strerror(errno)) << endl;
return false; return false;
} }
} }
@ -145,20 +145,20 @@ namespace net
if (::bind(m_fd,(struct sockaddr*)&addr,sizeof(struct sockaddr)) < 0) if (::bind(m_fd,(struct sockaddr*)&addr,sizeof(struct sockaddr)) < 0)
{ {
Out(SYS_CON|LOG_IMPORTANT) << TQString("Cannot bind to port %1 : %2").tqarg(port).tqarg(strerror(errno)) << endl; Out(SYS_CON|LOG_IMPORTANT) << TQString("Cannot bind to port %1 : %2").arg(port).arg(strerror(errno)) << endl;
return false; return false;
} }
if (also_listen && listen(m_fd,5) < 0) if (also_listen && listen(m_fd,5) < 0)
{ {
Out(SYS_CON|LOG_IMPORTANT) << TQString("Cannot listen to port %1 : %2").tqarg(port).tqarg(strerror(errno)) << endl; Out(SYS_CON|LOG_IMPORTANT) << TQString("Cannot listen to port %1 : %2").arg(port).arg(strerror(errno)) << endl;
return false; return false;
} }
int val = 1; int val = 1;
if (setsockopt(m_fd,SOL_SOCKET,SO_REUSEADDR,&val,sizeof(int)) < 0) if (setsockopt(m_fd,SOL_SOCKET,SO_REUSEADDR,&val,sizeof(int)) < 0)
{ {
Out(SYS_CON|LOG_NOTICE) << TQString("Failed to set the reuseaddr option : %1").tqarg(strerror(errno)) << endl; Out(SYS_CON|LOG_NOTICE) << TQString("Failed to set the reuseaddr option : %1").arg(strerror(errno)) << endl;
} }
m_state = BOUND; m_state = BOUND;
return true; return true;
@ -272,7 +272,7 @@ namespace net
if (setsockopt(m_fd,IPPROTO_IP,IP_TOS,&c,sizeof(c)) < 0) if (setsockopt(m_fd,IPPROTO_IP,IP_TOS,&c,sizeof(c)) < 0)
{ {
Out(SYS_CON|LOG_NOTICE) << TQString("Failed to set TOS to %1 : %2") Out(SYS_CON|LOG_NOTICE) << TQString("Failed to set TOS to %1 : %2")
.tqarg(type_of_service).tqarg(strerror(errno)) << endl; .arg(type_of_service).arg(strerror(errno)) << endl;
return false; return false;
} }
return true; return true;

4
libktorrent/pluginmanager.cpp
Unescape View File

@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
#include <tqfile.h> #include <tqfile.h>
#include <tqtextstream.h> #include <textstream.h>
#include <kparts/componentfactory.h> #include <kparts/componentfactory.h>
#include <util/log.h> #include <util/log.h>
#include <util/error.h> #include <util/error.h>
@ -71,7 +71,7 @@ namespace kt
{ {
Out(SYS_GEN|LOG_NOTICE) << Out(SYS_GEN|LOG_NOTICE) <<
TQString("Plugin %1 version does not match KTorrent version, unloading it.") TQString("Plugin %1 version does not match KTorrent version, unloading it.")
.tqarg(service->library()) << endl; .arg(service->library()) << endl;
delete plugin; delete plugin;
// unload the library again, no need to have it loaded // unload the library again, no need to have it loaded

6
libktorrent/pluginmanagerprefpage.cpp
Unescape View File

@ -51,9 +51,9 @@ namespace kt
{ {
setTitle("<h3>" + p->getGuiName() + "</h3>"); setTitle("<h3>" + p->getGuiName() + "</h3>");
setDescription( setDescription(
i18n("%1<br>Status: <b>%2</b><br>Author: %3").tqarg(p->getDescription()) i18n("%1<br>Status: <b>%2</b><br>Author: %3").arg(p->getDescription())
.tqarg(p->isLoaded() ? i18n("Loaded") : i18n("Not loaded")) .arg(p->isLoaded() ? i18n("Loaded") : i18n("Not loaded"))
.tqarg(p->getAuthor())); .arg(p->getAuthor()));
} }
TQString pluginName() {return p->getName();} TQString pluginName() {return p->getName();}

4
libktorrent/pluginmanagerwidget.ui
Unescape View File

@ -34,7 +34,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout1</cstring> <cstring>layout1</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -82,7 +82,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>31</height> <height>31</height>

2
libktorrent/torrent/announcelist.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <klocale.h> #include <klocale.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include <tqfile.h> #include <tqfile.h>
#include <tqtextstream.h> #include <textstream.h>
namespace bt namespace bt
{ {

8
libktorrent/torrent/bdecoder.cpp
Unescape View File

@ -59,7 +59,7 @@ namespace bt
} }
else 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; Int64 bi = 0LL;
bi = n.toLongLong(&ok); bi = n.toLongLong(&ok);
if (!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++; pos++;
if (verbose) Out() << "INT64 = " << n << endl; if (verbose) Out() << "INT64 = " << n << endl;
@ -195,7 +195,7 @@ namespace bt
len = n.toInt(&ok); len = n.toInt(&ok);
if (!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 // move pos to the first part of the string
pos++; pos++;
@ -204,7 +204,7 @@ namespace bt
TQByteArray arr(len); TQByteArray arr(len);
for (unsigned int i = pos;i < pos + len;i++) for (unsigned int i = pos;i < pos + len;i++)
arr.tqat(i-pos) = data[i]; arr.at(i-pos) = data[i];
pos += len; pos += len;
// read the string into n // read the string into n

8
libktorrent/torrent/bencoder.cpp
Unescape View File

@ -87,7 +87,7 @@ namespace bt
{ {
if (!out) return; if (!out) return;
TQCString s = TQString("i%1e").tqarg(val).utf8(); TQCString s = TQString("i%1e").arg(val).utf8();
out->write(s,s.length()); out->write(s,s.length());
} }
@ -95,7 +95,7 @@ namespace bt
{ {
if (!out) return; if (!out) return;
TQCString s = TQString("i%1e").tqarg(val).utf8(); TQCString s = TQString("i%1e").arg(val).utf8();
out->write(s,s.length()); out->write(s,s.length());
} }
@ -104,7 +104,7 @@ namespace bt
if (!out) return; if (!out) return;
TQCString u = str.utf8(); 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(s,s.length());
out->write(u,u.length()); out->write(u,u.length());
} }
@ -123,7 +123,7 @@ namespace bt
{ {
if (!out) return; if (!out) return;
TQCString s = TQString("%1:").tqarg(size).utf8(); TQCString s = TQString("%1:").arg(size).utf8();
out->write(s,s.length()); out->write(s,s.length());
out->write((const char*)data,size); out->write((const char*)data,size);
} }

28
libktorrent/torrent/bnode.cpp
Unescape View File

@ -56,8 +56,8 @@ namespace bt
BDictNode::~BDictNode() BDictNode::~BDictNode()
{ {
TQValueList<DictEntry>::iterator i = tqchildren.begin(); TQValueList<DictEntry>::iterator i = children.begin();
while (i != tqchildren.end()) while (i != children.end())
{ {
DictEntry & e = *i; DictEntry & e = *i;
delete e.node; delete e.node;
@ -70,13 +70,13 @@ namespace bt
DictEntry entry; DictEntry entry;
entry.key = key; entry.key = key;
entry.node = node; entry.node = node;
tqchildren.append(entry); children.append(entry);
} }
BNode* BDictNode::getData(const TQString & key) BNode* BDictNode::getData(const TQString & key)
{ {
TQValueList<DictEntry>::iterator i = tqchildren.begin(); TQValueList<DictEntry>::iterator i = children.begin();
while (i != tqchildren.end()) while (i != children.end())
{ {
DictEntry & e = *i; DictEntry & e = *i;
if (TQString(e.key) == key) if (TQString(e.key) == key)
@ -88,8 +88,8 @@ namespace bt
BDictNode* BDictNode::getDict(const TQByteArray & key) BDictNode* BDictNode::getDict(const TQByteArray & key)
{ {
TQValueList<DictEntry>::iterator i = tqchildren.begin(); TQValueList<DictEntry>::iterator i = children.begin();
while (i != tqchildren.end()) while (i != children.end())
{ {
DictEntry & e = *i; DictEntry & e = *i;
if (e.key == key) if (e.key == key)
@ -120,8 +120,8 @@ namespace bt
void BDictNode::printDebugInfo() void BDictNode::printDebugInfo()
{ {
Out() << "DICT" << endl; Out() << "DICT" << endl;
TQValueList<DictEntry>::iterator i = tqchildren.begin(); TQValueList<DictEntry>::iterator i = children.begin();
while (i != tqchildren.end()) while (i != children.end())
{ {
DictEntry & e = *i; DictEntry & e = *i;
Out() << TQString(e.key) << ": " << endl; Out() << TQString(e.key) << ": " << endl;
@ -135,7 +135,7 @@ namespace bt
BListNode::BListNode(Uint32 off) : BNode(LIST,off) BListNode::BListNode(Uint32 off) : BNode(LIST,off)
{ {
tqchildren.setAutoDelete(true); children.setAutoDelete(true);
} }
@ -145,7 +145,7 @@ namespace bt
void BListNode::append(BNode* node) void BListNode::append(BNode* node)
{ {
tqchildren.append(node); children.append(node);
} }
BListNode* BListNode::getList(Uint32 idx) BListNode* BListNode::getList(Uint32 idx)
@ -165,10 +165,10 @@ namespace bt
void BListNode::printDebugInfo() void BListNode::printDebugInfo()
{ {
Out() << "LIST " << tqchildren.count() << endl; Out() << "LIST " << children.count() << endl;
for (Uint32 i = 0;i < tqchildren.count();i++) for (Uint32 i = 0;i < children.count();i++)
{ {
BNode* n = tqchildren.at(i); BNode* n = children.at(i);
n->printDebugInfo(); n->printDebugInfo();
} }
Out() << "END" << endl; Out() << "END" << endl;

8
libktorrent/torrent/bnode.h
Unescape View File

@ -102,7 +102,7 @@ namespace bt
TQByteArray key; TQByteArray key;
BNode* node; BNode* node;
}; };
TQValueList<DictEntry> tqchildren; TQValueList<DictEntry> children;
public: public:
BDictNode(Uint32 off); BDictNode(Uint32 off);
virtual ~BDictNode(); virtual ~BDictNode();
@ -159,7 +159,7 @@ namespace bt
*/ */
class BListNode : public BNode class BListNode : public BNode
{ {
TQPtrList<BNode> tqchildren; TQPtrList<BNode> children;
public: public:
BListNode(Uint32 off); BListNode(Uint32 off);
virtual ~BListNode(); virtual ~BListNode();
@ -172,14 +172,14 @@ namespace bt
void printDebugInfo(); void printDebugInfo();
/// Get the number of nodes in the list. /// 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 * Get a node from the list
* @param idx The index * @param idx The index
* @return The node or 0 if idx is out of bounds * @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. * Get a BListNode.

38
libktorrent/torrent/cachefile.cpp
Unescape View File

@ -92,7 +92,7 @@ namespace bt
if (fd < 0) 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); file_size = FileSize(fd);
@ -118,7 +118,7 @@ namespace bt
if (read_only && mode != READ) 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) if (off + size > max_size)
@ -217,7 +217,7 @@ namespace bt
} }
if (read_only) 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 // jump to the end of the file
SeekFile(fd,0,SEEK_END); SeekFile(fd,0,SEEK_END);
@ -237,22 +237,22 @@ namespace bt
int nb = to_write > 1024 ? 1024 : to_write; int nb = to_write > 1024 ? 1024 : to_write;
int ret = ::write(fd,buf,nb); int ret = ::write(fd,buf,nb);
if (ret < 0) 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) 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; to_write -= nb;
} }
file_size += num; 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)) 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); fsync(fd);
if (file_size != FileSize(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) 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) 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); ::close(fd);
@ -348,7 +348,7 @@ namespace bt
if (off >= file_size || off >= max_size) 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 // jump to right position
@ -358,7 +358,7 @@ namespace bt
if (close_again) if (close_again)
closeTemporary(); closeTemporary();
throw Error(i18n("Error reading from %1").tqarg(path)); throw Error(i18n("Error reading from %1").arg(path));
} }
if (close_again) if (close_again)
@ -379,7 +379,7 @@ namespace bt
} }
if (read_only) 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) if (off + size > max_size)
{ {
@ -389,7 +389,7 @@ namespace bt
if (file_size < off) 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); growFile(off - file_size);
} }
@ -400,11 +400,11 @@ namespace bt
closeTemporary(); closeTemporary();
if (ret == -1) 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) else if ((Uint32)ret != size)
{ {
Out() << TQString("Incomplete write of %1 bytes, should be %2").tqarg(ret).tqarg(size) << endl; Out() << TQString("Incomplete write of %1 bytes, should be %2").arg(ret).arg(size) << endl;
throw Error(i18n("Error writing to %1").tqarg(path)); throw Error(i18n("Error writing to %1").arg(path));
} }
if (off + size > file_size) if (off + size > file_size)
@ -445,7 +445,7 @@ namespace bt
if (close_again) if (close_again)
closeTemporary(); 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 try
@ -472,7 +472,7 @@ namespace bt
if (close_again) if (close_again)
closeTemporary(); closeTemporary();
throw Error(i18n("Cannot preallocate diskspace : %1").tqarg(strerror(errno))); throw Error(i18n("Cannot preallocate diskspace : %1").arg(strerror(errno)));
} }
} }

2
libktorrent/torrent/chunk.cpp
Unescape View File

@ -37,7 +37,7 @@ namespace bt
clear(); clear();
} }
void Chunk::setData(Uint8* d,tqStatus nstatus) void Chunk::setData(Uint8* d,Status nstatus)
{ {
clear(); clear();
status = nstatus; status = nstatus;

14
libktorrent/torrent/chunk.h
Unescape View File

@ -45,7 +45,7 @@ namespace bt
Chunk(unsigned int index,Uint32 size); Chunk(unsigned int index,Uint32 size);
~Chunk(); ~Chunk();
enum tqStatus enum Status
{ {
MMAPPED, MMAPPED,
BUFFERED, BUFFERED,
@ -54,13 +54,13 @@ namespace bt
}; };
/// Get the chunks status. /// Get the chunks status.
tqStatus gettqStatus() const; Status getStatus() const;
/** /**
* Set the chunks status * Set the chunks status
* @param s * @param s
*/ */
void settqStatus(tqStatus s); void setStatus(Status s);
/// Get the data /// Get the data
const Uint8* getData() const; const Uint8* getData() const;
@ -69,7 +69,7 @@ namespace bt
Uint8* getData(); Uint8* getData();
/// Set the data and the new status /// 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) /// Clear the chunk (delete data depending on the mode)
void clear(); void clear();
@ -118,7 +118,7 @@ namespace bt
virtual void unmapped(); virtual void unmapped();
private: private:
tqStatus status; Status status;
Uint32 index; Uint32 index;
Uint8* data; Uint8* data;
Uint32 size; Uint32 size;
@ -126,12 +126,12 @@ namespace bt
Priority priority; Priority priority;
}; };
inline Chunk::tqStatus Chunk::gettqStatus() const inline Chunk::Status Chunk::getStatus() const
{ {
return status; return status;
} }
inline void Chunk::settqStatus(Chunk::tqStatus s) inline void Chunk::setStatus(Chunk::Status s)
{ {
status = s; status = s;
} }

28
libktorrent/torrent/chunkdownload.cpp
Unescape View File

@ -35,17 +35,17 @@
namespace bt namespace bt
{ {
class DownloadtqStatus : public std::set<Uint32> class DownloadStatus : public std::set<Uint32>
{ {
public: public:
// typedef std::set<Uint32>::iterator iterator; // typedef std::set<Uint32>::iterator iterator;
DownloadtqStatus() DownloadStatus()
{ {
} }
~DownloadtqStatus() ~DownloadStatus()
{ {
} }
@ -111,7 +111,7 @@ namespace bt
return false; return false;
DownloadtqStatus* ds = dstatus.find(p.getPeer()); DownloadStatus* ds = dstatus.find(p.getPeer());
if (ds) if (ds)
ds->remove(pp); ds->remove(pp);
@ -169,7 +169,7 @@ namespace bt
pd->grab(); pd->grab();
pdown.append(pd); pdown.append(pd);
dstatus.insert(pd->getPeer()->getID(),new DownloadtqStatus()); dstatus.insert(pd->getPeer()->getID(),new DownloadStatus());
sendRequests(pd); sendRequests(pd);
connect(pd,TQT_SIGNAL(timedout(const Request& )),this,TQT_SLOT(onTimeout(const Request& ))); 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& ))); 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) void ChunkDownload::notDownloaded(const Request & r,bool reject)
{ {
// find the peer // find the peer
DownloadtqStatus* ds = dstatus.find(r.getPeer()); DownloadStatus* ds = dstatus.find(r.getPeer());
if (ds) if (ds)
{ {
// Out() << "ds != 0" << endl; // Out() << "ds != 0" << endl;
@ -196,7 +196,7 @@ namespace bt
{ {
if (chunk->getIndex() == r.getIndex()) 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); notDownloaded(r,true);
} }
@ -207,7 +207,7 @@ namespace bt
// see if we are dealing with a piece of ours // see if we are dealing with a piece of ours
if (chunk->getIndex() == r.getIndex()) 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); notDownloaded(r,false);
} }
@ -216,7 +216,7 @@ namespace bt
void ChunkDownload::sendRequests(PeerDownloader* pd) void ChunkDownload::sendRequests(PeerDownloader* pd)
{ {
timer.update(); timer.update();
DownloadtqStatus* ds = dstatus.find(pd->getPeer()->getID()); DownloadStatus* ds = dstatus.find(pd->getPeer()->getID());
if (!ds) if (!ds)
return; return;
@ -262,11 +262,11 @@ namespace bt
void ChunkDownload::sendCancels(PeerDownloader* pd) void ChunkDownload::sendCancels(PeerDownloader* pd)
{ {
DownloadtqStatus* ds = dstatus.find(pd->getPeer()->getID()); DownloadStatus* ds = dstatus.find(pd->getPeer()->getID());
if (!ds) if (!ds)
return; return;
DownloadtqStatus::iterator itr = ds->begin(); DownloadStatus::iterator itr = ds->begin();
while (itr != ds->end()) while (itr != ds->end())
{ {
Uint32 i = *itr; Uint32 i = *itr;
@ -287,7 +287,7 @@ namespace bt
while (i != pdown.end()) while (i != pdown.end())
{ {
PeerDownloader* pd = *i; PeerDownloader* pd = *i;
DownloadtqStatus* ds = dstatus.find(pd->getPeer()->getID()); DownloadStatus* ds = dstatus.find(pd->getPeer()->getID());
Uint32 pp = p.getOffset() / MAX_PIECE_LEN; Uint32 pp = p.getOffset() / MAX_PIECE_LEN;
if (ds && ds->contains(pp)) if (ds && ds->contains(pp))
{ {
@ -360,7 +360,7 @@ namespace bt
ChunkDownloadHeader hdr; ChunkDownloadHeader hdr;
hdr.index = chunk->getIndex(); hdr.index = chunk->getIndex();
hdr.num_bits = pieces.getNumBits(); 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 // save the chunk header
file.write(&hdr,sizeof(ChunkDownloadHeader)); file.write(&hdr,sizeof(ChunkDownloadHeader));
// save the bitset // save the bitset
@ -370,7 +370,7 @@ namespace bt
// if it's a buffered chunk, save the contents to // if it's a buffered chunk, save the contents to
file.write(chunk->getData(),chunk->getSize()); file.write(chunk->getData(),chunk->getSize());
chunk->clear(); chunk->clear();
chunk->settqStatus(Chunk::ON_DISK); chunk->setStatus(Chunk::ON_DISK);
} }
} }

4
libktorrent/torrent/chunkdownload.h
Unescape View File

@ -41,7 +41,7 @@ namespace bt
class Peer; class Peer;
class Request; class Request;
class PeerDownloader; class PeerDownloader;
class DownloadtqStatus; class DownloadStatus;
struct ChunkDownloadHeader struct ChunkDownloadHeader
{ {
@ -193,7 +193,7 @@ namespace bt
Uint32 last_size; Uint32 last_size;
Timer timer; Timer timer;
TQPtrList<PeerDownloader> pdown; TQPtrList<PeerDownloader> pdown;
PtrMap<Uint32,DownloadtqStatus> dstatus; PtrMap<Uint32,DownloadStatus> dstatus;
std::set<Uint32> piece_providers; std::set<Uint32> piece_providers;

46
libktorrent/torrent/chunkmanager.cpp
Unescape View File

@ -189,7 +189,7 @@ namespace bt
Chunk* c = getChunk(hdr.index); Chunk* c = getChunk(hdr.index);
if (c) if (c)
{ {
c->settqStatus(Chunk::ON_DISK); c->setStatus(Chunk::ON_DISK);
bitset.set(hdr.index,true); bitset.set(hdr.index,true);
todo.set(hdr.index,false); todo.set(hdr.index,false);
recalc_chunks_left = true; recalc_chunks_left = true;
@ -204,12 +204,12 @@ namespace bt
{ {
File fptr; File fptr;
if (!fptr.open(index_file,"wb")) 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++) for (unsigned int i = 0;i < tor.getNumChunks();i++)
{ {
Chunk* c = getChunk(i); Chunk* c = getChunk(i);
if (c->gettqStatus() != Chunk::NOT_DOWNLOADED) if (c->getStatus() != Chunk::NOT_DOWNLOADED)
{ {
NewChunkHeader hdr; NewChunkHeader hdr;
hdr.index = i; hdr.index = i;
@ -267,16 +267,16 @@ namespace bt
for (Uint32 i = 0;i < bitset.getNumBits();i++) for (Uint32 i = 0;i < bitset.getNumBits();i++)
{ {
Chunk* c = chunks[i]; Chunk* c = chunks[i];
if (c->gettqStatus() == Chunk::MMAPPED) if (c->getStatus() == Chunk::MMAPPED)
{ {
cache->save(c); cache->save(c);
c->clear(); 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->clear();
c->settqStatus(Chunk::ON_DISK); c->setStatus(Chunk::ON_DISK);
} }
} }
cache->close(); cache->close();
@ -288,11 +288,11 @@ namespace bt
return 0; return 0;
Chunk* c = chunks[i]; Chunk* c = chunks[i];
if (c->gettqStatus() == Chunk::NOT_DOWNLOADED || c->isExcluded()) if (c->getStatus() == Chunk::NOT_DOWNLOADED || c->isExcluded())
{ {
return 0; return 0;
} }
else if (c->gettqStatus() == Chunk::ON_DISK) else if (c->getStatus() == Chunk::ON_DISK)
{ {
// load the chunk if it is on disk // load the chunk if it is on disk
cache->load(c); cache->load(c);
@ -338,10 +338,10 @@ namespace bt
Chunk* c = chunks[i]; Chunk* c = chunks[i];
if (!c->taken()) if (!c->taken())
{ {
if (c->gettqStatus() == Chunk::MMAPPED) if (c->getStatus() == Chunk::MMAPPED)
cache->save(c); cache->save(c);
c->clear(); c->clear();
c->settqStatus(Chunk::ON_DISK); c->setStatus(Chunk::ON_DISK);
loaded.remove(i); loaded.remove(i);
} }
} }
@ -352,10 +352,10 @@ namespace bt
return; return;
Chunk* c = chunks[i]; Chunk* c = chunks[i];
if (c->gettqStatus() == Chunk::MMAPPED) if (c->getStatus() == Chunk::MMAPPED)
cache->save(c); cache->save(c);
c->clear(); c->clear();
c->settqStatus(Chunk::NOT_DOWNLOADED); c->setStatus(Chunk::NOT_DOWNLOADED);
bitset.set(i,false); bitset.set(i,false);
todo.set(i,!excluded_chunks.get(i) && !only_seed_chunks.get(i)); todo.set(i,!excluded_chunks.get(i) && !only_seed_chunks.get(i));
loaded.remove(i); loaded.remove(i);
@ -372,10 +372,10 @@ namespace bt
// get rid of chunk if nobody asked for it in the last 5 seconds // get rid of chunk if nobody asked for it in the last 5 seconds
if (!c->taken() && bt::GetCurrentTime() - i.data() > 5000) if (!c->taken() && bt::GetCurrentTime() - i.data() > 5000)
{ {
if (c->gettqStatus() == Chunk::MMAPPED) if (c->getStatus() == Chunk::MMAPPED)
cache->save(c); cache->save(c);
c->clear(); c->clear();
c->settqStatus(Chunk::ON_DISK); c->setStatus(Chunk::ON_DISK);
TQMap<Uint32,TimeStamp>::iterator j = i; TQMap<Uint32,TimeStamp>::iterator j = i;
i++; i++;
loaded.erase(j); loaded.erase(j);
@ -387,7 +387,7 @@ namespace bt
} }
} }
// Uint32 num_in_mem = loaded.count(); // 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) void ChunkManager::saveChunk(unsigned int i,bool update_index)
@ -413,7 +413,7 @@ namespace bt
else else
{ {
c->clear(); 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; Out(SYS_DIO|LOG_IMPORTANT) << "Warning: attempted to save a chunk which was excluded" << endl;
} }
} }
@ -429,7 +429,7 @@ namespace bt
// try again // try again
if (!fptr.open(index_file,"r+b")) if (!fptr.open(index_file,"r+b"))
// panick if it failes // 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) bool ChunkManager::prepareChunk(Chunk* c,bool allways)
{ {
if (!allways && c->gettqStatus() != Chunk::NOT_DOWNLOADED) if (!allways && c->getStatus() != Chunk::NOT_DOWNLOADED)
return false; return false;
return cache->prep(c); return cache->prep(c);
@ -1044,7 +1044,7 @@ namespace bt
bitset.set(i,true); bitset.set(i,true);
todo.set(i,false); todo.set(i,false);
// the chunk must be on disk // the chunk must be on disk
c->settqStatus(Chunk::ON_DISK); c->setStatus(Chunk::ON_DISK);
tor.updateFilePercentage(i,bitset); tor.updateFilePercentage(i,bitset);
} }
else if (!ok_chunks.get(i) && bitset.get(i)) 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 // We think we have a chunk, but we don't
bitset.set(i,false); bitset.set(i,false);
todo.set(i,!only_seed_chunks.get(i) && !excluded_chunks.get(i)); 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); 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); resetChunk(i);
} }

2
libktorrent/torrent/chunkselector.cpp
Unescape View File

@ -165,7 +165,7 @@ namespace bt
for (Uint32 i = from;i <= to;i++) for (Uint32 i = from;i <= to;i++)
{ {
bool in_chunks = std::find(chunks.begin(),chunks.end(),i) != chunks.end(); 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; // Out(SYS_DIO|LOG_DEBUG) << "ChunkSelector::reIncluded " << i << endl;
chunks.push_back(i); chunks.push_back(i);

6
libktorrent/torrent/dndfile.cpp
Unescape View File

@ -105,7 +105,7 @@ namespace bt
File fptr; File fptr;
if (!fptr.open(path,"wb")) 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.write(&hdr,sizeof(DNDFileHeader));
fptr.close(); fptr.close();
@ -172,7 +172,7 @@ namespace bt
create(); create();
if (!fptr.open(path,"r+b")) 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(); create();
if (!fptr.open(path,"r+b")) 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()));
} }
} }

16
libktorrent/torrent/downloader.cpp
Unescape View File

@ -87,7 +87,7 @@ namespace bt
} }
// if the chunk is not in memory, reload it // 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); cman.prepareChunk(cd->getChunk(),true);
} }
@ -119,7 +119,7 @@ namespace bt
downloaded += p.getLength(); downloaded += p.getLength();
// save to disk again, if it is idle // 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); cman.saveChunk(cd->getChunk()->getIndex(),false);
} }
@ -160,7 +160,7 @@ namespace bt
if (cd->isIdle()) // idle chunks do not need to be in memory if (cd->isIdle()) // idle chunks do not need to be in memory
{ {
Chunk* c = cd->getChunk(); Chunk* c = cd->getChunk();
if (c->gettqStatus() == Chunk::MMAPPED) if (c->getStatus() == Chunk::MMAPPED)
{ {
cman.saveChunk(cd->getChunk()->getIndex(),false); cman.saveChunk(cd->getChunk()->getIndex(),false);
} }
@ -169,7 +169,7 @@ namespace bt
{ {
cd->releaseAllPDs(); cd->releaseAllPDs();
Chunk* c = cd->getChunk(); Chunk* c = cd->getChunk();
if (c->gettqStatus() == Chunk::MMAPPED) if (c->getStatus() == Chunk::MMAPPED)
{ {
cman.saveChunk(cd->getChunk()->getIndex(),false); cman.saveChunk(cd->getChunk()->getIndex(),false);
} }
@ -277,7 +277,7 @@ namespace bt
if (sel) if (sel)
{ {
// if it is on disk, reload it // 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); cman.prepareChunk(sel->getChunk(),true);
sel->assignPeer(pd); sel->assignPeer(pd);
@ -341,7 +341,7 @@ namespace bt
if (cdmin) if (cdmin)
{ {
// if it is on disk, reload it // 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); cman.prepareChunk(cdmin->getChunk(),true);
} }
@ -438,10 +438,10 @@ namespace bt
{ {
Uint32 ch = i->first; Uint32 ch = i->first;
Chunk* c = i->second->getChunk(); Chunk* c = i->second->getChunk();
if (c->gettqStatus() == Chunk::MMAPPED) if (c->getStatus() == Chunk::MMAPPED)
cman.saveChunk(ch,false); cman.saveChunk(ch,false);
c->settqStatus(Chunk::NOT_DOWNLOADED); c->setStatus(Chunk::NOT_DOWNLOADED);
} }
current_chunks.clear(); current_chunks.clear();
} }

8
libktorrent/torrent/ipblocklist.cpp
Unescape View File

@ -338,7 +338,7 @@ namespace bt
if(tmpmask == 0) if(tmpmask == 0)
out.prepend("*"); out.prepend("*");
else else
out.prepend(TQString("%1").tqarg(tmp)); out.prepend(TQString("%1").arg(tmp));
ip >>= 8; ip >>= 8;
mask >>= 8; mask >>= 8;
tmp = ip; tmp = ip;
@ -348,7 +348,7 @@ namespace bt
if(tmpmask == 0) if(tmpmask == 0)
out.prepend("*."); out.prepend("*.");
else else
out.prepend(TQString("%1.").tqarg(tmp)); out.prepend(TQString("%1.").arg(tmp));
ip >>= 8; ip >>= 8;
mask >>= 8; mask >>= 8;
tmp = ip; tmp = ip;
@ -358,7 +358,7 @@ namespace bt
if(tmpmask == 0) if(tmpmask == 0)
out.prepend("*."); out.prepend("*.");
else else
out.prepend(TQString("%1.").tqarg(tmp)); out.prepend(TQString("%1.").arg(tmp));
ip >>= 8; ip >>= 8;
mask >>= 8; mask >>= 8;
tmp = ip; tmp = ip;
@ -368,7 +368,7 @@ namespace bt
if(tmpmask == 0) if(tmpmask == 0)
out.prepend("*."); out.prepend("*.");
else else
out.prepend(TQString("%1.").tqarg(tmp)); out.prepend(TQString("%1.").arg(tmp));
return out; return out;
} }

18
libktorrent/torrent/multifilecache.cpp
Unescape View File

@ -425,7 +425,7 @@ namespace bt
{ {
// if mmap fails or is not possible use buffered mode // if mmap fails or is not possible use buffered mode
c->allocate(); c->allocate();
c->settqStatus(Chunk::BUFFERED); c->setStatus(Chunk::BUFFERED);
} }
else else
{ {
@ -436,7 +436,7 @@ namespace bt
{ {
// just allocate it // just allocate it
c->allocate(); c->allocate();
c->settqStatus(Chunk::BUFFERED); c->setStatus(Chunk::BUFFERED);
} }
return true; return true;
} }
@ -446,7 +446,7 @@ namespace bt
TQValueList<Uint32> tflist; TQValueList<Uint32> tflist;
tor.calcChunkPos(c->getIndex(),tflist); tor.calcChunkPos(c->getIndex(),tflist);
if (c->gettqStatus() == Chunk::MMAPPED) if (c->getStatus() == Chunk::MMAPPED)
{ {
// mapped chunks are easy // mapped chunks are easy
CacheFile* fd = files.find(tflist[0]); CacheFile* fd = files.find(tflist[0]);
@ -455,7 +455,7 @@ namespace bt
fd->unmap(c->getData(),c->getSize()); fd->unmap(c->getData(),c->getSize());
c->clear(); c->clear();
c->settqStatus(Chunk::ON_DISK); c->setStatus(Chunk::ON_DISK);
return; return;
} }
@ -506,7 +506,7 @@ namespace bt
// set the chunk to on disk and clear it // set the chunk to on disk and clear it
c->clear(); c->clear();
c->settqStatus(Chunk::ON_DISK); c->setStatus(Chunk::ON_DISK);
} }
void MultiFileCache::downloadStatusChanged(TorrentFile* tf, bool download) void MultiFileCache::downloadStatusChanged(TorrentFile* tf, bool download)
@ -592,7 +592,7 @@ namespace bt
DNDFile out(dst_file); DNDFile out(dst_file);
File fptr; File fptr;
if (!fptr.open(src_file,"rb")) 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; Uint32 cs = 0;
if (tf->getFirstChunk() == tor.getNumChunks() - 1) if (tf->getFirstChunk() == tor.getNumChunks() - 1)
@ -654,7 +654,7 @@ namespace bt
// first attempt failed, must be fat so try that // first attempt failed, must be fat so try that
if (!FatPreallocate(output_file,tf->getSize())) 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; File fptr;
if (!fptr.open(output_file,"r+b")) 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() ? Uint32 ts = cs - tf->getFirstChunkOffset() > tf->getLastChunkSize() ?
@ -782,7 +782,7 @@ namespace bt
else else
{ {
// tqchildren, so we cannot delete any more directories higher up // children, so we cannot delete any more directories higher up
return; return;
} }
} }

20
libktorrent/torrent/packet.cpp
Unescape View File

@ -138,16 +138,16 @@ namespace bt
switch (data[4]) switch (data[4])
{ {
case CHOKE : return TQString("CHOKE %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").tqarg(hdr_length).tqarg(data_length); case UNCHOKE : return TQString("UNCHOKE %1 %2").arg(hdr_length).arg(data_length);
case INTERESTED : return TQString("INTERESTED %1 %2").tqarg(hdr_length).tqarg(data_length); case INTERESTED : return TQString("INTERESTED %1 %2").arg(hdr_length).arg(data_length);
case NOT_INTERESTED : return TQString("NOT_INTERESTED %1 %2").tqarg(hdr_length).tqarg(data_length); case NOT_INTERESTED : return TQString("NOT_INTERESTED %1 %2").arg(hdr_length).arg(data_length);
case HAVE : return TQString("HAVE %1 %2").tqarg(hdr_length).tqarg(data_length); case HAVE : return TQString("HAVE %1 %2").arg(hdr_length).arg(data_length);
case BITFIELD : return TQString("BITFIELD %1 %2").tqarg(hdr_length).tqarg(data_length); case BITFIELD : return TQString("BITFIELD %1 %2").arg(hdr_length).arg(data_length);
case PIECE : return TQString("PIECE %1 %2").tqarg(hdr_length).tqarg(data_length); case PIECE : return TQString("PIECE %1 %2").arg(hdr_length).arg(data_length);
case REQUEST : return TQString("REQUEST %1 %2").tqarg(hdr_length).tqarg(data_length); case REQUEST : return TQString("REQUEST %1 %2").arg(hdr_length).arg(data_length);
case CANCEL : return TQString("CANCEL %1 %2").tqarg(hdr_length).tqarg(data_length); case CANCEL : return TQString("CANCEL %1 %2").arg(hdr_length).arg(data_length);
default: return TQString("UNKNOWN %1 %2").tqarg(hdr_length).tqarg(data_length); default: return TQString("UNKNOWN %1 %2").arg(hdr_length).arg(data_length);
} }
} }
*/ */

10
libktorrent/torrent/packetreader.cpp
Unescape View File

@ -36,13 +36,13 @@ namespace bt
#ifdef LOG_PACKET #ifdef LOG_PACKET
static void LogPacket(const Uint8* data,Uint32 size,Uint32 len) 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; File fptr;
if (!fptr.open(file,"a")) if (!fptr.open(file,"a"))
return; 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()); fptr.write(tmp.ascii(),tmp.length());
@ -51,7 +51,7 @@ namespace bt
{ {
for (Uint32 i = 0;i < size;i++) 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()); fptr.write(tmp.ascii(),tmp.length());
j++; j++;
if (j > 10) if (j > 10)
@ -65,7 +65,7 @@ namespace bt
{ {
for (Uint32 i = 0;i < 20;i++) 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()); fptr.write(tmp.ascii(),tmp.length());
j++; j++;
if (j > 10) if (j > 10)
@ -78,7 +78,7 @@ namespace bt
fptr.write(tmp.ascii(),tmp.length()); fptr.write(tmp.ascii(),tmp.length());
for (Uint32 i = size - 20;i < size;i++) 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()); fptr.write(tmp.ascii(),tmp.length());
j++; j++;
if (j > 10) if (j > 10)

4
libktorrent/torrent/packetwriter.cpp
Unescape View File

@ -195,7 +195,7 @@ namespace bt
else else
{ {
/* Out(SYS_CON|LOG_DEBUG) << TQString("Uploading %1 %2 %3 %4 %5") /* 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;; << endl;;
*/ */
queuePacket(new Packet(index,begin,len,ch)); queuePacket(new Packet(index,begin,len,ch));
@ -218,7 +218,7 @@ namespace bt
enc.write(TQString("p")); enc.write(TQString("p"));
enc.write((Uint32)port); 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(); enc.end();
sendExtProtMsg(0,arr); sendExtProtMsg(0,arr);
} }

36
libktorrent/torrent/peerid.cpp
Unescape View File

@ -174,7 +174,7 @@ namespace bt
Map["TS"] = "Torrent Storm"; Map["TS"] = "Torrent Storm";
Map["TT"] = "TuoTu"; Map["TT"] = "TuoTu";
Map["UL"] = "uLeecher!"; 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["WT"] = "BitLet";
Map["WY"] = "FireTorrent"; Map["WY"] = "FireTorrent";
Map["XL"] = "Xunlei"; Map["XL"] = "Xunlei";
@ -201,31 +201,31 @@ namespace bt
} }
TQString name = i18n("Unknown client"); TQString name = i18n("Unknown client");
if (peer_id.tqat(0) == '-' && if (peer_id.at(0) == '-' &&
peer_id.tqat(1).isLetter() && peer_id.at(1).isLetter() &&
peer_id.tqat(2).isLetter() ) //AZ style peer_id.at(2).isLetter() ) //AZ style
{ {
TQString ID(peer_id.mid(1,2)); TQString ID(peer_id.mid(1,2));
if (Map.contains(ID)) if (Map.contains(ID))
name = Map[ID] + " " + peer_id.tqat(3) + "." + peer_id.tqat(4) + "." name = Map[ID] + " " + peer_id.at(3) + "." + peer_id.at(4) + "."
+ peer_id.tqat(5) + "." + peer_id.tqat(6); + peer_id.at(5) + "." + peer_id.at(6);
} }
else if (peer_id.tqat(0).isLetter() && else if (peer_id.at(0).isLetter() &&
peer_id.tqat(1).isDigit() && peer_id.at(1).isDigit() &&
peer_id.tqat(2).isDigit() ) //Shadow's style 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)) if (Map.contains(ID))
name = Map[ID] + " " + peer_id.tqat(1) + "." + name = Map[ID] + " " + peer_id.at(1) + "." +
peer_id.tqat(2) + "." + peer_id.tqat(3); 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); name = Map["M"] + " " + peer_id.at(1) + "." + peer_id.at(3);
if(peer_id.tqat(4) == '-') if(peer_id.at(4) == '-')
name += "." + peer_id.tqat(5); name += "." + peer_id.at(5);
else 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")) else if (peer_id.startsWith("OP"))
{ {
@ -245,7 +245,7 @@ namespace bt
} }
else if ( peer_id.startsWith("Mbrst")) 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; return name;

16
libktorrent/torrent/peermanager.cpp
Unescape View File

@ -475,10 +475,10 @@ namespace bt
// convert IP address to string // convert IP address to string
pp.ip = TQString("%1.%2.%3.%4") pp.ip = TQString("%1.%2.%3.%4")
.tqarg((e.ip & 0xFF000000) >> 24) .arg((e.ip & 0xFF000000) >> 24)
.tqarg((e.ip & 0x00FF0000) >> 16) .arg((e.ip & 0x00FF0000) >> 16)
.tqarg((e.ip & 0x0000FF00) >> 8) .arg((e.ip & 0x0000FF00) >> 8)
.tqarg( e.ip & 0x000000FF); .arg( e.ip & 0x000000FF);
pp.port = e.port; pp.port = e.port;
addPotentialPeer(pp); addPotentialPeer(pp);
} }
@ -564,10 +564,10 @@ namespace bt
pp.port = ReadUint16(tmp,4); pp.port = ReadUint16(tmp,4);
Uint32 ip = ReadUint32(tmp,0); Uint32 ip = ReadUint32(tmp,0);
pp.ip = TQString("%1.%2.%3.%4") pp.ip = TQString("%1.%2.%3.%4")
.tqarg((ip & 0xFF000000) >> 24) .arg((ip & 0xFF000000) >> 24)
.tqarg((ip & 0x00FF0000) >> 16) .arg((ip & 0x00FF0000) >> 16)
.tqarg((ip & 0x0000FF00) >> 8) .arg((ip & 0x0000FF00) >> 8)
.tqarg( ip & 0x000000FF); .arg( ip & 0x000000FF);
pp.local = false; pp.local = false;
addPotentialPeer(pp); addPotentialPeer(pp);

16
libktorrent/torrent/peersourcemanager.cpp
Unescape View File

@ -386,7 +386,7 @@ namespace bt
// 30 minutes // 30 minutes
curr->setInterval(FINAL_WAIT_TIME); curr->setInterval(FINAL_WAIT_TIME);
timer.start(FINAL_WAIT_TIME * 1000,true); timer.start(FINAL_WAIT_TIME * 1000,true);
request_time = TQDateTime::tqcurrentDateTime(); request_time = TQDateTime::currentDateTime();
} }
else if (curr->failureCount() > 2) else if (curr->failureCount() > 2)
{ {
@ -394,14 +394,14 @@ namespace bt
// a minute or 5, no need for hammering every 30 seconds // a minute or 5, no need for hammering every 30 seconds
curr->setInterval(LONGER_WAIT_TIME); curr->setInterval(LONGER_WAIT_TIME);
timer.start(LONGER_WAIT_TIME * 1000,true); timer.start(LONGER_WAIT_TIME * 1000,true);
request_time = TQDateTime::tqcurrentDateTime(); request_time = TQDateTime::currentDateTime();
} }
else else
{ {
// lets not hammer and wait 30 seconds // lets not hammer and wait 30 seconds
curr->setInterval(INITIAL_WAIT_TIME); curr->setInterval(INITIAL_WAIT_TIME);
timer.start(INITIAL_WAIT_TIME * 1000,true); timer.start(INITIAL_WAIT_TIME * 1000,true);
request_time = TQDateTime::tqcurrentDateTime(); request_time = TQDateTime::currentDateTime();
} }
} }
else else
@ -418,7 +418,7 @@ namespace bt
{ {
curr->setInterval(FINAL_WAIT_TIME); curr->setInterval(FINAL_WAIT_TIME);
timer.start(FINAL_WAIT_TIME * 1000,true); timer.start(FINAL_WAIT_TIME * 1000,true);
request_time = TQDateTime::tqcurrentDateTime(); request_time = TQDateTime::currentDateTime();
} }
else if (trk->failureCount() > 2) else if (trk->failureCount() > 2)
{ {
@ -426,14 +426,14 @@ namespace bt
// wait 5 minutes and try again // wait 5 minutes and try again
curr->setInterval(LONGER_WAIT_TIME); curr->setInterval(LONGER_WAIT_TIME);
timer.start(LONGER_WAIT_TIME * 1000,true); timer.start(LONGER_WAIT_TIME * 1000,true);
request_time = TQDateTime::tqcurrentDateTime(); request_time = TQDateTime::currentDateTime();
} }
else else
{ {
// wait 30 seconds and try again // wait 30 seconds and try again
curr->setInterval(INITIAL_WAIT_TIME); curr->setInterval(INITIAL_WAIT_TIME);
timer.start(INITIAL_WAIT_TIME * 1000,true); timer.start(INITIAL_WAIT_TIME * 1000,true);
request_time = TQDateTime::tqcurrentDateTime(); request_time = TQDateTime::currentDateTime();
} }
} }
} }
@ -449,7 +449,7 @@ namespace bt
pending = false; pending = false;
if (started) if (started)
statusChanged(i18n("OK")); statusChanged(i18n("OK"));
request_time = TQDateTime::tqcurrentDateTime(); request_time = TQDateTime::currentDateTime();
} }
void PeerSourceManager::onTrackerRequestPending() void PeerSourceManager::onTrackerRequestPending()
@ -504,7 +504,7 @@ namespace bt
if (pending || !started || !curr) if (pending || !started || !curr)
return 0; return 0;
return curr->getInterval() - request_time.secsTo(TQDateTime::tqcurrentDateTime()); return curr->getInterval() - request_time.secsTo(TQDateTime::currentDateTime());
} }
Uint32 PeerSourceManager::getNumSeeders() const Uint32 PeerSourceManager::getNumSeeders() const

2
libktorrent/torrent/peersourcemanager.h
Unescape View File

@ -165,7 +165,7 @@ namespace bt
signals: signals:
/** /**
* tqStatus has changed of the tracker. * Status has changed of the tracker.
* @param ns The new status * @param ns The new status
*/ */
void statusChanged(const TQString & ns); void statusChanged(const TQString & ns);

4
libktorrent/torrent/peeruploader.cpp
Unescape View File

@ -45,7 +45,7 @@ namespace bt
void PeerUploader::addRequest(const Request & r) void PeerUploader::addRequest(const Request & r)
{ {
// Out(SYS_CON|LOG_DEBUG) << // 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 // allowed fast chunks go to the front of the queue
requests.append(r); requests.append(r);
@ -54,7 +54,7 @@ namespace bt
void PeerUploader::removeRequest(const Request & r) void PeerUploader::removeRequest(const Request & r)
{ {
// Out(SYS_CON|LOG_DEBUG) << // 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); requests.remove(r);
peer->getPacketWriter().doNotSendPiece(r,peer->getStats().fast_extensions); peer->getPacketWriter().doNotSendPiece(r,peer->getStats().fast_extensions);
} }

10
libktorrent/torrent/queuemanager.cpp
Unescape View File

@ -132,7 +132,7 @@ namespace bt
return kt::NOT_ENOUGH_DISKSPACE; return kt::NOT_ENOUGH_DISKSPACE;
case 1: //ask user 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); tc->setPriority(0);
return kt::USER_CANCELED; return kt::USER_CANCELED;
@ -154,7 +154,7 @@ namespace bt
if (s.completed && max_ratio > 0 && ratio >= max_ratio) 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); tc->setMaxShareRatio(0.00f);
startSafely(tc); startSafely(tc);
@ -234,7 +234,7 @@ namespace bt
{ {
TQString msg = TQString msg =
i18n("Error stopping torrent %1 : %2") 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")); KMessageBox::error(0, msg, i18n("Error"));
} }
} }
@ -740,7 +740,7 @@ namespace bt
TQString msg = TQString msg =
i18n("Error starting torrent %1 : %2") 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")); KMessageBox::error(0, msg, i18n("Error"));
} }
@ -758,7 +758,7 @@ namespace bt
TQString msg = TQString msg =
i18n("Error stopping torrent %1 : %2") 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")); KMessageBox::error(0, msg, i18n("Error"));
} }

14
libktorrent/torrent/singlefilecache.cpp
Unescape View File

@ -76,7 +76,7 @@ namespace bt
{ {
// mmap continuously fails, so stop using it // mmap continuously fails, so stop using it
c->allocate(); c->allocate();
c->settqStatus(Chunk::BUFFERED); c->setStatus(Chunk::BUFFERED);
} }
else else
{ {
@ -88,7 +88,7 @@ namespace bt
// buffer it if mmapping fails // buffer it if mmapping fails
Out(SYS_GEN|LOG_IMPORTANT) << "Warning : mmap failure, falling back to buffered mode" << endl; Out(SYS_GEN|LOG_IMPORTANT) << "Warning : mmap failure, falling back to buffered mode" << endl;
c->allocate(); c->allocate();
c->settqStatus(Chunk::BUFFERED); c->setStatus(Chunk::BUFFERED);
} }
else else
{ {
@ -105,7 +105,7 @@ namespace bt
if (mmap_failures >= 3 || !(buf = (Uint8*)fd->map(c,off,c->getSize(),CacheFile::READ))) if (mmap_failures >= 3 || !(buf = (Uint8*)fd->map(c,off,c->getSize(),CacheFile::READ)))
{ {
c->allocate(); c->allocate();
c->settqStatus(Chunk::BUFFERED); c->setStatus(Chunk::BUFFERED);
fd->read(c->getData(),c->getSize(),off); fd->read(c->getData(),c->getSize(),off);
if (mmap_failures < 3) if (mmap_failures < 3)
mmap_failures++; mmap_failures++;
@ -119,18 +119,18 @@ namespace bt
void SingleFileCache::save(Chunk* c) void SingleFileCache::save(Chunk* c)
{ {
// unmap the chunk if it is mapped // unmap the chunk if it is mapped
if (c->gettqStatus() == Chunk::MMAPPED) if (c->getStatus() == Chunk::MMAPPED)
{ {
fd->unmap(c->getData(),c->getSize()); fd->unmap(c->getData(),c->getSize());
c->clear(); 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(); Uint64 off = c->getIndex() * tor.getChunkSize();
fd->write(c->getData(),c->getSize(),off); fd->write(c->getData(),c->getSize(),off);
c->clear(); c->clear();
c->settqStatus(Chunk::ON_DISK); c->setStatus(Chunk::ON_DISK);
} }
} }

2
libktorrent/torrent/statsfile.cpp
Unescape View File

@ -25,7 +25,7 @@
#include <tqstring.h> #include <tqstring.h>
#include <tqfile.h> #include <tqfile.h>
#include <tqtextstream.h> #include <textstream.h>
namespace bt namespace bt
{ {

4
libktorrent/torrent/torrent.cpp
Unescape View File

@ -101,7 +101,7 @@ namespace bt
TQFile fptr(file); TQFile fptr(file);
if (!fptr.open(IO_ReadOnly)) if (!fptr.open(IO_ReadOnly))
throw Error(i18n(" Unable to open torrent file %1 : %2") throw Error(i18n(" Unable to open torrent file %1 : %2")
.tqarg(file).tqarg(fptr.errorString())); .arg(file).arg(fptr.errorString()));
TQByteArray data(fptr.size()); TQByteArray data(fptr.size());
// Out() << "File size = " << fptr.size() << endl; // Out() << "File size = " << fptr.size() << endl;
@ -366,7 +366,7 @@ namespace bt
const SHA1Hash & Torrent::getHash(Uint32 idx) const const SHA1Hash & Torrent::getHash(Uint32 idx) const
{ {
if (idx >= hash_pieces.count()) 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]; return hash_pieces[idx];
} }

44
libktorrent/torrent/torrentcontrol.cpp
Unescape View File

@ -23,7 +23,7 @@
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kfiledialog.h> #include <kfiledialog.h>
#include <tqtextstream.h> #include <textstream.h>
#include <util/log.h> #include <util/log.h>
#include <util/error.h> #include <util/error.h>
#include <util/bitset.h> #include <util/bitset.h>
@ -200,7 +200,7 @@ namespace bt
if (stats.completed && !comp) if (stats.completed && !comp)
{ {
pman->killSeeders(); pman->killSeeders();
TQDateTime now = TQDateTime::tqcurrentDateTime(); TQDateTime now = TQDateTime::currentDateTime();
istats.running_time_dl += istats.time_started_dl.secsTo(now); istats.running_time_dl += istats.time_started_dl.secsTo(now);
updateStatusMsg(); updateStatusMsg();
updateStats(); updateStats();
@ -228,7 +228,7 @@ namespace bt
else else
psman->manualUpdate(); psman->manualUpdate();
istats.last_announce = bt::GetCurrentTime(); istats.last_announce = bt::GetCurrentTime();
istats.time_started_dl = TQDateTime::tqcurrentDateTime(); istats.time_started_dl = TQDateTime::currentDateTime();
} }
updateStatusMsg(); updateStatusMsg();
@ -351,7 +351,7 @@ namespace bt
throw; throw;
} }
istats.time_started_ul = istats.time_started_dl = TQDateTime::tqcurrentDateTime(); istats.time_started_ul = istats.time_started_dl = TQDateTime::currentDateTime();
resetTrackerStats(); resetTrackerStats();
if (prealloc) if (prealloc)
@ -408,7 +408,7 @@ namespace bt
void TorrentControl::stop(bool user,WaitJob* wjob) void TorrentControl::stop(bool user,WaitJob* wjob)
{ {
TQDateTime now = TQDateTime::tqcurrentDateTime(); TQDateTime now = TQDateTime::currentDateTime();
if(!stats.completed) if(!stats.completed)
istats.running_time_dl += istats.time_started_dl.secsTo(now); istats.running_time_dl += istats.time_started_dl.secsTo(now);
istats.running_time_ul += istats.time_started_ul.secsTo(now); istats.running_time_ul += istats.time_started_ul.secsTo(now);
@ -506,7 +506,7 @@ namespace bt
delete tor; delete tor;
tor = 0; tor = 0;
throw Error(i18n("An error occurred while loading the torrent." 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)); initInternal(qman,tmpdir,ddir,default_save_dir,torrent.startsWith(tmpdir));
@ -544,7 +544,7 @@ namespace bt
TQFile fptr(tor_copy); TQFile fptr(tor_copy);
if (!fptr.open(IO_WriteOnly)) if (!fptr.open(IO_WriteOnly))
throw Error(i18n("Unable to create %1 : %2") 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()); fptr.writeBlock(data.data(),data.size());
} }
@ -559,12 +559,12 @@ namespace bt
{ {
qman->mergeAnnounceList(tor->getInfoHash(),tor->getTrackerList()); 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 else
{ {
throw Error(i18n("You are already downloading the torrent %1") throw Error(i18n("You are already downloading the torrent %1")
.tqarg(tor->getNameSuggestion())); .arg(tor->getNameSuggestion()));
} }
} }
} }
@ -670,7 +670,7 @@ namespace bt
throw Error( throw Error(
i18n("Cannot migrate %1 : %2") i18n("Cannot migrate %1 : %2")
.tqarg(tor->getNameSuggestion()).tqarg(err.toString())); .arg(tor->getNameSuggestion()).arg(err.toString()));
} }
} }
setupData(ddir); setupData(ddir);
@ -992,21 +992,21 @@ namespace bt
if (stats.running) if (stats.running)
{ {
TQDateTime now = TQDateTime::tqcurrentDateTime(); TQDateTime now = TQDateTime::currentDateTime();
st.write("RUNNING_TIME_DL",TQString("%1").tqarg(istats.running_time_dl + istats.time_started_dl.secsTo(now))); 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").tqarg(istats.running_time_ul + istats.time_started_ul.secsTo(now))); st.write("RUNNING_TIME_UL",TQString("%1").arg(istats.running_time_ul + istats.time_started_ul.secsTo(now)));
} }
else else
{ {
st.write("RUNNING_TIME_DL", TQString("%1").tqarg(istats.running_time_dl)); st.write("RUNNING_TIME_DL", TQString("%1").arg(istats.running_time_dl));
st.write("RUNNING_TIME_UL", TQString("%1").tqarg(istats.running_time_ul)); st.write("RUNNING_TIME_UL", TQString("%1").arg(istats.running_time_ul));
} }
st.write("PRIORITY", TQString("%1").tqarg(istats.priority)); st.write("PRIORITY", TQString("%1").arg(istats.priority));
st.write("AUTOSTART", TQString("%1").tqarg(stats.autostart)); st.write("AUTOSTART", TQString("%1").arg(stats.autostart));
st.write("IMPORTED", TQString("%1").tqarg(stats.imported_bytes)); st.write("IMPORTED", TQString("%1").arg(stats.imported_bytes));
st.write("CUSTOM_OUTPUT_NAME",istats.custom_output_name ? "1" : "0"); 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("MAX_SEED_TIME",TQString::number(stats.max_seed_time));
st.write("RESTART_DISK_PREALLOCATION",prealloc ? "1" : "0"); st.write("RESTART_DISK_PREALLOCATION",prealloc ? "1" : "0");
@ -1222,7 +1222,7 @@ namespace bt
if (!stats.running || stats.completed) if (!stats.running || stats.completed)
return istats.running_time_dl; return istats.running_time_dl;
else 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 Uint32 TorrentControl::getRunningTimeUL() const
@ -1230,7 +1230,7 @@ namespace bt
if (!stats.running) if (!stats.running)
return istats.running_time_ul; return istats.running_time_ul;
else 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 Uint32 TorrentControl::getNumFiles() const
@ -1274,7 +1274,7 @@ namespace bt
" To make sure this torrent still works with this version of KTorrent, " " 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 " "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.") "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")); outputdir = KFileDialog::getExistingDirectory(TQString(), 0,i18n("Select Folder to Save To"));
if (outputdir.isNull()) if (outputdir.isNull())
outputdir = TQDir::homeDirPath(); outputdir = TQDir::homeDirPath();

10
libktorrent/torrent/torrentcreator.cpp
Unescape View File

@ -120,7 +120,7 @@ namespace bt
{ {
File fptr; File fptr;
if (!fptr.open(url,"wb")) 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); BEncoder enc(&fptr);
enc.beginDict(); // top dict enc.beginDict(); // top dict
@ -147,7 +147,7 @@ namespace bt
enc.write(TQString("comments")); enc.write(TQString("comments"));
enc.write(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("creation date"));enc.write((Uint64)time(0));
enc.write(TQString("info")); enc.write(TQString("info"));
saveInfo(enc); saveInfo(enc);
@ -237,7 +237,7 @@ namespace bt
File fptr; File fptr;
if (!fptr.open(target,"rb")) if (!fptr.open(target,"rb"))
throw Error(i18n("Cannot open file %1: %2") 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; Uint32 s = cur_chunk != num_chunks - 1 ? chunk_size : last_size;
fptr.seek(File::BEGIN,(Int64)cur_chunk*chunk_size); fptr.seek(File::BEGIN,(Int64)cur_chunk*chunk_size);
@ -275,7 +275,7 @@ namespace bt
if (!fptr.open(target + f.getPath(),"rb")) if (!fptr.open(target + f.getPath(),"rb"))
{ {
throw Error(i18n("Cannot open file %1: %2") 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 // first calculate offset into file
@ -336,7 +336,7 @@ namespace bt
// write full index file // write full index file
File fptr; File fptr;
if (!fptr.open(dd + "index","wb")) 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++) for (Uint32 i = 0;i < num_chunks;i++)
{ {

8
libktorrent/torrent/udptracker.cpp
Unescape View File

@ -144,10 +144,10 @@ namespace bt
{ {
Uint32 ip = ReadUint32(buf,i); Uint32 ip = ReadUint32(buf,i);
addPeer(TQString("%1.%2.%3.%4") addPeer(TQString("%1.%2.%3.%4")
.tqarg((ip & (0xFF000000)) >> 24) .arg((ip & (0xFF000000)) >> 24)
.tqarg((ip & (0x00FF0000)) >> 16) .arg((ip & (0x00FF0000)) >> 16)
.tqarg((ip & (0x0000FF00)) >> 8) .arg((ip & (0x0000FF00)) >> 8)
.tqarg(ip & 0x000000FF), .arg(ip & 0x000000FF),
ReadUint16(buf,i+4)); ReadUint16(buf,i+4));
} }

2
libktorrent/torrent/udptrackersocket.cpp
Unescape View File

@ -59,7 +59,7 @@ namespace bt
if (!bound) if (!bound)
{ {
KMessageBox::error(0, 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 else
{ {

2
libktorrent/torrent/value.cpp
Unescape View File

@ -17,7 +17,7 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
#include <tqtextcodec.h> #include <textcodec.h>
#include "value.h" #include "value.h"
namespace bt namespace bt

4
libktorrent/util/autorotatelogjob.cpp
Unescape View File

@ -46,8 +46,8 @@ namespace bt
{ {
while (cnt > 1) while (cnt > 1)
{ {
TQString prev = TQString("%1-%2.gz").tqarg(file).tqarg(cnt - 1); TQString prev = TQString("%1-%2.gz").arg(file).arg(cnt - 1);
TQString curr = TQString("%1-%2.gz").tqarg(file).tqarg(cnt); TQString curr = TQString("%1-%2.gz").arg(file).arg(cnt);
if (bt::Exists(prev)) // if file exists start the move job if (bt::Exists(prev)) // if file exists start the move job
{ {
KIO::Job* sj = KIO::file_move(KURL::fromPathOrURL(prev),KURL::fromPathOrURL(curr),-1,true,false,false); KIO::Job* sj = KIO::file_move(KURL::fromPathOrURL(prev),KURL::fromPathOrURL(curr),-1,true,false,false);

4
libktorrent/util/file.cpp
Unescape View File

@ -84,7 +84,7 @@ namespace bt
if (errno == ENOSPC) if (errno == ENOSPC)
Out() << "Disk full !" << endl; Out() << "Disk full !" << endl;
throw Error(i18n("Cannot write to %1 : %2").tqarg(file).tqarg(strerror(errno))); throw Error(i18n("Cannot write to %1 : %2").arg(file).arg(strerror(errno)));
} }
return ret; return ret;
} }
@ -98,7 +98,7 @@ namespace bt
if (ferror(fptr)) if (ferror(fptr))
{ {
clearerr(fptr); clearerr(fptr);
throw Error(i18n("Cannot read from %1").tqarg(file)); throw Error(i18n("Cannot read from %1").arg(file));
} }
return ret; return ret;
} }

66
libktorrent/util/fileops.cpp
Unescape View File

@ -76,10 +76,10 @@ namespace bt
{ {
if (!nothrow) if (!nothrow)
throw Error(i18n("Cannot create directory %1: %2") throw Error(i18n("Cannot create directory %1: %2")
.tqarg(dir).tqarg(strerror(errno))); .arg(dir).arg(strerror(errno)));
else else
{ {
Out() << TQString("Error : Cannot create directory %1 : %2").tqarg(dir).tqarg(strerror(errno))<< endl; Out() << TQString("Error : Cannot create directory %1 : %2").arg(dir).arg(strerror(errno))<< endl;
} }
} }
} }
@ -90,12 +90,12 @@ namespace bt
{ {
if (!nothrow) if (!nothrow)
throw Error(i18n("Cannot symlink %1 to %2: %3") throw Error(i18n("Cannot symlink %1 to %2: %3")
.tqarg(link_url.utf8().data()).tqarg(link_to.utf8().data()) .arg(link_url.utf8().data()).arg(link_to.utf8().data())
.tqarg(strerror(errno))); .arg(strerror(errno)));
else else
Out() << TQString("Error : Cannot symlink %1 to %2: %3") Out() << TQString("Error : Cannot symlink %1 to %2: %3")
.tqarg(link_url.utf8().data()).tqarg(link_to.utf8().data()) .arg(link_url.utf8().data()).arg(link_to.utf8().data())
.tqarg(strerror(errno)) << endl; .arg(strerror(errno)) << endl;
} }
} }
@ -106,12 +106,12 @@ namespace bt
{ {
if (!nothrow) if (!nothrow)
throw Error(i18n("Cannot move %1 to %2: %3") throw Error(i18n("Cannot move %1 to %2: %3")
.tqarg(src).tqarg(dst) .arg(src).arg(dst)
.tqarg(KIO::NetAccess::lastErrorString())); .arg(KIO::NetAccess::lastErrorString()));
else else
Out() << TQString("Error : Cannot move %1 to %2: %3") Out() << TQString("Error : Cannot move %1 to %2: %3")
.tqarg(src).tqarg(dst) .arg(src).arg(dst)
.tqarg(KIO::NetAccess::lastErrorString()) << endl; .arg(KIO::NetAccess::lastErrorString()) << endl;
} }
} }
@ -122,12 +122,12 @@ namespace bt
{ {
if (!nothrow) if (!nothrow)
throw Error(i18n("Cannot copy %1 to %2: %3") throw Error(i18n("Cannot copy %1 to %2: %3")
.tqarg(src).tqarg(dst) .arg(src).arg(dst)
.tqarg(KIO::NetAccess::lastErrorString())); .arg(KIO::NetAccess::lastErrorString()));
else else
Out() << TQString("Error : Cannot copy %1 to %2: %3") Out() << TQString("Error : Cannot copy %1 to %2: %3")
.tqarg(src).tqarg(dst) .arg(src).arg(dst)
.tqarg(KIO::NetAccess::lastErrorString()) << endl; .arg(KIO::NetAccess::lastErrorString()) << endl;
} }
} }
@ -138,12 +138,12 @@ namespace bt
{ {
if (!nothrow) if (!nothrow)
throw Error(i18n("Cannot copy %1 to %2: %3") throw Error(i18n("Cannot copy %1 to %2: %3")
.tqarg(src).tqarg(dst) .arg(src).arg(dst)
.tqarg(KIO::NetAccess::lastErrorString())); .arg(KIO::NetAccess::lastErrorString()));
else else
Out() << TQString("Error : Cannot copy %1 to %2: %3") Out() << TQString("Error : Cannot copy %1 to %2: %3")
.tqarg(src).tqarg(dst) .arg(src).arg(dst)
.tqarg(KIO::NetAccess::lastErrorString()) << endl; .arg(KIO::NetAccess::lastErrorString()) << endl;
} }
} }
@ -230,8 +230,8 @@ namespace bt
if (!ok) if (!ok)
{ {
TQString err = i18n("Cannot delete %1: %2") TQString err = i18n("Cannot delete %1: %2")
.tqarg(url) .arg(url)
.tqarg(strerror(errno)); .arg(strerror(errno));
if (!nothrow) if (!nothrow)
throw Error(err); throw Error(err);
else else
@ -249,8 +249,8 @@ namespace bt
{ {
if (!nothrow) if (!nothrow)
throw Error(i18n("Cannot create %1: %2") throw Error(i18n("Cannot create %1: %2")
.tqarg(url) .arg(url)
.tqarg(fptr.errorString())); .arg(fptr.errorString()));
else else
Out() << "Error : Cannot create " << url << " : " Out() << "Error : Cannot create " << url << " : "
<< fptr.errorString() << endl; << fptr.errorString() << endl;
@ -270,7 +270,7 @@ namespace bt
#endif #endif
if (ret < 0) if (ret < 0)
throw Error(i18n("Cannot calculate the filesize of %1: %2") throw Error(i18n("Cannot calculate the filesize of %1: %2")
.tqarg(url).tqarg(strerror(errno))); .arg(url).arg(strerror(errno)));
return (Uint64)sb.st_size; return (Uint64)sb.st_size;
} }
@ -286,7 +286,7 @@ namespace bt
ret = fstat(fd,&sb); ret = fstat(fd,&sb);
#endif #endif
if (ret < 0) if (ret < 0)
throw Error(i18n("Cannot calculate the filesize : %2").tqarg(strerror(errno))); throw Error(i18n("Cannot calculate the filesize : %2").arg(strerror(errno)));
return (Uint64)sb.st_size; return (Uint64)sb.st_size;
} }
@ -314,7 +314,7 @@ namespace bt
{ {
int fd = ::open(TQFile::encodeName(path),O_RDWR | O_LARGEFILE); int fd = ::open(TQFile::encodeName(path),O_RDWR | O_LARGEFILE);
if (fd < 0) 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)));
bool ret = FatPreallocate(fd,size); bool ret = FatPreallocate(fd,size);
close(fd); close(fd);
@ -343,7 +343,7 @@ namespace bt
{ {
int fd = ::open(TQFile::encodeName(path), O_RDWR | O_LARGEFILE); int fd = ::open(TQFile::encodeName(path), O_RDWR | O_LARGEFILE);
if (fd < 0) 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)));
bool ret = XfsPreallocate(fd,size); bool ret = XfsPreallocate(fd,size);
close(fd); close(fd);
@ -364,16 +364,16 @@ namespace bt
#else #else
if (ftruncate(fd,size) == -1) if (ftruncate(fd,size) == -1)
#endif #endif
throw Error(i18n("Cannot expand file : %1").tqarg(strerror(errno))); throw Error(i18n("Cannot expand file : %1").arg(strerror(errno)));
} }
else else
{ {
#if HAVE_POSIX_FALLOCATE64 #if HAVE_POSIX_FALLOCATE64
if (posix_fallocate64(fd,0,size) != 0) if (posix_fallocate64(fd,0,size) != 0)
throw Error(i18n("Cannot expand file : %1").tqarg(strerror(errno))); throw Error(i18n("Cannot expand file : %1").arg(strerror(errno)));
#elif HAVE_POSIX_FALLOCATE #elif HAVE_POSIX_FALLOCATE
if (posix_fallocate(fd,0,size) != 0) if (posix_fallocate(fd,0,size) != 0)
throw Error(i18n("Cannot expand file : %1").tqarg(strerror(errno))); throw Error(i18n("Cannot expand file : %1").arg(strerror(errno)));
#else #else
SeekFile(fd,0,SEEK_SET); SeekFile(fd,0,SEEK_SET);
bt::Array<Uint8> buf(4096); bt::Array<Uint8> buf(4096);
@ -388,9 +388,9 @@ namespace bt
int ret = write(fd,buf,to_write); int ret = write(fd,buf,to_write);
if (ret < 0) if (ret < 0)
throw Error(i18n("Cannot expand file : %1").tqarg(strerror(errno))); throw Error(i18n("Cannot expand file : %1").arg(strerror(errno)));
else if (ret == 0 || ret != (int)to_write) else if (ret == 0 || ret != (int)to_write)
throw Error(i18n("Cannot expand file").tqarg(strerror(errno))); throw Error(i18n("Cannot expand file").arg(strerror(errno)));
else else
written += to_write; written += to_write;
} }
@ -402,7 +402,7 @@ namespace bt
{ {
int fd = ::open(TQFile::encodeName(path),O_RDWR | O_LARGEFILE); int fd = ::open(TQFile::encodeName(path),O_RDWR | O_LARGEFILE);
if (fd < 0) 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)));
try try
{ {
@ -423,7 +423,7 @@ namespace bt
#else #else
if (lseek(fd,off,whence) == -1) if (lseek(fd,off,whence) == -1)
#endif #endif
throw Error(i18n("Cannot seek in file : %1").tqarg(strerror(errno))); throw Error(i18n("Cannot seek in file : %1").arg(strerror(errno)));
} }
bool FreeDiskSpace(const TQString & path,Uint64 & bytes_free) bool FreeDiskSpace(const TQString & path,Uint64 & bytes_free)

10
libktorrent/util/log.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <kprocess.h> #include <kprocess.h>
#include <klocale.h> #include <klocale.h>
#include <tqdatetime.h> #include <tqdatetime.h>
#include <tqtextstream.h> #include <textstream.h>
#include <tqfile.h> #include <tqfile.h>
#include <tqptrlist.h> #include <tqptrlist.h>
#include <iostream> #include <iostream>
@ -79,8 +79,8 @@ namespace bt
// move all log files one up // move all log files one up
for (Uint32 i = 10;i > 1;i--) for (Uint32 i = 10;i > 1;i--)
{ {
TQString prev = TQString("%1-%2.gz").tqarg(file).tqarg(i - 1); TQString prev = TQString("%1-%2.gz").arg(file).arg(i - 1);
TQString curr = TQString("%1-%2.gz").tqarg(file).tqarg(i); TQString curr = TQString("%1-%2.gz").arg(file).arg(i);
if (bt::Exists(prev)) if (bt::Exists(prev))
bt::Move(prev,curr,true); bt::Move(prev,curr,true);
} }
@ -100,7 +100,7 @@ namespace bt
fptr.setName(file); fptr.setName(file);
if (!fptr.open(IO_WriteOnly)) if (!fptr.open(IO_WriteOnly))
throw Error(i18n("Cannot open log file %1 : %2").tqarg(file).tqarg(fptr.errorString())); throw Error(i18n("Cannot open log file %1 : %2").arg(file).arg(fptr.errorString()));
out->setDevice(TQT_TQIODEVICE(&fptr)); out->setDevice(TQT_TQIODEVICE(&fptr));
} }
@ -116,7 +116,7 @@ namespace bt
// this could result in the loss of some messages // this could result in the loss of some messages
if (!rotate_job) if (!rotate_job)
{ {
*out << TQDateTime::tqcurrentDateTime().toString() << ": " << tmp << ::endl; *out << TQDateTime::currentDateTime().toString() << ": " << tmp << ::endl;
fptr.flush(); fptr.flush();
if (to_cout) if (to_cout)
std::cout << TQString(tmp.local8Bit()) << std::endl; std::cout << TQString(tmp.local8Bit()) << std::endl;

14
libktorrent/util/profiler.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/ ***************************************************************************/
#ifdef KT_PROFILE #ifdef KT_PROFILE
#include <tqfile.h> #include <tqfile.h>
#include <tqtextstream.h> #include <textstream.h>
#include <sys/time.h> #include <sys/time.h>
#include "profiler.h" #include "profiler.h"
@ -30,7 +30,7 @@ namespace bt
min = max = avg = 0.0; min = max = avg = 0.0;
count = 0; count = 0;
start_time = 0.0; start_time = 0.0;
tqchildren.setAutoDelete(true); children.setAutoDelete(true);
} }
Profile::~Profile() Profile::~Profile()
@ -63,8 +63,8 @@ namespace bt
Profile* Profile::child(const TQString & name) Profile* Profile::child(const TQString & name)
{ {
TQPtrList<Profile>::iterator i = tqchildren.begin(); TQPtrList<Profile>::iterator i = children.begin();
while (i != tqchildren.end()) while (i != children.end())
{ {
Profile* p = *i; Profile* p = *i;
if (p->name == name) if (p->name == name)
@ -73,7 +73,7 @@ namespace bt
} }
Profile* p = new Profile(this,name); Profile* p = new Profile(this,name);
tqchildren.append(p); children.append(p);
return p; return p;
} }
@ -84,8 +84,8 @@ namespace bt
out.precision(5); out.precision(5);
out << qSetW(60) << nb << qSetW(10) << min << qSetW(10) << max << qSetW(10) << avg << qSetW(10) << count << endl; out << qSetW(60) << nb << qSetW(10) << min << qSetW(10) << max << qSetW(10) << avg << qSetW(10) << count << endl;
TQPtrList<Profile>::iterator i = tqchildren.begin(); TQPtrList<Profile>::iterator i = children.begin();
while (i != tqchildren.end()) while (i != children.end())
{ {
Profile* p = *i; Profile* p = *i;
p->save(out,nb); p->save(out,nb);

2
libktorrent/util/profiler.h
Unescape View File

@ -35,7 +35,7 @@ namespace bt
class Profile class Profile
{ {
Profile* parent; Profile* parent;
TQPtrList<Profile> tqchildren; TQPtrList<Profile> children;
TQString name; TQString name;
double min,max,avg; double min,max,avg;

26
plugins/infowidget/chunkbar.cpp
Unescape View File

@ -20,7 +20,7 @@
***************************************************************************/ ***************************************************************************/
#include <tqpainter.h> #include <tqpainter.h>
#include <tqpen.h> #include <tqpen.h>
#include <tqbrush.h> #include <brush.h>
#include <tqvaluelist.h> #include <tqvaluelist.h>
#include <tqpixmap.h> #include <tqpixmap.h>
#include <math.h> #include <math.h>
@ -71,15 +71,15 @@ namespace kt
TQMimeSourceFactory* factory = TQMimeSourceFactory::defaultFactory(); TQMimeSourceFactory* factory = TQMimeSourceFactory::defaultFactory();
TQImage excluded(16, 16, 32); TQImage excluded(16, 16, 32);
FillAndFrameBlack(&excluded, TQColor(bar->tqcolorGroup().color(TQColorGroup::Mid)).pixel(), 16); FillAndFrameBlack(&excluded, TQColor(bar->colorGroup().color(TQColorGroup::Mid)).pixel(), 16);
factory->setImage("excluded_color", excluded); factory->setImage("excluded_color", excluded);
TQImage available(16, 16, 32); TQImage available(16, 16, 32);
FillAndFrameBlack(&available, bar->tqcolorGroup().highlight().pixel(), 16); FillAndFrameBlack(&available, bar->colorGroup().highlight().pixel(), 16);
factory->setImage("available_color", available); factory->setImage("available_color", available);
TQImage unavailable(16, 16, 32); TQImage unavailable(16, 16, 32);
FillAndFrameBlack(&unavailable, bar->tqcolorGroup().base().pixel(), 16); FillAndFrameBlack(&unavailable, bar->colorGroup().base().pixel(), 16);
factory->setImage("unavailable_color", unavailable); factory->setImage("unavailable_color", unavailable);
} }
@ -121,7 +121,7 @@ namespace kt
// PROFILE("ChunkBar::updateBar"); // PROFILE("ChunkBar::updateBar");
// Out() << "Pixmap : " << s.width() << " " << s.height() << endl; // Out() << "Pixmap : " << s.width() << " " << s.height() << endl;
pixmap.resize(s); pixmap.resize(s);
pixmap.fill(tqcolorGroup().color(TQColorGroup::Base)); pixmap.fill(colorGroup().color(TQColorGroup::Base));
TQPainter painter(&pixmap); TQPainter painter(&pixmap);
drawBarContents(&painter); drawBarContents(&painter);
update(); update();
@ -132,9 +132,9 @@ namespace kt
{ {
// first draw background // first draw background
if (isEnabled()) if (isEnabled())
p->setBrush(tqcolorGroup().base()); p->setBrush(colorGroup().base());
else else
p->setBrush(tqcolorGroup().background()); p->setBrush(colorGroup().background());
p->setPen(TQt::NoPen); p->setPen(TQt::NoPen);
p->drawRect(contentsRect()); p->drawRect(contentsRect());
@ -148,7 +148,7 @@ namespace kt
TQSize s = contentsRect().size(); TQSize s = contentsRect().size();
//Out() << "Pixmap : " << s.width() << " " << s.height() << endl; //Out() << "Pixmap : " << s.width() << " " << s.height() << endl;
pixmap.resize(s); pixmap.resize(s);
pixmap.fill(tqcolorGroup().color(TQColorGroup::Base)); pixmap.fill(colorGroup().color(TQColorGroup::Base));
TQPainter painter(&pixmap); TQPainter painter(&pixmap);
drawBarContents(&painter); drawBarContents(&painter);
update(); update();
@ -164,15 +164,15 @@ namespace kt
const BitSet & bs = getBitSet(); const BitSet & bs = getBitSet();
curr = bs; curr = bs;
if (bs.allOn()) if (bs.allOn())
drawAllOn(p,tqcolorGroup().highlight()); drawAllOn(p,colorGroup().highlight());
else if (s.total_chunks > w) else if (s.total_chunks > w)
drawMoreChunksThenPixels(p,bs,tqcolorGroup().highlight()); drawMoreChunksThenPixels(p,bs,colorGroup().highlight());
else else
drawEqual(p,bs,tqcolorGroup().highlight()); drawEqual(p,bs,colorGroup().highlight());
if (show_excluded && s.num_chunks_excluded > 0) if (show_excluded && s.num_chunks_excluded > 0)
{ {
TQColor c = tqcolorGroup().color(TQColorGroup::Mid); TQColor c = colorGroup().color(TQColorGroup::Mid);
if (curr_ebs.allOn()) if (curr_ebs.allOn())
drawAllOn(p,c); drawAllOn(p,c);
else if (s.total_chunks > w) else if (s.total_chunks > w)
@ -186,7 +186,7 @@ namespace kt
void ChunkBar::drawEqual(TQPainter *p,const BitSet & bs,const TQColor & color) void ChunkBar::drawEqual(TQPainter *p,const BitSet & bs,const TQColor & color)
{ {
//p->setPen(TQPen(tqcolorGroup().highlight(),1,TQt::SolidLine)); //p->setPen(TQPen(colorGroup().highlight(),1,TQt::SolidLine));
TQColor c = color; TQColor c = color;
Uint32 w = contentsRect().width(); Uint32 w = contentsRect().width();

2
plugins/infowidget/chunkdownloadview.cpp
Unescape View File

@ -43,7 +43,7 @@ namespace kt
cd->getStats(s); cd->getStats(s);
setText(0,TQString::number(s.chunk_index)); setText(0,TQString::number(s.chunk_index));
setText(1,TQString("%1 / %2").tqarg(s.pieces_downloaded).tqarg(s.total_pieces)); setText(1,TQString("%1 / %2").arg(s.pieces_downloaded).arg(s.total_pieces));
setText(2,s.current_peer_id); setText(2,s.current_peer_id);
setText(3,KBytesPerSecToString(s.download_speed / 1024.0)); setText(3,KBytesPerSecToString(s.download_speed / 1024.0));
setText(4,TQString::number(s.num_downloaders)); setText(4,TQString::number(s.num_downloaders));

40
plugins/infowidget/chunkdownloadviewbase.ui
Unescape View File

@ -21,7 +21,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout8</cstring> <cstring>layout8</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -29,7 +29,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout11</cstring> <cstring>layout11</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -47,7 +47,7 @@
<property name="name"> <property name="name">
<cstring>m_total_chunks</cstring> <cstring>m_total_chunks</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>50</width> <width>50</width>
<height>0</height> <height>0</height>
@ -59,7 +59,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -67,7 +67,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout14</cstring> <cstring>layout14</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -85,7 +85,7 @@
<property name="name"> <property name="name">
<cstring>m_chunks_downloading</cstring> <cstring>m_chunks_downloading</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>50</width> <width>50</width>
<height>0</height> <height>0</height>
@ -97,7 +97,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -105,7 +105,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout13</cstring> <cstring>layout13</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -123,7 +123,7 @@
<property name="name"> <property name="name">
<cstring>m_chunks_downloaded</cstring> <cstring>m_chunks_downloaded</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>50</width> <width>50</width>
<height>0</height> <height>0</height>
@ -135,7 +135,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -143,7 +143,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout38</cstring> <cstring>layout38</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -161,7 +161,7 @@
<property name="name"> <property name="name">
<cstring>m_excluded_chunks</cstring> <cstring>m_excluded_chunks</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>50</width> <width>50</width>
<height>0</height> <height>0</height>
@ -173,7 +173,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -181,7 +181,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout38_2</cstring> <cstring>layout38_2</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -199,7 +199,7 @@
<property name="name"> <property name="name">
<cstring>m_chunks_left</cstring> <cstring>m_chunks_left</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>50</width> <width>50</width>
<height>0</height> <height>0</height>
@ -211,7 +211,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -219,7 +219,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout24</cstring> <cstring>layout24</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -237,7 +237,7 @@
<property name="name"> <property name="name">
<cstring>m_size_chunks</cstring> <cstring>m_size_chunks</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>80</width> <width>80</width>
<height>0</height> <height>0</height>
@ -249,7 +249,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -265,7 +265,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>

2
plugins/infowidget/fileview.cpp
Unescape View File

@ -186,7 +186,7 @@ namespace kt
else if (percent > 100.0) else if (percent > 100.0)
percent = 100.0; percent = 100.0;
KLocale* loc = KGlobal::locale(); KLocale* loc = KGlobal::locale();
it.current()->setText(4,i18n("%1 %").tqarg(loc->formatNumber(percent,2))); it.current()->setText(4,i18n("%1 %").arg(loc->formatNumber(percent,2)));
} }
} }

4
plugins/infowidget/flagdb.cpp
Unescape View File

@ -40,9 +40,9 @@ kt::FlagDBSource::FlagDBSource()
TQString kt::FlagDBSource::FlagDBSource::getPath(const TQString& country) const TQString kt::FlagDBSource::FlagDBSource::getPath(const TQString& country) const
{ {
if (type) { if (type) {
return locate(type, pathPattern.tqarg(country)); return locate(type, pathPattern.arg(country));
} else { } else {
return pathPattern.tqarg(country); return pathPattern.arg(country);
} }
} }

2
plugins/infowidget/floatspinbox.cpp
Unescape View File

@ -43,7 +43,7 @@ kt::FloatSpinBox::FloatSpinBox(
setStep( 0.25f ); setStep( 0.25f );
connect(this, TQT_SIGNAL(valueChanged ( int )), this, TQT_SLOT(internalValueChanged( int ))); connect(this, TQT_SIGNAL(valueChanged ( int )), this, TQT_SLOT(internalValueChanged( int )));
setValidator( new LocaleFloatValidator( TQT_TQOBJECT(dynamic_cast<TQSpinBox * > (this)) )); setValidator( new LocaleFloatValidator( TQT_TQOBJECT(dynamic_cast<TQSpinBox * > (this)) ));
editor()->tqsetAlignment(TQt::AlignRight); editor()->setAlignment(TQt::AlignRight);
} }
kt::FloatSpinBox::FloatSpinBox( kt::FloatSpinBox::FloatSpinBox(

20
plugins/infowidget/iwfiletreediritem.cpp
Unescape View File

@ -51,8 +51,8 @@ namespace kt
void IWFileTreeDirItem::updatePercentageInformation() void IWFileTreeDirItem::updatePercentageInformation()
{ {
// first set all the child items // first set all the child items
bt::PtrMap<TQString,FileTreeItem>::iterator i = tqchildren.begin(); bt::PtrMap<TQString,FileTreeItem>::iterator i = children.begin();
while (i != tqchildren.end()) while (i != children.end())
{ {
IWFileTreeItem* item = (IWFileTreeItem*)i->second; IWFileTreeItem* item = (IWFileTreeItem*)i->second;
item->updatePercentageInformation(); item->updatePercentageInformation();
@ -71,8 +71,8 @@ namespace kt
void IWFileTreeDirItem::updatePreviewInformation(kt::TorrentInterface* tc) void IWFileTreeDirItem::updatePreviewInformation(kt::TorrentInterface* tc)
{ {
// first set all the child items // first set all the child items
bt::PtrMap<TQString,FileTreeItem>::iterator i = tqchildren.begin(); bt::PtrMap<TQString,FileTreeItem>::iterator i = children.begin();
while (i != tqchildren.end()) while (i != children.end())
{ {
IWFileTreeItem* item = (IWFileTreeItem*)i->second; IWFileTreeItem* item = (IWFileTreeItem*)i->second;
item->updatePreviewInformation(tc); item->updatePreviewInformation(tc);
@ -91,11 +91,11 @@ namespace kt
Priority IWFileTreeDirItem::updatePriorityInformation(kt::TorrentInterface* tc) Priority IWFileTreeDirItem::updatePriorityInformation(kt::TorrentInterface* tc)
{ {
// first set all the child items // first set all the child items
bt::PtrMap<TQString,FileTreeItem>::iterator i = tqchildren.begin(); bt::PtrMap<TQString,FileTreeItem>::iterator i = children.begin();
bool setpriority = false; bool setpriority = false;
bool oneexcluded = false; bool oneexcluded = false;
Priority priority = PREVIEW_PRIORITY; Priority priority = PREVIEW_PRIORITY;
if(i != tqchildren.end()) if(i != children.end())
{ {
IWFileTreeItem* item = (IWFileTreeItem*)i->second; IWFileTreeItem* item = (IWFileTreeItem*)i->second;
item->updatePriorityInformation(tc); item->updatePriorityInformation(tc);
@ -105,7 +105,7 @@ namespace kt
oneexcluded = true; oneexcluded = true;
setpriority = true; setpriority = true;
} }
while (i != tqchildren.end()) while (i != children.end())
{ {
IWFileTreeItem* item = (IWFileTreeItem*)i->second; IWFileTreeItem* item = (IWFileTreeItem*)i->second;
item->updatePriorityInformation(tc); item->updatePriorityInformation(tc);
@ -118,7 +118,7 @@ namespace kt
// then recursivly move on to subdirs // then recursivly move on to subdirs
bt::PtrMap<TQString,FileTreeDirItem>::iterator j = subdirs.begin(); bt::PtrMap<TQString,FileTreeDirItem>::iterator j = subdirs.begin();
if(j != subdirs.end() && tqchildren.begin() == tqchildren.end()) if(j != subdirs.end() && children.begin() == children.end())
{ {
Priority priority = Priority priority =
((IWFileTreeDirItem*)j->second)->updatePriorityInformation(tc); ((IWFileTreeDirItem*)j->second)->updatePriorityInformation(tc);
@ -189,8 +189,8 @@ namespace kt
void IWFileTreeDirItem::updateDNDInformation() void IWFileTreeDirItem::updateDNDInformation()
{ {
// first set all the child items // first set all the child items
bt::PtrMap<TQString,FileTreeItem>::iterator i = tqchildren.begin(); bt::PtrMap<TQString,FileTreeItem>::iterator i = children.begin();
while (i != tqchildren.end()) while (i != children.end())
{ {
IWFileTreeItem* item = (IWFileTreeItem*)i->second; IWFileTreeItem* item = (IWFileTreeItem*)i->second;
item->updateDNDInformation(); item->updateDNDInformation();

2
plugins/infowidget/iwfiletreeitem.cpp
Unescape View File

@ -92,7 +92,7 @@ namespace kt
else if (percent > 100.0) else if (percent > 100.0)
percent = 100.0; percent = 100.0;
KLocale* loc = KGlobal::locale(); KLocale* loc = KGlobal::locale();
setText(4,i18n("%1 %").tqarg(loc->formatNumber(percent,2))); setText(4,i18n("%1 %").arg(loc->formatNumber(percent,2)));
perc_complete = percent; perc_complete = percent;
} }

2
plugins/infowidget/iwpref.ui
Unescape View File

@ -45,7 +45,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>21</height> <height>21</height>

4
plugins/infowidget/peerview.cpp
Unescape View File

@ -170,11 +170,11 @@ namespace kt
setText(5,s.choked ? i18n("Yes") : i18n("No")); setText(5,s.choked ? i18n("Yes") : i18n("No"));
//setPixmap(6,!s.snubbed ? yes_pix : no_pix); //setPixmap(6,!s.snubbed ? yes_pix : no_pix);
setText(6,s.snubbed ? i18n("Yes") : i18n("No")); setText(6,s.snubbed ? i18n("Yes") : i18n("No"));
setText(7,TQString("%1 %").tqarg(loc->formatNumber(s.perc_of_file,2))); setText(7,TQString("%1 %").arg(loc->formatNumber(s.perc_of_file,2)));
setPixmap(8,s.dht_support ? yes_pix : no_pix); setPixmap(8,s.dht_support ? yes_pix : no_pix);
setText(9,loc->formatNumber(s.aca_score,2)); setText(9,loc->formatNumber(s.aca_score,2));
setPixmap(10,s.has_upload_slot ? yes_pix : TQPixmap()); setPixmap(10,s.has_upload_slot ? yes_pix : TQPixmap());
setText(11,TQString("%1 / %2").tqarg(s.num_down_requests).tqarg(s.num_up_requests)); setText(11,TQString("%1 / %2").arg(s.num_down_requests).arg(s.num_up_requests));
setText(12, BytesToString(s.bytes_downloaded)); setText(12, BytesToString(s.bytes_downloaded));
setText(13, BytesToString(s.bytes_uploaded)); setText(13, BytesToString(s.bytes_uploaded));
} }

8
plugins/infowidget/statustab.cpp
Unescape View File

@ -37,7 +37,7 @@ namespace kt
StatusTab::StatusTab(TQWidget* parent, const char* name, WFlags fl) StatusTab::StatusTab(TQWidget* parent, const char* name, WFlags fl)
: StatusTabBase(parent,name,fl),curr_tc(0) : StatusTabBase(parent,name,fl),curr_tc(0)
{ {
TQColorGroup cg = tqcolorGroup(); TQColorGroup cg = colorGroup();
// do not use hardcoded colors // do not use hardcoded colors
m_info_caption->setPaletteBackgroundColor(cg.mid()); m_info_caption->setPaletteBackgroundColor(cg.mid());
m_chunks_caption->setPaletteBackgroundColor(cg.mid()); m_chunks_caption->setPaletteBackgroundColor(cg.mid());
@ -142,16 +142,16 @@ namespace kt
m_tracker_status->setText(s.trackerstatus); m_tracker_status->setText(s.trackerstatus);
m_seeders->setText(TQString("%1 (%2)") m_seeders->setText(TQString("%1 (%2)")
.tqarg(s.seeders_connected_to).tqarg(s.seeders_total)); .arg(s.seeders_connected_to).arg(s.seeders_total));
m_leechers->setText(TQString("%1 (%2)") m_leechers->setText(TQString("%1 (%2)")
.tqarg(s.leechers_connected_to).tqarg(s.leechers_total)); .arg(s.leechers_connected_to).arg(s.leechers_total));
float ratio = kt::ShareRatio(s); float ratio = kt::ShareRatio(s);
if(!maxRatio->hasFocus() && useLimit->isChecked()) if(!maxRatio->hasFocus() && useLimit->isChecked())
maxRatioUpdate(); maxRatioUpdate();
m_share_ratio->setText(TQString("<font color=\"%1\">%2</font>").tqarg(ratio <= 0.8 ? "#ff0000" : "#1c9a1c").tqarg(KGlobal::locale()->formatNumber(ratio,2))); m_share_ratio->setText(TQString("<font color=\"%1\">%2</font>").arg(ratio <= 0.8 ? "#ff0000" : "#1c9a1c").arg(KGlobal::locale()->formatNumber(ratio,2)));
Uint32 secs = curr_tc->getRunningTimeUL(); Uint32 secs = curr_tc->getRunningTimeUL();
if (secs == 0) if (secs == 0)

62
plugins/infowidget/statustabbase.ui
Unescape View File

@ -41,7 +41,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout16</cstring> <cstring>layout16</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -49,7 +49,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout15</cstring> <cstring>layout15</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -75,7 +75,7 @@
<property name="name"> <property name="name">
<cstring>m_seeders</cstring> <cstring>m_seeders</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -87,7 +87,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -95,7 +95,7 @@
<property name="name"> <property name="name">
<cstring>m_leechers</cstring> <cstring>m_leechers</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -107,7 +107,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -115,7 +115,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout14</cstring> <cstring>layout14</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -133,7 +133,7 @@
<property name="name"> <property name="name">
<cstring>m_avg_down</cstring> <cstring>m_avg_down</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -145,7 +145,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -153,7 +153,7 @@
<property name="name"> <property name="name">
<cstring>m_avg_up</cstring> <cstring>m_avg_up</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -165,7 +165,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -181,7 +181,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout12</cstring> <cstring>layout12</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -207,7 +207,7 @@
<property name="name"> <property name="name">
<cstring>m_tracker_status</cstring> <cstring>m_tracker_status</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -219,7 +219,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -227,7 +227,7 @@
<property name="name"> <property name="name">
<cstring>m_tracker_update_time</cstring> <cstring>m_tracker_update_time</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -239,7 +239,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -255,7 +255,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>207</width> <width>207</width>
<height>20</height> <height>20</height>
@ -266,7 +266,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout17</cstring> <cstring>layout17</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -274,7 +274,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout23</cstring> <cstring>layout23</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -282,7 +282,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout25</cstring> <cstring>layout25</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -344,7 +344,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -379,7 +379,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -398,7 +398,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -431,7 +431,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout16</cstring> <cstring>layout16</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -459,7 +459,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout15</cstring> <cstring>layout15</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -477,7 +477,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@ -497,7 +497,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="2" column="1"> <widget class="TQLayoutWidget" row="2" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout11</cstring> <cstring>layout11</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -515,7 +515,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@ -561,7 +561,7 @@
<property name="name"> <property name="name">
<cstring>m_share_ratio</cstring> <cstring>m_share_ratio</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>50</width> <width>50</width>
<height>0</height> <height>0</height>
@ -573,7 +573,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -589,7 +589,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>MinimumExpanding</enum> <enum>MinimumExpanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

4
plugins/infowidget/trackerview.cpp
Unescape View File

@ -167,7 +167,7 @@ namespace kt
// only enable change when we can actually change and the torrent is running // only enable change when we can actually change and the torrent is running
btnChange->setEnabled(s.running && listTrackers->childCount() > 1); btnChange->setEnabled(s.running && listTrackers->childCount() > 1);
lbltqStatus->setText("<b>" + s.trackerstatus + "</b>"); lblStatus->setText("<b>" + s.trackerstatus + "</b>");
if (tc->getTrackersList()) if (tc->getTrackersList())
{ {
TQString t = tc->getTrackersList()->getTrackerURL().prettyURL(); TQString t = tc->getTrackersList()->getTrackerURL().prettyURL();
@ -191,7 +191,7 @@ namespace kt
listTrackers->clear(); listTrackers->clear();
if(!tc) if(!tc)
{ {
lbltqStatus->clear(); lblStatus->clear();
lblCurrent->clear(); lblCurrent->clear();
lblUpdate->clear(); lblUpdate->clear();
txtTracker->clear(); txtTracker->clear();

12
plugins/infowidget/trackerviewbase.ui
Unescape View File

@ -50,7 +50,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="2" column="1"> <widget class="TQLayoutWidget" row="2" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout8</cstring> <cstring>layout8</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -85,7 +85,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>68</height> <height>68</height>
@ -129,7 +129,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout6</cstring> <cstring>layout6</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -180,7 +180,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -205,7 +205,7 @@
</widget> </widget>
<widget class="TQLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>lbltqStatus</cstring> <cstring>lblStatus</cstring>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy>
@ -229,7 +229,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>

8
plugins/ipfilter/antip2p.cpp
Unescape View File

@ -67,19 +67,19 @@ namespace kt
tmp = ip; tmp = ip;
tmp &= 0x000000FF; tmp &= 0x000000FF;
out.prepend(TQString("%1").tqarg(tmp)); out.prepend(TQString("%1").arg(tmp));
ip >>= 8; ip >>= 8;
tmp = ip; tmp = ip;
tmp &= 0x000000FF; tmp &= 0x000000FF;
out.prepend(TQString("%1.").tqarg(tmp)); out.prepend(TQString("%1.").arg(tmp));
ip >>= 8; ip >>= 8;
tmp = ip; tmp = ip;
tmp &= 0x000000FF; tmp &= 0x000000FF;
out.prepend(TQString("%1.").tqarg(tmp)); out.prepend(TQString("%1.").arg(tmp));
ip >>= 8; ip >>= 8;
tmp = ip; tmp = ip;
tmp &= 0x000000FF; tmp &= 0x000000FF;
out.prepend(TQString("%1.").tqarg(tmp)); out.prepend(TQString("%1.").arg(tmp));
return out; return out;
} }

6
plugins/ipfilter/convert_dlg.ui
Unescape View File

@ -46,7 +46,7 @@
<property name="scaledContents"> <property name="scaledContents">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
<property name="indent"> <property name="indent">
@ -73,7 +73,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>390</width> <width>390</width>
<height>0</height> <height>0</height>
@ -82,7 +82,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="3" column="0"> <widget class="TQLayoutWidget" row="3" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout6</cstring> <cstring>layout6</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

2
plugins/ipfilter/convertdialog.cpp
Unescape View File

@ -36,7 +36,7 @@
#include <tqfile.h> #include <tqfile.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include <tqtextstream.h> #include <textstream.h>
#include <tqregexp.h> #include <tqregexp.h>
#include <tqvalidator.h> #include <tqvalidator.h>
#include <tqlabel.h> #include <tqlabel.h>

10
plugins/ipfilter/ipblockingpref.ui
Unescape View File

@ -29,7 +29,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -63,7 +63,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="1" column="0"> <widget class="TQLayoutWidget" row="1" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout5</cstring> <cstring>layout5</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -92,7 +92,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="2" column="0"> <widget class="TQLayoutWidget" row="2" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout3</cstring> <cstring>layout3</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -108,7 +108,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>361</width> <width>361</width>
<height>20</height> <height>20</height>
@ -152,7 +152,7 @@ NOTE: ZIP file from bluetack.co.uk is supported.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

2
plugins/ipfilter/ipblockingprefpage.cpp
Unescape View File

@ -45,7 +45,7 @@
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqregexp.h> #include <tqregexp.h>
#include <tqvalidator.h> #include <tqvalidator.h>
#include <tqlayout.h> #include <layout.h>
#include <tqdialog.h> #include <tqdialog.h>
#include <tqobject.h> #include <tqobject.h>

2
plugins/logviewer/logprefwidgetbase.ui
Unescape View File

@ -29,7 +29,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>110</height> <height>110</height>

2
plugins/logviewer/logviewer.cpp
Unescape View File

@ -50,7 +50,7 @@ namespace kt
setTextFormat(TQt::LogText); setTextFormat(TQt::LogText);
setMaxLogLines(200); setMaxLogLines(200);
setMinimumSize(TQSize(0,50)); setMinimumSize(TQSize(0,50));
tqsetSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding); setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding);
KGlobal::config()->setGroup("LogViewer"); KGlobal::config()->setGroup("LogViewer");
if (KGlobal::config()->hasKey("LogViewerWidgetSize")) if (KGlobal::config()->hasKey("LogViewerWidgetSize"))
{ {

12
plugins/partfileimport/importdialog.cpp
Unescape View File

@ -97,7 +97,7 @@ namespace kt
catch (Error & e) catch (Error & e)
{ {
delete dc; delete dc;
KMessageBox::error(this,i18n("Cannot verify data : %1").tqarg(e.toString()),i18n("Error")); KMessageBox::error(this,i18n("Cannot verify data : %1").arg(e.toString()),i18n("Error"));
reject(); reject();
return; return;
} }
@ -204,7 +204,7 @@ namespace kt
} }
catch (Error & e) catch (Error & e)
{ {
KMessageBox::error(this,i18n("Cannot load the torrent file : %1").tqarg(e.toString()), KMessageBox::error(this,i18n("Cannot load the torrent file : %1").arg(e.toString()),
i18n("Error")); i18n("Error"));
reject(); reject();
return; return;
@ -240,7 +240,7 @@ namespace kt
} }
catch (Error & e) catch (Error & e)
{ {
KMessageBox::error(this,i18n("Cannot load the torrent file : %1").tqarg(e.toString()), KMessageBox::error(this,i18n("Cannot load the torrent file : %1").arg(e.toString()),
i18n("Error")); i18n("Error"));
reject(); reject();
return; return;
@ -254,7 +254,7 @@ namespace kt
// first try to open it // first try to open it
File fptr; File fptr;
if (!fptr.open(file,"wb")) if (!fptr.open(file,"wb"))
throw Error(i18n("Cannot open %1 : %2").tqarg(file).tqarg(fptr.errorString())); throw Error(i18n("Cannot open %1 : %2").arg(file).arg(fptr.errorString()));
// write all chunks to the file // write all chunks to the file
for (Uint32 i = 0;i < chunks.getNumBits();i++) for (Uint32 i = 0;i < chunks.getNumBits();i++)
@ -332,8 +332,8 @@ namespace kt
out << "PRIORITY=0" << ::endl; out << "PRIORITY=0" << ::endl;
out << "AUTOSTART=1" << ::endl; out << "AUTOSTART=1" << ::endl;
if (core->getGlobalMaxShareRatio() > 0) if (core->getGlobalMaxShareRatio() > 0)
out << TQString("MAX_RATIO=%1").tqarg(core->getGlobalMaxShareRatio(),0,'f',2) << ::endl; out << TQString("MAX_RATIO=%1").arg(core->getGlobalMaxShareRatio(),0,'f',2) << ::endl;
out << TQString("IMPORTED=%1").tqarg(imported) << ::endl; out << TQString("IMPORTED=%1").arg(imported) << ::endl;
if (custom_output_name) if (custom_output_name)
out << "CUSTOM_OUTPUT_NAME=1" << endl; out << "CUSTOM_OUTPUT_NAME=1" << endl;
} }

14
plugins/partfileimport/importdlgbase.ui
Unescape View File

@ -21,7 +21,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout6</cstring> <cstring>layout6</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -29,7 +29,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout5</cstring> <cstring>layout5</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -39,7 +39,7 @@
<property name="name"> <property name="name">
<cstring>textLabel1</cstring> <cstring>textLabel1</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>60</width> <width>60</width>
<height>0</height> <height>0</height>
@ -53,7 +53,7 @@
<property name="name"> <property name="name">
<cstring>textLabel2</cstring> <cstring>textLabel2</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>60</width> <width>60</width>
<height>0</height> <height>0</height>
@ -67,7 +67,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout4</cstring> <cstring>layout4</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -102,7 +102,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout3</cstring> <cstring>layout3</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -118,7 +118,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>61</width> <width>61</width>
<height>20</height> <height>20</height>

42
plugins/rssfeed/rss/article.cpp
Unescape View File

@ -54,7 +54,7 @@ Article::Article(const TQDomNode &node, Format format) : d(new Private)
d->numComments=0; d->numComments=0;
if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull()) if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull())
d->title = elemText; d->title = elemText;
@ -62,14 +62,14 @@ Article::Article(const TQDomNode &node, Format format) : d(new Private)
bool foundTorrentEnclosure = false; bool foundTorrentEnclosure = false;
for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) { for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {
const TQDomElement e = n.toElement(); const TQDomElement e = n.toElement();
if ( (e.tagName()==TQString::tqfromLatin1("enclosure") ) ) if ( (e.tagName()==TQString::fromLatin1("enclosure") ) )
{ {
TQString enclosureAttr = e.attribute(TQString::tqfromLatin1("type")); TQString enclosureAttr = e.attribute(TQString::fromLatin1("type"));
if (!enclosureAttr.isNull() ) if (!enclosureAttr.isNull() )
{ {
if (enclosureAttr == "application/x-bittorrent") if (enclosureAttr == "application/x-bittorrent")
{ {
enclosureAttr = e.attribute(TQString::tqfromLatin1("url")); enclosureAttr = e.attribute(TQString::fromLatin1("url"));
if (!enclosureAttr.isNull() ) if (!enclosureAttr.isNull() )
{ {
d->link=enclosureAttr; d->link=enclosureAttr;
@ -88,41 +88,41 @@ Article::Article(const TQDomNode &node, Format format) : d(new Private)
TQDomNode n; TQDomNode n;
for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) { for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {
const TQDomElement e = n.toElement(); const TQDomElement e = n.toElement();
if ( (e.tagName()==TQString::tqfromLatin1("link")) && if ( (e.tagName()==TQString::fromLatin1("link")) &&
(e.attribute(TQString::tqfromLatin1("rel"))==TQString::tqfromLatin1("alternate"))) (e.attribute(TQString::fromLatin1("rel"))==TQString::fromLatin1("alternate")))
{ {
d->link=n.toElement().attribute(TQString::tqfromLatin1("href")); d->link=n.toElement().attribute(TQString::fromLatin1("href"));
break; break;
} }
} }
} }
else else
{ {
if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull()) if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull())
d->link = elemText; d->link = elemText;
} }
} }
// prefer content/content:encoded over summary/description for feeds that provide it // prefer content/content:encoded over summary/description for feeds that provide it
TQString tagName=(format==AtomFeed)? TQString::tqfromLatin1("content"): TQString::tqfromLatin1("content:encoded"); TQString tagName=(format==AtomFeed)? TQString::fromLatin1("content"): TQString::fromLatin1("content:encoded");
if (!(elemText = extractNode(node, tagName, false)).isNull()) if (!(elemText = extractNode(node, tagName, false)).isNull())
d->description = elemText; d->description = elemText;
if (d->description.isEmpty()) if (d->description.isEmpty())
{ {
if (!(elemText = extractNode(node, TQString::tqfromLatin1("body"), false)).isNull()) if (!(elemText = extractNode(node, TQString::fromLatin1("body"), false)).isNull())
d->description = elemText; d->description = elemText;
if (d->description.isEmpty()) // 3rd try: see http://www.intertwingly.net/blog/1299.html if (d->description.isEmpty()) // 3rd try: see http://www.intertwingly.net/blog/1299.html
{ {
if (!(elemText = extractNode(node, TQString::tqfromLatin1((format==AtomFeed)? "summary" : "description"), false)).isNull()) if (!(elemText = extractNode(node, TQString::fromLatin1((format==AtomFeed)? "summary" : "description"), false)).isNull())
d->description = elemText; d->description = elemText;
} }
} }
if (!(elemText = extractNode(node, TQString::tqfromLatin1((format==AtomFeed)? "created": "pubDate"))).isNull()) if (!(elemText = extractNode(node, TQString::fromLatin1((format==AtomFeed)? "created": "pubDate"))).isNull())
{ {
time_t _time; time_t _time;
if (format==AtomFeed) if (format==AtomFeed)
@ -134,7 +134,7 @@ Article::Article(const TQDomNode &node, Format format) : d(new Private)
if (_time != 0) if (_time != 0)
d->pubDate.setTime_t(_time); d->pubDate.setTime_t(_time);
} }
if (!(elemText = extractNode(node, TQString::tqfromLatin1("dc:date"))).isNull()) if (!(elemText = extractNode(node, TQString::fromLatin1("dc:date"))).isNull())
{ {
time_t _time = parseISO8601Date(elemText); time_t _time = parseISO8601Date(elemText);
@ -146,23 +146,23 @@ Article::Article(const TQDomNode &node, Format format) : d(new Private)
//no luck so far - so let's set it to the current time //no luck so far - so let's set it to the current time
if (!d->pubDate.isValid()) if (!d->pubDate.isValid())
{ {
d->pubDate = TQDateTime::tqcurrentDateTime(); d->pubDate = TQDateTime::currentDateTime();
} }
if (!(elemText = extractNode(node, TQString::tqfromLatin1("wfw:comment"))).isNull()) { if (!(elemText = extractNode(node, TQString::fromLatin1("wfw:comment"))).isNull()) {
d->commentsLink = elemText; d->commentsLink = elemText;
} }
if (!(elemText = extractNode(node, TQString::tqfromLatin1("slash:comments"))).isNull()) { if (!(elemText = extractNode(node, TQString::fromLatin1("slash:comments"))).isNull()) {
d->numComments = elemText.toInt(); d->numComments = elemText.toInt();
} }
tagName=(format==AtomFeed)? TQString::tqfromLatin1("id"): TQString::tqfromLatin1("guid"); tagName=(format==AtomFeed)? TQString::fromLatin1("id"): TQString::fromLatin1("guid");
n = node.namedItem(tagName); n = node.namedItem(tagName);
if (!n.isNull()) { if (!n.isNull()) {
d->guidIsPermaLink = (format==AtomFeed)? false : true; d->guidIsPermaLink = (format==AtomFeed)? false : true;
if (n.toElement().attribute(TQString::tqfromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false; if (n.toElement().attribute(TQString::fromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false;
if (!(elemText = extractNode(node, tagName)).isNull()) if (!(elemText = extractNode(node, tagName)).isNull())
d->guid = elemText; d->guid = elemText;
@ -176,14 +176,14 @@ Article::Article(const TQDomNode &node, Format format) : d(new Private)
md5Machine.update(d->title.utf8()); md5Machine.update(d->title.utf8());
md5Machine.update(d->description.utf8()); md5Machine.update(d->description.utf8());
d->guid = TQString(md5Machine.hexDigest().data()); d->guid = TQString(md5Machine.hexDigest().data());
d->meta[TQString::tqfromLatin1("guidIsHash")] = TQString::tqfromLatin1("true"); d->meta[TQString::fromLatin1("guidIsHash")] = TQString::fromLatin1("true");
} }
for (TQDomNode i = node.firstChild(); !i.isNull(); i = i.nextSibling()) for (TQDomNode i = node.firstChild(); !i.isNull(); i = i.nextSibling())
{ {
if (i.isElement() && i.toElement().tagName() == TQString::tqfromLatin1("metaInfo:meta")) if (i.isElement() && i.toElement().tagName() == TQString::fromLatin1("metaInfo:meta"))
{ {
TQString type = i.toElement().attribute(TQString::tqfromLatin1("type")); TQString type = i.toElement().attribute(TQString::fromLatin1("type"));
d->meta[type] = i.toElement().text(); d->meta[type] = i.toElement().text();
} }
} }

300
plugins/rssfeed/rss/document.cpp
Unescape View File

@ -79,42 +79,42 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
TQString attr; TQString attr;
// we should probably check that it ISN'T feed or rss, rather than check if it is xhtml // we should probably check that it ISN'T feed or rss, rather than check if it is xhtml
if (rootNode.toElement().tagName()==TQString::tqfromLatin1("html")) if (rootNode.toElement().tagName()==TQString::fromLatin1("html"))
d->valid=false; d->valid=false;
else else
d->valid=true; d->valid=true;
attr = rootNode.toElement().attribute(TQString::tqfromLatin1("version"), TQString()); attr = rootNode.toElement().attribute(TQString::fromLatin1("version"), TQString());
if (!attr.isNull()) { if (!attr.isNull()) {
if (rootNode.toElement().tagName()=="feed") if (rootNode.toElement().tagName()=="feed")
{ {
d->format=AtomFeed; d->format=AtomFeed;
if (attr == TQString::tqfromLatin1("0.3")) if (attr == TQString::fromLatin1("0.3"))
d->version = vAtom_0_3; d->version = vAtom_0_3;
else if (attr == TQString::tqfromLatin1("0.2")) /* smt -> review */ else if (attr == TQString::fromLatin1("0.2")) /* smt -> review */
d->version = vAtom_0_2; d->version = vAtom_0_2;
else if (attr == TQString::tqfromLatin1("0.1")) /* smt -> review */ else if (attr == TQString::fromLatin1("0.1")) /* smt -> review */
d->version = vAtom_0_1; d->version = vAtom_0_1;
} }
else else
{ {
d->format=RSSFeed; d->format=RSSFeed;
if (attr == TQString::tqfromLatin1("0.91")) if (attr == TQString::fromLatin1("0.91"))
d->version = v0_91; d->version = v0_91;
else if (attr == TQString::tqfromLatin1("0.92")) else if (attr == TQString::fromLatin1("0.92"))
d->version = v0_92; d->version = v0_92;
else if (attr == TQString::tqfromLatin1("0.93")) else if (attr == TQString::fromLatin1("0.93"))
d->version = v0_93; d->version = v0_93;
else if (attr == TQString::tqfromLatin1("0.94")) else if (attr == TQString::fromLatin1("0.94"))
d->version = v0_94; d->version = v0_94;
else if (attr.startsWith("2.0") || attr == TQString::tqfromLatin1("2")) // http://www.breuls.org/rss puts 2.00 in version (BR #0000016) else if (attr.startsWith("2.0") || attr == TQString::fromLatin1("2")) // http://www.breuls.org/rss puts 2.00 in version (BR #0000016)
d->version = v2_0; d->version = v2_0;
} }
} }
if (d->format==UnknownFormat) if (d->format==UnknownFormat)
{ {
attr = rootNode.toElement().attribute(TQString::tqfromLatin1("xmlns"), TQString()); attr = rootNode.toElement().attribute(TQString::fromLatin1("xmlns"), TQString());
if (!attr.isNull()) { if (!attr.isNull()) {
/* /*
* Hardcoding these URLs is actually a bad idea, since the DTD doesn't * Hardcoding these URLs is actually a bad idea, since the DTD doesn't
@ -124,11 +124,11 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
* distinguish the RSS versions by analyzing the relationship between * distinguish the RSS versions by analyzing the relationship between
* the nodes. * the nodes.
*/ */
if (attr == TQString::tqfromLatin1("http://my.netscape.com/rdf/simple/0.9/")) { if (attr == TQString::fromLatin1("http://my.netscape.com/rdf/simple/0.9/")) {
d->format=RSSFeed; d->format=RSSFeed;
d->version = v0_90; d->version = v0_90;
} }
else if (attr == TQString::tqfromLatin1("http://purl.org/rss/1.0/")) { else if (attr == TQString::fromLatin1("http://purl.org/rss/1.0/")) {
d->format=RSSFeed; d->format=RSSFeed;
d->version = v1_0; d->version = v1_0;
} }
@ -140,13 +140,13 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
if (d->format == AtomFeed) if (d->format == AtomFeed)
channelNode=rootNode; channelNode=rootNode;
else else
channelNode=rootNode.namedItem(TQString::tqfromLatin1("channel")); channelNode=rootNode.namedItem(TQString::fromLatin1("channel"));
if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("title"))).isNull()) if (!(elemText = extractNode(channelNode, TQString::fromLatin1("title"))).isNull())
d->title = elemText; d->title = elemText;
if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("description"))).isNull()) if (!(elemText = extractNode(channelNode, TQString::fromLatin1("description"))).isNull())
d->description = elemText; d->description = elemText;
if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("link"))).isNull()) if (!(elemText = extractNode(channelNode, TQString::fromLatin1("link"))).isNull())
d->link = elemText; d->link = elemText;
@ -159,27 +159,27 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
else else
{ {
// following is a HACK for broken 0.91 feeds like xanga.com's // following is a HACK for broken 0.91 feeds like xanga.com's
if (!rootNode.namedItem(TQString::tqfromLatin1("item")).isNull()) if (!rootNode.namedItem(TQString::fromLatin1("item")).isNull())
parentNode = rootNode; parentNode = rootNode;
else else
parentNode = channelNode; parentNode = channelNode;
} }
// image and textinput aren't supported by Atom.. handle in case feed provides // image and textinput aren't supported by Atom.. handle in case feed provides
TQDomNode n = parentNode.namedItem(TQString::tqfromLatin1("image")); TQDomNode n = parentNode.namedItem(TQString::fromLatin1("image"));
if (!n.isNull()) if (!n.isNull())
d->image = new Image(n); d->image = new Image(n);
n = parentNode.namedItem(TQString::tqfromLatin1("textinput")); n = parentNode.namedItem(TQString::fromLatin1("textinput"));
if (!n.isNull()) if (!n.isNull())
d->textInput = new TextInput(n); d->textInput = new TextInput(n);
// Our (hopefully faster) version of elementsByTagName() // Our (hopefully faster) version of elementsByTagName()
TQString tagName; TQString tagName;
if (d->format == AtomFeed) if (d->format == AtomFeed)
tagName=TQString::tqfromLatin1("entry"); tagName=TQString::fromLatin1("entry");
else else
tagName=TQString::tqfromLatin1("item"); tagName=TQString::fromLatin1("item");
for (n = parentNode.firstChild(); !n.isNull(); n = n.nextSibling()) { for (n = parentNode.firstChild(); !n.isNull(); n = n.nextSibling()) {
const TQDomElement e = n.toElement(); const TQDomElement e = n.toElement();
@ -187,212 +187,212 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
d->articles.append(Article(e, d->format)); d->articles.append(Article(e, d->format));
} }
if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("copyright"))).isNull()) if (!(elemText = extractNode(channelNode, TQString::fromLatin1("copyright"))).isNull())
d->copyright = elemText; d->copyright = elemText;
if (d->format == AtomFeed) if (d->format == AtomFeed)
elemText = rootNode.toElement().attribute(TQString::tqfromLatin1("xml:lang"), TQString()); elemText = rootNode.toElement().attribute(TQString::fromLatin1("xml:lang"), TQString());
else else
elemText = extractNode(channelNode, TQString::tqfromLatin1("language")); elemText = extractNode(channelNode, TQString::fromLatin1("language"));
if (!elemText.isNull()){ if (!elemText.isNull()){
if (elemText == TQString::tqfromLatin1("af")) if (elemText == TQString::fromLatin1("af"))
d->language = af; d->language = af;
else if (elemText == TQString::tqfromLatin1("sq")) else if (elemText == TQString::fromLatin1("sq"))
d->language = sq; d->language = sq;
else if (elemText == TQString::tqfromLatin1("eu")) else if (elemText == TQString::fromLatin1("eu"))
d->language = eu; d->language = eu;
else if (elemText == TQString::tqfromLatin1("be")) else if (elemText == TQString::fromLatin1("be"))
d->language = be; d->language = be;
else if (elemText == TQString::tqfromLatin1("bg")) else if (elemText == TQString::fromLatin1("bg"))
d->language = bg; d->language = bg;
else if (elemText == TQString::tqfromLatin1("ca")) else if (elemText == TQString::fromLatin1("ca"))
d->language = ca; d->language = ca;
else if (elemText == TQString::tqfromLatin1("zh-cn")) else if (elemText == TQString::fromLatin1("zh-cn"))
d->language = zh_cn; d->language = zh_cn;
else if (elemText == TQString::tqfromLatin1("zh-tw")) else if (elemText == TQString::fromLatin1("zh-tw"))
d->language = zh_tw; d->language = zh_tw;
else if (elemText == TQString::tqfromLatin1("hr")) else if (elemText == TQString::fromLatin1("hr"))
d->language = hr; d->language = hr;
else if (elemText == TQString::tqfromLatin1("cs")) else if (elemText == TQString::fromLatin1("cs"))
d->language = cs; d->language = cs;
else if (elemText == TQString::tqfromLatin1("da")) else if (elemText == TQString::fromLatin1("da"))
d->language = da; d->language = da;
else if (elemText == TQString::tqfromLatin1("nl")) else if (elemText == TQString::fromLatin1("nl"))
d->language = nl; d->language = nl;
else if (elemText == TQString::tqfromLatin1("nl-be")) else if (elemText == TQString::fromLatin1("nl-be"))
d->language = nl_be; d->language = nl_be;
else if (elemText == TQString::tqfromLatin1("nl-nl")) else if (elemText == TQString::fromLatin1("nl-nl"))
d->language = nl_nl; d->language = nl_nl;
else if (elemText == TQString::tqfromLatin1("en")) else if (elemText == TQString::fromLatin1("en"))
d->language = en; d->language = en;
else if (elemText == TQString::tqfromLatin1("en-au")) else if (elemText == TQString::fromLatin1("en-au"))
d->language = en_au; d->language = en_au;
else if (elemText == TQString::tqfromLatin1("en-bz")) else if (elemText == TQString::fromLatin1("en-bz"))
d->language = en_bz; d->language = en_bz;
else if (elemText == TQString::tqfromLatin1("en-ca")) else if (elemText == TQString::fromLatin1("en-ca"))
d->language = en_ca; d->language = en_ca;
else if (elemText == TQString::tqfromLatin1("en-ie")) else if (elemText == TQString::fromLatin1("en-ie"))
d->language = en_ie; d->language = en_ie;
else if (elemText == TQString::tqfromLatin1("en-jm")) else if (elemText == TQString::fromLatin1("en-jm"))
d->language = en_jm; d->language = en_jm;
else if (elemText == TQString::tqfromLatin1("en-nz")) else if (elemText == TQString::fromLatin1("en-nz"))
d->language = en_nz; d->language = en_nz;
else if (elemText == TQString::tqfromLatin1("en-ph")) else if (elemText == TQString::fromLatin1("en-ph"))
d->language = en_ph; d->language = en_ph;
else if (elemText == TQString::tqfromLatin1("en-za")) else if (elemText == TQString::fromLatin1("en-za"))
d->language = en_za; d->language = en_za;
else if (elemText == TQString::tqfromLatin1("en-tt")) else if (elemText == TQString::fromLatin1("en-tt"))
d->language = en_tt; d->language = en_tt;
else if (elemText == TQString::tqfromLatin1("en-gb")) else if (elemText == TQString::fromLatin1("en-gb"))
d->language = en_gb; d->language = en_gb;
else if (elemText == TQString::tqfromLatin1("en-us")) else if (elemText == TQString::fromLatin1("en-us"))
d->language = en_us; d->language = en_us;
else if (elemText == TQString::tqfromLatin1("en-zw")) else if (elemText == TQString::fromLatin1("en-zw"))
d->language = en_zw; d->language = en_zw;
else if (elemText == TQString::tqfromLatin1("fo")) else if (elemText == TQString::fromLatin1("fo"))
d->language = fo; d->language = fo;
else if (elemText == TQString::tqfromLatin1("fi")) else if (elemText == TQString::fromLatin1("fi"))
d->language = fi; d->language = fi;
else if (elemText == TQString::tqfromLatin1("fr")) else if (elemText == TQString::fromLatin1("fr"))
d->language = fr; d->language = fr;
else if (elemText == TQString::tqfromLatin1("fr-be")) else if (elemText == TQString::fromLatin1("fr-be"))
d->language = fr_be; d->language = fr_be;
else if (elemText == TQString::tqfromLatin1("fr-ca")) else if (elemText == TQString::fromLatin1("fr-ca"))
d->language = fr_ca; d->language = fr_ca;
else if (elemText == TQString::tqfromLatin1("fr-fr")) else if (elemText == TQString::fromLatin1("fr-fr"))
d->language = fr_fr; d->language = fr_fr;
else if (elemText == TQString::tqfromLatin1("fr-lu")) else if (elemText == TQString::fromLatin1("fr-lu"))
d->language = fr_lu; d->language = fr_lu;
else if (elemText == TQString::tqfromLatin1("fr-mc")) else if (elemText == TQString::fromLatin1("fr-mc"))
d->language = fr_mc; d->language = fr_mc;
else if (elemText == TQString::tqfromLatin1("fr-ch")) else if (elemText == TQString::fromLatin1("fr-ch"))
d->language = fr_ch; d->language = fr_ch;
else if (elemText == TQString::tqfromLatin1("gl")) else if (elemText == TQString::fromLatin1("gl"))
d->language = gl; d->language = gl;
else if (elemText == TQString::tqfromLatin1("gd")) else if (elemText == TQString::fromLatin1("gd"))
d->language = gd; d->language = gd;
else if (elemText == TQString::tqfromLatin1("de")) else if (elemText == TQString::fromLatin1("de"))
d->language = de; d->language = de;
else if (elemText == TQString::tqfromLatin1("de-at")) else if (elemText == TQString::fromLatin1("de-at"))
d->language = de_at; d->language = de_at;
else if (elemText == TQString::tqfromLatin1("de-de")) else if (elemText == TQString::fromLatin1("de-de"))
d->language = de_de; d->language = de_de;
else if (elemText == TQString::tqfromLatin1("de-li")) else if (elemText == TQString::fromLatin1("de-li"))
d->language = de_li; d->language = de_li;
else if (elemText == TQString::tqfromLatin1("de-lu")) else if (elemText == TQString::fromLatin1("de-lu"))
d->language = de_lu; d->language = de_lu;
else if (elemText == TQString::tqfromLatin1("de-ch")) else if (elemText == TQString::fromLatin1("de-ch"))
d->language = de_ch; d->language = de_ch;
else if (elemText == TQString::tqfromLatin1("el")) else if (elemText == TQString::fromLatin1("el"))
d->language = el; d->language = el;
else if (elemText == TQString::tqfromLatin1("hu")) else if (elemText == TQString::fromLatin1("hu"))
d->language = hu; d->language = hu;
else if (elemText == TQString::tqfromLatin1("is")) else if (elemText == TQString::fromLatin1("is"))
d->language = is; d->language = is;
else if (elemText == TQString::tqfromLatin1("id")) else if (elemText == TQString::fromLatin1("id"))
d->language = id; d->language = id;
else if (elemText == TQString::tqfromLatin1("ga")) else if (elemText == TQString::fromLatin1("ga"))
d->language = ga; d->language = ga;
else if (elemText == TQString::tqfromLatin1("it")) else if (elemText == TQString::fromLatin1("it"))
d->language = it; d->language = it;
else if (elemText == TQString::tqfromLatin1("it-it")) else if (elemText == TQString::fromLatin1("it-it"))
d->language = it_it; d->language = it_it;
else if (elemText == TQString::tqfromLatin1("it-ch")) else if (elemText == TQString::fromLatin1("it-ch"))
d->language = it_ch; d->language = it_ch;
else if (elemText == TQString::tqfromLatin1("ja")) else if (elemText == TQString::fromLatin1("ja"))
d->language = ja; d->language = ja;
else if (elemText == TQString::tqfromLatin1("ko")) else if (elemText == TQString::fromLatin1("ko"))
d->language = ko; d->language = ko;
else if (elemText == TQString::tqfromLatin1("mk")) else if (elemText == TQString::fromLatin1("mk"))
d->language = mk; d->language = mk;
else if (elemText == TQString::tqfromLatin1("no")) else if (elemText == TQString::fromLatin1("no"))
d->language = no; d->language = no;
else if (elemText == TQString::tqfromLatin1("pl")) else if (elemText == TQString::fromLatin1("pl"))
d->language = pl; d->language = pl;
else if (elemText == TQString::tqfromLatin1("pt")) else if (elemText == TQString::fromLatin1("pt"))
d->language = pt; d->language = pt;
else if (elemText == TQString::tqfromLatin1("pt-br")) else if (elemText == TQString::fromLatin1("pt-br"))
d->language = pt_br; d->language = pt_br;
else if (elemText == TQString::tqfromLatin1("pt-pt")) else if (elemText == TQString::fromLatin1("pt-pt"))
d->language = pt_pt; d->language = pt_pt;
else if (elemText == TQString::tqfromLatin1("ro")) else if (elemText == TQString::fromLatin1("ro"))
d->language = ro; d->language = ro;
else if (elemText == TQString::tqfromLatin1("ro-mo")) else if (elemText == TQString::fromLatin1("ro-mo"))
d->language = ro_mo; d->language = ro_mo;
else if (elemText == TQString::tqfromLatin1("ro-ro")) else if (elemText == TQString::fromLatin1("ro-ro"))
d->language = ro_ro; d->language = ro_ro;
else if (elemText == TQString::tqfromLatin1("ru")) else if (elemText == TQString::fromLatin1("ru"))
d->language = ru; d->language = ru;
else if (elemText == TQString::tqfromLatin1("ru-mo")) else if (elemText == TQString::fromLatin1("ru-mo"))
d->language = ru_mo; d->language = ru_mo;
else if (elemText == TQString::tqfromLatin1("ru-ru")) else if (elemText == TQString::fromLatin1("ru-ru"))
d->language = ru_ru; d->language = ru_ru;
else if (elemText == TQString::tqfromLatin1("sr")) else if (elemText == TQString::fromLatin1("sr"))
d->language = sr; d->language = sr;
else if (elemText == TQString::tqfromLatin1("sk")) else if (elemText == TQString::fromLatin1("sk"))
d->language = sk; d->language = sk;
else if (elemText == TQString::tqfromLatin1("sl")) else if (elemText == TQString::fromLatin1("sl"))
d->language = sl; d->language = sl;
else if (elemText == TQString::tqfromLatin1("es")) else if (elemText == TQString::fromLatin1("es"))
d->language = es; d->language = es;
else if (elemText == TQString::tqfromLatin1("es-ar")) else if (elemText == TQString::fromLatin1("es-ar"))
d->language = es_ar; d->language = es_ar;
else if (elemText == TQString::tqfromLatin1("es-bo")) else if (elemText == TQString::fromLatin1("es-bo"))
d->language = es_bo; d->language = es_bo;
else if (elemText == TQString::tqfromLatin1("es-cl")) else if (elemText == TQString::fromLatin1("es-cl"))
d->language = es_cl; d->language = es_cl;
else if (elemText == TQString::tqfromLatin1("es-co")) else if (elemText == TQString::fromLatin1("es-co"))
d->language = es_co; d->language = es_co;
else if (elemText == TQString::tqfromLatin1("es-cr")) else if (elemText == TQString::fromLatin1("es-cr"))
d->language = es_cr; d->language = es_cr;
else if (elemText == TQString::tqfromLatin1("es-do")) else if (elemText == TQString::fromLatin1("es-do"))
d->language = es_do; d->language = es_do;
else if (elemText == TQString::tqfromLatin1("es-ec")) else if (elemText == TQString::fromLatin1("es-ec"))
d->language = es_ec; d->language = es_ec;
else if (elemText == TQString::tqfromLatin1("es-sv")) else if (elemText == TQString::fromLatin1("es-sv"))
d->language = es_sv; d->language = es_sv;
else if (elemText == TQString::tqfromLatin1("es-gt")) else if (elemText == TQString::fromLatin1("es-gt"))
d->language = es_gt; d->language = es_gt;
else if (elemText == TQString::tqfromLatin1("es-hn")) else if (elemText == TQString::fromLatin1("es-hn"))
d->language = es_hn; d->language = es_hn;
else if (elemText == TQString::tqfromLatin1("es-mx")) else if (elemText == TQString::fromLatin1("es-mx"))
d->language = es_mx; d->language = es_mx;
else if (elemText == TQString::tqfromLatin1("es-ni")) else if (elemText == TQString::fromLatin1("es-ni"))
d->language = es_ni; d->language = es_ni;
else if (elemText == TQString::tqfromLatin1("es-pa")) else if (elemText == TQString::fromLatin1("es-pa"))
d->language = es_pa; d->language = es_pa;
else if (elemText == TQString::tqfromLatin1("es-py")) else if (elemText == TQString::fromLatin1("es-py"))
d->language = es_py; d->language = es_py;
else if (elemText == TQString::tqfromLatin1("es-pe")) else if (elemText == TQString::fromLatin1("es-pe"))
d->language = es_pe; d->language = es_pe;
else if (elemText == TQString::tqfromLatin1("es-pr")) else if (elemText == TQString::fromLatin1("es-pr"))
d->language = es_pr; d->language = es_pr;
else if (elemText == TQString::tqfromLatin1("es-es")) else if (elemText == TQString::fromLatin1("es-es"))
d->language = es_es; d->language = es_es;
else if (elemText == TQString::tqfromLatin1("es-uy")) else if (elemText == TQString::fromLatin1("es-uy"))
d->language = es_uy; d->language = es_uy;
else if (elemText == TQString::tqfromLatin1("es-ve")) else if (elemText == TQString::fromLatin1("es-ve"))
d->language = es_ve; d->language = es_ve;
else if (elemText == TQString::tqfromLatin1("sv")) else if (elemText == TQString::fromLatin1("sv"))
d->language = sv; d->language = sv;
else if (elemText == TQString::tqfromLatin1("sv-fi")) else if (elemText == TQString::fromLatin1("sv-fi"))
d->language = sv_fi; d->language = sv_fi;
else if (elemText == TQString::tqfromLatin1("sv-se")) else if (elemText == TQString::fromLatin1("sv-se"))
d->language = sv_se; d->language = sv_se;
else if (elemText == TQString::tqfromLatin1("tr")) else if (elemText == TQString::fromLatin1("tr"))
d->language = tr; d->language = tr;
else if (elemText == TQString::tqfromLatin1("uk")) else if (elemText == TQString::fromLatin1("uk"))
d->language = uk; d->language = uk;
else else
d->language = UndefinedLanguage; d->language = UndefinedLanguage;
} }
if (d->format == AtomFeed) if (d->format == AtomFeed)
tagName=TQString::tqfromLatin1("issued"); // atom doesn't specify this for feeds tagName=TQString::fromLatin1("issued"); // atom doesn't specify this for feeds
// but some broken feeds do this // but some broken feeds do this
else else
tagName=TQString::tqfromLatin1("pubDate"); tagName=TQString::fromLatin1("pubDate");
if (!(elemText = extractNode(channelNode, tagName)).isNull()) { if (!(elemText = extractNode(channelNode, tagName)).isNull()) {
time_t _time; time_t _time;
@ -408,7 +408,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
d->pubDate.setTime_t(_time); d->pubDate.setTime_t(_time);
} }
if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("dc:date"))).isNull()) { if (!(elemText = extractNode(channelNode, TQString::fromLatin1("dc:date"))).isNull()) {
time_t _time = parseISO8601Date(elemText); time_t _time = parseISO8601Date(elemText);
/* \bug This isn't really the right way since it will set the date to /* \bug This isn't really the right way since it will set the date to
* Jan 1 1970, 1:00:00 if the passed date was invalid; this means that * Jan 1 1970, 1:00:00 if the passed date was invalid; this means that
@ -418,9 +418,9 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
} }
if (d->format == AtomFeed) if (d->format == AtomFeed)
tagName=TQString::tqfromLatin1("modified"); tagName=TQString::fromLatin1("modified");
else else
tagName=TQString::tqfromLatin1("lastBuildDate"); tagName=TQString::fromLatin1("lastBuildDate");
if (!(elemText = extractNode(channelNode, tagName)).isNull()) { if (!(elemText = extractNode(channelNode, tagName)).isNull()) {
time_t _time; time_t _time;
if (d->format == AtomFeed) if (d->format == AtomFeed)
@ -430,44 +430,44 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
d->lastBuildDate.setTime_t(_time); d->lastBuildDate.setTime_t(_time);
} }
if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("rating"))).isNull()) if (!(elemText = extractNode(channelNode, TQString::fromLatin1("rating"))).isNull())
d->rating = elemText; d->rating = elemText;
if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("docs"))).isNull()) if (!(elemText = extractNode(channelNode, TQString::fromLatin1("docs"))).isNull())
d->docs = elemText; d->docs = elemText;
if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1((d->format == AtomFeed) ? "author" : "managingEditor"))).isNull()) if (!(elemText = extractNode(channelNode, TQString::fromLatin1((d->format == AtomFeed) ? "author" : "managingEditor"))).isNull())
d->managingEditor = elemText; d->managingEditor = elemText;
if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("webMaster"))).isNull()) if (!(elemText = extractNode(channelNode, TQString::fromLatin1("webMaster"))).isNull())
d->webMaster = elemText; d->webMaster = elemText;
if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("ttl"))).isNull()) if (!(elemText = extractNode(channelNode, TQString::fromLatin1("ttl"))).isNull())
d->ttl = elemText.toUInt(); d->ttl = elemText.toUInt();
n = channelNode.namedItem(TQString::tqfromLatin1("skipHours")); n = channelNode.namedItem(TQString::fromLatin1("skipHours"));
if (!n.isNull()) if (!n.isNull())
for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement()) for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement())
if (e.tagName() == TQString::tqfromLatin1("hour")) if (e.tagName() == TQString::fromLatin1("hour"))
d->skipHours.append(e.text().toUInt()); d->skipHours.append(e.text().toUInt());
n = channelNode.namedItem(TQString::tqfromLatin1("skipDays")); n = channelNode.namedItem(TQString::fromLatin1("skipDays"));
if (!n.isNull()) { if (!n.isNull()) {
Day day; Day day;
TQString elemText; TQString elemText;
for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement()) for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement())
if (e.tagName() == TQString::tqfromLatin1("day")) { if (e.tagName() == TQString::fromLatin1("day")) {
elemText = e.text().lower(); elemText = e.text().lower();
if (elemText == TQString::tqfromLatin1("monday")) if (elemText == TQString::fromLatin1("monday"))
day = Monday; day = Monday;
else if (elemText == TQString::tqfromLatin1("tuesday")) else if (elemText == TQString::fromLatin1("tuesday"))
day = Tuesday; day = Tuesday;
else if (elemText == TQString::tqfromLatin1("wednesday")) else if (elemText == TQString::fromLatin1("wednesday"))
day = Wednesday; day = Wednesday;
else if (elemText == TQString::tqfromLatin1("thursday")) else if (elemText == TQString::fromLatin1("thursday"))
day = Thursday; day = Thursday;
else if (elemText == TQString::tqfromLatin1("friday")) else if (elemText == TQString::fromLatin1("friday"))
day = Friday; day = Friday;
else if (elemText == TQString::tqfromLatin1("saturday")) else if (elemText == TQString::fromLatin1("saturday"))
day = Saturday; day = Saturday;
else if (elemText == TQString::tqfromLatin1("sunday")) else if (elemText == TQString::fromLatin1("sunday"))
day = Sunday; day = Sunday;
else else
day = UndefinedDay; day = UndefinedDay;
@ -496,16 +496,16 @@ Version Document::version() const
TQString Document::verbVersion() const TQString Document::verbVersion() const
{ {
switch (d->version) { switch (d->version) {
case v0_90: return TQString::tqfromLatin1("0.90"); case v0_90: return TQString::fromLatin1("0.90");
case v0_91: return TQString::tqfromLatin1("0.91"); case v0_91: return TQString::fromLatin1("0.91");
case v0_92: return TQString::tqfromLatin1("0.92"); case v0_92: return TQString::fromLatin1("0.92");
case v0_93: return TQString::tqfromLatin1("0.93"); case v0_93: return TQString::fromLatin1("0.93");
case v0_94: return TQString::tqfromLatin1("0.94"); case v0_94: return TQString::fromLatin1("0.94");
case v1_0: return TQString::tqfromLatin1("1.0"); case v1_0: return TQString::fromLatin1("1.0");
case v2_0: return TQString::tqfromLatin1("2.0"); case v2_0: return TQString::fromLatin1("2.0");
case vAtom_0_3: return TQString::tqfromLatin1("0.3"); case vAtom_0_3: return TQString::fromLatin1("0.3");
case vAtom_0_2: return TQString::tqfromLatin1("0.2"); case vAtom_0_2: return TQString::fromLatin1("0.2");
case vAtom_0_1: return TQString::tqfromLatin1("0.1"); case vAtom_0_1: return TQString::fromLatin1("0.1");
} }
return TQString(); return TQString();
} }

2
plugins/rssfeed/rss/global.h
Unescape View File

@ -39,7 +39,7 @@ namespace RSS
* Possible status values returned by the signal * Possible status values returned by the signal
* Loader::loadingComplete(). * Loader::loadingComplete().
*/ */
enum tqStatus { enum Status {
Success, /** Success, /**
* Nothing went wrong so far, but you still have to check * Nothing went wrong so far, but you still have to check
* what values are returned by the classes since it's not * what values are returned by the classes since it's not

12
plugins/rssfeed/rss/image.cpp
Unescape View File

@ -48,17 +48,17 @@ Image::Image(const TQDomNode &node) : TQObject(), d(new Private)
{ {
TQString elemText; TQString elemText;
if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull()) if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull())
d->title = elemText; d->title = elemText;
if (!(elemText = extractNode(node, TQString::tqfromLatin1("url"))).isNull()) if (!(elemText = extractNode(node, TQString::fromLatin1("url"))).isNull())
d->url = elemText; d->url = elemText;
if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull()) if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull())
d->link = elemText; d->link = elemText;
if (!(elemText = extractNode(node, TQString::tqfromLatin1("description"))).isNull()) if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull())
d->description = elemText; d->description = elemText;
if (!(elemText = extractNode(node, TQString::tqfromLatin1("height"))).isNull()) if (!(elemText = extractNode(node, TQString::fromLatin1("height"))).isNull())
d->height = elemText.toUInt(); d->height = elemText.toUInt();
if (!(elemText = extractNode(node, TQString::tqfromLatin1("width"))).isNull()) if (!(elemText = extractNode(node, TQString::fromLatin1("width"))).isNull())
d->width = elemText.toUInt(); d->width = elemText.toUInt();
} }

4
plugins/rssfeed/rss/loader.cpp
Unescape View File

@ -240,7 +240,7 @@ Loader *Loader::create()
Loader *Loader::create(TQObject *object, const char *slot) Loader *Loader::create(TQObject *object, const char *slot)
{ {
Loader *loader = create(); Loader *loader = create();
connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)), connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)),
object, slot); object, slot);
return loader; return loader;
} }
@ -300,7 +300,7 @@ void Loader::slotRetrieverDone(const TQByteArray &data, bool success)
d->retriever = NULL; d->retriever = NULL;
Document rssDoc; Document rssDoc;
tqStatus status = Success; Status status = Success;
if (success) { if (success) {
TQDomDocument doc; TQDomDocument doc;

10
plugins/rssfeed/rss/loader.h
Unescape View File

@ -209,8 +209,8 @@ namespace RSS
* *
* \code * \code
* Loader *loader = Loader::create(); * Loader *loader = Loader::create();
* connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)), * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)),
* this, TQT_SLOT(slotLoadingComplete(Loader *, Document, tqStatus))); * this, TQT_SLOT(slotLoadingComplete(Loader *, Document, Status)));
* loader->loadFrom("http://www.blah.org/foobar.rdf", new FileRetriever); * loader->loadFrom("http://www.blah.org/foobar.rdf", new FileRetriever);
* \endcode * \endcode
* *
@ -234,7 +234,7 @@ namespace RSS
* 'slotLoadingComplete' method might look like this: * 'slotLoadingComplete' method might look like this:
* *
* \code * \code
* void MyClass::slotLoadingComplete(Loader *loader, Document doc, tqStatus status) * void MyClass::slotLoadingComplete(Loader *loader, Document doc, Status status)
* { * {
* // Note that Loader::~Loader() is private, so you cannot delete Loader instances. * // Note that Loader::~Loader() is private, so you cannot delete Loader instances.
* // You don't need to do that anyway since Loader instances delete themselves. * // You don't need to do that anyway since Loader instances delete themselves.
@ -320,9 +320,9 @@ namespace RSS
* the case if you intend to call getPixmap() on Document::image()! * the case if you intend to call getPixmap() on Document::image()!
* @param status A status byte telling whether there were any problems * @param status A status byte telling whether there were any problems
* while retrieving or parsing the data. * while retrieving or parsing the data.
* @see Document, tqStatus * @see Document, Status
*/ */
void loadingComplete(Loader *loader, Document doc, tqStatus status); void loadingComplete(Loader *loader, Document doc, Status status);
private slots: private slots:
void slotRetrieverDone(const TQByteArray &data, bool success); void slotRetrieverDone(const TQByteArray &data, bool success);

6
plugins/rssfeed/rss/testlibrss.cpp
Unescape View File

@ -19,12 +19,12 @@ static const KCmdLineOptions options[] =
void Tester::test( const TQString &url ) void Tester::test( const TQString &url )
{ {
Loader *loader = Loader::create(); Loader *loader = Loader::create();
connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, tqStatus ) ), connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ),
this, TQT_SLOT( slotLoadingComplete( Loader *, Document, tqStatus ) ) ); this, TQT_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) );
loader->loadFrom( url, new FileRetriever ); loader->loadFrom( url, new FileRetriever );
} }
void Tester::slotLoadingComplete( Loader *loader, Document doc, tqStatus status ) void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status )
{ {
if ( status == Success ) if ( status == Success )
{ {

4
plugins/rssfeed/rss/testlibrss.h
Unescape View File

@ -10,7 +10,7 @@
using RSS::Loader; using RSS::Loader;
using RSS::Document; using RSS::Document;
using RSS::tqStatus; using RSS::Status;
class Tester : public TQObject class Tester : public TQObject
{ {
@ -20,7 +20,7 @@ class Tester : public TQObject
void test( const TQString &url ); void test( const TQString &url );
private slots: private slots:
void slotLoadingComplete( Loader *loader, Document doc, tqStatus status ); void slotLoadingComplete( Loader *loader, Document doc, Status status );
}; };
#endif #endif

8
plugins/rssfeed/rss/textinput.cpp
Unescape View File

@ -38,13 +38,13 @@ TextInput::TextInput(const TQDomNode &node) : d(new Private)
{ {
TQString elemText; TQString elemText;
if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull()) if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull())
d->title = elemText; d->title = elemText;
if (!(elemText = extractNode(node, TQString::tqfromLatin1("description"))).isNull()) if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull())
d->description = elemText; d->description = elemText;
if (!(elemText = extractNode(node, TQString::tqfromLatin1("name")))) if (!(elemText = extractNode(node, TQString::fromLatin1("name"))))
d->name = elemText; d->name = elemText;
if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull()) if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull())
d->link = elemText; d->link = elemText;
} }

14
plugins/rssfeed/rssfeed.cpp
Unescape View File

@ -223,7 +223,7 @@ namespace kt
RssArticle::List::iterator it; RssArticle::List::iterator it;
for ( it = m_articles.begin(); it != m_articles.end(); ) for ( it = m_articles.begin(); it != m_articles.end(); )
{ {
if ((*it).pubDate().daysTo(TQDateTime::tqcurrentDateTime()) > m_articleAge) if ((*it).pubDate().daysTo(TQDateTime::currentDateTime()) > m_articleAge)
{ {
it = m_articles.erase(it); it = m_articles.erase(it);
removed = true; removed = true;
@ -254,12 +254,12 @@ namespace kt
feedLoading = true; feedLoading = true;
cleanArticles(); cleanArticles();
Loader * feedLoader = Loader::create(); Loader * feedLoader = Loader::create();
connect( feedLoader, TQT_SIGNAL( loadingComplete( Loader *, Document, tqStatus ) ), connect( feedLoader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ),
this, TQT_SLOT( feedLoaded( Loader *, Document, tqStatus ) ) ); this, TQT_SLOT( feedLoaded( Loader *, Document, Status ) ) );
feedLoader->loadFrom( m_feedUrl, new FileRetriever ); feedLoader->loadFrom( m_feedUrl, new FileRetriever );
} }
void RssFeed::feedLoaded(Loader *feedLoader, Document doc, tqStatus status) void RssFeed::feedLoaded(Loader *feedLoader, Document doc, Status status)
{ {
feedLoading = false; feedLoading = false;
@ -290,7 +290,7 @@ namespace kt
for (int i=doc.articles().count()-1; i>=0; i--) for (int i=doc.articles().count()-1; i>=0; i--)
{ {
curArticle = doc.articles()[i]; curArticle = doc.articles()[i];
if (curArticle.pubDate().daysTo(TQDateTime::tqcurrentDateTime()) < m_articleAge && !m_articles.contains(curArticle)) if (curArticle.pubDate().daysTo(TQDateTime::currentDateTime()) < m_articleAge && !m_articles.contains(curArticle))
{ {
m_articles.prepend(curArticle); m_articles.prepend(curArticle);
emit scanRssArticle(curArticle); emit scanRssArticle(curArticle);
@ -306,8 +306,8 @@ namespace kt
qDebug( "There was and error loading the feed\n"); qDebug( "There was and error loading the feed\n");
} }
disconnect( feedLoader, TQT_SIGNAL( loadingComplete( Loader *, Document, tqStatus ) ), disconnect( feedLoader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ),
this, TQT_SLOT( feedLoaded( Loader *, Document, tqStatus ) ) ); this, TQT_SLOT( feedLoaded( Loader *, Document, Status ) ) );
feedLoader->deleteLater(); feedLoader->deleteLater();
} }

2
plugins/rssfeed/rssfeed.h
Unescape View File

@ -73,7 +73,7 @@ namespace kt
public slots: public slots:
void refreshFeed(); void refreshFeed();
void feedLoaded(Loader *feedLoader, Document doc, tqStatus status); void feedLoaded(Loader *feedLoader, Document doc, Status status);
void clearArticles(); void clearArticles();

2
plugins/rssfeed/rssfeedmanager.cpp
Unescape View File

@ -40,7 +40,7 @@
#include <tqdatetimeedit.h> #include <tqdatetimeedit.h>
#include <tqtable.h> #include <tqtable.h>
#include <tqregexp.h> #include <tqregexp.h>
#include <tqlayout.h> #include <layout.h>
#include <torrent/globals.h> #include <torrent/globals.h>
#include <util/log.h> #include <util/log.h>

40
plugins/rssfeed/rssfeedwidget.ui
Unescape View File

@ -48,7 +48,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout2</cstring> <cstring>layout2</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -152,7 +152,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>90</width> <width>90</width>
<height>21</height> <height>21</height>
@ -194,7 +194,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>tqlayout13</cstring> <cstring>layout13</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -252,7 +252,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>60</width> <width>60</width>
<height>21</height> <height>21</height>
@ -277,7 +277,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>tqlayout47</cstring> <cstring>layout47</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -367,7 +367,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout28</cstring> <cstring>layout28</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -476,7 +476,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout14</cstring> <cstring>layout14</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -484,7 +484,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout9</cstring> <cstring>layout9</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -526,7 +526,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout12</cstring> <cstring>layout12</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -565,7 +565,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout11</cstring> <cstring>layout11</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -573,7 +573,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout28</cstring> <cstring>layout28</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -600,7 +600,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Preferred</enum> <enum>Preferred</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>21</height> <height>21</height>
@ -614,7 +614,7 @@
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>60</width> <width>60</width>
<height>32767</height> <height>32767</height>
@ -633,7 +633,7 @@
<property name="name"> <property name="name">
<cstring>seriesBox</cstring> <cstring>seriesBox</cstring>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32000</width> <width>32000</width>
<height>32000</height> <height>32000</height>
@ -648,7 +648,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout9</cstring> <cstring>layout9</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -664,7 +664,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>21</height> <height>21</height>
@ -686,7 +686,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout10</cstring> <cstring>layout10</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -792,7 +792,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout33</cstring> <cstring>layout33</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -880,7 +880,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout13</cstring> <cstring>layout13</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -910,7 +910,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>170</width> <width>170</width>
<height>21</height> <height>21</height>

12
plugins/rssfeed/rssfilter.cpp
Unescape View File

@ -302,8 +302,8 @@ namespace kt
regEx.setPattern(*episodeFormats.at(i)); regEx.setPattern(*episodeFormats.at(i));
if (regEx.search(article.title()) >= 0) if (regEx.search(article.title()) >= 0)
{ {
season = (*regEx.tqcapturedTexts().at(1)).toInt(); season = (*regEx.capturedTexts().at(1)).toInt();
episode = (*regEx.tqcapturedTexts().at(2)).toInt(); episode = (*regEx.capturedTexts().at(2)).toInt();
if (!episodeInRange(season,episode,ignoreMatches,alreadyDownloaded)) if (!episodeInRange(season,episode,ignoreMatches,alreadyDownloaded))
{ {
return false; return false;
@ -313,8 +313,8 @@ namespace kt
if (regEx.search(article.link().prettyURL()) >= 0) if (regEx.search(article.link().prettyURL()) >= 0)
{ {
season = (*regEx.tqcapturedTexts().at(1)).toInt(); season = (*regEx.capturedTexts().at(1)).toInt();
episode = (*regEx.tqcapturedTexts().at(2)).toInt(); episode = (*regEx.capturedTexts().at(2)).toInt();
if (!episodeInRange(season,episode,ignoreMatches,alreadyDownloaded)) if (!episodeInRange(season,episode,ignoreMatches,alreadyDownloaded))
{ {
return false; return false;
@ -324,8 +324,8 @@ namespace kt
if (regEx.search(article.description()) >= 0) if (regEx.search(article.description()) >= 0)
{ {
season = (*regEx.tqcapturedTexts().at(1)).toInt(); season = (*regEx.capturedTexts().at(1)).toInt();
episode = (*regEx.tqcapturedTexts().at(2)).toInt(); episode = (*regEx.capturedTexts().at(2)).toInt();
if (!episodeInRange(season,episode,ignoreMatches,alreadyDownloaded)) if (!episodeInRange(season,episode,ignoreMatches,alreadyDownloaded))
{ {
return false; return false;

4
plugins/rssfeed/rssfilter.h
Unescape View File

@ -42,8 +42,8 @@ namespace kt
{ {
public: public:
FilterMatch() { m_season = 0; m_episode = 0; m_time = TQDateTime::tqcurrentDateTime().toString(); m_link=TQString(); }; FilterMatch() { m_season = 0; m_episode = 0; m_time = TQDateTime::currentDateTime().toString(); m_link=TQString(); };
FilterMatch(int season, int episode, TQString link, TQString time = TQDateTime::tqcurrentDateTime().toString()); FilterMatch(int season, int episode, TQString link, TQString time = TQDateTime::currentDateTime().toString());
FilterMatch(const FilterMatch &other); FilterMatch(const FilterMatch &other);
FilterMatch &operator=(const FilterMatch &other); FilterMatch &operator=(const FilterMatch &other);
bool operator==(const FilterMatch &other) const; bool operator==(const FilterMatch &other) const;

14
plugins/rssfeed/rsslinkdownloader.cpp
Unescape View File

@ -42,7 +42,7 @@ namespace kt
if (!KURL(link).isValid()) if (!KURL(link).isValid())
{ {
// no valid URL, so just display an error message // no valid URL, so just display an error message
KMessageBox::error(0,i18n("Failed to find and download a valid torrent for %1").tqarg(curLink)); KMessageBox::error(0,i18n("Failed to find and download a valid torrent for %1").arg(curLink));
TQTimer::singleShot(50,this,TQT_SLOT(suicide())); TQTimer::singleShot(50,this,TQT_SLOT(suicide()));
} }
else else
@ -59,10 +59,10 @@ namespace kt
} }
void RssLinkDownloader::processLink(KIO::Job* jobtqStatus) void RssLinkDownloader::processLink(KIO::Job* jobStatus)
{ {
if (!jobtqStatus->error()) if (!jobStatus->error())
{ {
//the file downloaded ok - so let's check if it's a torrent //the file downloaded ok - so let's check if it's a torrent
KMimeType linkType = *KMimeType::findByContent(curFile->data()); KMimeType linkType = *KMimeType::findByContent(curFile->data());
@ -100,15 +100,15 @@ namespace kt
hrefText = TQString("HREF=\"?([^\">< ]*)[\" ]"); hrefText = TQString("HREF=\"?([^\">< ]*)[\" ]");
hrefText.setCaseSensitive(false); hrefText.setCaseSensitive(false);
hrefTags.tqcapturedTexts()[0].find(hrefText); hrefTags.capturedTexts()[0].find(hrefText);
//lets get the captured //lets get the captured
TQString hrefLink = hrefText.capturedTexts()[1]; TQString hrefLink = hrefText.capturedTexts()[1];
if (hrefLink.tqstartsWith("/")) if (hrefLink.startsWith("/"))
{ {
hrefLink = url.protocol() + "://" + url.host() + hrefLink; hrefLink = url.protocol() + "://" + url.host() + hrefLink;
} }
else if (!hrefLink.tqstartsWith("http://", false)) else if (!hrefLink.startsWith("http://", false))
{ {
hrefLink = url.url().left(url.url().findRev("/")+1) + hrefLink; hrefLink = url.url().left(url.url().findRev("/")+1) + hrefLink;
} }
@ -180,7 +180,7 @@ namespace kt
else else
{ {
//failed to download a selected article from a feed //failed to download a selected article from a feed
KMessageBox::error(0,i18n("Failed to find and download a valid torrent for %1").tqarg(curLink)); KMessageBox::error(0,i18n("Failed to find and download a valid torrent for %1").arg(curLink));
} }
deleteLater(); deleteLater();
} }

2
plugins/rssfeed/rsslinkdownloader.h
Unescape View File

@ -59,7 +59,7 @@ namespace kt
public slots: public slots:
void processLink(KIO::Job* jobtqStatus); void processLink(KIO::Job* jobStatus);
void suicide(); void suicide();
signals: signals:

6
plugins/scanfolder/scanfolderprefpagewidget.cpp
Unescape View File

@ -73,7 +73,7 @@ namespace kt
TQString message = i18n( "ScanFolder - Folder %1: Invalid URL or folder does not exist. Please, choose a valid directory." ); TQString message = i18n( "ScanFolder - Folder %1: Invalid URL or folder does not exist. Please, choose a valid directory." );
if(!TQFile::exists(sfPath1) && usesf1) if(!TQFile::exists(sfPath1) && usesf1)
{ {
KMessageBox::sorry(0, message.tqarg( 1 ) ); KMessageBox::sorry(0, message.arg( 1 ) );
usesf1 = false; usesf1 = false;
} }
else else
@ -81,7 +81,7 @@ namespace kt
if(!TQFile::exists(sfPath2) && usesf2) if(!TQFile::exists(sfPath2) && usesf2)
{ {
KMessageBox::sorry(0, message.tqarg( 2 ) ); KMessageBox::sorry(0, message.arg( 2 ) );
usesf2 = false; usesf2 = false;
} }
else else
@ -89,7 +89,7 @@ namespace kt
if(!TQFile::exists(sfPath3) && usesf3) if(!TQFile::exists(sfPath3) && usesf3)
{ {
KMessageBox::sorry(0, message.tqarg( 3 ) ); KMessageBox::sorry(0, message.arg( 3 ) );
usesf3 = false; usesf3 = false;
} }
else else

6
plugins/scanfolder/sfprefwidgetbase.ui
Unescape View File

@ -21,7 +21,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout16</cstring> <cstring>layout16</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -188,7 +188,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -205,7 +205,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>90</height> <height>90</height>

12
plugins/scheduler/bwscheduler.cpp
Unescape View File

@ -160,9 +160,9 @@ namespace kt
if(!m_enabled) if(!m_enabled)
return; return;
TQDateTime now = TQDateTime::tqcurrentDateTime(); TQDateTime now = TQDateTime::currentDateTime();
TQString prefix = TQString("BWS: %1 :: ").tqarg(now.toString()); TQString prefix = TQString("BWS: %1 :: ").arg(now.toString());
int t1 = now.date().dayOfWeek(); int t1 = now.date().dayOfWeek();
int t2 = now.time().hour(); int t2 = now.time().hour();
@ -173,7 +173,7 @@ namespace kt
case CAT_NORMAL: case CAT_NORMAL:
Out(SYS_SCD|LOG_NOTICE) << prefix << "Switching to NORMAL category" << endl; Out(SYS_SCD|LOG_NOTICE) << prefix << "Switching to NORMAL category" << endl;
Out(SYS_SCD|LOG_NOTICE) << prefix << TQString("%1 Up, %2 Down") Out(SYS_SCD|LOG_NOTICE) << prefix << TQString("%1 Up, %2 Down")
.tqarg(m_core->getMaxUploadSpeed()).tqarg(m_core->getMaxDownloadSpeed()) << endl; .arg(m_core->getMaxUploadSpeed()).arg(m_core->getMaxDownloadSpeed()) << endl;
if(!m_core) if(!m_core)
break; break;
m_core->setPausedState(false); m_core->setPausedState(false);
@ -183,7 +183,7 @@ namespace kt
case CAT_FIRST: case CAT_FIRST:
Out(SYS_SCD|LOG_NOTICE) << prefix << "Switching to FIRST category" << endl; Out(SYS_SCD|LOG_NOTICE) << prefix << "Switching to FIRST category" << endl;
Out(SYS_SCD|LOG_NOTICE) << prefix << TQString("%1 Up, %2 Down") Out(SYS_SCD|LOG_NOTICE) << prefix << TQString("%1 Up, %2 Down")
.tqarg(m_schedule.getUpload(0)).tqarg(m_schedule.getDownload(0)) << endl; .arg(m_schedule.getUpload(0)).arg(m_schedule.getDownload(0)) << endl;
if(!m_core) if(!m_core)
break; break;
m_core->setPausedState(false); m_core->setPausedState(false);
@ -193,7 +193,7 @@ namespace kt
case CAT_SECOND: case CAT_SECOND:
Out(SYS_SCD|LOG_NOTICE) << prefix << "Switching to SECOND category" << endl; Out(SYS_SCD|LOG_NOTICE) << prefix << "Switching to SECOND category" << endl;
Out(SYS_SCD|LOG_NOTICE) << prefix << TQString("%1 Up, %2 Down") Out(SYS_SCD|LOG_NOTICE) << prefix << TQString("%1 Up, %2 Down")
.tqarg(m_schedule.getUpload(1)).tqarg(m_schedule.getDownload(1)) << endl; .arg(m_schedule.getUpload(1)).arg(m_schedule.getDownload(1)) << endl;
if(!m_core) if(!m_core)
break; break;
m_core->setPausedState(false); m_core->setPausedState(false);
@ -203,7 +203,7 @@ namespace kt
case CAT_THIRD: case CAT_THIRD:
Out(SYS_SCD|LOG_NOTICE) << prefix << "Switching to THIRD category" << endl; Out(SYS_SCD|LOG_NOTICE) << prefix << "Switching to THIRD category" << endl;
Out(SYS_SCD|LOG_NOTICE) << prefix << TQString("%1 Up, %2 Down") Out(SYS_SCD|LOG_NOTICE) << prefix << TQString("%1 Up, %2 Down")
.tqarg(m_schedule.getUpload(2)).tqarg(m_schedule.getDownload(2)) << endl; .arg(m_schedule.getUpload(2)).arg(m_schedule.getDownload(2)) << endl;
if(!m_core) if(!m_core)
break; break;
m_core->setPausedState(false); m_core->setPausedState(false);

54
plugins/scheduler/bwspage.ui
Unescape View File

@ -12,13 +12,13 @@
<height>530</height> <height>530</height>
</rect> </rect>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>750</width> <width>750</width>
<height>540</height> <height>540</height>
@ -36,7 +36,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="1"> <widget class="TQLayoutWidget" row="0" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout21</cstring> <cstring>layout21</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -73,7 +73,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>15</height> <height>15</height>
@ -95,7 +95,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>15</height> <height>15</height>
@ -117,7 +117,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>15</height> <height>15</height>
@ -139,7 +139,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>15</height> <height>15</height>
@ -177,7 +177,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>15</height> <height>15</height>
@ -245,7 +245,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>15</height> <height>15</height>
@ -267,7 +267,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>15</height> <height>15</height>
@ -289,7 +289,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>15</height> <height>15</height>
@ -311,7 +311,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>15</height> <height>15</height>
@ -349,7 +349,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>30</width> <width>30</width>
<height>15</height> <height>15</height>
@ -411,7 +411,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="1" column="0"> <widget class="TQLayoutWidget" row="1" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout8</cstring> <cstring>layout8</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -461,7 +461,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="3" column="0"> <widget class="TQLayoutWidget" row="3" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout9</cstring> <cstring>layout9</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -511,7 +511,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="5" column="0"> <widget class="TQLayoutWidget" row="5" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout10</cstring> <cstring>layout10</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -581,13 +581,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>379</width> <width>379</width>
<height>510</height> <height>510</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>379</width> <width>379</width>
<height>508</height> <height>508</height>
@ -596,7 +596,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="2" column="1"> <widget class="TQLayoutWidget" row="2" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout34</cstring> <cstring>layout34</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -604,7 +604,7 @@
</property> </property>
<widget class="TQLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>lbltqStatus</cstring> <cstring>lblStatus</cstring>
</property> </property>
<property name="text"> <property name="text">
<string></string> <string></string>
@ -625,7 +625,7 @@
<property name="text"> <property name="text">
<string>* zero means no limit</string> <string>* zero means no limit</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -641,7 +641,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -650,7 +650,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget" row="4" column="1"> <widget class="TQLayoutWidget" row="4" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout32</cstring> <cstring>layout32</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -658,7 +658,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout31</cstring> <cstring>layout31</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -700,7 +700,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>36</width> <width>36</width>
<height>20</height> <height>20</height>
@ -728,7 +728,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>35</width> <width>35</width>
<height>20</height> <height>20</height>
@ -737,7 +737,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout29</cstring> <cstring>layout29</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">

8
plugins/scheduler/bwsprefpagewidget.cpp
Unescape View File

@ -51,7 +51,7 @@ namespace kt
loadDefault(); loadDefault();
lbltqStatus->clear(); lblStatus->clear();
pix_icon->setPixmap(KGlobal::iconLoader()->loadIcon("clock",KIcon::NoGroup)); pix_icon->setPixmap(KGlobal::iconLoader()->loadIcon("clock",KIcon::NoGroup));
@ -162,7 +162,7 @@ namespace kt
stream << (int) schedule.getCategory(i, j); stream << (int) schedule.getCategory(i, j);
file.close(); file.close();
lbltqStatus->setText(i18n("Schedule saved.")); lblStatus->setText(i18n("Schedule saved."));
} }
void BWSPrefPageWidget::loadSchedule(TQString& fn, bool showmsg) void BWSPrefPageWidget::loadSchedule(TQString& fn, bool showmsg)
@ -205,7 +205,7 @@ namespace kt
file.close(); file.close();
m_bwsWidget->setSchedule(schedule); m_bwsWidget->setSchedule(schedule);
lbltqStatus->setText(i18n("Schedule loaded.")); lblStatus->setText(i18n("Schedule loaded."));
} }
void BWSPrefPageWidget::loadDefault() void BWSPrefPageWidget::loadDefault()
@ -228,7 +228,7 @@ namespace kt
ulCat2->setValue(0); ulCat2->setValue(0);
ulCat3->setValue(0); ulCat3->setValue(0);
lbltqStatus->clear(); lblStatus->clear();
} }
void BWSPrefPageWidget::apply() void BWSPrefPageWidget::apply()

6
plugins/scheduler/schedulerpage.ui
Unescape View File

@ -72,7 +72,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -89,7 +89,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>80</height> <height>80</height>
@ -108,7 +108,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>

4
plugins/scheduler/schedulerplugin.cpp
Unescape View File

@ -74,7 +74,7 @@ namespace kt
getGUI()->addPrefPage(Pref); getGUI()->addPrefPage(Pref);
BWScheduler::instance().setCoreInterface(getCore()); BWScheduler::instance().setCoreInterface(getCore());
TQDateTime now = TQDateTime::tqcurrentDateTime(); TQDateTime now = TQDateTime::currentDateTime();
//each hour //each hour
TQDateTime hour = now.addSecs(3600); TQDateTime hour = now.addSecs(3600);
@ -115,7 +115,7 @@ namespace kt
void SchedulerPlugin::timer_triggered() void SchedulerPlugin::timer_triggered()
{ {
m_timer.changeInterval(3600*1000); m_timer.changeInterval(3600*1000);
TQDateTime now = TQDateTime::tqcurrentDateTime(); TQDateTime now = TQDateTime::currentDateTime();
BWScheduler::instance().trigger(); BWScheduler::instance().trigger();
} }

4
plugins/search/htmlpart.cpp
Unescape View File

@ -21,7 +21,7 @@
#include <kio/job.h> #include <kio/job.h>
#include <kio/jobclasses.h> #include <kio/jobclasses.h>
//#include <tqfile.h> //#include <tqfile.h>
#include <tqclipboard.h> #include <clipboard.h>
#include <tqapplication.h> #include <tqapplication.h>
#include <kio/netaccess.h> #include <kio/netaccess.h>
#include <klocale.h> #include <klocale.h>
@ -60,7 +60,7 @@ namespace kt
void HTMLPart::copy() void HTMLPart::copy()
{ {
TQString txt = selectedText(); TQString txt = selectedText();
TQClipboard *cb = TQApplication::tqclipboard(); TQClipboard *cb = TQApplication::clipboard();
// Copy text into the clipboard // Copy text into the clipboard
if (cb) if (cb)
cb->setText(txt,TQClipboard::Clipboard); cb->setText(txt,TQClipboard::Clipboard);

2
plugins/search/searchbar.ui
Unescape View File

@ -63,7 +63,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Maximum</enum> <enum>Maximum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>60</width> <width>60</width>
<height>20</height> <height>20</height>

2
plugins/search/searchenginelist.cpp
Unescape View File

@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
#include <tqfile.h> #include <tqfile.h>
#include <tqtextstream.h> #include <textstream.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include "searchenginelist.h" #include "searchenginelist.h"

2
plugins/search/searchplugin.cpp
Unescape View File

@ -108,7 +108,7 @@ namespace kt
if(SearchPluginSettings::useDefaultBrowser()) if(SearchPluginSettings::useDefaultBrowser())
kapp->invokeBrowser(url.url()); kapp->invokeBrowser(url.url());
else else
KRun::runCommand(TQString("%1 \"%2\"").tqarg(SearchPluginSettings::customBrowser()).tqarg(url.url()), SearchPluginSettings::customBrowser(), "viewmag" ); KRun::runCommand(TQString("%1 \"%2\"").arg(SearchPluginSettings::customBrowser()).arg(url.url()), SearchPluginSettings::customBrowser(), "viewmag" );
return; return;
} }

16
plugins/search/searchpref.ui
Unescape View File

@ -20,7 +20,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>500</width> <width>500</width>
<height>350</height> <height>350</height>
@ -65,7 +65,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout29</cstring> <cstring>layout29</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -97,7 +97,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -129,7 +129,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout22</cstring> <cstring>layout22</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -152,7 +152,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout23</cstring> <cstring>layout23</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -223,7 +223,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>50</height> <height>50</height>
@ -235,7 +235,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout5</cstring> <cstring>layout5</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -267,7 +267,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Maximum</enum> <enum>Maximum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>

4
plugins/search/searchprefpage.cpp
Unescape View File

@ -53,9 +53,9 @@ namespace kt
" (capital letters) on the search engine you want to add. <br> " " (capital letters) on the search engine you want to add. <br> "
"Then copy the URL in the addressbar after the search is finished, and paste it here.<br><br>Searching for %1" "Then copy the URL in the addressbar after the search is finished, and paste it here.<br><br>Searching for %1"
" on Google for example, will result in http://www.google.com/search?q=FOOBAR&ie=UTF-8&oe=UTF-8. <br> " " on Google for example, will result in http://www.google.com/search?q=FOOBAR&ie=UTF-8&oe=UTF-8. <br> "
"If you add this URL here, ktorrent can search using Google.").tqarg("FOOBAR").tqarg("FOOBAR"); "If you add this URL here, ktorrent can search using Google.").arg("FOOBAR").arg("FOOBAR");
TQString info_short = i18n("Use your web browser to search for the string %1 (capital letters) " TQString info_short = i18n("Use your web browser to search for the string %1 (capital letters) "
"on the search engine you want to add. Use the resulting URL below.").tqarg("FOOBAR"); "on the search engine you want to add. Use the resulting URL below.").arg("FOOBAR");
m_infoLabel->setText(info_short); m_infoLabel->setText(info_short);
TQToolTip::add(m_infoLabel,info); TQToolTip::add(m_infoLabel,info);
TQToolTip::add(m_engine_name,info); TQToolTip::add(m_engine_name,info);

2
plugins/search/searchtab.cpp
Unescape View File

@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
#include <tqfile.h> #include <tqfile.h>
#include <tqtextstream.h> #include <textstream.h>
#include <tqapplication.h> #include <tqapplication.h>
#include <tqlistbox.h> #include <tqlistbox.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>

10
plugins/search/searchwidget.cpp
Unescape View File

@ -21,9 +21,9 @@
#include <kapplication.h> #include <kapplication.h>
#include <khtmlview.h> #include <khtmlview.h>
#include <tqlayout.h> #include <layout.h>
#include <tqfile.h> #include <tqfile.h>
#include <tqtextstream.h> #include <textstream.h>
#include <tqstring.h> #include <tqstring.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include <klineedit.h> #include <klineedit.h>
@ -59,8 +59,8 @@ namespace kt
SearchWidget::SearchWidget(SearchPlugin* sp) : html_part(0),sp(sp) SearchWidget::SearchWidget(SearchPlugin* sp) : html_part(0),sp(sp)
{ {
TQVBoxLayout* tqlayout = new TQVBoxLayout(this); TQVBoxLayout* layout = new TQVBoxLayout(this);
tqlayout->setAutoAdd(true); layout->setAutoAdd(true);
sbar = new SearchBar(this); sbar = new SearchBar(this);
html_part = new HTMLPart(this); html_part = new HTMLPart(this);
@ -175,7 +175,7 @@ namespace kt
s_url.replace("FOOBAR", KURL::encode_string(text), true); s_url.replace("FOOBAR", KURL::encode_string(text), true);
KURL url = KURL::fromPathOrURL(s_url); KURL url = KURL::fromPathOrURL(s_url);
statusBarMsg(i18n("Searching for %1...").tqarg(text)); statusBarMsg(i18n("Searching for %1...").arg(text));
//html_part->openURL(url); //html_part->openURL(url);
html_part->openURLRequest(url,KParts::URLArgs()); html_part->openURLRequest(url,KParts::URLArgs());
} }

4
plugins/stats/ChartDrawer.cc
Unescape View File

@ -416,7 +416,7 @@ void ChartDrawer::MakeLegendTooltip()
{ {
TQToolTip::remove(this); TQToolTip::remove(this);
TQString helpstr(TQString("<b>%1:</b><br><br>").tqarg(i18n("Legend"))); TQString helpstr(TQString("<b>%1:</b><br><br>").arg(i18n("Legend")));
TQMimeSourceFactory* factory = TQMimeSourceFactory::defaultFactory(); TQMimeSourceFactory* factory = TQMimeSourceFactory::defaultFactory();
std::vector<TQImage> img; std::vector<TQImage> img;
@ -434,7 +434,7 @@ void ChartDrawer::MakeLegendTooltip()
} }
factory->setImage(mEls[i].GetName().replace(' ', '_') + "-" + TQString::number(i), img[i]); factory->setImage(mEls[i].GetName().replace(' ', '_') + "-" + TQString::number(i), img[i]);
helpstr += TQString("<img src='%1'>&nbsp;&nbsp;-&nbsp;&nbsp;%2<br>").tqarg(mEls[i].GetName().replace(" ", "_") + "-" + TQString::number(i)).tqarg( mEls[i].GetName() ); helpstr += TQString("<img src='%1'>&nbsp;&nbsp;-&nbsp;&nbsp;%2<br>").arg(mEls[i].GetName().replace(" ", "_") + "-" + TQString::number(i)).arg( mEls[i].GetName() );
} }
TQToolTip::add(this, helpstr); TQToolTip::add(this, helpstr);

12
plugins/stats/StatsCon.cc
Unescape View File

@ -26,16 +26,16 @@ StatsCon::StatsCon(TQWidget * p) : StatsConWgt(p), pmPeersConCht(new ChartDrawe
pmDHTCht(new ChartDrawer(DHTGbw, StatsPluginSettings::dHTMeasurements())) pmDHTCht(new ChartDrawer(DHTGbw, StatsPluginSettings::dHTMeasurements()))
{ {
PeersConGbw->setColumnLayout(0, Qt::Vertical ); PeersConGbw->setColumnLayout(0, Qt::Vertical );
PeersConGbw->tqlayout()->setSpacing( 6 ); PeersConGbw->layout()->setSpacing( 6 );
PeersConGbw->tqlayout()->setMargin( 11 ); PeersConGbw->layout()->setMargin( 11 );
pmPeersConLay = new TQVBoxLayout(PeersConGbw -> tqlayout()); pmPeersConLay = new TQVBoxLayout(PeersConGbw -> layout());
DHTGbw->setColumnLayout(0, Qt::Vertical ); DHTGbw->setColumnLayout(0, Qt::Vertical );
DHTGbw->tqlayout()->setSpacing( 6 ); DHTGbw->layout()->setSpacing( 6 );
DHTGbw->tqlayout()->setMargin( 11 ); DHTGbw->layout()->setMargin( 11 );
pmDHTLay = new TQVBoxLayout(DHTGbw -> tqlayout()); pmDHTLay = new TQVBoxLayout(DHTGbw -> layout());
//------------- //-------------

2
plugins/stats/StatsCon.h
Unescape View File

@ -22,7 +22,7 @@
#define STATSCON_H_ #define STATSCON_H_
#include <tqwidget.h> #include <tqwidget.h>
#include <tqlayout.h> #include <layout.h>
#include <tqtabwidget.h> #include <tqtabwidget.h>
#include <tqgroupbox.h> #include <tqgroupbox.h>

18
plugins/stats/StatsSpd.cc
Unescape View File

@ -29,22 +29,22 @@ StatsSpd::StatsSpd(TQWidget *p) : StatsSpdWgt(p),
{ {
DownSpeedGbw->setColumnLayout(0, Qt::Vertical ); DownSpeedGbw->setColumnLayout(0, Qt::Vertical );
DownSpeedGbw->tqlayout()->setSpacing( 6 ); DownSpeedGbw->layout()->setSpacing( 6 );
DownSpeedGbw->tqlayout()->setMargin( 11 ); DownSpeedGbw->layout()->setMargin( 11 );
pmDSpdLay = new TQVBoxLayout(DownSpeedGbw -> tqlayout()); pmDSpdLay = new TQVBoxLayout(DownSpeedGbw -> layout());
UpSpeedGbw->setColumnLayout(0, Qt::Vertical ); UpSpeedGbw->setColumnLayout(0, Qt::Vertical );
UpSpeedGbw->tqlayout()->setSpacing( 6 ); UpSpeedGbw->layout()->setSpacing( 6 );
UpSpeedGbw->tqlayout()->setMargin( 11 ); UpSpeedGbw->layout()->setMargin( 11 );
pmUSpdLay = new TQVBoxLayout(UpSpeedGbw -> tqlayout()); pmUSpdLay = new TQVBoxLayout(UpSpeedGbw -> layout());
PeersSpdGbw->setColumnLayout(0, Qt::Vertical ); PeersSpdGbw->setColumnLayout(0, Qt::Vertical );
PeersSpdGbw->tqlayout()->setSpacing( 6 ); PeersSpdGbw->layout()->setSpacing( 6 );
PeersSpdGbw->tqlayout()->setMargin( 11 ); PeersSpdGbw->layout()->setMargin( 11 );
pmPeersSpdLay = new TQVBoxLayout(PeersSpdGbw -> tqlayout()); pmPeersSpdLay = new TQVBoxLayout(PeersSpdGbw -> layout());
//----------------- //-----------------

2
plugins/stats/StatsSpd.h
Unescape View File

@ -22,7 +22,7 @@
#define STATSSPD_H_ #define STATSSPD_H_
#include <tqwidget.h> #include <tqwidget.h>
#include <tqlayout.h> #include <layout.h>
#include <tqtabwidget.h> #include <tqtabwidget.h>
#include <tqgroupbox.h> #include <tqgroupbox.h>

24
plugins/stats/sprefwgt.ui
Unescape View File

@ -32,7 +32,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout2</cstring> <cstring>layout2</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -78,7 +78,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout4</cstring> <cstring>layout4</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -140,7 +140,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout11</cstring> <cstring>layout11</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -197,7 +197,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout3</cstring> <cstring>layout3</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -253,7 +253,7 @@
<property name="text"> <property name="text">
<string>Gathering data about many connected peers can be CPU consuming.</string> <string>Gathering data about many connected peers can be CPU consuming.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -275,7 +275,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -314,7 +314,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout5</cstring> <cstring>layout5</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -346,7 +346,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="1" column="0"> <widget class="TQLayoutWidget" row="1" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout5_2</cstring> <cstring>layout5_2</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -378,7 +378,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="2" column="0"> <widget class="TQLayoutWidget" row="2" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout5_3</cstring> <cstring>layout5_3</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -410,7 +410,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="1"> <widget class="TQLayoutWidget" row="0" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout5_5</cstring> <cstring>layout5_5</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -442,7 +442,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="1" column="1"> <widget class="TQLayoutWidget" row="1" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout5_4</cstring> <cstring>layout5_4</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -484,7 +484,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>

2
plugins/stats/statsconwgt.ui
Unescape View File

@ -18,7 +18,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout3</cstring> <cstring>layout3</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

2
plugins/stats/statsspdwgt.ui
Unescape View File

@ -18,7 +18,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout5</cstring> <cstring>layout5</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

6
plugins/upnp/soap.cpp
Unescape View File

@ -29,7 +29,7 @@ namespace kt
"<SOAP-ENV:Body>" "<SOAP-ENV:Body>"
"<m:%1 xmlns:m=\"%2\"/>" "<m:%1 xmlns:m=\"%2\"/>"
"</SOAP-ENV:Body></SOAP-ENV:Envelope>" "</SOAP-ENV:Body></SOAP-ENV:Envelope>"
"\r\n").tqarg(action).tqarg(service); "\r\n").arg(action).arg(service);
return comm; return comm;
} }
@ -39,7 +39,7 @@ namespace kt
TQString comm = TQString("<?xml version=\"1.0\"?>\r\n" TQString comm = TQString("<?xml version=\"1.0\"?>\r\n"
"<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" SOAP-ENV:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">" "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" SOAP-ENV:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">"
"<SOAP-ENV:Body>" "<SOAP-ENV:Body>"
"<m:%1 xmlns:m=\"%2\">").tqarg(action).tqarg(service); "<m:%1 xmlns:m=\"%2\">").arg(action).arg(service);
for (TQValueList<Arg>::const_iterator i = args.begin();i != args.end();i++) for (TQValueList<Arg>::const_iterator i = args.begin();i != args.end();i++)
{ {
@ -47,7 +47,7 @@ namespace kt
comm += "<" + a.element + ">" + a.value + "</" + a.element + ">"; comm += "<" + a.element + ">" + a.value + "</" + a.element + ">";
} }
comm += TQString("</m:%1></SOAP-ENV:Body></SOAP-ENV:Envelope>\r\n").tqarg(action); comm += TQString("</m:%1></SOAP-ENV:Body></SOAP-ENV:Envelope>\r\n").arg(action);
return comm; return comm;
} }
} }

4
plugins/upnp/upnpdescriptionparser.cpp
Unescape View File

@ -32,7 +32,7 @@ namespace kt
class XMLContentHandler : public TQXmlDefaultHandler class XMLContentHandler : public TQXmlDefaultHandler
{ {
enum tqStatus enum Status
{ {
TOPLEVEL,ROOT,DEVICE,SERVICE,FIELD,OTHER TOPLEVEL,ROOT,DEVICE,SERVICE,FIELD,OTHER
}; };
@ -40,7 +40,7 @@ namespace kt
TQString tmp; TQString tmp;
UPnPRouter* router; UPnPRouter* router;
UPnPService curr_service; UPnPService curr_service;
TQValueStack<tqStatus> status_stack; TQValueStack<Status> status_stack;
public: public:
XMLContentHandler(UPnPRouter* router); XMLContentHandler(UPnPRouter* router);
virtual ~XMLContentHandler(); virtual ~XMLContentHandler();

2
plugins/upnp/upnpmcastsocket.cpp
Unescape View File

@ -35,7 +35,7 @@ extern "C" {
#include <util/log.h> #include <util/log.h>
#include <torrent/globals.h> #include <torrent/globals.h>
#include <tqfile.h> #include <tqfile.h>
#include <tqtextstream.h> #include <textstream.h>
#include "upnpmcastsocket.h" #include "upnpmcastsocket.h"
using namespace KNetwork; using namespace KNetwork;

6
plugins/upnp/upnprouter.cpp
Unescape View File

@ -113,7 +113,7 @@ namespace kt
UPnPRouter::UPnPRouter(const TQString & server,const KURL & location,bool verbose) : server(server),location(location),verbose(verbose) UPnPRouter::UPnPRouter(const TQString & server,const KURL & location,bool verbose) : server(server),location(location),verbose(verbose)
{ {
// make the tmp_file unique, current time * a random number should be enough // make the tmp_file unique, current time * a random number should be enough
tmp_file = TQString("/tmp/ktorrent_upnp_description-%1.xml").tqarg(bt::GetCurrentTime() * rand()); tmp_file = TQString("/tmp/ktorrent_upnp_description-%1.xml").arg(bt::GetCurrentTime() * rand());
} }
@ -227,7 +227,7 @@ namespace kt
a.element = "NewPortMappingDescription"; a.element = "NewPortMappingDescription";
static Uint32 cnt = 0; static Uint32 cnt = 0;
a.value = TQString("KTorrent UPNP %1").tqarg(cnt++); // TODO: change this a.value = TQString("KTorrent UPNP %1").arg(cnt++); // TODO: change this
args.append(a); args.append(a);
a.element = "NewLeaseDuration"; a.element = "NewLeaseDuration";
@ -335,7 +335,7 @@ namespace kt
"Content-length: $CONTENT_LENGTH\r\n" "Content-length: $CONTENT_LENGTH\r\n"
"Content-Type: text/xml\r\n" "Content-Type: text/xml\r\n"
"SOAPAction: \"%4\"\r\n" "SOAPAction: \"%4\"\r\n"
"\r\n").tqarg(controlurl).tqarg(location.host()).tqarg(location.port()).tqarg(soapact); "\r\n").arg(controlurl).arg(location.host()).arg(location.port()).arg(soapact);
HTTPRequest* r = new HTTPRequest(http_hdr,query,location.host(),location.port(),verbose); HTTPRequest* r = new HTTPRequest(http_hdr,query,location.host(),location.port(),verbose);

6
plugins/upnp/upnpwidget.ui
Unescape View File

@ -21,7 +21,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout1</cstring> <cstring>layout1</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -77,7 +77,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout3</cstring> <cstring>layout3</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -109,7 +109,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>70</width> <width>70</width>
<height>20</height> <height>20</height>

4
plugins/webinterface/httpclienthandler.cpp
Unescape View File

@ -171,7 +171,7 @@ namespace kt
void HttpClientHandler::send500(HttpResponseHeader & hdr) void HttpClientHandler::send500(HttpResponseHeader & hdr)
{ {
// Out(SYS_WEB|LOG_DEBUG) << "Sending 500 " << endl; // Out(SYS_WEB|LOG_DEBUG) << "Sending 500 " << endl;
TQString data = TQString(HTTP_500_ERROR).tqarg("An internal server error occured !"); TQString data = TQString(HTTP_500_ERROR).arg("An internal server error occured !");
hdr.setValue("Content-Length",TQString::number(data.length())); hdr.setValue("Content-Length",TQString::number(data.length()));
TQTextStream os(client); TQTextStream os(client);
@ -199,7 +199,7 @@ namespace kt
php = new PhpHandler(php_exe,php_iface); php = new PhpHandler(php_exe,php_iface);
if (!php->executeScript(php_file,args)) if (!php->executeScript(php_file,args))
{ {
TQString data = TQString(HTTP_500_ERROR).tqarg("Failed to launch PHP executable !"); TQString data = TQString(HTTP_500_ERROR).arg("Failed to launch PHP executable !");
hdr.setResponseCode(500); hdr.setResponseCode(500);
hdr.setValue("Content-Length",TQString::number(data.utf8().length())); hdr.setValue("Content-Length",TQString::number(data.utf8().length()));

4
plugins/webinterface/httpresponseheader.cpp
Unescape View File

@ -61,12 +61,12 @@ namespace kt
TQString HttpResponseHeader::toString() const TQString HttpResponseHeader::toString() const
{ {
TQString str; TQString str;
str += TQString("HTTP/1.1 %1 %2\r\n").tqarg(response_code).tqarg(ResponseCodeToString(response_code)); str += TQString("HTTP/1.1 %1 %2\r\n").arg(response_code).arg(ResponseCodeToString(response_code));
TQMap<TQString,TQString>::const_iterator itr = fields.begin(); TQMap<TQString,TQString>::const_iterator itr = fields.begin();
while (itr != fields.end()) while (itr != fields.end())
{ {
str += TQString("%1: %2\r\n").tqarg(itr.key()).tqarg(itr.data()); str += TQString("%1: %2\r\n").arg(itr.key()).arg(itr.data());
itr++; itr++;
} }
str += "\r\n"; str += "\r\n";

20
plugins/webinterface/httpserver.cpp
Unescape View File

@ -237,23 +237,23 @@ namespace kt
{ {
if (!cookie) if (!cookie)
return now.toString("%1, dd %2 yyyy hh:mm:ss UTC") return now.toString("%1, dd %2 yyyy hh:mm:ss UTC")
.tqarg(days[now.date().dayOfWeek() - 1]) .arg(days[now.date().dayOfWeek() - 1])
.tqarg(months[now.date().month() - 1]); .arg(months[now.date().month() - 1]);
else else
return now.toString("%1, dd-%2-yyyy hh:mm:ss GMT") return now.toString("%1, dd-%2-yyyy hh:mm:ss GMT")
.tqarg(days[now.date().dayOfWeek() - 1]) .arg(days[now.date().dayOfWeek() - 1])
.tqarg(months[now.date().month() - 1]); .arg(months[now.date().month() - 1]);
} }
void HttpServer::setDefaultResponseHeaders(HttpResponseHeader & hdr,const TQString & content_type,bool with_session_info) void HttpServer::setDefaultResponseHeaders(HttpResponseHeader & hdr,const TQString & content_type,bool with_session_info)
{ {
hdr.setValue("Server","KTorrent/" KT_VERSION_MACRO); hdr.setValue("Server","KTorrent/" KT_VERSION_MACRO);
hdr.setValue("Date",DateTimeToString(TQDateTime::tqcurrentDateTime(Qt::UTC),false)); hdr.setValue("Date",DateTimeToString(TQDateTime::currentDateTime(Qt::UTC),false));
hdr.setValue("Content-Type",content_type); hdr.setValue("Content-Type",content_type);
hdr.setValue("Connection","keep-alive"); hdr.setValue("Connection","keep-alive");
if (with_session_info && session.sessionId && session.logged_in) if (with_session_info && session.sessionId && session.logged_in)
{ {
hdr.setValue("Set-Cookie",TQString("KT_SESSID=%1").tqarg(session.sessionId)); hdr.setValue("Set-Cookie",TQString("KT_SESSID=%1").arg(session.sessionId));
} }
} }
@ -328,8 +328,8 @@ namespace kt
if (path.endsWith("login.html")) if (path.endsWith("login.html"))
{ {
// clear cookie in case of login page // clear cookie in case of login page
TQDateTime dt = TQDateTime::tqcurrentDateTime().addDays(-1); TQDateTime dt = TQDateTime::currentDateTime().addDays(-1);
TQString cookie = TQString("KT_SESSID=666; expires=%1 +0000").tqarg(DateTimeToString(dt,true)); TQString cookie = TQString("KT_SESSID=666; expires=%1 +0000").arg(DateTimeToString(dt,true));
rhdr.setValue("Set-Cookie",cookie); rhdr.setValue("Set-Cookie",cookie);
} }
@ -351,7 +351,7 @@ namespace kt
setDefaultResponseHeaders(rhdr,"text/html",true); setDefaultResponseHeaders(rhdr,"text/html",true);
rhdr.setValue("Cache-Control","max-age=0"); rhdr.setValue("Cache-Control","max-age=0");
rhdr.setValue("Last-Modified",DateTimeToString(fi.lastModified(),false)); rhdr.setValue("Last-Modified",DateTimeToString(fi.lastModified(),false));
rhdr.setValue("Expires",DateTimeToString(TQDateTime::tqcurrentDateTime(Qt::UTC).addSecs(3600),false)); rhdr.setValue("Expires",DateTimeToString(TQDateTime::currentDateTime(Qt::UTC).addSecs(3600),false));
hdlr->sendResponse(rhdr); hdlr->sendResponse(rhdr);
return; return;
} }
@ -361,7 +361,7 @@ namespace kt
HttpResponseHeader rhdr(200); HttpResponseHeader rhdr(200);
setDefaultResponseHeaders(rhdr,ExtensionToContentType(ext),true); setDefaultResponseHeaders(rhdr,ExtensionToContentType(ext),true);
rhdr.setValue("Last-Modified",DateTimeToString(fi.lastModified(),false)); rhdr.setValue("Last-Modified",DateTimeToString(fi.lastModified(),false));
rhdr.setValue("Expires",DateTimeToString(TQDateTime::tqcurrentDateTime(Qt::UTC).addSecs(3600),false)); rhdr.setValue("Expires",DateTimeToString(TQDateTime::currentDateTime(Qt::UTC).addSecs(3600),false));
rhdr.setValue("Cache-Control","private"); rhdr.setValue("Cache-Control","private");
if (!hdlr->sendFile(rhdr,path)) if (!hdlr->sendFile(rhdr,path))
{ {

4
plugins/webinterface/php_handler.cpp
Unescape View File

@ -76,13 +76,13 @@ namespace kt
ts.setEncoding( TQTextStream::UnicodeUTF8 ); ts.setEncoding( TQTextStream::UnicodeUTF8 );
ts.writeRawBytes(php_s.data(),off); // first write the opening tag from the script ts.writeRawBytes(php_s.data(),off); // first write the opening tag from the script
php_i->globalInfo(ts); php_i->globalInfo(ts);
php_i->downloadtqStatus(ts); php_i->downloadStatus(ts);
TQMap<TQString,TQString>::const_iterator it; TQMap<TQString,TQString>::const_iterator it;
for ( it = args.begin(); it != args.end(); ++it ) for ( it = args.begin(); it != args.end(); ++it )
{ {
ts << TQString("$_REQUEST['%1']=\"%2\";\n").tqarg(it.key()).tqarg(it.data()); ts << TQString("$_REQUEST['%1']=\"%2\";\n").arg(it.key()).arg(it.data());
} }
ts.writeRawBytes(php_s.data() + off,php_s.size() - off); // the rest of the script ts.writeRawBytes(php_s.data() + off,php_s.size() - off); // the rest of the script
ts << flush; ts << flush;

118
plugins/webinterface/php_interface.cpp
Unescape View File

@ -48,19 +48,19 @@ namespace kt
{ {
KLocale* loc = KGlobal::locale(); KLocale* loc = KGlobal::locale();
if (bytes >= 1024 * 1024 * 1024) if (bytes >= 1024 * 1024 * 1024)
return TQString("%1 GB").tqarg(loc->formatNumber(bytes / TO_GIG,precision < 0 ? 2 : precision)); return TQString("%1 GB").arg(loc->formatNumber(bytes / TO_GIG,precision < 0 ? 2 : precision));
else if (bytes >= 1024*1024) else if (bytes >= 1024*1024)
return TQString("%1 MB").tqarg(loc->formatNumber(bytes / TO_MEG,precision < 0 ? 1 : precision)); return TQString("%1 MB").arg(loc->formatNumber(bytes / TO_MEG,precision < 0 ? 1 : precision));
else if (bytes >= 1024) else if (bytes >= 1024)
return TQString("%1 KB").tqarg(loc->formatNumber(bytes / TO_KB,precision < 0 ? 1 : precision)); return TQString("%1 KB").arg(loc->formatNumber(bytes / TO_KB,precision < 0 ? 1 : precision));
else else
return TQString("%1 B").tqarg(bytes); return TQString("%1 B").arg(bytes);
} }
TQString KBytesPerSecToString2(double speed,int precision = 2) TQString KBytesPerSecToString2(double speed,int precision = 2)
{ {
KLocale* loc = KGlobal::locale(); KLocale* loc = KGlobal::locale();
return TQString("%1 KB/s").tqarg(loc->formatNumber(speed,precision)); return TQString("%1 KB/s").arg(loc->formatNumber(speed,precision));
} }
/************************ /************************
@ -72,12 +72,12 @@ namespace kt
} }
/*Generate php code /*Generate php code
* function downloadtqStatus() * function downloadStatus()
* { * {
* return array( ... ); * return array( ... );
* } * }
*/ */
void PhpCodeGenerator::downloadtqStatus(TQTextStream & out) void PhpCodeGenerator::downloadStatus(TQTextStream & out)
{ {
TorrentStats stats; TorrentStats stats;
//Priority file_priority; //Priority file_priority;
@ -91,42 +91,42 @@ namespace kt
out << ",\n"; out << ",\n";
stats=(*i)->getStats(); stats=(*i)->getStats();
out << TQString("\n%1 => array(").tqarg(k); out << TQString("\n%1 => array(").arg(k);
out << TQString("\"imported_bytes\" => %1,\n").tqarg(stats.imported_bytes); out << TQString("\"imported_bytes\" => %1,\n").arg(stats.imported_bytes);
out << TQString("\"bytes_downloaded\" => \"%1\",\n").tqarg(BytesToString2(stats.bytes_downloaded)); out << TQString("\"bytes_downloaded\" => \"%1\",\n").arg(BytesToString2(stats.bytes_downloaded));
out << TQString("\"bytes_uploaded\" => \"%1\",\n").tqarg(BytesToString2(stats.bytes_uploaded)); out << TQString("\"bytes_uploaded\" => \"%1\",\n").arg(BytesToString2(stats.bytes_uploaded));
out << TQString("\"bytes_left\" => %1,\n").tqarg(stats.bytes_left); out << TQString("\"bytes_left\" => %1,\n").arg(stats.bytes_left);
out << TQString("\"bytes_left_to_download\" => %1,\n").tqarg(stats.bytes_left_to_download); out << TQString("\"bytes_left_to_download\" => %1,\n").arg(stats.bytes_left_to_download);
out << TQString("\"total_bytes\" => \"%1\",\n").tqarg(BytesToString2(stats.total_bytes)); out << TQString("\"total_bytes\" => \"%1\",\n").arg(BytesToString2(stats.total_bytes));
out << TQString("\"total_bytes_to_download\" => %1,\n").tqarg(stats.total_bytes_to_download); out << TQString("\"total_bytes_to_download\" => %1,\n").arg(stats.total_bytes_to_download);
out << TQString("\"download_rate\" => \"%1\",\n").tqarg(KBytesPerSecToString2(stats.download_rate / 1024.0)); out << TQString("\"download_rate\" => \"%1\",\n").arg(KBytesPerSecToString2(stats.download_rate / 1024.0));
out << TQString("\"upload_rate\" => \"%1\",\n").tqarg(KBytesPerSecToString2(stats.upload_rate / 1024.0)); out << TQString("\"upload_rate\" => \"%1\",\n").arg(KBytesPerSecToString2(stats.upload_rate / 1024.0));
out << TQString("\"num_peers\" => %1,\n").tqarg(stats.num_peers); out << TQString("\"num_peers\" => %1,\n").arg(stats.num_peers);
out << TQString("\"num_chunks_downloading\" => %1,\n").tqarg(stats.num_chunks_downloading); out << TQString("\"num_chunks_downloading\" => %1,\n").arg(stats.num_chunks_downloading);
out << TQString("\"total_chunks\" => %1,\n").tqarg(stats.total_chunks); out << TQString("\"total_chunks\" => %1,\n").arg(stats.total_chunks);
out << TQString("\"num_chunks_downloaded\" => %1,\n").tqarg(stats.num_chunks_downloaded); out << TQString("\"num_chunks_downloaded\" => %1,\n").arg(stats.num_chunks_downloaded);
out << TQString("\"num_chunks_excluded\" => %1,\n").tqarg(stats.num_chunks_excluded); out << TQString("\"num_chunks_excluded\" => %1,\n").arg(stats.num_chunks_excluded);
out << TQString("\"chunk_size\" => %1,\n").tqarg(stats.chunk_size); out << TQString("\"chunk_size\" => %1,\n").arg(stats.chunk_size);
out << TQString("\"seeders_total\" => %1,\n").tqarg(stats.seeders_total); out << TQString("\"seeders_total\" => %1,\n").arg(stats.seeders_total);
out << TQString("\"seeders_connected_to\" => %1,\n").tqarg(stats.seeders_connected_to); out << TQString("\"seeders_connected_to\" => %1,\n").arg(stats.seeders_connected_to);
out << TQString("\"leechers_total\" => %1,\n").tqarg(stats.leechers_total); out << TQString("\"leechers_total\" => %1,\n").arg(stats.leechers_total);
out << TQString("\"leechers_connected_to\" => %1,\n").tqarg(stats.leechers_connected_to); out << TQString("\"leechers_connected_to\" => %1,\n").arg(stats.leechers_connected_to);
out << TQString("\"status\" => %1,\n").tqarg(stats.status); out << TQString("\"status\" => %1,\n").arg(stats.status);
out << TQString("\"running\" => %1,\n").tqarg(stats.running); out << TQString("\"running\" => %1,\n").arg(stats.running);
out << TQString("\"trackerstatus\" => \"%1\",\n").tqarg(stats.trackerstatus.replace("\\", "\\\\").replace("\"", "\\\"").replace("$", "\\$")); out << TQString("\"trackerstatus\" => \"%1\",\n").arg(stats.trackerstatus.replace("\\", "\\\\").replace("\"", "\\\"").replace("$", "\\$"));
out << TQString("\"session_bytes_downloaded\" => %1,\n").tqarg(stats.session_bytes_downloaded); out << TQString("\"session_bytes_downloaded\" => %1,\n").arg(stats.session_bytes_downloaded);
out << TQString("\"session_bytes_uploaded\" => %1,\n").tqarg(stats.session_bytes_uploaded); out << TQString("\"session_bytes_uploaded\" => %1,\n").arg(stats.session_bytes_uploaded);
out << TQString("\"trk_bytes_downloaded\" => %1,\n").tqarg(stats.trk_bytes_downloaded); out << TQString("\"trk_bytes_downloaded\" => %1,\n").arg(stats.trk_bytes_downloaded);
out << TQString("\"trk_bytes_uploaded\" => %1,\n").tqarg(stats.trk_bytes_uploaded); out << TQString("\"trk_bytes_uploaded\" => %1,\n").arg(stats.trk_bytes_uploaded);
out << TQString("\"torrent_name\" => \"%1\",\n").tqarg(stats.torrent_name.replace("\\", "\\\\").replace("\"", "\\\"").replace("$", "\\$")); out << TQString("\"torrent_name\" => \"%1\",\n").arg(stats.torrent_name.replace("\\", "\\\\").replace("\"", "\\\"").replace("$", "\\$"));
out << TQString("\"output_path\" => \"%1\",\n").tqarg(stats.output_path.replace("\\", "\\\\").replace("\"", "\\\"").replace("$", "\\$")); out << TQString("\"output_path\" => \"%1\",\n").arg(stats.output_path.replace("\\", "\\\\").replace("\"", "\\\"").replace("$", "\\$"));
out << TQString("\"stopped_by_error\" => \"%1\",\n").tqarg(stats.stopped_by_error); out << TQString("\"stopped_by_error\" => \"%1\",\n").arg(stats.stopped_by_error);
out << TQString("\"completed\" => \"%1\",\n").tqarg(stats.completed); out << TQString("\"completed\" => \"%1\",\n").arg(stats.completed);
out << TQString("\"user_controlled\" => \"%1\",\n").tqarg(stats.user_controlled); out << TQString("\"user_controlled\" => \"%1\",\n").arg(stats.user_controlled);
out << TQString("\"max_share_ratio\" => %1,\n").tqarg(stats.max_share_ratio); out << TQString("\"max_share_ratio\" => %1,\n").arg(stats.max_share_ratio);
out << TQString("\"priv_torrent\" => \"%1\",\n").tqarg(stats.priv_torrent); out << TQString("\"priv_torrent\" => \"%1\",\n").arg(stats.priv_torrent);
out << TQString("\"num_files\" => \"%1\",\n").tqarg((*i)->getNumFiles()); out << TQString("\"num_files\" => \"%1\",\n").arg((*i)->getNumFiles());
out << TQString("\"files\" => array("); out << TQString("\"files\" => array(");
out << flush; out << flush;
if (stats.multi_file_torrent) if (stats.multi_file_torrent)
@ -138,11 +138,11 @@ namespace kt
out << ",\n"; out << ",\n";
TorrentFileInterface & file = (*i)->getTorrentFile(j); TorrentFileInterface & file = (*i)->getTorrentFile(j);
out << TQString("\"%1\" => array(\n").tqarg(j); out << TQString("\"%1\" => array(\n").arg(j);
out << TQString("\"name\" => \"%1\",\n").tqarg(file.getPath()); out << TQString("\"name\" => \"%1\",\n").arg(file.getPath());
out << TQString("\"size\" => \"%1\",\n").tqarg(KIO::convertSize(file.getSize())); out << TQString("\"size\" => \"%1\",\n").arg(KIO::convertSize(file.getSize()));
out << TQString("\"perc_done\" => \"%1\",\n").tqarg(file.getDownloadPercentage()); out << TQString("\"perc_done\" => \"%1\",\n").arg(file.getDownloadPercentage());
out << TQString("\"status\" => \"%1\"\n").tqarg(file.getPriority()); out << TQString("\"status\" => \"%1\"\n").arg(file.getPriority());
out << TQString(")\n"); out << TQString(")\n");
out << flush; out << flush;
} }
@ -156,7 +156,7 @@ namespace kt
} }
/*Generate php code /*Generate php code
* function globaltqStatus() * function globalStatus()
* { * {
* return array( ... ); * return array( ... );
* } * }
@ -166,16 +166,16 @@ namespace kt
out << "function globalInfo()\n{\nreturn array("; out << "function globalInfo()\n{\nreturn array(";
CurrentStats stats=core->getStats(); CurrentStats stats=core->getStats();
out << TQString("\"download_speed\" => \"%1\",").tqarg(KBytesPerSecToString2(stats.download_speed / 1024.0)); out << TQString("\"download_speed\" => \"%1\",").arg(KBytesPerSecToString2(stats.download_speed / 1024.0));
out << TQString("\"upload_speed\" => \"%1\",").tqarg(KBytesPerSecToString2(stats.upload_speed / 1024.0)); out << TQString("\"upload_speed\" => \"%1\",").arg(KBytesPerSecToString2(stats.upload_speed / 1024.0));
out << TQString("\"bytes_downloaded\" => \"%1\",").tqarg(stats.bytes_downloaded); out << TQString("\"bytes_downloaded\" => \"%1\",").arg(stats.bytes_downloaded);
out << TQString("\"bytes_uploaded\" => \"%1\",").tqarg(stats.bytes_uploaded); out << TQString("\"bytes_uploaded\" => \"%1\",").arg(stats.bytes_uploaded);
out << TQString("\"max_download_speed\" => \"%1\",").tqarg(core->getMaxDownloadSpeed()); out << TQString("\"max_download_speed\" => \"%1\",").arg(core->getMaxDownloadSpeed());
out << TQString("\"max_upload_speed\" => \"%1\",").tqarg(core->getMaxUploadSpeed()); out << TQString("\"max_upload_speed\" => \"%1\",").arg(core->getMaxUploadSpeed());
out << TQString("\"max_downloads\" => \"%1\",").tqarg(Settings::maxDownloads()); out << TQString("\"max_downloads\" => \"%1\",").arg(Settings::maxDownloads());
out << TQString("\"max_seeds\"=> \"%1\",").tqarg(Settings::maxSeeds()); out << TQString("\"max_seeds\"=> \"%1\",").arg(Settings::maxSeeds());
out << TQString("\"dht_support\" => \"%1\",").tqarg(Settings::dhtSupport()); out << TQString("\"dht_support\" => \"%1\",").arg(Settings::dhtSupport());
out << TQString("\"use_encryption\" => \"%1\"").tqarg(Settings::useEncryption()); out << TQString("\"use_encryption\" => \"%1\"").arg(Settings::useEncryption());
out << ");\n}\n"; out << ");\n}\n";
} }

2
plugins/webinterface/php_interface.h
Unescape View File

@ -40,7 +40,7 @@ namespace kt
PhpCodeGenerator(CoreInterface *c); PhpCodeGenerator(CoreInterface *c);
virtual ~PhpCodeGenerator(){} virtual ~PhpCodeGenerator(){}
void downloadtqStatus(TQTextStream & out); void downloadStatus(TQTextStream & out);
void globalInfo(TQTextStream & out); void globalInfo(TQTextStream & out);
private: private:
CoreInterface *core; CoreInterface *core;

14
plugins/webinterface/webinterfacepref.ui
Unescape View File

@ -20,7 +20,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>500</width> <width>500</width>
<height>350</height> <height>350</height>
@ -46,7 +46,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout5</cstring> <cstring>layout5</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -92,7 +92,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>54</width> <width>54</width>
<height>21</height> <height>21</height>
@ -128,7 +128,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="1" column="0"> <widget class="TQLayoutWidget" row="1" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout4</cstring> <cstring>layout4</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -151,7 +151,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="3" column="0"> <widget class="TQLayoutWidget" row="3" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout6</cstring> <cstring>layout6</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -159,7 +159,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout5</cstring> <cstring>layout5</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -192,7 +192,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="2" column="0"> <widget class="TQLayoutWidget" row="2" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

10
plugins/webinterface/webinterfaceprefwidget.cpp
Unescape View File

@ -113,23 +113,23 @@ void WebInterfacePrefWidget::changeLedState()
{ {
TQFileInfo fi(phpExecutablePath->url()); TQFileInfo fi(phpExecutablePath->url());
if(fi.isExecutable() && (fi.isFile() || fi.isSymLink())){ if(fi.isExecutable() && (fi.isFile() || fi.isSymLink())){
TQToolTip::add( kled, i18n("%1 exists and it is executable").tqarg(phpExecutablePath->url())); TQToolTip::add( kled, i18n("%1 exists and it is executable").arg(phpExecutablePath->url()));
kled->setColor(green); kled->setColor(green);
} }
else if (!fi.exists()){ else if (!fi.exists()){
TQToolTip::add( kled, i18n("%1 does not exist").tqarg(phpExecutablePath->url()) ); TQToolTip::add( kled, i18n("%1 does not exist").arg(phpExecutablePath->url()) );
kled->setColor(red); kled->setColor(red);
} }
else if (!fi.isExecutable()){ else if (!fi.isExecutable()){
TQToolTip::add( kled, i18n("%1 is not executable").tqarg(phpExecutablePath->url()) ); TQToolTip::add( kled, i18n("%1 is not executable").arg(phpExecutablePath->url()) );
kled->setColor(red); kled->setColor(red);
} }
else if (fi.isDir()){ else if (fi.isDir()){
TQToolTip::add( kled, i18n("%1 is a directory").tqarg(phpExecutablePath->url()) ); TQToolTip::add( kled, i18n("%1 is a directory").arg(phpExecutablePath->url()) );
kled->setColor(red); kled->setColor(red);
} }
else{ else{
TQToolTip::add( kled, i18n("%1 is not php executable path").tqarg(phpExecutablePath->url()) ); TQToolTip::add( kled, i18n("%1 is not php executable path").arg(phpExecutablePath->url()) );
kled->setColor(red); kled->setColor(red);
} }
} }

4
plugins/webinterface/www/default/details.php
Unescape View File

@ -1,5 +1,5 @@
<?php <?php
$stats=downloadtqStatus(); $stats=downloadStatus();
$num_torrent=$_REQUEST['torrent']; $num_torrent=$_REQUEST['torrent'];
function cut_name_if_long($string) function cut_name_if_long($string)
@ -61,7 +61,7 @@ $display_name=cut_name_if_long($stats[$num_torrent]['torrent_name']);
<tr> <tr>
<th>Actions</th> <th>Actions</th>
<th>File</th> <th>File</th>
<th>tqStatus</th> <th>Status</th>
<th>Size</th> <th>Size</th>
<th>Complete</th> <th>Complete</th>
</tr> </tr>

6
plugins/webinterface/www/default/interface.php
Unescape View File

@ -1,6 +1,6 @@
<?php <?php
$globalinfo=globalInfo(); $globalinfo=globalInfo();
$stats=downloadtqStatus(); $stats=downloadStatus();
function get_torrent_status_name($status_id) function get_torrent_status_name($status_id)
{ {
@ -18,7 +18,7 @@ function get_torrent_status_name($status_id)
10 => 'Checking Data' 10 => 'Checking Data'
); );
if (array_key_exists($status_id, $table)) return $table[$status_id]; if (array_key_exists($status_id, $table)) return $table[$status_id];
else return 'Not supported tqStatus'; else return 'Not supported Status';
} }
function generate_button_code($img, $alt, $href='') function generate_button_code($img, $alt, $href='')
@ -104,7 +104,7 @@ function generate_button_code($img, $alt, $href='')
<tr> <tr>
<th>Actions</th> <th>Actions</th>
<th>File</th> <th>File</th>
<th>tqStatus</th> <th>Status</th>
<th>Downloaded</th> <th>Downloaded</th>
<th>Size</th> <th>Size</th>
<th>Uploaded</th> <th>Uploaded</th>

2
plugins/webinterface/www/default/wz_tooltip.js
Unescape View File

@ -300,7 +300,7 @@ function tt_DeAlt(t_tag)
{ {
if(t_tag.alt) t_tag.alt = ""; if(t_tag.alt) t_tag.alt = "";
if(t_tag.title) t_tag.title = ""; if(t_tag.title) t_tag.title = "";
var t_c = t_tag.tqchildren || t_tag.childNodes || null; var t_c = t_tag.children || t_tag.childNodes || null;
if(t_c) if(t_c)
{ {
for(var t_i = t_c.length; t_i; ) for(var t_i = t_c.length; t_i; )

2
plugins/webinterface/www/mobile/interface.php
Unescape View File

@ -18,7 +18,7 @@
<table width="100%"> <table width="100%">
<tbody> <tbody>
<?php <?php
$stats=downloadtqStatus(); $stats=downloadStatus();
$a = 0; $a = 0;
foreach ($stats as $torrent) { foreach ($stats as $torrent) {
echo "<tr>"; echo "<tr>";

2
plugins/webinterface/www/mobile/torrent.php
Unescape View File

@ -8,7 +8,7 @@
<tr> <tr>
<td align="center"><IMG src="ktorrentwebinterfacelogo.png" width="340" height="150" align="top" border="0"></td> <td align="center"><IMG src="ktorrentwebinterfacelogo.png" width="340" height="150" align="top" border="0"></td>
<?php <?php
$stats=downloadtqStatus(); $stats=downloadStatus();
$t=$stats[$_REQUEST['id']]; $t=$stats[$_REQUEST['id']];
echo "<td><strong>ktorrent-><a href=\"interface.php\">transfers</a></strong>->{$t['torrent_name']}</td>"; echo "<td><strong>ktorrent-><a href=\"interface.php\">transfers</a></strong>->{$t['torrent_name']}</td>";
echo "<td><a href=\"torrent.php?id={$_REQUEST['id']}\" >refresh</a></td>"; echo "<td><a href=\"torrent.php?id={$_REQUEST['id']}\" >refresh</a></td>";

6
plugins/zeroconf/avahiservice.cpp
Unescape View File

@ -66,7 +66,7 @@ namespace kt
} }
} }
const char* name = avahi_strdup(TQString("%1__%2%3").tqarg(service->id).tqarg((rand() % 26) + 65).tqarg((rand() % 26) + 65).ascii()); const char* name = avahi_strdup(TQString("%1__%2%3").arg(service->id).arg((rand() % 26) + 65).arg((rand() % 26) + 65).ascii());
const char* type = avahi_strdup("_bittorrent._tcp"); const char* type = avahi_strdup("_bittorrent._tcp");
const char* subtype = avahi_strdup(TQString("_" + service->infoHash + "._sub._bittorrent._tcp").ascii()); const char* subtype = avahi_strdup(TQString("_" + service->infoHash + "._sub._bittorrent._tcp").ascii());
@ -75,7 +75,7 @@ namespace kt
(AvahiPublishFlags)0, name, type, NULL, NULL, service->port, NULL)) (AvahiPublishFlags)0, name, type, NULL, NULL, service->port, NULL))
{ {
if (avahi_client_errno(c) != -8) if (avahi_client_errno(c) != -8)
Out(SYS_ZCO|LOG_DEBUG) << TQString("ZC: Failed to add the service (%i).").tqarg(avahi_client_errno(c)) << endl; Out(SYS_ZCO|LOG_DEBUG) << TQString("ZC: Failed to add the service (%i).").arg(avahi_client_errno(c)) << endl;
else else
publish_service(service, c); publish_service(service, c);
return; return;
@ -85,7 +85,7 @@ namespace kt
service->group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, service->group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
(AvahiPublishFlags)0, name, type, NULL, subtype)) (AvahiPublishFlags)0, name, type, NULL, subtype))
{ {
Out(SYS_ZCO|LOG_DEBUG) << TQString("ZC: Failed to add the service subtype (%i).").tqarg( avahi_client_errno(c)) << endl; Out(SYS_ZCO|LOG_DEBUG) << TQString("ZC: Failed to add the service subtype (%i).").arg( avahi_client_errno(c)) << endl;
return; return;
} }

4
utests/biginttest.cpp
Unescape View File

@ -43,7 +43,7 @@ namespace utest
b.toBuffer(buf,10); b.toBuffer(buf,10);
for (Uint32 i = 0;i < 10;i++) for (Uint32 i = 0;i < 10;i++)
{ {
Out() << TQString("0x%1 ").tqarg(buf[i],0,16); Out() << TQString("0x%1 ").arg(buf[i],0,16);
} }
Out() << endl; Out() << endl;
} }
@ -67,7 +67,7 @@ namespace utest
a.toBuffer(foobar,5); a.toBuffer(foobar,5);
for (Uint32 i = 0;i < 5;i++) for (Uint32 i = 0;i < 5;i++)
{ {
Out() << TQString("0x%1 ").tqarg(foobar[i],0,16); Out() << TQString("0x%1 ").arg(foobar[i],0,16);
} }
Out() << endl; Out() << endl;
Out() << "Third test" << endl; Out() << "Third test" << endl;

Write Preview
Loading…
Cancel
Save