summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-11-24 10:46:40 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-11-24 22:27:35 +0900
commit59f680d9507a1b37ea480b4a8ba72f608a8027c5 (patch)
tree2eee8b2268f54fd48d40039aa30170ed81717fe7
parent20f03559c28d35f93028b91344efddb8d90ecee7 (diff)
downloadktorrent-59f680d9507a1b37ea480b4a8ba72f608a8027c5.tar.gz
ktorrent-59f680d9507a1b37ea480b4a8ba72f608a8027c5.zip
Replaced various '#define' with actual strings - part 3
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 6458ac1fee48f77706492026f50f2efb179ec827)
-rw-r--r--apps/ktorrent/main.cpp2
-rw-r--r--apps/ktorrent/newui/button.cpp2
-rw-r--r--apps/ktorrent/newui/docksplitter.cpp4
-rw-r--r--libktorrent/net/speed.cpp2
-rw-r--r--libktorrent/torrent/speedestimater.cpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/apps/ktorrent/main.cpp b/apps/ktorrent/main.cpp
index 748001a..a6b67c8 100644
--- a/apps/ktorrent/main.cpp
+++ b/apps/ktorrent/main.cpp
@@ -116,7 +116,7 @@ int main(int argc, char **argv)
// ignore SIGPIPE's
signal(SIGPIPE,SIG_IGN);
signal(SIGXFSZ,SIG_IGN);
- tqInstallMsgHandler( StupidWarningMessagesFromTQt );
+ qInstallMsgHandler( StupidWarningMessagesFromTQt );
TDEAboutData about("ktorrent", I18N_NOOP("KTorrent"), kt::VERSION_STRING, description,
TDEAboutData::License_GPL, "(C) 2005 -2008 Joris Guisson and Ivan Vasic", 0);
about.addAuthor("Joris Guisson", 0, "joris.guisson@gmail.com" );
diff --git a/apps/ktorrent/newui/button.cpp b/apps/ktorrent/newui/button.cpp
index e3c1730..89ed258 100644
--- a/apps/ktorrent/newui/button.cpp
+++ b/apps/ktorrent/newui/button.cpp
@@ -229,7 +229,7 @@ TQSize Button::sizeHint(const TQString &text) const
h = TQMAX(h, sz.height());
}
- return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
+ return (style().sizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
expandedTo(TQApplication::globalStrut()));
}
diff --git a/apps/ktorrent/newui/docksplitter.cpp b/apps/ktorrent/newui/docksplitter.cpp
index fde09d8..115abf2 100644
--- a/apps/ktorrent/newui/docksplitter.cpp
+++ b/apps/ktorrent/newui/docksplitter.cpp
@@ -166,8 +166,8 @@ TQPair<uint, uint> DockSplitter::indexOf(TQWidget *dock)
for (uint i = 0; i < m_docks.count(); ++i)
for (uint j = 0; j < m_docks[i].count(); ++j)
if (dock == m_docks[i][j])
- return tqMakePair(i, j);
- return tqMakePair(0u, 0u);
+ return qMakePair(i, j);
+ return qMakePair(0u, 0u);
}
}
diff --git a/libktorrent/net/speed.cpp b/libktorrent/net/speed.cpp
index 35fde9d..e4328fc 100644
--- a/libktorrent/net/speed.cpp
+++ b/libktorrent/net/speed.cpp
@@ -37,7 +37,7 @@ namespace net
void Speed::onData(Uint32 b,bt::TimeStamp ts)
{
- dlrate.append(tqMakePair(b,ts));
+ dlrate.append(qMakePair(b,ts));
bytes += b;
}
diff --git a/libktorrent/torrent/speedestimater.cpp b/libktorrent/torrent/speedestimater.cpp
index a0b67da..7752999 100644
--- a/libktorrent/torrent/speedestimater.cpp
+++ b/libktorrent/torrent/speedestimater.cpp
@@ -36,7 +36,7 @@ namespace bt
void data(Uint32 bytes)
{
- dlrate.append(tqMakePair(bytes,GetCurrentTime()));
+ dlrate.append(qMakePair(bytes,GetCurrentTime()));
}
void update()