summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore 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.cpp4
-rw-r--r--noncore/apps/opie-console/dialer.h2
-rw-r--r--noncore/apps/opie-console/function_keyboard.cpp64
-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, 57 insertions, 47 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 @@
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;
@@ -116,6 +116,7 @@ void BTConfigWidget::load( const Profile& prof ) {
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
@@ -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
@@ -192,7 +192,7 @@ void Dialer::trydial(const QString& number)
192 } 192 }
193 } 193 }
194 } 194 }
195 195
196 if(state != state_cancel) 196 if(state != state_cancel)
197 { 197 {
198 switchState(state_online); 198 switchState(state_online);
@@ -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 int m_fd;
48 const Profile& m_profile; 49 const Profile& m_profile;
49 int m_fd;
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
@@ -1,12 +1,12 @@
1#include "function_keyboard.h" 1#include "function_keyboard.h"
2#include <qsizepolicy.h> 2#include <qsizepolicy.h>
3#include <qevent.h> 3#include <qevent.h>
4#include <qwindowsystem_qws.h> 4#include <qwindowsystem_qws.h>
5#include <qapplication.h> 5#include <qapplication.h>
6#include <qlayout.h> 6#include <qlayout.h>
7 7
8FunctionKeyboard::FunctionKeyboard(QWidget *parent) : 8FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
9 QFrame(parent), numRows(2), numCols(11), 9 QFrame(parent), numRows(2), numCols(11),
10 pressedRow(0), pressedCol(0) { 10 pressedRow(0), pressedCol(0) {
11 11
12 setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed)); 12 setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed));
@@ -23,7 +23,7 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
23 23
24 keys.insert( 24 keys.insert(
25 25
26 handle, 26 handle,
27 FKey (value_list[0], value_list[1].toUShort(), value_list[2].toUShort()) 27 FKey (value_list[0], value_list[1].toUShort(), value_list[2].toUShort())
28 ); 28 );
29 } 29 }
@@ -67,9 +67,9 @@ void FunctionKeyboard::paintEvent(QPaintEvent *e) {
67 if (keys.contains(handle)) { 67 if (keys.contains(handle)) {
68 68
69 p.drawText( 69 p.drawText(
70 c * keyWidth + 1, r * keyHeight + 1, 70 c * keyWidth + 1, r * keyHeight + 1,
71 keyWidth, keyHeight, 71 keyWidth, keyHeight,
72 Qt::AlignHCenter | Qt::AlignVCenter, 72 Qt::AlignHCenter | Qt::AlignVCenter,
73 keys[handle].getL() 73 keys[handle].getL()
74 ); 74 );
75 } 75 }
@@ -80,14 +80,14 @@ void FunctionKeyboard::paintEvent(QPaintEvent *e) {
80void FunctionKeyboard::paintKey(int row, int col) { 80void FunctionKeyboard::paintKey(int row, int col) {
81 81
82 QPainter p(this); 82 QPainter p(this);
83 83
84 p.fillRect(QRect(QPoint(col * keyWidth + 1, row * keyHeight + 1), 84 p.fillRect(QRect(QPoint(col * keyWidth + 1, row * keyHeight + 1),
85 QPoint((col + 1) * keyWidth - 1, row * keyHeight + keyHeight- 1)), 85 QPoint((col + 1) * keyWidth - 1, row * keyHeight + keyHeight- 1)),
86 (pressedRow != -1 && pressedCol != -1 ) ? QColor(97,119,155) : QColor(255,255,255)); 86 (pressedRow != -1 && pressedCol != -1 ) ? QColor(97,119,155) : QColor(255,255,255));
87 p.drawText( 87 p.drawText(
88 col * keyWidth + 1, row * keyHeight + 1, 88 col * keyWidth + 1, row * keyHeight + 1,
89 keyWidth, keyHeight, 89 keyWidth, keyHeight,
90 Qt::AlignHCenter | Qt::AlignVCenter, 90 Qt::AlignHCenter | Qt::AlignVCenter,
91 keys["r" + QString::number(row) + "c" + QString::number(col)].getL() 91 keys["r" + QString::number(row) + "c" + QString::number(col)].getL()
92 ); 92 );
93 93
@@ -138,27 +138,27 @@ QSize FunctionKeyboard::sizeHint() const {
138void FunctionKeyboard::loadDefaults() { 138void FunctionKeyboard::loadDefaults() {
139 139
140 /* what keys should be default? */ 140 /* what keys should be default? */
141 keys.insert( "r0c0", FKey ("F1", 4144, 0)); 141 keys.insert( "r0c0", FKey ("F1", 4144, 0));
142 keys.insert( "r0c1", FKey ("F2", 4145, 0)); 142 keys.insert( "r0c1", FKey ("F2", 4145, 0));
143 keys.insert( "r0c2", FKey ("F3", 4145, 0)); 143 keys.insert( "r0c2", FKey ("F3", 4145, 0));
144 keys.insert( "r0c3", FKey ("F4", 4146, 0)); 144 keys.insert( "r0c3", FKey ("F4", 4146, 0));
145 keys.insert( "r0c4", FKey ("F5", 4147, 0)); 145 keys.insert( "r0c4", FKey ("F5", 4147, 0));
146 keys.insert( "r0c5", FKey ("F6", 4148, 0)); 146 keys.insert( "r0c5", FKey ("F6", 4148, 0));
147 keys.insert( "r0c6", FKey ("F7", 4149, 0)); 147 keys.insert( "r0c6", FKey ("F7", 4149, 0));
148 keys.insert( "r0c7", FKey ("F8", 4150, 0)); 148 keys.insert( "r0c7", FKey ("F8", 4150, 0));
149 keys.insert( "r0c8", FKey ("F9", 4151, 0)); 149 keys.insert( "r0c8", FKey ("F9", 4151, 0));
150 keys.insert( "r0c9", FKey ("F10", 4152, 0)); 150 keys.insert( "r0c9", FKey ("F10", 4152, 0));
151 keys.insert( "r0c10", FKey ("F11", 4153, 0)); 151 keys.insert( "r0c10", FKey ("F11", 4153, 0));
152 152
153 keys.insert( "r1c7", FKey ("Ho", 4112, 0)); 153 keys.insert( "r1c7", FKey ("Ho", 4112, 0));
154 keys.insert( "r1c8", FKey ("End", 4113, 0)); 154 keys.insert( "r1c8", FKey ("End", 4113, 0));
155 keys.insert( "r1c9", FKey ("PU", 4118, 0)); 155 keys.insert( "r1c9", FKey ("PU", 4118, 0));
156 keys.insert( "r1c10", FKey ("PD", 4119, 0)); 156 keys.insert( "r1c10", FKey ("PD", 4119, 0));
157 157
158} 158}
159 159
160 160
161FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent) : 161FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent) :
162 ProfileDialogKeyWidget(name, parent) { 162 ProfileDialogKeyWidget(name, parent) {
163 163
164 164
@@ -174,9 +174,9 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par
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
@@ -85,5 +85,7 @@ QString IOModem::name() const {
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
@@ -107,7 +107,7 @@ void IOLayerBase::setParity( Parity par ) {
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;
@@ -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 @@
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;
@@ -95,6 +95,7 @@ void IrdaConfigWidget::load( const Profile& prof ) {
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() ) {
@@ -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
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
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 @@
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;
@@ -126,6 +126,7 @@ void ModemConfigWidget::load( const Profile& prof ) {
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
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}
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;
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 @@
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;
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
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;
@@ -181,12 +181,12 @@ void TransferDialog::slotCancel()
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
@@ -238,7 +238,7 @@ void TransferDialog::slotSent()
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."));