more qt4 port

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

2 files changed, 18 insertions, 9 deletions

diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
index d1bd90d32..4aa323b54 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/setupwizard.cpp
@@ -211,7 +211,7 @@ KviSetupWizard::KviSetupWizard()
 
 	QString tmp;
 
-	m_pDirButtonGroup = new QVButtonGroup(__tr2qs("Store configuration in folder"),m_pDirectory->m_pVBox);
+	m_pDirButtonGroup = new KviTalVButtonGroup(__tr2qs("Store configuration in folder"),m_pDirectory->m_pVBox);
 	m_pDirUsePrev = new QRadioButton(__tr2qs("Use settings folder from previous installation"),m_pDirButtonGroup);
 	connect(m_pDirUsePrev,SIGNAL(clicked()),this,SLOT(oldDirClicked()));
 	
@@ -311,7 +311,7 @@ KviSetupWizard::KviSetupWizard()
 	if(nick.isEmpty())nick = "newbie";
 	if(nick == "root")nick = "newbie";
 //m_pIdentity->m_pVBox
-	KviTalGroupBox * gbox = new KviTalGroupBox(1,KviTalGroupBox::Horizontal,__tr2qs("Basic Properties"),m_pIdentity->m_pVBox);
+	KviTalGroupBox * gbox = new KviTalGroupBox(1,Qt::Horizontal,__tr2qs("Basic Properties"),m_pIdentity->m_pVBox);
 
 	m_pNickSelector = new KviStringSelector(gbox,__tr2qs("Nickname:"),&(KVI_OPTION_STRING(KviOption_stringNickname1)),true);
 	m_pNickSelector->setMinimumLabelWidth(120);
@@ -328,7 +328,7 @@ KviSetupWizard::KviSetupWizard()
 	QString szCenterEnd("</center>");
 	QString szTrailing = "<br><br>" + szOptionalCtcpUserInfo + szCenterEnd;
 
-	gbox = new KviTalGroupBox(1,KviTalGroupBox::Horizontal,__tr2qs("Profile"),m_pIdentity->m_pVBox);
+	gbox = new KviTalGroupBox(1,Qt::Horizontal,__tr2qs("Profile"),m_pIdentity->m_pVBox);
 
 	KviTalHBox* hb = new KviTalHBox(gbox);
 	hb->setSpacing(4);
@@ -405,7 +405,7 @@ KviSetupWizard::KviSetupWizard()
 		"in order to preserve your current visual settings.<br><br>" \
 		"If you don't know what to choose, just use the default.</p>"));
 
-	m_pThemeButtonGroup = new QVButtonGroup(m_pTheme->m_pVBox);
+	m_pThemeButtonGroup = new KviTalVButtonGroup(m_pTheme->m_pVBox);
 	
 	KviTalHBox* pThemesHb = new KviTalHBox(m_pThemeButtonGroup);
 
@@ -465,7 +465,7 @@ KviSetupWizard::KviSetupWizard()
 			"Now you should specify an IRC server, to be connected to it"));
 
 
-	m_pServersButtonGroup = new QVButtonGroup(__tr2qs("Choose a server to connect"),m_pServers->m_pVBox);
+	m_pServersButtonGroup = new KviTalVButtonGroup(__tr2qs("Choose a server to connect"),m_pServers->m_pVBox);
 	
 	m_pServersChooseFromList = new QRadioButton(__tr2qs("Choose from built-in server list"),m_pServersButtonGroup);
 	
diff --git a/src/modules/setup/setupwizard.h b/src/modules/setup/setupwizard.h
index 476e969bf..f0229bf3d 100644
--- a/src/modules/setup/setupwizard.h
+++ b/src/modules/setup/setupwizard.h
@@ -30,7 +30,13 @@
 #include <qlabel.h>
 #include <qpixmap.h>
 #include <qlineedit.h>
-#include <qvbuttongroup.h>
+#ifdef COMPILE_USE_QT4
+#include <Q3VButtonGroup>
+#define KviTalVButtonGroup Q3VButtonGroup
+#else
+ #include <qvbuttongroup.h>
+#define KviTalVButtonGroup QVButtonGroup
+#endif
 #include <qradiobutton.h>
 #include <qcombobox.h>
 #include <qcheckbox.h>
@@ -76,7 +82,10 @@ public:
 	KviSetupPage  * m_pServers;
 	
 	// Theme
-	QVButtonGroup * m_pThemeButtonGroup;
+
+
+	KviTalVButtonGroup * m_pThemeButtonGroup;
+
 	QRadioButton  * m_pThemeHiRes;
 	QRadioButton  * m_pThemeLoRes;
 	QRadioButton  * m_pThemeNone;
@@ -88,7 +97,7 @@ public:
 	//Dir
 	QLineEdit     * m_pDataPathEdit;
 	QLineEdit     * m_pIncomingPathEdit;
-	QVButtonGroup * m_pDirButtonGroup;
+	KviTalVButtonGroup * m_pDirButtonGroup;
 	QRadioButton  * m_pDirUsePrev;
 	QRadioButton  * m_pDirUseNew;
 #ifdef COMPILE_ON_WINDOWS
@@ -111,7 +120,7 @@ public:
 	KviStringSelector * m_pOtherInfoSelector;
 	
 	//Servers
-	QVButtonGroup * m_pServersButtonGroup;
+	KviTalVButtonGroup * m_pServersButtonGroup;
 	QRadioButton  * m_pServersChooseFromList;
 	QRadioButton  * m_pServersSpecifyManually;
 	QRadioButton  * m_pServersOpenIrcUrl;