summaryrefslogtreecommitdiff
path: root/noncore
Unidiff
Diffstat (limited to 'noncore') (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/opie-console/btconfigwidget.cpp4
-rw-r--r--noncore/apps/opie-console/default.cpp2
-rw-r--r--noncore/apps/opie-console/dialer.cpp2
-rw-r--r--noncore/apps/opie-console/dialer.h2
-rw-r--r--noncore/apps/opie-console/function_keyboard.cpp4
-rw-r--r--noncore/apps/opie-console/io_modem.cpp2
-rw-r--r--noncore/apps/opie-console/iolayerbase.cpp4
-rw-r--r--noncore/apps/opie-console/irdaconfigwidget.cpp4
-rw-r--r--noncore/apps/opie-console/main.cpp1
-rw-r--r--noncore/apps/opie-console/modemconfigwidget.cpp3
-rw-r--r--noncore/apps/opie-console/procctl.cpp1
-rw-r--r--noncore/apps/opie-console/profileeditordialog.cpp3
-rw-r--r--noncore/apps/opie-console/serialconfigwidget.cpp2
-rw-r--r--noncore/apps/opie-console/transferdialog.cpp8
14 files changed, 26 insertions, 16 deletions
diff --git a/noncore/apps/opie-console/btconfigwidget.cpp b/noncore/apps/opie-console/btconfigwidget.cpp
index 6246f92..64046d8 100644
--- a/noncore/apps/opie-console/btconfigwidget.cpp
+++ b/noncore/apps/opie-console/btconfigwidget.cpp
@@ -8,13 +8,13 @@
8#include "iolayerbase.h" 8#include "iolayerbase.h"
9#include "btconfigwidget.h" 9#include "btconfigwidget.h"
10 10
11namespace { 11namespace {
12 void setCurrent( const QString& str, QComboBox* bo ) { 12 void setCurrent( const QString& str, QComboBox* bo ) {
13 uint b = bo->count(); 13 uint b = bo->count();
14 for (uint i = 0; i < bo->count(); i++ ) { 14 for (int i = 0; i < bo->count(); i++ ) {
15 if ( bo->text(i) == str ) { 15 if ( bo->text(i) == str ) {
16 bo->setCurrentItem( i ); 16 bo->setCurrentItem( i );
17 return; 17 return;
18 } 18 }
19 } 19 }
20 bo->insertItem( str ); 20 bo->insertItem( str );
@@ -113,12 +113,13 @@ void BTConfigWidget::load( const Profile& prof ) {
113 * save speed, 113 * save speed,
114 * flow, 114 * flow,
115 * parity 115 * parity
116 */ 116 */
117void BTConfigWidget::save( Profile& prof ) { 117void BTConfigWidget::save( Profile& prof ) {
118 int flow, parity, speed; 118 int flow, parity, speed;
119 flow = parity = speed = 0;
119 prof.writeEntry("Device", m_deviceCmb->currentText() ); 120 prof.writeEntry("Device", m_deviceCmb->currentText() );
120 121
121 122
122 switch( m_base->flow() ) { 123 switch( m_base->flow() ) {
123 case IOLayerBase::None: 124 case IOLayerBase::None:
124 flow = 0; 125 flow = 0;
@@ -153,12 +154,13 @@ void BTConfigWidget::save( Profile& prof ) {
153 case IOLayerBase::Baud_38400: 154 case IOLayerBase::Baud_38400:
154 speed = 38400; 155 speed = 38400;
155 break; 156 break;
156 case IOLayerBase::Baud_19200: 157 case IOLayerBase::Baud_19200:
157 speed = 19200; 158 speed = 19200;
158 break; 159 break;
160 default:
159 case IOLayerBase::Baud_9600: 161 case IOLayerBase::Baud_9600:
160 speed = 9600; 162 speed = 9600;
161 break; 163 break;
162 } 164 }
163 165
164 prof.writeEntry("Flow", flow); 166 prof.writeEntry("Flow", flow);
diff --git a/noncore/apps/opie-console/default.cpp b/noncore/apps/opie-console/default.cpp
index 0160b56..19640d8 100644
--- a/noncore/apps/opie-console/default.cpp
+++ b/noncore/apps/opie-console/default.cpp
@@ -64,13 +64,13 @@ extern "C" {
64 ProfileDialogWidget* newModemWidget( const QString& str, QWidget* wid ) { 64 ProfileDialogWidget* newModemWidget( const QString& str, QWidget* wid ) {
65 return new ModemConfigWidget(str, wid ); 65 return new ModemConfigWidget(str, wid );
66 } 66 }
67 ProfileDialogWidget* newBTWidget( const QString& str, QWidget* wid ) { 67 ProfileDialogWidget* newBTWidget( const QString& str, QWidget* wid ) {
68 return new BTConfigWidget(str, wid ); 68 return new BTConfigWidget(str, wid );
69 } 69 }
70 ProfileDialogWidget* newConsoleWid( const QString& str, QWidget* wid ) { 70 ProfileDialogWidget* newConsoleWid( const QString& , QWidget* ) {
71 return 0l; 71 return 0l;
72 } 72 }
73 73
74 74
75 // Terminal Widget(s) 75 // Terminal Widget(s)
76 ProfileDialogWidget* newTerminalWidget(const QString& na, QWidget* wid) { 76 ProfileDialogWidget* newTerminalWidget(const QString& na, QWidget* wid) {
diff --git a/noncore/apps/opie-console/dialer.cpp b/noncore/apps/opie-console/dialer.cpp
index d37e406..5056040 100644
--- a/noncore/apps/opie-console/dialer.cpp
+++ b/noncore/apps/opie-console/dialer.cpp
@@ -222,13 +222,13 @@ void Dialer::send(const QString& msg)
222 222
223QString Dialer::receive() 223QString Dialer::receive()
224{ 224{
225 QString buf; 225 QString buf;
226 char buffer[1024]; 226 char buffer[1024];
227 int ret; 227 int ret;
228 int counter; 228 int counter = 0;
229 229
230 while(1) 230 while(1)
231 { 231 {
232 ret = ::read(m_fd, buffer, sizeof(buffer)); 232 ret = ::read(m_fd, buffer, sizeof(buffer));
233 233
234 if(ret > 0) 234 if(ret > 0)
diff --git a/noncore/apps/opie-console/dialer.h b/noncore/apps/opie-console/dialer.h
index 28303f3..88681a3 100644
--- a/noncore/apps/opie-console/dialer.h
+++ b/noncore/apps/opie-console/dialer.h
@@ -42,13 +42,13 @@ class Dialer : public QDialog
42 42
43 QLabel *status; 43 QLabel *status;
44 QProgressBar *progress; 44 QProgressBar *progress;
45 QPushButton *cancel; 45 QPushButton *cancel;
46 int state; 46 int state;
47 int usercancel; 47 int usercancel;
48 const Profile& m_profile;
49 int m_fd; 48 int m_fd;
49 const Profile& m_profile;
50 int cleanshutdown; 50 int cleanshutdown;
51}; 51};
52 52
53#endif 53#endif
54 54
diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp
index fd20e99..100fdfc 100644
--- a/noncore/apps/opie-console/function_keyboard.cpp
+++ b/noncore/apps/opie-console/function_keyboard.cpp
@@ -171,12 +171,12 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par
171 root->addWidget(dimentions); 171 root->addWidget(dimentions);
172 root->addWidget(editKey); 172 root->addWidget(editKey);
173} 173}
174FunctionKeyboardConfig::~FunctionKeyboardConfig() { 174FunctionKeyboardConfig::~FunctionKeyboardConfig() {
175 175
176} 176}
177void FunctionKeyboardConfig::load (const Profile& prof) { 177void FunctionKeyboardConfig::load (const Profile& ) {
178 178
179} 179}
180void FunctionKeyboardConfig::save (Profile& prof) { 180void FunctionKeyboardConfig::save (Profile& ) {
181 181
182} 182}
diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp
index f246d81..d4ea0b2 100644
--- a/noncore/apps/opie-console/io_modem.cpp
+++ b/noncore/apps/opie-console/io_modem.cpp
@@ -82,8 +82,10 @@ QString IOModem::identifier() const {
82QString IOModem::name() const { 82QString IOModem::name() const {
83 return "Modem IO Layer"; 83 return "Modem IO Layer";
84} 84}
85 85
86void IOModem::slotExited(OProcess* proc ){ 86void IOModem::slotExited(OProcess* proc ){
87 close(); 87 close();
88 /* delete it afterwards */
89 delete proc;
88} 90}
89 91
diff --git a/noncore/apps/opie-console/iolayerbase.cpp b/noncore/apps/opie-console/iolayerbase.cpp
index b0df02d..47f9e76 100644
--- a/noncore/apps/opie-console/iolayerbase.cpp
+++ b/noncore/apps/opie-console/iolayerbase.cpp
@@ -104,13 +104,13 @@ void IOLayerBase::setParity( Parity par ) {
104 case Even: 104 case Even:
105 m_parityEven->setChecked( true ); 105 m_parityEven->setChecked( true );
106 break; 106 break;
107 } 107 }
108} 108}
109void IOLayerBase::setSpeed( Speed sp ) { 109void IOLayerBase::setSpeed( Speed sp ) {
110 int index; 110 int index = -1;
111 switch( sp ) { 111 switch( sp ) {
112 case Baud_115200: 112 case Baud_115200:
113 index = id_baud_115200; 113 index = id_baud_115200;
114 break; 114 break;
115 case Baud_57600: 115 case Baud_57600:
116 index = id_baud_57600; 116 index = id_baud_57600;
@@ -118,12 +118,13 @@ void IOLayerBase::setSpeed( Speed sp ) {
118 case Baud_38400: 118 case Baud_38400:
119 index = id_baud_38400; 119 index = id_baud_38400;
120 break; 120 break;
121 case Baud_19200: 121 case Baud_19200:
122 index = id_baud_19200; 122 index = id_baud_19200;
123 break; 123 break;
124 default:
124 case Baud_9600: 125 case Baud_9600:
125 index = id_baud_9600; 126 index = id_baud_9600;
126 break; 127 break;
127 } 128 }
128 m_speedBox->setCurrentItem(index ); 129 m_speedBox->setCurrentItem(index );
129} 130}
@@ -157,11 +158,12 @@ IOLayerBase::Speed IOLayerBase::speed()const{
157 case id_baud_38400: 158 case id_baud_38400:
158 return Baud_38400; 159 return Baud_38400;
159 break; 160 break;
160 case id_baud_19200: 161 case id_baud_19200:
161 return Baud_19200; 162 return Baud_19200;
162 break; 163 break;
164 default:
163 case id_baud_9600: 165 case id_baud_9600:
164 return Baud_9600; 166 return Baud_9600;
165 break; 167 break;
166 } 168 }
167} 169}
diff --git a/noncore/apps/opie-console/irdaconfigwidget.cpp b/noncore/apps/opie-console/irdaconfigwidget.cpp
index 72e99a1..059530d 100644
--- a/noncore/apps/opie-console/irdaconfigwidget.cpp
+++ b/noncore/apps/opie-console/irdaconfigwidget.cpp
@@ -5,13 +5,13 @@
5#include "iolayerbase.h" 5#include "iolayerbase.h"
6#include "irdaconfigwidget.h" 6#include "irdaconfigwidget.h"
7 7
8namespace { 8namespace {
9 void setCurrent( const QString& str, QComboBox* bo ) { 9 void setCurrent( const QString& str, QComboBox* bo ) {
10 uint b = bo->count(); 10 uint b = bo->count();
11 for (uint i = 0; i < bo->count(); i++ ) { 11 for (int i = 0; i < bo->count(); i++ ) {
12 if ( bo->text(i) == str ) { 12 if ( bo->text(i) == str ) {
13 bo->setCurrentItem( i ); 13 bo->setCurrentItem( i );
14 return; 14 return;
15 } 15 }
16 } 16 }
17 bo->insertItem( str ); 17 bo->insertItem( str );
@@ -92,12 +92,13 @@ void IrdaConfigWidget::load( const Profile& prof ) {
92 * save speed, 92 * save speed,
93 * flow, 93 * flow,
94 * parity 94 * parity
95 */ 95 */
96void IrdaConfigWidget::save( Profile& prof ) { 96void IrdaConfigWidget::save( Profile& prof ) {
97 int flow, parity, speed; 97 int flow, parity, speed;
98 flow = parity = speed = 0;
98 prof.writeEntry("Device", m_deviceCmb->currentText() ); 99 prof.writeEntry("Device", m_deviceCmb->currentText() );
99 100
100 switch( m_base->flow() ) { 101 switch( m_base->flow() ) {
101 case IOLayerBase::None: 102 case IOLayerBase::None:
102 flow = 0; 103 flow = 0;
103 break; 104 break;
@@ -132,12 +133,13 @@ void IrdaConfigWidget::save( Profile& prof ) {
132 case IOLayerBase::Baud_38400: 133 case IOLayerBase::Baud_38400:
133 speed = 38400; 134 speed = 38400;
134 break; 135 break;
135 case IOLayerBase::Baud_19200: 136 case IOLayerBase::Baud_19200:
136 speed = 19200; 137 speed = 19200;
137 break; 138 break;
139 default:
138 case IOLayerBase::Baud_9600: 140 case IOLayerBase::Baud_9600:
139 speed = 9600; 141 speed = 9600;
140 break; 142 break;
141 } 143 }
142 144
143 prof.writeEntry("Flow", flow); 145 prof.writeEntry("Flow", flow);
diff --git a/noncore/apps/opie-console/main.cpp b/noncore/apps/opie-console/main.cpp
index 78a91a2..7f9f038 100644
--- a/noncore/apps/opie-console/main.cpp
+++ b/noncore/apps/opie-console/main.cpp
@@ -88,12 +88,13 @@ void FixIt::fixIt() {
88 ::kill( SIGHUP, 1 ); 88 ::kill( SIGHUP, 1 );
89} 89}
90#endif 90#endif
91 91
92 92
93int main(int argc, char **argv) { 93int main(int argc, char **argv) {
94 argv[0]="embeddedkonsole";
94 QPEApplication app( argc, argv ); 95 QPEApplication app( argc, argv );
95 96
96#ifdef FSCKED_DISTRIBUTION 97#ifdef FSCKED_DISTRIBUTION
97 qWarning("fscked"); 98 qWarning("fscked");
98 FixIt it; 99 FixIt it;
99 it.fixIt(); 100 it.fixIt();
diff --git a/noncore/apps/opie-console/modemconfigwidget.cpp b/noncore/apps/opie-console/modemconfigwidget.cpp
index d3a23fa..c37fafd 100644
--- a/noncore/apps/opie-console/modemconfigwidget.cpp
+++ b/noncore/apps/opie-console/modemconfigwidget.cpp
@@ -9,13 +9,13 @@
9#include "modemconfigwidget.h" 9#include "modemconfigwidget.h"
10#include "dialdialog.h" 10#include "dialdialog.h"
11 11
12namespace { 12namespace {
13 void setCurrent( const QString& str, QComboBox* bo ) { 13 void setCurrent( const QString& str, QComboBox* bo ) {
14 uint b = bo->count(); 14 uint b = bo->count();
15 for (uint i = 0; i < bo->count(); i++ ) { 15 for (int i = 0; i < bo->count(); i++ ) {
16 if ( bo->text(i) == str ) { 16 if ( bo->text(i) == str ) {
17 bo->setCurrentItem( i ); 17 bo->setCurrentItem( i );
18 return; 18 return;
19 } 19 }
20 } 20 }
21 bo->insertItem( str ); 21 bo->insertItem( str );
@@ -123,12 +123,13 @@ void ModemConfigWidget::load( const Profile& prof ) {
123 * save speed, 123 * save speed,
124 * flow, 124 * flow,
125 * parity 125 * parity
126 */ 126 */
127void ModemConfigWidget::save( Profile& prof ) { 127void ModemConfigWidget::save( Profile& prof ) {
128 int flow, parity, speed; 128 int flow, parity, speed;
129 flow = parity = speed = 0;
129 prof.writeEntry( "Device", m_deviceCmb->currentText() ); 130 prof.writeEntry( "Device", m_deviceCmb->currentText() );
130 131
131 132
132 switch( m_base->flow() ) { 133 switch( m_base->flow() ) {
133 case IOLayerBase::None: 134 case IOLayerBase::None:
134 flow = 0; 135 flow = 0;
diff --git a/noncore/apps/opie-console/procctl.cpp b/noncore/apps/opie-console/procctl.cpp
index ff6bea8..a44529b 100644
--- a/noncore/apps/opie-console/procctl.cpp
+++ b/noncore/apps/opie-console/procctl.cpp
@@ -14,12 +14,13 @@ ProcCtl::ProcCtl() {
14ProcCtl::~ProcCtl() { 14ProcCtl::~ProcCtl() {
15} 15}
16ProcCtl* ProcCtl::self() { 16ProcCtl* ProcCtl::self() {
17 if (!m_self ) { 17 if (!m_self ) {
18 m_self = new ProcCtl; 18 m_self = new ProcCtl;
19 } 19 }
20 return m_self;
20} 21}
21void ProcCtl::add(pid_t pi, int fd ) { 22void ProcCtl::add(pid_t pi, int fd ) {
22 ProcContainer * con = new ProcContainer; 23 ProcContainer * con = new ProcContainer;
23 //memset(con, 0, sizeof(con) ); 24 //memset(con, 0, sizeof(con) );
24 con->pid = pi; 25 con->pid = pi;
25 con->fd = fd; 26 con->fd = fd;
diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp
index 413e80b..1765d42 100644
--- a/noncore/apps/opie-console/profileeditordialog.cpp
+++ b/noncore/apps/opie-console/profileeditordialog.cpp
@@ -89,13 +89,13 @@ void ProfileEditorDialog::initUI()
89 vbox3->add(m_termCmb ); 89 vbox3->add(m_termCmb );
90 vbox3->add(m_autoConnect); 90 vbox3->add(m_autoConnect);
91 vbox3->addStretch(1); 91 vbox3->addStretch(1);
92 92
93 m_showconntab = 0; 93 m_showconntab = 0;
94 tabWidget->addTab(tabprof, "", QObject::tr("Profile")); 94 tabWidget->addTab(tabprof, "", QObject::tr("Profile"));
95 //tabWidget->addTab(m_tabCon, "", QObject::tr("Connection")); 95 tabWidget->addTab(m_tabCon, "", QObject::tr("Connection"));
96 tabWidget->addTab(m_tabTerm, "", QObject::tr("Terminal")); 96 tabWidget->addTab(m_tabTerm, "", QObject::tr("Terminal"));
97 tabWidget->addTab(m_tabKey, "", QObject::tr("Special Keys")); 97 tabWidget->addTab(m_tabKey, "", QObject::tr("Special Keys"));
98 tabWidget->setCurrentTab( tabprof ); 98 tabWidget->setCurrentTab( tabprof );
99 99
100 100
101 // fill the comboboxes 101 // fill the comboboxes
@@ -182,13 +182,12 @@ void ProfileEditorDialog::slotConActivated( const QString& str ) {
182 if ( !m_con ) { 182 if ( !m_con ) {
183 m_con = new NoOptions( str, m_tabCon, "name"); 183 m_con = new NoOptions( str, m_tabCon, "name");
184 } 184 }
185 m_con->load( m_prof ); 185 m_con->load( m_prof );
186 m_layCon->addWidget( m_con ); 186 m_layCon->addWidget( m_con );
187 187
188 tabWidget->addTab( m_tabCon, "", QObject::tr("Connection") );
189 tabWidget->setCurrentTab( tabprof ); 188 tabWidget->setCurrentTab( tabprof );
190 189
191} 190}
192/* 191/*
193 * we need to switch the widget 192 * we need to switch the widget
194 */ 193 */
diff --git a/noncore/apps/opie-console/serialconfigwidget.cpp b/noncore/apps/opie-console/serialconfigwidget.cpp
index bd0312a..5c6d975 100644
--- a/noncore/apps/opie-console/serialconfigwidget.cpp
+++ b/noncore/apps/opie-console/serialconfigwidget.cpp
@@ -5,13 +5,13 @@
5#include "iolayerbase.h" 5#include "iolayerbase.h"
6#include "serialconfigwidget.h" 6#include "serialconfigwidget.h"
7 7
8namespace { 8namespace {
9 void setCurrent( const QString& str, QComboBox* bo ) { 9 void setCurrent( const QString& str, QComboBox* bo ) {
10 uint b = bo->count(); 10 uint b = bo->count();
11 for (uint i = 0; i < bo->count(); i++ ) { 11 for (int i = 0; i < bo->count(); i++ ) {
12 if ( bo->text(i) == str ) { 12 if ( bo->text(i) == str ) {
13 bo->setCurrentItem( i ); 13 bo->setCurrentItem( i );
14 return; 14 return;
15 } 15 }
16 } 16 }
17 bo->insertItem( str ); 17 bo->insertItem( str );
diff --git a/noncore/apps/opie-console/transferdialog.cpp b/noncore/apps/opie-console/transferdialog.cpp
index f89723c..75c4c72 100644
--- a/noncore/apps/opie-console/transferdialog.cpp
+++ b/noncore/apps/opie-console/transferdialog.cpp
@@ -14,13 +14,13 @@
14#include "receive_layer.h" 14#include "receive_layer.h"
15#include "metafactory.h" 15#include "metafactory.h"
16#include "mainwindow.h" 16#include "mainwindow.h"
17 17
18#include "transferdialog.h" 18#include "transferdialog.h"
19 19
20TransferDialog::TransferDialog(QWidget *parent, MainWindow *mainwindow, const char *name) 20TransferDialog::TransferDialog(QWidget *parent, MainWindow *mainwindow, const char *)
21: QDialog(parent, 0l, true), m_win(mainwindow) 21: QDialog(parent, 0l, true), m_win(mainwindow)
22{ 22{
23 m_lay = 0l; 23 m_lay = 0l;
24 m_recvlay = 0l; 24 m_recvlay = 0l;
25 QVBoxLayout *vbox, *vbox2; 25 QVBoxLayout *vbox, *vbox2;
26 QHBoxLayout *hbox, *hbox2, *hbox3; 26 QHBoxLayout *hbox, *hbox2, *hbox3;
@@ -178,18 +178,18 @@ void TransferDialog::slotCancel()
178 else 178 else
179 { 179 {
180 close(); 180 close();
181 } 181 }
182} 182}
183 183
184void TransferDialog::slotProgress(const QString& file, int progress, int speed, int hours, int minutes, int seconds) 184void TransferDialog::slotProgress(const QString& , int progress, int , int , int, int )
185{ 185{
186 progressbar->setProgress(progress); 186 progressbar->setProgress(progress);
187} 187}
188 188
189void TransferDialog::slotError(int error, const QString& message) 189void TransferDialog::slotError(int error, const QString& )
190{ 190{
191 statusbar->setText(QObject::tr("Ready")); 191 statusbar->setText(QObject::tr("Ready"));
192 192
193 switch(error) 193 switch(error)
194 { 194 {
195 case FileTransferLayer::NotSupported: 195 case FileTransferLayer::NotSupported:
@@ -235,13 +235,13 @@ void TransferDialog::slotSent()
235 ok->setEnabled(true); 235 ok->setEnabled(true);
236 progressbar->setProgress(0); 236 progressbar->setProgress(0);
237 statusbar->setText(QObject::tr("Ready")); 237 statusbar->setText(QObject::tr("Ready"));
238 m_autocleanup = 1; 238 m_autocleanup = 1;
239} 239}
240 240
241void TransferDialog::slotReceived(const QString& file) 241void TransferDialog::slotReceived(const QString& )
242{ 242{
243 progressbar->setProgress(100); 243 progressbar->setProgress(100);
244 QMessageBox::information(this, QObject::tr("Received"), QObject::tr("File has been received.")); 244 QMessageBox::information(this, QObject::tr("Received"), QObject::tr("File has been received."));
245 //QMessageBox::information(this, QObject::tr("Sent"), QObject::tr("File has been received as %1.").arg(file)); 245 //QMessageBox::information(this, QObject::tr("Sent"), QObject::tr("File has been received as %1.").arg(file));
246 ok->setEnabled(true); 246 ok->setEnabled(true);
247 progressbar->setProgress(0); 247 progressbar->setProgress(0);