5 files changed, 73 insertions, 59 deletions

diff --git a/noncore/apps/opie-console/metafactory.cpp b/noncore/apps/opie-console/metafactory.cpp
index c5e614d..b69d6da 100644
--- a/noncore/apps/opie-console/metafactory.cpp
+++ b/noncore/apps/opie-console/metafactory.cpp
@@ -15,62 +15,62 @@ void MetaFactory::addConfigWidgetFactory( const QString& str,
 void MetaFactory::addIOLayerFactory( const QString& str,
                                      iolayer lay) {
     m_layerFact.insert( str, lay );
 }
 void MetaFactory::addFileTransferLayer( const QString& str,
                                         filelayer lay) {
     m_fileFact.insert( str, lay );
 }
 QStringList MetaFactory::ioLayers()const {
     QStringList list;
     QMap<QString, iolayer>::ConstIterator it;
     for (it = m_layerFact.begin(); it != m_layerFact.end(); ++it ) {
         list << it.key();
     }
     return list;
 }
 QStringList MetaFactory::configWidgets()const {
     QStringList list;
     QMap<QString,  configWidget>::ConstIterator it;
     for ( it = m_confFact.begin(); it != m_confFact.end(); ++it ) {
         list << it.key();
     }
     return list;
 }
 QStringList MetaFactory::fileTransferLayers()const {
     QStringList list;
     QMap<QString, filelayer>::ConstIterator it;
     for ( it = m_fileFact.begin(); it != m_fileFact.end(); ++it ) {
         list << it.key();
     }
     return list;
 }
 
 IOLayer* MetaFactory::newIOLayer( const QString& str,const Profile& prof ) {
     IOLayer* lay = 0l;
 
     QMap<QString, iolayer>::Iterator it;
     it = m_layerFact.find( str );
     if ( it != m_layerFact.end() ) {
         lay = (*(it.data()))(prof);
         /*
         iolayer laye = it.data();
         lay = (*laye )(conf);*/
     }
 
     return lay;
 }
 
-ProfileEditorPlugin *MetaFactory::newConfigPlugin ( const QString& str, QWidget *parent, const Profile& prof) {
+ProfileEditorPlugin *MetaFactory::newConfigPlugin ( const QString& str, QWidget *parent, Profile *prof) {
     ProfileEditorPlugin *p = NULL;
     configWidget c;
 
     c = m_confFact[str];
     if(c) p = c(parent, prof);
 
     return p;
 }
 
 QString MetaFactory::name( const QString& str ) {
     return m_namemap[str];
 }
 
diff --git a/noncore/apps/opie-console/metafactory.h b/noncore/apps/opie-console/metafactory.h
index 8c714b3..216de03 100644
--- a/noncore/apps/opie-console/metafactory.h
+++ b/noncore/apps/opie-console/metafactory.h
@@ -1,51 +1,51 @@
 #ifndef OPIE_META_FACTORY_H
 #define OPIE_META_FACTORY_H
 
 /**
  * The MetaFactory is used to keep track of all IOLayers, FileTransferLayers and ConfigWidgets
  * and to instantiate these implementations on demand
  */
 
 #include <qwidget.h>
 #include <qmap.h>
 
 #include <qpe/config.h>
 
 #include "io_layer.h"
 #include "file_layer.h"
 #include "profile.h"
 #include "profileeditorplugins.h"
 
 class MetaFactory {
 public:
-    typedef ProfileEditorPlugin* (*configWidget)(QWidget* parent, const Profile&);
+    typedef ProfileEditorPlugin* (*configWidget)(QWidget* parent, Profile* prof);
     typedef IOLayer* (*iolayer)(const Profile& );
     typedef FileTransferLayer* (*filelayer)(IOLayer*);
 
     MetaFactory();
     ~MetaFactory();
 
     void addConfigWidgetFactory( const QString&,
                                  const QString&,
                                  configWidget );
     void addIOLayerFactory(const QString&,
                            iolayer );
     void addFileTransferLayer( const QString&,
                                filelayer );
     QStringList ioLayers()const;
     QStringList configWidgets()const;
     QStringList fileTransferLayers()const;
     IOLayer* newIOLayer( const QString&,const Profile& );
-    ProfileEditorPlugin *newConfigPlugin ( const QString&, QWidget*, const Profile& );
+    ProfileEditorPlugin *newConfigPlugin ( const QString&, QWidget*, Profile* );
 
     QString name( const QString& );
 
 private:
     QMap<QString, configWidget> m_confFact;
     QMap<QString, iolayer> m_layerFact;
     QMap<QString, filelayer> m_fileFact;
         QMap<QString, QString> m_namemap;
 };
 
 
 #endif
diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp
index d98e589..8e63429 100644
--- a/noncore/apps/opie-console/profileeditordialog.cpp
+++ b/noncore/apps/opie-console/profileeditordialog.cpp
@@ -28,151 +28,161 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact )
         // Default profile
         m_prof = Profile(QString::null, "serial", Profile::Black, Profile::White, Profile::VT102);
 
         initUI();
 
         // Apply current profile
         // plugin_plugin->load(profile);
 }
 
 Profile ProfileEditorDialog::profile() const
 {
         return m_prof;
 }
 
 void ProfileEditorDialog::initUI()
 {
         QWidget *tabterm, *tabconn, *tabprof;
 
         tabprof = new QWidget(this);
         tabterm = new QWidget(this);
         tabconn = new QWidget(this);
 
         // for the time being: fake factory
         
         m_fact->addConfigWidgetFactory("serial", QObject::tr("Serial cable"), factory_serial);
         m_fact->addConfigWidgetFactory("irda", QObject::tr("IrDA port"), factory_irda);
         m_fact->addConfigWidgetFactory("modem", QObject::tr("Serial via modem"), factory_modem);
 
         // profile tab
 
         QLabel *name = new QLabel(QObject::tr("Profile name"), tabprof);
 
         name_line = new QLineEdit(tabprof);
 
         // connection tab, fixed part
 
         QLabel *device = new QLabel(QObject::tr("Device"), tabconn);
 
         device_box = new QComboBox(tabconn);
 
         QStringList w = m_fact->configWidgets();
         for(QStringList::Iterator it = w.begin(); it != w.end(); it++)
                 device_box->insertItem(m_fact->name((*it)));
 
         // connection tab, factory part
         plugin_base = new QWidget(tabconn);
         plugin_layout = new QHBoxLayout(plugin_base, 0);
 
-        plugin_plugin = m_fact->newConfigPlugin("serial", plugin_base, m_prof);
+        plugin_plugin = m_fact->newConfigPlugin("serial", plugin_base, &m_prof);
         plugin_layout->add(plugin_plugin->widget());
 
         // connection tab, general part
 
         QWidget *conn_widget = plugin_plugin->connection_widget();
         conn_widget->reparent(tabconn, 0, QPoint(), true);
 
         // terminal tab
 
         QWidget *term_widget = plugin_plugin->terminal_widget();
         term_widget->reparent(tabterm, 0, QPoint(), true);
 
         // layouting
 
         QVBoxLayout *vbox3 = new QVBoxLayout(tabprof, 2);
         vbox3->add(name);
         vbox3->add(name_line);
         vbox3->addStretch(1);
 
         QVBoxLayout *vbox = new QVBoxLayout(tabconn, 2);
         vbox->add(device);
         vbox->add(device_box);
         vbox->add(plugin_base);
         vbox->add(conn_widget);
 
         QVBoxLayout *vbox2 = new QVBoxLayout(tabterm, 2);
         vbox2->add(term_widget);
 
         addTab(tabprof, QObject::tr("Profile"));
         addTab(tabconn, QObject::tr("Connection"));
         addTab(tabterm, QObject::tr("Terminal"));
 
         setOkButton(QObject::tr("OK"));
         setCancelButton(QObject::tr("Cancel"));
 
         // load profile values
 
         name_line->setText(m_prof.name());
+        for(int i = 0; i < device_box->count(); i++)
+        {
+                device_box->setCurrentItem(i);
+                if(prof_type() == m_prof.ioLayerName())
+                {
+                        slotDevice(i);
+                        break;
+                }
+        }
 
         // signals
 
         connect(this, SIGNAL(cancelButtonPressed()), SLOT(slotCancel()));
         connect(device_box, SIGNAL(activated(int)), SLOT(slotDevice(int)));
 }
 
 ProfileEditorDialog::~ProfileEditorDialog() {
 
 }
 
 void ProfileEditorDialog::slotDevice(int id)
 {
         delete plugin_plugin;
 
-        plugin_plugin = m_fact->newConfigPlugin(prof_type(), plugin_base, m_prof);
+        plugin_plugin = m_fact->newConfigPlugin(prof_type(), plugin_base, &m_prof);
         plugin_layout->add(plugin_plugin->widget());
 
         // Reload profile associated to device, including e.g. conn_device()
         // m_prof = plugin_plugin->profile()
         // or, keeping the profile name: m_prof->reload(plugin_plugin->profile())
 
         //plugin_plugin->show();
         plugin_plugin->widget()->show();
 }
 
 void ProfileEditorDialog::accept()
 {
         if(prof_name().isEmpty())
         {
                 QMessageBox::information(this,
                         QObject::tr("Invalid profile"),
                         QObject::tr("Please enter a profile name."));
                 return;
         }
         // Save profile and plugin profile
         if(plugin_plugin) plugin_plugin->save();
 
         // Save general values
         m_prof.setName(prof_name());
+        m_prof.setIOLayer(prof_type());
 
         QDialog::accept();
 }
 
 void ProfileEditorDialog::slotCancel()
 {
         reject();
 }
 
 QString ProfileEditorDialog::prof_name()
 {
         return name_line->text();
 }
 
 QString ProfileEditorDialog::prof_type()
 {
         QStringList w = m_fact->configWidgets();
         for(QStringList::Iterator it = w.begin(); it != w.end(); it++)
                 if(device_box->currentText() == m_fact->name((*it))) return (*it);
 
         return QString::null;
 }
 
 
