summaryrefslogtreecommitdiff
Side-by-side diff
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,3 +1,4 @@
Makefile
+Makefile.in
moc*
obexdlg.cpp
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
@@ -97,6 +97,6 @@ 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();
@@ -104,5 +104,5 @@ void Obex::slotExited(OProcess* proc ){
}
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() );
@@ -110,8 +110,9 @@ void Obex::slotStdOut(OProcess* proc, char* buf, int len){
}
-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 );
}
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
@@ -76,5 +76,5 @@ private slots:
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
@@ -29,4 +29,5 @@ ObexImpl::ObexImpl( )
this, SLOT(slotReceivedFile(const QString& ) ) );
}
+
ObexImpl::~ObexImpl() {
delete m_obex;
@@ -34,4 +35,5 @@ ObexImpl::~ObexImpl() {
delete m_sendgui;
}
+
QRESULT ObexImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) {
*iface = 0;
@@ -45,6 +47,6 @@ QRESULT ObexImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
(*iface)->addRef();
return QS_OK;
-
}
+
void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) {
QDataStream stream( data, IO_ReadOnly );
@@ -65,5 +67,5 @@ void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) {
SLOT( slotSent() ) );
}else if(msg == "receive(int)" ) { // open a GUI
- m_recvgui->showMaximized();
+ //m_recvgui->showMaximized();
int receiveD = 0;
stream >> receiveD;
@@ -106,4 +108,5 @@ void ObexImpl::slotError( int errorCode) {
m_sendgui->hide();
}
+
// Received a file via beam
// check for mime type and then either
@@ -122,4 +125,9 @@ void ObexImpl::slotReceivedFile( const QString &fileName ) {
}
} // 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();