compilation fixes (objects module)

fixes for filetransferwindow

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

6 files changed, 74 insertions, 72 deletions

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;

 }