ported KviTalWidgetStack

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1311 17fca916-40b9-46aa-a4ea-0a15b648b75c

9 files changed, 64 insertions, 191 deletions

diff --git a/src/kvilib/build/Makefile.am b/src/kvilib/build/Makefile.am
index 7f8a81a67..0b3987236 100644
--- a/src/kvilib/build/Makefile.am
+++ b/src/kvilib/build/Makefile.am
@@ -218,8 +218,6 @@ headers_HEADERS = \
 	../tal/kvi_tal_tooltip.h \
 	../tal/kvi_tal_vbox.h \
 	../tal/kvi_tal_widgetstack.h \
-	../tal/kvi_tal_widgetstack_qt3.h \
-	../tal/kvi_tal_widgetstack_qt4.h \
 	../tal/kvi_tal_wizard.h \
 	../tal/kvi_tal_windowstate.h
 
@@ -287,8 +285,7 @@ headers_HEADERS = \
 ../tal/kvi_tal_toolbar.cpp: ../tal/kvi_tal_toolbar_qt.moc
 ../tal/kvi_tal_toolbar.cpp: ../tal/kvi_tal_toolbar_kde.moc
 ../tal/kvi_tal_tooltip.cpp: ../tal/kvi_tal_tooltip.moc
-../tal/kvi_tal_widgetstack.cpp: ../tal/kvi_tal_widgetstack_qt3.moc
-../tal/kvi_tal_widgetstack.cpp: ../tal/kvi_tal_widgetstack_qt4.moc
+../tal/kvi_tal_widgetstack.cpp: ../tal/kvi_tal_widgetstack.moc
 ../tal/kvi_tal_wizard.cpp: ../tal/kvi_tal_wizard.moc
 
 #
diff --git a/src/kvilib/tal/kvi_tal_widgetstack.cpp b/src/kvilib/tal/kvi_tal_widgetstack.cpp
index 8fc4ee62e..9521b93dd 100644
--- a/src/kvilib/tal/kvi_tal_widgetstack.cpp
+++ b/src/kvilib/tal/kvi_tal_widgetstack.cpp
@@ -25,9 +25,4 @@
 #define __KVILIB__
 #include "kvi_tal_widgetstack.h"
 
-#ifdef COMPILE_USE_QT4
-	#include "kvi_tal_widgetstack_qt4.moc"
-#else
-	#include "kvi_tal_widgetstack_qt3.moc"
-#endif
-
+#include "kvi_tal_widgetstack.moc"
diff --git a/src/kvilib/tal/kvi_tal_widgetstack.h b/src/kvilib/tal/kvi_tal_widgetstack.h
index 792982020..15c5c8c1f 100644
--- a/src/kvilib/tal/kvi_tal_widgetstack.h
+++ b/src/kvilib/tal/kvi_tal_widgetstack.h
@@ -27,10 +27,15 @@
 
 #include "kvi_settings.h"
 
-#ifdef COMPILE_USE_QT4
-	#include "kvi_tal_widgetstack_qt4.h"
-#else
-	#include "kvi_tal_widgetstack_qt3.h"
-#endif
+#include <QStackedWidget>
+
+class KVILIB_API KviTalWidgetStack : public QStackedWidget
+{
+	Q_OBJECT
+public:
+	KviTalWidgetStack(QWidget * pParent)
+	: QStackedWidget(pParent) {};
+	virtual ~KviTalWidgetStack() {};
+};
 
 #endif // _KVI_TAL_WIDGETSTACK_H_
