author | korovkin <korovkin> | 2006-10-24 20:39:01 (UTC) |
---|---|---|
committer | korovkin <korovkin> | 2006-10-24 20:39:01 (UTC) |
commit | b742daec72bbef07039b785dcadca9dca9a0dc1c (patch) (side-by-side diff) | |
tree | 9aa359723443aab322dedd95110858718287784b /core/obex/obex.cpp | |
parent | 687aa5f6bd15190461d4460779d1913e7bd0db55 (diff) | |
download | opie-b742daec72bbef07039b785dcadca9dca9a0dc1c.zip opie-b742daec72bbef07039b785dcadca9dca9a0dc1c.tar.gz opie-b742daec72bbef07039b785dcadca9dca9a0dc1c.tar.bz2 |
IR OBEX is handled by OPIE OBEX functions, not by external utility.
-rw-r--r-- | core/obex/obex.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/obex/obex.cpp b/core/obex/obex.cpp index 95c561a..e4a3c31 100644 --- a/core/obex/obex.cpp +++ b/core/obex/obex.cpp @@ -12,98 +12,97 @@ .i_,=:_. -<s. This library is distributed in the hope that + . -:. = it will be useful, but WITHOUT ANY WARRANTY; : .. .:, . . . without even the implied warranty of =_ + =;=| MERCHANTABILITY or FITNESS FOR A _.=:. : :=>: PARTICULAR PURPOSE. See the GNU ..}^=.= = ; Library General Public License for more ++= -. . .: details. : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-= this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* * The Infrared OBEX handling class implementation */ #include "obex.h" /* OPIE */ #include <opie2/oprocess.h> #include <opie2/odebug.h> /* QT */ #include <qfileinfo.h> using namespace OpieObex; using namespace Opie::Core; /* TRANSLATOR OpieObex::Obex */ Obex::Obex( QObject *parent, const char* name ) : ObexBase(parent, name ) { m_rec = 0; m_send=0; }; Obex::~Obex() { delete m_rec; delete m_send; } void Obex::receive() { ObexBase::receive(); - m_rec = new OProcess(); - *m_rec << "irobex_palm3"; + m_rec = new ObexServer(OBEX_TRANS_IRDA); // connect to the necessary slots connect(m_rec, SIGNAL(processExited(Opie::Core::OProcess*) ), this, SLOT(slotExited(Opie::Core::OProcess*) ) ); connect(m_rec, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), this, SLOT(slotStdOut(Opie::Core::OProcess*, char*, int) ) ); if(!m_rec->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { emit done( false ); delete m_rec; m_rec = 0; } } // if currently receiving stop it send receive void Obex::send(const QString& fileName, const QString& addr) { ObexBase::send(fileName, addr); if (m_rec != 0 ) { if (m_rec->isRunning() ) { emit error(-1 ); delete m_rec; m_rec = 0; }else{ emit error( -1 ); // we did not delete yet but it's not running slotExited is pending return; } } sendNow(); } void Obex::sendNow(){ if ( m_count >= 25 ) { // could not send emit error(-1 ); emit sent(false); return; } // OProcess inititialisation m_send = new OProcess(); m_send->setWorkingDirectory( QFileInfo(m_file).dirPath(true) ); *m_send << "irobex_palm3"; *m_send << QFile::encodeName(QFileInfo(m_file).fileName()); // connect to slots Exited and and StdOut connect(m_send, SIGNAL(processExited(Opie::Core::OProcess*) ), this, SLOT(slotExited(Opie::Core::OProcess*)) ); connect(m_send, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int )), this, SLOT(slotStdOut(Opie::Core::OProcess*, char*, int) ) ); |