Rename old tq methods that no longer need a unique name

39 files changed, 147 insertions, 147 deletions

diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
index b9e2f2b..c35b1fe 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/kvi_channel.cpp
@@ -220,7 +220,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name
 	if(KVI_OPTION_BOOL(KviOption_boolAutoLogChannels))m_pIrcView->startLogging();
 
 	applyOptions();
-	m_joinTime = TQDateTime::tqcurrentDateTime();
+	m_joinTime = TQDateTime::currentDateTime();
 	m_tLastReceivedWhoReply = (kvi_time_t)m_joinTime.toTime_t();
 	
 
@@ -547,23 +547,23 @@ void KviChannel::resizeEvent(TQResizeEvent *e)
 {
 #ifdef COMPILE_USE_QT4
 	int hght = m_pInput->heightHint();
-	int hght2 = m_pTopicWidget->tqsizeHint().height();
+	int hght2 = m_pTopicWidget->sizeHint().height();
 	m_pButtonBox->setGeometry(0,0,width(),hght2);
 	m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2));
 	m_pInput->setGeometry(0,height() - hght,width(),hght);
 #else
 	int hght = m_pInput->heightHint();
-	int hght2 = m_pButtonBox->tqsizeHint().height();
+	int hght2 = m_pButtonBox->sizeHint().height();
 	m_pButtonBox->setGeometry(0,0,width(),hght2);
 	m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2));
 	m_pInput->setGeometry(0,height() - hght,width(),hght);
 #endif
 }
 
-TQSize KviChannel::tqsizeHint() const
+TQSize KviChannel::sizeHint() const
 {
-	TQSize ret(m_pSplitter->tqsizeHint().width(),
-		m_pIrcView->tqsizeHint().height() + m_pInput->heightHint() + m_pButtonBox->tqsizeHint().height());
+	TQSize ret(m_pSplitter->sizeHint().width(),
+		m_pIrcView->sizeHint().height() + m_pInput->heightHint() + m_pButtonBox->sizeHint().height());
 	return ret;
 }
 
@@ -655,7 +655,7 @@ void KviChannel::setAliveChan()
 	m_iStateFlags = 0;
 	setType(KVI_WINDOW_TYPE_CHANNEL);
 	m_pUserListView->setUserDataBase(connection()->userDataBase());
-	m_joinTime = TQDateTime::tqcurrentDateTime();
+	m_joinTime = TQDateTime::currentDateTime();
 	context()->unregisterDeadChannel(this);
 	connection()->registerChannel(this);
 	// Update log file name
@@ -1170,7 +1170,7 @@ bool KviChannel::activityMeter(unsigned int * puActivityValue,unsigned int * puA
 	
 		if(m_pActionHistory->count() < KVI_CHANNEL_ACTION_HISTORY_MAX_COUNT)
 		{
-			if(m_joinTime.secsTo(TQDateTime::tqcurrentDateTime()) < KVI_CHANNEL_ACTION_HISTORY_MAX_TIMESPAN)
+			if(m_joinTime.secsTo(TQDateTime::currentDateTime()) < KVI_CHANNEL_ACTION_HISTORY_MAX_TIMESPAN)
 			{
 				// we can't exactly estimate
 				if(dSpan < 60.0)dSpan = 60.0;
@@ -1281,7 +1281,7 @@ void KviChannel::getChannelActivityStats(KviChannelActivityStats * s)
 
 	if(s->uActionCount < KVI_CHANNEL_ACTION_HISTORY_MAX_COUNT)
 	{
-		if(m_joinTime.secsTo(TQDateTime::tqcurrentDateTime()) < KVI_CHANNEL_ACTION_HISTORY_MAX_TIMESPAN)
+		if(m_joinTime.secsTo(TQDateTime::currentDateTime()) < KVI_CHANNEL_ACTION_HISTORY_MAX_TIMESPAN)
 		{
 			// we can't exactly estimate
 			s->bStatsInaccurate = true;
diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h
index 45a4801..3c86b6a 100644
--- a/src/kvirc/ui/kvi_channel.h
+++ b/src/kvirc/ui/kvi_channel.h
@@ -233,7 +233,7 @@ public:
 	void prependUserFlag(const TQString &nick,TQString &buffer){ m_pUserListView->prependUserFlag(nick,buffer); };
 	char getUserFlag(const TQString &nick){ return m_pUserListView->getUserFlag(nick); };
 	bool isDeadChan(){ return (m_iStateFlags & KVI_CHANNEL_STATE_DEADCHAN); };
-	virtual TQSize tqsizeHint() const;
+	virtual TQSize sizeHint() const;
 	void enableUserListUpdates(bool bEnable){ m_pUserListView->enableUpdates(bEnable); };
 	KviUserListEntry * join(const TQString &nick,const TQString &user = TQString(),const TQString &host = TQString(),int iFlags = 0)
 		{ return m_pUserListView->join(nick,user,host,iFlags); };
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
index fdce502..b2a19f4 100644
--- a/src/kvirc/ui/kvi_console.cpp
+++ b/src/kvirc/ui/kvi_console.cpp
@@ -1087,15 +1087,15 @@ void KviConsole::applyOptions()
 void KviConsole::resizeEvent(TQResizeEvent *e)
 {
 	int hght = m_pInput->heightHint();
-	int hght2 = m_pButtonBox->tqsizeHint().height();
+	int hght2 = m_pButtonBox->sizeHint().height();
 	m_pButtonBox->setGeometry(0,0,width(),hght2);
 	m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2));
 	m_pInput->setGeometry(0,height() - hght,width(),hght);
 }
 
-TQSize KviConsole::tqsizeHint() const
+TQSize KviConsole::sizeHint() const
 {
-	TQSize ret(m_pIrcView->tqsizeHint().height(),m_pIrcView->tqsizeHint().height() + m_pInput->heightHint());
+	TQSize ret(m_pIrcView->sizeHint().height(),m_pIrcView->sizeHint().height() + m_pInput->heightHint());
 	return ret;
 }
 
diff --git a/src/kvirc/ui/kvi_console.h b/src/kvirc/ui/kvi_console.h
index 18c02ee..a32ae7f 100644
--- a/src/kvirc/ui/kvi_console.h
+++ b/src/kvirc/ui/kvi_console.h
@@ -101,7 +101,7 @@ protected:
 	virtual void getBaseLogFileName(TQString &buffer);
 	virtual void getTaskBarTipText(TQString &buffer);
 	virtual void fillContextPopup(KviTalPopupMenu * p);
-	virtual TQSize tqsizeHint() const;
+	virtual TQSize sizeHint() const;
 	virtual void applyOptions();
 	virtual void triggerCreationEvents();
 	void fillStatusString();
@@ -181,7 +181,7 @@ public:
 
 	void terminateConnectionRequest(bool bForce = false,const char * quitMsg = 0);
 
-	// tqStatus string (usermode + nick) (connection related too)
+	// Status string (usermode + nick) (connection related too)
 	const TQString & statusString(){ return m_szStatusString; };
 	
 	// forwarders from KviIrcConnection
diff --git a/src/kvirc/ui/kvi_cryptcontroller.cpp b/src/kvirc/ui/kvi_cryptcontroller.cpp
index 83ac72e..1af4c18 100644
--- a/src/kvirc/ui/kvi_cryptcontroller.cpp
+++ b/src/kvirc/ui/kvi_cryptcontroller.cpp
@@ -107,9 +107,9 @@
 		m_pDescriptionLabel = new TQLabel(this);
 		m_pDescriptionLabel->setFrameStyle(TQFrame::Sunken | TQFrame::StyledPanel);
 #ifdef COMPILE_USE_QT4
-		m_pDescriptionLabel->tqsetAlignment(TQt::AlignTop | TQt::AlignLeft);
+		m_pDescriptionLabel->setAlignment(TQt::AlignTop | TQt::AlignLeft);
 #else
-		m_pDescriptionLabel->tqsetAlignment(TQt::AlignTop | TQt::AlignLeft);
+		m_pDescriptionLabel->setAlignment(TQt::AlignTop | TQt::AlignLeft);
 #endif
 		g->addMultiCellWidget(m_pDescriptionLabel,3,3,1,3);
 
diff --git a/src/kvirc/ui/kvi_ctcppagedialog.cpp b/src/kvirc/ui/kvi_ctcppagedialog.cpp
index da82146..8a151e6 100644
--- a/src/kvirc/ui/kvi_ctcppagedialog.cpp
+++ b/src/kvirc/ui/kvi_ctcppagedialog.cpp
@@ -103,7 +103,7 @@ void KviCtcpPageDialog::addPage(const TQString &szNick,const TQString &szUser,co
 	TQLabel * l = new TQLabel(this);
 	l->setFrameStyle(TQFrame::Raised | TQFrame::StyledPanel);
 	//l->setMaximumWidth(600);
-	TQString date = TQDateTime::tqcurrentDateTime().toString();
+	TQString date = TQDateTime::currentDateTime().toString();
 
 	TQString tmp = "<center>";
 	tmp += __tr2qs("You have been paged by");
diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp
index 828eb02..e6b234e 100644
--- a/src/kvirc/ui/kvi_customtoolbar.cpp
+++ b/src/kvirc/ui/kvi_customtoolbar.cpp
@@ -62,17 +62,17 @@ KviCustomToolBarSeparator::KviCustomToolBarSeparator(KviCustomToolBar *pParent,c
 	m_pToolBar = pParent;
 	setBackgroundMode(pParent->backgroundMode());
 	setBackgroundOrigin(ParentOrigin);
-	tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum));
+	setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum));
 }
 