diff --git a/src/kvilib/tal/kvi_tal_widgetstack_qt3.h b/src/kvilib/tal/kvi_tal_widgetstack_qt3.h
deleted file mode 100644
index 8679dcfde..000000000
--- a/src/kvilib/tal/kvi_tal_widgetstack_qt3.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _KVI_TAL_WIDGETSTACK_QT3_H_
-#define _KVI_TAL_WIDGETSTACK_QT3_H_
-
-//=============================================================================
-//
-//   File : kvi_tal_widgetstack_qt3.h
-//   Creation date : Mon Jan 22 2007 11:17:08 by Szymon Stefanek
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2007 Szymon Stefanek (pragma at kvirc dot net)
-//
-//   This program is FREE software. You can redistribute it and/or
-//   modify it under the terms of the GNU General Public License
-//   as published by the Free Software Foundation; either version 2
-//   of the License, or (at your opinion) any later version.
-//
-//   This program is distributed in the HOPE that it will be USEFUL,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-//   See the GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, write to the Free Software Foundation,
-//   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-//=============================================================================
-
-#include "kvi_settings.h"
-
-#include <qwidgetstack.h>
-
-
-class KVILIB_API KviTalWidgetStack : public QWidgetStack
-{
-	Q_OBJECT
-public:
-	KviTalWidgetStack(QWidget * pParent)
-	: QWidgetStack(pParent) {};
-	virtual ~KviTalWidgetStack() {};
-};
-
-#endif // _KVI_TAL_WIDGETSTACK_QT3_H_
diff --git a/src/kvilib/tal/kvi_tal_widgetstack_qt4.h b/src/kvilib/tal/kvi_tal_widgetstack_qt4.h
deleted file mode 100644
index 5d47586e4..000000000
--- a/src/kvilib/tal/kvi_tal_widgetstack_qt4.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _KVI_TAL_WIDGETSTACK_QT4_H_
-#define _KVI_TAL_WIDGETSTACK_QT4_H_
-
-//=============================================================================
-//
-//   File : kvi_tal_widgetstack_qt4.h
-//   Creation date : Mon Jan 22 2007 11:17:08 by Szymon Stefanek
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2007 Szymon Stefanek (pragma at kvirc dot net)
-//
-//   This program is FREE software. You can redistribute it and/or
-//   modify it under the terms of the GNU General Public License
-//   as published by the Free Software Foundation; either version 2
-//   of the License, or (at your opinion) any later version.
-//
-//   This program is distributed in the HOPE that it will be USEFUL,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-//   See the GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, write to the Free Software Foundation,
-//   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-//=============================================================================
-
-#include "kvi_settings.h"
-
-//#include <qstackedwidget.h>
-#include <q3widgetstack.h>
-
-class KVILIB_API KviTalWidgetStack : public Q3WidgetStack
-{
-	Q_OBJECT
-public:
-	KviTalWidgetStack(QWidget * pParent)
-	: Q3WidgetStack(pParent) {};
-	virtual ~KviTalWidgetStack() {};
-};
-
-#endif // _KVI_TAL_WIDGETSTACK_QT4_H_
diff --git a/src/kvirc/ui/kvi_ctcppagedialog.cpp b/src/kvirc/ui/kvi_ctcppagedialog.cpp
index fde9bc149..58a3a63fa 100644
--- a/src/kvirc/ui/kvi_ctcppagedialog.cpp
+++ b/src/kvirc/ui/kvi_ctcppagedialog.cpp
@@ -26,28 +26,20 @@
 
 #include "kvi_locale.h"
 #include "kvi_app.h"
-
 #include "kvi_iconmanager.h"
 
