summaryrefslogtreecommitdiff
authoribotty <ibotty>2002-10-11 17:43:18 (UTC)
committer ibotty <ibotty>2002-10-11 17:43:18 (UTC)
commit01f26248efccbd764e7c82b74372f33a4bbae303 (patch) (side-by-side diff)
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
@@ -117,3 +117,3 @@ ProfileDialogWidget *MetaFactory::newTerminalPlugin( const QString& str, QWidget
}
-EmulationLayer* MetaFactory::newEmulationLayer( const QString& str, Widget* wid) {
+EmulationLayer* MetaFactory::newEmulationLayer( const QString& str, WidgetLayer* wid) {
EmulationLayer* lay = 0l;
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
@@ -19,3 +19,3 @@
-class Widget;
+class WidgetLayer;
class MetaFactory {
@@ -25,3 +25,3 @@ public:
typedef FileTransferLayer* (*filelayer)(IOLayer*);
- typedef EmulationLayer* (*emulationLayer)(Widget* );
+ typedef EmulationLayer* (*emulationLayer)(WidgetLayer* );
@@ -79,3 +79,3 @@ public:
ProfileDialogWidget* newTerminalPlugin( const QString&, QWidget* );
- EmulationLayer* newEmulationLayer(const QString&, Widget* );
+ EmulationLayer* newEmulationLayer(const QString&, WidgetLayer* );
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
@@ -9,3 +9,4 @@
-#include "widget.h"
+#include "widget_layer.h"
+#include "emulation_widget.h"
#include "metafactory.h"
@@ -82,3 +83,3 @@ Session* ProfileManager::fromProfile( const Profile& prof, QWidget* parent) {
stack->raiseWidget( 0 );
- Widget* wid = new Widget(dummy );
+ WidgetLayer* wid = new EmulationWidget( prof, dummy );
lay->addWidget( 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
@@ -4,3 +4,3 @@
#include "file_layer.h"
-#include "widget.h"
+#include "widget_layer.h"
#include "emulation_layer.h"
@@ -39,3 +39,3 @@ EmulationLayer* Session::emulationLayer() {
}
-Widget* Session::emulationWidget() {
+WidgetLayer* Session::emulationWidget() {
return m_widLay;
@@ -77,3 +77,3 @@ void Session::setEmulationLayer( EmulationLayer* lay ) {
}
-void Session::setEmulationWidget( Widget* lay ) {
+void Session::setEmulationWidget( WidgetLayer* lay ) {
delete m_widLay;
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
@@ -7,3 +7,3 @@ class IOLayer;
class EmulationLayer;
-class Widget;
+class WidgetLayer;
/**
@@ -44,3 +44,3 @@ public:
EmulationLayer* emulationLayer();
- Widget* emulationWidget();
+ WidgetLayer* emulationWidget();
@@ -60,3 +60,3 @@ public:
void setEmulationLayer( EmulationLayer* lay );
- void setEmulationWidget( Widget* lay );
+ void setEmulationWidget( WidgetLayer* lay );
void setIOLayer( IOLayer* );
@@ -69,3 +69,3 @@ private:
EmulationLayer* m_emLay;
- Widget* m_widLay;
+ WidgetLayer* m_widLay;
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
@@ -23,2 +23,3 @@
# this is not right! EmulationLayer should send it...
+ i changed all those to use emulationLayer()->send() instead
i had to create a QByteArray before...
@@ -1232,3 +1233,4 @@ void Widget::dropEvent(QDropEvent* event)
// ibot: this should be pretty wrong...
- currentSession->layer()->send( tmp.setRawData( dropText.local8Bit()));
+ // now it sends to the right layer
+ currentSession-> emulationLayer()->send( tmp.setRawData( dropText.local8Bit()));
}
@@ -1243,3 +1245,3 @@ void Widget::dropEvent(QDropEvent* event)
QByteArray tmp;
- currentSession->layer()->send( tmp.setRawData( dropText.local8Bit()));
+ currentSession->emulationLayer()->send( tmp.setRawData( dropText.local8Bit()));
}
@@ -1259,3 +1261,3 @@ void Widget::drop_menu_activated(int item)
//currentSession->getEmulation()->sendString(dropText.local8Bit());
- currentSession->layer()->send( tmp.setRawData( dropText.local8Bit()));
+ currentSession->emulationLayer()->send( tmp.setRawData( dropText.local8Bit()));
@@ -1266,3 +1268,3 @@ void Widget::drop_menu_activated(int item)
tmp.setRawData( "cd " );
- currentSession->layer()->send( tmp );
+ currentSession->emulationLayer()->send( tmp );
struct stat statbuf;
@@ -1284,3 +1286,3 @@ void Widget::drop_menu_activated(int item)
//currentSession->getEmulation()->sendString("\n");
- currentSession->layer()->send( tmp );
+ currentSession->emulationLayer()->send( tmp );
// KWM::activate((Window)this->winId());
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
@@ -104,4 +104,5 @@ public:
* reload configuration
+ * @param const Profile& config, the config to be used (may be the same as in constructor)
*/
- virtual void reloadConfig() = 0;
+ virtual void reloadConfig( const Profile& config ) = 0;