-TQSize KviCustomToolBarSeparator::tqsizeHint() const
+TQSize KviCustomToolBarSeparator::sizeHint() const
 {
 #ifdef COMPILE_USE_QT4
 	TQStyleOption opt;
 	opt.initFrom(this);
-	int extent = tqstyle()->tqpixelMetric(TQStyle::PM_ToolBarSeparatorExtent,&opt,this);
+	int extent = tqstyle()->pixelMetric(TQStyle::PM_ToolBarSeparatorExtent,&opt,this);
 #else
-	int extent = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowSeparatorExtent,this);
+	int extent = tqstyle().pixelMetric(TQStyle::PM_DockWindowSeparatorExtent,this);
 #endif
 	if(m_pToolBar->orientation() == Qt::Horizontal)return TQSize(extent,0);
 	else return TQSize(0,extent);
@@ -88,7 +88,7 @@ void KviCustomToolBarSeparator::paintEvent(TQPaintEvent *)
 #else
 	TQStyle::SFlags flags = TQStyle::Style_Default;
 	if(m_pToolBar->orientation() == Qt::Horizontal)flags |= TQStyle::Style_Horizontal;
-	tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator,&p,rect(),tqcolorGroup(),flags);
+	tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator,&p,rect(),colorGroup(),flags);
 #endif
 }
 
@@ -293,7 +293,7 @@ void KviCustomToolBar::dragEnterEvent(TQDragEnterEvent *e)
 				boxLayout()->insertWidget(idx,m_pDraggedChild);
 #ifdef COMPILE_KDE_SUPPORT
 				// bleah ://///
-				insertWidget(-1,m_pDraggedChild->tqsizeHint().width(),m_pDraggedChild,idx);
+				insertWidget(-1,m_pDraggedChild->sizeHint().width(),m_pDraggedChild,idx);
 #endif
 #endif
 				TQEvent ev(TQEvent::LayoutHint);
diff --git a/src/kvirc/ui/kvi_customtoolbar.h b/src/kvirc/ui/kvi_customtoolbar.h
index ec6483b..d02ad59 100644
--- a/src/kvirc/ui/kvi_customtoolbar.h
+++ b/src/kvirc/ui/kvi_customtoolbar.h
@@ -41,7 +41,7 @@ class KviCustomToolBarSeparator : public TQWidget
   TQ_OBJECT
 public:
 	KviCustomToolBarSeparator(KviCustomToolBar *pParent,const char * name);
-	TQSize tqsizeHint() const;
+	TQSize sizeHint() const;
 protected:
 	KviCustomToolBar * m_pToolBar;
 protected:
diff --git a/src/kvirc/ui/kvi_debugwindow.cpp b/src/kvirc/ui/kvi_debugwindow.cpp
index 8110967..dcbb49d 100644
--- a/src/kvirc/ui/kvi_debugwindow.cpp
+++ b/src/kvirc/ui/kvi_debugwindow.cpp
@@ -124,9 +124,9 @@ void KviDebugWindow::resizeEvent(TQResizeEvent *e)
 	m_pInput->setGeometry(0,height() - hght,width(),hght);
 }
 
-TQSize KviDebugWindow::tqsizeHint() const
+TQSize KviDebugWindow::sizeHint() const
 {
-	TQSize ret(m_pSplitter->tqsizeHint().width(),m_pIrcView->tqsizeHint().height() + m_pInput->heightHint());
+	TQSize ret(m_pSplitter->sizeHint().width(),m_pIrcView->sizeHint().height() + m_pInput->heightHint());
 	return ret;
 }
 
diff --git a/src/kvirc/ui/kvi_debugwindow.h b/src/kvirc/ui/kvi_debugwindow.h
index 616752a..1eab1ee 100644
--- a/src/kvirc/ui/kvi_debugwindow.h
+++ b/src/kvirc/ui/kvi_debugwindow.h
@@ -49,7 +49,7 @@ protected:
 	virtual void loadProperties(KviConfig * cfg);
 	virtual void saveProperties(KviConfig * cfg);
 	virtual void getBaseLogFileName(TQString &buffer);
-	virtual TQSize tqsizeHint() const;
+	virtual TQSize sizeHint() const;
 };
 
 #endif //_KVI_DEBUGWINDOW_H_
diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp
index db5efa8..96c63e6 100644
--- a/src/kvirc/ui/kvi_frame.cpp
+++ b/src/kvirc/ui/kvi_frame.cpp
@@ -879,7 +879,7 @@ void KviFrame::childWindowActivated(KviWindow *wnd)
 	if(wnd->isMaximized() && wnd->mdiParent())updateCaption();
 	m_pTaskBar->setActiveItem(wnd->taskBarItem());
 
-	//wnd->gainedActiveWindowtqStatus(); // <-- atm unused
+	//wnd->gainedActiveWindowStatus(); // <-- atm unused
 	
 	if(g_pActiveWindow->view())
 		g_pActiveWindow->view()->clearUnreaded();
@@ -1165,7 +1165,7 @@ void KviFrame::toolbarsPopupSelected(int id)
 bool KviFrame::focusNextPrevChild(bool next)
 {
 	//debug("FOCUS NEXT PREV CHILD");
-	TQWidget * w = tqfocusWidget();
+	TQWidget * w = focusWidget();
 	if(w)
 	{
 #ifdef COMPILE_USE_QT4
diff --git a/src/kvirc/ui/kvi_imagedialog.cpp b/src/kvirc/ui/kvi_imagedialog.cpp
index a4c89ad..03eeeee 100644
--- a/src/kvirc/ui/kvi_imagedialog.cpp
+++ b/src/kvirc/ui/kvi_imagedialog.cpp
@@ -67,7 +67,7 @@ void KviImageDialogItem::paint(TQPainter * p)
 		p->drawRect(3,3,pm->width() + 4,pm->height() + 4);
 	}
 
-	TQRect daRect(listBox()->tqitemRect(this));
+	TQRect daRect(listBox()->itemRect(this));
 
 	p->setPen(TQt::black);
 	p->drawRect(1,1,daRect.width() - 2,daRect.height() - 2);
@@ -361,7 +361,7 @@ void KviImageDialog::tipRequest(KviDynamicToolTip *,const TQPoint &pnt)
 {
 	KviTalListBoxItem * it = (KviTalListBoxItem *)m_pListBox->itemAt(pnt);
 	if(!it)return;
-	TQRect r = m_pListBox->tqitemRect(it);
+	TQRect r = m_pListBox->itemRect(it);
 	KviImageDialogItem * i = (KviImageDialogItem *)it;
 	m_pTip->tip(r,i->tipText());
 }
diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp
index 5258577..5445738 100644
--- a/src/kvirc/ui/kvi_input.cpp
+++ b/src/kvirc/ui/kvi_input.cpp
@@ -299,10 +299,10 @@ void KviInputEditor::dropEvent(TQDropEvent *e)
 
 int  KviInputEditor::heightHint() const
 {
-	return tqsizeHint().height();
+	return sizeHint().height();
 }
 
-TQSize KviInputEditor::tqsizeHint() const
+TQSize KviInputEditor::sizeHint() const
 {
 	//grabbed from qlineedit.cpp
 	constPolish();
@@ -2335,7 +2335,7 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view)
 	m_pButtonContainer->setSpacing(0);
 
 #ifdef COMPILE_USE_QT4
-	m_pButtonContainer->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred));
+	m_pButtonContainer->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred));
 //	if(m_pButtonContainer->tqlayout())
 //		m_pButtonContainer->tqlayout()->setSizeConstraint(TQLayout::SetMinimumSize);
 #endif
