From be39d41e086d81a73c0bfa24c439f062d3fcf1ed Mon Sep 17 00:00:00 2001
From: Fabio Bas
Date: Fri, 12 Sep 2008 16:23:27 +0000
Subject: compilation fixes (objects module) fixes for filetransferwindow

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2443 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/kvilib/tal/kvi_tal_hbox.cpp                    |   4 +
 src/kvilib/tal/kvi_tal_hbox.h                      |   1 +
 src/kvilib/tal/kvi_tal_toolbar.cpp                 |   2 +-
 src/kvilib/tal/kvi_tal_vbox.cpp                    |   5 +
 src/kvilib/tal/kvi_tal_vbox.h                      |   1 +
 src/kvirc/kernel/kvi_filetransfer.h                |   2 +-
 src/modules/dcc/send.cpp                           |   4 +-
 src/modules/dcc/send.h                             |   2 +-
 .../filetransferwindow/filetransferwindow.cpp      | 113 ++++++++++++++-------
 .../filetransferwindow/filetransferwindow.h        |  14 ++-
 src/modules/http/httpfiletransfer.cpp              |  12 +--
 src/modules/http/httpfiletransfer.h                |   8 +-
 src/modules/objects/class_ftp.cpp                  | 109 ++++++++++----------
 src/modules/objects/class_hbox.cpp                 |   4 +-
 src/modules/objects/class_http.h                   |  26 ++---
 src/modules/objects/class_layout.cpp               |   2 +-
 src/modules/objects/class_vbox.cpp                 |   4 +-
 src/modules/objects/class_widget.cpp               |   1 -
 src/modules/trayicon/libkvitrayicon.cpp            |   2 +-
 19 files changed, 190 insertions(+), 126 deletions(-)

diff --git a/src/kvilib/tal/kvi_tal_hbox.cpp b/src/kvilib/tal/kvi_tal_hbox.cpp
index d75b7e672..0c0ea5e13 100644
--- a/src/kvilib/tal/kvi_tal_hbox.cpp
+++ b/src/kvilib/tal/kvi_tal_hbox.cpp
@@ -77,6 +77,10 @@ void KviTalHBox::setAlignment(Qt::Alignment alignment)
 	m_pLayout->setAlignment(this,alignment);
 }
 
+void KviTalHBox::addStretch(int stretch)
+{
+	m_pLayout->addStretch(stretch);
+}
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 	#include "kvi_tal_hbox.moc"
diff --git a/src/kvilib/tal/kvi_tal_hbox.h b/src/kvilib/tal/kvi_tal_hbox.h
index aa1258ff2..1aed2c961 100644
--- a/src/kvilib/tal/kvi_tal_hbox.h
+++ b/src/kvilib/tal/kvi_tal_hbox.h
@@ -40,6 +40,7 @@ public:
 	void setSpacing(int);
 	void setMargin(int);
 	void setAlignment(Qt::Alignment);
+	void addStretch(int stretch=0);
 protected:
 	virtual void childEvent(QChildEvent * e);
 private:
diff --git a/src/kvilib/tal/kvi_tal_toolbar.cpp b/src/kvilib/tal/kvi_tal_toolbar.cpp
index 25b91c311..291a4fa96 100644
--- a/src/kvilib/tal/kvi_tal_toolbar.cpp
+++ b/src/kvilib/tal/kvi_tal_toolbar.cpp
@@ -27,7 +27,7 @@
 	KviTalToolBar::KviTalToolBar(const QString &label,QMainWindow *w,QT_TOOLBARDOCK_TYPE dock,bool bNewLine,const char * nam)
 	: KToolBar(nam,w,dock,bNewLine)
 	{
-		setLabel(label);
+		setWindowTitle(label);
 	}
 
 	KviTalToolBar::~KviTalToolBar()
diff --git a/src/kvilib/tal/kvi_tal_vbox.cpp b/src/kvilib/tal/kvi_tal_vbox.cpp
index 0c886e30a..25595896b 100644
--- a/src/kvilib/tal/kvi_tal_vbox.cpp
+++ b/src/kvilib/tal/kvi_tal_vbox.cpp
@@ -77,6 +77,11 @@ void KviTalVBox::setAlignment(Qt::Alignment alignment)
 	m_pLayout->setAlignment(alignment);
 }
 
