-rw-r--r-- | core/applets/obex/.cvsignore | 1 | ||||
-rw-r--r-- | core/applets/obex/obex.cc | 9 | ||||
-rw-r--r-- | core/applets/obex/obex.h | 2 | ||||
-rw-r--r-- | core/applets/obex/obeximpl.cc | 12 |
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 @@ | |||
1 | Makefile | 1 | Makefile |
2 | Makefile.in | ||
2 | moc* | 3 | moc* |
3 | obexdlg.cpp | 4 | 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(){ | |||
97 | 97 | ||
98 | void Obex::slotExited(OProcess* proc ){ | 98 | void Obex::slotExited(OProcess* proc ){ |
99 | if (proc == m_rec ) { // recieve process | 99 | if (proc == m_rec ) { // receive process |
100 | recieved(); | 100 | received(); |
101 | }else if ( proc == m_send ) { | 101 | }else if ( proc == m_send ) { |
102 | sendEnd(); | 102 | sendEnd(); |
@@ -104,5 +104,5 @@ void Obex::slotExited(OProcess* proc ){ | |||
104 | } | 104 | } |
105 | void Obex::slotStdOut(OProcess* proc, char* buf, int len){ | 105 | void Obex::slotStdOut(OProcess* proc, char* buf, int len){ |
106 | if ( proc == m_rec ) { // only recieve | 106 | if ( proc == m_rec ) { // only receive |
107 | QCString cstring( buf, len ); | 107 | QCString cstring( buf, len ); |
108 | m_outp.append( cstring.data() ); | 108 | m_outp.append( cstring.data() ); |
@@ -110,8 +110,9 @@ void Obex::slotStdOut(OProcess* proc, char* buf, int len){ | |||
110 | } | 110 | } |
111 | 111 | ||
112 | void Obex::recieved() { | 112 | void Obex::received() { |
113 | if (m_rec->normalExit() ) { | 113 | if (m_rec->normalExit() ) { |
114 | if ( m_rec->exitStatus() == 0 ) { // we got one | 114 | if ( m_rec->exitStatus() == 0 ) { // we got one |
115 | QString filename = parseOut(); | 115 | QString filename = parseOut(); |
116 | qWarning("ACHTUNG"); | ||
116 | emit receivedFile( filename ); | 117 | emit receivedFile( filename ); |
117 | } | 118 | } |
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: | |||
76 | void sendNow(); | 76 | void sendNow(); |
77 | QString parseOut(); | 77 | QString parseOut(); |
78 | void recieved(); | 78 | void received(); |
79 | void sendEnd(); | 79 | void sendEnd(); |
80 | 80 | ||
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( ) | |||
29 | this, SLOT(slotReceivedFile(const QString& ) ) ); | 29 | this, SLOT(slotReceivedFile(const QString& ) ) ); |
30 | } | 30 | } |
31 | |||
31 | ObexImpl::~ObexImpl() { | 32 | ObexImpl::~ObexImpl() { |
32 | delete m_obex; | 33 | delete m_obex; |
@@ -34,4 +35,5 @@ ObexImpl::~ObexImpl() { | |||
34 | delete m_sendgui; | 35 | delete m_sendgui; |
35 | } | 36 | } |
37 | |||
36 | QRESULT ObexImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) { | 38 | QRESULT ObexImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) { |
37 | *iface = 0; | 39 | *iface = 0; |
@@ -45,6 +47,6 @@ QRESULT ObexImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | |||
45 | (*iface)->addRef(); | 47 | (*iface)->addRef(); |
46 | return QS_OK; | 48 | return QS_OK; |
47 | |||
48 | } | 49 | } |
50 | |||
49 | void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) { | 51 | void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) { |
50 | QDataStream stream( data, IO_ReadOnly ); | 52 | QDataStream stream( data, IO_ReadOnly ); |
@@ -65,5 +67,5 @@ void ObexImpl::slotMessage( const QCString& msg, const QByteArray&data ) { | |||
65 | SLOT( slotSent() ) ); | 67 | SLOT( slotSent() ) ); |
66 | }else if(msg == "receive(int)" ) { // open a GUI | 68 | }else if(msg == "receive(int)" ) { // open a GUI |
67 | m_recvgui->showMaximized(); | 69 | //m_recvgui->showMaximized(); |
68 | int receiveD = 0; | 70 | int receiveD = 0; |
69 | stream >> receiveD; | 71 | stream >> receiveD; |
@@ -106,4 +108,5 @@ void ObexImpl::slotError( int errorCode) { | |||
106 | m_sendgui->hide(); | 108 | m_sendgui->hide(); |
107 | } | 109 | } |
110 | |||
108 | // Received a file via beam | 111 | // Received a file via beam |
109 | // check for mime type and then either | 112 | // check for mime type and then either |
@@ -122,4 +125,9 @@ void ObexImpl::slotReceivedFile( const QString &fileName ) { | |||
122 | } | 125 | } |
123 | } // now prompt and then add it | 126 | } // now prompt and then add it |
127 | |||
128 | m_recvgui->PixmapLabel->setPixmap(lnk.pixmap()); | ||
129 | m_recvgui->TextLabel1_2->setText(lnk.name()); | ||
130 | m_recvgui->showMaximized(); | ||
131 | |||
124 | QCString str= "QPE/Application/"; | 132 | QCString str= "QPE/Application/"; |
125 | str += exec.latin1(); | 133 | str += exec.latin1(); |