More Qt 4.x port

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

7 files changed, 21 insertions, 20 deletions

diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
index 47f36becd..e8ba76cb5 100644
--- a/src/modules/dcc/canvaswidget.cpp
+++ b/src/modules/dcc/canvaswidget.cpp
@@ -33,6 +33,7 @@
 #include "kvi_string.h"
 
 #include "kvi_locale.h"
+#include "kvi_tal_popupmenu.h"
 
 #include <math.h>
 
@@ -1552,10 +1553,10 @@ KviCanvasWidget::KviCanvasWidget(QWidget * par)
 
 	connect(m_pPropertiesWidget,SIGNAL(propertyChanged(const QString &,const QVariant &)),m_pCanvasView,SLOT(propertyChanged(const QString &,const QVariant &)));
 
-	QPopupMenu * add = new QPopupMenu(m_pMenuBar);
-	QPopupMenu * shapes = new QPopupMenu(add);
-	QPopupMenu * polygons = new QPopupMenu(add);
-	QPopupMenu * items = new QPopupMenu(add);
+	KviTalPopupMenu * add = new KviTalPopupMenu(m_pMenuBar);
+	KviTalPopupMenu * shapes = new KviTalPopupMenu(add);
+	KviTalPopupMenu * polygons = new KviTalPopupMenu(add);
+	KviTalPopupMenu * items = new KviTalPopupMenu(add);
 	shapes->insertItem(__tr2qs_ctx("&Line","dcc"),m_pCanvasView,SLOT(insertLine()));
 	shapes->insertItem(__tr2qs_ctx("&Rectangle","dcc"),m_pCanvasView,SLOT(insertRectangle()));
 	shapes->insertItem(__tr2qs_ctx("&Ellipse","dcc"),m_pCanvasView,SLOT(insertEllipse()));
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 608859677..8700640b3 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -64,7 +64,7 @@
 
 #include <qsplitter.h>
 #include <qevent.h>
-#include <qvbox.h>
+#include "kvi_tal_vbox.h"
 
 
 #ifdef COMPILE_SSL_SUPPORT
@@ -91,7 +91,7 @@ KviDccChat::KviDccChat(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name)
 	m_pTopSplitter = new QSplitter(QSplitter::Horizontal,this,"top_splitter");
 	KviThemedLabel * dummy;
 	dummy = new KviThemedLabel(m_pTopSplitter,"dummy_label");
-	QVBox * box = new QVBox(m_pTopSplitter);
+	KviTalVBox * box = new KviTalVBox(m_pTopSplitter);
 
 #ifdef COMPILE_CRYPT_SUPPORT
 	createCryptControllerButton(box);
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index 308e8273f..8c30a03e3 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -926,7 +926,7 @@ void KviDccFileTransfer::abort()
 }
 
 