+void KviTalVBox::addStretch(int stretch)
+{
+	m_pLayout->addStretch(stretch);
+}
+
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 	#include "kvi_tal_vbox.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/kvilib/tal/kvi_tal_vbox.h b/src/kvilib/tal/kvi_tal_vbox.h
index 85581f301..888c5bb05 100644
--- a/src/kvilib/tal/kvi_tal_vbox.h
+++ b/src/kvilib/tal/kvi_tal_vbox.h
@@ -40,6 +40,7 @@ public:
 	void setSpacing(int spacing);
 	void setMargin(int margin);
 	void setAlignment(Qt::Alignment);
+	void addStretch(int stretch=0);
 protected:
 	virtual void childEvent(QChildEvent * e);
 private:
diff --git a/src/kvirc/kernel/kvi_filetransfer.h b/src/kvirc/kernel/kvi_filetransfer.h
index a8dd22ef2..d2e9edc3c 100644
--- a/src/kvirc/kernel/kvi_filetransfer.h
+++ b/src/kvirc/kernel/kvi_filetransfer.h
@@ -107,7 +107,7 @@ public:
 	virtual QString localFileName();
 	virtual QString retryCommand();
 	virtual int displayHeight(int iLineSpacing);
-	virtual void fillContextPopup(KviTalPopupMenu * m,int column) = 0;
+	virtual void fillContextPopup(KviTalPopupMenu * m) = 0;
 	virtual void die() = 0;
 };
 
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index f45157683..e70bb2d54 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -929,7 +929,7 @@ void KviDccFileTransfer::abort()
 	displayUpdate();
 }
 
-void KviDccFileTransfer::fillContextPopup(KviTalPopupMenu * m,int column)
+void KviDccFileTransfer::fillContextPopup(KviTalPopupMenu * m)
 {
 	m->insertItem(__tr2qs_ctx("Configure Bandwidth...","dcc"),this,SLOT(configureBandwidth()));
 	m->insertSeparator();
@@ -1358,7 +1358,7 @@ void KviDccFileTransfer::init()
 	g_pDccFileTransfers = new KviPointerList<KviDccFileTransfer>;
 	g_pDccFileTransfers->setAutoDelete(false);
 
-	QPixmap * pix = g_pIconManager->getImage("kvi_dccfiletransfericons.png");
+	QPixmap * pix = g_pIconManager->getImage("kvi_dccfiletransfericons.png", false);
 	if(pix)g_pDccFileTransferIcon = new QPixmap(*pix);
 	else g_pDccFileTransferIcon = 0;
 }
diff --git a/src/modules/dcc/send.h b/src/modules/dcc/send.h
index 036339091..a6dd294c0 100644
--- a/src/modules/dcc/send.h
+++ b/src/modules/dcc/send.h
@@ -216,7 +216,7 @@ public:
 
 	virtual void displayPaint(QPainter * p,int column, QRect rect);
 	virtual int displayHeight(int iLineSpacing);
-	virtual void fillContextPopup(KviTalPopupMenu * m,int column);
+	virtual void fillContextPopup(KviTalPopupMenu * m);
 	virtual void fillStatusString(QString &szBuffer);
 	virtual bool active();
 	virtual void die();
diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp
index 0c6dfbe48..985c413e7 100644
--- a/src/modules/filetransferwindow/filetransferwindow.cpp
+++ b/src/modules/filetransferwindow/filetransferwindow.cpp
@@ -77,7 +77,7 @@ KviFileTransferItem::KviFileTransferItem(KviFileTransferWidget * v,KviFileTransf
 	col1Item = new KviTalTableWidgetItem(v, row(), 1);
 	col2Item = new KviTalTableWidgetItem(v, row(), 2);
 	//FIXME fixed row height
-	tableWidget()->setRowHeight( row(), 68 );
+	tableWidget()->setRowHeight( row(), 70 );
 }
 
 KviFileTransferItem::~KviFileTransferItem()
@@ -89,6 +89,7 @@ KviFileTransferItem::~KviFileTransferItem()
 
 void KviFileTransferItem::displayUpdate()
 {
+	//FIXME this hurts
 	int dummy = (int) time(NULL);
 	tableWidget()->model()->setData(tableWidget()->model()->index(row(),0), dummy, Qt::DisplayRole);
 	tableWidget()->model()->setData(tableWidget()->model()->index(row(),1), dummy, Qt::DisplayRole);
@@ -109,6 +110,72 @@ QString KviFileTransferItem::key(int column,bool bAcending) const
 	return ret;
 }
 
