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

1 files changed, 17 insertions, 17 deletions

diff --git a/src/modules/notifier/notifiermessage.cpp b/src/modules/notifier/notifiermessage.cpp
index 1e91b5de..d57d2019 100644
--- a/src/modules/notifier/notifiermessage.cpp
+++ b/src/modules/notifier/notifiermessage.cpp
@@ -45,24 +45,24 @@
 #endif
 */
 
-#include <qapplication.h>
-#include <qpainter.h>
-#include <qimage.h>
-#include <qdesktopwidget.h>
-#include <qtooltip.h>
+#include <tqapplication.h>
+#include <tqpainter.h>
+#include <tqimage.h>
+#include <tqdesktopwidget.h>
+#include <tqtooltip.h>
 
 #ifdef COMPILE_USE_QT4
-	#define QPopupMenu Q3PopupMenu
-	#include <q3popupmenu.h>
+	#define TQPopupMenu Q3PopupMenu
+	#include <tq3popupmenu.h>
 #else
-	#include <qpopupmenu.h>
+	#include <tqpopupmenu.h>
 #endif
 
 extern kvi_time_t g_tNotifierDisabledUntil;
 
-KviNotifierMessage::KviNotifierMessage(KviNotifierWindow * pNotifierWindow, QPixmap * pImage, const QString &szText)
+KviNotifierMessage::KviNotifierMessage(KviNotifierWindow * pNotifierWindow, TQPixmap * pImage, const TQString &szText)
 {
-	m_pText = new QSimpleRichText(KviMircCntrl::stripControlBytes(szText),pNotifierWindow->defaultFont());
+	m_pText = new TQSimpleRichText(KviMircCntrl::stripControlBytes(szText),pNotifierWindow->defaultFont());
 	m_pText->setWidth(pNotifierWindow->textWidth());
 	m_pImage = pImage;
 	m_bHistoric = false;
@@ -74,20 +74,20 @@ KviNotifierMessage::~KviNotifierMessage()
 	if(m_pImage)delete m_pImage;
 }
 
-static void increase_transparency(QImage &buffer,QImage &srcimg,int iDivisor)
+static void increase_transparency(TQImage &buffer,TQImage &srcimg,int iDivisor)
 {
 	buffer.create(srcimg.width(),srcimg.height(),32);
 	buffer.setAlphaBuffer(true);
 
 	for(int y = 0;y < buffer.height();y++)
 	{
-		QRgb * dst = (QRgb *)buffer.scanLine(y);
-		QRgb * end = dst + buffer.width();
-		QRgb * src = (QRgb *)srcimg.scanLine(y);
+		TQRgb * dst = (TQRgb *)buffer.scanLine(y);
+		TQRgb * end = dst + buffer.width();
+		TQRgb * src = (TQRgb *)srcimg.scanLine(y);
 
 		while(dst < end)
 		{
-			*dst = qRgba(qRed(*src),qGreen(*src),qBlue(*src),qAlpha(*src) / iDivisor);
+			*dst = tqRgba(tqRed(*src),tqGreen(*src),tqBlue(*src),tqAlpha(*src) / iDivisor);
 			dst++;
 			src++;
 		}
@@ -99,8 +99,8 @@ void KviNotifierMessage::setHistoric()
 	m_bHistoric = true;
 	if(!m_pImage)return;
 	if(!m_pImage->hasAlphaChannel())return;
-	QImage tmp;
-	QImage out = m_pImage->convertToImage();
+	TQImage tmp;
+	TQImage out = m_pImage->convertToImage();
 	increase_transparency(tmp,out,2);
 	m_pImage->convertFromImage(tmp);
 }