-void KviDccFileTransfer::fillContextPopup(QPopupMenu * m,int column)
+void KviDccFileTransfer::fillContextPopup(KviTalPopupMenu * m,int column)
 {
 	m->insertItem(__tr2qs_ctx("Configure Bandwidth...","dcc"),this,SLOT(configureBandwidth()));
 	m->insertSeparator();
diff --git a/src/modules/dcc/send.h b/src/modules/dcc/send.h
index 29baf9cff..e7bd7ceda 100644
--- a/src/modules/dcc/send.h
+++ b/src/modules/dcc/send.h
@@ -36,9 +36,9 @@
 #include "kvi_list.h"
 #include <qlabel.h>
 #include <qprogressbar.h>
-#include <qpopupmenu.h>
-#include <qhbox.h>
-#include <qvbox.h>
+#include "kvi_tal_popupmenu.h"
+#include "kvi_tal_hbox.h"
+#include "kvi_tal_vbox.h"
 #include <qfile.h>
 #include <qdialog.h>
 
@@ -167,7 +167,7 @@ protected slots:
 
 class KviDccMarshal;
 class QPainter;
-class QPopupMenu;
+class KviTalPopupMenu;
 
 class KviDccFileTransfer : public KviFileTransfer, public KviDccMarshalOutputContext
 {
@@ -219,7 +219,7 @@ public:
 
 	virtual void displayPaint(QPainter * p,int column,int width,int height);
 	virtual int displayHeight(int iLineSpacing);
-	virtual void fillContextPopup(QPopupMenu * m,int column);
+	virtual void fillContextPopup(KviTalPopupMenu * m,int column);
 	virtual void fillStatusString(QString &szBuffer);
 	virtual bool active();
 	virtual void die();
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index c3884a69d..26ef25f67 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -42,7 +42,7 @@
 
 #include <qframe.h>
 #include <qsplitter.h>
-#include <qvbox.h>
+#include "kvi_tal_vbox.h"
 #include <qslider.h>
 #include <qtooltip.h>
 
@@ -655,9 +655,9 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name
 	m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"splitter");
 	m_pIrcView = new KviIrcView(m_pSplitter,pFrm,this);
 
-	m_pHBox = new QHBox(this,"h_box");
+	m_pHBox = new KviTalHBox(this);
 
-	QVBox * vbox = new QVBox(m_pHBox,"v_box");
+	KviTalVBox * vbox = new KviTalVBox(m_pHBox);
 
 	m_pInputLabel = new QLabel(__tr2qs_ctx("Input buffer","dcc"),vbox);
 	m_pInputLabel->setFrameStyle(QFrame::Sunken | QFrame::Panel);
@@ -665,7 +665,7 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name
 	m_pOutputLabel->setFrameStyle(QFrame::Sunken | QFrame::Panel);
 	vbox->setSpacing(1);
 	
-	QVBox * vbox2 = new QVBox(m_pHBox,"v_box_2");
+	KviTalVBox * vbox2 = new KviTalVBox(m_pHBox);
 
 	m_pRecordingLabel = new QLabel(vbox2);
 	m_pRecordingLabel->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RECORD)));
diff --git a/src/modules/dcc/voice.h b/src/modules/dcc/voice.h
index c123d98f1..bfbe62ac0 100644
--- a/src/modules/dcc/voice.h
+++ b/src/modules/dcc/voice.h
@@ -32,7 +32,7 @@
 #include "thread.h"
 #include "window.h"
 
-#include <qhbox.h>
+#include "kvi_tal_hbox.h"
 #include <qlabel.h>
 #include <qtoolbutton.h>
 #include <qtimer.h>
@@ -107,7 +107,7 @@ public:
 	KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name);
 	~KviDccVoice();
 protected:
-	QHBox                  * m_pHBox;
+	KviTalHBox                  * m_pHBox;
 	QSlider                * m_pVolumeSlider;
 	QLabel                 * m_pInputLabel;
 	QLabel                 * m_pOutputLabel;
diff --git a/src/modules/dcc/window.cpp b/src/modules/dcc/window.cpp
index dc7bc396f..11fe893fd 100644
--- a/src/modules/dcc/window.cpp
+++ b/src/modules/dcc/window.cpp
@@ -21,7 +21,7 @@
 //
 
 #include "window.h"
-#include <qhbox.h> 
+#include "kvi_tal_hbox.h" 
 
 KviDccWindow::KviDccWindow(int type,KviFrame * lpFrm,const char * name,KviDccDescriptor * d)
 : KviWindow(type,lpFrm,name)
@@ -29,7 +29,7 @@ KviDccWindow::KviDccWindow(int type,KviFrame * lpFrm,const char * name,KviDccDes
 	m_pDescriptor = d;
 	m_pDescriptor->setWindow(this);
 	m_pMarshal    = 0;
-	m_pButtonBox = new QHBox(this,"button_box");
+	m_pButtonBox = new KviTalHBox(this);
 	createTextEncodingButton(m_pButtonBox);
 }