From 18d575d0ee47a0700091de81bc3e8c54be4eae18 Mon Sep 17 00:00:00 2001 From: wazlaf Date: Sat, 28 Sep 2002 15:21:53 +0000 Subject: indenting, comments --- (limited to 'noncore/apps') 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 @@ -118,6 +118,10 @@ bool IOSerial::open() { void IOSerial::reload(const Config &config) { m_device = config.readEntry("Device", SERIAL_DEFAULT_DEVICE); m_baud = config.readNumEntry("Baud", SERIAL_DEFAULT_BAUD); + m_parity = config.readNumEntry("Parity", SERIAL_DEFAULT_PARITY); + m_dbits = config.readNumEntry("DataBits", SERIAL_DEFAULT_DBITS); + m_sbits = config.readNumEntry("StopBits", SERIAL_DEFAULT_SBITS); + m_flow = config.readNumEntry("Flow", SERIAL_DEFAULT_FLOW); } int IOSerial::getBaud(int baud) const { 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 @@ -8,15 +8,12 @@ #include "metafactory.h" #include "mainwindow.h" -MainWindow::MainWindow() -{ - qWarning("c'tor"); +MainWindow::MainWindow() { m_factory = new MetaFactory(); m_sessions.setAutoDelete( TRUE ); - m_curSession = 0l; + m_curSession = -1; initUI(); - } void MainWindow::initUI() { setToolBarsMovable( FALSE ); @@ -51,12 +48,15 @@ void MainWindow::initUI() { MainWindow::~MainWindow() { delete m_factory; } + MetaFactory* MainWindow::factory() { return m_factory; } + Session* MainWindow::currentSession() { return m_curSession; } + QList MainWindow::sessions() { return m_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 @@ -15,6 +15,7 @@ class QToolBar; class QMenuBar; class QAction; class MetaFactory; + class MainWindow : public QMainWindow { Q_OBJECT public: @@ -37,7 +38,9 @@ public: * the session list */ QList sessions(); - +protected slots: + void slotNew(); + void slotConnect(); private: void initUI(); /** 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 @@ -2,7 +2,8 @@ #define OPIE_META_FACTORY_H /** - * meta factory is our factory servie + * The MetaFactory is used to keep track of all IOLayers, FileTransferLayers and ConfigWidgets + * and to instantiate these implementations on demand */ #include @@ -19,6 +20,7 @@ public: typedef QWidget* (*configWidget)(QWidget* parent); typedef IOLayer* (*iolayer)(const Config& ); typedef FileTransferLayer* (*filelayer)(IOLayer*); + MetaFactory(); ~MetaFactory(); @@ -31,15 +33,10 @@ public: QStringList ioLayers()const; QStringList configWidgets()const; QStringList fileTransferLayers()const; - - private: QMap m_confFact; QMap m_layerFact; QMap m_fileFact; - - - }; -- cgit v0.9.0.2