+
+
+KviFileTransferWidget::KviFileTransferWidget(QWidget * pParent)
+: KviTalTableWidget(pParent)
+{
+	//hide the header
+	verticalHeader()->hide();
+	//hide cells grids
+	setShowGrid(false);
+	//disable cell content editing
+	setEditTriggers(QAbstractItemView::NoEditTriggers);
+
+	//select one row at once
+	setSelectionBehavior(QAbstractItemView::SelectRows);
+	setSelectionMode(QAbstractItemView::SingleSelection);
+
+	//prepare columns
+	setColumnCount(3);
+
+	QStringList colHeaders;
+	colHeaders << __tr2qs_ctx("Type","filetransferwindow")
+				<< __tr2qs_ctx("Information","filetransferwindow")
+				<< __tr2qs_ctx("Progress","filetransferwindow");
+	setHorizontalHeaderLabels(colHeaders);
+	horizontalHeader()->setResizeMode(QHeaderView::Interactive);
+
+	//default column widths
+	setColumnWidth(0, 68);
+	horizontalHeader()->setResizeMode(0, QHeaderView::Fixed);
+	horizontalHeader()->setResizeMode(1, QHeaderView::Stretch);
+	horizontalHeader()->setResizeMode(2, QHeaderView::Stretch);
+
+	//focus policy
+	setFocusPolicy(Qt::NoFocus);
+	viewport()->setFocusPolicy(Qt::NoFocus);
+}
+
+void KviFileTransferWidget::mousePressEvent (QMouseEvent *e)
+{
+	if (e->button() == Qt::RightButton)
+	{
+		// we have 3 items: the one on the first column is the real one (has a transfer() member)
+		// others are just fakes
+		QTableWidgetItem *clicked = itemAt(e->pos());
+		if(clicked)
+		{
+			KviFileTransferItem *i = (KviFileTransferItem*) item(clicked->row(),0);
+			if (i) emit rightButtonPressed(i, QCursor::pos());
+		}
+	}
+	QTableWidget::mousePressEvent(e);
+}
+
+void KviFileTransferWidget::mouseDoubleClickEvent (QMouseEvent *e)
+{
+	// we have 3 items: the one on the first column is the real one (has a transfer() member)
+	// others are just fakes
+	QTableWidgetItem *clicked = itemAt(e->pos());
+	if(clicked)
+	{
+		KviFileTransferItem *i = (KviFileTransferItem*) item(clicked->row(),0);
+		if (i) emit doubleClicked(i,QCursor::pos());
+	}
+	QTableWidget::mouseDoubleClickEvent(e);
+}
+
 void KviFileTransferWidget::paintEvent(QPaintEvent * event)
 {
 	QPainter *p = new QPainter(viewport());
@@ -141,8 +208,10 @@ void KviFileTransferItemDelegate::paint(QPainter * p, const QStyleOptionViewItem
 	KviFileTransferWidget* tableWidget = (KviFileTransferWidget*)parent();
 	KviFileTransferItem* item = (KviFileTransferItem*) tableWidget->itemFromIndex(index);
 
+	if(!item) return;
 	KviFileTransfer* transfer = ((KviFileTransferItem*)tableWidget->item(item->row(), 0))->transfer();
 
+
 	p->setFont(option.font);
 
 	p->setPen(option.state & QStyle::State_Selected ? option.palette.highlight().color() : option.palette.base().color());
@@ -188,53 +257,27 @@ KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,Kv
 	m_pSplitter->setObjectName("transferwindow_hsplitter");
 	m_pVertSplitter = new QSplitter(Qt::Vertical,m_pSplitter);
 	m_pVertSplitter->setObjectName("transferwindow_vsplitter");
-	
+
 	m_pTableWidget  = new KviFileTransferWidget(m_pVertSplitter);
 
 	//ad-hoc itemdelegate for this view
 	m_pItemDelegate = new KviFileTransferItemDelegate(m_pTableWidget);
 	m_pTableWidget->setItemDelegate(m_pItemDelegate);
 
-	m_pTableWidget->verticalHeader()->hide();
-	m_pTableWidget->setShowGrid(false);
-
-	m_pTableWidget->setSelectionBehavior(QAbstractItemView::SelectRows);
-	m_pTableWidget->setSelectionMode(QAbstractItemView::SingleSelection);
-
-	m_pTableWidget->setColumnCount(3);
-
-	QStringList colHeaders;
-	colHeaders.append(__tr2qs_ctx("Type","filetransferwindow"));
-	colHeaders.append(__tr2qs_ctx("Information","filetransferwindow"));
-	colHeaders.append(__tr2qs_ctx("Progress","filetransferwindow"));
-	m_pTableWidget->setHorizontalHeaderLabels(colHeaders);
-	m_pTableWidget->horizontalHeader()->setResizeMode(QHeaderView::Interactive);
-	m_pTableWidget->horizontalHeader()->setMinimumSectionSize(50);
-
-	//default column widths
-	m_pTableWidget->setColumnWidth(0, 68);
-	m_pTableWidget->horizontalHeader()->setResizeMode(0, QHeaderView::Fixed);
-	m_pTableWidget->horizontalHeader()->setResizeMode(1, QHeaderView::Stretch);
-	m_pTableWidget->horizontalHeader()->setResizeMode(2, QHeaderView::Stretch);
-
 	KviDynamicToolTip * tp = new KviDynamicToolTip(m_pTableWidget->viewport());
 	//TODO
 	//connect(tp,SIGNAL(tipRequest(KviDynamicToolTip *,const QPoint &)),this,SLOT(tipRequest(KviDynamicToolTip *,const QPoint &)));
 
-	m_pTableWidget->setFocusPolicy(Qt::NoFocus);
-	m_pTableWidget->viewport()->setFocusPolicy(Qt::NoFocus);
-
-	//connect(m_pTableWidget,SIGNAL(rightButtonPressed(KviTalTableWidgetItem *,const QPoint &,int)),
-	// this,SLOT(showHostPopup(KviTalTableWidgetItem *,const QPoint &,int)));
-
 	QFontMetrics fm(font());
 	m_iLineSpacing = fm.lineSpacing();
 
 	m_pIrcView = new KviIrcView(m_pVertSplitter,lpFrm,this);
 
 	m_pTableWidget->installEventFilter(this);
-	connect(m_pTableWidget,SIGNAL(rightButtonPressed(KviTalTableWidgetItem *,const QPoint &,int)),this,SLOT(rightButtonPressed(KviTalTableWidgetItem *,const QPoint &,int)));
-	connect(m_pTableWidget,SIGNAL(doubleClicked(KviTalTableWidgetItem *,const QPoint &,int)),this,SLOT(doubleClicked(KviTalTableWidgetItem *,const QPoint &,int)));
+
+	connect(m_pTableWidget,SIGNAL(rightButtonPressed(KviFileTransferItem *,QPoint)),
+		this,SLOT(rightButtonPressed(KviFileTransferItem *,QPoint)));
+	connect(m_pTableWidget,SIGNAL(doubleClicked(KviFileTransferItem *,const QPoint &)),this,SLOT(doubleClicked(KviFileTransferItem *,const QPoint &)));
 	fillTransferView();
 
 	connect(KviFileTransferManager::instance(),SIGNAL(transferRegistered(KviFileTransfer *)),this,SLOT(transferRegistered(KviFileTransfer *)));
@@ -327,12 +370,12 @@ void KviFileTransferWindow::transferUnregistering(KviFileTransfer * t)
     it = 0;
 }
 
-void KviFileTransferWindow::doubleClicked(KviFileTransferItem *it,const QPoint &pnt,int col)
+void KviFileTransferWindow::doubleClicked(KviFileTransferItem *it,const QPoint &)
 {
 	if(it) openLocalFile();
 }
 
-void KviFileTransferWindow::rightButtonPressed(KviFileTransferItem *it,const QPoint &pnt,int col)
+void KviFileTransferWindow::rightButtonPressed(KviFileTransferItem *it,const QPoint &pnt)
 {
 	if(!m_pContextPopup)m_pContextPopup = new KviTalPopupMenu(this);
 	if(!m_pLocalFilePopup)m_pLocalFilePopup = new KviTalPopupMenu(this);
@@ -437,7 +480,7 @@ void KviFileTransferWindow::rightButtonPressed(KviFileTransferItem *it,const QPo
 
 			}
 
-			i->transfer()->fillContextPopup(m_pContextPopup,col);
+			i->transfer()->fillContextPopup(m_pContextPopup);
 			m_pContextPopup->insertSeparator();
 		}
 	}