-#include <qdatetime.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qpixmap.h>
-
-#ifdef COMPILE_USE_QT4
-	#include <qdesktopwidget.h>
-#endif
+#include <QDateTime>
+#include <QLayout>
+#include <QLabel>
+#include <QPixmap>
+#include <QDesktopWidget>
 
 // kvi_app.cpp
 extern KVIRC_API KviCtcpPageDialog * g_pCtcpPageDialog;
 
 KviCtcpPageDialog::KviCtcpPageDialog()
 : QWidget(0,"kvirc_ctcppage_dialog",
-#ifdef COMPILE_USE_QT4
-		Qt::WindowStaysOnTopHint | Qt::Tool | Qt::Dialog | Qt::Window)
-#else
-		  WStyle_StaysOnTop | WStyle_Tool | WType_Dialog | WType_TopLevel)
-#endif
+	Qt::WindowStaysOnTopHint | Qt::Tool | Qt::Dialog | Qt::Window)
 {
 	QGridLayout * g = new QGridLayout(this,4,1,6,0);
 	m_pWidgetStack = new KviTalWidgetStack(this);
@@ -90,16 +82,13 @@ void KviCtcpPageDialog::die()
 
 void KviCtcpPageDialog::tabSelected(int id)
 {
-	m_pWidgetStack->raiseWidget(id);
+	m_pWidgetStack->widget(id)->raise();
 }
 
 void KviCtcpPageDialog::addPage(const QString &szNick,const QString &szUser,const QString &szHost,const QString &szMsg)
 {
-#ifdef COMPILE_USE_QT4
 	int id = m_pTabBar->addTab(szNick);
-#else
-	int id = m_pTabBar->addTab(new QTab(szNick));
-#endif
+
 	QLabel * l = new QLabel(this);
 	l->setFrameStyle(QFrame::Raised | QFrame::StyledPanel);
 	//l->setMaximumWidth(600);
@@ -120,8 +109,8 @@ void KviCtcpPageDialog::addPage(const QString &szNick,const QString &szUser,cons
 	tmp += "]</center>";
 
 	l->setText(tmp);
-	m_pWidgetStack->addWidget(l,id);
-	m_pWidgetStack->raiseWidget(l);
+	m_pWidgetStack->addWidget(l);
+	m_pWidgetStack->widget(id)->raise();
 	m_pTabBar->setCurrentTab(id);
 }
 
diff --git a/src/kvirc/ui/kvi_ctcppagedialog.h b/src/kvirc/ui/kvi_ctcppagedialog.h
index 35ebdd5db..74084e36e 100644
--- a/src/kvirc/ui/kvi_ctcppagedialog.h
+++ b/src/kvirc/ui/kvi_ctcppagedialog.h
@@ -23,13 +23,12 @@
 //
 
 #include "kvi_settings.h"
-
 #include "kvi_string.h"
-
 #include "kvi_tal_widgetstack.h"
-#include <qtabbar.h>
-#include <qwidget.h>
-#include <qpushbutton.h>
+
+#include <QTabBar>
+#include <QWidget>
+#include <QPushButton>
 
 class KVIRC_API KviCtcpPageDialog : public QWidget
 {
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index db3c57212..c12f5a5c9 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -32,28 +32,26 @@
 #include "kvi_module.h"
 #include "kvi_styled_controls.h"
 #include "kvi_pointerhashtable.h"
-#include <qlayout.h>
 #include "kvi_accel.h"
-#include <qlabel.h>
 #include "kvi_tal_vbox.h"
-#include <qsplitter.h>
 #include "kvi_tal_widgetstack.h"
-#include <qpushbutton.h>
 #include "kvi_tal_tooltip.h"
-
-#ifdef COMPILE_USE_QT4
-	#include <q3header.h>
-#else
-	#include <qheader.h>
-	#include <qobjectlist.h>
-#endif
 #include "kvi_tal_popupmenu.h"
-#include <qtoolbutton.h>
-#include <qcheckbox.h>
 #include <kvi_tal_groupbox.h>
-#include <qpainter.h>
-#include <qfont.h>
-#include <qevent.h>
+
+#include <QLayout>
+#include <QLabel>
+#include <QSplitter>
+#include <QPushButton>
+#include <QToolButton>
+#include <QCheckBox>
+#include <QPainter>
+#include <QFont>
+#include <QEvent>
+#include <QCloseEvent>
+
+#include <q3header.h>
+// FIXME: #include <QHeaderView>
 
 //extern KviModule * g_pOptionsModule;
 extern KviPointerHashTable<QString,KviOptionsDialog> * g_pOptionsDialogDict;
@@ -66,9 +64,7 @@ KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(QWidget *parent,const
 {
 	createLayout(1,1);
 	QLabel * l = new QLabel(szText,this);
-#ifdef COMPILE_USE_QT4
 	l->setWordWrap(true);
-#endif
 	l->setAlignment(Qt::AlignTop);
 	layout()->addWidget(l,0,0);
 }
@@ -78,8 +74,6 @@ KviGeneralOptionsFrontWidget::~KviGeneralOptionsFrontWidget()
 }
 
 
-
-
 KviOptionsListViewItem::KviOptionsListViewItem(KviTalListView *parent,KviOptionsWidgetInstanceEntry * e)
 :KviTalListViewItem(parent,e->szName)
 {
@@ -137,21 +131,21 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 	}
 
 	QString szDialog = __tr2qs_ctx("This dialog contains a set of KVIrc settings.<br> Use the icons " \
-							"on the left to navigate through the option pages. The text box in the " \
-							"bottom left corner is a small search engine. It will highlight the " \
-							"pages that contain options related to the search term you have entered.","options");
+			"on the left to navigate through the option pages. The text box in the " \
+			"bottom left corner is a small search engine. It will highlight the " \
+			"pages that contain options related to the search term you have entered.","options");
 
 
 	QString szInfoTips;
 #ifdef COMPILE_INFO_TIPS
 	szInfoTips = __tr2qs_ctx("Many settings have tooltips that can be shown by holding " \
-							"the cursor over their label for a few seconds.","options"); 
+			"the cursor over their label for a few seconds.","options"); 
 #else
 	szInfoTips = "";
 #endif
 	QString szOkCancelButtons = __tr2qs_ctx("When you have finished, click \"<b>OK</b>\" to accept your changes " \
-						"or \"<b>Cancel</b>\" to discard them. Clicking \"<b>Apply</b>\" will commit your " \
-						"changes without closing the window.","options");
+			"or \"<b>Cancel</b>\" to discard them. Clicking \"<b>Apply</b>\" will commit your " \
+			"changes without closing the window.","options");
 
 
 	QString szFrontText = QString(
@@ -215,11 +209,11 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 
 #ifdef COMPILE_INFO_TIPS
 	QString szTip = __tr2qs_ctx("<p>This is the search tool for this options dialog.</p>" \
-								"<p>You can enter a search term either in your native " \
-								"language or in english and press the button on the right. " \
-								"The pages that contain some options related to the " \
-								"search term will be highlighted and you will be able " \
-								"to quickly find them.</p><p>Try \"nickname\" for example.</p>","options");
+			"<p>You can enter a search term either in your native " \
+			"language or in english and press the button on the right. " \
+			"The pages that contain some options related to the " \
+			"search term will be highlighted and you will be able " \
+			"to quickly find them.</p><p>Try \"nickname\" for example.</p>","options");
 	KviTalToolTip::add(m_pSearchLineEdit,szTip);
 	KviTalToolTip::add(m_pSearchButton,szTip);
 #endif
