summaryrefslogtreecommitdiff
authorzecke <zecke>2002-10-15 10:55:58 (UTC)
committer zecke <zecke>2002-10-15 10:55:58 (UTC)
commitf2e9de1c8b6d3b2b2e82dec23ebf502c5805f575 (patch) (unidiff)
tree108efdb1a75a78dd212a69ccad718c2e65ece0bf
parentdaae7a75b0e9ccbf1ea4c699c631ad77825e6301 (diff)
downloadopie-f2e9de1c8b6d3b2b2e82dec23ebf502c5805f575.zip
opie-f2e9de1c8b6d3b2b2e82dec23ebf502c5805f575.tar.gz
opie-f2e9de1c8b6d3b2b2e82dec23ebf502c5805f575.tar.bz2
Remove debugging output
Fix possible crashes in io_bt and io_irda
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/MyPty.cpp6
-rw-r--r--noncore/apps/opie-console/configdialog.cpp1
-rw-r--r--noncore/apps/opie-console/emulation_handler.cpp6
-rw-r--r--noncore/apps/opie-console/filereceive.cpp2
-rw-r--r--noncore/apps/opie-console/filetransfer.cpp6
-rw-r--r--noncore/apps/opie-console/io_bt.cpp1
-rw-r--r--noncore/apps/opie-console/io_irda.cpp2
-rw-r--r--noncore/apps/opie-console/io_serial.cpp8
-rw-r--r--noncore/apps/opie-console/iolayerbase.cpp3
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp5
-rw-r--r--noncore/apps/opie-console/metafactory.cpp1
-rw-r--r--noncore/apps/opie-console/procctl.cpp1
-rw-r--r--noncore/apps/opie-console/profile.cpp2
-rw-r--r--noncore/apps/opie-console/profileconfig.cpp1
-rw-r--r--noncore/apps/opie-console/profileeditordialog.cpp7
-rw-r--r--noncore/apps/opie-console/profilemanager.cpp4
-rw-r--r--noncore/apps/opie-console/session.cpp1
-rw-r--r--noncore/apps/opie-console/tabwidget.cpp1
18 files changed, 3 insertions, 55 deletions
diff --git a/noncore/apps/opie-console/MyPty.cpp b/noncore/apps/opie-console/MyPty.cpp
index ae01392..b6ae1d9 100644
--- a/noncore/apps/opie-console/MyPty.cpp
+++ b/noncore/apps/opie-console/MyPty.cpp
@@ -114,7 +114,6 @@ void MyPty::donePty()
114 ::close(m_fd); 114 ::close(m_fd);
115 115
116 if (m_cpid) { 116 if (m_cpid) {
117 qWarning("killing!!!");
118 kill(m_cpid, SIGHUP); 117 kill(m_cpid, SIGHUP);
119 //waitpid(m_cpid, &status, 0); 118 //waitpid(m_cpid, &status, 0);
120 delete m_sn_e; 119 delete m_sn_e;
@@ -134,7 +133,6 @@ const char* MyPty::deviceName()
134 133
135void MyPty::error() 134void MyPty::error()
136{ 135{
137 qWarning("error");
138 // This is code from the Qt DumbTerminal example 136 // This is code from the Qt DumbTerminal example
139 donePty(); 137 donePty();
140} 138}
@@ -268,7 +266,6 @@ void MyPty::reload( const Profile& ) {
268/*! sends len bytes through the line */ 266/*! sends len bytes through the line */
269void MyPty::send(const QByteArray& ar) 267void MyPty::send(const QByteArray& ar)
270{ 268{
271 qWarning("sending!");
272#ifdef VERBOSE_DEBUG 269#ifdef VERBOSE_DEBUG
273 // verbose debug 270 // verbose debug
274 printf("sending bytes:\n"); 271 printf("sending bytes:\n");
@@ -283,15 +280,12 @@ void MyPty::send(const QByteArray& ar)
283/*! indicates that a block of data is received */ 280/*! indicates that a block of data is received */
284void MyPty::readPty() 281void MyPty::readPty()
285{ 282{
286 qWarning("read");
287 QByteArray buf(4096); 283 QByteArray buf(4096);
288 284
289 int len = ::read( m_fd, buf.data(), 4096 ); 285 int len = ::read( m_fd, buf.data(), 4096 );
290 286
291 if (len == -1 || len == 0) { 287 if (len == -1 || len == 0) {
292 qWarning("donePty!!! now!");
293 donePty(); 288 donePty();
294 qWarning("return %s", sender()->className() );
295 delete sender(); 289 delete sender();
296 return; 290 return;
297 } 291 }
diff --git a/noncore/apps/opie-console/configdialog.cpp b/noncore/apps/opie-console/configdialog.cpp
index 8745305..0bc6588 100644
--- a/noncore/apps/opie-console/configdialog.cpp
+++ b/noncore/apps/opie-console/configdialog.cpp
@@ -92,7 +92,6 @@ void ConfigDialog::slotEdit() {
92 92
93 93
94void ConfigDialog::slotAdd() { 94void ConfigDialog::slotAdd() {
95 qWarning("slotAdd");
96 ProfileEditorDialog dlg(m_fact); 95 ProfileEditorDialog dlg(m_fact);
97 96
98 dlg.setCaption("New Connection"); 97 dlg.setCaption("New Connection");
diff --git a/noncore/apps/opie-console/emulation_handler.cpp b/noncore/apps/opie-console/emulation_handler.cpp
index 836a05b..b2cd348 100644
--- a/noncore/apps/opie-console/emulation_handler.cpp
+++ b/noncore/apps/opie-console/emulation_handler.cpp
@@ -37,11 +37,9 @@ void EmulationHandler::load( const Profile& prof) {
37 m_teWid->setBackgroundColor(backColor(num) ); 37 m_teWid->setBackgroundColor(backColor(num) );
38} 38}
39void EmulationHandler::recv( const QByteArray& ar) { 39void EmulationHandler::recv( const QByteArray& ar) {
40 qWarning("received in EmulationHandler!");
41 m_teEmu->onRcvBlock(ar.data(), ar.count() ); 40 m_teEmu->onRcvBlock(ar.data(), ar.count() );
42} 41}
43void EmulationHandler::recvEmulation(const char* src, int len ) { 42void EmulationHandler::recvEmulation(const char* src, int len ) {
44 qWarning("received from te ");
45 QByteArray ar(len); 43 QByteArray ar(len);
46 44
47 memcpy(ar.data(), src, sizeof(char) * len ); 45 memcpy(ar.data(), src, sizeof(char) * len );
@@ -99,12 +97,10 @@ QColor EmulationHandler::foreColor(int col) {
99 switch( col ) { 97 switch( col ) {
100 default: 98 default:
101 case Profile::White: 99 case Profile::White:
102 qWarning("Foreground black");
103 /* color is black */ 100 /* color is black */
104 co = Qt::white; 101 co = Qt::white;
105 break; 102 break;
106 case Profile::Black: 103 case Profile::Black:
107 qWarning("Foreground white");
108 co = Qt::black; 104 co = Qt::black;
109 break; 105 break;
110 case Profile::Green: 106 case Profile::Green:
@@ -126,12 +122,10 @@ QColor EmulationHandler::backColor(int col ) {
126 switch( col ) { 122 switch( col ) {
127 default: 123 default:
128 case Profile::White: 124 case Profile::White:
129 qWarning("Background white");
130 /* color is white */ 125 /* color is white */
131 co = Qt::black; 126 co = Qt::black;
132 break; 127 break;
133 case Profile::Black: 128 case Profile::Black:
134 qWarning("Background black");
135 co = Qt::white; 129 co = Qt::white;
136 break; 130 break;
137 case Profile::Green: 131 case Profile::Green:
diff --git a/noncore/apps/opie-console/filereceive.cpp b/noncore/apps/opie-console/filereceive.cpp
index 26b3dec..e517862 100644
--- a/noncore/apps/opie-console/filereceive.cpp
+++ b/noncore/apps/opie-console/filereceive.cpp
@@ -135,13 +135,11 @@ void FileReceive::setupChild() {
135void FileReceive::slotRead() { 135void FileReceive::slotRead() {
136 QByteArray ar(4096); 136 QByteArray ar(4096);
137 int len = read(m_comm[0], ar.data(), 4096 ); 137 int len = read(m_comm[0], ar.data(), 4096 );
138 qWarning("slot read %d", len);
139 for (int i = 0; i < len; i++ ) { 138 for (int i = 0; i < len; i++ ) {
140 // printf("%c", ar[i] ); 139 // printf("%c", ar[i] );
141 } 140 }
142 ar.resize( len ); 141 ar.resize( len );
143 QString str( ar ); 142 QString str( ar );
144 qWarning(str.simplifyWhiteSpace() );
145} 143}
146void FileReceive::slotExec() { 144void FileReceive::slotExec() {
147 char buf[2]; 145 char buf[2];
diff --git a/noncore/apps/opie-console/filetransfer.cpp b/noncore/apps/opie-console/filetransfer.cpp
index 8ca0df2..b81c2a2 100644
--- a/noncore/apps/opie-console/filetransfer.cpp
+++ b/noncore/apps/opie-console/filetransfer.cpp
@@ -53,7 +53,6 @@ void FileTransfer::sendFile( const QString& file ) {
53 break; 53 break;
54 case 0:{ 54 case 0:{
55 setupChild(); 55 setupChild();
56 qWarning("output:"+file );
57 /* exec */ 56 /* exec */
58 char* verbose = "-vv"; 57 char* verbose = "-vv";
59 char* binray = "-b"; 58 char* binray = "-b";
@@ -166,19 +165,16 @@ void FileTransfer::setupChild() {
166void FileTransfer::slotRead() { 165void FileTransfer::slotRead() {
167 QByteArray ar(4096); 166 QByteArray ar(4096);
168 int len = read(m_comm[0], ar.data(), 4096 ); 167 int len = read(m_comm[0], ar.data(), 4096 );
169 qWarning("slot read %d", len);
170 for (int i = 0; i < len; i++ ) { 168 for (int i = 0; i < len; i++ ) {
171 // printf("%c", ar[i] ); 169 // printf("%c", ar[i] );
172 } 170 }
173 ar.resize( len ); 171 ar.resize( len );
174 QString str( ar ); 172 QString str( ar );
175 qWarning(str.simplifyWhiteSpace() );
176 QStringList lis = QStringList::split(' ', str ); 173 QStringList lis = QStringList::split(' ', str );
177 /* 174 /*
178 * Transfer finished.. either complete or incomplete 175 * Transfer finished.. either complete or incomplete
179 */ 176 */
180 if ( lis[0].simplifyWhiteSpace() == "Transfer" ) { 177 if ( lis[0].simplifyWhiteSpace() == "Transfer" ) {
181 qWarning("sent!!!!");
182 return; 178 return;
183 } 179 }
184 /* 180 /*
@@ -214,7 +210,6 @@ void FileTransfer::slotProgress( const QStringList& list ) {
214 return; 210 return;
215 } 211 }
216 212
217 qWarning("%s, %d, %d", progi.join("/").latin1(), sent, total );
218 213
219 double pro = (double)sent/total; 214 double pro = (double)sent/total;
220 int prog = pro * 100; 215 int prog = pro * 100;
@@ -240,7 +235,6 @@ void FileTransfer::cancel() {
240 235
241} 236}
242void FileTransfer::slotExec() { 237void FileTransfer::slotExec() {
243 qWarning("exited!");
244 char buf[2]; 238 char buf[2];
245 ::read(m_term[0], buf, 1 ); 239 ::read(m_term[0], buf, 1 );
246 delete m_proc; 240 delete m_proc;
diff --git a/noncore/apps/opie-console/io_bt.cpp b/noncore/apps/opie-console/io_bt.cpp
index 8bff4df..0831faf 100644
--- a/noncore/apps/opie-console/io_bt.cpp
+++ b/noncore/apps/opie-console/io_bt.cpp
@@ -36,6 +36,7 @@ bool IOBt::open() {
36 } else { 36 } else {
37 qWarning("could not attach to device"); 37 qWarning("could not attach to device");
38 delete m_attach; 38 delete m_attach;
39 m_attach = 0;
39 } 40 }
40} 41}
41 42
diff --git a/noncore/apps/opie-console/io_irda.cpp b/noncore/apps/opie-console/io_irda.cpp
index 8e31e82..56a373c 100644
--- a/noncore/apps/opie-console/io_irda.cpp
+++ b/noncore/apps/opie-console/io_irda.cpp
@@ -32,8 +32,10 @@ bool IOIrda::open() {
32 if ( m_attach->start() ) { 32 if ( m_attach->start() ) {
33 IOSerial::open(); 33 IOSerial::open();
34 } else { 34 } else {
35 // emit error!!!
35 qWarning("could not attach to device"); 36 qWarning("could not attach to device");
36 delete m_attach; 37 delete m_attach;
38 m_attach = 0l;
37 } 39 }
38} 40}
39 41
diff --git a/noncore/apps/opie-console/io_serial.cpp b/noncore/apps/opie-console/io_serial.cpp
index 03f1b1a..a4a6f0b 100644
--- a/noncore/apps/opie-console/io_serial.cpp
+++ b/noncore/apps/opie-console/io_serial.cpp
@@ -27,7 +27,6 @@ void IOSerial::send(const QByteArray &data) {
27} 27}
28 28
29void IOSerial::close() { 29void IOSerial::close() {
30 qWarning("closing!");
31 if (m_fd) { 30 if (m_fd) {
32 delete m_read; 31 delete m_read;
33 delete m_error; 32 delete m_error;
@@ -39,13 +38,10 @@ void IOSerial::close() {
39} 38}
40 39
41bool IOSerial::open() { 40bool IOSerial::open() {
42 qWarning("open");
43 if (!m_fd) { 41 if (!m_fd) {
44 qWarning("going to open %s", m_device.latin1());
45 struct termios tty; 42 struct termios tty;
46 m_fd = ::open(m_device, O_RDWR | O_NOCTTY | O_NONBLOCK); 43 m_fd = ::open(m_device, O_RDWR | O_NOCTTY | O_NONBLOCK);
47 if (m_fd < 0) { 44 if (m_fd < 0) {
48 qWarning(" fd < 0 ");
49 emit error(CouldNotOpen, strerror(errno)); 45 emit error(CouldNotOpen, strerror(errno));
50 return FALSE; 46 return FALSE;
51 } 47 }
@@ -54,7 +50,6 @@ bool IOSerial::open() {
54 /* Baud rate */ 50 /* Baud rate */
55 int speed = baud(m_baud); 51 int speed = baud(m_baud);
56 if (speed == -1) { 52 if (speed == -1) {
57 qWarning("speed -1");
58 emit error(Refuse, tr("Invalid baud rate")); 53 emit error(Refuse, tr("Invalid baud rate"));
59 } 54 }
60 cfsetospeed(&tty, speed); 55 cfsetospeed(&tty, speed);
@@ -118,7 +113,6 @@ bool IOSerial::open() {
118 connect(m_error, SIGNAL(activated(int)), this, SLOT(errorOccured())); 113 connect(m_error, SIGNAL(activated(int)), this, SLOT(errorOccured()));
119 return TRUE; 114 return TRUE;
120 } else { 115 } else {
121 qWarning(" already opened");
122 emit error(Refuse, tr("Device is already connected")); 116 emit error(Refuse, tr("Device is already connected"));
123 m_fd = 0; 117 m_fd = 0;
124 return FALSE; 118 return FALSE;
@@ -127,8 +121,6 @@ bool IOSerial::open() {
127 121
128void IOSerial::reload(const Profile &config) { 122void IOSerial::reload(const Profile &config) {
129 m_device = config.readEntry("Device", SERIAL_DEFAULT_DEVICE); 123 m_device = config.readEntry("Device", SERIAL_DEFAULT_DEVICE);
130 qWarning( "Dev" +m_device );
131 qWarning( "Conf:" +config.readEntry("Device") );
132 m_baud = config.readNumEntry("Speed", SERIAL_DEFAULT_BAUD); 124 m_baud = config.readNumEntry("Speed", SERIAL_DEFAULT_BAUD);
133 m_parity = config.readNumEntry("Parity", SERIAL_DEFAULT_PARITY); 125 m_parity = config.readNumEntry("Parity", SERIAL_DEFAULT_PARITY);
134 m_dbits = config.readNumEntry("DataBits", SERIAL_DEFAULT_DBITS); 126 m_dbits = config.readNumEntry("DataBits", SERIAL_DEFAULT_DBITS);
diff --git a/noncore/apps/opie-console/iolayerbase.cpp b/noncore/apps/opie-console/iolayerbase.cpp
index 49ed284..b0df02d 100644
--- a/noncore/apps/opie-console/iolayerbase.cpp
+++ b/noncore/apps/opie-console/iolayerbase.cpp
@@ -129,13 +129,10 @@ void IOLayerBase::setSpeed( Speed sp ) {
129} 129}
130IOLayerBase::Flow IOLayerBase::flow()const { 130IOLayerBase::Flow IOLayerBase::flow()const {
131 if (m_flowHw->isChecked() ) { 131 if (m_flowHw->isChecked() ) {
132 qWarning("Hardware flow");
133 return Hardware; 132 return Hardware;
134 }else if( m_flowSw->isChecked() ) { 133 }else if( m_flowSw->isChecked() ) {
135 qWarning("Software");
136 return Software; 134 return Software;
137 } else { 135 } else {
138 qWarning("None");
139 return None; 136 return None;
140 } 137 }
141} 138}
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index b770551..94c99bc 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -263,7 +263,6 @@ QList<Session> MainWindow::sessions() {
263} 263}
264 264
265void MainWindow::slotNew() { 265void MainWindow::slotNew() {
266 qWarning("New Connection");
267 ProfileEditorDialog dlg(factory() ); 266 ProfileEditorDialog dlg(factory() );
268 dlg.showMaximized(); 267 dlg.showMaximized();
269 int ret = dlg.exec(); 268 int ret = dlg.exec();
@@ -339,14 +338,12 @@ void MainWindow::slotTerminate() {
339} 338}
340 339
341void MainWindow::slotConfigure() { 340void MainWindow::slotConfigure() {
342 qWarning("configure");
343 ConfigDialog conf( manager()->all(), factory() ); 341 ConfigDialog conf( manager()->all(), factory() );
344 conf.showMaximized(); 342 conf.showMaximized();
345 343
346 int ret = conf.exec(); 344 int ret = conf.exec();
347 345
348 if ( QDialog::Accepted == ret ) { 346 if ( QDialog::Accepted == ret ) {
349 qWarning("conf %d", conf.list().count() );
350 manager()->setProfiles( conf.list() ); 347 manager()->setProfiles( conf.list() );
351 manager()->save(); 348 manager()->save();
352 populateProfiles(); 349 populateProfiles();
@@ -360,7 +357,6 @@ void MainWindow::slotConfigure() {
360 * and set the currentSession() 357 * and set the currentSession()
361 */ 358 */
362void MainWindow::slotClose() { 359void MainWindow::slotClose() {
363 qWarning("close");
364 if (!currentSession() ) 360 if (!currentSession() )
365 return; 361 return;
366 362
@@ -438,7 +434,6 @@ void MainWindow::slotOpenKeb(bool state) {
438} 434}
439void MainWindow::slotSessionChanged( Session* ses ) { 435void MainWindow::slotSessionChanged( Session* ses ) {
440 if ( ses ) { 436 if ( ses ) {
441 qWarning("changing %s", ses->name().latin1() );
442 m_curSession = ses; 437 m_curSession = ses;
443 438
444 if ( m_curSession->isConnected() ) { 439 if ( m_curSession->isConnected() ) {
diff --git a/noncore/apps/opie-console/metafactory.cpp b/noncore/apps/opie-console/metafactory.cpp
index 09ba586..04a5dfa 100644
--- a/noncore/apps/opie-console/metafactory.cpp
+++ b/noncore/apps/opie-console/metafactory.cpp
@@ -120,7 +120,6 @@ ProfileDialogWidget *MetaFactory::newTerminalPlugin( const QString& str, QWidget
120 if (str.isEmpty() ) 120 if (str.isEmpty() )
121 return 0l; 121 return 0l;
122 ProfileDialogWidget* wid = 0l; 122 ProfileDialogWidget* wid = 0l;
123 qWarning("new terminalPlugin %s %l", str.latin1(), parent );
124 123
125 QMap<QString, configWidget>::Iterator it; 124 QMap<QString, configWidget>::Iterator it;
126 it = m_termFact.find( str ); 125 it = m_termFact.find( str );
diff --git a/noncore/apps/opie-console/procctl.cpp b/noncore/apps/opie-console/procctl.cpp
index d1cfaf6..ff6bea8 100644
--- a/noncore/apps/opie-console/procctl.cpp
+++ b/noncore/apps/opie-console/procctl.cpp
@@ -71,7 +71,6 @@ int ProcCtl::status(pid_t pid )const{
71 return -1; 71 return -1;
72} 72}
73void ProcCtl::signal_handler(int) { 73void ProcCtl::signal_handler(int) {
74 qWarning("signal handler in ProcCtl");
75 int status; 74 int status;
76 signal( SIGCHLD, signal_handler ); 75 signal( SIGCHLD, signal_handler );
77 pid_t pi = waitpid( -1, &status, WNOHANG ); 76 pid_t pi = waitpid( -1, &status, WNOHANG );
diff --git a/noncore/apps/opie-console/profile.cpp b/noncore/apps/opie-console/profile.cpp
index ffd672e..1a94619 100644
--- a/noncore/apps/opie-console/profile.cpp
+++ b/noncore/apps/opie-console/profile.cpp
@@ -78,11 +78,9 @@ void Profile::clearConf() {
78 m_conf.clear(); 78 m_conf.clear();
79} 79}
80void Profile::writeEntry( const QString& key, const QString& value ) { 80void Profile::writeEntry( const QString& key, const QString& value ) {
81 qWarning("key %s value %s", key.latin1(), value.latin1() );
82 m_conf.replace( key, value ); 81 m_conf.replace( key, value );
83} 82}
84void Profile::writeEntry( const QString& key, int num ) { 83void Profile::writeEntry( const QString& key, int num ) {
85 qWarning("num");
86 writeEntry( key, QString::number( num ) ); 84 writeEntry( key, QString::number( num ) );
87} 85}
88void Profile::writeEntry( const QString& key, bool b ) { 86void Profile::writeEntry( const QString& key, bool b ) {
diff --git a/noncore/apps/opie-console/profileconfig.cpp b/noncore/apps/opie-console/profileconfig.cpp
index 732fae7..bd089c8 100644
--- a/noncore/apps/opie-console/profileconfig.cpp
+++ b/noncore/apps/opie-console/profileconfig.cpp
@@ -12,7 +12,6 @@ QStringList ProfileConfig::groups()const {
12 QStringList list; 12 QStringList list;
13 QMap<QString, ConfigGroup>::ConstIterator it; 13 QMap<QString, ConfigGroup>::ConstIterator it;
14 it= Config::groups.begin(); 14 it= Config::groups.begin();
15 qWarning("config %d", Config::groups.count() );
16 15
17 for (; it != Config::groups.end(); ++it ) 16 for (; it != Config::groups.end(); ++it )
18 list << it.key(); 17 list << it.key();
diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp
index 094c871..b709cf3 100644
--- a/noncore/apps/opie-console/profileeditordialog.cpp
+++ b/noncore/apps/opie-console/profileeditordialog.cpp
@@ -115,10 +115,6 @@ void ProfileEditorDialog::initUI()
115 setCurrent( m_fact->external(m_prof.ioLayerName() ), m_conCmb ); 115 setCurrent( m_fact->external(m_prof.ioLayerName() ), m_conCmb );
116 setCurrent( m_fact->external(m_prof.terminalName() ), m_termCmb ); 116 setCurrent( m_fact->external(m_prof.terminalName() ), m_termCmb );
117 117
118 qWarning("Layer: %s %s", m_prof.ioLayerName().data(),
119 m_fact->external(m_prof.ioLayerName() ).latin1() );
120 qWarning("Term: %s %s", m_prof.terminalName().data(),
121 m_fact->external(m_prof.terminalName() ).latin1() );
122 118
123 // signal and slots 119 // signal and slots
124 connect(m_conCmb, SIGNAL(activated(const QString& ) ), 120 connect(m_conCmb, SIGNAL(activated(const QString& ) ),
@@ -147,8 +143,6 @@ void ProfileEditorDialog::accept()
147 m_prof.setName(profName()); 143 m_prof.setName(profName());
148 m_prof.setIOLayer( m_fact->internal(m_conCmb ->currentText() ) ); 144 m_prof.setIOLayer( m_fact->internal(m_conCmb ->currentText() ) );
149 m_prof.setTerminalName( m_fact->internal(m_termCmb->currentText() ) ); 145 m_prof.setTerminalName( m_fact->internal(m_termCmb->currentText() ) );
150 qWarning("Term %s %s", m_fact->internal(m_termCmb->currentText() ).data(),
151 m_termCmb->currentText().latin1() );
152 146
153 if (m_con ) 147 if (m_con )
154 m_con->save( m_prof ); 148 m_con->save( m_prof );
@@ -190,7 +184,6 @@ void ProfileEditorDialog::slotConActivated( const QString& str ) {
190void ProfileEditorDialog::slotTermActivated( const QString& str ) { 184void ProfileEditorDialog::slotTermActivated( const QString& str ) {
191 delete m_term; 185 delete m_term;
192 m_term = m_fact->newTerminalPlugin( str, m_tabTerm ); 186 m_term = m_fact->newTerminalPlugin( str, m_tabTerm );
193 qWarning("past");
194 187
195 if (m_term) { 188 if (m_term) {
196 m_term->load(m_prof ); 189 m_term->load(m_prof );
diff --git a/noncore/apps/opie-console/profilemanager.cpp b/noncore/apps/opie-console/profilemanager.cpp
index 95a46f9..e5aedb6 100644
--- a/noncore/apps/opie-console/profilemanager.cpp
+++ b/noncore/apps/opie-console/profilemanager.cpp
@@ -24,7 +24,6 @@ ProfileManager::~ProfileManager() {
24} 24}
25void ProfileManager::load() { 25void ProfileManager::load() {
26 m_list.clear(); 26 m_list.clear();
27 qWarning("load");
28 ProfileConfig conf("opie-console-profiles"); 27 ProfileConfig conf("opie-console-profiles");
29 QStringList groups = conf.groups(); 28 QStringList groups = conf.groups();
30 QStringList::Iterator it; 29 QStringList::Iterator it;
@@ -33,13 +32,11 @@ void ProfileManager::load() {
33 * for each profile 32 * for each profile
34 */ 33 */
35 for ( it = groups.begin(); it != groups.end(); ++it ) { 34 for ( it = groups.begin(); it != groups.end(); ++it ) {
36 qWarning("group " + (*it) );
37 conf.setGroup( (*it) ); 35 conf.setGroup( (*it) );
38 Profile prof; 36 Profile prof;
39 prof.setName( conf.readEntry("name") ); 37 prof.setName( conf.readEntry("name") );
40 prof.setIOLayer( conf.readEntry("iolayer").utf8() ); 38 prof.setIOLayer( conf.readEntry("iolayer").utf8() );
41 prof.setTerminalName( conf.readEntry("term").utf8() ); 39 prof.setTerminalName( conf.readEntry("term").utf8() );
42 qWarning(" %s %s", conf.readEntry("iolayer").latin1(), prof.ioLayerName().data() );
43 prof.setBackground( conf.readNumEntry("back") ); 40 prof.setBackground( conf.readNumEntry("back") );
44 prof.setForeground( conf.readNumEntry("fore") ); 41 prof.setForeground( conf.readNumEntry("fore") );
45 prof.setTerminal( conf.readNumEntry("terminal") ); 42 prof.setTerminal( conf.readNumEntry("terminal") );
@@ -121,7 +118,6 @@ void ProfileManager::save( ) {
121 118
122 conf.writeEntry( "name", (*it2).name() ); 119 conf.writeEntry( "name", (*it2).name() );
123 QString str = QString::fromUtf8( (*it2).ioLayerName() ); 120 QString str = QString::fromUtf8( (*it2).ioLayerName() );
124 qWarning("IOLayerName " + str );
125 121
126 conf.writeEntry( "iolayer", str ); 122 conf.writeEntry( "iolayer", str );
127 conf.writeEntry( "term", QString::fromUtf8( (*it2).terminalName() ) ); 123 conf.writeEntry( "term", QString::fromUtf8( (*it2).terminalName() ) );
diff --git a/noncore/apps/opie-console/session.cpp b/noncore/apps/opie-console/session.cpp
index d0ace6c..e53dbc4 100644
--- a/noncore/apps/opie-console/session.cpp
+++ b/noncore/apps/opie-console/session.cpp
@@ -47,7 +47,6 @@ void Session::connect() {
47 47
48 m_connected = true; 48 m_connected = true;
49 49
50 qWarning("connection in session");
51 QObject::connect(m_layer, SIGNAL(received(const QByteArray&) ), 50 QObject::connect(m_layer, SIGNAL(received(const QByteArray&) ),
52 m_emu, SLOT(recv(const QByteArray&) ) ); 51 m_emu, SLOT(recv(const QByteArray&) ) );
53 QObject::connect(m_emu, SIGNAL(send(const QByteArray&) ), 52 QObject::connect(m_emu, SIGNAL(send(const QByteArray&) ),
diff --git a/noncore/apps/opie-console/tabwidget.cpp b/noncore/apps/opie-console/tabwidget.cpp
index 466b536..8a691f9 100644
--- a/noncore/apps/opie-console/tabwidget.cpp
+++ b/noncore/apps/opie-console/tabwidget.cpp
@@ -12,7 +12,6 @@ TabWidget::~TabWidget() {
12 12
13void TabWidget::add( Session* ses ) { 13void TabWidget::add( Session* ses ) {
14 if ( !ses->widgetStack() ) return; 14 if ( !ses->widgetStack() ) return;
15 qWarning("going to add it");
16 //reparent( ses->widgetStack(), QPoint() ); 15 //reparent( ses->widgetStack(), QPoint() );
17 addTab( ses->widgetStack(), "console/konsole", ses->name() ); 16 addTab( ses->widgetStack(), "console/konsole", ses->name() );
18 //addTab( ses->widgetStack(), ses->name() ); 17 //addTab( ses->widgetStack(), ses->name() );