summaryrefslogtreecommitdiff
path: root/noncore/apps/opie-console
Side-by-side diff
Diffstat (limited to 'noncore/apps/opie-console') (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
@@ -13,3 +13,3 @@ namespace {
uint b = bo->count();
- for (uint i = 0; i < bo->count(); i++ ) {
+ for (int i = 0; i < bo->count(); i++ ) {
if ( bo->text(i) == str ) {
@@ -118,2 +118,3 @@ void BTConfigWidget::save( Profile& prof ) {
int flow, parity, speed;
+ flow = parity = speed = 0;
prof.writeEntry("Device", m_deviceCmb->currentText() );
@@ -158,2 +159,3 @@ void BTConfigWidget::save( Profile& prof ) {
break;
+ default:
case IOLayerBase::Baud_9600:
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
@@ -69,3 +69,3 @@ extern "C" {
}
- ProfileDialogWidget* newConsoleWid( const QString& str, QWidget* wid ) {
+ ProfileDialogWidget* newConsoleWid( const QString& , QWidget* ) {
return 0l;
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
@@ -194,3 +194,3 @@ void Dialer::trydial(const QString& number)
}
-
+
if(state != state_cancel)
@@ -227,3 +227,3 @@ QString Dialer::receive()
int ret;
- int counter;
+ int counter = 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
@@ -47,4 +47,4 @@ class Dialer : public QDialog
int usercancel;
+ int m_fd;
const Profile& m_profile;
- int m_fd;
int cleanshutdown;
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,3 +1,3 @@
#include "function_keyboard.h"
-#include <qsizepolicy.h>
+#include <qsizepolicy.h>
#include <qevent.h>
@@ -7,4 +7,4 @@
-FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
- QFrame(parent), numRows(2), numCols(11),
+FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
+ QFrame(parent), numRows(2), numCols(11),
pressedRow(0), pressedCol(0) {
@@ -25,3 +25,3 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
- handle,
+ handle,
FKey (value_list[0], value_list[1].toUShort(), value_list[2].toUShort())
@@ -69,5 +69,5 @@ void FunctionKeyboard::paintEvent(QPaintEvent *e) {
p.drawText(
- c * keyWidth + 1, r * keyHeight + 1,
- keyWidth, keyHeight,
- Qt::AlignHCenter | Qt::AlignVCenter,
+ c * keyWidth + 1, r * keyHeight + 1,
+ keyWidth, keyHeight,
+ Qt::AlignHCenter | Qt::AlignVCenter,
keys[handle].getL()
@@ -82,10 +82,10 @@ void FunctionKeyboard::paintKey(int row, int col) {
QPainter p(this);
-
- p.fillRect(QRect(QPoint(col * keyWidth + 1, row * keyHeight + 1),
- QPoint((col + 1) * keyWidth - 1, row * keyHeight + keyHeight- 1)),
+
+ p.fillRect(QRect(QPoint(col * keyWidth + 1, row * keyHeight + 1),
+ QPoint((col + 1) * keyWidth - 1, row * keyHeight + keyHeight- 1)),
(pressedRow != -1 && pressedCol != -1 ) ? QColor(97,119,155) : QColor(255,255,255));
p.drawText(
- col * keyWidth + 1, row * keyHeight + 1,
- keyWidth, keyHeight,
- Qt::AlignHCenter | Qt::AlignVCenter,
+ col * keyWidth + 1, row * keyHeight + 1,
+ keyWidth, keyHeight,
+ Qt::AlignHCenter | Qt::AlignVCenter,
keys["r" + QString::number(row) + "c" + QString::number(col)].getL()
@@ -140,18 +140,18 @@ void FunctionKeyboard::loadDefaults() {
/* what keys should be default? */
- keys.insert( "r0c0", FKey ("F1", 4144, 0));
- keys.insert( "r0c1", FKey ("F2", 4145, 0));
- keys.insert( "r0c2", FKey ("F3", 4145, 0));
- keys.insert( "r0c3", FKey ("F4", 4146, 0));
- keys.insert( "r0c4", FKey ("F5", 4147, 0));
- keys.insert( "r0c5", FKey ("F6", 4148, 0));
- keys.insert( "r0c6", FKey ("F7", 4149, 0));
- keys.insert( "r0c7", FKey ("F8", 4150, 0));
- keys.insert( "r0c8", FKey ("F9", 4151, 0));
- keys.insert( "r0c9", FKey ("F10", 4152, 0));
- keys.insert( "r0c10", FKey ("F11", 4153, 0));
-
- keys.insert( "r1c7", FKey ("Ho", 4112, 0));
- keys.insert( "r1c8", FKey ("End", 4113, 0));
- keys.insert( "r1c9", FKey ("PU", 4118, 0));
- keys.insert( "r1c10", FKey ("PD", 4119, 0));
+ keys.insert( "r0c0", FKey ("F1", 4144, 0));
+ keys.insert( "r0c1", FKey ("F2", 4145, 0));
+ keys.insert( "r0c2", FKey ("F3", 4145, 0));
+ keys.insert( "r0c3", FKey ("F4", 4146, 0));
+ keys.insert( "r0c4", FKey ("F5", 4147, 0));
+ keys.insert( "r0c5", FKey ("F6", 4148, 0));
+ keys.insert( "r0c6", FKey ("F7", 4149, 0));
+ keys.insert( "r0c7", FKey ("F8", 4150, 0));
+ keys.insert( "r0c8", FKey ("F9", 4151, 0));
+ keys.insert( "r0c9", FKey ("F10", 4152, 0));
+ keys.insert( "r0c10", FKey ("F11", 4153, 0));
+
+ keys.insert( "r1c7", FKey ("Ho", 4112, 0));
+ keys.insert( "r1c8", FKey ("End", 4113, 0));
+ keys.insert( "r1c9", FKey ("PU", 4118, 0));
+ keys.insert( "r1c10", FKey ("PD", 4119, 0));
@@ -160,3 +160,3 @@ void FunctionKeyboard::loadDefaults() {
-FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent) :
+FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent) :
ProfileDialogKeyWidget(name, parent) {
@@ -176,6 +176,6 @@ FunctionKeyboardConfig::~FunctionKeyboardConfig() {
}
-void FunctionKeyboardConfig::load (const Profile& prof) {
+void FunctionKeyboardConfig::load (const Profile& ) {
}
-void FunctionKeyboardConfig::save (Profile& prof) {
+void FunctionKeyboardConfig::save (Profile& ) {
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
@@ -87,2 +87,4 @@ void IOModem::slotExited(OProcess* proc ){
close();
+ /* delete it afterwards */
+ delete proc;
}
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
@@ -109,3 +109,3 @@ void IOLayerBase::setParity( Parity par ) {
void IOLayerBase::setSpeed( Speed sp ) {
- int index;
+ int index = -1;
switch( sp ) {
@@ -123,2 +123,3 @@ void IOLayerBase::setSpeed( Speed sp ) {
break;
+ default:
case Baud_9600:
@@ -162,2 +163,3 @@ IOLayerBase::Speed IOLayerBase::speed()const{
break;
+ default:
case id_baud_9600:
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
@@ -10,3 +10,3 @@ namespace {
uint b = bo->count();
- for (uint i = 0; i < bo->count(); i++ ) {
+ for (int i = 0; i < bo->count(); i++ ) {
if ( bo->text(i) == str ) {
@@ -97,2 +97,3 @@ void IrdaConfigWidget::save( Profile& prof ) {
int flow, parity, speed;
+ flow = parity = speed = 0;
prof.writeEntry("Device", m_deviceCmb->currentText() );
@@ -137,2 +138,3 @@ void IrdaConfigWidget::save( Profile& prof ) {
break;
+ default:
case IOLayerBase::Baud_9600:
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
@@ -93,2 +93,3 @@ void FixIt::fixIt() {
int main(int argc, char **argv) {
+ argv[0]="embeddedkonsole";
QPEApplication app( argc, argv );
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
@@ -14,3 +14,3 @@ namespace {
uint b = bo->count();
- for (uint i = 0; i < bo->count(); i++ ) {
+ for (int i = 0; i < bo->count(); i++ ) {
if ( bo->text(i) == str ) {
@@ -128,2 +128,3 @@ void ModemConfigWidget::save( Profile& prof ) {
int flow, parity, speed;
+ flow = parity = speed = 0;
prof.writeEntry( "Device", m_deviceCmb->currentText() );
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
@@ -19,2 +19,3 @@ ProcCtl* ProcCtl::self() {
}
+ return m_self;
}
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
@@ -94,3 +94,3 @@ void ProfileEditorDialog::initUI()
tabWidget->addTab(tabprof, "", QObject::tr("Profile"));
- //tabWidget->addTab(m_tabCon, "", QObject::tr("Connection"));
+ tabWidget->addTab(m_tabCon, "", QObject::tr("Connection"));
tabWidget->addTab(m_tabTerm, "", QObject::tr("Terminal"));
@@ -187,3 +187,2 @@ void ProfileEditorDialog::slotConActivated( const QString& str ) {
- tabWidget->addTab( m_tabCon, "", QObject::tr("Connection") );
tabWidget->setCurrentTab( tabprof );
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
@@ -10,3 +10,3 @@ namespace {
uint b = bo->count();
- for (uint i = 0; i < bo->count(); i++ ) {
+ for (int i = 0; i < bo->count(); i++ ) {
if ( bo->text(i) == 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
@@ -19,3 +19,3 @@
-TransferDialog::TransferDialog(QWidget *parent, MainWindow *mainwindow, const char *name)
+TransferDialog::TransferDialog(QWidget *parent, MainWindow *mainwindow, const char *)
: QDialog(parent, 0l, true), m_win(mainwindow)
@@ -183,3 +183,3 @@ void TransferDialog::slotCancel()
-void TransferDialog::slotProgress(const QString& file, int progress, int speed, int hours, int minutes, int seconds)
+void TransferDialog::slotProgress(const QString& , int progress, int , int , int, int )
{
@@ -188,3 +188,3 @@ void TransferDialog::slotProgress(const QString& file, int progress, int speed,
-void TransferDialog::slotError(int error, const QString& message)
+void TransferDialog::slotError(int error, const QString& )
{
@@ -240,3 +240,3 @@ void TransferDialog::slotSent()
-void TransferDialog::slotReceived(const QString& file)
+void TransferDialog::slotReceived(const QString& )
{