diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2013-11-28 13:30:19 -0600 |
---|---|---|
committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-11-28 13:30:19 -0600 |
commit | 90f1f50f00651f7bc9f8acf50556968b4288400d (patch) | |
tree | 8d5df88cb28a00efd2c8b9f3c6b1ca7e6063ada9 /tdeioslave | |
parent | 1c37295608c6d783b2b710f423befbcfb0068bbd (diff) | |
download | tdebase-90f1f50f00651f7bc9f8acf50556968b4288400d.tar.gz tdebase-90f1f50f00651f7bc9f8acf50556968b4288400d.zip |
Fix remnant QMIN/QMAX to TQMIN/TQMAX.
Diffstat (limited to 'tdeioslave')
-rw-r--r-- | tdeioslave/pop3/pop3.cc | 10 | ||||
-rw-r--r-- | tdeioslave/thumbnail/textcreator.cpp | 4 | ||||
-rw-r--r-- | tdeioslave/thumbnail/thumbnail.cpp | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/tdeioslave/pop3/pop3.cc b/tdeioslave/pop3/pop3.cc index 4f85c409c..7d5f914ad 100644 --- a/tdeioslave/pop3/pop3.cc +++ b/tdeioslave/pop3/pop3.cc @@ -230,7 +230,7 @@ POP3Protocol::Resp POP3Protocol::getResponse(char *r_buf, unsigned int r_len, if (strncmp(buf, "+OK", 3) == 0) { if (r_buf && r_len) { memcpy(r_buf, (buf[3] == ' ' ? buf + 4 : buf + 3), - QMIN(r_len, (buf[3] == ' ' ? recv_len - 4 : recv_len - 3))); + TQMIN(r_len, (buf[3] == ' ' ? recv_len - 4 : recv_len - 3))); } delete[]buf; @@ -239,7 +239,7 @@ POP3Protocol::Resp POP3Protocol::getResponse(char *r_buf, unsigned int r_len, } else if (strncmp(buf, "-ERR", 4) == 0) { if (r_buf && r_len) { memcpy(r_buf, (buf[4] == ' ' ? buf + 5 : buf + 4), - QMIN(r_len, (buf[4] == ' ' ? recv_len - 5 : recv_len - 4))); + TQMIN(r_len, (buf[4] == ' ' ? recv_len - 5 : recv_len - 4))); } TQString command = TQString::fromLatin1(cmd); @@ -256,8 +256,8 @@ POP3Protocol::Resp POP3Protocol::getResponse(char *r_buf, unsigned int r_len, return Err; } else if (strncmp(buf, "+ ", 2) == 0) { if (r_buf && r_len) { - memcpy(r_buf, buf + 2, QMIN(r_len, recv_len - 4)); - r_buf[QMIN(r_len - 1, recv_len - 4)] = '\0'; + memcpy(r_buf, buf + 2, TQMIN(r_len, recv_len - 4)); + r_buf[TQMIN(r_len - 1, recv_len - 4)] = '\0'; } delete[]buf; @@ -267,7 +267,7 @@ POP3Protocol::Resp POP3Protocol::getResponse(char *r_buf, unsigned int r_len, POP3_DEBUG << "Invalid POP3 response received!" << endl; if (r_buf && r_len) { - memcpy(r_buf, buf, QMIN(r_len, recv_len)); + memcpy(r_buf, buf, TQMIN(r_len, recv_len)); } if (!buf || !*buf) { diff --git a/tdeioslave/thumbnail/textcreator.cpp b/tdeioslave/thumbnail/textcreator.cpp index 322c944a2..13f3ba83f 100644 --- a/tdeioslave/thumbnail/textcreator.cpp +++ b/tdeioslave/thumbnail/textcreator.cpp @@ -122,9 +122,9 @@ bool TextCreator::create(const TQString &path, int width, int height, TQImage &i TQRect rect; int rest = m_pixmap.width() - (numCharsPerLine * chSize.width()); - xborder = QMAX( xborder, rest/2); // center horizontally + xborder = TQMAX( xborder, rest/2); // center horizontally rest = m_pixmap.height() - (numLines * chSize.height()); - yborder = QMAX( yborder, rest/2); // center vertically + yborder = TQMAX( yborder, rest/2); // center vertically // end centering int x = xborder, y = yborder; // where to paint the characters diff --git a/tdeioslave/thumbnail/thumbnail.cpp b/tdeioslave/thumbnail/thumbnail.cpp index 0e6b24880..cc2eefbc3 100644 --- a/tdeioslave/thumbnail/thumbnail.cpp +++ b/tdeioslave/thumbnail/thumbnail.cpp @@ -348,9 +348,9 @@ void ThumbnailProtocol::get(const KURL &url) TQImage icon = getIcon(); int x = img.width() - icon.width() - 4; - x = QMAX( x, 0 ); + x = TQMAX( x, 0 ); int y = img.height() - icon.height() - 6; - y = QMAX( y, 0 ); + y = TQMAX( y, 0 ); KImageEffect::blendOnLower( x, y, icon, img ); } |