Diffstat (limited to 'noncore/apps/opie-gutenbrowser') (more/less context) (ignore whitespace changes)
-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 |
4 files changed, 23 insertions, 23 deletions
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 @@ -34,9 +34,9 @@ /* * 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" ); 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 @@ -39,9 +39,9 @@ extern "C" { 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); 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 @@ -54,16 +54,16 @@ FontDialog::FontDialog( QWidget * parent, const char* name /*, bool modal, WFla 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); @@ -89,19 +89,19 @@ void FontDialog::familyListBoxSlot(const QString & text) 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 @@ -112,22 +112,22 @@ 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 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(); } @@ -150,9 +150,9 @@ void FontDialog::populateLists() 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 ); @@ -173,14 +173,14 @@ void FontDialog::populateLists() } } // 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); } @@ -188,9 +188,9 @@ void FontDialog::populateLists() #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(); @@ -208,37 +208,37 @@ void FontDialog::changeText() 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); @@ -248,9 +248,9 @@ void FontDialog::changeText() 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); 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 @@ -19,9 +19,9 @@ #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(); |