diff --git a/src/modules/filetransferwindow/filetransferwindow.h b/src/modules/filetransferwindow/filetransferwindow.h
index a388bec16..a3a3b381f 100644
--- a/src/modules/filetransferwindow/filetransferwindow.h
+++ b/src/modules/filetransferwindow/filetransferwindow.h
@@ -39,16 +39,24 @@
 #include <QTimer>
 #include <QPixmap>
 
+class KviFileTransferItem;
+
 class KviFileTransferWidget : public KviTalTableWidget
 {
 	friend class KviFileTransferItemDelegate;
 	Q_OBJECT
 	Q_PROPERTY(int TransparencyCapable READ dummyRead)
 public:
-	KviFileTransferWidget(QWidget * pParent) : KviTalTableWidget(pParent) {};
+	KviFileTransferWidget(QWidget * pParent);
 	~KviFileTransferWidget() {};
 	void paintEvent(QPaintEvent * event);
 	int dummyRead() const { return 0; };
+protected:
+	void mousePressEvent (QMouseEvent *e);
+	void mouseDoubleClickEvent (QMouseEvent *e);
+signals:
+	void rightButtonPressed(KviFileTransferItem *,QPoint pnt);
+	void doubleClicked(KviFileTransferItem *,QPoint pnt);
 };
 
 class KviFileTransferItem : public KviTalTableWidgetItemEx
