From 0a80cfd57d271dd44221467efb426675fa470356 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 28 Jun 2011 18:31:12 +0000 Subject: TQt4 port kvirc This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1238719 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/kvilib/irc/kvi_avatar.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/kvilib/irc/kvi_avatar.cpp') diff --git a/src/kvilib/irc/kvi_avatar.cpp b/src/kvilib/irc/kvi_avatar.cpp index 1642560a..680e7978 100644 --- a/src/kvilib/irc/kvi_avatar.cpp +++ b/src/kvilib/irc/kvi_avatar.cpp @@ -27,7 +27,7 @@ #include "kvi_avatar.h" #include "kvi_qstring.h" -#include +#include /* @@ -95,13 +95,13 @@ The "preferred" image size may grow with time, as the network transmission speed grows. */ -KviAvatar::KviAvatar(const QString &szLocalPath,const QString &szName,QPixmap * pix) +KviAvatar::KviAvatar(const TQString &szLocalPath,const TQString &szName,TQPixmap * pix) { m_pPixmap = pix; m_pScaledPixmap = 0; - if(m_pPixmap == 0)m_pPixmap = new QPixmap(32,32); // cool memory map :) + if(m_pPixmap == 0)m_pPixmap = new TQPixmap(32,32); // cool memory map :) - m_bRemote = KviQString::equalCIN("http://",szName,7); + m_bRemote = KviTQString::equalCIN("http://",szName,7); m_szLocalPath = szLocalPath; m_szName = szName; @@ -113,7 +113,7 @@ KviAvatar::~KviAvatar() if(m_pScaledPixmap)delete m_pScaledPixmap; } -QPixmap * KviAvatar::scaledPixmap(unsigned int w,unsigned int h) +TQPixmap * KviAvatar::scaledPixmap(unsigned int w,unsigned int h) { if(((unsigned int)(m_pPixmap->width())) == w) { @@ -154,11 +154,11 @@ QPixmap * KviAvatar::scaledPixmap(unsigned int w,unsigned int h) } #ifdef COMPILE_USE_QT4 - m_pScaledPixmap = new QPixmap(m_pPixmap->scaled(scaleW,scaleH)); + m_pScaledPixmap = new TQPixmap(m_pPixmap->scaled(scaleW,scaleH)); #else - QImage img = m_pPixmap->convertToImage(); + TQImage img = m_pPixmap->convertToImage(); - m_pScaledPixmap = new QPixmap(); + m_pScaledPixmap = new TQPixmap(); m_pScaledPixmap->convertFromImage(img.smoothScale(scaleW,scaleH)); #endif return m_pScaledPixmap; -- cgit v1.2.1