4 files changed, 6 insertions, 4 deletions

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
@@ -6,25 +6,25 @@ This program is free software; you can redistribute it and/or modify it under th
 License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
 version.
 
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
 implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
 Public License for more details.
 
 You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
 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);
         
         setIcon(Resource::loadPixmap("opie-sh"));
 
         textView = new QTextBrowser(this, "textview");
         layout->addWidget(textView);
 
         QString string;
 
         if(title.isNull())
         {
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
@@ -6,25 +6,25 @@ This program is free software; you can redistribute it and/or modify it under th
 License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
 version.
 
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
 implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
 Public License for more details.
 
 You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
 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);
         layout->addStrut(32);
         QLabel *label = new QLabel(labelString, this, "label");
         setCaption(title);
         int x, y;
 
         layout->addSpacing(5);
         layout->addWidget(label);
         layout->addSpacing(5);
 
@@ -105,13 +105,14 @@ QString InputDialog::getString()
                 {
                         if(listBox->isSelected(i))
                         {
                                 string+=listBox->text(i)+'\n';
                         }
                 }
                 if(string[string.length()-1] == '\n')
                 {
                         string.truncate(string.length()-1);
                 }
                 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
@@ -7,25 +7,25 @@ License as published by the Free Software Foundation; either version 2 of the Li
 version.
 
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
 implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
 Public License for more details.
 
 You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
 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);
 
         QHBoxLayout *hlayout1 = new QHBoxLayout(this);
         QHBoxLayout *hlayout2 = new QHBoxLayout(this);
 
         int x, y;
         
         layout->addLayout(hlayout1);
         layout->addLayout(hlayout2);
         
         setCaption(title);
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
@@ -90,24 +90,25 @@ int myMessageBox(int wi, int h, QWidget *w, int argc, QStringList args)
         switch(mbox->exec() )
         {
         case 0:
                 return -1;
         case 1:
                 return -1;
         case 2:
                 return 0;
         case 3:
                 return 1;
         case 4:
                 return 2;
+        default: return -1;
         }
 }
 
 void printusage()
 {
         printf("Usage instructions for Opie-sh\n");
         printf("Usage: opie-sh [dialog type] [type specific options]\n");
         printf("Types:\n");
         printf("      -m                 Message Box\n");
         printf("      -f [filename]      View file [Default = stdin]\n");
         printf("      -i                 Input dialog\n");
         printf("      -h --help          These instructions\n");
@@ -119,25 +120,25 @@ void printusage()
         printf("      -e                 Use the error icon\n");
         printf("      -0 [text]          First button text [Default = OK]\n");
         printf("      -1 [text]          Second button text\n");
         printf("      -2 [text]          Third button text\n");
         printf("      -g                 Disable fullscreen\n");
         printf("Input Dialog options:\n");
         printf("      -s                 A single line of input (output to console)\n");
         printf("      -l                 List input (newline separated list read in from file)\n");
         printf("      -b                 A list box, enabling multiple selections (input same as -l)\n");
         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)
 {
         int i;
         QString filename, title, icon;
         bool update=false;
 
         for(i=0; i < argc; i++)
         {
                 if(args[i] == "-f")
                 {