summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/checkbook/traninfo.cpp2
-rw-r--r--noncore/apps/confedit/listviewconfdir.cpp4
-rw-r--r--noncore/apps/confedit/listviewitemconfigentry.cpp8
-rw-r--r--noncore/apps/opie-bartender/bac.cpp1
-rw-r--r--noncore/apps/opie-gutenbrowser/LibraryDialog.cpp2
-rw-r--r--noncore/apps/opie-gutenbrowser/NetworkDialog.cpp2
-rw-r--r--noncore/apps/opie-gutenbrowser/fontDialog.cpp40
-rw-r--r--noncore/apps/opie-gutenbrowser/helpwindow.cpp2
-rw-r--r--noncore/apps/oxygen/kmolelements.cpp36
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
@@ -225,3 +225,3 @@ TranInfo *TranInfoList::findMostRecentByDesc( const QString &desc )
}
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
@@ -52,7 +52,7 @@ void ListViewConfDir::readConfFiles()
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;
}
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
@@ -137,7 +137,7 @@ void ListViewItemConfigEntry::save(QTextStream *t)
void ListViewItemConfigEntry::revert()
{
- _group = _groupOrig;
- _key = _keyOrig;
- _value = _valueOrig;
+ _group = _groupOrig;
+ _key = _keyOrig;
+ _value = _valueOrig;
_changed=false;
displayText();
@@ -148,3 +148,3 @@ 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
@@ -135,5 +135,4 @@ void BacDialog::calculate()
float weight,genderDiff, bac, typeDrink=0, drinkOz=0, bodyWater, milliliters, oz, gram, gramsMil, alc, metab, bac1;
- float weightunitDifference, massunitdiff;
QString estBac;
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
@@ -36,5 +36,5 @@
* 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 )
{
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
@@ -41,5 +41,5 @@ 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;
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
@@ -56,5 +56,5 @@ FontDialog::FontDialog( QWidget * parent, const char* name /*, bool modal, WFla
FontTextLabel4->setText( tr( "Size" ) );
hbox->addWidget( FontTextLabel4,0);
-
+
sizeComboBox = new QComboBox( FALSE, this, "SizeCombo");
// sizeComboBox->setMaximumWidth(60);
@@ -63,5 +63,5 @@ FontDialog::FontDialog( QWidget * parent, const char* name /*, bool modal, WFla
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" ) );
@@ -91,15 +91,15 @@ void FontDialog::familyListBoxSlot(const QString & text)
// 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 ));
}
@@ -114,5 +114,5 @@ QValueList<int> smoothies = fdb.smoothSizes( family, styleListBox->text(0) );
#endif
- if(styleInt == -1 || styleInt > styleListBox->count() )
+ if(styleInt == -1 || styleInt > static_cast<int>(styleListBox->count()) )
styleListBox->setCurrentItem(0);
else
@@ -122,10 +122,10 @@ QValueList<int> smoothies = fdb.smoothSizes( family, styleListBox->text(0) );
}
-void FontDialog::styleListBoxSlot(const QString &text)
+void FontDialog::styleListBoxSlot(const QString &)
{
changeText();
}
-void FontDialog::sizeComboBoxSlot(const QString & text)
+void FontDialog::sizeComboBoxSlot(const QString &)
{
changeText();
@@ -152,5 +152,5 @@ void FontDialog::populateLists()
QString family = *f;
// if(family == defaultFont.family())
-// odebug << family << oendl;
+// odebug << family << oendl;
familyListBox->insertItem( family);
@@ -175,10 +175,10 @@ void FontDialog::populateLists()
}
}
- 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);
@@ -190,5 +190,5 @@ void FontDialog::populateLists()
if(sizeComboBox->text(i) == sizeStr)
#else
- if(fontsize[i] == i_size)
+ if(fontsize[i] == i_size)
#endif
sizeComboBox->setCurrentItem(i);
@@ -210,5 +210,5 @@ void FontDialog::changeText()
family = familyListBox->currentText();
}
-// odebug << "Font family is "+family << oendl;
+// odebug << "Font family is "+family << oendl;
if( styleListBox->currentItem() == -1)
style=styleListBox->text(0);
@@ -216,5 +216,5 @@ void FontDialog::changeText()
style = styleListBox->currentText();
}
-// odebug << "font style is "+style << oendl;
+// odebug << "font style is "+style << oendl;
if( sizeComboBox->currentItem() == -1 )
@@ -224,5 +224,5 @@ void FontDialog::changeText()
}
-// odebug << "Font size is "+size << oendl;
+// odebug << "Font size is "+size << oendl;
bool ok;
int i_size = size.toInt(&ok,10);
@@ -232,11 +232,11 @@ void FontDialog::changeText()
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");
@@ -250,5 +250,5 @@ void FontDialog::changeText()
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");
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
@@ -21,5 +21,5 @@
#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()
{
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
@@ -9,8 +9,8 @@
#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 () {}
@@ -19,5 +19,5 @@ 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.
*/
@@ -29,5 +29,5 @@ SubUnit* SubUnit::makeSubUnit(QString line) {
str >> weight >> ws;
return new Element(name, weight.toDouble());
- }
+ }
else {
str >> grpname;
@@ -49,10 +49,10 @@ QString SubUnit::getName() const {
* 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 () {
@@ -66,5 +66,5 @@ ElementList::~ElementList () {
/**
- * A group of elements.
+ * A group of elements.
*/
ElementList::ElementList (QString name) {
@@ -81,5 +81,5 @@ void ElementList::writeOut(QString& line) {
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();
@@ -104,5 +104,5 @@ double ElementList::getWeight(QDict<SubUnit>* elstable) const {
/**
- * 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.
*/
@@ -115,8 +115,8 @@ QString ElementList::getEA(QDict<SubUnit>* elstable, double mw) const {
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
@@ -125,5 +125,5 @@ QString ElementList::getEA(QDict<SubUnit>* elstable, double mw) const {
return ea;
}
-
+
/**
* Return a string representing THIS as an empirical chemical formula.
@@ -163,5 +163,5 @@ void ElementList::addTo(ElementList& els, double coef) {
/**
- * 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.
@@ -185,5 +185,5 @@ 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();
@@ -203,5 +203,5 @@ QString ElementList::getName() const {
* A chemical element.
*/
-Element::Element(const QString& n, double w)
+Element::Element(const QString& n, double w)
: weight(w), name(n) { }
@@ -219,5 +219,5 @@ void Element::writeOut(QString& line) {
}
-double Element::getWeight(QDict<SubUnit>* elstable) const {
+double Element::getWeight(QDict<SubUnit>* ) const {
return weight;
}
@@ -232,5 +232,5 @@ QString Element::getName() const {
/**
- * An element - coefficient pair. Used to represent elements within an
+ * An element - coefficient pair. Used to represent elements within an
* element list.
*/