More Qt4 port

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

3 files changed, 12 insertions, 6 deletions

diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp
index e2af1c140..ef66a61ef 100644
--- a/src/modules/options/container.cpp
+++ b/src/modules/options/container.cpp
@@ -30,6 +30,11 @@
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qtooltip.h>
+#include <qevent.h>
+
+#ifdef COMPILE_USE_QT4
+	#include <qdesktopwidget.h>
+#endif
 
 extern KviOptionsInstanceManager * g_pOptionsInstanceManager;
 
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 010c06b58..5614fe61b 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -34,7 +34,7 @@
 #include "kvi_ptrdict.h"
 
 #include <qlayout.h>
-#include <qaccel.h>
+#include "kvi_accel.h"
 #include <qlabel.h>
 #include "kvi_tal_vbox.h"
 #include <qsplitter.h>
@@ -50,6 +50,7 @@
 #include <qobjectlist.h>
 #include <qpainter.h>
 #include <qfont.h>
+#include <qevent.h>
 
 
 //extern KviModule * g_pOptionsModule;
@@ -64,7 +65,7 @@ KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(QWidget *parent,const
 	createLayout(1,1);
 	QLabel * l = new QLabel(szText,this);
 	
-	l->setAlignment(AlignTop);
+	l->setAlignment(Qt::AlignTop);
 	layout()->addWidget(l,0,0);
 }
 
@@ -281,8 +282,8 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 			KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry).y());
 	}
 
-	QAccel *a = new QAccel( this );
-        a->connectItem( a->insertItem(Key_Escape), this,SLOT(close()) );        
+	KviAccel *a = new KviAccel( this );
+        a->connectItem( a->insertItem(Qt::Key_Escape), this,SLOT(close()) );        
 }
 
 KviOptionsDialog::~KviOptionsDialog()
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 2c11230d3..5927be5e2 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -102,7 +102,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 
 	QLabel * l = new QLabel(szTmp,this);
 	l->setFrameStyle(QFrame::Raised | QFrame::StyledPanel);
-	l->setAlignment(AlignCenter);
+	l->setAlignment(Qt::AlignCenter);
 	l->setMargin(10);
 	g->addMultiCellWidget(l,0,0,0,3);
 	l->setMinimumWidth(200);
@@ -451,7 +451,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 
 	m_pHeaderLabel = new QLabel("",this); // the text will be set later
 	m_pHeaderLabel->setFrameStyle(QFrame::Raised | QFrame::StyledPanel);
-	m_pHeaderLabel->setAlignment(AlignCenter);
+	m_pHeaderLabel->setAlignment(Qt::AlignCenter);
 	m_pHeaderLabel->setMargin(10);
 	g->addMultiCellWidget(m_pHeaderLabel,0,0,0,3);
 	m_pHeaderLabel->setMinimumWidth(200);