summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-06-14 10:30:25 (UTC)
committer harlekin <harlekin>2002-06-14 10:30:25 (UTC)
commita014866573fc86bf63544d1f692ccdd94c0d104f (patch) (side-by-side diff)
tree26c91e69d84aed959b8163bb853966f67041063b
parentcf54bc85d0e9846d64ca2a2af55fffc3d4e2f4ad (diff)
downloadopie-a014866573fc86bf63544d1f692ccdd94c0d104f.zip
opie-a014866573fc86bf63544d1f692ccdd94c0d104f.tar.gz
opie-a014866573fc86bf63544d1f692ccdd94c0d104f.tar.bz2
fixed type and getting closer to finish
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/obex/.cvsignore1
-rw-r--r--core/applets/obex/obex.cc9
-rw-r--r--core/applets/obex/obex.h2
-rw-r--r--core/applets/obex/obeximpl.cc12
4 files changed, 17 insertions, 7 deletions
diff --git a/core/applets/obex/.cvsignore b/core/applets/obex/.cvsignore
index c7899af..8fde018 100644
--- a/core/applets/obex/.cvsignore
+++ b/core/applets/obex/.cvsignore
@@ -1,4 +1,5 @@
Makefile
+Makefile.in
moc*
obexdlg.cpp
obexdlg.h
diff --git a/core/applets/obex/obex.cc b/core/applets/obex/obex.cc
index fc0be3b..43041f5 100644
--- a/core/applets/obex/obex.cc
+++ b/core/applets/obex/obex.cc
@@ -96,23 +96,24 @@ void Obex::sendNow(){
}
void Obex::slotExited(OProcess* proc ){
- if (proc == m_rec ) { // recieve process
- recieved();
+ if (proc == m_rec ) { // receive process
+ received();
}else if ( proc == m_send ) {
sendEnd();
}
}
void Obex::slotStdOut(OProcess* proc, char* buf, int len){
- if ( proc == m_rec ) { // only recieve
+ if ( proc == m_rec ) { // only receive
QCString cstring( buf, len );
m_outp.append( cstring.data() );
}
}
-void Obex::recieved() {
+void Obex::received() {
if (m_rec->normalExit() ) {
if ( m_rec->exitStatus() == 0 ) { // we got one
QString filename = parseOut();
+ qWarning("ACHTUNG");
emit receivedFile( filename );
}
}else{
diff --git a/core/applets/obex/obex.h b/core/applets/obex/obex.h
index 2ce44f2..781fca2 100644
--- a/core/applets/obex/obex.h
+++ b/core/applets/obex/obex.h
@@ -75,7 +75,7 @@ private slots:
private:
void sendNow();
QString parseOut();
- void recieved();
+ void received();
void sendEnd();
};
diff --git a/core/applets/obex/obeximpl.cc b/core/applets/obex/obeximpl.cc
index 1a1c922..7df933a 100644
--- a/core/applets/obex/obeximpl.cc
+++ b/core/applets/obex/obeximpl.cc
@@ -28,11 +28,13 @@ ObexImpl::ObexImpl( )
connect(m_obex, SIGNAL(receivedFile(const QString& ) ),
this, SLOT(slotReceivedFile(const QString& ) ) );
}
+
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 )
@@ -44,8 +46,8 @@ QRESULT ObexImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
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() );
@@ -64,7 +66,7 @@ void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) {
connect( (QObject*)m_obex, SIGNAL( error(int) ), this,
SLOT( slotSent() ) );
}else if(msg == "receive(int)" ) { // open a GUI
- m_recvgui->showMaximized();
+ //m_recvgui->showMaximized();
int receiveD = 0;
stream >> receiveD;
if ( receiveD == 1)
@@ -105,6 +107,7 @@ void ObexImpl::slotError( int errorCode) {
qDebug("Error: " + errorString);
m_sendgui->hide();
}
+
// Received a file via beam
// check for mime type and then either
// add to App via setDocument
@@ -121,6 +124,11 @@ void ObexImpl::slotReceivedFile( const QString &fileName ) {
exec = "datebook";
}
} // now prompt and then add it
+
+ m_recvgui->PixmapLabel->setPixmap(lnk.pixmap());
+ m_recvgui->TextLabel1_2->setText(lnk.name());
+ m_recvgui->showMaximized();
+
QCString str= "QPE/Application/";
str += exec.latin1();
qWarning("channel %s", str.data() );