-rw-r--r-- | noncore/apps/opie-console/io_serial.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 10 | ||||
-rw-r--r-- | noncore/apps/opie-console/mainwindow.h | 5 | ||||
-rw-r--r-- | noncore/apps/opie-console/metafactory.h | 9 |
4 files changed, 16 insertions, 12 deletions
diff --git a/noncore/apps/opie-console/io_serial.cpp b/noncore/apps/opie-console/io_serial.cpp index 9a81de9..c9155d1 100644 --- a/noncore/apps/opie-console/io_serial.cpp +++ b/noncore/apps/opie-console/io_serial.cpp | |||
@@ -120,2 +120,6 @@ void IOSerial::reload(const Config &config) { | |||
120 | m_baud = config.readNumEntry("Baud", SERIAL_DEFAULT_BAUD); | 120 | m_baud = config.readNumEntry("Baud", SERIAL_DEFAULT_BAUD); |
121 | m_parity = config.readNumEntry("Parity", SERIAL_DEFAULT_PARITY); | ||
122 | m_dbits = config.readNumEntry("DataBits", SERIAL_DEFAULT_DBITS); | ||
123 | m_sbits = config.readNumEntry("StopBits", SERIAL_DEFAULT_SBITS); | ||
124 | m_flow = config.readNumEntry("Flow", SERIAL_DEFAULT_FLOW); | ||
121 | } | 125 | } |
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index b6b2a2e..e9b5eda 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp | |||
@@ -10,11 +10,8 @@ | |||
10 | 10 | ||
11 | MainWindow::MainWindow() | 11 | MainWindow::MainWindow() { |
12 | { | ||
13 | qWarning("c'tor"); | ||
14 | m_factory = new MetaFactory(); | 12 | m_factory = new MetaFactory(); |
15 | m_sessions.setAutoDelete( TRUE ); | 13 | m_sessions.setAutoDelete( TRUE ); |
16 | m_curSession = 0l; | 14 | m_curSession = -1; |
17 | 15 | ||
18 | initUI(); | 16 | initUI(); |
19 | |||
20 | } | 17 | } |
@@ -53,2 +50,3 @@ MainWindow::~MainWindow() { | |||
53 | } | 50 | } |
51 | |||
54 | MetaFactory* MainWindow::factory() { | 52 | MetaFactory* MainWindow::factory() { |
@@ -56,2 +54,3 @@ MetaFactory* MainWindow::factory() { | |||
56 | } | 54 | } |
55 | |||
57 | Session* MainWindow::currentSession() { | 56 | Session* MainWindow::currentSession() { |
@@ -59,2 +58,3 @@ Session* MainWindow::currentSession() { | |||
59 | } | 58 | } |
59 | |||
60 | QList<Session> MainWindow::sessions() { | 60 | QList<Session> MainWindow::sessions() { |
diff --git a/noncore/apps/opie-console/mainwindow.h b/noncore/apps/opie-console/mainwindow.h index 3d1e1c8..db3a653 100644 --- a/noncore/apps/opie-console/mainwindow.h +++ b/noncore/apps/opie-console/mainwindow.h | |||
@@ -17,2 +17,3 @@ class QAction; | |||
17 | class MetaFactory; | 17 | class MetaFactory; |
18 | |||
18 | class MainWindow : public QMainWindow { | 19 | class MainWindow : public QMainWindow { |
@@ -39,3 +40,5 @@ public: | |||
39 | QList<Session> sessions(); | 40 | QList<Session> sessions(); |
40 | 41 | protected slots: | |
42 | void slotNew(); | ||
43 | void slotConnect(); | ||
41 | private: | 44 | private: |
diff --git a/noncore/apps/opie-console/metafactory.h b/noncore/apps/opie-console/metafactory.h index 9c0f0a1..aae9391 100644 --- a/noncore/apps/opie-console/metafactory.h +++ b/noncore/apps/opie-console/metafactory.h | |||
@@ -4,3 +4,4 @@ | |||
4 | /** | 4 | /** |
5 | * meta factory is our factory servie | 5 | * The MetaFactory is used to keep track of all IOLayers, FileTransferLayers and ConfigWidgets |
6 | * and to instantiate these implementations on demand | ||
6 | */ | 7 | */ |
@@ -21,2 +22,3 @@ public: | |||
21 | typedef FileTransferLayer* (*filelayer)(IOLayer*); | 22 | typedef FileTransferLayer* (*filelayer)(IOLayer*); |
23 | |||
22 | MetaFactory(); | 24 | MetaFactory(); |
@@ -33,4 +35,2 @@ public: | |||
33 | QStringList fileTransferLayers()const; | 35 | QStringList fileTransferLayers()const; |
34 | |||
35 | |||
36 | private: | 36 | private: |
@@ -39,5 +39,2 @@ private: | |||
39 | QMap<QString, filelayer> m_fileFact; | 39 | QMap<QString, filelayer> m_fileFact; |
40 | |||
41 | |||
42 | |||
43 | }; | 40 | }; |