diff --git a/noncore/apps/opie-console/profileeditorplugins.cpp b/noncore/apps/opie-console/profileeditorplugins.cpp
index 32e8235..a0bcab8 100644
--- a/noncore/apps/opie-console/profileeditorplugins.cpp
+++ b/noncore/apps/opie-console/profileeditorplugins.cpp
@@ -1,479 +1,483 @@
 
 #include "profileeditorplugins.h"
 #include "profile.h"
 
 #include "qframe.h"
 #include "qlabel.h"
 #include "qlineedit.h"
 #include "qlayout.h"
 #include "qcombobox.h"
 #include "qradiobutton.h"
 #include "qcheckbox.h"
 #include "qbuttongroup.h"
 
 #include "io_serial.h"
 
 // Base class
 
-ProfileEditorPlugin::ProfileEditorPlugin(QWidget *parent, Profile p)
+ProfileEditorPlugin::ProfileEditorPlugin(QWidget *parent, Profile *p)
 {
         m_parent = parent;
         m_profile = p;
         m_widget = NULL;
 }
 
 ProfileEditorPlugin::~ProfileEditorPlugin()
 {
         if(m_widget) delete m_widget;
 }
 
 QWidget *ProfileEditorPlugin::connection_widget()
 {
         QWidget *root;
         QVBoxLayout *lroot;
 
         root = new QWidget();
 
         // Build GUI
 
         QComboBox *speed_box = new QComboBox(root);
         speed_box->insertItem("115200 baud", id_baud_115200);
         speed_box->insertItem("57600 baud", id_baud_57600);
         speed_box->insertItem("38400 baud", id_baud_38400);
         speed_box->insertItem("19200 baud", id_baud_19200);
         speed_box->insertItem("9600 baud", id_baud_9600);
 
         QLabel *speedlabel = new QLabel(QObject::tr("Speed"), root);
         QLabel *flow = new QLabel(QObject::tr("Flow control"), root);
         QLabel *parity = new QLabel(QObject::tr("Parity"), root);
 
         QButtonGroup *group_flow = new QButtonGroup(root);
         group_flow->hide();
         QRadioButton *flow_hw = new QRadioButton(QObject::tr("Hardware"), root);
         QRadioButton *flow_sw = new QRadioButton(QObject::tr("Software"), root);
         group_flow->insert(flow_hw, id_flow_hw);
         group_flow->insert(flow_sw, id_flow_sw);
 
         QButtonGroup *group_parity = new QButtonGroup(root);
         group_parity->hide();
         QRadioButton *parity_odd = new QRadioButton(QObject::tr("Odd"), root);
         QRadioButton *parity_even = new QRadioButton(QObject::tr("Even"), root);
         group_parity->insert(parity_odd, id_parity_odd);
         group_parity->insert(parity_even, id_parity_even);
 
         // Build Layout
 
         lroot = new QVBoxLayout(root);
         lroot->add(speedlabel);
         lroot->add(speed_box);
         lroot->add(flow);
         QHBoxLayout *hbox = new QHBoxLayout(lroot, 2);
         hbox->add(flow_hw);
         hbox->add(flow_sw);
         lroot->add(parity);
         QHBoxLayout *hbox2 = new QHBoxLayout(lroot, 2);
         hbox2->add(parity_odd);
         hbox2->add(parity_even);
 
         // Apply profile settings
-        int rad_flow = m_profile.readNumEntry("Flow");
-        int rad_parity = m_profile.readNumEntry("Parity");
-        int speed = m_profile.readNumEntry("Speed");
+
+        int rad_flow = m_profile->readNumEntry("Flow");
+        int rad_parity = m_profile->readNumEntry("Parity");
+        int speed = m_profile->readNumEntry("Speed");
 
         if(rad_flow == IOSerial::FlowHW) flow_hw->setChecked(true);
         else flow_sw->setChecked(true);
         if(rad_parity == IOSerial::ParityEven) parity_even->setChecked(true);
         else parity_odd->setChecked(true);
         if(speed == 115200) speed_box->setCurrentItem(id_baud_115200);
         if(speed == 57600) speed_box->setCurrentItem(id_baud_57600);
         if(speed == 38400) speed_box->setCurrentItem(id_baud_38400);
         if(speed == 19200) speed_box->setCurrentItem(id_baud_19200);
         if(speed == 9600) speed_box->setCurrentItem(id_baud_9600);
 
         // Signals
 
         connect(group_flow, SIGNAL(clicked(int)), SLOT(slotConnFlow(int)));
         connect(group_parity, SIGNAL(clicked(int)), SLOT(slotConnParity(int)));
         connect(speed_box, SIGNAL(activated(int)), SLOT(slotConnSpeed(int)));
 
         return root;
 }
 
 QWidget *ProfileEditorPlugin::terminal_widget()
 {
         QWidget *root;
         QVBoxLayout *lroot;
 
         root = new QWidget();
 
         // Build GUI
 
         QComboBox *terminal_box = new QComboBox(root);
         terminal_box->insertItem("VT 100", id_term_vt100);
         terminal_box->insertItem("VT 220", id_term_vt220);
         terminal_box->insertItem("ANSI", id_term_ansi);
 
         QLabel *terminal = new QLabel(QObject::tr("Terminal type"), root);
         QLabel *colourlabel = new QLabel(QObject::tr("Colour scheme"), root);
         QLabel *sizelabel = new QLabel(QObject::tr("Font size"), root);
         QLabel *options = new QLabel(QObject::tr("Options"), root);
         QLabel *conversions = new QLabel(QObject::tr("Line-break conversions"), root);
 
         QComboBox *colour_box = new QComboBox(root);
         colour_box->insertItem(QObject::tr("black on white"), id_term_black);
         colour_box->insertItem(QObject::tr("white on black"), id_term_white);
 
         QButtonGroup *group_size = new QButtonGroup(root);
         group_size->hide();
         QRadioButton *size_small = new QRadioButton(QObject::tr("small"), root);
         QRadioButton *size_medium = new QRadioButton(QObject::tr("medium"), root);
         QRadioButton *size_large = new QRadioButton(QObject::tr("large"), root);
         group_size->insert(size_small);
         group_size->insert(size_medium);
         group_size->insert(size_large);
 
         QCheckBox *option_echo = new QCheckBox(QObject::tr("Local echo"), root);
         QCheckBox *option_wrap = new QCheckBox(QObject::tr("Line wrap"), root);
 
         QCheckBox *conv_inbound = new QCheckBox(QObject::tr("Inbound"), root);
         QCheckBox *conv_outbound = new QCheckBox(QObject::tr("Outbound"), root);
 
         // Build Layout
 
         lroot = new QVBoxLayout(root, 2);
         lroot->add(terminal);
         lroot->add(terminal_box);
         lroot->add(sizelabel);
         QHBoxLayout *hbox = new QHBoxLayout(lroot, 2);
         hbox->add(size_small);
         hbox->add(size_medium);
         hbox->add(size_large);
         lroot->add(colourlabel);
         lroot->add(colour_box);
         lroot->add(conversions);
         QHBoxLayout *hbox2 = new QHBoxLayout(lroot, 2);
         hbox2->add(conv_inbound);
         hbox2->add(conv_outbound);
         lroot->add(options);
         QHBoxLayout *hbox3 = new QHBoxLayout(lroot, 2);
         hbox3->add(option_wrap);
         hbox3->add(option_echo);
 
         // Apply profile settings
-        int term = m_profile.readNumEntry("Terminal");
-        int colour = m_profile.readNumEntry("Colour");
-        int fontsize = m_profile.readNumEntry("Font");
-        int opt_echo = m_profile.readNumEntry("Echo");
-        int opt_wrap = m_profile.readNumEntry("Wrap");
-        int opt_inbound = m_profile.readNumEntry("Inbound");
-        int opt_outbound = m_profile.readNumEntry("Outbound");
+
+        int term = m_profile->readNumEntry("Terminal");
+        int colour = m_profile->readNumEntry("Colour");
+        int fontsize = m_profile->readNumEntry("Font");
+        int opt_echo = m_profile->readNumEntry("Echo");
+        int opt_wrap = m_profile->readNumEntry("Wrap");
+        int opt_inbound = m_profile->readNumEntry("Inbound");
+        int opt_outbound = m_profile->readNumEntry("Outbound");
 
         if(term == Profile::VT102) terminal_box->setCurrentItem(id_term_vt100);
 
         if(colour == Profile::Black) colour_box->setCurrentItem(id_term_black);
         if(colour == Profile::White) colour_box->setCurrentItem(id_term_white);
 
         if(fontsize == Profile::Micro) size_small->setChecked(true);
         if(fontsize == Profile::Small) size_medium->setChecked(true);
         if(fontsize == Profile::Medium) size_large->setChecked(true);
 
         if(opt_echo) option_echo->setChecked(true);
         if(opt_wrap) option_wrap->setChecked(true);
         if(opt_inbound) conv_inbound->setChecked(true);
         if(opt_outbound) conv_outbound->setChecked(true);
 
         // Signals
 
         connect(terminal_box, SIGNAL(activated(int)), SLOT(slotTermTerm(int)));
         connect(colour_box, SIGNAL(activated(int)), SLOT(slotTermColour(int)));
         connect(group_size, SIGNAL(clicked(int)), SLOT(slotTermFont(int)));
 
         connect(option_echo, SIGNAL(toggled(bool)), SLOT(slotTermEcho(bool)));
         connect(option_wrap, SIGNAL(toggled(bool)), SLOT(slotTermWrap(bool)));
         connect(conv_inbound, SIGNAL(toggled(bool)), SLOT(slotTermInbound(bool)));
         connect(conv_outbound, SIGNAL(toggled(bool)), SLOT(slotTermOutbound(bool)));
 
         return root;
 }
 
 void ProfileEditorPlugin::slotConnFlow(int id)
 {
         switch(id)
         {
                 case id_flow_hw:
-                        m_profile.writeEntry("Flow", IOSerial::FlowHW);
+                        m_profile->writeEntry("Flow", IOSerial::FlowHW);
                         break;
                 case id_flow_sw:
-                        m_profile.writeEntry("Flow", IOSerial::FlowSW);
+                        m_profile->writeEntry("Flow", IOSerial::FlowSW);
                         break;
         }
 }
 
 void ProfileEditorPlugin::slotConnParity(int id)
 {
         switch(id)
         {
                 case id_parity_odd:
-                        m_profile.writeEntry("Parity", IOSerial::ParityEven);
+                        m_profile->writeEntry("Parity", IOSerial::ParityEven);
                         break;
                 case id_parity_even:
-                        m_profile.writeEntry("Parity", IOSerial::ParityOdd);
+                        m_profile->writeEntry("Parity", IOSerial::ParityOdd);
                         break;
         }
 }
 
 void ProfileEditorPlugin::slotConnSpeed(int id)
 {
         switch(id)
         {
 
                 case id_baud_115200:
-                        m_profile.writeEntry("Speed", 115200);
+                        m_profile->writeEntry("Speed", 115200);
                         break;
                 case id_baud_57600:
-                        m_profile.writeEntry("Speed", 57600);
+                        m_profile->writeEntry("Speed", 57600);
                         break;
                 case id_baud_38400:
-                        m_profile.writeEntry("Speed", 38400);
+                        m_profile->writeEntry("Speed", 38400);
                         break;
                 case id_baud_19200:
-                        m_profile.writeEntry("Speed", 19200);
+                        m_profile->writeEntry("Speed", 19200);
                         break;
                 case id_baud_9600:
-                        m_profile.writeEntry("Speed", 9600);
+                        m_profile->writeEntry("Speed", 9600);
                         break;
         }
 }
 
 void ProfileEditorPlugin::slotTermTerm(int id)
 {
         switch(id)
         {
                 case id_term_vt100:
-                        m_profile.writeEntry("Terminal", Profile::VT102);
+                        m_profile->writeEntry("Terminal", Profile::VT102);
                         break;
                 case id_term_vt220:
-                        m_profile.writeEntry("Terminal", Profile::VT102);
+                        m_profile->writeEntry("Terminal", Profile::VT102);
                         break;
                 case id_term_ansi:
-                        m_profile.writeEntry("Terminal", Profile::VT102);
+                        m_profile->writeEntry("Terminal", Profile::VT102);
                         break;
         }
 }
 
 void ProfileEditorPlugin::slotTermColour(int id)
 {
         switch(id)
         {
                 case id_term_black:
-                        m_profile.writeEntry("Colour", Profile::Black);
+                        m_profile->writeEntry("Colour", Profile::Black);
                         break;
                 case id_term_white:
-                        m_profile.writeEntry("Colour", Profile::White);
+                        m_profile->writeEntry("Colour", Profile::White);
                         break;
         }
 }
 
 void ProfileEditorPlugin::slotTermFont(int id)
 {
         switch(id)
         {
                 case id_size_small:
-                        m_profile.writeEntry("Font", Profile::Micro);
+                        m_profile->writeEntry("Font", Profile::Micro);
                         break;
                 case id_size_medium:
-                        m_profile.writeEntry("Font", Profile::Small);
+                        m_profile->writeEntry("Font", Profile::Small);
                         break;
                 case id_size_large:
-                        m_profile.writeEntry("Font", Profile::Medium);
+                        m_profile->writeEntry("Font", Profile::Medium);
                         break;
         }
 }
 
 void ProfileEditorPlugin::slotTermEcho(bool on)
 {
-        m_profile.writeEntry("Echo", on ? 1 : 0);
+        m_profile->writeEntry("Echo", on ? 1 : 0);
 }
 
 void ProfileEditorPlugin::slotTermWrap(bool on)
 {
-        m_profile.writeEntry("Wrap", on ? 1 : 0);
+        m_profile->writeEntry("Wrap", on ? 1 : 0);
 }
 
 void ProfileEditorPlugin::slotTermInbound(bool on)
 {
-        m_profile.writeEntry("Inbound", on ? 1 : 0);
+        m_profile->writeEntry("Inbound", on ? 1 : 0);
 }
 
 void ProfileEditorPlugin::slotTermOutbound(bool on)
 {
-        m_profile.writeEntry("Outbound", on ? 1 : 0);
+        m_profile->writeEntry("Outbound", on ? 1 : 0);
 }
 
 // Inherited classes
 
 class ProfileEditorPluginSerial : public ProfileEditorPlugin
 {
         public:
         
-        ProfileEditorPluginSerial(QWidget *parent, Profile p)
+        ProfileEditorPluginSerial(QWidget *parent, Profile *p)
         : ProfileEditorPlugin(parent, p)
         {
         }
 
         ~ProfileEditorPluginSerial()
         {
         }
 
         QWidget *widget()
         {
                 if(!m_widget)
                 {
                         QFrame *device_frame = new QFrame(m_parent);
                         device_frame->setFrameStyle(QFrame::Panel | QFrame::Sunken);
 
                         QLabel *frame_device = new QLabel(QObject::tr("Device"), device_frame);
 
                         device_line = new QLineEdit("/dev/ttyS0", device_frame);
 
                         QVBoxLayout *vbox_frame = new QVBoxLayout(device_frame, 2);
                         vbox_frame->add(frame_device);
                         vbox_frame->add(device_line);
 
                         m_widget = device_frame;
 
                         // Load special settings
-                        device_line->setText(m_profile.readEntry("Device"));
+
+                        QString dev = m_profile->readEntry("Device");
+                        if(!dev.isNull()) device_line->setText(dev);
                 }
 
                 return m_widget;
         }
 
         void save()
         {
                 // special settings
-                Profile p = m_profile;
-                p.writeEntry("Device", device_line->text());
+                m_profile->writeEntry("Device", device_line->text());
         }
 
         private:
                 QLineEdit *device_line;
 };
 
 class ProfileEditorPluginIrda : public ProfileEditorPlugin
 {
         public:
 
-        ProfileEditorPluginIrda(QWidget *parent, Profile p)
+        ProfileEditorPluginIrda(QWidget *parent, Profile *p)
         : ProfileEditorPlugin(parent, p)
         {
         }
 
         ~ProfileEditorPluginIrda()
         {
         }
 
         QWidget *widget()
         {
                 if(!m_widget)
                 {
                         QFrame *device_frame = new QFrame(m_parent);
                         device_frame->setFrameStyle(QFrame::Panel | QFrame::Sunken);
 
                         QLabel *frame_device = new QLabel(QObject::tr("Device"), device_frame);
 
                         device_line = new QLineEdit("/dev/ircomm0", device_frame);
 
                         QVBoxLayout *vbox_frame = new QVBoxLayout(device_frame, 2);
                         vbox_frame->add(frame_device);
                         vbox_frame->add(device_line);
 
                         m_widget = device_frame;
 
                         // Load special settings
-                        device_line->setText(m_profile.readEntry("Device"));
+                        QString dev = m_profile->readEntry("Device");
+                        if(!dev.isNull()) device_line->setText(dev);
                 }
 
                 return m_widget;
         }
 
         void save()
         {
                 // special settings
-                Profile p = m_profile;
-                p.writeEntry("Device", device_line->text());
+                m_profile->writeEntry("Device", device_line->text());
         }
 
         private:
                 QLineEdit *device_line;
 };
 
 class ProfileEditorPluginModem : public ProfileEditorPlugin
 {
         public:
 
-        ProfileEditorPluginModem(QWidget *parent, Profile p)
+        ProfileEditorPluginModem(QWidget *parent, Profile *p)
         : ProfileEditorPlugin(parent, p)
         {
         }
 
         ~ProfileEditorPluginModem()
         {
         }
 
         QWidget *widget()
         {
                 if(!m_widget)
                 {
                         QFrame *device_frame = new QFrame(m_parent);
                         device_frame->setFrameStyle(QFrame::Panel | QFrame::Sunken);
 
                         QLabel *frame_device = new QLabel(QObject::tr("Device"), device_frame);
                         QLabel *frame_number = new QLabel(QObject::tr("Phone number"), device_frame);
 
                         device_line = new QLineEdit("/dev/ttyS0", device_frame);
                         number_line = new QLineEdit(device_frame);
 
                         QVBoxLayout *vbox_frame = new QVBoxLayout(device_frame, 2);
                         vbox_frame->add(frame_device);
                         vbox_frame->add(device_line);
                         vbox_frame->add(frame_number);
                         vbox_frame->add(number_line);
 
                         m_widget = device_frame;
 
                         // Load special settings
-                        device_line->setText(m_profile.readEntry("Device"));
-                        number_line->setText(m_profile.readEntry("Number"));
+                        QString dev = m_profile->readEntry("Device");
+                        QString num = m_profile->readEntry("Number");
+                        if(!dev.isNull()) device_line->setText(dev);
+                        number_line->setText(num);
                 }
 
                 return m_widget;
         }
 
         void save()
         {
                 // special settings
-                Profile p = m_profile;
-                p.writeEntry("Device", device_line->text());
-                p.writeEntry("Number", number_line->text());
+                m_profile->writeEntry("Device", device_line->text());
+                m_profile->writeEntry("Number", number_line->text());
         }
 
         private:
                 QLineEdit *device_line, *number_line;
 };
 