@@ -2396,9 +2396,9 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view)
 	m_pInputEditor = new KviInputEditor(this,par,view);
 	connect(m_pInputEditor,TQT_SIGNAL(enterPressed()),this,TQT_SLOT(inputEditorEnterPressed()));
 #ifdef COMPILE_USE_QT4
-	m_pInputEditor->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Ignored));
+	m_pInputEditor->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Ignored));
 #else
-	m_pInputEditor->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored));
+	m_pInputEditor->setSizePolicy(TQSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored));
 #endif
 	
 
diff --git a/src/kvirc/ui/kvi_input.h b/src/kvirc/ui/kvi_input.h
index 777fb41..6e2d5c9 100644
--- a/src/kvirc/ui/kvi_input.h
+++ b/src/kvirc/ui/kvi_input.h
@@ -144,7 +144,7 @@ protected:
 	bool			 m_bReadOnly;
 public:
 	int  heightHint() const;
-	virtual TQSize  tqsizeHint() const;
+	virtual TQSize  sizeHint() const;
 	void setText(const TQString text);
 	TQString text() { return m_szTextBuffer; };
 	void insertChar(TQChar c);
diff --git a/src/kvirc/ui/kvi_ipeditor.cpp b/src/kvirc/ui/kvi_ipeditor.cpp
index 0e12d2d..df15e02 100644
--- a/src/kvirc/ui/kvi_ipeditor.cpp
+++ b/src/kvirc/ui/kvi_ipeditor.cpp
@@ -208,7 +208,7 @@ void KviIpEditor::recreateChildren()
 			m_pEdit[i] = new TQLineEdit(this);
 			m_pEdit[i]->installEventFilter(this);
 			m_pEdit[i]->setFrame(false);
-			m_pEdit[i]->tqsetAlignment(TQt::AlignCenter);
+			m_pEdit[i]->setAlignment(TQt::AlignCenter);
 		}
 		//m_pEdit[i]->setMinimumWidth(minWidth);
 		m_pEdit[i]->setMaxLength(bIpV4 ? 3 : 4);
@@ -243,8 +243,8 @@ void KviIpEditor::recreateChildren()
 			}
 		}
 	}
-	//setMinimumWidth(4 + (max * minWidth) + ((max - 1) * m_pLabel[0]->tqsizeHint().width()));
-	setMinimumHeight(m_pLabel[0]->tqsizeHint().height() + 4);
+	//setMinimumWidth(4 + (max * minWidth) + ((max - 1) * m_pLabel[0]->sizeHint().width()));
+	setMinimumHeight(m_pLabel[0]->sizeHint().height() + 4);
 	resizeEvent(0);
 }
 
@@ -395,7 +395,7 @@ void KviIpEditor::resizeEvent(TQResizeEvent *e)
 	if(m_pEdit[0])
 	{
 		int maxW = (m_addrType == IpV4) ? 4 : 8;
-		int labHint = m_pLabel[0]->tqsizeHint().width();
+		int labHint = m_pLabel[0]->sizeHint().width();
 		int hghHint = height() - 4;
 		int ediWdth = ((width() - 4) - ((maxW - 1) * labHint)) / maxW;
 		int curX = 2;
@@ -413,16 +413,16 @@ void KviIpEditor::resizeEvent(TQResizeEvent *e)
 	if(e)TQFrame::resizeEvent(e);
 }
 
-TQSize KviIpEditor::tqsizeHint()
+TQSize KviIpEditor::sizeHint()
 {
 	if(m_pEdit[0])
 	{
-		int labHint = m_pLabel[0]->tqsizeHint().width();
-		int hghHint = m_pEdit[0]->tqsizeHint().height();
-		int ediHint = m_pEdit[0]->tqsizeHint().width();
+		int labHint = m_pLabel[0]->sizeHint().width();
+		int hghHint = m_pEdit[0]->sizeHint().height();
+		int ediHint = m_pEdit[0]->sizeHint().width();
 		if(m_addrType == IpV4)return TQSize((labHint * 3) + (ediHint * 4) + 4,hghHint + 4);
 		else return TQSize((labHint * 7) + (ediHint * 8) + 4,hghHint + 4);
-	} else return TQFrame::tqsizeHint();
+	} else return TQFrame::sizeHint();
 }
 
 
diff --git a/src/kvirc/ui/kvi_ipeditor.h b/src/kvirc/ui/kvi_ipeditor.h
index 19e2a3c..625f164 100644
--- a/src/kvirc/ui/kvi_ipeditor.h
+++ b/src/kvirc/ui/kvi_ipeditor.h
@@ -55,7 +55,7 @@ public:
 protected:
 	virtual bool eventFilter(TQObject * o,TQEvent *e);
 	virtual void resizeEvent(TQResizeEvent *e);
-	virtual TQSize tqsizeHint();
+	virtual TQSize sizeHint();
 private:
 	void recreateChildren();
 };
diff --git a/src/kvirc/ui/kvi_irctoolbar.cpp b/src/kvirc/ui/kvi_irctoolbar.cpp
index e551771..2f2a237 100644
--- a/src/kvirc/ui/kvi_irctoolbar.cpp
+++ b/src/kvirc/ui/kvi_irctoolbar.cpp
@@ -77,7 +77,7 @@ KviToolBarGraphicalApplet::KviToolBarGraphicalApplet(TQWidget * par,const char *
 	setMouseTracking(true);
 	m_bResizeMode = false;
 
-	m_tqsizeHint = TQSize(180,32);
+	m_sizeHint = TQSize(180,32);
 	m_bSizeLoaded = false;
 }
 
@@ -95,16 +95,16 @@ void KviToolBarGraphicalApplet::saveAppletWidth(unsigned int uWidth)
 
 void KviToolBarGraphicalApplet::setupSizeHint()
 {
-	m_tqsizeHint = TQSize(loadAppletWidth(),22);
+	m_sizeHint = TQSize(loadAppletWidth(),22);
 	m_bSizeLoaded = true;
 }
 