@@ -115,8 +123,8 @@ public:
 protected slots:
 	void transferRegistered(KviFileTransfer *t);
 	void transferUnregistering(KviFileTransfer *t);
-	void rightButtonPressed(KviFileTransferItem *it,const QPoint &pnt,int col);
-	void doubleClicked(KviFileTransferItem *it,const QPoint &pnt,int col);
+	void rightButtonPressed(KviFileTransferItem *it,const QPoint &pnt);
+	void doubleClicked(KviFileTransferItem *it,const QPoint &pnt);
 	void heartbeat();
 	void clearTerminated();
 	void clearAll();
diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp
index 619ba185c..2e03ffd1b 100644
--- a/src/modules/http/httpfiletransfer.cpp
+++ b/src/modules/http/httpfiletransfer.cpp
@@ -49,7 +49,7 @@ KviHttpFileTransfer::KviHttpFileTransfer()
 	m_tStartTime = kvi_unixTime();
 	m_tTransferStartTime = 0;
 	m_tTransferEndTime = 0;
-	
+
 	m_bNotifyCompletion = true;
 	m_bAutoClean = false;
 	m_pAutoCleanTimer = 0;
@@ -65,7 +65,7 @@ KviHttpFileTransfer::KviHttpFileTransfer()
 	connect(m_pHttpRequest,SIGNAL(contactingHost(const QString &)),this,SLOT(contactingHost(const QString &)));
 	connect(m_pHttpRequest,SIGNAL(receivedResponse(const QString &)),this,SLOT(receivedResponse(const QString &)));
 	connect(m_pHttpRequest,SIGNAL(connectionEstabilished()),this,SLOT(connectionEstabilished()));
-	
+
 	m_eGeneralStatus = Initializing;
 	m_szStatusString = __tr2qs_ctx("Initializing","http");
 }
@@ -102,7 +102,7 @@ void KviHttpFileTransfer::abort()
 	m_pHttpRequest->abort();
 }
 
-void KviHttpFileTransfer::fillContextPopup(KviTalPopupMenu * m,int column)
+void KviHttpFileTransfer::fillContextPopup(KviTalPopupMenu * m)
 {
 	int id = m->insertItem(__tr2qs_ctx("Abort","http"),this,SLOT(abort()));
 	if(!active())m->setItemEnabled(id,false);
@@ -339,7 +339,7 @@ void KviHttpFileTransfer::init()
 	g_pHttpFileTransfers = new KviPointerList<KviHttpFileTransfer>;
 	g_pHttpFileTransfers->setAutoDelete(false);
 
-	QPixmap * pix = g_pIconManager->getImage("kvi_httpicons.png");
+	QPixmap * pix = g_pIconManager->getImage("kvi_httpicons.png", false);
 	if(pix)g_pHttpIcon = new QPixmap(*pix);
 	else g_pHttpIcon = new QPixmap(192,48);
 }
