29 files changed, 51 insertions, 48 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 3dd9f54..93bc97a 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp @@ -152,7 +152,7 @@ void CardMonitor::cardMessage( const QCString &msg, const QByteArray & ) { } } -bool CardMonitor::getStatusPcmcia( int showPopUp = FALSE ) { +bool CardMonitor::getStatusPcmcia( int showPopUp ) { bool cardWas0 = cardInPcmcia0; // remember last state bool cardWas1 = cardInPcmcia1; @@ -235,7 +235,7 @@ bool CardMonitor::getStatusPcmcia( int showPopUp = FALSE ) { } -bool CardMonitor::getStatusSd( int showPopUp = FALSE ) { +bool CardMonitor::getStatusSd( int showPopUp ) { bool cardWas=cardInSd; // remember last state cardInSd=false; diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index b29ee62..4278f46 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp @@ -626,4 +626,5 @@ int VMemo::setToggleButton(int tog) { break; }; } + return -1; } diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc index 8299b3d..7a67ab2 100644 --- a/libopie/ofileselector.cc +++ b/libopie/ofileselector.cc @@ -113,8 +113,8 @@ QTimer::singleShot(6*1000, this, SLOT( slotTest() ) ); } OFileSelector::OFileSelector(const QString &mimeFilter, QWidget *parent, - const char *name, bool newVisible = TRUE, - bool closeVisible = FALSE ) + const char *name, bool newVisible, + bool closeVisible ) : QWidget( parent, name ) { m_mimetypes = QStringList::split(";", mimeFilter ); diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp index 293c391..8f2b9c9 100644 --- a/noncore/net/opieftp/opieftp.cpp +++ b/noncore/net/opieftp/opieftp.cpp @@ -499,10 +499,10 @@ void OpieFtp::localUpload() void OpieFtp::nullifyCallBack() { - FtpOptions(FTPLIB_CALLBACK, NULL, conn); - FtpOptions(FTPLIB_IDLETIME, NULL, conn); - FtpOptions(FTPLIB_CALLBACKARG, NULL, conn); - FtpOptions(FTPLIB_CALLBACKBYTES, NULL, conn); + FtpOptions(FTPLIB_CALLBACK, 0, conn); + FtpOptions(FTPLIB_IDLETIME, 0, conn); + FtpOptions(FTPLIB_CALLBACKARG, 0, conn); + FtpOptions(FTPLIB_CALLBACKBYTES, 0, conn); } void OpieFtp::remoteDownload() diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp index b490072..672548f 100644 --- a/noncore/settings/sound/soundsettings.cpp +++ b/noncore/settings/sound/soundsettings.cpp @@ -38,8 +38,8 @@ #include <stdio.h> #include <sys/stat.h> -SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl ) - : SoundSettingsBase( parent, name, TRUE, fl ) +SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) + : SoundSettingsBase( parent, objname, TRUE, fl ) { keyReset=FALSE; diff --git a/noncore/tools/opie-sh/fviewer.cpp b/noncore/tools/opie-sh/fviewer.cpp index 882c72c..6f8f054 100644 --- a/noncore/tools/opie-sh/fviewer.cpp +++ b/noncore/tools/opie-sh/fviewer.cpp @@ -15,7 +15,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "fviewer.h" -FViewer::FViewer(QString icon, QString filename, QString title, QWidget *parent=0, const char*name=0):QWidget(parent, name) +FViewer::FViewer(QString icon, QString filename, QString title, QWidget *parent, const char*name):QWidget(parent, name) { QVBoxLayout *layout = new QVBoxLayout(this); diff --git a/noncore/tools/opie-sh/inputdialog.cpp b/noncore/tools/opie-sh/inputdialog.cpp index 0780def..1c4e688 100644 --- a/noncore/tools/opie-sh/inputdialog.cpp +++ b/noncore/tools/opie-sh/inputdialog.cpp @@ -15,7 +15,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "inputdialog.h" -InputDialog::InputDialog(int w, int h, int newtype, QString labelString, QString title, QString filename, bool edit, QWidget *parent=0, const char *name=0, bool modal=true, WFlags f=0):QDialog(parent, name, modal, f) +InputDialog::InputDialog(int w, int h, int newtype, QString labelString, QString title, QString filename, bool edit, QWidget *parent, const char *name, bool modal, WFlags f):QDialog(parent, name, modal, f) { type = newtype; QHBoxLayout *layout = new QHBoxLayout(this); @@ -114,4 +114,5 @@ QString InputDialog::getString() } return string; } + return QString::null; } diff --git a/noncore/tools/opie-sh/mbox.cpp b/noncore/tools/opie-sh/mbox.cpp index cb3ea1b..04b397d 100644 --- a/noncore/tools/opie-sh/mbox.cpp +++ b/noncore/tools/opie-sh/mbox.cpp @@ -16,7 +16,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "mbox.h" -MBox::MBox(int w, int h, int type, QString title, QString message, QString *btext0 = 0, QString *btext1= 0, QString *btext2 = 0, QWidget *parent=0, const char*name=0, bool modal=true, WFlags f=0):QDialog(parent, name, modal, f) +MBox::MBox(int w, int h, int type, QString title, QString message, QString *btext0, QString *btext1, QString *btext2, QWidget *parent, const char*name, bool modal, WFlags f):QDialog(parent, name, modal, f) { QVBoxLayout *layout = new QVBoxLayout(this); diff --git a/noncore/tools/opie-sh/opie-sh.cpp b/noncore/tools/opie-sh/opie-sh.cpp index e898cb1..96b4b93 100644 --- a/noncore/tools/opie-sh/opie-sh.cpp +++ b/noncore/tools/opie-sh/opie-sh.cpp @@ -99,6 +99,7 @@ int myMessageBox(int wi, int h, QWidget *w, int argc, QStringList args) return 1; case 4: return 2; + default: return -1; } } @@ -128,7 +129,7 @@ void printusage() printf(" -L [label] The label for the input field\n"); printf(" -F [filename] An input file (for when it makes sense) [Default = stdin]\n"); printf(" -E Makes list input editable\n"); - printf(" -g Disable fullscreen\n\0"); + printf(" -g Disable fullscreen\n"); } int fileviewer(QPEApplication *a, int argc, QStringList args) diff --git a/noncore/tools/remote/buttondialog.cpp b/noncore/tools/remote/buttondialog.cpp index 7479e85..6ea4801 100644 --- a/noncore/tools/remote/buttondialog.cpp +++ b/noncore/tools/remote/buttondialog.cpp @@ -16,7 +16,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "buttondialog.h" -ButtonDialog::ButtonDialog(QString buttonName, QWidget *parent=0, const char*name=0, bool modal=FALSE, WFlags f=0):QDialog(parent, name, modal, f) +ButtonDialog::ButtonDialog(QString buttonName, QWidget *parent, const char*name, bool modal, WFlags f):QDialog(parent, name, modal, f) { setCaption(tr(buttonName)); @@ -111,7 +111,7 @@ QStringList ButtonDialog::getRemotes() return NULL; } - if(std::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) + if(::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) { QMessageBox *mb = new QMessageBox("Error!", "couldnt connect to socket", @@ -154,7 +154,7 @@ QStringList ButtonDialog::getRemotes() return NULL; } - std::close(fd); + ::close(fd); return list; } @@ -184,7 +184,7 @@ QStringList ButtonDialog::getButtons(const char *remoteName) } - if(std::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) + if(::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) { QMessageBox *mb = new QMessageBox("Error!", "couldnt connect to socket", @@ -230,7 +230,7 @@ QStringList ButtonDialog::getButtons(const char *remoteName) return NULL; } - std::close(fd); + ::close(fd); return list; } diff --git a/noncore/tools/remote/channelgroup.cpp b/noncore/tools/remote/channelgroup.cpp index 9f90284..7c33674 100644 --- a/noncore/tools/remote/channelgroup.cpp +++ b/noncore/tools/remote/channelgroup.cpp @@ -16,7 +16,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "channelgroup.h" -ChannelGroup::ChannelGroup(QWidget *parent=0, const char *name=0):QWidget(parent,name) +ChannelGroup::ChannelGroup(QWidget *parent, const char *name):QWidget(parent,name) { QGridLayout *layout = new QGridLayout(this); QVBoxLayout *volLayout = new QVBoxLayout(this); diff --git a/noncore/tools/remote/channelgroupconf.cpp b/noncore/tools/remote/channelgroupconf.cpp index 2d98115..e39121e 100644 --- a/noncore/tools/remote/channelgroupconf.cpp +++ b/noncore/tools/remote/channelgroupconf.cpp @@ -16,7 +16,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "channelgroupconf.h" -ChannelGroupConf::ChannelGroupConf(QWidget *parent=0, const char *name=0):QWidget(parent,name) +ChannelGroupConf::ChannelGroupConf(QWidget *parent, const char *name):QWidget(parent,name) { QGridLayout *layout = new QGridLayout(this); QVBoxLayout *volLayout = new QVBoxLayout(this); diff --git a/noncore/tools/remote/configtab.cpp b/noncore/tools/remote/configtab.cpp index f5896a9..17cdc6a 100644 --- a/noncore/tools/remote/configtab.cpp +++ b/noncore/tools/remote/configtab.cpp @@ -16,7 +16,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "configtab.h" -ConfigTab::ConfigTab(QWidget *parent=0, const char *name=0):QWidget(parent,name) +ConfigTab::ConfigTab(QWidget *parent, const char *name):QWidget(parent,name) { QVBoxLayout *layout = new QVBoxLayout(this); diff --git a/noncore/tools/remote/dvdgroup.cpp b/noncore/tools/remote/dvdgroup.cpp index a75c48a..d7ff515 100644 --- a/noncore/tools/remote/dvdgroup.cpp +++ b/noncore/tools/remote/dvdgroup.cpp @@ -22,7 +22,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "dvdgroup.h" -DVDGroup::DVDGroup(QWidget *parent=0, const char *name=0):QWidget(parent,name) +DVDGroup::DVDGroup(QWidget *parent, const char *name):QWidget(parent,name) { QGridLayout *layout = new QGridLayout(this); diff --git a/noncore/tools/remote/dvdgroupconf.cpp b/noncore/tools/remote/dvdgroupconf.cpp index 5bfe393..2a08ab6 100644 --- a/noncore/tools/remote/dvdgroupconf.cpp +++ b/noncore/tools/remote/dvdgroupconf.cpp @@ -16,7 +16,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "dvdgroupconf.h" -DVDGroupConf::DVDGroupConf(QWidget *parent=0, const char *name=0):QWidget(parent,name) +DVDGroupConf::DVDGroupConf(QWidget *parent, const char *name):QWidget(parent,name) { QGridLayout *layout = new QGridLayout(this); diff --git a/noncore/tools/remote/learntab.cpp b/noncore/tools/remote/learntab.cpp index 054bc7b..998f449 100644 --- a/noncore/tools/remote/learntab.cpp +++ b/noncore/tools/remote/learntab.cpp @@ -16,7 +16,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "learntab.h" -LearnTab::LearnTab(QWidget *parent=0, const char *name=0):QWidget(parent,name) +LearnTab::LearnTab(QWidget *parent, const char *name):QWidget(parent,name) { QVBoxLayout *layout = new QVBoxLayout(this); QString *string = new QString("<qt><h1>Opie-Remote Usage Instructions</h1><p>First, some definitions. A Remote is a remote entry in an lircd.conf file, it represents one remote you want to emulate. A Remote Layout is one entry in your ~/Settings/Remote.conf file. It represents the buttons that you see on your screen. Each button on a Remote Layout can be mapped to any button in a Remote. This way you can have, for example, a vcr remote layout, in which all the play/pause/etc buttons are mapped to the buttons on your vcr's remote. However, most VCR's don't have volume controls, so the volume buttons can be mapped to the volume buttons on your TV.</p><p>The first things you need the lirc and lirc-modules ipkgs. If you installed this from an ipkg, they should already be there, thanks to the wonderful world of dependencies. If not, get them. The next thing you need is an lircd.conf file. you can get these at <a href=http://www.lirc.org/>http://www.lirc.org/</a>. Read the documentation there to figure out how to make your own, if one for your remote doesn't exist, or how to have multiple remotes in one lircd.conf file. Once you have a good lircd.conf file, put it in /etc, kill the lircd daemon (if its running) and do a modprobe lirc_sir. Then, run lircd again.</p><p>The next thing you want to do is to create a remote layout. Go to the config tab, and enter a name for your remote layout in the pulldown menu. Dont use the name Remotes, as that could confuse the app. Hopefully, that will be fixed soon. after entering the name you want to use, press New, and then select the name again from the pulldown menu (another oddity that i hope to fix). Then, press each button that you want to map, and a dialog should appear. Select the remote and button that you want to use, and click OK. Once you are done, go to the Remote tab, and select the new remote from the dropdown menu. It should works fine. If at any time you want to change a remote layout, go to the Config tab, select the layout from the dropdown menu, and change the buttons you want to change.</p><p>This is program is written and maintaned by Thomas (spiralman) Stephens. <a href=mailto:spiralman@softhome.net>spiralman@softhome.net</a>. Or, look for me on #opie or #handhelds.org on irc.openprojects.net.</p></qt>"); diff --git a/noncore/tools/remote/mainview.cpp b/noncore/tools/remote/mainview.cpp index 47027fb..a7be9e3 100644 --- a/noncore/tools/remote/mainview.cpp +++ b/noncore/tools/remote/mainview.cpp @@ -16,7 +16,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "mainview.h" -MainView::MainView(QWidget *parent, const char *name=0) : QWidget(parent, name) +MainView::MainView(QWidget *parent, const char *name) : QWidget(parent, name) { setIcon( Resource::loadPixmap( "remote" ) ); setCaption(tr("Remote") ); diff --git a/noncore/tools/remote/remotetab.cpp b/noncore/tools/remote/remotetab.cpp index 64b8ee4..5b02e94 100644 --- a/noncore/tools/remote/remotetab.cpp +++ b/noncore/tools/remote/remotetab.cpp @@ -16,7 +16,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "remotetab.h" -RemoteTab::RemoteTab(QWidget *parent=0, const char *name=0):QWidget(parent,name) +RemoteTab::RemoteTab(QWidget *parent, const char *name):QWidget(parent,name) { QVBoxLayout *layout = new QVBoxLayout(this); @@ -71,11 +71,11 @@ int RemoteTab::sendIR() QMessageBox::NoButton); mb->exec(); perror("RemoteTab::SendIR"); - return NULL; + return 0; } - if(std::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) + if(::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) { QMessageBox *mb = new QMessageBox("Error!", "couldnt connect to socket", @@ -103,7 +103,7 @@ int RemoteTab::sendIR() done=true; } } - std::close(fd); + ::close(fd); } // printf("%s\n", readPacket()); diff --git a/noncore/tools/remote/topgroup.cpp b/noncore/tools/remote/topgroup.cpp index 94ea622..93cffbb 100644 --- a/noncore/tools/remote/topgroup.cpp +++ b/noncore/tools/remote/topgroup.cpp @@ -16,7 +16,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "topgroup.h" -TopGroup::TopGroup(QWidget *parent=0, const char *name=0):QWidget(parent,name) +TopGroup::TopGroup(QWidget *parent, const char *name):QWidget(parent,name) { QHBoxLayout *layout = new QHBoxLayout(this, 0, -1, 0); diff --git a/noncore/tools/remote/topgroupconf.cpp b/noncore/tools/remote/topgroupconf.cpp index eb071fb..d763a3a 100644 --- a/noncore/tools/remote/topgroupconf.cpp +++ b/noncore/tools/remote/topgroupconf.cpp @@ -16,7 +16,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "topgroupconf.h" -TopGroupConf::TopGroupConf(QWidget *parent=0, const char *name=0):QWidget(parent,name) +TopGroupConf::TopGroupConf(QWidget *parent, const char *name):QWidget(parent,name) { QHBoxLayout *layout = new QHBoxLayout(this); diff --git a/noncore/tools/remote/vcrgroup.cpp b/noncore/tools/remote/vcrgroup.cpp index 4f07ca3..10ebe5d 100644 --- a/noncore/tools/remote/vcrgroup.cpp +++ b/noncore/tools/remote/vcrgroup.cpp @@ -22,7 +22,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "vcrgroup.h" -VCRGroup::VCRGroup(QWidget *parent=0, const char *name=0) : QWidget(parent, +VCRGroup::VCRGroup(QWidget *parent, const char *name) : QWidget(parent, name) { QVBoxLayout *vlayout = new QVBoxLayout(this); diff --git a/noncore/tools/remote/vcrgroupconf.cpp b/noncore/tools/remote/vcrgroupconf.cpp index a50ed0a..2158d43 100644 --- a/noncore/tools/remote/vcrgroupconf.cpp +++ b/noncore/tools/remote/vcrgroupconf.cpp @@ -16,7 +16,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "vcrgroupconf.h" -VCRGroupConf::VCRGroupConf(QWidget *parent=0, const char *name=0) : QWidget(parent, name) +VCRGroupConf::VCRGroupConf(QWidget *parent, const char *name) : QWidget(parent, name) { QVBoxLayout *vlayout = new QVBoxLayout(this); diff --git a/noncore/unsupported/mail2/libmail/imaphandler.cpp b/noncore/unsupported/mail2/libmail/imaphandler.cpp index 730a004..7493240 100644 --- a/noncore/unsupported/mail2/libmail/imaphandler.cpp +++ b/noncore/unsupported/mail2/libmail/imaphandler.cpp @@ -170,7 +170,7 @@ QString IMAPHandler::iStatus(const QString &mailbox, const QString &items) return tag(false); } -QString IMAPHandler::iAppend(const QString &mailbox, const QString &literal, const QString &flags, const QString &datetime = 0) +QString IMAPHandler::iAppend(const QString &mailbox, const QString &literal, const QString &flags, const QString &datetime) { doLogin(); diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp index 7df1d6b..05f2f06 100644 --- a/noncore/unsupported/oipkg/mainwindow.cpp +++ b/noncore/unsupported/oipkg/mainwindow.cpp @@ -31,7 +31,7 @@ #include "packagelistitem.h" -MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) : +MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : QMainWindow( parent, name, f ) // packageListServers( QObject(parent), name ), // packageListSearch( parent, name ), diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp index 97f7813..517b37a 100644 --- a/noncore/unsupported/oipkg/package.cpp +++ b/noncore/unsupported/oipkg/package.cpp @@ -9,7 +9,7 @@ #include "debug.h" -Package::Package( QObject *parent=0, const char *name=0 ) +Package::Package( QObject *parent, const char *name ) : QObject(parent,name) { @@ -19,7 +19,7 @@ Package::~Package() { } -Package::Package( PackageManagerSettings *s, QObject *parent=0, const char *name=0 ) +Package::Package( PackageManagerSettings *s, QObject *parent, const char *name ) : QObject(parent,name) { Package(parent,name); @@ -45,14 +45,14 @@ void Package::init( PackageManagerSettings *s ) _version=""; } -Package::Package( QStringList pack, PackageManagerSettings *s , QObject *parent=0, const char *name=0 ) +Package::Package( QStringList pack, PackageManagerSettings *s , QObject *parent, const char *name ) : QObject(parent,name) { init(s); parsePackage( pack ); } -Package::Package( QString n, PackageManagerSettings *s, QObject *parent=0, const char *name=0 ) +Package::Package( QString n, PackageManagerSettings *s, QObject *parent, const char *name ) { init(s); if ( !QFile::exists( n ) ) @@ -66,7 +66,7 @@ Package::Package( QString n, PackageManagerSettings *s, QObject *parent=0, const } } -Package::Package( Package *pi, QObject *parent=0, const char *name=0 ) +Package::Package( Package *pi, QObject *parent, const char *name ) { init(pi->settings); copyValues( pi ); diff --git a/noncore/unsupported/oipkg/packagelist.cpp b/noncore/unsupported/oipkg/packagelist.cpp index 3cc0443..e445570 100644 --- a/noncore/unsupported/oipkg/packagelist.cpp +++ b/noncore/unsupported/oipkg/packagelist.cpp @@ -10,7 +10,7 @@ static QDict<Package> *packageListAll; static int packageListAllRefCount = 0; -PackageList::PackageList(QObject *parent=0, const char *name=0) +PackageList::PackageList(QObject *parent, const char *name) : QObject(parent,name), packageIter( packageList ) { empty=true; @@ -197,7 +197,7 @@ void PackageList::setSettings( PackageManagerSettings *s ) Package* PackageList::getByName( QString n ) { - origPackageList[n]; + return origPackageList[n]; } void PackageList::clear() diff --git a/noncore/unsupported/oipkg/packagelistdoclnk.cpp b/noncore/unsupported/oipkg/packagelistdoclnk.cpp index b42cfdd..deb8a6d 100644 --- a/noncore/unsupported/oipkg/packagelistdoclnk.cpp +++ b/noncore/unsupported/oipkg/packagelistdoclnk.cpp @@ -8,13 +8,13 @@ #include "package.h" #include "pksettings.h" -PackageListDocLnk::PackageListDocLnk(PackageManagerSettings* s, QObject *parent=0, const char *name=0) +PackageListDocLnk::PackageListDocLnk(PackageManagerSettings* s, QObject *parent, const char *name) : PackageList(s) { PackageListDocLnk(parent, name); } -PackageListDocLnk::PackageListDocLnk(QObject *parent=0, const char *name=0) +PackageListDocLnk::PackageListDocLnk(QObject *parent, const char *name) : PackageList(parent, name) { Config cfg( "oipkg", Config::User ); diff --git a/noncore/unsupported/oipkg/packagelistitem.cpp b/noncore/unsupported/oipkg/packagelistitem.cpp index 0c9c676..7c54441 100644 --- a/noncore/unsupported/oipkg/packagelistitem.cpp +++ b/noncore/unsupported/oipkg/packagelistitem.cpp @@ -159,7 +159,7 @@ void PackageListItem::displayDetails() sod = sod.isEmpty()?QString(""):QString(" ("+sod+")"); setText(0, package->name()+sod ); nameItem->setText( 0, QObject::tr("Name: ")+package->name()); - linkItem->setText( 0, QObject::tr("Link: ")+package->link()?QObject::tr("Yes"):QObject::tr("No")); + linkItem->setText( 0, QObject::tr("Link: ")+(package->link()?QObject::tr("Yes"):QObject::tr("No"))); destItem->setText( 0, QObject::tr("Destination: ")+package->dest() ); statusItem->setText( 0, QObject::tr("Status: ")+package->status() ); repaint(); diff --git a/noncore/unsupported/qpdf/fixed.h b/noncore/unsupported/qpdf/fixed.h index d073421..ec0e696 100644 --- a/noncore/unsupported/qpdf/fixed.h +++ b/noncore/unsupported/qpdf/fixed.h @@ -169,8 +169,8 @@ template <unsigned int SH> inline fixed<SH> sqrt ( const fixed<SH> &f ) if ( f. m_f <= 0 ) return fixed<SH> ( 0, true ); - fixed<SH>::fix_t a0 = 0; - fixed<SH>::fix_t a1 = f. m_f; // take value as first approximation + typename fixed<SH>::fix_t a0 = 0; + typename fixed<SH>::fix_t a1 = f. m_f; // take value as first approximation do { a0 = a1; |