Diffstat (limited to 'noncore/apps/opie-console/session.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-console/session.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/noncore/apps/opie-console/session.cpp b/noncore/apps/opie-console/session.cpp index 42b0583..ff2c3e2 100644 --- a/noncore/apps/opie-console/session.cpp +++ b/noncore/apps/opie-console/session.cpp | |||
@@ -1,81 +1,81 @@ | |||
1 | 1 | ||
2 | 2 | ||
3 | #include "io_layer.h" | 3 | #include "io_layer.h" |
4 | #include "file_layer.h" | 4 | #include "file_layer.h" |
5 | #include "widget.h" | 5 | #include "widget_layer.h" |
6 | #include "emulation_layer.h" | 6 | #include "emulation_layer.h" |
7 | #include "session.h" | 7 | #include "session.h" |
8 | 8 | ||
9 | 9 | ||
10 | Session::Session() { | 10 | Session::Session() { |
11 | m_widget = 0l; | 11 | m_widget = 0l; |
12 | m_layer = 0l; | 12 | m_layer = 0l; |
13 | m_widLay = 0l; | 13 | m_widLay = 0l; |
14 | m_emLay = 0l; | 14 | m_emLay = 0l; |
15 | } | 15 | } |
16 | Session::Session( const QString& na, QWidgetStack* widget, IOLayer* lay) | 16 | Session::Session( const QString& na, QWidgetStack* widget, IOLayer* lay) |
17 | : m_name( na ), m_widget( widget ), m_layer( lay ) | 17 | : m_name( na ), m_widget( widget ), m_layer( lay ) |
18 | { | 18 | { |
19 | m_widLay = 0l; | 19 | m_widLay = 0l; |
20 | m_emLay = 0l; | 20 | m_emLay = 0l; |
21 | } | 21 | } |
22 | Session::~Session() { | 22 | Session::~Session() { |
23 | delete m_layer; | 23 | delete m_layer; |
24 | delete m_emLay; | 24 | delete m_emLay; |
25 | delete m_widget; | 25 | delete m_widget; |
26 | /* the widget layer should be deleted by the m_widget */ | 26 | /* the widget layer should be deleted by the m_widget */ |
27 | } | 27 | } |
28 | QString Session::name()const { | 28 | QString Session::name()const { |
29 | return m_name; | 29 | return m_name; |
30 | } | 30 | } |
31 | QWidgetStack* Session::widgetStack() { | 31 | QWidgetStack* Session::widgetStack() { |
32 | return m_widget; | 32 | return m_widget; |
33 | } | 33 | } |
34 | IOLayer* Session::layer() { | 34 | IOLayer* Session::layer() { |
35 | return m_layer; | 35 | return m_layer; |
36 | } | 36 | } |
37 | EmulationLayer* Session::emulationLayer() { | 37 | EmulationLayer* Session::emulationLayer() { |
38 | return m_emLay; | 38 | return m_emLay; |
39 | } | 39 | } |
40 | Widget* Session::emulationWidget() { | 40 | WidgetLayer* Session::emulationWidget() { |
41 | return m_widLay; | 41 | return m_widLay; |
42 | } | 42 | } |
43 | void Session::connect() { | 43 | void Session::connect() { |
44 | if ( !m_layer || !m_emLay ) | 44 | if ( !m_layer || !m_emLay ) |
45 | return; | 45 | return; |
46 | 46 | ||
47 | QObject::connect(m_layer, SIGNAL(received(const QByteArray&) ), | 47 | QObject::connect(m_layer, SIGNAL(received(const QByteArray&) ), |
48 | m_emLay, SLOT(onRcvBlock(const QByteArray&) ) ); | 48 | m_emLay, SLOT(onRcvBlock(const QByteArray&) ) ); |
49 | QObject::connect(m_emLay, SIGNAL(sndBlock(const QByteArray&) ), | 49 | QObject::connect(m_emLay, SIGNAL(sndBlock(const QByteArray&) ), |
50 | m_layer, SLOT(send(const QByteArray&) ) ); | 50 | m_layer, SLOT(send(const QByteArray&) ) ); |
51 | } | 51 | } |
52 | void Session::disconnect() { | 52 | void Session::disconnect() { |
53 | if ( !m_layer || !m_emLay ) | 53 | if ( !m_layer || !m_emLay ) |
54 | return; | 54 | return; |
55 | 55 | ||
56 | QObject::disconnect(m_layer, SIGNAL(received(const QByteArray&) ), | 56 | QObject::disconnect(m_layer, SIGNAL(received(const QByteArray&) ), |
57 | m_emLay, SLOT(onRcvBlock(const QByteArray&) ) ); | 57 | m_emLay, SLOT(onRcvBlock(const QByteArray&) ) ); |
58 | QObject::disconnect(m_emLay, SIGNAL(sndBlock(const QByteArray&) ), | 58 | QObject::disconnect(m_emLay, SIGNAL(sndBlock(const QByteArray&) ), |
59 | m_layer, SLOT(send(const QByteArray&) ) ); | 59 | m_layer, SLOT(send(const QByteArray&) ) ); |
60 | } | 60 | } |
61 | void Session::setName( const QString& na){ | 61 | void Session::setName( const QString& na){ |
62 | m_name = na; | 62 | m_name = na; |
63 | } | 63 | } |
64 | void Session::setWidgetStack( QWidgetStack* wid ) { | 64 | void Session::setWidgetStack( QWidgetStack* wid ) { |
65 | delete m_widget; | 65 | delete m_widget; |
66 | /* the EmulationLayer was destroyed... */ | 66 | /* the EmulationLayer was destroyed... */ |
67 | delete m_emLay; | 67 | delete m_emLay; |
68 | m_widget = wid; | 68 | m_widget = wid; |
69 | } | 69 | } |
70 | void Session::setIOLayer( IOLayer* lay ) { | 70 | void Session::setIOLayer( IOLayer* lay ) { |
71 | delete m_layer; | 71 | delete m_layer; |
72 | m_layer = lay; | 72 | m_layer = lay; |
73 | } | 73 | } |
74 | void Session::setEmulationLayer( EmulationLayer* lay ) { | 74 | void Session::setEmulationLayer( EmulationLayer* lay ) { |
75 | delete m_emLay; | 75 | delete m_emLay; |
76 | m_emLay = lay; | 76 | m_emLay = lay; |
77 | } | 77 | } |
78 | void Session::setEmulationWidget( Widget* lay ) { | 78 | void Session::setEmulationWidget( WidgetLayer* lay ) { |
79 | delete m_widLay; | 79 | delete m_widLay; |
80 | m_widLay = lay; | 80 | m_widLay = lay; |
81 | } | 81 | } |