diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:32:56 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:32:56 -0600 |
| commit | f96f74ffa7040e64ae3352e08c810c383c8a0ba2 (patch) | |
| tree | 8f4cdf2f66860234f9ae889cd483b44150affb2c /apps | |
| parent | 0ad9f974f4ad92a3f1458a76d4df26d843efeab7 (diff) | |
| download | ktorrent-f96f74ffa7040e64ae3352e08c810c383c8a0ba2.tar.gz ktorrent-f96f74ffa7040e64ae3352e08c810c383c8a0ba2.zip | |
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'apps')
43 files changed, 273 insertions, 273 deletions
diff --git a/apps/ktcachecheck/cachechecker.cpp b/apps/ktcachecheck/cachechecker.cpp index f05fb18..c8371a7 100644 --- a/apps/ktcachecheck/cachechecker.cpp +++ b/apps/ktcachecheck/cachechecker.cpp @@ -44,7 +44,7 @@ namespace ktdebug this->index_file = index_file; File fptr; 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) { @@ -73,7 +73,7 @@ namespace ktdebug File fptr; if (!fptr.open(index_file,"wb")) - throw Error(i18n("Cannot open index file %1 : %2").tqarg(index_file).tqarg(fptr.errorString())); + throw Error(i18n("Cannot open index file %1 : %2").arg(index_file).arg(fptr.errorString())); std::set<bt::Uint32>::iterator i; // first remove failed chunks from downloaded diff --git a/apps/ktcachecheck/multicachechecker.cpp b/apps/ktcachecheck/multicachechecker.cpp index 3132e12..53e8fee 100644 --- a/apps/ktcachecheck/multicachechecker.cpp +++ b/apps/ktcachecheck/multicachechecker.cpp @@ -79,7 +79,7 @@ namespace ktdebug // we can read the chunk from this file File fptr; 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.read(buf + bytes_offset,to_read); @@ -94,7 +94,7 @@ namespace ktdebug // Out() << "Partially reading " << to_read << endl; File fptr; 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.read(buf + bytes_offset,to_read); diff --git a/apps/ktcachecheck/singlecachechecker.cpp b/apps/ktcachecheck/singlecachechecker.cpp index c311db1..ab64fc3 100644 --- a/apps/ktcachecheck/singlecachechecker.cpp +++ b/apps/ktcachecheck/singlecachechecker.cpp @@ -48,7 +48,7 @@ namespace ktdebug if (!fptr.open(cache,"rb")) { 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; diff --git a/apps/ktorrent/addpeerwidgetbase.ui b/apps/ktorrent/addpeerwidgetbase.ui index 3ae532a..d3359a2 100644 --- a/apps/ktorrent/addpeerwidgetbase.ui +++ b/apps/ktorrent/addpeerwidgetbase.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -77,7 +77,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -86,7 +86,7 @@ </spacer> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> diff --git a/apps/ktorrent/advancedpref.ui b/apps/ktorrent/advancedpref.ui index a144aa6..8a54e29 100644 --- a/apps/ktorrent/advancedpref.ui +++ b/apps/ktorrent/advancedpref.ui @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <hbox> <property name="name"> @@ -108,7 +108,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>148</width> <height>20</height> @@ -127,7 +127,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout25</cstring> + <cstring>layout25</cstring> </property> <hbox> <property name="name"> @@ -179,7 +179,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -223,7 +223,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>111</width> <height>20</height> @@ -234,7 +234,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5_2</cstring> + <cstring>layout5_2</cstring> </property> <hbox> <property name="name"> @@ -283,7 +283,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>111</width> <height>20</height> @@ -294,7 +294,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -359,7 +359,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -405,7 +405,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -416,7 +416,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -459,7 +459,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -483,7 +483,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout33</cstring> + <cstring>layout33</cstring> </property> <hbox> <property name="name"> @@ -491,7 +491,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout32</cstring> + <cstring>layout32</cstring> </property> <grid> <property name="name"> @@ -553,7 +553,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>383</width> <height>20</height> @@ -572,7 +572,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -601,7 +601,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>81</width> <height>20</height> @@ -622,7 +622,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> diff --git a/apps/ktorrent/downloadpref.ui b/apps/ktorrent/downloadpref.ui index 6315cba..378cbbc 100644 --- a/apps/ktorrent/downloadpref.ui +++ b/apps/ktorrent/downloadpref.ui @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout49</cstring> + <cstring>layout49</cstring> </property> <hbox> <property name="name"> @@ -37,7 +37,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout42</cstring> + <cstring>layout42</cstring> </property> <vbox> <property name="name"> @@ -45,7 +45,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <hbox> <property name="name"> @@ -69,7 +69,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -106,7 +106,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout46</cstring> + <cstring>layout46</cstring> </property> <vbox> <property name="name"> @@ -164,7 +164,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout45</cstring> + <cstring>layout45</cstring> </property> <hbox> <property name="name"> @@ -214,7 +214,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout48</cstring> + <cstring>layout48</cstring> </property> <vbox> <property name="name"> @@ -222,7 +222,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -246,7 +246,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>10</width> <height>20</height> @@ -273,7 +273,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>191</width> <height>20</height> @@ -290,7 +290,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>207</width> <height>20</height> @@ -316,7 +316,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout42</cstring> + <cstring>layout42</cstring> </property> <grid> <property name="name"> @@ -356,7 +356,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <hbox> <property name="name"> @@ -380,7 +380,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -425,7 +425,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout41</cstring> + <cstring>layout41</cstring> </property> <vbox> <property name="name"> @@ -546,7 +546,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout40</cstring> + <cstring>layout40</cstring> </property> <vbox> <property name="name"> @@ -594,7 +594,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>208</width> <height>20</height> @@ -611,7 +611,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>208</width> <height>20</height> @@ -628,7 +628,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>208</width> <height>20</height> @@ -697,7 +697,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/apps/ktorrent/fileselectdlg.cpp b/apps/ktorrent/fileselectdlg.cpp index 5f0e33d..98d927a 100644 --- a/apps/ktorrent/fileselectdlg.cpp +++ b/apps/ktorrent/fileselectdlg.cpp @@ -217,9 +217,9 @@ void FileSelectDlg::updateSizeLabels() lblRequired->setText(kt::BytesToString(bytes_to_download)); 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 - lbltqStatus->setText(kt::BytesToString(bytes_free - bytes_to_download)); + lblStatus->setText(kt::BytesToString(bytes_free - bytes_to_download)); } void FileSelectDlg::treeItemChanged() diff --git a/apps/ktorrent/fileselectdlgbase.ui b/apps/ktorrent/fileselectdlgbase.ui index 152c057..546d72c 100644 --- a/apps/ktorrent/fileselectdlgbase.ui +++ b/apps/ktorrent/fileselectdlgbase.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -44,7 +44,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -52,7 +52,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -207,7 +207,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>135</height> @@ -237,7 +237,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -246,7 +246,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout33</cstring> + <cstring>layout33</cstring> </property> <vbox> <property name="name"> @@ -280,7 +280,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout34</cstring> + <cstring>layout34</cstring> </property> <vbox> <property name="name"> @@ -298,7 +298,7 @@ </widget> <widget class="TQLabel"> <property name="name"> - <cstring>lbltqStatus</cstring> + <cstring>lblStatus</cstring> </property> </widget> </vbox> @@ -315,7 +315,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>220</width> <height>20</height> diff --git a/apps/ktorrent/filterbar.cpp b/apps/ktorrent/filterbar.cpp index 0be4049..2f872f8 100644 --- a/apps/ktorrent/filterbar.cpp +++ b/apps/ktorrent/filterbar.cpp @@ -20,7 +20,7 @@ #include "filterbar.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <kdialog.h> @@ -42,30 +42,30 @@ FilterBar::FilterBar(TQWidget *parent, const char *name) : TQVBoxLayout* foo = new TQVBoxLayout(this); foo->addSpacing(gap); - TQHBoxLayout* tqlayout = new TQHBoxLayout(foo); - tqlayout->addSpacing(gap); + TQHBoxLayout* layout = new TQHBoxLayout(foo); + layout->addSpacing(gap); m_close = new KToolBarButton("fileclose",0,this); 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); - tqlayout->addWidget(m_filter); - tqlayout->addSpacing(KDialog::spacingHint()); + layout->addWidget(m_filter); + layout->addSpacing(KDialog::spacingHint()); m_filterInput = new KLineEdit(this); - tqlayout->addWidget(m_filterInput); + layout->addWidget(m_filterInput); m_clear = new KPushButton(this); m_clear->setIconSet(SmallIcon("clear_left")); m_clear->setFlat(true); - tqlayout->addWidget(m_clear); - tqlayout->addSpacing(gap); + layout->addWidget(m_clear); + layout->addSpacing(gap); m_case_sensitive = new TQCheckBox(i18n("Case sensitive"),this); m_case_sensitive->setChecked(true); - tqlayout->addWidget(m_case_sensitive); - tqlayout->addItem(new TQSpacerItem(10,10,TQSizePolicy::Expanding)); + layout->addWidget(m_case_sensitive); + layout->addItem(new TQSpacerItem(10,10,TQSizePolicy::Expanding)); connect(m_filterInput, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotChangeFilter(const TQString&))); diff --git a/apps/ktorrent/generalpref.ui b/apps/ktorrent/generalpref.ui index 33eb8f3..529686f 100644 --- a/apps/ktorrent/generalpref.ui +++ b/apps/ktorrent/generalpref.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -104,7 +104,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -142,7 +142,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -174,7 +174,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -237,7 +237,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <grid> <property name="name"> @@ -310,7 +310,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <hbox> <property name="name"> @@ -355,7 +355,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1" rowspan="3" colspan="1"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <vbox> <property name="name"> diff --git a/apps/ktorrent/groups/groupview.cpp b/apps/ktorrent/groups/groupview.cpp index 11a6aa6..92b78c3 100644 --- a/apps/ktorrent/groups/groupview.cpp +++ b/apps/ktorrent/groups/groupview.cpp @@ -163,7 +163,7 @@ namespace kt 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; } @@ -214,7 +214,7 @@ namespace kt 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 { diff --git a/apps/ktorrent/groups/torrentgroup.cpp b/apps/ktorrent/groups/torrentgroup.cpp index 65fed38..d44b744 100644 --- a/apps/ktorrent/groups/torrentgroup.cpp +++ b/apps/ktorrent/groups/torrentgroup.cpp @@ -51,7 +51,7 @@ namespace kt if (hashes.count(tor->getInfoHash())) { /* 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()); torrents.insert(tor); diff --git a/apps/ktorrent/ipfilterwidget.cpp b/apps/ktorrent/ipfilterwidget.cpp index 76ba43f..152e8c1 100644 --- a/apps/ktorrent/ipfilterwidget.cpp +++ b/apps/ktorrent/ipfilterwidget.cpp @@ -140,7 +140,7 @@ void IPFilterWidget::saveFilter(TQString& fn) 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; } diff --git a/apps/ktorrent/ipfilterwidgetbase.ui b/apps/ktorrent/ipfilterwidgetbase.ui index c02218d..7d8c383 100644 --- a/apps/ktorrent/ipfilterwidgetbase.ui +++ b/apps/ktorrent/ipfilterwidgetbase.ui @@ -29,7 +29,7 @@ <property name="text"> <string>Note: Blacklist applies to current session only. Use save/open to save your entries or use IPFilter plugin (PeerGuardian).</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -82,7 +82,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -111,7 +111,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1" rowspan="3" colspan="1"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> @@ -144,7 +144,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -192,7 +192,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -234,7 +234,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> diff --git a/apps/ktorrent/ktorrent.cpp b/apps/ktorrent/ktorrent.cpp index 85cb4f0..a113576 100644 --- a/apps/ktorrent/ktorrent.cpp +++ b/apps/ktorrent/ktorrent.cpp @@ -791,14 +791,14 @@ void KTorrent::updatedStats() //m_statusInfo->setText(i18n("Some info here e.g. connected/disconnected")); TQString tmp = i18n("Speed down: %1 / up: %2") - .tqarg(KBytesPerSecToString((double)stats.download_speed/1024.0)) - .tqarg(KBytesPerSecToString((double)stats.upload_speed/1024.0)); + .arg(KBytesPerSecToString((double)stats.download_speed/1024.0)) + .arg(KBytesPerSecToString((double)stats.upload_speed/1024.0)); m_statusSpeed->setText(tmp); TQString tmp1 = i18n("Transferred down: %1 / up: %2") - .tqarg(BytesToString(stats.bytes_downloaded)) - .tqarg(BytesToString(stats.bytes_uploaded)); + .arg(BytesToString(stats.bytes_downloaded)) + .arg(BytesToString(stats.bytes_uploaded)); m_statusTransfer->setText(tmp1); if (ServerAuthenticate::isFirewalled() && m_core->getNumTorrentsRunning() > 0) @@ -817,7 +817,7 @@ void KTorrent::updatedStats() { const dht::Stats & s = Globals::instance().getDHT().getStats(); 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 m_statusDHT->setText(i18n("DHT: off")); diff --git a/apps/ktorrent/ktorrentcore.cpp b/apps/ktorrent/ktorrentcore.cpp index e97dc84..de0984a 100644 --- a/apps/ktorrent/ktorrentcore.cpp +++ b/apps/ktorrent/ktorrentcore.cpp @@ -114,7 +114,7 @@ KTorrentCore::KTorrentCore(kt::GUIInterface* gui) : max_downloads(0),keep_seedin KMessageBox::information(0, i18n("Specified port (%1) is unavailable or in" " 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; } @@ -122,7 +122,7 @@ KTorrentCore::KTorrentCore(kt::GUIInterface* gui) : max_downloads(0),keep_seedin { KMessageBox::error(0, 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; } @@ -465,7 +465,7 @@ TQString KTorrentCore::findNewTorrentDir() const while (true) { TQDir d; - TQString dir = data_dir + TQString("tor%1/").tqarg(i); + TQString dir = data_dir + TQString("tor%1/").arg(i); if (!d.exists(dir)) { return dir; @@ -764,7 +764,7 @@ void KTorrentCore::makeTorrent(const TQString & file,const TQStringList & tracke // Show error message KMessageBox::error(0, - i18n("Cannot create torrent: %1").tqarg(e.toString()), + i18n("Cannot create torrent: %1").arg(e.toString()), i18n("Error")); } } @@ -889,7 +889,7 @@ void KTorrentCore::queue(kt::TorrentInterface* tc) 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; TQPtrList<TorrentInterface>::iterator i = qman->begin(); while(i != qman->end()) @@ -1025,7 +1025,7 @@ void KTorrentCore::aboutToBeStarted(kt::TorrentInterface* tc,bool & ret) 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(), KGuiItem(i18n("Recreate")),KGuiItem(i18n("Do Not Download"))); @@ -1038,7 +1038,7 @@ void KTorrentCore::aboutToBeStarted(kt::TorrentInterface* tc,bool & ret) } 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")); ret = false; } @@ -1052,7 +1052,7 @@ void KTorrentCore::aboutToBeStarted(kt::TorrentInterface* tc,bool & ret) } 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")); ret = false; } @@ -1065,7 +1065,7 @@ void KTorrentCore::aboutToBeStarted(kt::TorrentInterface* tc,bool & ret) } 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"))); if (ret == KMessageBox::Yes) { @@ -1075,7 +1075,7 @@ void KTorrentCore::aboutToBeStarted(kt::TorrentInterface* tc,bool & ret) } 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")); ret = false; } diff --git a/apps/ktorrent/ktorrentview.cpp b/apps/ktorrent/ktorrentview.cpp index e445fbb..a02ef6b 100644 --- a/apps/ktorrent/ktorrentview.cpp +++ b/apps/ktorrent/ktorrentview.cpp @@ -40,7 +40,7 @@ #include <tqcursor.h> #include <tqheader.h> #include <tqvaluelist.h> -#include <tqlayout.h> +#include <layout.h> #include "ktorrentview.h" #include "ktorrentviewitem.h" @@ -85,8 +85,8 @@ bool TorrentView::eventFilter(TQObject* watched, TQEvent* e) KTorrentView::KTorrentView(TQWidget *parent) : TQWidget(parent),menu(0),current_group(0),running(0),total(0),view(0),filter_bar(0) { - TQVBoxLayout* tqlayout = new TQVBoxLayout(this); - tqlayout->setAutoAdd(true); + TQVBoxLayout* layout = new TQVBoxLayout(this); + layout->setAutoAdd(true); view = new TorrentView(this); filter_bar = new FilterBar(this); filter_bar->setHidden(true); @@ -198,9 +198,9 @@ void KTorrentView::setCurrentGroup(Group* 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 - setCaption(i18n("All Torrents %1/%2").tqarg(running).tqarg(total)); + setCaption(i18n("All Torrents %1/%2").arg(running).arg(total)); onSelectionChanged(); onExecuted(view->currentItem()); @@ -208,7 +208,7 @@ void KTorrentView::setCurrentGroup(Group* group) 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); cfg->setGroup(group); filter_bar->saveSettings(cfg); @@ -217,7 +217,7 @@ void KTorrentView::saveSettings(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->setDragEnabled(true); @@ -373,7 +373,7 @@ void KTorrentView::removeDownloads() if (!s.completed) { 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( this,msg,i18n("Remove Download"), i18n("Delete Data"),i18n("Keep Data")); @@ -546,9 +546,9 @@ void KTorrentView::update() total = t; 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 - setCaption(i18n("All Torrents %1/%2").tqarg(running).tqarg(total)); + setCaption(i18n("All Torrents %1/%2").arg(running).arg(total)); onSelectionChanged(); } @@ -628,7 +628,7 @@ void KTorrentView::checkDataIntegrity() } 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) { 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()) continue; @@ -872,9 +872,9 @@ void KTorrentView::updateCaption() total = t; 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 - setCaption(i18n("All Torrents %1/%2").tqarg(running).tqarg(total)); + setCaption(i18n("All Torrents %1/%2").arg(running).arg(total)); } } diff --git a/apps/ktorrent/ktorrentviewitem.cpp b/apps/ktorrent/ktorrentviewitem.cpp index 1156b88..a9392bd 100644 --- a/apps/ktorrent/ktorrentviewitem.cpp +++ b/apps/ktorrent/ktorrentviewitem.cpp @@ -30,7 +30,7 @@ using namespace bt; using namespace kt; /* -static TQString StatusToString(TorrentInterface* tc,TorrenttqStatus s) +static TQString StatusToString(TorrentInterface* tc,TorrentStatus 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 yellow(255,174,0); @@ -222,7 +222,7 @@ void KTorrentViewItem::update() Uint32 secs = tc->getETA(); if(secs == -1) { - setText(7,TQString("%1").tqarg(TQChar(0x221E))); + setText(7,TQString("%1").arg(TQChar(0x221E))); eta = -2; } else @@ -233,7 +233,7 @@ void KTorrentViewItem::update() } else { - setText(7,TQString("%1").tqarg(TQChar(0x221E))); + setText(7,TQString("%1").arg(TQChar(0x221E))); eta = -2; } } @@ -242,23 +242,23 @@ void KTorrentViewItem::update() 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)) { - 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)) { - 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)) { 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)) diff --git a/apps/ktorrent/leaktrace.cpp b/apps/ktorrent/leaktrace.cpp index ae41d3f..76439ce 100644 --- a/apps/ktorrent/leaktrace.cpp +++ b/apps/ktorrent/leaktrace.cpp @@ -91,7 +91,7 @@ static void WriteLeakReport() fclose(report); } -static void PrinttqStatus() +static void PrintStatus() { if (mtree.count == 0) { @@ -124,7 +124,7 @@ static void RegisterAlloc(void* ptr,Uint32 size) for (Uint32 b = 0;b < SOME_PRIME;b++) mtree.buckets[b] = 0; mtree.num_buckets = SOME_PRIME; - atexit(PrinttqStatus); + atexit(PrintStatus); } // hash the address @@ -180,7 +180,7 @@ static void DeregisterAlloc(void* ptr) if (!p->left && !p->right) { - // no tqchildren so just free p + // no children so just free p if (prev->left == p) { free(prev->left); @@ -214,7 +214,7 @@ static void DeregisterAlloc(void* ptr) } else { - // both tqchildren exist + // both children exist if (prev->left == p) { // attach the left child of p diff --git a/apps/ktorrent/main.cpp b/apps/ktorrent/main.cpp index 5e9fcb2..fa21922 100644 --- a/apps/ktorrent/main.cpp +++ b/apps/ktorrent/main.cpp @@ -79,7 +79,7 @@ static const char description[] = bool GrabPIDLock() { // 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); if (fd < 0) diff --git a/apps/ktorrent/newui/button.cpp b/apps/ktorrent/newui/button.cpp index cbbfbed..4819657 100644 --- a/apps/ktorrent/newui/button.cpp +++ b/apps/ktorrent/newui/button.cpp @@ -49,8 +49,8 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, setToggleButton(true); setFocusPolicy(TQ_NoFocus); setDescription(m_description); - tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); - resize(tqsizeHint()); + setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + resize(sizeHint()); fixDimensions(Ideal::Bottom); TQToolTip::add(this, m_realText); @@ -62,9 +62,9 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, KConfig *config = kapp->config(); config->setGroup("UI"); - TQString accel = config->readEntry(TQString("button_%1").tqarg(text), ""); + TQString accel = config->readEntry(TQString("button_%1").arg(text), ""); if (!accel.isEmpty()) - setRealText(TQString("&%1 %2").tqarg(accel).tqarg(m_realText)); + setRealText(TQString("&%1 %2").arg(accel).arg(m_realText)); } Button::~Button() @@ -80,11 +80,11 @@ Button::~Button() TQString text = m_realText; if (text.contains(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 { - 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()); 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()), - tqcolorGroup(), flags, TQStyleOption()); + colorGroup(), flags, TQStyleOption()); switch (m_place) { @@ -178,7 +178,7 @@ void Button::fixDimensions(Place oldPlace) if ((oldPlace == Ideal::Bottom) || (oldPlace == Ideal::Top)) { setFixedWidth(height()); - setMinimumHeight(tqsizeHint().width()); + setMinimumHeight(sizeHint().width()); setMaximumHeight(32767); } break; @@ -187,19 +187,19 @@ void Button::fixDimensions(Place oldPlace) if ((oldPlace == Ideal::Left) || (oldPlace == Ideal::Right)) { setFixedHeight(width()); - setMinimumWidth(tqsizeHint().height()); + setMinimumWidth(sizeHint().height()); setMaximumWidth(32767); } 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(); int w = 0, h = 0; @@ -211,7 +211,7 @@ TQSize Button::tqsizeHint(const TQString &text) const h = TQMAX( h, ih ); } if ( isMenuButton() ) - w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this); + w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this); if ( pixmap() ) { TQPixmap *pm = (TQPixmap *)pixmap(); w += pm->width(); @@ -220,7 +220,7 @@ TQSize Button::tqsizeHint(const TQString &text) const TQString s( text ); bool empty = s.isEmpty(); if ( empty ) - s = TQString::tqfromLatin1("XXXX"); + s = TQString::fromLatin1("XXXX"); TQFontMetrics fm = fontMetrics(); TQSize sz = fm.size( ShowPrefix, s ); if(!empty || !w) @@ -239,12 +239,12 @@ void Button::updateSize() { case Ideal::Left: case Ideal::Right: - setMinimumHeight(tqsizeHint().width()); - resize(tqsizeHint().height(), tqsizeHint().width()); + setMinimumHeight(sizeHint().width()); + resize(sizeHint().height(), sizeHint().width()); break; case Ideal::Top: case Ideal::Bottom: - resize(tqsizeHint().width(), tqsizeHint().height()); + resize(sizeHint().width(), sizeHint().height()); break; } } @@ -320,7 +320,7 @@ void Button::assignAccel() if (ok) { TQString text = realTextWithoutAccel(); - text = TQString("&%1 %2").tqarg(num).tqarg(text); + text = TQString("&%1 %2").arg(num).arg(text); setRealText(text); } } diff --git a/apps/ktorrent/newui/button.h b/apps/ktorrent/newui/button.h index fae0b56..18aecd4 100644 --- a/apps/ktorrent/newui/button.h +++ b/apps/ktorrent/newui/button.h @@ -54,8 +54,8 @@ public: /**Sets the mode of a button.*/ void setMode(Ideal::ButtonMode mode); - TQSize tqsizeHint() const; - TQSize tqsizeHint(const TQString &text) const; + TQSize sizeHint() const; + TQSize sizeHint(const TQString &text) const; /**Updates size of a widget. Used after squeezing button's text.*/ void updateSize(); diff --git a/apps/ktorrent/newui/buttonbar.cpp b/apps/ktorrent/newui/buttonbar.cpp index 47227a8..4d45598 100644 --- a/apps/ktorrent/newui/buttonbar.cpp +++ b/apps/ktorrent/newui/buttonbar.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "buttonbar.h" -#include <tqlayout.h> +#include <layout.h> #include <kdebug.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()) return size; @@ -54,7 +54,7 @@ TQSize ButtonLayout::tqminimumSize() const case Ideal::Bottom: return TQSize(0,size.height()); } - return TQBoxLayout::tqminimumSize(); + return TQBoxLayout::minimumSize(); } @@ -128,14 +128,14 @@ void ButtonBar::fixDimensions() { case Ideal::Left: case Ideal::Right: - setFixedWidth(tqsizeHint().width()); - setMinimumHeight(tqsizeHint().height()); + setFixedWidth(sizeHint().width()); + setMinimumHeight(sizeHint().height()); setMaximumHeight(32767); break; case Ideal::Top: case Ideal::Bottom: - setFixedHeight(tqsizeHint().height()); - setMinimumWidth(tqsizeHint().width()); + setFixedHeight(sizeHint().height()); + setMinimumWidth(sizeHint().width()); setMaximumWidth(32767); break; } @@ -156,13 +156,13 @@ void ButtonBar::resizeEvent(TQResizeEvent *ev) { case Ideal::Left: case Ideal::Right: - preferredDimension = l->TQBoxLayout::tqminimumSize().height(); + preferredDimension = l->TQBoxLayout::minimumSize().height(); actualDimension = size().height(); oldDimension = ev->oldSize().height(); break; case Ideal::Top: case Ideal::Bottom: - preferredDimension = l->TQBoxLayout::tqminimumSize().width(); + preferredDimension = l->TQBoxLayout::minimumSize().width(); actualDimension = size().width(); oldDimension = ev->oldSize().width(); break; @@ -285,7 +285,7 @@ int ButtonBar::originalDimension() int size = 0; 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; } diff --git a/apps/ktorrent/newui/buttonbar.h b/apps/ktorrent/newui/buttonbar.h index a2e8ecc..ef4c528 100644 --- a/apps/ktorrent/newui/buttonbar.h +++ b/apps/ktorrent/newui/buttonbar.h @@ -25,21 +25,21 @@ #include "comdefs.h" -#include <tqlayout.h> +#include <layout.h> namespace Ideal { class Button; 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{ public: ButtonLayout(ButtonBar *parent, Direction d, int margin = 0, int spacing = -1, const char * name = 0); - virtual TQSize tqminimumSize() const; + virtual TQSize minimumSize() const; private: ButtonBar *m_buttonBar; diff --git a/apps/ktorrent/newui/ddockwindow.cpp b/apps/ktorrent/newui/ddockwindow.cpp index f008e56..e762e5f 100644 --- a/apps/ktorrent/newui/ddockwindow.cpp +++ b/apps/ktorrent/newui/ddockwindow.cpp @@ -20,7 +20,7 @@ #include "ddockwindow.h" #include <tqtoolbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqstyle.h> #include <tqwidgetstack.h> #include <tqimage.h> @@ -104,7 +104,7 @@ void DDockWindow::setVisible(bool v) { //write dock width to the config file KConfig *config = kapp->config(); - TQString group = TQString("%1").tqarg(m_name); + TQString group = TQString("%1").arg(m_name); config->setGroup(group); if (m_visible) @@ -115,13 +115,13 @@ void DDockWindow::setVisible(bool v) v ? m_widgetStack->show() : m_widgetStack->hide(); m_visible = v; - m_internalLayout->tqinvalidate(); + m_internalLayout->invalidate(); if (!m_visible) { if (m_position == DDockWindow::Bottom) - setFixedExtentHeight(m_internalLayout->tqsizeHint().height()); + setFixedExtentHeight(m_internalLayout->sizeHint().height()); else - setFixedExtentWidth(m_internalLayout->tqsizeHint().width()); + setFixedExtentWidth(m_internalLayout->sizeHint().width()); emit hidden(); } else @@ -130,12 +130,12 @@ void DDockWindow::setVisible(bool v) int size = 0; if (m_position == DDockWindow::Bottom) { - size = config->readNumEntry("ViewWidth", m_internalLayout->tqminimumSize().height()); + size = config->readNumEntry("ViewWidth", m_internalLayout->minimumSize().height()); setFixedExtentHeight(size); } else { - size = config->readNumEntry("ViewWidth", m_internalLayout->tqminimumSize().width()); + size = config->readNumEntry("ViewWidth", m_internalLayout->minimumSize().width()); setFixedExtentWidth(size); } } @@ -148,7 +148,7 @@ void DDockWindow::loadSettings() void DDockWindow::saveSettings() { KConfig *config = kapp->config(); - TQString group = TQString("%1").tqarg(m_name); + TQString group = TQString("%1").arg(m_name); int invisibleWidth = 0; config->setGroup(group); 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 //we need to show it KConfig *config = kapp->config(); - TQString group = TQString("%1").tqarg(m_name); + TQString group = TQString("%1").arg(m_name); config->setGroup(group); if (config->readEntry("ViewLastWidget") == title) { @@ -338,7 +338,7 @@ bool DDockWindow::isActive() { if (m_toggledButton) { - TQWidget *w = tqApp->tqfocusWidget(); + TQWidget *w = tqApp->focusWidget(); if (!w) return false; TQWidget *toolWidget = m_widgets[m_toggledButton]; diff --git a/apps/ktorrent/newui/dmainwindow.cpp b/apps/ktorrent/newui/dmainwindow.cpp index 26186d0..d5edb2f 100644 --- a/apps/ktorrent/newui/dmainwindow.cpp +++ b/apps/ktorrent/newui/dmainwindow.cpp @@ -189,8 +189,8 @@ DTabWidget *DMainWindow::splitVertical() void DMainWindow::invalidateActiveTabWidget() { -/* TQWidget *focused = m_central->tqfocusWidget(); - kdDebug(9000) << "tqinvalidate: " << focused << endl; +/* TQWidget *focused = m_central->focusWidget(); + kdDebug(9000) << "invalidate: " << focused << endl; if (focused == 0) return; if (!m_widgets.contains(focused)) diff --git a/apps/ktorrent/newui/docksplitter.cpp b/apps/ktorrent/newui/docksplitter.cpp index 4931ad0..6da580f 100644 --- a/apps/ktorrent/newui/docksplitter.cpp +++ b/apps/ktorrent/newui/docksplitter.cpp @@ -113,7 +113,7 @@ void DockSplitter::removeDock(uint row, uint col, bool alsoDelete) w->hide(); } - m_splitters[row]->setMinimumSize(m_splitters[row]->tqminimumSizeHint()); + m_splitters[row]->setMinimumSize(m_splitters[row]->minimumSizeHint()); if (isRowEmpty(row)) { diff --git a/apps/ktorrent/newui/dtabwidget.cpp b/apps/ktorrent/newui/dtabwidget.cpp index fd7fad0..202396a 100644 --- a/apps/ktorrent/newui/dtabwidget.cpp +++ b/apps/ktorrent/newui/dtabwidget.cpp @@ -90,7 +90,7 @@ void DTabWidget::insertTab(TQWidget *child, const TQString &label, int index) if (m_closeButton && m_closeButtonShown) m_closeButton->show(); KTabWidget::insertTab(child, label, index); - if (index != -1) tabBar()->tqrepaint(); + if (index != -1) tabBar()->repaint(); } 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) m_closeButton->show(); KTabWidget::insertTab(child, iconset, label, index); - if (index != -1) tabBar()->tqrepaint(); + if (index != -1) tabBar()->repaint(); } /*void DTabWidget::updateHistory(TQWidget *w) diff --git a/apps/ktorrent/pastedialog.cpp b/apps/ktorrent/pastedialog.cpp index 7d3bff9..b562730 100644 --- a/apps/ktorrent/pastedialog.cpp +++ b/apps/ktorrent/pastedialog.cpp @@ -22,7 +22,7 @@ #include "ktorrentcore.h" #include <kpushbutton.h> #include <kstdguiitem.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqapplication.h> #include <kurl.h> #include <klineedit.h> @@ -33,7 +33,7 @@ PasteDialog::PasteDialog(KTorrentCore* core, TQWidget *parent, const char *name) :PasteDlgBase(parent, name) { m_core = core; - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); TQString text = cb->text(TQClipboard::Clipboard); KURL url = KURL::fromPathOrURL(text); if ( url.isValid() ) diff --git a/apps/ktorrent/pastedlgbase.ui b/apps/ktorrent/pastedlgbase.ui index 6762dfe..9121734 100644 --- a/apps/ktorrent/pastedlgbase.ui +++ b/apps/ktorrent/pastedlgbase.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -38,7 +38,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -64,7 +64,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>400</width> <height>0</height> @@ -75,7 +75,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -91,7 +91,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>297</width> <height>20</height> diff --git a/apps/ktorrent/pref.cpp b/apps/ktorrent/pref.cpp index 4fbc0fd..a379c66 100644 --- a/apps/ktorrent/pref.cpp +++ b/apps/ktorrent/pref.cpp @@ -22,7 +22,7 @@ #include <kactivelabel.h> #include <kglobal.h> #include <kcombobox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <knuminput.h> @@ -281,7 +281,7 @@ bool GeneralPrefPage::apply() { TQString err = KResolver::errorString(res.error()); 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")); return false; } diff --git a/apps/ktorrent/queuedialog.cpp b/apps/ktorrent/queuedialog.cpp index 508789b..01293cf 100644 --- a/apps/ktorrent/queuedialog.cpp +++ b/apps/ktorrent/queuedialog.cpp @@ -30,7 +30,7 @@ #include <tqtabwidget.h> #include <tqgroupbox.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kglobal.h> @@ -123,7 +123,7 @@ QueueDialog::QueueDialog(bt::QueueManager* qm, TQWidget *parent, const char *nam for( ; it != qman->end(); ++it) { TorrentInterface* tc = *it; - TorrenttqStatus ts = tc->getStats().status; + TorrentStatus ts = tc->getStats().status; if(ts == kt::SEEDING || ts == kt::DOWNLOAD_COMPLETE || ts == kt::SEEDING_COMPLETE || tc->getStats().completed) @@ -288,7 +288,7 @@ void QueueDialog::downloadList_currentChanged(TQListViewItem* item) { if(!item) { - dltqStatus->clear(); + dlStatus->clear(); dlTracker->clear(); dlRatio->clear(); dlDHT->clear(); @@ -298,9 +298,9 @@ void QueueDialog::downloadList_currentChanged(TQListViewItem* item) const TorrentInterface* tc = ((QueueItem*)item)->getTC(); TorrentStats s = tc->getStats(); - dltqStatus->setText(tc->statusToString()); + dlStatus->setText(tc->statusToString()); 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)); dlDHT->setText(s.priv_torrent ? i18n("No (private torrent)") : i18n("Yes")); } @@ -309,7 +309,7 @@ void QueueDialog::seedList_currentChanged(TQListViewItem* item) { if(!item) { - ultqStatus->clear(); + ulStatus->clear(); ulTracker->clear(); ulRatio->clear(); ulDHT->clear(); @@ -319,9 +319,9 @@ void QueueDialog::seedList_currentChanged(TQListViewItem* item) const TorrentInterface* tc = ((QueueItem*)item)->getTC(); TorrentStats s = tc->getStats(); - ultqStatus->setText(tc->statusToString()); + ulStatus->setText(tc->statusToString()); 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)); ulDHT->setText(s.priv_torrent ? i18n("No (private torrent)") : i18n("Yes")); } diff --git a/apps/ktorrent/queuedlg.ui b/apps/ktorrent/queuedlg.ui index 8517b57..00a194f 100644 --- a/apps/ktorrent/queuedlg.ui +++ b/apps/ktorrent/queuedlg.ui @@ -47,7 +47,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout25</cstring> + <cstring>layout25</cstring> </property> <vbox> <property name="name"> @@ -121,7 +121,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout26</cstring> + <cstring>layout26</cstring> </property> <vbox> <property name="name"> @@ -129,7 +129,7 @@ </property> <widget class="TQLabel"> <property name="name"> - <cstring>dltqStatus</cstring> + <cstring>dlStatus</cstring> </property> <property name="text"> <string></string> @@ -263,7 +263,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <vbox> <property name="name"> @@ -337,7 +337,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout27</cstring> + <cstring>layout27</cstring> </property> <vbox> <property name="name"> @@ -345,7 +345,7 @@ </property> <widget class="TQLabel"> <property name="name"> - <cstring>ultqStatus</cstring> + <cstring>ulStatus</cstring> </property> <property name="text"> <string></string> @@ -392,7 +392,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> @@ -400,7 +400,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout49</cstring> + <cstring>layout49</cstring> </property> <hbox> <property name="name"> @@ -416,7 +416,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -452,7 +452,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -471,7 +471,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -504,7 +504,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -540,7 +540,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -573,7 +573,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/apps/ktorrent/scandialog.cpp b/apps/ktorrent/scandialog.cpp index 292c1ea..80fd681 100644 --- a/apps/ktorrent/scandialog.cpp +++ b/apps/ktorrent/scandialog.cpp @@ -67,14 +67,14 @@ void ScanDialog::scan() } 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) { - 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(); m_cancel->setEnabled(true); this->silently = silently; diff --git a/apps/ktorrent/scandlgbase.ui b/apps/ktorrent/scandlgbase.ui index 89ffb9f..18c76f1 100644 --- a/apps/ktorrent/scandlgbase.ui +++ b/apps/ktorrent/scandlgbase.ui @@ -40,7 +40,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -48,7 +48,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -74,7 +74,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -84,7 +84,7 @@ <property name="name"> <cstring>m_chunks_found</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -96,7 +96,7 @@ <property name="text"> <string>0</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -104,7 +104,7 @@ <property name="name"> <cstring>m_chunks_failed</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -119,7 +119,7 @@ <property name="text"> <string>0</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -148,7 +148,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -164,7 +164,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>181</width> <height>20</height> diff --git a/apps/ktorrent/speedlimitsdlg.cpp b/apps/ktorrent/speedlimitsdlg.cpp index 5fbe5b4..69c6a48 100644 --- a/apps/ktorrent/speedlimitsdlg.cpp +++ b/apps/ktorrent/speedlimitsdlg.cpp @@ -33,7 +33,7 @@ using namespace kt; SpeedLimitsDlg::SpeedLimitsDlg(kt::TorrentInterface* ti,TQWidget* parent, const char* name) : 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; tor->getTrafficLimits(up,down); m_upload_rate->setValue(up / 1024); diff --git a/apps/ktorrent/speedlimitsdlgbase.ui b/apps/ktorrent/speedlimitsdlgbase.ui index f4313e2..520a705 100644 --- a/apps/ktorrent/speedlimitsdlgbase.ui +++ b/apps/ktorrent/speedlimitsdlgbase.ui @@ -29,7 +29,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -37,7 +37,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> @@ -63,7 +63,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -83,7 +83,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -125,7 +125,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>20</height> diff --git a/apps/ktorrent/torrentcreatordlg.cpp b/apps/ktorrent/torrentcreatordlg.cpp index d42c06f..8518de3 100644 --- a/apps/ktorrent/torrentcreatordlg.cpp +++ b/apps/ktorrent/torrentcreatordlg.cpp @@ -46,7 +46,7 @@ TorrentCreatorDlg::TorrentCreatorDlg(KTorrentCore* core,TQWidget *parent, const TQMap<TQString, int> n = bt::Globals::instance().getDHT().getClosestGoodNodes(10); 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() @@ -105,7 +105,7 @@ void TorrentCreatorDlg::onCreate() s += ".torrent"; KProgressDialog* dlg = new KProgressDialog(this,0); - dlg->setLabel(i18n("Creating %1...").tqarg(s)); + dlg->setLabel(i18n("Creating %1...").arg(s)); dlg->setModal(true); dlg->setAllowCancel(false); dlg->show(); @@ -136,7 +136,7 @@ void TorrentCreatorDlg::btnRemoveNode_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*) diff --git a/apps/ktorrent/torrentcreatordlgbase.ui b/apps/ktorrent/torrentcreatordlgbase.ui index fa02179..a9199bc 100644 --- a/apps/ktorrent/torrentcreatordlgbase.ui +++ b/apps/ktorrent/torrentcreatordlgbase.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <vbox> <property name="name"> @@ -66,7 +66,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -148,7 +148,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -188,7 +188,7 @@ </widget> <widget class="TQLayoutWidget" row="5" column="0"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -233,7 +233,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -319,7 +319,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -372,7 +372,7 @@ <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -422,7 +422,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -436,7 +436,7 @@ <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> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/apps/ktorrent/trayhoverpopup.cpp b/apps/ktorrent/trayhoverpopup.cpp index 7df590f..5cce261 100644 --- a/apps/ktorrent/trayhoverpopup.cpp +++ b/apps/ktorrent/trayhoverpopup.cpp @@ -114,7 +114,7 @@ void TrayHoverPopup::create() hb->setSpacing(KDialog::spacingHint()); TQLabel* pix_lbl = new TQLabel(hb,"title_icon"); pix_lbl->setPixmap(pix); - pix_lbl->tqsetAlignment(AlignLeft); + pix_lbl->setAlignment(AlignLeft); } @@ -122,13 +122,13 @@ void TrayHoverPopup::create() TQFont fnt = title->font(); fnt.setBold( true ); title->setFont( fnt ); - title->tqsetAlignment( TQt::AlignHCenter ); + title->setAlignment( TQt::AlignHCenter ); if ( hb ) hb->setStretchFactor(title, 10 ); // enforce centering // text will be filled later text = new TQLabel( "Dummy", vb, "msg_label" ); - text->tqsetAlignment( AlignLeft ); + text->setAlignment( AlignLeft ); setView(vb); } diff --git a/apps/ktorrent/trayicon.cpp b/apps/ktorrent/trayicon.cpp index 14a3db7..8588fc2 100644 --- a/apps/ktorrent/trayicon.cpp +++ b/apps/ktorrent/trayicon.cpp @@ -88,24 +88,24 @@ void TrayIcon::leaveEvent(TQEvent* ) 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>") - .tqarg(KBytesPerSecToString((double)stats.download_speed/1024.0)) - .tqarg(KBytesPerSecToString((double)stats.upload_speed/1024.0)) - .tqarg(BytesToString(stats.bytes_downloaded)) - .tqarg(BytesToString(stats.bytes_uploaded)); + .arg(KBytesPerSecToString((double)stats.download_speed/1024.0)) + .arg(KBytesPerSecToString((double)stats.upload_speed/1024.0)) + .arg(BytesToString(stats.bytes_downloaded)) + .arg(BytesToString(stats.bytes_uploaded)); m_hover_popup->updateText(tip); if(showBars) drawSpeedBar(stats.download_speed/1024,stats.upload_speed/1024, downloadBandwidth, uploadBandwidth); 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; } } void TrayIcon::drawSpeedBar(int downloadSpeed, int uploadSpeed, int downloadBandwidth, int uploadBandwidth ) { - //check if need tqrepaint + //check if need repaint if (uploadBandwidth == 0) uploadBandwidth = 1; if (downloadBandwidth == 0) @@ -116,7 +116,7 @@ void TrayIcon::drawSpeedBar(int downloadSpeed, int uploadSpeed, int downloadBand if(previousDownloadHeight==DownloadHeight && previousUploadHeight==UploadHeight) return; - tqrepaint (); + repaint (); TQBrush brushD(green); TQBrush brushU(red); @@ -146,9 +146,9 @@ void TrayIcon::finished(TorrentInterface* tc) TQString msg = i18n("<b>%1</b> has completed downloading." "<br>Average speed: %2 DL / %3 UL.") - .tqarg(s.torrent_name) - .tqarg(KBytesPerSecToString(speed_down / tc->getRunningTimeDL())) - .tqarg(KBytesPerSecToString(speed_up / tc->getRunningTimeUL())); + .arg(s.torrent_name) + .arg(KBytesPerSecToString(speed_down / tc->getRunningTimeDL())) + .arg(KBytesPerSecToString(speed_up / tc->getRunningTimeUL())); 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." "<br>Uploaded %3 at an average speed of %4.") - .tqarg(s.torrent_name) - .tqarg(loc->formatNumber(s.max_share_ratio,2)) - .tqarg(BytesToString(s.bytes_uploaded)) - .tqarg(KBytesPerSecToString(speed_up / tc->getRunningTimeUL())); + .arg(s.torrent_name) + .arg(loc->formatNumber(s.max_share_ratio,2)) + .arg(BytesToString(s.bytes_uploaded)) + .arg(KBytesPerSecToString(speed_up / tc->getRunningTimeUL())); 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." "<br>Uploaded %3 at an average speed of %4.") - .tqarg(s.torrent_name) - .tqarg(loc->formatNumber(s.max_seed_time,2)) - .tqarg(BytesToString(s.bytes_uploaded)) - .tqarg(KBytesPerSecToString(speed_up / tc->getRunningTimeUL())); + .arg(s.torrent_name) + .arg(loc->formatNumber(s.max_seed_time,2)) + .arg(BytesToString(s.bytes_uploaded)) + .arg(KBytesPerSecToString(speed_up / tc->getRunningTimeUL())); showPassivePopup(msg,i18n("Seeding completed")); } @@ -198,7 +198,7 @@ void TrayIcon::torrentStoppedByError(kt::TorrentInterface* tc, TQString msg) const TorrentStats & s = tc->getStats(); 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")); } @@ -211,7 +211,7 @@ void TrayIcon::corruptedData(kt::TorrentInterface* tc) const TorrentStats & s = tc->getStats(); 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.") - .tqarg(s.torrent_name); + .arg(s.torrent_name); showPassivePopup(err_msg,i18n("Error")); } @@ -227,10 +227,10 @@ void TrayIcon::queuingNotPossible(kt::TorrentInterface* tc) 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.") - .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 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.")); } @@ -240,7 +240,7 @@ void TrayIcon::canNotStart(kt::TorrentInterface* tc,kt::TorrentStartResponse rea if (!Settings::showPopups()) 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) { case kt::TQM_LIMITS_REACHED: @@ -274,7 +274,7 @@ void TrayIcon::lowDiskSpace(kt::TorrentInterface * tc, bool stopped) 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) msg.prepend(i18n("Torrent has been stopped.<br />")); @@ -335,10 +335,10 @@ void SetMaxRate::makeMenu() { 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 - insertItem(TQString("%1").tqarg(valuePair[j]),-1, (j == 0) ? 2 : count()); + insertItem(TQString("%1").arg(valuePair[j]),-1, (j == 0) ? 2 : count()); } } diff --git a/apps/ktupnptest/mainwidget.ui b/apps/ktupnptest/mainwidget.ui index 0aacede..ed2022c 100644 --- a/apps/ktupnptest/mainwidget.ui +++ b/apps/ktupnptest/mainwidget.ui @@ -23,7 +23,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -39,7 +39,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> diff --git a/apps/ktupnptest/upnptestapp.cpp b/apps/ktupnptest/upnptestapp.cpp index 0d14228..7ccbb4f 100644 --- a/apps/ktupnptest/upnptestapp.cpp +++ b/apps/ktupnptest/upnptestapp.cpp @@ -21,7 +21,7 @@ #include <klocale.h> #include <kapplication.h> #include <kmessagebox.h> -#include <tqtextbrowser.h> +#include <textbrowser.h> #include <util/error.h> #include "upnptestapp.h" #include "mainwidget.h" |