26 files changed, 46 insertions, 44 deletions
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 | |||
@@ -500,8 +500,8 @@ void OpieFtp::localUpload() | |||
500 | void OpieFtp::nullifyCallBack() | 500 | void OpieFtp::nullifyCallBack() |
501 | { | 501 | { |
502 | FtpOptions(FTPLIB_CALLBACK, NULL, conn); | 502 | FtpOptions(FTPLIB_CALLBACK, 0, conn); |
503 | FtpOptions(FTPLIB_IDLETIME, NULL, conn); | 503 | FtpOptions(FTPLIB_IDLETIME, 0, conn); |
504 | FtpOptions(FTPLIB_CALLBACKARG, NULL, conn); | 504 | FtpOptions(FTPLIB_CALLBACKARG, 0, conn); |
505 | FtpOptions(FTPLIB_CALLBACKBYTES, NULL, conn); | 505 | FtpOptions(FTPLIB_CALLBACKBYTES, 0, conn); |
506 | } | 506 | } |
507 | 507 | ||
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 | |||
@@ -39,6 +39,6 @@ | |||
39 | #include <sys/stat.h> | 39 | #include <sys/stat.h> |
40 | 40 | ||
41 | SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl ) | 41 | SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) |
42 | : SoundSettingsBase( parent, name, TRUE, fl ) | 42 | : SoundSettingsBase( parent, objname, TRUE, fl ) |
43 | { | 43 | { |
44 | keyReset=FALSE; | 44 | 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 | |||
@@ -16,5 +16,5 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
16 | #include "fviewer.h" | 16 | #include "fviewer.h" |
17 | 17 | ||
18 | FViewer::FViewer(QString icon, QString filename, QString title, QWidget *parent=0, const char*name=0):QWidget(parent, name) | 18 | FViewer::FViewer(QString icon, QString filename, QString title, QWidget *parent, const char*name):QWidget(parent, name) |
19 | { | 19 | { |
20 | QVBoxLayout *layout = new QVBoxLayout(this); | 20 | 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 | |||
@@ -16,5 +16,5 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
16 | #include "inputdialog.h" | 16 | #include "inputdialog.h" |
17 | 17 | ||
18 | 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) | 18 | 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) |
19 | { | 19 | { |
20 | type = newtype; | 20 | type = newtype; |
@@ -115,3 +115,4 @@ QString InputDialog::getString() | |||
115 | return string; | 115 | return string; |
116 | } | 116 | } |
117 | return QString::null; | ||
117 | } | 118 | } |
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 | |||
@@ -17,5 +17,5 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
17 | #include "mbox.h" | 17 | #include "mbox.h" |
18 | 18 | ||
19 | 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) | 19 | 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) |
20 | { | 20 | { |
21 | QVBoxLayout *layout = new QVBoxLayout(this); | 21 | 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 | |||
@@ -100,4 +100,5 @@ int myMessageBox(int wi, int h, QWidget *w, int argc, QStringList args) | |||
100 | case 4: | 100 | case 4: |
101 | return 2; | 101 | return 2; |
102 | default: return -1; | ||
102 | } | 103 | } |
103 | } | 104 | } |
@@ -129,5 +130,5 @@ void printusage() | |||
129 | printf(" -F [filename] An input file (for when it makes sense) [Default = stdin]\n"); | 130 | printf(" -F [filename] An input file (for when it makes sense) [Default = stdin]\n"); |
130 | printf(" -E Makes list input editable\n"); | 131 | printf(" -E Makes list input editable\n"); |
131 | printf(" -g Disable fullscreen\n\0"); | 132 | printf(" -g Disable fullscreen\n"); |
132 | } | 133 | } |
133 | 134 | ||
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 | |||
@@ -17,5 +17,5 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
17 | #include "buttondialog.h" | 17 | #include "buttondialog.h" |
18 | 18 | ||
19 | ButtonDialog::ButtonDialog(QString buttonName, QWidget *parent=0, const char*name=0, bool modal=FALSE, WFlags f=0):QDialog(parent, name, modal, f) | 19 | ButtonDialog::ButtonDialog(QString buttonName, QWidget *parent, const char*name, bool modal, WFlags f):QDialog(parent, name, modal, f) |
20 | { | 20 | { |
21 | setCaption(tr(buttonName)); | 21 | setCaption(tr(buttonName)); |
@@ -112,5 +112,5 @@ QStringList ButtonDialog::getRemotes() | |||
112 | } | 112 | } |
113 | 113 | ||
114 | if(std::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) | 114 | if(::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) |
115 | { | 115 | { |
116 | QMessageBox *mb = new QMessageBox("Error!", | 116 | QMessageBox *mb = new QMessageBox("Error!", |
@@ -155,5 +155,5 @@ QStringList ButtonDialog::getRemotes() | |||
155 | } | 155 | } |
156 | 156 | ||
157 | std::close(fd); | 157 | ::close(fd); |
158 | return list; | 158 | return list; |
159 | } | 159 | } |
@@ -185,5 +185,5 @@ QStringList ButtonDialog::getButtons(const char *remoteName) | |||
185 | 185 | ||
186 | 186 | ||
187 | if(std::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) | 187 | if(::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) |
188 | { | 188 | { |
189 | QMessageBox *mb = new QMessageBox("Error!", | 189 | QMessageBox *mb = new QMessageBox("Error!", |
@@ -231,5 +231,5 @@ QStringList ButtonDialog::getButtons(const char *remoteName) | |||
231 | } | 231 | } |
232 | 232 | ||
233 | std::close(fd); | 233 | ::close(fd); |
234 | return list; | 234 | return list; |
235 | } | 235 | } |
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 | |||
@@ -17,5 +17,5 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
17 | #include "channelgroup.h" | 17 | #include "channelgroup.h" |
18 | 18 | ||
19 | ChannelGroup::ChannelGroup(QWidget *parent=0, const char *name=0):QWidget(parent,name) | 19 | ChannelGroup::ChannelGroup(QWidget *parent, const char *name):QWidget(parent,name) |
20 | { | 20 | { |
21 | QGridLayout *layout = new QGridLayout(this); | 21 | QGridLayout *layout = new QGridLayout(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 | |||
@@ -17,5 +17,5 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
17 | #include "channelgroupconf.h" | 17 | #include "channelgroupconf.h" |
18 | 18 | ||
19 | ChannelGroupConf::ChannelGroupConf(QWidget *parent=0, const char *name=0):QWidget(parent,name) | 19 | ChannelGroupConf::ChannelGroupConf(QWidget *parent, const char *name):QWidget(parent,name) |
20 | { | 20 | { |
21 | QGridLayout *layout = new QGridLayout(this); | 21 | QGridLayout *layout = new QGridLayout(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 | |||
@@ -17,5 +17,5 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
17 | #include "configtab.h" | 17 | #include "configtab.h" |
18 | 18 | ||
19 | ConfigTab::ConfigTab(QWidget *parent=0, const char *name=0):QWidget(parent,name) | 19 | ConfigTab::ConfigTab(QWidget *parent, const char *name):QWidget(parent,name) |
20 | { | 20 | { |
21 | 21 | ||
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 | |||
@@ -23,5 +23,5 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
23 | #include "dvdgroup.h" | 23 | #include "dvdgroup.h" |
24 | 24 | ||
25 | DVDGroup::DVDGroup(QWidget *parent=0, const char *name=0):QWidget(parent,name) | 25 | DVDGroup::DVDGroup(QWidget *parent, const char *name):QWidget(parent,name) |
26 | { | 26 | { |
27 | QGridLayout *layout = new QGridLayout(this); | 27 | 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 | |||
@@ -17,5 +17,5 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
17 | #include "dvdgroupconf.h" | 17 | #include "dvdgroupconf.h" |
18 | 18 | ||
19 | DVDGroupConf::DVDGroupConf(QWidget *parent=0, const char *name=0):QWidget(parent,name) | 19 | DVDGroupConf::DVDGroupConf(QWidget *parent, const char *name):QWidget(parent,name) |
20 | { | 20 | { |
21 | QGridLayout *layout = new QGridLayout(this); | 21 | 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 | |||
@@ -17,5 +17,5 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
17 | #include "learntab.h" | 17 | #include "learntab.h" |
18 | 18 | ||
19 | LearnTab::LearnTab(QWidget *parent=0, const char *name=0):QWidget(parent,name) | 19 | LearnTab::LearnTab(QWidget *parent, const char *name):QWidget(parent,name) |
20 | { | 20 | { |
21 | QVBoxLayout *layout = new QVBoxLayout(this); | 21 | QVBoxLayout *layout = new QVBoxLayout(this); |
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 | |||
@@ -17,5 +17,5 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
17 | #include "mainview.h" | 17 | #include "mainview.h" |
18 | 18 | ||
19 | MainView::MainView(QWidget *parent, const char *name=0) : QWidget(parent, name) | 19 | MainView::MainView(QWidget *parent, const char *name) : QWidget(parent, name) |
20 | { | 20 | { |
21 | setIcon( Resource::loadPixmap( "remote" ) ); | 21 | setIcon( Resource::loadPixmap( "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 | |||
@@ -17,5 +17,5 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
17 | #include "remotetab.h" | 17 | #include "remotetab.h" |
18 | 18 | ||
19 | RemoteTab::RemoteTab(QWidget *parent=0, const char *name=0):QWidget(parent,name) | 19 | RemoteTab::RemoteTab(QWidget *parent, const char *name):QWidget(parent,name) |
20 | { | 20 | { |
21 | QVBoxLayout *layout = new QVBoxLayout(this); | 21 | QVBoxLayout *layout = new QVBoxLayout(this); |
@@ -72,9 +72,9 @@ int RemoteTab::sendIR() | |||
72 | mb->exec(); | 72 | mb->exec(); |
73 | perror("RemoteTab::SendIR"); | 73 | perror("RemoteTab::SendIR"); |
74 | return NULL; | 74 | return 0; |
75 | } | 75 | } |
76 | 76 | ||
77 | 77 | ||
78 | if(std::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) | 78 | if(::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) |
79 | { | 79 | { |
80 | QMessageBox *mb = new QMessageBox("Error!", | 80 | QMessageBox *mb = new QMessageBox("Error!", |
@@ -104,5 +104,5 @@ int RemoteTab::sendIR() | |||
104 | } | 104 | } |
105 | } | 105 | } |
106 | std::close(fd); | 106 | ::close(fd); |
107 | } | 107 | } |
108 | 108 | ||
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 | |||
@@ -17,5 +17,5 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
17 | #include "topgroup.h" | 17 | #include "topgroup.h" |
18 | 18 | ||
19 | TopGroup::TopGroup(QWidget *parent=0, const char *name=0):QWidget(parent,name) | 19 | TopGroup::TopGroup(QWidget *parent, const char *name):QWidget(parent,name) |
20 | { | 20 | { |
21 | QHBoxLayout *layout = new QHBoxLayout(this, 0, -1, 0); | 21 | 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 | |||
@@ -17,5 +17,5 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
17 | #include "topgroupconf.h" | 17 | #include "topgroupconf.h" |
18 | 18 | ||
19 | TopGroupConf::TopGroupConf(QWidget *parent=0, const char *name=0):QWidget(parent,name) | 19 | TopGroupConf::TopGroupConf(QWidget *parent, const char *name):QWidget(parent,name) |
20 | { | 20 | { |
21 | QHBoxLayout *layout = new QHBoxLayout(this); | 21 | 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 | |||
@@ -23,5 +23,5 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
23 | #include "vcrgroup.h" | 23 | #include "vcrgroup.h" |
24 | 24 | ||
25 | VCRGroup::VCRGroup(QWidget *parent=0, const char *name=0) : QWidget(parent, | 25 | VCRGroup::VCRGroup(QWidget *parent, const char *name) : QWidget(parent, |
26 | name) | 26 | name) |
27 | { | 27 | { |
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 | |||
@@ -17,5 +17,5 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
17 | #include "vcrgroupconf.h" | 17 | #include "vcrgroupconf.h" |
18 | 18 | ||
19 | VCRGroupConf::VCRGroupConf(QWidget *parent=0, const char *name=0) : QWidget(parent, name) | 19 | VCRGroupConf::VCRGroupConf(QWidget *parent, const char *name) : QWidget(parent, name) |
20 | { | 20 | { |
21 | QVBoxLayout *vlayout = new QVBoxLayout(this); | 21 | 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 | |||
@@ -171,5 +171,5 @@ QString IMAPHandler::iStatus(const QString &mailbox, const QString &items) | |||
171 | } | 171 | } |
172 | 172 | ||
173 | QString IMAPHandler::iAppend(const QString &mailbox, const QString &literal, const QString &flags, const QString &datetime = 0) | 173 | QString IMAPHandler::iAppend(const QString &mailbox, const QString &literal, const QString &flags, const QString &datetime) |
174 | { | 174 | { |
175 | doLogin(); | 175 | 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 | |||
@@ -32,5 +32,5 @@ | |||
32 | 32 | ||
33 | 33 | ||
34 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) : | 34 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : |
35 | QMainWindow( parent, name, f ) | 35 | QMainWindow( parent, name, f ) |
36 | // packageListServers( QObject(parent), name ), | 36 | // packageListServers( QObject(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 | |||
@@ -10,5 +10,5 @@ | |||
10 | #include "debug.h" | 10 | #include "debug.h" |
11 | 11 | ||
12 | Package::Package( QObject *parent=0, const char *name=0 ) | 12 | Package::Package( QObject *parent, const char *name ) |
13 | : QObject(parent,name) | 13 | : QObject(parent,name) |
14 | { | 14 | { |
@@ -20,5 +20,5 @@ Package::~Package() | |||
20 | } | 20 | } |
21 | 21 | ||
22 | Package::Package( PackageManagerSettings *s, QObject *parent=0, const char *name=0 ) | 22 | Package::Package( PackageManagerSettings *s, QObject *parent, const char *name ) |
23 | : QObject(parent,name) | 23 | : QObject(parent,name) |
24 | { | 24 | { |
@@ -46,5 +46,5 @@ void Package::init( PackageManagerSettings *s ) | |||
46 | } | 46 | } |
47 | 47 | ||
48 | Package::Package( QStringList pack, PackageManagerSettings *s , QObject *parent=0, const char *name=0 ) | 48 | Package::Package( QStringList pack, PackageManagerSettings *s , QObject *parent, const char *name ) |
49 | : QObject(parent,name) | 49 | : QObject(parent,name) |
50 | { | 50 | { |
@@ -53,5 +53,5 @@ Package::Package( QStringList pack, PackageManagerSettings *s , QObject *parent= | |||
53 | } | 53 | } |
54 | 54 | ||
55 | Package::Package( QString n, PackageManagerSettings *s, QObject *parent=0, const char *name=0 ) | 55 | Package::Package( QString n, PackageManagerSettings *s, QObject *parent, const char *name ) |
56 | { | 56 | { |
57 | init(s); | 57 | init(s); |
@@ -67,5 +67,5 @@ Package::Package( QString n, PackageManagerSettings *s, QObject *parent=0, const | |||
67 | } | 67 | } |
68 | 68 | ||
69 | Package::Package( Package *pi, QObject *parent=0, const char *name=0 ) | 69 | Package::Package( Package *pi, QObject *parent, const char *name ) |
70 | { | 70 | { |
71 | init(pi->settings); | 71 | init(pi->settings); |
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 | |||
@@ -11,5 +11,5 @@ static QDict<Package> *packageListAll; | |||
11 | static int packageListAllRefCount = 0; | 11 | static int packageListAllRefCount = 0; |
12 | 12 | ||
13 | PackageList::PackageList(QObject *parent=0, const char *name=0) | 13 | PackageList::PackageList(QObject *parent, const char *name) |
14 | : QObject(parent,name), packageIter( packageList ) | 14 | : QObject(parent,name), packageIter( packageList ) |
15 | { | 15 | { |
@@ -198,5 +198,5 @@ void PackageList::setSettings( PackageManagerSettings *s ) | |||
198 | Package* PackageList::getByName( QString n ) | 198 | Package* PackageList::getByName( QString n ) |
199 | { | 199 | { |
200 | origPackageList[n]; | 200 | return origPackageList[n]; |
201 | } | 201 | } |
202 | 202 | ||
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 | |||
@@ -9,5 +9,5 @@ | |||
9 | #include "pksettings.h" | 9 | #include "pksettings.h" |
10 | 10 | ||
11 | PackageListDocLnk::PackageListDocLnk(PackageManagerSettings* s, QObject *parent=0, const char *name=0) | 11 | PackageListDocLnk::PackageListDocLnk(PackageManagerSettings* s, QObject *parent, const char *name) |
12 | : PackageList(s) | 12 | : PackageList(s) |
13 | { | 13 | { |
@@ -15,5 +15,5 @@ PackageListDocLnk::PackageListDocLnk(PackageManagerSettings* s, QObject *parent= | |||
15 | } | 15 | } |
16 | 16 | ||
17 | PackageListDocLnk::PackageListDocLnk(QObject *parent=0, const char *name=0) | 17 | PackageListDocLnk::PackageListDocLnk(QObject *parent, const char *name) |
18 | : PackageList(parent, name) | 18 | : PackageList(parent, name) |
19 | { | 19 | { |
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 | |||
@@ -160,5 +160,5 @@ void PackageListItem::displayDetails() | |||
160 | setText(0, package->name()+sod ); | 160 | setText(0, package->name()+sod ); |
161 | nameItem->setText( 0, QObject::tr("Name: ")+package->name()); | 161 | nameItem->setText( 0, QObject::tr("Name: ")+package->name()); |
162 | linkItem->setText( 0, QObject::tr("Link: ")+package->link()?QObject::tr("Yes"):QObject::tr("No")); | 162 | linkItem->setText( 0, QObject::tr("Link: ")+(package->link()?QObject::tr("Yes"):QObject::tr("No"))); |
163 | destItem->setText( 0, QObject::tr("Destination: ")+package->dest() ); | 163 | destItem->setText( 0, QObject::tr("Destination: ")+package->dest() ); |
164 | statusItem->setText( 0, QObject::tr("Status: ")+package->status() ); | 164 | statusItem->setText( 0, QObject::tr("Status: ")+package->status() ); |
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 | |||
@@ -170,6 +170,6 @@ template <unsigned int SH> inline fixed<SH> sqrt ( const fixed<SH> &f ) | |||
170 | return fixed<SH> ( 0, true ); | 170 | return fixed<SH> ( 0, true ); |
171 | 171 | ||
172 | fixed<SH>::fix_t a0 = 0; | 172 | typename fixed<SH>::fix_t a0 = 0; |
173 | fixed<SH>::fix_t a1 = f. m_f; // take value as first approximation | 173 | typename fixed<SH>::fix_t a1 = f. m_f; // take value as first approximation |
174 | 174 | ||
175 | do { | 175 | do { |