author | ibotty <ibotty> | 2002-10-11 18:40:51 (UTC) |
---|---|---|
committer | ibotty <ibotty> | 2002-10-11 18:40:51 (UTC) |
commit | b6822170c525fd2cebf31647db4435f995fa9d63 (patch) (unidiff) | |
tree | e77c83e95e34519fba441eb080ee5a238f3f7b0c | |
parent | 35c5d56d076786fd175655e7b2fc4b93cd433a86 (diff) | |
download | opie-b6822170c525fd2cebf31647db4435f995fa9d63.zip opie-b6822170c525fd2cebf31647db4435f995fa9d63.tar.gz opie-b6822170c525fd2cebf31647db4435f995fa9d63.tar.bz2 |
altered, to use widgetLayer over widget
-rw-r--r-- | noncore/apps/opie-console/default.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/default.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/noncore/apps/opie-console/default.cpp b/noncore/apps/opie-console/default.cpp index 62f02f5..a6c3bc4 100644 --- a/noncore/apps/opie-console/default.cpp +++ b/noncore/apps/opie-console/default.cpp | |||
@@ -19,58 +19,58 @@ extern "C" { | |||
19 | FileTransferLayer* newSXTransfer(IOLayer* lay) { | 19 | FileTransferLayer* newSXTransfer(IOLayer* lay) { |
20 | return new SzTransfer( SzTransfer::SX, lay ); | 20 | return new SzTransfer( SzTransfer::SX, lay ); |
21 | } | 21 | } |
22 | 22 | ||
23 | // Layer stuff | 23 | // Layer stuff |
24 | IOLayer* newSerialLayer( const Profile& prof) { | 24 | IOLayer* newSerialLayer( const Profile& prof) { |
25 | return new IOSerial( prof ); | 25 | return new IOSerial( prof ); |
26 | } | 26 | } |
27 | IOLayer* newBTLayer( const Profile& ) { | 27 | IOLayer* newBTLayer( const Profile& ) { |
28 | return 0l; | 28 | return 0l; |
29 | } | 29 | } |
30 | IOLayer* newIrDaLayer( const Profile& ) { | 30 | IOLayer* newIrDaLayer( const Profile& ) { |
31 | return 0l; | 31 | return 0l; |
32 | } | 32 | } |
33 | 33 | ||
34 | // Connection Widgets | 34 | // Connection Widgets |
35 | ProfileDialogWidget* newSerialWidget( const QString& str, QWidget* wid ) { | 35 | ProfileDialogWidget* newSerialWidget( const QString& str, QWidget* wid ) { |
36 | return new SerialConfigWidget( str, wid ); | 36 | return new SerialConfigWidget( str, wid ); |
37 | } | 37 | } |
38 | ProfileDialogWidget* newIrDaWidget( const QString& str, QWidget* wid ) { | 38 | ProfileDialogWidget* newIrDaWidget( const QString& str, QWidget* wid ) { |
39 | return new IrdaConfigWidget( str, wid ); | 39 | return new IrdaConfigWidget( str, wid ); |
40 | } | 40 | } |
41 | ProfileDialogWidget* newBTWidget( const QString& str, QWidget* wid ) { | 41 | ProfileDialogWidget* newBTWidget( const QString& str, QWidget* wid ) { |
42 | return new BTConfigWidget(str, wid ); | 42 | return new BTConfigWidget(str, wid ); |
43 | } | 43 | } |
44 | 44 | ||
45 | // Terminal Widget(s) | 45 | // Terminal Widget(s) |
46 | ProfileDialogWidget* newTerminalWidget(const QString& na, QWidget* wid) { | 46 | ProfileDialogWidget* newTerminalWidget(const QString& na, QWidget* wid) { |
47 | return new TerminalWidget(na, wid,0 ); | 47 | return new TerminalWidget(na, wid,0 ); |
48 | } | 48 | } |
49 | 49 | ||
50 | // VT Emulations | 50 | // VT Emulations |
51 | EmulationLayer* newVT102( Widget* wid ) { | 51 | EmulationLayer* newVT102( WidgetLayer* wid ) { |
52 | return new Vt102Emulation( wid ); | 52 | return new Vt102Emulation( wid ); |
53 | } | 53 | } |
54 | 54 | ||
55 | }; | 55 | }; |
56 | 56 | ||
57 | Default::Default( MetaFactory* fact ) { | 57 | Default::Default( MetaFactory* fact ) { |
58 | fact->addFileTransferLayer( "SZ", QObject::tr("Z-Modem"), newSZTransfer ); | 58 | fact->addFileTransferLayer( "SZ", QObject::tr("Z-Modem"), newSZTransfer ); |
59 | fact->addFileTransferLayer( "SY", QObject::tr("Y-Modem"), newSYTransfer ); | 59 | fact->addFileTransferLayer( "SY", QObject::tr("Y-Modem"), newSYTransfer ); |
60 | fact->addFileTransferLayer( "SX", QObject::tr("X-Modem"), newSXTransfer ); | 60 | fact->addFileTransferLayer( "SX", QObject::tr("X-Modem"), newSXTransfer ); |
61 | 61 | ||
62 | fact->addIOLayerFactory( "serial", QObject::tr("Serial"), newSerialLayer ); | 62 | fact->addIOLayerFactory( "serial", QObject::tr("Serial"), newSerialLayer ); |
63 | fact->addIOLayerFactory( "irda", QObject::tr("Infrared"), newIrDaLayer ); | 63 | fact->addIOLayerFactory( "irda", QObject::tr("Infrared"), newIrDaLayer ); |
64 | fact->addIOLayerFactory( "bt", QObject::tr("Bluetooth"), newBTLayer ); | 64 | fact->addIOLayerFactory( "bt", QObject::tr("Bluetooth"), newBTLayer ); |
65 | 65 | ||
66 | fact->addConnectionWidgetFactory( "serial", QObject::tr("Serial"), newSerialWidget ); | 66 | fact->addConnectionWidgetFactory( "serial", QObject::tr("Serial"), newSerialWidget ); |
67 | fact->addConnectionWidgetFactory( "irda", QObject::tr("Infrared"), newIrDaWidget ); | 67 | fact->addConnectionWidgetFactory( "irda", QObject::tr("Infrared"), newIrDaWidget ); |
68 | fact->addConnectionWidgetFactory( "bt", QObject::tr("Bluetooth"), newBTWidget ); | 68 | fact->addConnectionWidgetFactory( "bt", QObject::tr("Bluetooth"), newBTWidget ); |
69 | 69 | ||
70 | fact->addTerminalWidgetFactory( "default", QObject::tr("Default Terminal"), newTerminalWidget ); | 70 | fact->addTerminalWidgetFactory( "default", QObject::tr("Default Terminal"), newTerminalWidget ); |
71 | 71 | ||
72 | fact->addEmulationLayer( "default", QObject::tr("Default Terminal"), newVT102 ); | 72 | fact->addEmulationLayer( "default", QObject::tr("Default Terminal"), newVT102 ); |
73 | } | 73 | } |
74 | Default::~Default() { | 74 | Default::~Default() { |
75 | 75 | ||
76 | } | 76 | } |
diff --git a/noncore/apps/opie-console/default.h b/noncore/apps/opie-console/default.h index b9af898..4d51db8 100644 --- a/noncore/apps/opie-console/default.h +++ b/noncore/apps/opie-console/default.h | |||
@@ -1,34 +1,34 @@ | |||
1 | #ifndef OPIE_DEFAULT_H | 1 | #ifndef OPIE_DEFAULT_H |
2 | #define OPIE_DEFAULT_H | 2 | #define OPIE_DEFAULT_H |
3 | 3 | ||
4 | #include "metafactory.h" | 4 | #include "metafactory.h" |
5 | 5 | ||
6 | class Widget; | 6 | class Widget; |
7 | 7 | ||
8 | extern "C" { | 8 | extern "C" { |
9 | FileTransferLayer* newSZTransfer(IOLayer*); | 9 | FileTransferLayer* newSZTransfer(IOLayer*); |
10 | FileTransferLayer* newSYTransfer(IOLayer*); | 10 | FileTransferLayer* newSYTransfer(IOLayer*); |
11 | FileTransferLayer* newSXTransfer(IOLayer*); | 11 | FileTransferLayer* newSXTransfer(IOLayer*); |
12 | 12 | ||
13 | IOLayer* newSerialLayer(const Profile&); | 13 | IOLayer* newSerialLayer(const Profile&); |
14 | IOLayer* newBTLayer(const Profile& ); | 14 | IOLayer* newBTLayer(const Profile& ); |
15 | IOLayer* newIrDaLayer(const Profile& ); | 15 | IOLayer* newIrDaLayer(const Profile& ); |
16 | 16 | ||
17 | ProfileDialogWidget* newSerialWidget(const QString&, QWidget* ); | 17 | ProfileDialogWidget* newSerialWidget(const QString&, QWidget* ); |
18 | ProfileDialogWidget* newIrDaWidget (const QString&, QWidget* ); | 18 | ProfileDialogWidget* newIrDaWidget (const QString&, QWidget* ); |
19 | ProfileDialogWidget* newBTWidget (const QString&, QWidget* ); | 19 | ProfileDialogWidget* newBTWidget (const QString&, QWidget* ); |
20 | 20 | ||
21 | ProfileDialogWidget* newTerminalWidget(const QString&, QWidget* ); | 21 | ProfileDialogWidget* newTerminalWidget(const QString&, QWidget* ); |
22 | 22 | ||
23 | EmulationLayer* newVT102( Widget* ); | 23 | EmulationLayer* newVT102( WidgetLayer* ); |
24 | }; | 24 | }; |
25 | 25 | ||
26 | class MetaFactory; | 26 | class MetaFactory; |
27 | struct Default { | 27 | struct Default { |
28 | public: | 28 | public: |
29 | Default(MetaFactory* ); | 29 | Default(MetaFactory* ); |
30 | ~Default(); | 30 | ~Default(); |
31 | }; | 31 | }; |
32 | 32 | ||
33 | 33 | ||
34 | #endif | 34 | #endif |