author | zecke <zecke> | 2002-10-21 22:15:31 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-10-21 22:15:31 (UTC) |
commit | 151729eb3e4e4cfbb69db1f027e74188cf55c328 (patch) (side-by-side diff) | |
tree | 73705a6ca967933780062a95756dc18ae7bd8167 | |
parent | 5bcd4ccebd86f912c693de16675da44d21e11d94 (diff) | |
download | opie-151729eb3e4e4cfbb69db1f027e74188cf55c328.zip opie-151729eb3e4e4cfbb69db1f027e74188cf55c328.tar.gz opie-151729eb3e4e4cfbb69db1f027e74188cf55c328.tar.bz2 |
Fix the addPage bug... and avoid some compiler warnings. REMEMBER WARNINGS ARE BUGS
-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 @@ -10,9 +10,9 @@ 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; } @@ -115,8 +115,9 @@ void BTConfigWidget::load( const Profile& prof ) { * parity */ void BTConfigWidget::save( Profile& prof ) { int flow, parity, speed; + flow = parity = speed = 0; prof.writeEntry("Device", m_deviceCmb->currentText() ); switch( m_base->flow() ) { @@ -155,8 +156,9 @@ void BTConfigWidget::save( Profile& prof ) { break; 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 @@ -66,9 +66,9 @@ 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 @@ -224,9 +224,9 @@ QString Dialer::receive() { QString buf; char buffer[1024]; int ret; - int counter; + int counter = 0; while(1) { ret = ::read(m_fd, buffer, sizeof(buffer)); 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 @@ -44,10 +44,10 @@ class Dialer : public QDialog QProgressBar *progress; QPushButton *cancel; int state; int usercancel; - const Profile& m_profile; int m_fd; + const Profile& m_profile; int cleanshutdown; }; #endif 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 @@ -173,10 +173,10 @@ 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 @@ -84,6 +84,8 @@ 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 @@ -106,9 +106,9 @@ void IOLayerBase::setParity( Parity par ) { break; } } void IOLayerBase::setSpeed( Speed sp ) { - int index; + int index = -1; switch( sp ) { case Baud_115200: index = id_baud_115200; break; @@ -120,8 +120,9 @@ void IOLayerBase::setSpeed( Speed sp ) { break; case Baud_19200: index = id_baud_19200; break; + default: case Baud_9600: index = id_baud_9600; break; } @@ -159,8 +160,9 @@ IOLayerBase::Speed IOLayerBase::speed()const{ break; 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 @@ -7,9 +7,9 @@ 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; } @@ -94,8 +94,9 @@ void IrdaConfigWidget::load( const Profile& prof ) { * parity */ void IrdaConfigWidget::save( Profile& prof ) { int flow, parity, speed; + flow = parity = speed = 0; prof.writeEntry("Device", m_deviceCmb->currentText() ); switch( m_base->flow() ) { case IOLayerBase::None: @@ -134,8 +135,9 @@ void IrdaConfigWidget::save( Profile& prof ) { break; 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 @@ -90,8 +90,9 @@ void FixIt::fixIt() { #endif int main(int argc, char **argv) { + argv[0]="embeddedkonsole"; QPEApplication app( argc, argv ); #ifdef FSCKED_DISTRIBUTION qWarning("fscked"); 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 @@ -11,9 +11,9 @@ 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; } @@ -125,8 +125,9 @@ void ModemConfigWidget::load( const Profile& prof ) { * parity */ void ModemConfigWidget::save( Profile& prof ) { int flow, parity, speed; + flow = parity = speed = 0; prof.writeEntry( "Device", m_deviceCmb->currentText() ); switch( m_base->flow() ) { 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 @@ -16,8 +16,9 @@ ProcCtl::~ProcCtl() { 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; //memset(con, 0, sizeof(con) ); 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 @@ -91,9 +91,9 @@ void ProfileEditorDialog::initUI() vbox3->addStretch(1); 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 ); @@ -184,9 +184,8 @@ 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 @@ -7,9 +7,9 @@ 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 @@ -16,9 +16,9 @@ #include "mainwindow.h" #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; m_recvlay = 0l; @@ -180,14 +180,14 @@ void TransferDialog::slotCancel() close(); } } -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")); switch(error) @@ -237,9 +237,9 @@ void TransferDialog::slotSent() statusbar->setText(QObject::tr("Ready")); 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.")); //QMessageBox::information(this, QObject::tr("Sent"), QObject::tr("File has been received as %1.").arg(file)); |