-rw-r--r-- | noncore/apps/opie-console/btconfigwidget.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/opie-console/default.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/dialer.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/dialer.h | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/function_keyboard.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_modem.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/iolayerbase.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/opie-console/irdaconfigwidget.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/opie-console/main.cpp | 1 | ||||
-rw-r--r-- | noncore/apps/opie-console/modemconfigwidget.cpp | 3 | ||||
-rw-r--r-- | noncore/apps/opie-console/procctl.cpp | 1 | ||||
-rw-r--r-- | noncore/apps/opie-console/profileeditordialog.cpp | 3 | ||||
-rw-r--r-- | noncore/apps/opie-console/serialconfigwidget.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/transferdialog.cpp | 8 |
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 | |||
@@ -11,7 +11,7 @@ | |||
11 | namespace { | 11 | namespace { |
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; |
@@ -116,6 +116,7 @@ void BTConfigWidget::load( const Profile& prof ) { | |||
116 | */ | 116 | */ |
117 | void BTConfigWidget::save( Profile& prof ) { | 117 | void 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 | ||
@@ -156,6 +157,7 @@ void BTConfigWidget::save( Profile& prof ) { | |||
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; |
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 | |||
@@ -67,7 +67,7 @@ extern "C" { | |||
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 | ||
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 | |||
@@ -225,7 +225,7 @@ QString Dialer::receive() | |||
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 | { |
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 | |||
@@ -45,8 +45,8 @@ class Dialer : public QDialog | |||
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 | ||
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 | |||
@@ -174,9 +174,9 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par | |||
174 | FunctionKeyboardConfig::~FunctionKeyboardConfig() { | 174 | FunctionKeyboardConfig::~FunctionKeyboardConfig() { |
175 | 175 | ||
176 | } | 176 | } |
177 | void FunctionKeyboardConfig::load (const Profile& prof) { | 177 | void FunctionKeyboardConfig::load (const Profile& ) { |
178 | 178 | ||
179 | } | 179 | } |
180 | void FunctionKeyboardConfig::save (Profile& prof) { | 180 | void 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 | |||
@@ -85,5 +85,7 @@ QString IOModem::name() const { | |||
85 | 85 | ||
86 | void IOModem::slotExited(OProcess* proc ){ | 86 | void 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 | |||
@@ -107,7 +107,7 @@ void IOLayerBase::setParity( Parity par ) { | |||
107 | } | 107 | } |
108 | } | 108 | } |
109 | void IOLayerBase::setSpeed( Speed sp ) { | 109 | void 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; |
@@ -121,6 +121,7 @@ void IOLayerBase::setSpeed( Speed sp ) { | |||
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; |
@@ -160,6 +161,7 @@ IOLayerBase::Speed IOLayerBase::speed()const{ | |||
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; |
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 | |||
@@ -8,7 +8,7 @@ | |||
8 | namespace { | 8 | namespace { |
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; |
@@ -95,6 +95,7 @@ void IrdaConfigWidget::load( const Profile& prof ) { | |||
95 | */ | 95 | */ |
96 | void IrdaConfigWidget::save( Profile& prof ) { | 96 | void 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() ) { |
@@ -135,6 +136,7 @@ void IrdaConfigWidget::save( Profile& prof ) { | |||
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; |
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 | |||
@@ -91,6 +91,7 @@ void FixIt::fixIt() { | |||
91 | 91 | ||
92 | 92 | ||
93 | int main(int argc, char **argv) { | 93 | int 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 |
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 | |||
@@ -12,7 +12,7 @@ | |||
12 | namespace { | 12 | namespace { |
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; |
@@ -126,6 +126,7 @@ void ModemConfigWidget::load( const Profile& prof ) { | |||
126 | */ | 126 | */ |
127 | void ModemConfigWidget::save( Profile& prof ) { | 127 | void 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 | ||
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 | |||
@@ -17,6 +17,7 @@ ProcCtl* 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 | } |
21 | void ProcCtl::add(pid_t pi, int fd ) { | 22 | void ProcCtl::add(pid_t pi, int fd ) { |
22 | ProcContainer * con = new ProcContainer; | 23 | ProcContainer * con = new ProcContainer; |
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 | |||
@@ -92,7 +92,7 @@ void ProfileEditorDialog::initUI() | |||
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 ); |
@@ -185,7 +185,6 @@ void ProfileEditorDialog::slotConActivated( const QString& str ) { | |||
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 | } |
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 | |||
@@ -8,7 +8,7 @@ | |||
8 | namespace { | 8 | namespace { |
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; |
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 | |||
@@ -17,7 +17,7 @@ | |||
17 | 17 | ||
18 | #include "transferdialog.h" | 18 | #include "transferdialog.h" |
19 | 19 | ||
20 | TransferDialog::TransferDialog(QWidget *parent, MainWindow *mainwindow, const char *name) | 20 | TransferDialog::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; |
@@ -181,12 +181,12 @@ void TransferDialog::slotCancel() | |||
181 | } | 181 | } |
182 | } | 182 | } |
183 | 183 | ||
184 | void TransferDialog::slotProgress(const QString& file, int progress, int speed, int hours, int minutes, int seconds) | 184 | void TransferDialog::slotProgress(const QString& , int progress, int , int , int, int ) |
185 | { | 185 | { |
186 | progressbar->setProgress(progress); | 186 | progressbar->setProgress(progress); |
187 | } | 187 | } |
188 | 188 | ||
189 | void TransferDialog::slotError(int error, const QString& message) | 189 | void TransferDialog::slotError(int error, const QString& ) |
190 | { | 190 | { |
191 | statusbar->setText(QObject::tr("Ready")); | 191 | statusbar->setText(QObject::tr("Ready")); |
192 | 192 | ||
@@ -238,7 +238,7 @@ void TransferDialog::slotSent() | |||
238 | m_autocleanup = 1; | 238 | m_autocleanup = 1; |
239 | } | 239 | } |
240 | 240 | ||
241 | void TransferDialog::slotReceived(const QString& file) | 241 | void 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.")); |