@@ -434,7 +434,7 @@ void KviHttpFileTransfer::transferTerminated(bool bSuccess)
 	} else {
 		KviKvsScript::run(m_szCompletionCallback,out ? out : (KviWindow *)(g_pApp->activeConsole()),&vParams);
 	}
-	
+
 	if(bSuccess)
 	{
 		m_szStatusString = __tr2qs_ctx("Transfer completed","http");
@@ -451,7 +451,7 @@ void KviHttpFileTransfer::transferTerminated(bool bSuccess)
 		if(out && (!m_bNoOutput))out->output(KVI_OUT_GENERICERROR,__tr2qs_ctx("[HTTP %d]: Transfer failed: %Q","http"),id(),&(m_pHttpRequest->lastError()));
 		g_pApp->fileDownloadTerminated(false,m_pHttpRequest->url().url(),m_pHttpRequest->fileName(),QString::null,m_pHttpRequest->lastError(),!m_bNotifyCompletion);
 	}
-	
+
 	if(m_bAutoClean)
 	{
 		if(m_pAutoCleanTimer)delete m_pAutoCleanTimer;
diff --git a/src/modules/http/httpfiletransfer.h b/src/modules/http/httpfiletransfer.h
index 5216df6fb..85a2b702e 100644
--- a/src/modules/http/httpfiletransfer.h
+++ b/src/modules/http/httpfiletransfer.h
@@ -54,12 +54,12 @@ private:
 	kvi_time_t       m_tStartTime;
 	kvi_time_t       m_tTransferStartTime;
 	kvi_time_t       m_tTransferEndTime;
-	
+
 	KviKvsVariant    m_vMagicIdentifier;
 	bool             m_bNotifyCompletion;
 	bool             m_bAutoClean;
 	bool             m_bNoOutput;
-	
+
 	QTimer         * m_pAutoCleanTimer;
 	QString          m_szCompletionCallback;
 public:
@@ -69,7 +69,7 @@ public:
 	static void done();
 
 	virtual bool startDownload();
-	
+
 	void setCompletionCallback(const QString &szCallback){ m_szCompletionCallback = szCallback; };
 	void setMagicIdentifier(const KviKvsVariant &vIdentifier){ m_vMagicIdentifier = vIdentifier; };
 	void setNotifyCompletion(bool bNotify){ m_bNotifyCompletion = bNotify; };
@@ -78,7 +78,7 @@ public:
 
 	virtual void displayPaint(QPainter * p,int column, QRect rect);
 	virtual int displayHeight(int iLineSpacing);
-	virtual void fillContextPopup(KviTalPopupMenu * m,int column);
+	virtual void fillContextPopup(KviTalPopupMenu * m);
 	virtual bool active();
 	virtual void die();
 	virtual QString tipText();
diff --git a/src/modules/objects/class_ftp.cpp b/src/modules/objects/class_ftp.cpp
index d42178cef..82716c3a2 100644
--- a/src/modules/objects/class_ftp.cpp
+++ b/src/modules/objects/class_ftp.cpp
@@ -167,76 +167,77 @@ bool KviKvsObject_ftp::function_commandFinishedEvent(KviKvsObjectFunctionCall *c
 	return true;
 }
 
-void KviKvsObject_ftp::slotCommandFinished ( int id, bool error )
-{
-	QString status=""; 
-	if (m_pFtp->currentCommand()==QFtp::Get){
-		status="Finished to load"; 
-		m_pFile->close();
-		delete m_pFile;
-	}
-	else if (m_pFtp->currentCommand()==QFtp:: ConnectToHost) status="connected"; 
-	else if (m_pFtp->currentCommand()==QFtp:: Login) status="logged"; 
-	else if (m_pFtp->currentCommand()==QFtp:: Cd) status="entered"; 
-	else if (m_pFtp->currentCommand()==QFtp:: List) status="listCompleted"; 
+void KviKvsObject_ftp::slotCommandFinished ( int id, bool error )
+{
+	QString status=""; 
+	if (m_pFtp->currentCommand()==QFtp::Get){
+		status="Finished to load"; 
+		m_pFile->close();
+		delete m_pFile;
+	}
+	else if (m_pFtp->currentCommand()==QFtp:: ConnectToHost) status="connected"; 
+	else if (m_pFtp->currentCommand()==QFtp:: Login) status="logged"; 
+	else if (m_pFtp->currentCommand()==QFtp:: Cd) status="entered"; 
+	else if (m_pFtp->currentCommand()==QFtp:: List) status="listCompleted"; 
 	callFunction(this,"commandFinishedEvent",0,new KviKvsVariantList(new KviKvsVariant((kvs_int_t) id),
-		new KviKvsVariant(status),new KviKvsVariant(error)));
-}
-
-void KviKvsObject_ftp::slotCommandStarted ( int id )
-{
-}
-
-void KviKvsObject_ftp::slotDataTransferProgress ( qint64 done, qint64 total )
-{
+		new KviKvsVariant(status),new KviKvsVariant(error)));
+}
+
+void KviKvsObject_ftp::slotCommandStarted ( int id )
+{
+}
+
+void KviKvsObject_ftp::slotDataTransferProgress ( qint64 done, qint64 total )
+{
+	//FIXME qint64 to kvs_int_t cast
 	callFunction(this,"dataTransferProgressEvent",0,new KviKvsVariantList(
-		new KviKvsVariant(done),new KviKvsVariant(total)));
-}
+		new KviKvsVariant((kvs_int_t) done),new KviKvsVariant((kvs_int_t) total)));
+}
 bool KviKvsObject_ftp::function_dataTransferProgressEvent(KviKvsObjectFunctionCall *c)
 {
 	emitSignal("dataTransferProgress",c,c->params());
 	return true;
-}
-void KviKvsObject_ftp::slotDone ( bool error )
-{
-}
-
-void KviKvsObject_ftp::slotListInfo ( const QUrlInfo & i )
-{
+}
+void KviKvsObject_ftp::slotDone ( bool error )
+{
+}
+
+void KviKvsObject_ftp::slotListInfo ( const QUrlInfo & i )
+{
 	callFunction(this,"listInfoEvent",0,new KviKvsVariantList(
-		new KviKvsVariant(i.name())));
-	
-}
+		new KviKvsVariant(i.name())));
+	
+}
 bool KviKvsObject_ftp::function_listInfoEvent(KviKvsObjectFunctionCall *c)
 {
 	emitSignal("listInfo",c,c->params());
 	return true;
-}
-void KviKvsObject_ftp::slotRawCommandReply ( int replyCode, const QString & detail )
-{
-}
-
-void KviKvsObject_ftp::slotReadyRead ()
-{
-}
-
-void KviKvsObject_ftp::slotStateChanged ( int state)
-{
-	QString szState="";
-	if (state==QFtp::Unconnected) szState="Unconnected";
-	else if (state==QFtp::HostLookup) szState="HostLookup";
-	else if (state==QFtp::Connecting) szState="Connecting";
-	else if (state==QFtp::Connected) szState="Connected";
-	else if (state==QFtp::LoggedIn) szState="LoggedIn";
-	else if (state==QFtp::Closing) szState="Closing";
+}
+void KviKvsObject_ftp::slotRawCommandReply ( int replyCode, const QString & detail )
+{
+}
+
+void KviKvsObject_ftp::slotReadyRead ()
+{
+}
+
+void KviKvsObject_ftp::slotStateChanged ( int state)
+{
+	QString szState="";
+	if (state==QFtp::Unconnected) szState="Unconnected";
+	else if (state==QFtp::HostLookup) szState="HostLookup";
+	else if (state==QFtp::Connecting) szState="Connecting";
+	else if (state==QFtp::Connected) szState="Connected";
+	else if (state==QFtp::LoggedIn) szState="LoggedIn";
+	else if (state==QFtp::Closing) szState="Closing";
 	callFunction(this,"stateChangedEvent",0,new KviKvsVariantList(
-		new KviKvsVariant(szState)));
-}
+		new KviKvsVariant(szState)));
+}
 bool KviKvsObject_ftp::function_stateChangedEvent(KviKvsObjectFunctionCall *c)
 {
 	emitSignal("stateChanged",c,c->params());
 	return true;
-}
+}
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_class_ftp.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/class_hbox.cpp
index da9b31cdd..a44f703e8 100644
--- a/src/modules/objects/class_hbox.cpp
+++ b/src/modules/objects/class_hbox.cpp
@@ -218,6 +218,6 @@ bool KviKvsObject_hbox::functionsetAlignment(KviKvsObjectFunctionCall *c)
 				c->warning(__tr2qs("Unknown alignment: '%Q'"),&(*it));
 			
 		}