@@ -240,8 +234,10 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 
 	// First widget visible
 	m_pFrontWidget = new KviGeneralOptionsFrontWidget(m_pWidgetStack,szFrontText);
-	m_pWidgetStack->addWidget(m_pFrontWidget,0);
-	m_pWidgetStack->raiseWidget(m_pFrontWidget);
+	m_pWidgetStack->addWidget(m_pFrontWidget);
+
+	int idx = m_pWidgetStack->indexOf(m_pFrontWidget);
+	m_pWidgetStack->widget(idx)->raise();
 
 //  Ok,Cancel,Help
 
@@ -274,7 +270,6 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 	
 	if(!parent())
 	{
-
 		if(KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry).y() < 5)
 		{
 			KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry).setY(5);
@@ -314,7 +309,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const QStr
 	if(!pItem->m_pOptionsWidget)
 	{
 		pItem->m_pOptionsWidget = g_pOptionsInstanceManager->getInstance(pItem->m_pInstanceEntry,m_pWidgetStack);
-		m_pWidgetStack->addWidget(pItem->m_pOptionsWidget,0);
+		m_pWidgetStack->addWidget(pItem->m_pOptionsWidget);
 	}
 
 	bool bFoundSomethingHere = false;
@@ -323,43 +318,26 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const QStr
 	QTabWidget * pTabWidgetToMark = 0;
 	
 	QObject * o;