-TQSize KviToolBarGraphicalApplet::tqsizeHint() const
+TQSize KviToolBarGraphicalApplet::sizeHint() const
 {
 	// forget constness :(
 	KviToolBarGraphicalApplet * that = (KviToolBarGraphicalApplet *)this;
 	if(!m_bSizeLoaded)that->setupSizeHint();
-	return m_tqsizeHint;
+	return m_sizeHint;
 }
 
 /*
@@ -127,7 +127,7 @@ void KviToolBarGraphicalApplet::mouseMoveEvent(TQMouseEvent * e)
 			int w = e->pos().x();
 			if(w < 32)w = 32;
 			if(w > 480)w = 480;
-			m_tqsizeHint = TQSize(w,22);
+			m_sizeHint = TQSize(w,22);
 			resize(w,height());
 			g_pApp->postEvent(parentWidget(),new TQEvent(TQEvent::LayoutHint));
 		}
@@ -155,7 +155,7 @@ void KviToolBarGraphicalApplet::mouseReleaseEvent(TQMouseEvent * e)
 
 KviToolBarGraphicalApplet::~KviToolBarGraphicalApplet()
 {
-	saveAppletWidth(m_tqsizeHint.width());
+	saveAppletWidth(m_sizeHint.width());
 	g_pToolBarGraphicalAppletList->removeRef(this);
 	if(g_pToolBarGraphicalAppletList->isEmpty())
 	{
@@ -208,10 +208,10 @@ void KviToolBarGraphicalApplet::paintEvent(TQPaintEvent *e)
 	drawContents(&pa);
 
 	//Need to draw the sunken rect around the view now...
-	pa.setPen(tqcolorGroup().dark());
+	pa.setPen(colorGroup().dark());
 	pa.drawLine(0,0,width(),0);
 	pa.drawLine(0,0,0,width());
-	pa.setPen(tqcolorGroup().light());
+	pa.setPen(colorGroup().light());
 	pa.drawLine(1,height() - 1,width() - 1,height() - 1);
 	pa.drawLine(width() - 1,1,width() - 1,height());
 
@@ -332,7 +332,7 @@ void KviIrcContextDisplay::tipRequest(KviDynamicToolTip * tip,const TQPoint &)
 
 
 /*
-TQSize KviIrcContextDisplay::tqsizeHint() const
+TQSize KviIrcContextDisplay::sizeHint() const
 {
 	return TQSize(160,22);
 }
@@ -416,7 +416,7 @@ void KviIrcContextDisplay::drawContents(TQPainter * p)
 	
 		p->setClipping(false);
 
-		TQColor base = tqcolorGroup().background();
+		TQColor base = colorGroup().background();
 		TQColor cntx = KVI_OPTION_ICCOLOR(c->ircContextId() % KVI_NUM_ICCOLOR_OPTIONS);
 		base.setRgb((base.red() + cntx.red()) >> 1,(base.green() + cntx.green()) >> 1,
 			(base.blue() + cntx.blue()) >> 1);
diff --git a/src/kvirc/ui/kvi_irctoolbar.h b/src/kvirc/ui/kvi_irctoolbar.h
index dd6c93e..1b1d94e 100644
--- a/src/kvirc/ui/kvi_irctoolbar.h
+++ b/src/kvirc/ui/kvi_irctoolbar.h
@@ -55,7 +55,7 @@ public:
 private:
 	bool m_bResizeMode;
 	bool m_bSizeLoaded;
-	TQSize m_tqsizeHint;
+	TQSize m_sizeHint;
 private:
 	void resizeMemBuffer();
 protected:
@@ -63,7 +63,7 @@ protected:
 
 	virtual unsigned int loadAppletWidth();
 	virtual void saveAppletWidth(unsigned int uWidth);
-	virtual TQSize tqsizeHint() const;
+	virtual TQSize sizeHint() const;
 	virtual void mouseMoveEvent(TQMouseEvent *e);
 	virtual void mousePressEvent(TQMouseEvent *e);
 	virtual void mouseReleaseEvent(TQMouseEvent *e);
diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp
index a500c46..9d469f7 100644
--- a/src/kvirc/ui/kvi_ircview.cpp
+++ b/src/kvirc/ui/kvi_ircview.cpp
@@ -165,7 +165,7 @@
 
 #define KVI_DEF_BACK 200
 
-// FIXME: #warning "The scrollbar should NOT have a fixed size : the KDE styles can configure the size (tqsizeHint() ?)"
+// FIXME: #warning "The scrollbar should NOT have a fixed size : the KDE styles can configure the size (sizeHint() ?)"
 
 //
 // FIXME: PgUp and PgDn scrolls a fixed number of lines!
@@ -532,7 +532,7 @@ void KviIrcView::stopLogging()
 	if(m_pLogFile)
 	{
 		TQString szLogEnd;
-		szLogEnd.sprintf(__tr2qs("### Log session terminated at %s ###"),TQDateTime::tqcurrentDateTime().toString().utf8().data());
+		szLogEnd.sprintf(__tr2qs("### Log session terminated at %s ###"),TQDateTime::currentDateTime().toString().utf8().data());
 		
 		add2Log(szLogEnd);	
 		m_pLogFile->close();
@@ -706,7 +706,7 @@ bool KviIrcView::startLogging(const TQString& fname,bool bPrependCurBuffer)
 	}
 
 	TQString szLogStart;
-	szLogStart.sprintf(__tr2qs("### Log session started at %s ###"),TQDateTime::tqcurrentDateTime().toString().utf8().data());
+	szLogStart.sprintf(__tr2qs("### Log session started at %s ###"),TQDateTime::currentDateTime().toString().utf8().data());
 	add2Log(szLogStart);
 	if(bPrependCurBuffer)
 	{
@@ -803,7 +803,7 @@ void KviIrcView::clearLineMark(bool bRepaint)
 
 void KviIrcView::checkLogDate()
 {
-	TQDate::tqcurrentDate();
+	TQDate::currentDate();
 }
 
 void KviIrcView::clearUnreaded()
@@ -1264,7 +1264,7 @@ void KviIrcView::appendText(int iMsgType,const kvi_wchar_t *data_ptr,int iFlags)
 		{
 			TQString szBuffer;
 			kvi_appendWCharToTQStringWithLength(&szBuffer,data_ptr,kvi_wstrlen(data_ptr));
-			szBuffer.prepend(TQDateTime::tqcurrentDateTime().toString("[h:mm:ss] "));
+			szBuffer.prepend(TQDateTime::currentDateTime().toString("[h:mm:ss] "));
 			if(m_pLogFile && KVI_OPTION_MSGTYPE(iMsgType).logEnabled())
 			{
 				add2Log(szBuffer,iMsgType);
@@ -1923,7 +1923,7 @@ const kvi_wchar_t * KviIrcView::getTextLine(int iMsgType,
 	if(bEnableTimeStamp && KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp))
 	{
 		TQString szTimestamp;
-		szTimestamp=TQDateTime::tqcurrentDateTime ( 
+		szTimestamp=TQDateTime::currentDateTime ( 
 				KVI_OPTION_BOOL(KviOption_boolIrcViewTimestampUTC) ? Qt::UTC : Qt::LocalTime ).toString(
 					KVI_OPTION_STRING(KviOption_stringIrcViewTimestampFormat) );
 		szTimestamp.append(' ');
@@ -3428,10 +3428,10 @@ no_selection_paint:
 	}
 	
 	//Need to draw the sunken rect around the view now...
-	pa.setPen(tqcolorGroup().dark());
+	pa.setPen(colorGroup().dark());
 	pa.drawLine(0,0,widgetWidth,0);
 	pa.drawLine(0,0,0,widgetHeight);
-	pa.setPen(tqcolorGroup().light());
+	pa.setPen(colorGroup().light());
 	widgetWidth--;
 	pa.drawLine(1,widgetHeight-1,widgetWidth,widgetHeight-1);
 	pa.drawLine(widgetWidth,1,widgetWidth,widgetHeight);
@@ -3858,7 +3858,7 @@ void KviIrcView::recalcFontVariables(const TQFontMetrics &fm,const TQFontInfo &f
 
 void KviIrcView::resizeEvent(TQResizeEvent *)
 {
-	int iScr = m_pScrollBar->tqsizeHint().width();
+	int iScr = m_pScrollBar->sizeHint().width();
 	int iLeft = width()-iScr;
 	m_pToolsButton->setGeometry(iLeft,0,iScr,iScr);
 	m_pScrollBar->setGeometry(iLeft,iScr,iScr,height() - iScr);
@@ -3873,7 +3873,7 @@ void KviIrcView::resizeEvent(TQResizeEvent *)
 	}
 }
 
-TQSize KviIrcView::tqsizeHint() const
+TQSize KviIrcView::sizeHint() const
 {
 	TQSize ret(KVI_IRCVIEW_SIZEHINT_WIDTH,KVI_IRCVIEW_SIZEHINT_HEIGHT);
 	return ret;
@@ -3900,7 +3900,7 @@ void KviIrcView::showToolsPopup()
 	m_pToolsPopup->insertSeparator();
 	m_pToolsPopup->insertItem(__tr2qs("Clear Buffer"),this,TQT_SLOT(clearBuffer()));
 	
-	TQSize s = m_pToolsPopup->tqsizeHint();
+	TQSize s = m_pToolsPopup->sizeHint();
 
 	m_pToolsPopup->popup(m_pToolsButton->mapToGlobal(TQPoint(m_pToolsButton->width() - s.width(),m_pToolsButton->height())));
 }
@@ -3959,7 +3959,7 @@ void KviIrcView::toggleToolWidget()
 
 	} else {
 		m_pToolWidget = new KviIrcViewToolWidget(this);
-		int w = m_pToolWidget->tqsizeHint().width();
+		int w = m_pToolWidget->sizeHint().width();
 		m_pToolWidget->move(width() - (w + 40),10);
 		m_pToolWidget->show();
 	}
diff --git a/src/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/kvi_ircview.h
index 092d5ed..84b485f 100644
--- a/src/kvirc/ui/kvi_ircview.h
+++ b/src/kvirc/ui/kvi_ircview.h
@@ -197,7 +197,7 @@ public:
 	void nextLine();
 	void nextPage();
 	void prevPage();
-	virtual TQSize tqsizeHint() const;
+	virtual TQSize sizeHint() const;
 	const TQString & lastLineOfText();
 	const TQString & lastMessageText();
 	virtual void setFont(const TQFont &f);
diff --git a/src/kvirc/ui/kvi_mdicaption.cpp b/src/kvirc/ui/kvi_mdicaption.cpp
index f1d47c9..7f57350 100644
--- a/src/kvirc/ui/kvi_mdicaption.cpp
+++ b/src/kvirc/ui/kvi_mdicaption.cpp
@@ -81,11 +81,11 @@ void KviMdiCaptionButton::drawButton(TQPainter *p)
 #ifdef COMPILE_USE_QT4
 	TQBrush b(parentWidget()->palette().window());
 #else
-	TQBrush b(parentWidget()->tqcolorGroup().background());
+	TQBrush b(parentWidget()->colorGroup().background());
 #endif
 	
 	if(isDown())
-		qDrawShadePanel(p,0,0,width(),height(),tqcolorGroup(),true,1,&b);
+		qDrawShadePanel(p,0,0,width(),height(),colorGroup(),true,1,&b);
 	else
 		p->fillRect(0,0,width(),height(),b);
 
@@ -229,7 +229,7 @@ void KviMdiCaption::paintEvent(TQPaintEvent * e)
 	TQPainter p(this);
 	p.fillRect(r,m_bActive ? KVI_OPTION_COLOR(KviOption_colorMdiCaptionActive) : KVI_OPTION_COLOR(KviOption_colorMdiCaptionInactive));
 	TQSimpleRichText rt(m_bActive ? ((KviMdiChild *)parent())->xmlActiveCaption() : ((KviMdiChild *)parent())->xmlInactiveCaption(),font());
-	rt.draw(&p,height() + 2,-1,rect(),tqcolorGroup());
+	rt.draw(&p,height() + 2,-1,rect(),colorGroup());
 }
 
 void KviMdiCaption::mouseReleaseEvent(TQMouseEvent *)
@@ -278,7 +278,7 @@ KviMenuBarToolButton::~KviMenuBarToolButton()
 {
 }
 
-TQSize KviMenuBarToolButton::tqsizeHint() const
+TQSize KviMenuBarToolButton::sizeHint() const
 {
 	return TQSize(20,20);
 }
diff --git a/src/kvirc/ui/kvi_mdicaption.h b/src/kvirc/ui/kvi_mdicaption.h
index c46572a..d214d9a 100644
--- a/src/kvirc/ui/kvi_mdicaption.h
+++ b/src/kvirc/ui/kvi_mdicaption.h
@@ -57,7 +57,7 @@ public:
 	KviMenuBarToolButton(TQWidget * par,const TQPixmap &img, const char * name);
 	~KviMenuBarToolButton();
 public:
-	virtual TQSize tqsizeHint() const;
+	virtual TQSize sizeHint() const;
 };
 
 
diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp
index 2bf0130..248a2a1 100644
--- a/src/kvirc/ui/kvi_mdichild.cpp
+++ b/src/kvirc/ui/kvi_mdichild.cpp
@@ -442,8 +442,8 @@ void KviMdiChild::calculateResizeRect(int resizeCorner,TQPoint mousePos,TQRect &
 void KviMdiChild::calculateMinimumSize(int &minWidth,int &minHeight)
 {
 	if(m_pClient){
-		minWidth  = m_pClient->tqminimumSize().width() + (KVI_MDICHILD_BORDER << 1);
-		minHeight = m_pClient->tqminimumSize().height()+ (KVI_MDICHILD_BORDER << 1)+
+		minWidth  = m_pClient->minimumSize().width() + (KVI_MDICHILD_BORDER << 1);
+		minHeight = m_pClient->minimumSize().height()+ (KVI_MDICHILD_BORDER << 1)+
 					m_pCaption->heightHint() + KVI_MDICHILD_SPACING;
 	}
 	if(minWidth<KVI_MDICHILD_MIN_WIDTH)minWidth=KVI_MDICHILD_MIN_WIDTH;
@@ -508,10 +508,10 @@ void KviMdiChild::setClient(TQWidget *w)
 */
 	//linkChildren(w);
 