-	if (widget()) ((KviTalHBox *)widget())->setAlignment(((QWidget *)(pObject->object())),(Qt::Alignment)sum);
+	if (widget()) ((KviTalHBox *)widget())->setAlignment((Qt::Alignment)sum);
 	return true;
-}
\ No newline at end of file
+}
diff --git a/src/modules/objects/class_http.h b/src/modules/objects/class_http.h
index 197250117..9430c194d 100644
--- a/src/modules/objects/class_http.h
+++ b/src/modules/objects/class_http.h
@@ -30,6 +30,8 @@
 #include <QHttp>
 #include <QFile>
 #include <QHash>
+#include <QSslError>
+
 class KviKvsObject_http : public KviKvsObject
 {
 	Q_OBJECT
@@ -65,19 +67,19 @@ protected:
 	#endif
 
 protected slots:
-	void slotRequestFinished ( int id, bool error );
-	void slotDone (bool error );
-	void slotRequestStarted ( int id );
-	void slotDataSendProgress ( int done, int total );
-	void slotDataReadProgress ( int done, int total );
+	void slotRequestFinished ( int id, bool error );
+	void slotDone (bool error );
+	void slotRequestStarted ( int id );
+	void slotDataSendProgress ( int done, int total );
+	void slotDataReadProgress ( int done, int total );
 	#ifndef QT_NO_OPENSSL
-	void slotSslErrors(QList<QSslError>);
-#endif
-	void slotResponseHeaderReceived(const QHttpResponseHeader &r);
-	void slotReadyRead(const QHttpResponseHeader &r);
-	void slotStateChanged ( int state);
-
-
+	void slotSslErrors(QList<QSslError>);
+#endif
+	void slotResponseHeaderReceived(const QHttpResponseHeader &r);
+	void slotReadyRead(const QHttpResponseHeader &r);
+	void slotStateChanged ( int state);
+
+
 
 };
 #endif //_CLASS_HTTP_H_
diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp
index a73f6da8b..1107b6d55 100644
--- a/src/modules/objects/class_layout.cpp
+++ b/src/modules/objects/class_layout.cpp
@@ -346,4 +346,4 @@ bool KviKvsObject_layout::functionsetAlignment(KviKvsObjectFunctionCall *c)
 		}
 	if (widget()) ((QGridLayout *)widget())->setAlignment(((QWidget *)(pObject->object())),(Qt::Alignment)sum);
 	return true;
-}
\ No newline at end of file
+}
diff --git a/src/modules/objects/class_vbox.cpp b/src/modules/objects/class_vbox.cpp
index 9a9cc8cc0..8e5d49339 100644
--- a/src/modules/objects/class_vbox.cpp
+++ b/src/modules/objects/class_vbox.cpp
@@ -223,6 +223,6 @@ bool KviKvsObject_vbox::functionsetAlignment(KviKvsObjectFunctionCall *c)
 				c->warning(__tr2qs("Unknown alignment: '%Q'"),&(*it));
 			
 		}
-	if (widget()) ((KviTalHBox *)widget())->setAlignment(((QWidget *)(pObject->object())),(Qt::Alignment)sum);
+	if (widget()) ((KviTalHBox *)widget())->setAlignment((Qt::Alignment)sum);
 	return true;
-}
\ No newline at end of file
+}
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index c09473b49..322336b47 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -728,7 +728,6 @@ bool KviKvsObject_widget::init(KviKvsRunTimeContext * pContext,KviKvsVariantList
 {
 	setObject(new KviKvsWidget(this,parentScriptWidget()));
 	widget()->setObjectName(getName());
-	webview=0;
 	return true;
 }
 
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
index 8c264c2bf..01ee29b42 100644
--- a/src/modules/trayicon/libkvitrayicon.cpp
+++ b/src/modules/trayicon/libkvitrayicon.cpp
@@ -313,7 +313,7 @@ void KviTrayIcon::toggleParentFrame()
 			m_pFrm->showNormal();
 		else
 			m_pFrm->show();
-		m_pFrm->setWindowState(getPrevWindowState() & Qt::WindowMinimized);
+// 		m_pFrm->setWindowState(getPrevWindowState() & Qt::WindowMinimized);
 	}
 }
 
-- 
cgit v1.3.1-10-gc9f91