Simon thanks for the patch. Some clean ups. Patch provided by tronical

OAOAOAOAOAOAOAOAOAOAOAOAOBOBCVS: 	noncore/tools/remote/dvdgroupconf.cpp

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
@@ -154,3 +154,3 @@ void CardMonitor::cardMessage( const QCString &msg, const QByteArray & ) {
 
-bool CardMonitor::getStatusPcmcia( int showPopUp = FALSE ) {
+bool CardMonitor::getStatusPcmcia( int showPopUp ) {
 
@@ -237,3 +237,3 @@ bool CardMonitor::getStatusPcmcia( int showPopUp = FALSE ) {
 
-bool CardMonitor::getStatusSd( int showPopUp = FALSE ) {
+bool CardMonitor::getStatusSd( int showPopUp ) {
 
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
@@ -628,2 +628,3 @@ int VMemo::setToggleButton(int tog) {
   }
+  return -1;
 }
diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc
index 8299b3d..7a67ab2 100644
--- a/libopie/ofileselector.cc
+++ b/libopie/ofileselector.cc
@@ -115,4 +115,4 @@ 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 )
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
@@ -501,6 +501,6 @@ 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);
 }
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
@@ -40,4 +40,4 @@
 
-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 )
 {
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
@@ -17,3 +17,3 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-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)
 {
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
@@ -17,3 +17,3 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-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)
 {
@@ -116,2 +116,3 @@ QString InputDialog::getString()
 	}
+	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
@@ -18,3 +18,3 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-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)
 {
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
@@ -101,2 +101,3 @@ int myMessageBox(int wi, int h, QWidget *w, int argc, QStringList args)
 		return 2;
+	default: return -1;
 	}
@@ -130,3 +131,3 @@ void printusage()
 	printf("      -E                 Makes list input editable\n");