-	if(m_pClient->tqminimumSize().width() > KVI_MDICHILD_MIN_WIDTH && 
-		m_pClient->tqminimumSize().height() > KVI_MDICHILD_MIN_HEIGHT){
-		setMinimumWidth(m_pClient->tqminimumSize().width() + (KVI_MDICHILD_BORDER << 1));
-		setMinimumHeight(m_pClient->tqminimumSize().height()+ (KVI_MDICHILD_BORDER << 1) +
+	if(m_pClient->minimumSize().width() > KVI_MDICHILD_MIN_WIDTH && 
+		m_pClient->minimumSize().height() > KVI_MDICHILD_MIN_HEIGHT){
+		setMinimumWidth(m_pClient->minimumSize().width() + (KVI_MDICHILD_BORDER << 1));
+		setMinimumHeight(m_pClient->minimumSize().height()+ (KVI_MDICHILD_BORDER << 1) +
 					m_pCaption->heightHint() + KVI_MDICHILD_SPACING);
 	}
 
@@ -561,16 +561,16 @@ void KviMdiChild::focusInEvent(TQFocusEvent *)
 #endif
 }
 
-TQSize KviMdiChild::tqsizeHint()
+TQSize KviMdiChild::sizeHint()
 {
 	if(m_pClient)
 	{
-		TQSize s = m_pClient->tqsizeHint();
+		TQSize s = m_pClient->sizeHint();
 		TQSize ret(s.width() + (KVI_MDICHILD_BORDER << 1),
 				s.height() + (KVI_MDICHILD_BORDER << 1) + KVI_MDICHILD_SPACING + m_pCaption->heightHint());
 		return ret;
 	}
-	return TQFrame::tqsizeHint();
+	return TQFrame::sizeHint();
 }
 
 
diff --git a/src/kvirc/ui/kvi_mdichild.h b/src/kvirc/ui/kvi_mdichild.h
index feac48b..6d7b879 100644
--- a/src/kvirc/ui/kvi_mdichild.h
+++ b/src/kvirc/ui/kvi_mdichild.h
@@ -77,7 +77,7 @@ public:
 	const TQString & xmlActiveCaption(){ return m_szXmlActiveCaption; };
 	const TQString & xmlInactiveCaption(){ return m_szXmlInactiveCaption; };
 	void setCaption(const TQString & plain,const TQString & xmlActive,const TQString & xmlInactive);
-	virtual TQSize tqsizeHint();
+	virtual TQSize sizeHint();
 	void setIcon(const TQPixmap &pix);
 	const TQPixmap * icon();
 	void enableClose(bool bEnable);
diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp
index 9163595..59f5850 100644
--- a/src/kvirc/ui/kvi_mdimanager.cpp
+++ b/src/kvirc/ui/kvi_mdimanager.cpp
@@ -225,7 +225,7 @@ void KviMdiManager::setTopChild(KviMdiChild *lpC,bool bSetFocus)
 		{
 			lpC->setFocus();
 			/*
-			if(tqtopLevelWidget()->isActiveWindow())
+			if(topLevelWidget()->isActiveWindow())
 			{
 				
 			}
@@ -284,8 +284,8 @@ TQPoint KviMdiManager::getCascadePoint(int indexOfWindow)
 	if(indexOfWindow==0)return pnt;
 	KviMdiChild *lpC=m_pZ->first();
 	int step=(lpC ? (lpC->captionLabel()->heightHint()+KVI_MDICHILD_BORDER) : 20);
-	int availableHeight=viewport()->height()-(lpC ? lpC->tqminimumSize().height() : KVI_MDICHILD_MIN_HEIGHT);
-	int availableWidth=viewport()->width()-(lpC ? lpC->tqminimumSize().width() : KVI_MDICHILD_MIN_WIDTH);
+	int availableHeight=viewport()->height()-(lpC ? lpC->minimumSize().height() : KVI_MDICHILD_MIN_HEIGHT);
+	int availableWidth=viewport()->width()-(lpC ? lpC->minimumSize().width() : KVI_MDICHILD_MIN_WIDTH);
 	int ax=0;
 	int ay=0;
 	for(int i=0;i<indexOfWindow;i++)
@@ -814,7 +814,7 @@ void KviMdiManager::cascadeWindows()
 		{
 			TQPoint p = getCascadePoint(idx);
 			moveChild(lpC,p.x(),p.y());
-			lpC->resize(lpC->tqsizeHint());
+			lpC->resize(lpC->sizeHint());
 			idx++;
 		}
 		list.removeFirst();
@@ -844,8 +844,8 @@ void KviMdiManager::cascadeMaximized()
 			TQPoint pnt(getCascadePoint(idx));
 			moveChild(lpC,pnt.x(),pnt.y());
 			TQSize curSize(viewport()->width() - pnt.x(),viewport()->height() - pnt.y());
-			if((lpC->tqminimumSize().width() > curSize.width()) ||
-				(lpC->tqminimumSize().height() > curSize.height()))lpC->resize(lpC->tqminimumSize());
+			if((lpC->minimumSize().width() > curSize.width()) ||
+				(lpC->minimumSize().height() > curSize.height()))lpC->resize(lpC->minimumSize());
 			else lpC->resize(curSize);
 			idx++;
 		}
@@ -1007,13 +1007,13 @@ void KviMdiManager::tileAllInternal(int maxWnds,bool bHorizontal)
 
 	int numToHandle=((numVisible > maxWnds) ? maxWnds : numVisible);
 	int xQuantum=viewport()->width()/pColstable[numToHandle-1];
-	if(xQuantum < ((lpTop->tqminimumSize().width() > KVI_MDICHILD_MIN_WIDTH) ? lpTop->tqminimumSize().width() : KVI_MDICHILD_MIN_WIDTH)){
+	if(xQuantum < ((lpTop->minimumSize().width() > KVI_MDICHILD_MIN_WIDTH) ? lpTop->minimumSize().width() : KVI_MDICHILD_MIN_WIDTH)){
 		if(pColrecall[numToHandle-1]==0)debug("Tile : Not enouh space");
 		else tileAllInternal(pColrecall[numToHandle-1],bHorizontal);
 		return;
 	}
 	int yQuantum=viewport()->height()/pRowstable[numToHandle-1];
-	if(yQuantum < ((lpTop->tqminimumSize().height() > KVI_MDICHILD_MIN_HEIGHT) ? lpTop->tqminimumSize().height() : KVI_MDICHILD_MIN_HEIGHT)){
+	if(yQuantum < ((lpTop->minimumSize().height() > KVI_MDICHILD_MIN_HEIGHT) ? lpTop->minimumSize().height() : KVI_MDICHILD_MIN_HEIGHT)){
 		if(pRowrecall[numToHandle-1]==0)debug("Tile : Not enough space");
 		else tileAllInternal(pRowrecall[numToHandle-1],bHorizontal);
 		return;
diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp
index 8b959a7..d0dae63 100644
--- a/src/kvirc/ui/kvi_optionswidget.cpp
+++ b/src/kvirc/ui/kvi_optionswidget.cpp
@@ -676,7 +676,7 @@ KviTalGroupBox * KviOptionsWidget::addGroupBox(int x1,int y1,int x2,int y2,int n
 
 void KviOptionsWidget::addAdvancedButton(int x1,int y1,int x2,int y2)
 {
-	TQWidget * w = tqtopLevelWidget();
+	TQWidget * w = topLevelWidget();
 	if(!w)return;
 	if(!w->inherits("KviGeneralOptionsDialog"))return;
 
diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp
index ce26661..a5455bb 100644
--- a/src/kvirc/ui/kvi_query.cpp
+++ b/src/kvirc/ui/kvi_query.cpp
@@ -559,15 +559,15 @@ TQPixmap * KviQuery::myIconPtr()
 void KviQuery::resizeEvent(TQResizeEvent *e)
 {
 	int hght = m_pInput->heightHint();
-	int hght2 = m_pButtonBox->tqsizeHint().height();
+	int hght2 = m_pButtonBox->sizeHint().height();
 	m_pButtonBox->setGeometry(0,0,width(),hght2);
 	m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2));
 	m_pInput->setGeometry(0,height() - hght,width(),hght);
 }
 
-TQSize KviQuery::tqsizeHint() const
+TQSize KviQuery::sizeHint() const
 {
-	TQSize ret(m_pSplitter->tqsizeHint().width(),m_pIrcView->tqsizeHint().height() + m_pInput->heightHint());
+	TQSize ret(m_pSplitter->sizeHint().width(),m_pIrcView->sizeHint().height() + m_pInput->heightHint());
 	return ret;
 }
 
diff --git a/src/kvirc/ui/kvi_query.h b/src/kvirc/ui/kvi_query.h
index 3b1a81b..d0a12e5 100644
--- a/src/kvirc/ui/kvi_query.h
+++ b/src/kvirc/ui/kvi_query.h
@@ -66,7 +66,7 @@ public:
 	void setDeadQuery();
 	void setAliveQuery();
 	bool isDeadQuery(){ return m_iFlags & KVI_TQUERY_FLAG_DEAD; };
-	virtual TQSize tqsizeHint() const;
+	virtual TQSize sizeHint() const;
 	virtual const TQString & target(){ return windowName(); };
 	virtual void applyOptions();
 	KviUserListEntry * setTarget(const TQString &nick,const TQString &user,const TQString &host);
diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp
index c3e5473..f63392e 100644
--- a/src/kvirc/ui/kvi_selectors.cpp
+++ b/src/kvirc/ui/kvi_selectors.cpp
@@ -513,7 +513,7 @@ KviColorSelector::KviColorSelector(TQWidget * par,const TQString & txt,TQColor *
 
 void KviColorSelector::setButtonPalette(TQColor * pOption)
 {
-	TQPalette pal(*pOption,tqcolorGroup().background());
+	TQPalette pal(*pOption,colorGroup().background());
 	m_memColor = *pOption;
 	m_pButton->setPalette(pal);
 
diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp
index 861facd..1985217 100644
--- a/src/kvirc/ui/kvi_statusbar.cpp
+++ b/src/kvirc/ui/kvi_statusbar.cpp
@@ -106,9 +106,9 @@ KviStatusBar::KviStatusBar(KviFrame * pFrame)
 	m_pMessageLabel = new TQLabel("<b>[x]</b> x",this,"msgstatuslabel");
 	m_pMessageLabel->setMargin(1);
 #ifdef COMPILE_USE_QT4
-	m_pMessageLabel->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft);
+	m_pMessageLabel->setAlignment(TQt::AlignVCenter | TQt::AlignLeft);
 #else
-	m_pMessageLabel->tqsetAlignment(SingleLine | TQt::AlignVCenter | TQt::AlignLeft);
+	m_pMessageLabel->setAlignment(SingleLine | TQt::AlignVCenter | TQt::AlignLeft);
 #endif
 	m_pMessageLabel->setMinimumWidth(350);
 	
@@ -210,7 +210,7 @@ void KviStatusBar::layoutChildren()
 	int h = height() - (VMARGIN * 2);
 	for(KviStatusBarApplet * a = m_pAppletList->last();a;a = m_pAppletList->prev())
 	{
-		int w = a->tqsizeHint().width();
+		int w = a->sizeHint().width();
 		x -= w;
 		a->setGeometry(x,VMARGIN,w,h);
 		x -= SPACING;
@@ -237,11 +237,11 @@ bool KviStatusBar::event(TQEvent * e)
 void KviStatusBar::recalcMinimumHeight()
 {
 	int s = 18;
-	int h = m_pMessageLabel->tqsizeHint().height();
+	int h = m_pMessageLabel->sizeHint().height();
 	if(h > s)s = h;
 	for(KviStatusBarApplet * a = m_pAppletList->last();a;a = m_pAppletList->prev())
 	{
-		h = a->tqsizeHint().height();
+		h = a->sizeHint().height();
 		if(h > s)s = h;
 	}
 	s += (VMARGIN * 2) + RICHTEXTLABELTRICK;
@@ -467,9 +467,9 @@ void KviStatusBar::paintEvent(TQPaintEvent * e)
 {
 	// avoid the ugly rectangle around the widgets painted by TQStatusBar
 //	TQPainter p(this);
-//	style().drawPrimitive(TQStyle::PE_Panel,&p,rect(),tqcolorGroup(),TQStyle::Style_Raised,TQStyleOption(1,1));
+//	style().drawPrimitive(TQStyle::PE_Panel,&p,rect(),colorGroup(),TQStyle::Style_Raised,TQStyleOption(1,1));
 	//TQStatusBar::paintEvent(e);
-	//qDrawWinPanel(&p,0,0,width(),height(),tqcolorGroup(),false,0);
+	//qDrawWinPanel(&p,0,0,width(),height(),colorGroup(),false,0);
 }
 
 void KviStatusBar::mousePressEvent(TQMouseEvent * e)
diff --git a/src/kvirc/ui/kvi_styled_controls.cpp b/src/kvirc/ui/kvi_styled_controls.cpp
index 629fae9..e67cef1 100644
--- a/src/kvirc/ui/kvi_styled_controls.cpp
+++ b/src/kvirc/ui/kvi_styled_controls.cpp
@@ -279,7 +279,7 @@ void KviStyledToolButton::paintEvent ( TQPaintEvent * event)
 		
 		pDoubleBufferPixmap->fill(
 			bActive ? TQColor(206,215,223) :
-			tqcolorGroup().background()
+			colorGroup().background()
 			);
 		
 		
diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp
index ad47661..952501f 100644
--- a/src/kvirc/ui/kvi_taskbar.cpp
+++ b/src/kvirc/ui/kvi_taskbar.cpp
@@ -290,7 +290,7 @@ void KviTaskBarButton::drawButtonLabel(TQPainter * painter)
 	if(KVI_OPTION_BOOL(KviOption_boolUseTaskBarIrcContextIndicator))
 	{
 		iHeight -= KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT;
-		TQColor base = tqcolorGroup().background();
+		TQColor base = colorGroup().background();
 		if(m_pWindow->console())
 		{
 			TQColor cntx = KVI_OPTION_ICCOLOR(m_pWindow->console()->ircContextId() % KVI_NUM_ICCOLOR_OPTIONS);
@@ -298,7 +298,7 @@ void KviTaskBarButton::drawButtonLabel(TQPainter * painter)
 				(base.blue() + cntx.blue()) >> 1);
 			pPainter->fillRect(2,iHeight,iWidth - 4,KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT - 2,base);
 		} else {
-			pPainter->fillRect(2,iHeight,iWidth - 4,KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT - 2,tqcolorGroup().brush(TQColorGroup::Background));
+			pPainter->fillRect(2,iHeight,iWidth - 4,KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT - 2,colorGroup().brush(TQColorGroup::Background));
 		}
 	}
 
@@ -394,7 +394,7 @@ void KviTaskBarButton::drawButtonLabel(TQPainter * painter)
 	{
 		pPainter->setClipRect(cRect.right(),cRect.y(),10,cRect.height());
 		TQColor base = pPainter->pen().color();
-		TQColor bg   = tqcolorGroup().color(TQColorGroup::Background);
+		TQColor bg   = colorGroup().color(TQColorGroup::Background);
 		base.setRgb((base.red() + bg.red()) / 2,(base.green() + bg.green()) / 2,(base.blue() + bg.blue()) / 2);
 		pPainter->setPen(base);
 		cRect.setWidth(cRect.width() + 10);
@@ -907,7 +907,7 @@ void KviTreeTaskBarItem::paintCell(TQPainter *painter,const TQColorGroup &cg,int
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 			if(g_pShadedChildGlobalDesktopBackground)
 			{
-				TQPoint pnt = listView()->viewport()->mapToGlobal(TQPoint(int(painter->tqworldMatrix().dx()),int(painter->tqworldMatrix().dy())));
+				TQPoint pnt = listView()->viewport()->mapToGlobal(TQPoint(int(painter->worldMatrix().dx()),int(painter->worldMatrix().dy())));
 				p.drawTiledPixmap(0,0,width,height(),*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y());
 			} else {
 #endif
@@ -918,7 +918,7 @@ void KviTreeTaskBarItem::paintCell(TQPainter *painter,const TQColorGroup &cg,int
 			TQPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapTreeTaskBarBackground).pixmap();
 			if(pix)
 			{
-				TQPoint pnt = listView()->viewportToContents(TQPoint(int(painter->tqworldMatrix().dx()),int(painter->tqworldMatrix().dy())));
+				TQPoint pnt = listView()->viewportToContents(TQPoint(int(painter->worldMatrix().dx()),int(painter->worldMatrix().dy())));
 				//p.drawTiledPixmap(0,0,width,height(),*pix,pnt.x(),pnt.y());
 //				debug("%i %i",pnt.x(),pnt.y());
 				p.translate(-pnt.x(),-pnt.y());
@@ -1192,7 +1192,7 @@ void KviTreeTaskBarListView::paintEmptyArea(TQPainter * p,const TQRect &rct)
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 	if(g_pShadedChildGlobalDesktopBackground)
 	{
-		TQPoint pnt = viewport()->mapToGlobal(TQPoint(rct.x() + int(p->tqworldMatrix().dx()),rct.y() + int(p->tqworldMatrix().dy())));
+		TQPoint pnt = viewport()->mapToGlobal(TQPoint(rct.x() + int(p->worldMatrix().dx()),rct.y() + int(p->worldMatrix().dy())));
 		p->drawTiledPixmap(rct.x(),rct.y(),rct.width(),rct.height(),*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y());
 	} else {
 #endif
@@ -1204,7 +1204,7 @@ void KviTreeTaskBarListView::paintEmptyArea(TQPainter * p,const TQRect &rct)
 	TQPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapTreeTaskBarBackground).pixmap();
 	if(pix)
 	{
-		TQPoint pnt = viewportToContents(TQPoint(rct.x() + int(p->tqworldMatrix().dx()),rct.y() + int(p->tqworldMatrix().dy())));
+		TQPoint pnt = viewportToContents(TQPoint(rct.x() + int(p->worldMatrix().dx()),rct.y() + int(p->worldMatrix().dy())));
 		//p->drawTiledPixmap(rct.x(),rct.y(),rct.width(),rct.height(),*pix,pnt.x(),pnt.y());
 		KviPixmapUtils::drawPixmapWithPainter(p,pix,KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign),rct,viewport()->width(),viewport()->height(),pnt.x(),pnt.y());
 	}
@@ -1235,7 +1235,7 @@ KviTreeTaskBar::KviTreeTaskBar()
 	// FIXME: this code is useless ?
 	if(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth) < 48)
 		KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth) = 48;
-	int iMin = m_pListView->tqminimumSize().width() + 4;
+	int iMin = m_pListView->minimumSize().width() + 4;
 	if(((unsigned int)iMin) < KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth))
 		iMin = KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth);
     setMinimumWidth(iMin);
@@ -1305,7 +1305,7 @@ void KviTreeTaskBar::tipRequest(KviDynamicToolTip *,const TQPoint &pnt)
 		{
 			TQString szText;
 			((KviTreeTaskBarItem *)it)->m_pWindow->getTaskBarTipText(szText);
-			m_pToolTip->tip(m_pListView->tqitemRect(it),szText);
+			m_pToolTip->tip(m_pListView->itemRect(it),szText);
 		}
 	}
 }
diff --git a/src/kvirc/ui/kvi_themedlabel.cpp b/src/kvirc/ui/kvi_themedlabel.cpp
index 1f57db0..ef54460 100644
--- a/src/kvirc/ui/kvi_themedlabel.cpp
+++ b/src/kvirc/ui/kvi_themedlabel.cpp
@@ -44,9 +44,9 @@ KviThemedLabel::~KviThemedLabel()
 {
 }
 
-/*TQSize KviThemedLabel::tqsizeHint()
+/*TQSize KviThemedLabel::sizeHint()
 {
-	TQSize size=TQFrame::tqsizeHint();
+	TQSize size=TQFrame::sizeHint();
 	int iHeight=fontMetrics().height()*TQStringList::split('\n',m_szText).count()+4;
 	size.setHeight(iHeight);
 	return size;
diff --git a/src/kvirc/ui/kvi_themedlabel.h b/src/kvirc/ui/kvi_themedlabel.h
index a307149..f704310 100644
--- a/src/kvirc/ui/kvi_themedlabel.h
+++ b/src/kvirc/ui/kvi_themedlabel.h
@@ -55,7 +55,7 @@ public:
 	void setAutoHeight(bool value) { m_bAutoHeight=value; };
 	void applyOptions();
 	
-//	TQSize tqsizeHint();
+//	TQSize sizeHint();
 signals:
 	void doubleClicked();
 };
diff --git a/src/kvirc/ui/kvi_toolwindows_container.cpp b/src/kvirc/ui/kvi_toolwindows_container.cpp
index 65c6dec..b45f7be 100644
--- a/src/kvirc/ui/kvi_toolwindows_container.cpp
+++ b/src/kvirc/ui/kvi_toolwindows_container.cpp
@@ -94,7 +94,7 @@ KviWindowToolPageButton::KviWindowToolPageButton ( int pixon,int pixoff, const T
 	setToggleButton(true);
 	setOn(bOn);
 
-//	tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Ignored));
+//	setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Ignored));
 }
 
 KviWindowToolPageButton::~KviWindowToolPageButton()
@@ -106,9 +106,9 @@ KviWindowToolPageButton::~KviWindowToolPageButton()
 {
 	TQPixmap pixmap( height(), width() );
 	if(isOn())
-		pixmap.fill(tqcolorGroup().mid());
+		pixmap.fill(colorGroup().mid());
 	else
-    		pixmap.fill(tqcolorGroup().button()); 
+    		pixmap.fill(colorGroup().button()); 
     	TQPainter painter( &pixmap );
     	
 	TQPixmap icon;
@@ -118,7 +118,7 @@ KviWindowToolPageButton::~KviWindowToolPageButton()
 		icon=iconSet()->pixmap(TQIconSet::Small,TQIconSet::Normal,TQIconSet::Off);
 		
 	// Draw the frame
-	//painter.setPen( tqcolorGroup().mid() );
+	//painter.setPen( colorGroup().mid() );
 	//if ( m_id != NUM_TABS - 1 ) painter.drawLine( 0, 0, 0, pixmap.height() - 1 );
 	//painter.drawLine( 0, pixmap.height() - 1, pixmap.width() - 1, pixmap.height() - 1 );
 	
@@ -127,7 +127,7 @@ KviWindowToolPageButton::~KviWindowToolPageButton()
 	TQString str = text();
 	str.remove("&");
 	const int textX = pixmap.width() / 2 - TQFontMetrics( font ).width( str ) / 2;
-	painter.setPen( tqcolorGroup().buttonText() );
+	painter.setPen( colorGroup().buttonText() );
 	const TQRect rect( textX + icon.width() / 2 + 2, 0, pixmap.width(), pixmap.height() );
 	painter.drawText( rect, TQt::AlignLeft | TQt::AlignVCenter, str );
 	
diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp
index fe9011e..63fd4e6 100644
--- a/src/kvirc/ui/kvi_topicw.cpp
+++ b/src/kvirc/ui/kvi_topicw.cpp
@@ -74,7 +74,7 @@ int KviListBoxTopicItem::width ( const KviTalListBox * lb ) const
 
 void KviListBoxTopicItem::paint ( TQPainter * p )
 {
-	KviTopicWidget::paintColoredText(p,text(),listBox()->tqcolorGroup(),height(listBox()));
+	KviTopicWidget::paintColoredText(p,text(),listBox()->colorGroup(),height(listBox()));
 }
 
 
@@ -438,11 +438,11 @@ void KviTopicWidget::drawContents(TQPainter *p)
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 	}
 #endif
-	TQColorGroup tqcolorGroup;
-	//tqcolorGroup()
-	tqcolorGroup.setColor(TQColorGroup::Text,KVI_OPTION_COLOR(KviOption_colorLabelForeground));
-	tqcolorGroup.setColor(TQColorGroup::Background,KVI_OPTION_COLOR(KviOption_colorLabelBackground));
-	paintColoredText(p,m_szTopic,tqcolorGroup);
+	TQColorGroup colorGroup;
+	//colorGroup()
+	colorGroup.setColor(TQColorGroup::Text,KVI_OPTION_COLOR(KviOption_colorLabelForeground));
+	colorGroup.setColor(TQColorGroup::Background,KVI_OPTION_COLOR(KviOption_colorLabelBackground));
+	paintColoredText(p,m_szTopic,colorGroup);
 }
 
 void KviTopicWidget::setTopic(const TQString & topic)
@@ -541,7 +541,7 @@ void KviTopicWidget::updateToolTip()
 	KviTalToolTip::add(this,txt);
 }
 
-TQSize KviTopicWidget::tqsizeHint() const
+TQSize KviTopicWidget::sizeHint() const
 {
 	TQFontMetrics fm(font());
 	int hght = fm.lineSpacing() + (frameWidth() << 1) + 4;
diff --git a/src/kvirc/ui/kvi_topicw.h b/src/kvirc/ui/kvi_topicw.h
index 5a59ced..89e4901 100644
--- a/src/kvirc/ui/kvi_topicw.h
+++ b/src/kvirc/ui/kvi_topicw.h
@@ -102,7 +102,7 @@ public:
 	const TQString & topic(){ return m_szTopic; };
 	const TQString & topicSetBy(){ return m_szSetBy; };
 	const TQString & topicSetAt(){ return m_szSetAt; };
-	virtual TQSize tqsizeHint() const;
+	virtual TQSize sizeHint() const;
 	void applyOptions();
 	
 	static void paintColoredText(TQPainter *p, TQString text,const TQColorGroup& cg, int h=-1, int w=-1);
diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp
index d504915..cc3d866 100644
--- a/src/kvirc/ui/kvi_userlistview.cpp
+++ b/src/kvirc/ui/kvi_userlistview.cpp
@@ -1141,7 +1141,7 @@ void KviUserListView::resizeEvent(TQResizeEvent *)
 	int hght;
 	if(!KVI_OPTION_BOOL(KviOption_boolDisableUserListLabel))//G&N  2005
 	{
-		hght = m_pUsersLabel->tqsizeHint().height();
+		hght = m_pUsersLabel->sizeHint().height();
 		if(hght < 16)hght = 16; // at least
 		m_pUsersLabel->setGeometry(0,0,width(),hght);
 	}
@@ -1531,9 +1531,9 @@ void KviUserListViewArea::paintEvent(TQPaintEvent *ev)
 							p.setPen(TQPen(KVI_OPTION_COLOR(KviOption_colorUserListViewGrid),0 /*,TQPen::DotLine*/));
 							if((bShowState || bShowIcons) && (KVI_OPTION_UINT(KviOption_uintUserListViewGridType) == KVI_USERLISTVIEW_GRIDTYPE_3DGRID))
 								p.drawLine(iAvatarAndTextX,bottom - 1,iAvatarAndTextX,theY);
