summaryrefslogtreecommitdiff
authorjosef <josef>2002-10-14 18:28:19 (UTC)
committer josef <josef>2002-10-14 18:28:19 (UTC)
commit5ada62902971fa9ac34e831259442535299f7ef6 (patch) (side-by-side diff)
tree445974a3569d35267cb7542aefd5235ff14536dd
parente789f01a4fc6ada39809d40f8c44a6f6deec7785 (diff)
downloadopie-5ada62902971fa9ac34e831259442535299f7ef6.zip
opie-5ada62902971fa9ac34e831259442535299f7ef6.tar.gz
opie-5ada62902971fa9ac34e831259442535299f7ef6.tar.bz2
- add modem layer so dialer can be used within Connect
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/default.cpp5
-rw-r--r--noncore/apps/opie-console/dialer.cpp3
-rw-r--r--noncore/apps/opie-console/dialer.h2
-rw-r--r--noncore/apps/opie-console/io_modem.cpp8
4 files changed, 13 insertions, 5 deletions
diff --git a/noncore/apps/opie-console/default.cpp b/noncore/apps/opie-console/default.cpp
index ce5c870..5c1c05a 100644
--- a/noncore/apps/opie-console/default.cpp
+++ b/noncore/apps/opie-console/default.cpp
@@ -3,2 +3,3 @@
#include "io_bt.h"
+#include "io_modem.h"
#include "filetransfer.h"
@@ -47,2 +48,5 @@ extern "C" {
}
+ IOLayer* newModemLayer( const Profile& prof ) {
+ return new IOModem( prof );
+ }
@@ -87,2 +91,3 @@ Default::Default( MetaFactory* fact ) {
fact->addIOLayerFactory( "bt", QObject::tr("Bluetooth"), newBTLayer );
+ fact->addIOLayerFactory( "modem", QObject::tr("Modem"), newModemLayer );
diff --git a/noncore/apps/opie-console/dialer.cpp b/noncore/apps/opie-console/dialer.cpp
index d20965a..90e2b6c 100644
--- a/noncore/apps/opie-console/dialer.cpp
+++ b/noncore/apps/opie-console/dialer.cpp
@@ -47,3 +47,3 @@
Dialer::Dialer(const Profile& profile, QWidget *parent, const char *name)
-: QDialog(parent, name, true)
+: QDialog(parent, name, true), m_profile(profile)
{
@@ -53,3 +53,2 @@ Dialer::Dialer(const Profile& profile, QWidget *parent, const char *name)
usercancel = 0;
- m_profile = profile;
diff --git a/noncore/apps/opie-console/dialer.h b/noncore/apps/opie-console/dialer.h
index 8c83bb6..09cc5ca 100644
--- a/noncore/apps/opie-console/dialer.h
+++ b/noncore/apps/opie-console/dialer.h
@@ -46,3 +46,3 @@ class Dialer : public QDialog
int usercancel;
- Profile m_profile;
+ const Profile& m_profile;
};
diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp
index 56147d8..28d1722 100644
--- a/noncore/apps/opie-console/io_modem.cpp
+++ b/noncore/apps/opie-console/io_modem.cpp
@@ -22,6 +22,10 @@ void IOModem::close() {
bool IOModem::open() {
- qWarning("IOModem::open");
- IOSerial::open();
+ bool ret = IOSerial::open();
+ if(!ret) return false;
+
+ qWarning("IOModem::open continues...");
Dialer d(m_profile);
+ qWarning("dialer created");
+
int result = d.exec();