-rw-r--r-- | noncore/apps/checkbook/traninfo.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/confedit/listviewconfdir.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/confedit/listviewitemconfigentry.cpp | 8 | ||||
-rw-r--r-- | noncore/apps/opie-bartender/bac.cpp | 1 | ||||
-rw-r--r-- | noncore/apps/opie-gutenbrowser/LibraryDialog.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-gutenbrowser/NetworkDialog.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-gutenbrowser/fontDialog.cpp | 40 | ||||
-rw-r--r-- | noncore/apps/opie-gutenbrowser/helpwindow.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/oxygen/kmolelements.cpp | 36 |
9 files changed, 48 insertions, 49 deletions
diff --git a/noncore/apps/checkbook/traninfo.cpp b/noncore/apps/checkbook/traninfo.cpp index 506f567..4833af9 100644 --- a/noncore/apps/checkbook/traninfo.cpp +++ b/noncore/apps/checkbook/traninfo.cpp @@ -211,17 +211,17 @@ QString TranInfo::toString() (const char *)desc(), (withdrawal() ? -1 : 1) * amount(), fee() ); return(ret); } // --- findMostRecentByDesc --------------------------------------------------- TranInfo *TranInfoList::findMostRecentByDesc( const QString &desc ) { for(TranInfo *cur=last(); cur; cur=prev()) { if( cur->desc()==desc ) return( cur ); } return(NULL); -}
\ No newline at end of file +} diff --git a/noncore/apps/confedit/listviewconfdir.cpp b/noncore/apps/confedit/listviewconfdir.cpp index 33bffe1..73eaae3 100644 --- a/noncore/apps/confedit/listviewconfdir.cpp +++ b/noncore/apps/confedit/listviewconfdir.cpp @@ -38,28 +38,28 @@ ListViewConfDir::~ListViewConfDir() } void ListViewConfDir::readConfFiles() { confDir.setFilter( QDir::Files | QDir::NoSymLinks ); confDir.setSorting( QDir::Name ); confDir.setNameFilter("*.conf"); const QFileInfoList *list = confDir.entryInfoList(); QFileInfoListIterator it( *list ); QFileInfo *fi; ListViewItemConfFile *fileEntry; while ( (fi=it.current()) ) { - odebug << "opening: >" << fi->fileName().data() << "<" << oendl; + odebug << "opening: >" << fi->fileName().data() << "<" << oendl; fileEntry = new ListViewItemConfFile( fi, this ); - QListViewItem *dummy = new QListViewItem(fileEntry, "dummy"); + (void)new QListViewItem(fileEntry, "dummy"); ++it; } } void ListViewConfDir::expand(QListViewItem *item) { ((ListViewItemConf*)item)->expand(); } diff --git a/noncore/apps/confedit/listviewitemconfigentry.cpp b/noncore/apps/confedit/listviewitemconfigentry.cpp index 0970125..714a154 100644 --- a/noncore/apps/confedit/listviewitemconfigentry.cpp +++ b/noncore/apps/confedit/listviewitemconfigentry.cpp @@ -123,28 +123,28 @@ void ListViewItemConfigEntry::save(QTextStream *t) _type = Group; }else{ s += _key+" = "+_value; _type = Key; } s += "\n"; (*t) << s; _changed = false; for (QListViewItem *it = firstChild(); it!=0;it = it->nextSibling()) { ((ListViewItemConfigEntry*)it)->save(t); } } void ListViewItemConfigEntry::revert() { - _group = _groupOrig; - _key = _keyOrig; - _value = _valueOrig; + _group = _groupOrig; + _key = _keyOrig; + _value = _valueOrig; _changed=false; displayText(); } void ListViewItemConfigEntry::expand() { -}
\ No newline at end of file +} diff --git a/noncore/apps/opie-bartender/bac.cpp b/noncore/apps/opie-bartender/bac.cpp index 2e74029..8dc7e88 100644 --- a/noncore/apps/opie-bartender/bac.cpp +++ b/noncore/apps/opie-bartender/bac.cpp @@ -121,33 +121,32 @@ BacDialog::BacDialog( QWidget* parent, const char* name, bool modal, WFlags fl palette.setColor(QPalette::Normal, QColorGroup::Foreground, Qt::red); palette.setColor(QPalette::Normal, QColorGroup::Light, Qt::black); palette.setColor(QPalette::Normal, QColorGroup::Dark, Qt::darkGreen); LCDNumber1->setPalette(palette); Layout7->addWidget( LCDNumber1 ); NumberSpinBox->setFocus(); } BacDialog::~BacDialog() {} void BacDialog::calculate() { float weight,genderDiff, bac, typeDrink=0, drinkOz=0, bodyWater, milliliters, oz, gram, gramsMil, alc, metab, bac1; - float weightunitDifference, massunitdiff; QString estBac; if( GenderComboBox->currentItem()==0) genderDiff = .58; else genderDiff = .49; switch(TypeDrinkComboBox->currentItem()) { case 0: { //beer typeDrink = .045; drinkOz = 12; } break; case 1: { typeDrink = .2; drinkOz = 4; diff --git a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp index 124b6f3..020a116 100644 --- a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp +++ b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp @@ -22,33 +22,33 @@ #include <qpe/qpedialog.h> #include <opie2/odebug.h> /* QT */ #include <qpushbutton.h> #include <qmultilineedit.h> //#include <qlayout.h> /* STD */ #include <unistd.h> #include <stdio.h> #include <stdlib.h> /* * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -LibraryDialog::LibraryDialog( QWidget* parent, const char* name , bool modal, WFlags fl ) +LibraryDialog::LibraryDialog( QWidget* parent, const char* name , bool /*modal*/, WFlags fl ) : QDialog( parent, name, true/* modal*/, fl ) { if ( !name ) setName( "LibraryDialog" ); indexLoaded=false; initDialog(); // this->setMaximumWidth(240); index = "GUTINDEX.ALL"; local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/"; local_index = local_library + index; QString iniFile ; iniFile = QPEApplication::qpeDir()+"/etc/gutenbrowser/gutenbrowserrc"; diff --git a/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp b/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp index af14aac..a321952 100644 --- a/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp +++ b/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp @@ -27,33 +27,33 @@ #include <qfile.h> #include <qstringlist.h> #include <qlabel.h> #include <qpushbutton.h> #include <qlayout.h> /* STD */ #include <unistd.h> extern "C" { #include <ftplib.h> } QProgressBar* ProgressBar1; QPushButton* buttonCancel; static netbuf *conn = NULL; -static int log_progress(netbuf *ctl, int xfered, void *arg) { +static int log_progress(netbuf *, int xfered, void *arg) { int fsz = *(int *)arg; int pct = (xfered * 100) / fsz; printf("%3d%%\r", pct); fflush(stdout); ProgressBar1->setProgress(xfered); qApp->processEvents(); return 1; } NetworkDialog::NetworkDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QStringList netL) : QDialog( parent, name, modal, fl ) { ftp_host = netL[0]; networkUrl = strUrl = netL[0]; diff --git a/noncore/apps/opie-gutenbrowser/fontDialog.cpp b/noncore/apps/opie-gutenbrowser/fontDialog.cpp index fa964a6..c6d0fe6 100644 --- a/noncore/apps/opie-gutenbrowser/fontDialog.cpp +++ b/noncore/apps/opie-gutenbrowser/fontDialog.cpp @@ -42,219 +42,219 @@ FontDialog::FontDialog( QWidget * parent, const char* name /*, bool modal, WFla QGridLayout *layout = new QGridLayout( this ); layout->setSpacing(2); layout->setMargin(2); familyListBox = new QListBox( this, "familyListBox" ); layout->addMultiCellWidget( familyListBox, 0, 2, 0, 0); QBoxLayout * hbox = new QHBoxLayout(this); QBoxLayout * vbox = new QVBoxLayout(this); styleListBox = new QListBox( this, "styleListBox" ); vbox->addWidget( styleListBox, 0); FontTextLabel4 = new QLabel( this, "TextLabel4" ); FontTextLabel4->setText( tr( "Size" ) ); hbox->addWidget( FontTextLabel4,0); - + sizeComboBox = new QComboBox( FALSE, this, "SizeCombo"); // sizeComboBox->setMaximumWidth(60); hbox->addWidget( sizeComboBox, 0); vbox->addLayout(hbox,0); layout->addLayout( vbox,0,3); - + MultiLineEdit1 = new QMultiLineEdit( this, "MultiLineEdit1" ); MultiLineEdit1->setText( tr( "The Quick Brown Fox Jumps Over The Lazy Dog" ) ); MultiLineEdit1->setWordWrap( QMultiLineEdit::WidgetWidth); layout->addMultiCellWidget( MultiLineEdit1, 4, 4, 0, 3); connect(familyListBox,SIGNAL(highlighted(const QString &)),SLOT(familyListBoxSlot(const QString &))); connect(styleListBox,SIGNAL(highlighted(const QString &)),SLOT(styleListBoxSlot(const QString &))); connect(sizeComboBox,SIGNAL(activated(const QString &)),SLOT(sizeComboBoxSlot(const QString &))); populateLists(); } FontDialog::~FontDialog() { } void FontDialog::familyListBoxSlot(const QString & text) { int styleInt = styleListBox->currentItem(); int sizeInt = sizeComboBox->currentText().toInt(); sizeComboBox->clear(); styleListBox->clear(); // clearListBoxes(); family = text; -// odebug << family << oendl; +// odebug << family << oendl; QStringList styles = fdb.styles( family ); // string list of styles of our current font family styleListBox->insertStringList( styles); QString dstyle;// = "\t" + style + " ("; -#ifdef BUGGY_SHARP_ZAURUS +#ifdef BUGGY_SHARP_ZAURUS QValueList<int> smoothies = fdb.smoothSizes( family, styleListBox->text(0) ); for ( QValueList<int>::Iterator points = smoothies.begin(); points != smoothies.end(); ++points ) { dstyle = QString::number( *points ); - odebug << dstyle << oendl; + odebug << dstyle << oendl; sizeComboBox->insertItem( dstyle.left( dstyle.length() - 1 )); } #else for (int i=0; i<nfontsizes; i++) { sizeComboBox->insertItem( QString::number(fontsize[i])); if(fontsize[i] == sizeInt) { sizeComboBox->setCurrentItem(i); } } #endif - if(styleInt == -1 || styleInt > styleListBox->count() ) + if(styleInt == -1 || styleInt > static_cast<int>(styleListBox->count()) ) styleListBox->setCurrentItem(0); else styleListBox->setCurrentItem(styleInt); changeText(); } -void FontDialog::styleListBoxSlot(const QString &text) +void FontDialog::styleListBoxSlot(const QString &) { changeText(); } -void FontDialog::sizeComboBoxSlot(const QString & text) +void FontDialog::sizeComboBoxSlot(const QString &) { changeText(); } void FontDialog::populateLists() { // QFont defaultFont=MultiLineEdit1->font(); // QFont defaultFont=Lview->font(); // QFontInfo fontInfo(defaultFont); Config config("Gutenbrowser"); config.setGroup("Font"); QString familyStr = config.readEntry("Family", "fixed"); QString styleStr = config.readEntry("Style", "Regular"); QString sizeStr = config.readEntry("Size", "10"); QString charSetStr = config.readEntry("CharSet", "iso10646-1" ); bool ok; int i_size = sizeStr.toInt(&ok,10); selectedFont = fdb.font(familyStr,styleStr,i_size,charSetStr); // defaultFont.setItalic(TRUE); families = fdb.families(); for ( QStringList::Iterator f = families.begin(); f != families.end();++f ) { QString family = *f; // if(family == defaultFont.family()) -// odebug << family << oendl; +// odebug << family << oendl; familyListBox->insertItem( family); if( familyListBox->text(0) == family) { QStringList styles = fdb.styles( family ); // string list of styles of our current font family styleListBox->insertStringList( styles); for ( QStringList::Iterator s = styles.begin(); s != styles.end();++s ) { // for each font style style = *s; QString dstyle;// = "\t" + style + " ("; if(styleListBox->text(0) == style) { QValueList<int> smoothies = fdb.smoothSizes( family, style ); for ( QValueList<int>::Iterator points = smoothies.begin(); points != smoothies.end(); ++points ) { dstyle = QString::number( *points ) + " "; sizeComboBox ->insertItem( dstyle.left( dstyle.length() - 1 )); } dstyle = dstyle.left( dstyle.length() - 1 ) + ")"; } } // styles } } - for(int i=0;i < familyListBox->count();i++) { + for(uint i=0;i < familyListBox->count();i++) { if( familyListBox->text(i) == familyStr) familyListBox->setSelected( i, TRUE); } - for(int i=0;i < styleListBox->count();i++) { + for(uint i=0;i < styleListBox->count();i++) { if( styleListBox->text(i) == styleStr) styleListBox->setSelected( i, TRUE); } for (int i=0; i<sizeComboBox->count(); i++) { #ifdef BUGGY_SHARP_ZAURUS if(sizeComboBox->text(i) == sizeStr) #else - if(fontsize[i] == i_size) + if(fontsize[i] == i_size) #endif sizeComboBox->setCurrentItem(i); } changeText(); } void FontDialog::clearListBoxes() { familyListBox->clear(); sizeComboBox->clear(); styleListBox->clear(); } void FontDialog::changeText() { if( familyListBox->currentItem() == -1) family= familyListBox->text(0); else { family = familyListBox->currentText(); } -// odebug << "Font family is "+family << oendl; +// odebug << "Font family is "+family << oendl; if( styleListBox->currentItem() == -1) style=styleListBox->text(0); else { style = styleListBox->currentText(); } -// odebug << "font style is "+style << oendl; +// odebug << "font style is "+style << oendl; if( sizeComboBox->currentItem() == -1 ) size = sizeComboBox->text(0); else { size = sizeComboBox->currentText(); } -// odebug << "Font size is "+size << oendl; +// odebug << "Font size is "+size << oendl; bool ok; int i_size = size.toInt(&ok,10); QStringList charSetList = fdb.charSets(family); // QStringList styles = fdb.styles( family ); // string list of styles of our current font family QString charSet; for ( QStringList::Iterator s = charSetList.begin(); s != charSetList.end();++s ) { // for each font style charSet = *s; -// odebug << charSet << oendl; +// odebug << charSet << oendl; } selectedFont = fdb.font(family,style,i_size,charSet); QFontInfo fontInfo( selectedFont); -// if(fontInfo.italic() ) odebug << "italic" << oendl; - selectedFont.setWeight(fontInfo.weight() ); -// odebug << "Style are "+style+" " << fontInfo.weight() << " " << oendl; +// if(fontInfo.italic() ) odebug << "italic" << oendl; + selectedFont.setWeight(fontInfo.weight() ); +// odebug << "Style are "+style+" " << fontInfo.weight() << " " << oendl; Config cfg("Gutenbrowser"); cfg.setGroup("Font"); cfg.writeEntry("Family",family); cfg.writeEntry("Style",style); cfg.writeEntry("Size",size); cfg.writeEntry("CharSet",charSet); if(style.find("Italic",0,TRUE) != -1) { selectedFont = fdb.font(family,"Regular",i_size,charSet); selectedFont.setItalic(TRUE); //ya right cfg.writeEntry("Italic","TRUE"); -// odebug << "Style is "+styleListBox->currentText() << oendl; +// odebug << "Style is "+styleListBox->currentText() << oendl; } else cfg.writeEntry("Italic","FALSE"); MultiLineEdit1->setFont( selectedFont); MultiLineEdit1->update(); changedFonts=TRUE; } diff --git a/noncore/apps/opie-gutenbrowser/helpwindow.cpp b/noncore/apps/opie-gutenbrowser/helpwindow.cpp index e86ca49..ffdc9f0 100644 --- a/noncore/apps/opie-gutenbrowser/helpwindow.cpp +++ b/noncore/apps/opie-gutenbrowser/helpwindow.cpp @@ -7,33 +7,33 @@ ** program may be used, distributed and modified without limitation. ** copyright : (C) 2000 -2004 by llornkcor email : ljp@llornkcor.com *****************************************************************************/ #include "helpwindow.h" #include <qstatusbar.h> #include <qmenubar.h> #include <qtoolbar.h> #include <qtoolbutton.h> #include <qcombobox.h> #include <ctype.h> -HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* parent, const char *name ) +HelpWindow::HelpWindow( const QString& home_, const QString&, QWidget* parent, const char *name ) : QMainWindow( parent, name, WDestructiveClose ), pathCombo( 0 ), selectedURL() { QString local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/"; // readHistory(); // readBookmarks(); browser = new QTextBrowser( this ); QStringList Strlist; Strlist.append( home_); browser->mimeSourceFactory()->setFilePath( Strlist ); browser->setFrameStyle( QFrame::Panel | QFrame::Sunken ); connect(browser,SIGNAL(textChanged()),this,SLOT(textChanged())); setCentralWidget( browser ); diff --git a/noncore/apps/oxygen/kmolelements.cpp b/noncore/apps/oxygen/kmolelements.cpp index ce8f9c1..e76461b 100644 --- a/noncore/apps/oxygen/kmolelements.cpp +++ b/noncore/apps/oxygen/kmolelements.cpp @@ -1,143 +1,143 @@ /* * kmolelements.cpp * * Copyright (C) 2000 Tomislav Gountchev <tomi@idiom.com> */ // classes that store and manipulate chemical formulas represented as // lists of elements #include <stdio.h> -#include "kmolelements.h" +#include "kmolelements.h" /** - * A generic chemical entity. Can be an element or a group. + * A generic chemical entity. Can be an element or a group. */ SubUnit::SubUnit () {} SubUnit::~SubUnit () {} /** - * Construct a subunit and return a pointer to it. The syntax of LINE is + * Construct a subunit and return a pointer to it. The syntax of LINE is * the one used in the element definition file. */ SubUnit* SubUnit::makeSubUnit(QString line) { QString name, grpname, weight, coef; QTextStream str (line, IO_ReadOnly); str >> name; if (name != "-group") { // not a group - must be represented as Element str >> weight >> ws; return new Element(name, weight.toDouble()); - } + } else { str >> grpname; ElementList* els = new ElementList(grpname); // group - make an ElementList while (!str.eof()) { str >> name >> ws; str >> coef >> ws; els->addElement(name, coef.toDouble()); } return els; } } QString SubUnit::getName() const { return QString("None"); } /** * Get the molecular weight of THIS, based on the data from ELSTABLE. */ -double SubUnit::getWeight(QDict<SubUnit>* elstable) const { +double SubUnit::getWeight(QDict<SubUnit>* ) const { return -1; } /** - * A group of elements. + * A group of elements. */ ElementList::ElementList () { elements = new QList<ElementCoef>; } ElementList::~ElementList () { delete elements; } /** - * A group of elements. + * A group of elements. */ ElementList::ElementList (QString name) { this->name = name; elements = new QList<ElementCoef>; } /** * Write THIS to LINE, in a format suitable for the element definition file. */ void ElementList::writeOut(QString& line) { QString coef; line = "-group " + name; ElementCoef* current = elements->first(); while (current != 0) { - line += " " + current->name + " " + coef.setNum(current->coef, 'g', 10); + line += " " + current->name + " " + coef.setNum(current->coef, 'g', 10); // precision set to 10 digits current = elements->next(); } } /** * Get the molecular weight of THIS, based on the data from ELSTABLE. */ double ElementList::getWeight(QDict<SubUnit>* elstable) const { double weight = 0; ElementCoef* current = elements->first(); while (current != 0) { SubUnit* e = elstable->find(current->name); if (e != 0) { weight += (current->coef) * (e->getWeight(elstable)); } else return -1; //ERROR current = elements->next(); } return weight; } /** - * Return a string representing the elemental composition of THIS, as + * Return a string representing the elemental composition of THIS, as * a tab-separated element - percentage pairs, separated by newlines. */ QString ElementList::getEA(QDict<SubUnit>* elstable, double mw) const { if (mw == 0) mw = getWeight(elstable); QString ea; QString temp; ElementCoef* current = elements->first(); while (current != 0) { SubUnit* e = elstable->find(current->name); if (e != 0) { - double current_percent = 100 * (current->coef) * - (e->getWeight(elstable)) + double current_percent = 100 * (current->coef) * + (e->getWeight(elstable)) / mw; - ea += current->name + "\t" + + ea += current->name + "\t" + temp.setNum(current_percent) + "\n"; } else return QString("ERROR!\n"); //ERROR current = elements->next(); } return ea; } - + /** * Return a string representing THIS as an empirical chemical formula. */ QString ElementList::getEmpFormula() const { QString ef; QString temp; ElementCoef* current = elements->first(); while (current != 0) { ef += current->name + temp.setNum(current->coef); current = elements->next(); } return ef; } /** * Multiply THIS (i.e. the coefficient of each element) by coef. @@ -149,90 +149,90 @@ void ElementList::multiplyBy(double coef) { current = elements->next(); } } /** * Add THIS to ELS. THIS is not modified; ELS is. */ void ElementList::addTo(ElementList& els, double coef) { ElementCoef* current = elements->first(); while (current != 0) { els.addElement(current->name, (current->coef) * coef); current = elements->next(); } } /** - * Add an element to THIS, with a coefficient COEF. If THIS already contains + * Add an element to THIS, with a coefficient COEF. If THIS already contains * an element with the same name, adjust its coefficient only; if not, create * a new ElementCoef pair and add to THIS. */ void ElementList::addElement(const QString& name, double coef) { ElementCoef* current = elements->first(); while (current != 0) { if (current->name == name) { current->coef += coef; return; } current = elements->next(); } elements->append(new ElementCoef(name, coef)); } /** * True iff THIS contains element named NAME. */ bool ElementList::contains(const QString& name) { ElementCoef* current = elements->first(); while (current != 0) { - if (current->name == name) + if (current->name == name) return true; current = elements->next(); } return false; } bool ElementList::isEmpty() { return elements->isEmpty(); } QString ElementList::getName() const { return name; } /** * A chemical element. */ -Element::Element(const QString& n, double w) +Element::Element(const QString& n, double w) : weight(w), name(n) { } Element::~Element() { } /** * Write THIS to LINE, in a format suitable for the element definition file. */ void Element::writeOut(QString& line) { line.setNum(weight); line = name + " " + line; } -double Element::getWeight(QDict<SubUnit>* elstable) const { +double Element::getWeight(QDict<SubUnit>* ) const { return weight; } void Element::addTo(ElementList& els, double coef) { els.addElement(name, coef); } QString Element::getName() const { return name; } /** - * An element - coefficient pair. Used to represent elements within an + * An element - coefficient pair. Used to represent elements within an * element list. */ ElementCoef::ElementCoef(const QString& n, double c) : name(n), coef(c) {} |