-ProfileEditorPlugin *factory_serial(QWidget *parent, const Profile& p)
+ProfileEditorPlugin *factory_serial(QWidget *parent, Profile *p)
 {
         return new ProfileEditorPluginSerial(parent, p);
 }
 
-ProfileEditorPlugin *factory_irda(QWidget *parent, const Profile& p)
+ProfileEditorPlugin *factory_irda(QWidget *parent, Profile *p)
 {
         return new ProfileEditorPluginIrda(parent, p);
 }
 
-ProfileEditorPlugin *factory_modem(QWidget *parent, const Profile& p)
+ProfileEditorPlugin *factory_modem(QWidget *parent, Profile *p)
 {
         return new ProfileEditorPluginModem(parent, p);
 }
 
diff --git a/noncore/apps/opie-console/profileeditorplugins.h b/noncore/apps/opie-console/profileeditorplugins.h
index caec7ba..591163a 100644
--- a/noncore/apps/opie-console/profileeditorplugins.h
+++ b/noncore/apps/opie-console/profileeditorplugins.h
@@ -1,97 +1,97 @@
 #ifndef PROFILE_EDITOR_PLUGINS_H
 #define PROFILE_EDITOR_PLUGINS_H
 
 #include "profile.h"
 
 #include "qobject.h"
 
 class QWidget;
 
 class ProfileEditorPlugin : public QObject
 {
         Q_OBJECT
         public:
-                ProfileEditorPlugin(QWidget *parent, Profile p);
+                ProfileEditorPlugin(QWidget *parent, Profile *p);
 
                 virtual ~ProfileEditorPlugin();
 
                 virtual void save() = 0;
 
                 virtual QWidget *widget() = 0;
 
                 QWidget *connection_widget();
                 QWidget *terminal_widget();
 
         public slots:
                 void slotConnFlow(int id);
                 void slotConnParity(int id);
                 void slotConnSpeed(int id);
                 void slotTermTerm(int id);
                 void slotTermColour(int id);
                 void slotTermFont(int id);
                 void slotTermEcho(bool on);
                 void slotTermWrap(bool on);
                 void slotTermInbound(bool on);
                 void slotTermOutbound(bool on);
 
         protected:
                 QWidget *m_parent, *m_widget;
-                Profile m_profile;
+                Profile *m_profile;
 
         private:
                 enum ParityIds
                 {
                         id_parity_odd,
                         id_parity_even
                 };
 
                 enum FlowIds
                 {
                         id_flow_hw,
                         id_flow_sw
                 };
 
                 enum SpeedIds
                 {
                         id_baud_115200,
                         id_baud_57600,
                         id_baud_38400,
                         id_baud_19200,
                         id_baud_9600
                 };
 
                 enum TermIds
                 {
                         id_term_vt100,
                         id_term_vt220,
                         id_term_ansi
                 };
 
                 enum ColourIds
                 {
                         id_term_black,
                         id_term_white
                 };
 
                 enum FontIds
                 {
                         id_size_small,
                         id_size_medium,
                         id_size_large
                 };
 };
 
 //#ifdef __cplusplus
 //extern "C" {
 //#endif
 
-ProfileEditorPlugin *factory_serial(QWidget *parent, const Profile& p);
-ProfileEditorPlugin *factory_irda(QWidget *parent, const Profile& p);
-ProfileEditorPlugin *factory_modem(QWidget *parent, const Profile& p);
+ProfileEditorPlugin *factory_serial(QWidget *parent, Profile *p);
+ProfileEditorPlugin *factory_irda(QWidget *parent, Profile *p);
+ProfileEditorPlugin *factory_modem(QWidget *parent, Profile *p);
 
 //#ifdef __cplusplus
 //}
 //#endif
 
 #endif