From 151729eb3e4e4cfbb69db1f027e74188cf55c328 Mon Sep 17 00:00:00 2001 From: zecke Date: Mon, 21 Oct 2002 22:15:31 +0000 Subject: Fix the addPage bug... and avoid some compiler warnings. REMEMBER WARNINGS ARE BUGS --- 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 @@ namespace { void setCurrent( const QString& str, QComboBox* bo ) { 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 ) { bo->setCurrentItem( i ); return; @@ -116,6 +116,7 @@ void BTConfigWidget::load( const Profile& prof ) { */ void BTConfigWidget::save( Profile& prof ) { int flow, parity, speed; + flow = parity = speed = 0; prof.writeEntry("Device", m_deviceCmb->currentText() ); @@ -156,6 +157,7 @@ void BTConfigWidget::save( Profile& prof ) { case IOLayerBase::Baud_19200: speed = 19200; break; + default: case IOLayerBase::Baud_9600: speed = 9600; 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" { ProfileDialogWidget* newBTWidget( const QString& str, QWidget* wid ) { return new BTConfigWidget(str, wid ); } - 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 @@ -192,7 +192,7 @@ void Dialer::trydial(const QString& number) } } } - + if(state != state_cancel) { switchState(state_online); @@ -225,7 +225,7 @@ QString Dialer::receive() QString buf; char buffer[1024]; int ret; - int counter; + int counter = 0; while(1) { 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 QPushButton *cancel; int state; 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,12 +1,12 @@ #include "function_keyboard.h" -#include +#include #include #include #include #include -FunctionKeyboard::FunctionKeyboard(QWidget *parent) : - QFrame(parent), numRows(2), numCols(11), +FunctionKeyboard::FunctionKeyboard(QWidget *parent) : + QFrame(parent), numRows(2), numCols(11), pressedRow(0), pressedCol(0) { setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed)); @@ -23,7 +23,7 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) : keys.insert( - handle, + handle, FKey (value_list[0], value_list[1].toUShort(), value_list[2].toUShort()) ); } @@ -67,9 +67,9 @@ void FunctionKeyboard::paintEvent(QPaintEvent *e) { if (keys.contains(handle)) { 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() ); } @@ -80,14 +80,14 @@ void FunctionKeyboard::paintEvent(QPaintEvent *e) { 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() ); @@ -138,27 +138,27 @@ QSize FunctionKeyboard::sizeHint() const { 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)); } -FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent) : +FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent) : ProfileDialogKeyWidget(name, parent) { @@ -174,9 +174,9 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par 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 @@ -85,5 +85,7 @@ QString IOModem::name() const { 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 @@ -107,7 +107,7 @@ void IOLayerBase::setParity( Parity par ) { } } void IOLayerBase::setSpeed( Speed sp ) { - int index; + int index = -1; switch( sp ) { case Baud_115200: index = id_baud_115200; @@ -121,6 +121,7 @@ void IOLayerBase::setSpeed( Speed sp ) { case Baud_19200: index = id_baud_19200; break; + default: case Baud_9600: index = id_baud_9600; break; @@ -160,6 +161,7 @@ IOLayerBase::Speed IOLayerBase::speed()const{ case id_baud_19200: return Baud_19200; break; + default: case id_baud_9600: return Baud_9600; 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 @@ namespace { void setCurrent( const QString& str, QComboBox* bo ) { 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 ) { bo->setCurrentItem( i ); return; @@ -95,6 +95,7 @@ void IrdaConfigWidget::load( const Profile& prof ) { */ void IrdaConfigWidget::save( Profile& prof ) { int flow, parity, speed; + flow = parity = speed = 0; prof.writeEntry("Device", m_deviceCmb->currentText() ); switch( m_base->flow() ) { @@ -135,6 +136,7 @@ void IrdaConfigWidget::save( Profile& prof ) { case IOLayerBase::Baud_19200: speed = 19200; break; + default: case IOLayerBase::Baud_9600: speed = 9600; 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() { int main(int argc, char **argv) { + argv[0]="embeddedkonsole"; QPEApplication app( argc, argv ); #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 @@ namespace { void setCurrent( const QString& str, QComboBox* bo ) { 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 ) { bo->setCurrentItem( i ); return; @@ -126,6 +126,7 @@ void ModemConfigWidget::load( const Profile& prof ) { */ 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 @@ -17,6 +17,7 @@ ProcCtl* ProcCtl::self() { if (!m_self ) { m_self = new ProcCtl; } + return m_self; } void ProcCtl::add(pid_t pi, int fd ) { 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() m_showconntab = 0; 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")); tabWidget->addTab(m_tabKey, "", QObject::tr("Special Keys")); tabWidget->setCurrentTab( tabprof ); @@ -185,7 +185,6 @@ void ProfileEditorDialog::slotConActivated( const QString& str ) { m_con->load( m_prof ); m_layCon->addWidget( m_con ); - 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 @@ -8,7 +8,7 @@ namespace { void setCurrent( const QString& str, QComboBox* bo ) { 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 ) { bo->setCurrentItem( i ); 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 @@ #include "transferdialog.h" -TransferDialog::TransferDialog(QWidget *parent, MainWindow *mainwindow, const char *name) +TransferDialog::TransferDialog(QWidget *parent, MainWindow *mainwindow, const char *) : QDialog(parent, 0l, true), m_win(mainwindow) { m_lay = 0l; @@ -181,12 +181,12 @@ 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 ) { progressbar->setProgress(progress); } -void TransferDialog::slotError(int error, const QString& message) +void TransferDialog::slotError(int error, const QString& ) { statusbar->setText(QObject::tr("Ready")); @@ -238,7 +238,7 @@ void TransferDialog::slotSent() m_autocleanup = 1; } -void TransferDialog::slotReceived(const QString& file) +void TransferDialog::slotReceived(const QString& ) { progressbar->setProgress(100); QMessageBox::information(this, QObject::tr("Received"), QObject::tr("File has been received.")); -- cgit v0.9.0.2