-							p.setPen(tqcolorGroup().shadow());
+							p.setPen(colorGroup().shadow());
 							p.drawLine(0,bottom - 1,wdth,bottom - 1);
-							p.setPen(tqcolorGroup().light());
+							p.setPen(colorGroup().light());
 							p.drawLine(0,theY,wdth,theY);
 							theY--;
 						}
@@ -1725,10 +1725,10 @@ void KviUserListViewArea::paintEvent(TQPaintEvent *ev)
 	//we really do not need any self-draw borders. 
 	//if we will need it, we will draw a better one with system style
 
-	//p.setPen(tqcolorGroup().dark());
+	//p.setPen(colorGroup().dark());
 	//p.drawLine(0,0,wdth,0);
 	//p.drawLine(0,0,0,height());
-	//p.setPen(tqcolorGroup().light());
+	//p.setPen(colorGroup().light());
 	//p.drawLine(1,height()-1,wdth,height()-1);
 	//p.drawLine(wdth - 1,1,wdth - 1,height());
 
@@ -1742,7 +1742,7 @@ void KviUserListViewArea::paintEvent(TQPaintEvent *ev)
 
 void KviUserListViewArea::resizeEvent(TQResizeEvent *)
 {
-	int iScr = m_pScrollBar->tqsizeHint().width();
+	int iScr = m_pScrollBar->sizeHint().width();
 	m_pScrollBar->setGeometry(width() - iScr,0,iScr,height());
 	m_pScrollBar->setPageStep(height());
 	m_pScrollBar->setLineStep(m_pListView->m_iFontHeight - 1);
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index 6c959e7..e0c8621 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -285,7 +285,7 @@ void KviWindow::demandAttention()
 
 bool KviWindow::focusNextPrevChild(bool next)
 {
-	TQWidget * w = tqfocusWidget();
+	TQWidget * w = focusWidget();
 	if(w)
 	{
 #ifdef COMPILE_USE_QT4
@@ -299,9 +299,9 @@ bool KviWindow::focusNextPrevChild(bool next)
 		if(w->parent())
 		{
 #ifdef COMPILE_USE_QT4
-			if(w->parent()->tqmetaObject()->indexOfProperty("KviProperty_ChildFocusOwner") == -1)
+			if(w->parent()->metaObject()->indexOfProperty("KviProperty_ChildFocusOwner") == -1)
 #else
-			if(w->parent()->tqmetaObject()->findProperty("KviProperty_ChildFocusOwner") == -1)
+			if(w->parent()->metaObject()->findProperty("KviProperty_ChildFocusOwner") == -1)
 #endif
 				return false; // Do NOT change the focus widget!
 		}
@@ -586,7 +586,7 @@ void KviWindow::getDefaultLogFileName(TQString &buffer)
 {
 	// FIXME: #warning "Make it configurable ?"
 	TQString date;
-	TQDate dt(TQDate::tqcurrentDate());
+	TQDate dt(TQDate::currentDate());
 	date=dt.toString("yyyy.MM.dd");
 	TQString base;
 	getBaseLogFileName(base);
@@ -1224,7 +1224,7 @@ void KviWindow::updateBackgrounds(TQObject * obj)
 	for(TQList<TQObject *>::Iterator it = list.begin();it != list.end();++it)
 	{
 		TQObject * child = *it;
-		if(child->tqmetaObject()->indexOfProperty("TransparencyCapable") != -1){
+		if(child->metaObject()->indexOfProperty("TransparencyCapable") != -1){
 		//	if (child->isWidgetType())
 			((TQWidget *)child)->update();
 		}
@@ -1239,7 +1239,7 @@ void KviWindow::updateBackgrounds(TQObject * obj)
 		{
 			TQObject * child = list.at(i);
 			// FIXME: check if this code can work with qt < 3.0.0 too
-			if(child->tqmetaObject()->findProperty("TransparencyCapable",true) != -1)
+			if(child->metaObject()->findProperty("TransparencyCapable",true) != -1)
 				((TQWidget *)child)->update();
 
 			updateBackgrounds(child);