1 files changed, 0 insertions, 48 deletions

diff --git a/src/kvilib/tal/kvi_tal_wizard.cpp b/src/kvilib/tal/kvi_tal_wizard.cpp
index 396aa650..2555efd0 100644
--- a/src/kvilib/tal/kvi_tal_wizard.cpp
+++ b/src/kvilib/tal/kvi_tal_wizard.cpp
@@ -28,15 +28,6 @@
 #include "kvi_pointerlist.h"
 #include "kvi_locale.h"
 
-#ifdef COMPILE_USE_QT4
-	#include <TQShowEvent>
-	#include <TQLabel>
-	#include <TQPushButton>
-	#include <TQGridLayout>
-	#include <TQFrame>
-	#include <TQStackedWidget>
-	#include <TQPalette>
-#else
 	#include <tqlabel.h>
 	#include <tqpushbutton.h>
 	#include <tqlayout.h>
@@ -44,7 +35,6 @@
 	#include <tqframe.h>
 	#include <tqwidgetstack.h>
 	#include <tqpalette.h>
-#endif
 
 
 class KviTalWizardPageData
@@ -82,11 +72,7 @@ public:
 	TQWidget                          * pNextSpacer;
 	TQPushButton                      * pFinishButton;
 	TQWidget                          * pFinishSpacer;
-#ifdef COMPILE_USE_QT4
-	TQStackedWidget                   * pWidgetStack;
-#else
 	TQWidgetStack                     * pWidgetStack;
-#endif
 public:
 	KviTalWizardPageData * findPage(TQWidget * pWidget)
 	{
@@ -177,50 +163,25 @@ KviTalWizard::KviTalWizard(TQWidget * pParent)
 	m_p->pLayout = new TQGridLayout(this);
 
 	m_p->pTitleLabel = new TQLabel(this);
-#ifdef COMPILE_USE_QT4
-	m_p->pLayout->addWidget(m_p->pTitleLabel,0,0,1,3);
-#else
 	m_p->pLayout->addMultiCellWidget(m_p->pTitleLabel,0,0,0,3);
-#endif
 	m_p->pStepsLabel = new TQLabel(this);
 	m_p->pStepsLabel->setMinimumWidth(80);
 	m_p->pStepsLabel->setAlignment(TQt::AlignRight);
-#ifdef COMPILE_USE_QT4
-	m_p->pLayout->addWidget(m_p->pStepsLabel,0,4,1,3);
-#else
 	m_p->pLayout->addMultiCellWidget(m_p->pStepsLabel,0,0,4,6);
-#endif
 
 	TQFrame * f1 = new TQFrame(this);
 	f1->setFrameStyle(TQFrame::Sunken | TQFrame::HLine);
-#ifdef COMPILE_USE_QT4
-	m_p->pLayout->addWidget(f1,1,0,1,7);
-#else
 	m_p->pLayout->addMultiCellWidget(f1,1,1,0,6);
-#endif
 
-#ifdef COMPILE_USE_QT4
-	m_p->pWidgetStack = new TQStackedWidget(this);
-	m_p->pLayout->addWidget(m_p->pWidgetStack,2,0,1,7);
-#else
 	m_p->pWidgetStack = new TQWidgetStack(this);
 	m_p->pLayout->addMultiCellWidget(m_p->pWidgetStack,2,2,0,6);
-#endif
 
 	TQFrame * f2 = new TQFrame(this);
 	f2->setFrameStyle(TQFrame::Sunken | TQFrame::HLine);
-#ifdef COMPILE_USE_QT4
-	m_p->pLayout->addWidget(f2,3,0,1,7);
-#else
 	m_p->pLayout->addMultiCellWidget(f2,3,3,0,6);
-#endif
 
 	KviTalHBox * pButtonBox = new KviTalHBox(this);
-#ifdef COMPILE_USE_QT4
-	m_p->pLayout->addWidget(pButtonBox,4,0,1,7);
-#else
 	m_p->pLayout->addMultiCellWidget(pButtonBox,4,4,0,6);
-#endif
 
 	pButtonBox->setMargin(0);
 	pButtonBox->setSpacing(0);
@@ -388,22 +349,13 @@ void KviTalWizard::setCurrentPage(KviTalWizardPageData * pData)
 		bCancelEnabled = (pData->iEnableFlags & KviTalWizardPageData::EnableCancel);
 		bFinishEnabled = (pData->iEnableFlags & KviTalWizardPageData::EnableFinish);
 		bHelpEnabled = (pData->iEnableFlags & KviTalWizardPageData::EnableHelp);
-#ifdef COMPILE_USE_QT4
-		m_p->pWidgetStack->setCurrentWidget(pData->pWidget);
-#else
 		m_p->pWidgetStack->raiseWidget(pData->pWidget);
-#endif
 		szTitle = "<b>";
 		szTitle += pData->szTitle;
 		szTitle += "</b>";
 		TQPalette pal = m_p->pStepsLabel->palette();
-#ifdef COMPILE_USE_QT4
-		TQColor clrWin = pal.color(TQPalette::Normal,TQPalette::Window);
-		TQColor clrTxt = pal.color(TQPalette::Normal,TQPalette::WindowText);
-#else
 		TQColor clrWin = pal.color(TQPalette::Normal,TQColorGroup::Foreground);
 		TQColor clrTxt = pal.color(TQPalette::Normal,TQColorGroup::Background);
-#endif
 		TQColor clrMid = tqRgb(
 							(clrWin.red() + clrTxt.red()) / 2,
 							(clrWin.green() + clrTxt.green()) / 2,