summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-06-13 14:26:28 (UTC)
committer harlekin <harlekin>2002-06-13 14:26:28 (UTC)
commitd3cf2ac6fb114cbabc5de481ea275b30f396d2a1 (patch) (side-by-side diff)
treeccf688ce67698cb23e0cb9d08512de1883cac9bf
parent6780e595e7c2cfebc9e7c095947ce6e963060a79 (diff)
downloadopie-d3cf2ac6fb114cbabc5de481ea275b30f396d2a1.zip
opie-d3cf2ac6fb114cbabc5de481ea275b30f396d2a1.tar.gz
opie-d3cf2ac6fb114cbabc5de481ea275b30f396d2a1.tar.bz2
update
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/obex/obeximpl.cc12
-rw-r--r--core/applets/obex/obeximpl.h4
2 files changed, 14 insertions, 2 deletions
diff --git a/core/applets/obex/obeximpl.cc b/core/applets/obex/obeximpl.cc
index 92197ad..856f100 100644
--- a/core/applets/obex/obeximpl.cc
+++ b/core/applets/obex/obeximpl.cc
@@ -1,88 +1,100 @@
#include <qdatastream.h>
+#include <qmessagebox.h>
+
#include <qpe/qcom.h>
#include <qlabel.h>
#include "obex.h"
#include "obeximpl.h"
using namespace OpieObex;
ObexImpl::ObexImpl( )
: QObject() {
// register to a channel
qWarning( "c'tor" );
m_obex = new Obex(this, "obex");
m_sendgui = new ObexDlg();
m_recvgui = new ObexInc();
m_chan = new QCopChannel("QPE/Obex" );
connect(m_chan, SIGNAL(received(const QCString&, const QByteArray& ) ),
this, SLOT(slotMessage(const QCString&, const QByteArray&) ) );
}
ObexImpl::~ObexImpl() {
delete m_obex;
delete m_chan;
delete m_sendgui;
}
QRESULT ObexImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) {
*iface = 0;
if( uuid == IID_QUnknown )
*iface = this;
else if( uuid == IID_ObexInterface )
*iface = this;
qWarning("query" );
if(*iface )
(*iface)->addRef();
return QS_OK;
}
void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) {
QDataStream stream( data, IO_ReadOnly );
qWarning("Message %s", msg.data() );
if(msg == "send(QString,QString,QString)" ) {
QString desc;
stream >> desc;
QString filename;
stream >> filename;
m_sendgui->showMaximized();
m_sendgui->lblPath->setText(filename);
connect( (QObject*)m_sendgui->PushButton2, SIGNAL(clicked()),
this, SLOT(slotCancelSend()));
m_obex->send(filename );
connect( (QObject*)m_obex, SIGNAL( sent() ), this,
SLOT( slotSent() ) );
}else if(msg == "receive(bool)" ) { // open a GUI
m_recvgui->showMaximized();
m_obex->receive();
} else if (msg =="done(QString)") {
QString text;
stream >> text;
m_sendgui->lblPath->setText(tr("Done transfering " + text));
}
}
void ObexImpl::slotCancelSend() {
// cancel sync process too
//m_obex->cancel(); // not ready yet
m_sendgui->hide();
}
void ObexImpl::slotDone(bool) {
QCopEnvelope e ("QPE/Obex", "done(QString)" ); //but this into a slot
e << "Done!";
}
void ObexImpl::slotSent() {
m_sendgui->lblPath->setText("Done!");
m_sendgui->hide();
}
+void ObexImpl::slotError( int errorCode) {
+
+ QString errorString = "";
+ if (errorCode = -1) {
+ errorString = "test";
+ }
+ qDebug("Error: " + errorString);
+ m_sendgui->hide();
+}
+
Q_EXPORT_INTERFACE()
{
Q_CREATE_INSTANCE( ObexImpl )
}
diff --git a/core/applets/obex/obeximpl.h b/core/applets/obex/obeximpl.h
index 1a8fe99..4e5109f 100644
--- a/core/applets/obex/obeximpl.h
+++ b/core/applets/obex/obeximpl.h
@@ -1,36 +1,36 @@
#ifndef OpieObexImpl_H
#define OpieObexImpl_H
#include <qobject.h>
#include "../obexinterface.h"
#include "obexdlg.h"
#include "obexinc.h"
#include <qpe/qcopenvelope_qws.h>
namespace OpieObex {
class Obex;
class ObexImpl : public QObject, public ObexInterface {
Q_OBJECT
public:
ObexImpl();
virtual ~ObexImpl();
QRESULT queryInterface( const QUuid&, QUnknownInterface** );
Q_REFCOUNT // for reference counting (macro )
private:
ulong ref;
Obex* m_obex; // obex lib
QCopChannel *m_chan;
ObexDlg *m_sendgui;
ObexInc *m_recvgui;
private slots:
void slotCancelSend();
void slotMessage( const QCString&, const QByteArray& );
- /* void slotError(int );
- void slotCurrentTry( unsigned int ); */
+ void slotError(int );
+ // void slotCurrentTry( unsigned int ); */
void slotDone(bool);
//void slotReceivedFile(const QString & );
void slotSent();
};
};
#endif