-	printf("      -g                 Disable fullscreen\n\0");
+	printf("      -g                 Disable fullscreen\n");
 }
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
@@ -18,3 +18,3 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-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)
 {
@@ -113,3 +113,3 @@ QStringList ButtonDialog::getRemotes()
 
-	if(std::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1)
+	if(::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1)
 	{
@@ -156,3 +156,3 @@ QStringList ButtonDialog::getRemotes()
 
-	std::close(fd);
+	::close(fd);
 	return list;
@@ -186,3 +186,3 @@ 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)
 	{
@@ -232,3 +232,3 @@ QStringList ButtonDialog::getButtons(const char *remoteName)
 
-	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
@@ -18,3 +18,3 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-ChannelGroup::ChannelGroup(QWidget *parent=0, const char *name=0):QWidget(parent,name)
+ChannelGroup::ChannelGroup(QWidget *parent, const char *name):QWidget(parent,name)
 {
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
@@ -18,3 +18,3 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-ChannelGroupConf::ChannelGroupConf(QWidget *parent=0, const char *name=0):QWidget(parent,name)
+ChannelGroupConf::ChannelGroupConf(QWidget *parent, const char *name):QWidget(parent,name)
 {
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
@@ -18,3 +18,3 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-ConfigTab::ConfigTab(QWidget *parent=0, const char *name=0):QWidget(parent,name)
+ConfigTab::ConfigTab(QWidget *parent, const char *name):QWidget(parent,name)
 {
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
@@ -24,3 +24,3 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-DVDGroup::DVDGroup(QWidget *parent=0, const char *name=0):QWidget(parent,name)
+DVDGroup::DVDGroup(QWidget *parent, const char *name):QWidget(parent,name)
 {
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
@@ -18,3 +18,3 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-DVDGroupConf::DVDGroupConf(QWidget *parent=0, const char *name=0):QWidget(parent,name)
+DVDGroupConf::DVDGroupConf(QWidget *parent, const char *name):QWidget(parent,name)
 {
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
@@ -18,3 +18,3 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-LearnTab::LearnTab(QWidget *parent=0, const char *name=0):QWidget(parent,name)
+LearnTab::LearnTab(QWidget *parent, const char *name):QWidget(parent,name)
 {
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
@@ -18,3 +18,3 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-MainView::MainView(QWidget *parent, const char *name=0) : QWidget(parent, name)
+MainView::MainView(QWidget *parent, const char *name) : QWidget(parent, name)
 {
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
@@ -18,3 +18,3 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-RemoteTab::RemoteTab(QWidget *parent=0, const char *name=0):QWidget(parent,name)
+RemoteTab::RemoteTab(QWidget *parent, const char *name):QWidget(parent,name)
 {
@@ -73,3 +73,3 @@ int RemoteTab::sendIR()
 		perror("RemoteTab::SendIR");
-		return NULL;
+		return 0;
 	}
@@ -77,3 +77,3 @@ int RemoteTab::sendIR()
 
-	if(std::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1)
+	if(::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1)
 	{
@@ -105,3 +105,3 @@ int RemoteTab::sendIR()
 	}
-	std::close(fd);
+	::close(fd);
 }
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
@@ -18,3 +18,3 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-TopGroup::TopGroup(QWidget *parent=0, const char *name=0):QWidget(parent,name)
+TopGroup::TopGroup(QWidget *parent, const char *name):QWidget(parent,name)
 {
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
@@ -18,3 +18,3 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-TopGroupConf::TopGroupConf(QWidget *parent=0, const char *name=0):QWidget(parent,name)
+TopGroupConf::TopGroupConf(QWidget *parent, const char *name):QWidget(parent,name)
 {
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
@@ -24,3 +24,3 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-VCRGroup::VCRGroup(QWidget *parent=0, const char *name=0) : QWidget(parent, 
+VCRGroup::VCRGroup(QWidget *parent, const char *name) : QWidget(parent, 
 name)
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
@@ -18,3 +18,3 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-VCRGroupConf::VCRGroupConf(QWidget *parent=0, const char *name=0) : QWidget(parent, name)
+VCRGroupConf::VCRGroupConf(QWidget *parent, const char *name) : QWidget(parent, name)
 {
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
@@ -172,3 +172,3 @@ QString IMAPHandler::iStatus(const QString &mailbox, const QString &items)
 
-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)
 {
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
@@ -33,3 +33,3 @@
 
-MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) :
+MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
   QMainWindow( parent, name, f )
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
@@ -11,3 +11,3 @@
 
-Package::Package( QObject *parent=0, const char *name=0 )
+Package::Package( QObject *parent, const char *name )
 	: QObject(parent,name)
@@ -21,3 +21,3 @@ 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)
@@ -47,3 +47,3 @@ void Package::init( PackageManagerSettings *s )
 
-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)
@@ -54,3 +54,3 @@ Package::Package( QStringList pack, PackageManagerSettings *s , QObject *parent=
 
-Package::Package( QString n, PackageManagerSettings *s, QObject *parent=0, const char *name=0 )
+Package::Package( QString n, PackageManagerSettings *s, QObject *parent, const char *name )
 {	
@@ -68,3 +68,3 @@ 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 )
 {
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
@@ -12,3 +12,3 @@ 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 )
@@ -199,3 +199,3 @@ Package* PackageList::getByName( QString n )
 {
-	origPackageList[n];
+	return origPackageList[n];
 }
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
@@ -10,3 +10,3 @@
 
-PackageListDocLnk::PackageListDocLnk(PackageManagerSettings* s, QObject *parent=0, const char *name=0)
+PackageListDocLnk::PackageListDocLnk(PackageManagerSettings* s, QObject *parent, const char *name)
 	: PackageList(s)
@@ -16,3 +16,3 @@ PackageListDocLnk::PackageListDocLnk(PackageManagerSettings* s, QObject *parent=
 
-PackageListDocLnk::PackageListDocLnk(QObject *parent=0, const char *name=0)
+PackageListDocLnk::PackageListDocLnk(QObject *parent, const char *name)
 	: PackageList(parent, name)
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
@@ -161,3 +161,3 @@ void PackageListItem::displayDetails()
 	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() );
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
@@ -171,4 +171,4 @@ template <unsigned int SH> inline fixed<SH> sqrt ( const fixed<SH> &f )
 		
-	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