-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 8 | ||||
-rw-r--r-- | noncore/apps/advancedfm/output.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_bt.cpp | 3 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_irda.cpp | 3 | ||||
-rw-r--r-- | noncore/apps/opie-console/sz_transfer.cpp | 4 |
5 files changed, 10 insertions, 12 deletions
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index a694b70..6d41ac3 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp | |||
@@ -29,14 +29,14 @@ | |||
29 | #include <sys/stat.h> | 29 | #include <sys/stat.h> |
30 | #include <dirent.h> | 30 | #include <dirent.h> |
31 | #include <sys/sendfile.h> | 31 | #include <sys/sendfile.h> |
32 | #include <fcntl.h> | 32 | #include <fcntl.h> |
33 | 33 | ||
34 | 34 | ||
35 | using namespace Opie::Core; | 35 | using namespace Opie::Core; |
36 | using namespace Opie::Core; | 36 | using namespace Opie::Core; |
37 | void AdvancedFm::doDirChange() { | 37 | void AdvancedFm::doDirChange() { |
38 | QString pathItem = CurrentView()->currentItem()->text(0); | 38 | QString pathItem = CurrentView()->currentItem()->text(0); |
39 | if( pathItem == "../") { | 39 | if( pathItem == "../") { |
40 | ListClicked( CurrentView()->currentItem()); | 40 | ListClicked( CurrentView()->currentItem()); |
41 | } else { | 41 | } else { |
42 | if( pathItem.find(" -> ",0,TRUE) != -1) | 42 | if( pathItem.find(" -> ",0,TRUE) != -1) |
@@ -702,16 +702,16 @@ void AdvancedFm::selectAll() { | |||
702 | 702 | ||
703 | void AdvancedFm::startProcess(const QString & cmd) { | 703 | void AdvancedFm::startProcess(const QString & cmd) { |
704 | QStringList command; | 704 | QStringList command; |
705 | OProcess *process; | 705 | OProcess *process; |
706 | process = new OProcess(); | 706 | process = new OProcess(); |
707 | connect(process, SIGNAL(processExited(Opie::Core::OProcess*)), | 707 | connect(process, SIGNAL(processExited(Opie::Core::OProcess*)), |
708 | this, SLOT( processEnded(OProcess*))); | 708 | this, SLOT( processEnded(Opie::Core::OProcess*))); |
709 | 709 | ||
710 | connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)), | 710 | connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)), |
711 | this, SLOT( oprocessStderr(OProcess*,char*,int))); | 711 | this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int))); |
712 | 712 | ||
713 | command << "/bin/sh"; | 713 | command << "/bin/sh"; |
714 | command << "-c"; | 714 | command << "-c"; |
715 | command << cmd.latin1(); | 715 | command << cmd.latin1(); |
716 | *process << command; | 716 | *process << command; |
717 | if(!process->start(OProcess::NotifyOnExit, OProcess::All) ) | 717 | if(!process->start(OProcess::NotifyOnExit, OProcess::All) ) |
diff --git a/noncore/apps/advancedfm/output.cpp b/noncore/apps/advancedfm/output.cpp index 16a0992..6906298 100644 --- a/noncore/apps/advancedfm/output.cpp +++ b/noncore/apps/advancedfm/output.cpp | |||
@@ -144,16 +144,16 @@ Output::Output( const QStringList commands, QWidget* parent, const char* name, | |||
144 | proc = new OProcess(); | 144 | proc = new OProcess(); |
145 | 145 | ||
146 | connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)), | 146 | connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)), |
147 | this, SLOT( processFinished())); | 147 | this, SLOT( processFinished())); |
148 | 148 | ||
149 | connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), | 149 | connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), |
150 | this, SLOT(commandStdout(OProcess*,char*,int))); | 150 | this, SLOT(commandStdout(Opie::Core::OProcess*,char*,int))); |
151 | 151 | ||
152 | connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), | 152 | connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), |
153 | this, SLOT(commandStderr(OProcess*,char*,int))); | 153 | this, SLOT(commandStderr(Opie::Core::OProcess*,char*,int))); |
154 | 154 | ||
155 | // connect( , SIGNAL(received(const QByteArray&)), | 155 | // connect( , SIGNAL(received(const QByteArray&)), |
156 | // this, SLOT(commandStdin(const QByteArray&))); | 156 | // this, SLOT(commandStdin(const QByteArray&))); |
157 | 157 | ||
158 | // * proc << commands.latin1(); | 158 | // * proc << commands.latin1(); |
159 | for ( QStringList::Iterator it = cmmds.begin(); it != cmmds.end(); ++it ) { | 159 | for ( QStringList::Iterator it = cmmds.begin(); it != cmmds.end(); ++it ) { |
diff --git a/noncore/apps/opie-console/io_bt.cpp b/noncore/apps/opie-console/io_bt.cpp index 35a328f..a29fa8e 100644 --- a/noncore/apps/opie-console/io_bt.cpp +++ b/noncore/apps/opie-console/io_bt.cpp | |||
@@ -1,11 +1,10 @@ | |||
1 | 1 | ||
2 | #include "io_bt.h" | 2 | #include "io_bt.h" |
3 | 3 | ||
4 | using namespace Opie::Core; | 4 | using namespace Opie::Core; |
5 | using namespace Opie::Core; | ||
6 | IOBt::IOBt( const Profile &config ) : IOSerial( config ) { | 5 | IOBt::IOBt( const Profile &config ) : IOSerial( config ) { |
7 | m_attach = 0; | 6 | m_attach = 0; |
8 | } | 7 | } |
9 | 8 | ||
10 | 9 | ||
11 | IOBt::~IOBt() { | 10 | IOBt::~IOBt() { |
@@ -36,13 +35,13 @@ bool IOBt::open() { | |||
36 | m_attach = new OProcess(); | 35 | m_attach = new OProcess(); |
37 | *m_attach << "hciattach /dev/ttyS2 any 57600"; | 36 | *m_attach << "hciattach /dev/ttyS2 any 57600"; |
38 | 37 | ||
39 | // then start hcid, then rcfomm handling (m_mac) | 38 | // then start hcid, then rcfomm handling (m_mac) |
40 | 39 | ||
41 | connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ), | 40 | connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ), |
42 | this, SLOT( slotExited(OProcess*) ) ); | 41 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); |
43 | 42 | ||
44 | if ( m_attach->start() ) { | 43 | if ( m_attach->start() ) { |
45 | ret = IOSerial::open(); | 44 | ret = IOSerial::open(); |
46 | } else { | 45 | } else { |
47 | qWarning("could not attach to device"); | 46 | qWarning("could not attach to device"); |
48 | delete m_attach; | 47 | delete m_attach; |
diff --git a/noncore/apps/opie-console/io_irda.cpp b/noncore/apps/opie-console/io_irda.cpp index ba0b0e5..07c2b62 100644 --- a/noncore/apps/opie-console/io_irda.cpp +++ b/noncore/apps/opie-console/io_irda.cpp | |||
@@ -1,11 +1,10 @@ | |||
1 | 1 | ||
2 | #include "io_irda.h" | 2 | #include "io_irda.h" |
3 | 3 | ||
4 | using namespace Opie::Core; | 4 | using namespace Opie::Core; |
5 | using namespace Opie::Core; | ||
6 | IOIrda::IOIrda( const Profile &config ) : IOSerial( config ) { | 5 | IOIrda::IOIrda( const Profile &config ) : IOSerial( config ) { |
7 | m_attach = 0; | 6 | m_attach = 0; |
8 | } | 7 | } |
9 | 8 | ||
10 | 9 | ||
11 | IOIrda::~IOIrda() { | 10 | IOIrda::~IOIrda() { |
@@ -27,13 +26,13 @@ bool IOIrda::open() { | |||
27 | 26 | ||
28 | // irdaattach here | 27 | // irdaattach here |
29 | m_attach = new OProcess(); | 28 | m_attach = new OProcess(); |
30 | *m_attach << "irattach /dev/ttyS2 -s"; | 29 | *m_attach << "irattach /dev/ttyS2 -s"; |
31 | 30 | ||
32 | connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ), | 31 | connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ), |
33 | this, SLOT( slotExited(OProcess*) ) ); | 32 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); |
34 | 33 | ||
35 | if ( m_attach->start() ) { | 34 | if ( m_attach->start() ) { |
36 | ret= IOSerial::open(); | 35 | ret= IOSerial::open(); |
37 | } else { | 36 | } else { |
38 | // emit error!!! | 37 | // emit error!!! |
39 | qWarning("could not attach to device"); | 38 | qWarning("could not attach to device"); |
diff --git a/noncore/apps/opie-console/sz_transfer.cpp b/noncore/apps/opie-console/sz_transfer.cpp index 5958e93..fbc5306 100644 --- a/noncore/apps/opie-console/sz_transfer.cpp +++ b/noncore/apps/opie-console/sz_transfer.cpp | |||
@@ -27,15 +27,15 @@ void SzTransfer::sendFile(const QString& file) { | |||
27 | proc = new OProcess; | 27 | proc = new OProcess; |
28 | *proc << "sz"; | 28 | *proc << "sz"; |
29 | *proc << "-v" << "-v" << "-b" << file; | 29 | *proc << "-v" << "-v" << "-b" << file; |
30 | connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)), | 30 | connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)), |
31 | this, SLOT(sent())); | 31 | this, SLOT(sent())); |
32 | connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), | 32 | connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), |
33 | this, SLOT(SzReceivedStdout(OProcess*,char*,int))); | 33 | this, SLOT(SzReceivedStdout(Opie::Core::OProcess*,char*,int))); |
34 | connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), | 34 | connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), |
35 | this, SLOT(SzReceivedStderr(OProcess*,char*,int))); | 35 | this, SLOT(SzReceivedStderr(Opie::Core::OProcess*,char*,int))); |
36 | connect(layer(), SIGNAL(received(const QByteArray&)), | 36 | connect(layer(), SIGNAL(received(const QByteArray&)), |
37 | this, SLOT(receivedStdin(const QByteArray&))); | 37 | this, SLOT(receivedStdin(const QByteArray&))); |
38 | proc->start(OProcess::NotifyOnExit, OProcess::All); | 38 | proc->start(OProcess::NotifyOnExit, OProcess::All); |
39 | 39 | ||
40 | } | 40 | } |
41 | 41 | ||