summaryrefslogtreecommitdiff
authoribotty <ibotty>2002-10-11 17:43:18 (UTC)
committer ibotty <ibotty>2002-10-11 17:43:18 (UTC)
commit01f26248efccbd764e7c82b74372f33a4bbae303 (patch) (unidiff)
treea13712dabfa9aaeb7d9ad9353e434b8976234836
parent00005567e4841af1f0efe090160881b286574493 (diff)
downloadopie-01f26248efccbd764e7c82b74372f33a4bbae303.zip
opie-01f26248efccbd764e7c82b74372f33a4bbae303.tar.gz
opie-01f26248efccbd764e7c82b74372f33a4bbae303.tar.bz2
changed references to widget into references to widgetLayer or EmulationWidget.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/metafactory.cpp2
-rw-r--r--noncore/apps/opie-console/metafactory.h6
-rw-r--r--noncore/apps/opie-console/profilemanager.cpp5
-rw-r--r--noncore/apps/opie-console/session.cpp6
-rw-r--r--noncore/apps/opie-console/session.h8
-rw-r--r--noncore/apps/opie-console/widget.cpp12
-rw-r--r--noncore/apps/opie-console/widget_layer.h3
7 files changed, 23 insertions, 19 deletions
diff --git a/noncore/apps/opie-console/metafactory.cpp b/noncore/apps/opie-console/metafactory.cpp
index 02a9f9b..2b672cf 100644
--- a/noncore/apps/opie-console/metafactory.cpp
+++ b/noncore/apps/opie-console/metafactory.cpp
@@ -115,7 +115,7 @@ ProfileDialogWidget *MetaFactory::newTerminalPlugin( const QString& str, QWidget
115 } 115 }
116 return wid; 116 return wid;
117} 117}
118EmulationLayer* MetaFactory::newEmulationLayer( const QString& str, Widget* wid) { 118EmulationLayer* MetaFactory::newEmulationLayer( const QString& str, WidgetLayer* wid) {
119 EmulationLayer* lay = 0l; 119 EmulationLayer* lay = 0l;
120 120
121 QMap<QString, emulationLayer>::Iterator it; 121 QMap<QString, emulationLayer>::Iterator it;
diff --git a/noncore/apps/opie-console/metafactory.h b/noncore/apps/opie-console/metafactory.h
index 71c35a2..d05ece4 100644
--- a/noncore/apps/opie-console/metafactory.h
+++ b/noncore/apps/opie-console/metafactory.h
@@ -17,13 +17,13 @@
17#include "profiledialogwidget.h" 17#include "profiledialogwidget.h"
18#include "emulation_layer.h" 18#include "emulation_layer.h"
19 19
20class Widget; 20class WidgetLayer;
21class MetaFactory { 21class MetaFactory {
22public: 22public:
23 typedef ProfileDialogWidget* (*configWidget)(const QString&, QWidget* parent); 23 typedef ProfileDialogWidget* (*configWidget)(const QString&, QWidget* parent);
24 typedef IOLayer* (*iolayer)(const Profile& ); 24 typedef IOLayer* (*iolayer)(const Profile& );
25 typedef FileTransferLayer* (*filelayer)(IOLayer*); 25 typedef FileTransferLayer* (*filelayer)(IOLayer*);
26 typedef EmulationLayer* (*emulationLayer)(Widget* ); 26 typedef EmulationLayer* (*emulationLayer)(WidgetLayer* );
27 27
28 MetaFactory(); 28 MetaFactory();
29 ~MetaFactory(); 29 ~MetaFactory();
@@ -77,7 +77,7 @@ public:
77 IOLayer* newIOLayer( const QString&,const Profile& ); 77 IOLayer* newIOLayer( const QString&,const Profile& );
78 ProfileDialogWidget *newConnectionPlugin ( const QString&, QWidget* ); 78 ProfileDialogWidget *newConnectionPlugin ( const QString&, QWidget* );
79 ProfileDialogWidget* newTerminalPlugin( const QString&, QWidget* ); 79 ProfileDialogWidget* newTerminalPlugin( const QString&, QWidget* );
80 EmulationLayer* newEmulationLayer(const QString&, Widget* ); 80 EmulationLayer* newEmulationLayer(const QString&, WidgetLayer* );
81 81
82 /* 82 /*
83 * internal takes the maybe translated 83 * internal takes the maybe translated
diff --git a/noncore/apps/opie-console/profilemanager.cpp b/noncore/apps/opie-console/profilemanager.cpp
index dcf3cbd..78751e7 100644
--- a/noncore/apps/opie-console/profilemanager.cpp
+++ b/noncore/apps/opie-console/profilemanager.cpp
@@ -7,7 +7,8 @@
7 7
8#include <qpe/config.h> 8#include <qpe/config.h>
9 9
10#include "widget.h" 10#include "widget_layer.h"
11#include "emulation_widget.h"
11#include "metafactory.h" 12#include "metafactory.h"
12#include "profileconfig.h" 13#include "profileconfig.h"
13#include "profilemanager.h" 14#include "profilemanager.h"
@@ -80,7 +81,7 @@ Session* ProfileManager::fromProfile( const Profile& prof, QWidget* parent) {
80 QHBoxLayout* lay = new QHBoxLayout(dummy ); 81 QHBoxLayout* lay = new QHBoxLayout(dummy );
81 stack->addWidget( dummy, 0 ); 82 stack->addWidget( dummy, 0 );
82 stack->raiseWidget( 0 ); 83 stack->raiseWidget( 0 );
83 Widget* wid = new Widget(dummy ); 84 WidgetLayer* wid = new EmulationWidget( prof, dummy );
84 lay->addWidget( wid ); 85 lay->addWidget( wid );
85 86
86 session->setEmulationWidget( wid ); 87 session->setEmulationWidget( wid );
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
@@ -2,7 +2,7 @@
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
@@ -37,7 +37,7 @@ IOLayer* Session::layer() {
37EmulationLayer* Session::emulationLayer() { 37EmulationLayer* Session::emulationLayer() {
38 return m_emLay; 38 return m_emLay;
39} 39}
40Widget* Session::emulationWidget() { 40WidgetLayer* Session::emulationWidget() {
41 return m_widLay; 41 return m_widLay;
42} 42}
43void Session::connect() { 43void Session::connect() {
@@ -75,7 +75,7 @@ void Session::setEmulationLayer( EmulationLayer* lay ) {
75 delete m_emLay; 75 delete m_emLay;
76 m_emLay = lay; 76 m_emLay = lay;
77} 77}
78void Session::setEmulationWidget( Widget* lay ) { 78void Session::setEmulationWidget( WidgetLayer* lay ) {
79 delete m_widLay; 79 delete m_widLay;
80 m_widLay = lay; 80 m_widLay = lay;
81} 81}
diff --git a/noncore/apps/opie-console/session.h b/noncore/apps/opie-console/session.h
index c3673fc..64c2cdb 100644
--- a/noncore/apps/opie-console/session.h
+++ b/noncore/apps/opie-console/session.h
@@ -5,7 +5,7 @@
5 5
6class IOLayer; 6class IOLayer;
7class EmulationLayer; 7class EmulationLayer;
8class Widget; 8class WidgetLayer;
9/** 9/**
10 * This is a Session. A session contains 10 * This is a Session. A session contains
11 * a QWidget pointer and a IOLayer 11 * a QWidget pointer and a IOLayer
@@ -42,7 +42,7 @@ public:
42 IOLayer* layer(); 42 IOLayer* layer();
43 43
44 EmulationLayer* emulationLayer(); 44 EmulationLayer* emulationLayer();
45 Widget* emulationWidget(); 45 WidgetLayer* emulationWidget();
46 46
47 /* 47 /*
48 * connects the data flow from 48 * connects the data flow from
@@ -58,7 +58,7 @@ public:
58 58
59 void setWidgetStack( QWidgetStack* widget ); 59 void setWidgetStack( QWidgetStack* widget );
60 void setEmulationLayer( EmulationLayer* lay ); 60 void setEmulationLayer( EmulationLayer* lay );
61 void setEmulationWidget( Widget* lay ); 61 void setEmulationWidget( WidgetLayer* lay );
62 void setIOLayer( IOLayer* ); 62 void setIOLayer( IOLayer* );
63 void setName( const QString& ); 63 void setName( const QString& );
64 64
@@ -67,7 +67,7 @@ private:
67 QWidgetStack* m_widget; 67 QWidgetStack* m_widget;
68 IOLayer* m_layer; 68 IOLayer* m_layer;
69 EmulationLayer* m_emLay; 69 EmulationLayer* m_emLay;
70 Widget* m_widLay; 70 WidgetLayer* m_widLay;
71 71
72}; 72};
73 73
diff --git a/noncore/apps/opie-console/widget.cpp b/noncore/apps/opie-console/widget.cpp
index b8f2906..d948179 100644
--- a/noncore/apps/opie-console/widget.cpp
+++ b/noncore/apps/opie-console/widget.cpp
@@ -21,6 +21,7 @@
21 "currentSession->getEmulation()->sendString()" to 21 "currentSession->getEmulation()->sendString()" to
22 "currentSession->layer()->send()" 22 "currentSession->layer()->send()"
23 # this is not right! EmulationLayer should send it... 23 # this is not right! EmulationLayer should send it...
24 i changed all those to use emulationLayer()->send() instead
24 i had to create a QByteArray before... 25 i had to create a QByteArray before...
25 26
26TODO: 27TODO:
@@ -1230,7 +1231,8 @@ void Widget::dropEvent(QDropEvent* event)
1230 //currentSession->getEmulation()->sendString(dropText.local8Bit()); 1231 //currentSession->getEmulation()->sendString(dropText.local8Bit());
1231 QByteArray tmp; 1232 QByteArray tmp;
1232 // ibot: this should be pretty wrong... 1233 // ibot: this should be pretty wrong...
1233 currentSession->layer()->send( tmp.setRawData( dropText.local8Bit())); 1234 // now it sends to the right layer
1235 currentSession-> emulationLayer()->send( tmp.setRawData( dropText.local8Bit()));
1234 } 1236 }
1235 // kdDebug() << "Drop:" << dropText.local8Bit() << "\n"; 1237 // kdDebug() << "Drop:" << dropText.local8Bit() << "\n";
1236 } 1238 }
@@ -1241,7 +1243,7 @@ void Widget::dropEvent(QDropEvent* event)
1241 if (currentSession) { 1243 if (currentSession) {
1242 //currentSession->getEmulation()->sendString(dropText.local8Bit()); 1244 //currentSession->getEmulation()->sendString(dropText.local8Bit());
1243 QByteArray tmp; 1245 QByteArray tmp;
1244 currentSession->layer()->send( tmp.setRawData( dropText.local8Bit())); 1246 currentSession->emulationLayer()->send( tmp.setRawData( dropText.local8Bit()));
1245 } 1247 }
1246 // Paste it 1248 // Paste it
1247 } 1249 }
@@ -1257,14 +1259,14 @@ void Widget::drop_menu_activated(int item)
1257 { 1259 {
1258 case 0: // paste 1260 case 0: // paste
1259 //currentSession->getEmulation()->sendString(dropText.local8Bit()); 1261 //currentSession->getEmulation()->sendString(dropText.local8Bit());
1260 currentSession->layer()->send( tmp.setRawData( dropText.local8Bit())); 1262 currentSession->emulationLayer()->send( tmp.setRawData( dropText.local8Bit()));
1261 1263
1262// KWM::activate((Window)this->winId()); 1264// KWM::activate((Window)this->winId());
1263 break; 1265 break;
1264 case 1: // cd ... 1266 case 1: // cd ...
1265 //currentSession->getEmulation()->sendString("cd "); 1267 //currentSession->getEmulation()->sendString("cd ");
1266 tmp.setRawData( "cd " ); 1268 tmp.setRawData( "cd " );
1267 currentSession->layer()->send( tmp ); 1269 currentSession->emulationLayer()->send( tmp );
1268 struct stat statbuf; 1270 struct stat statbuf;
1269 if ( ::stat( QFile::encodeName( dropText ), &statbuf ) == 0 ) 1271 if ( ::stat( QFile::encodeName( dropText ), &statbuf ) == 0 )
1270 { 1272 {
@@ -1282,7 +1284,7 @@ void Widget::drop_menu_activated(int item)
1282 tmp.setRawDate( dropText.local8Bit() + "\n" ); 1284 tmp.setRawDate( dropText.local8Bit() + "\n" );
1283 //currentSession->getEmulation()->sendString(dropText.local8Bit()); 1285 //currentSession->getEmulation()->sendString(dropText.local8Bit());
1284 //currentSession->getEmulation()->sendString("\n"); 1286 //currentSession->getEmulation()->sendString("\n");
1285 currentSession->layer()->send( tmp ); 1287 currentSession->emulationLayer()->send( tmp );
1286// KWM::activate((Window)this->winId()); 1288// KWM::activate((Window)this->winId());
1287 break; 1289 break;
1288 } 1290 }
diff --git a/noncore/apps/opie-console/widget_layer.h b/noncore/apps/opie-console/widget_layer.h
index 5bd2ef9..01a4614 100644
--- a/noncore/apps/opie-console/widget_layer.h
+++ b/noncore/apps/opie-console/widget_layer.h
@@ -102,8 +102,9 @@ public:
102 102
103 /** 103 /**
104 * reload configuration 104 * reload configuration
105 * @param const Profile& config, the config to be used (may be the same as in constructor)
105 */ 106 */
106 virtual void reloadConfig() = 0; 107 virtual void reloadConfig( const Profile& config ) = 0;
107 108
108 109
109 /** 110 /**