-#ifdef COMPILE_USE_QT4
 	QObjectList ol = pItem->m_pOptionsWidget->queryList();
 	if(ol.count() > 0)
 	{
 		for(QObjectList::Iterator it = ol.begin();it != ol.end();++it)
 		{
 			o = *it;
-#else
-	QObjectList * ol = pItem->m_pOptionsWidget->queryList();
-	if(ol)
-	{
-		QObjectListIt it(*ol);
-		while((o = it.current())/* && (!bFoundSomethingHere)*/)
-		{
-#endif
 			QString szText;
 			if(o->inherits("QLabel"))szText = ((QLabel *)o)->text();
 			else if(o->inherits("QCheckBox"))szText = ((QCheckBox *)o)->text();
 			else if(o->inherits("KviTalGroupBox"))szText = ((KviTalGroupBox *)o)->title();
 #ifdef COMPILE_INFO_TIPS
 			if(o->inherits("QWidget"))
-#ifdef COMPILE_USE_QT4
 				szText.append(((QWidget *)o)->toolTip());
-#else
-				szText.append(QToolTip::textFor((QWidget*)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;
@@ -413,14 +391,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const QStr
 					}
 				}
 			}
-
-#ifndef COMPILE_USE_QT4
-			++it;
-#endif
 		}
-#ifndef COMPILE_USE_QT4
-		delete ol;
-#endif
 	}
 
 	if(pTabWidgetToMark)
@@ -524,7 +495,7 @@ void KviOptionsDialog::fillListView(KviTalListViewItem * p,KviPointerList<KviOpt
 			if(!it->m_pOptionsWidget)
 			{
 				it->m_pOptionsWidget = g_pOptionsInstanceManager->getInstance(it->m_pInstanceEntry,m_pWidgetStack);
-				m_pWidgetStack->addWidget(it->m_pOptionsWidget,0);
+				m_pWidgetStack->addWidget(it->m_pOptionsWidget);
 			}
 		} else {
 			it = (KviOptionsListViewItem *)p;
@@ -564,10 +535,11 @@ void KviOptionsDialog::listViewItemSelectionChanged(KviTalListViewItem *it)
 		if(!i->m_pOptionsWidget)
 		{
 			i->m_pOptionsWidget = g_pOptionsInstanceManager->getInstance(i->m_pInstanceEntry,m_pWidgetStack);
-			m_pWidgetStack->addWidget(i->m_pOptionsWidget,0);
+			m_pWidgetStack->addWidget(i->m_pOptionsWidget);
 		}
 
-		m_pWidgetStack->raiseWidget(i->m_pOptionsWidget);
+		int idx = m_pWidgetStack->indexOf(i->m_pOptionsWidget);
+		m_pWidgetStack->widget(idx)->raise();
 		m_pCategoryLabel->setText(str);
 	}
 }
diff --git a/src/modules/options/dialog.h b/src/modules/options/dialog.h
index 355e4565d..cd9aad4ac 100644
--- a/src/modules/options/dialog.h
+++ b/src/modules/options/dialog.h
@@ -25,13 +25,13 @@
 //
 //=============================================================================
 
+#include "instances.h"
 
-#include <qdialog.h>
-#include "kvi_tal_listview.h"
-#include <qstringlist.h>
 #include "kvi_optionswidget.h"
+#include "kvi_tal_listview.h"
 
-#include "instances.h"
+#include <QDialog>
+#include <QStringList>
 
 class QLabel;
 class KviTalWidgetStack;