4 files changed, 2 insertions, 60 deletions

diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp
index a11dfaa5..badaf18b 100644
--- a/src/modules/options/container.cpp
+++ b/src/modules/options/container.cpp
@@ -32,9 +32,6 @@
 #include "kvi_tal_tooltip.h"
 #include <tqevent.h>
 
-#ifdef COMPILE_USE_QT4
-	#include <tqdesktopwidget.h>
-#endif
 
 extern KviOptionsInstanceManager * g_pOptionsInstanceManager;
 
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 5f28da7d..92cba9d1 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -41,12 +41,8 @@
 #include <tqpushbutton.h>
 #include "kvi_tal_tooltip.h"
 
-#ifdef COMPILE_USE_QT4
-	#include <tq3header.h>
-#else
-	#include <tqheader.h>
-	#include <tqobjectlist.h>
-#endif
+#include <tqheader.h>
+#include <tqobjectlist.h>
 #include "kvi_tal_popupmenu.h"
 #include <tqtoolbutton.h>
 #include <tqcheckbox.h>
@@ -66,9 +62,6 @@ KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(TQWidget *parent,cons
 {
 	createLayout(1,1);
 	TQLabel * l = new TQLabel(szText,this);
-#ifdef COMPILE_USE_QT4
-	l->setWordWrap(true);
-#endif
 	l->setAlignment(TQt::AlignTop);
 	layout()->addWidget(l,0,0);
 }
@@ -323,43 +316,26 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
 	TQTabWidget * pTabWidgetToMark = 0;
 	
 	TQObject * o;
-#ifdef COMPILE_USE_QT4
-	TQObjectList ol = pItem->m_pOptionsWidget->queryList();
-	if(ol.count() > 0)
-	{
-		for(TQObjectList::Iterator it = ol.begin();it != ol.end();++it)
-		{
-			o = *it;
-#else
 	TQObjectList * ol = pItem->m_pOptionsWidget->queryList();
 	if(ol)
 	{
 		TQObjectListIt it(*ol);
 		while((o = it.current())/* && (!bFoundSomethingHere)*/)
 		{
-#endif
 			TQString szText;
 			if(o->inherits("TQLabel"))szText = ((TQLabel *)o)->text();
 			else if(o->inherits("TQCheckBox"))szText = ((TQCheckBox *)o)->text();
 			else if(o->inherits("KviTalGroupBox"))szText = ((KviTalGroupBox *)o)->title();
 #ifdef COMPILE_INFO_TIPS
 			if(o->inherits("TQWidget"))
-#ifdef COMPILE_USE_QT4
-				szText.append(((TQWidget *)o)->toolTip());
-#else
 				szText.append(TQToolTip::textFor((TQWidget*)o));
 #endif
-#endif
 			if(!szText.isEmpty())
 			{
 				bool bOk = true;
 				for(int j=0;j<lKeywords.count();j++)
 				{
-#ifdef COMPILE_USE_QT4
-					if(szText.find(lKeywords.at(j),0,false) == -1)
-#else
 					if(szText.find(*(lKeywords.at(j)),0,false) == -1)
-#endif
 					{
 						bOk = false;
 						break;
@@ -414,13 +390,9 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
 				}
 			}
 
-#ifndef COMPILE_USE_QT4
 			++it;
-#endif
 		}
-#ifndef COMPILE_USE_QT4
 		delete ol;
-#endif
 	}
 
 	if(pTabWidgetToMark)
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index d76826fe..946339f6 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -297,17 +297,9 @@ void KviMessageListViewItem::paintCell(TQPainter * p,const TQColorGroup &,int,in
 	p->drawText(24,listView()->itemMargin(),w - 24,height() - (listView()->itemMargin() * 2),TQt::AlignLeft | TQt::AlignVCenter,txt);
 	if(isSelected())
 	{
-#ifdef COMPILE_USE_QT4
-		TQPen pen(KVI_OPTION_COLOR(KviOption_colorIrcViewBackground));
-		pen.setStyle(TQt::DashLine);
-		p->setPen( pen);
-		p->drawRect(0,0,w,height());
-		p->drawRect(1,1,w - 2,height() - 2);
-#else
 	
 		p->drawWinFocusRect(0,0,w,height(),KVI_OPTION_COLOR(KviOption_colorIrcViewBackground));
 		p->drawWinFocusRect(1,1,w - 2,height() - 2,KVI_OPTION_COLOR(KviOption_colorIrcViewBackground));
-#endif
 	}
 }
 
@@ -340,18 +332,9 @@ void KviMessageColorListBoxItem::paint(TQPainter * p)
 	}
 	if(isSelected())
 	{
-#ifdef COMPILE_USE_QT4
-	TQPen pen(clr);
-	pen.setStyle(TQt::DashLine);
-	p->setPen( pen);
-	p->drawRect(0,0,width(lb),height(lb));
-	p->drawRect(1,1,width(lb) - 2,height(lb) - 2);
-	p->drawRect(2,2,width(lb) - 4,height(lb) - 4);
-#else
 	p->drawWinFocusRect(0,0,width(lb),height(lb),clr);
 	p->drawWinFocusRect(1,1,width(lb) - 2,height(lb) - 2,clr);
 	p->drawWinFocusRect(2,2,width(lb) - 4,height(lb) - 4,clr);
-#endif
 	}
 }
 /*
@@ -399,11 +382,7 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(TQWidget * parent)
 	m_pListView->setSelectionMode(KviTalListView::Single);
 	m_pListView->setFont(KVI_OPTION_FONT(KviOption_fontIrcView));
 	m_pListView->setStaticBackground(true);
-#ifdef COMPILE_USE_QT4
-	m_pListView->viewport()->setBackgroundMode(TQt::NoBackground);
-#else
 	m_pListView->viewport()->setBackgroundMode(TQWidget::NoBackground);
-#endif
 
 	addWidgetToLayout(m_pListView,0,0,2,0);
 
diff --git a/src/modules/options/optw_texticons.h b/src/modules/options/optw_texticons.h
index 4a6dae6c..7c754149 100644
--- a/src/modules/options/optw_texticons.h
+++ b/src/modules/options/optw_texticons.h
@@ -36,15 +36,9 @@
 #include "kvi_tal_popupmenu.h"
 #include "kvi_tal_hbox.h" 
 
-#ifdef COMPILE_USE_QT4
-#include <tq3table.h>
-#define KviTalTable Q3Table
-#define KviTalTableItem Q3TableItem
-#else
 #include <tqtable.h>
 #define KviTalTable TQTable
 #define KviTalTableItem TQTableItem
-#endif
 
 class KviTextIconTableItem;