gcc3.x fixes

11 files changed, 74 insertions, 32 deletions

diff --git a/noncore/apps/opie-sheet/cellformat.cpp b/noncore/apps/opie-sheet/cellformat.cpp
index 597502c..342ebe9 100644
--- a/noncore/apps/opie-sheet/cellformat.cpp
+++ b/noncore/apps/opie-sheet/cellformat.cpp
@@ -26,12 +26,33 @@
 #define VALIGN_COUNT 3
 
-QColor qtColors[COLOR_COUNT]={Qt::black, Qt::white, Qt::darkGray, Qt::gray, Qt::lightGray, Qt::red, Qt::green, Qt::blue, Qt::cyan, Qt::magenta, Qt::yellow, Qt::darkRed, Qt::darkGreen, Qt::darkBlue, Qt::darkCyan, Qt::darkMagenta, Qt::darkYellow};
-Qt::BrushStyle brushStyles[STYLE_COUNT]={Qt::SolidPattern, Qt::Dense1Pattern, Qt::Dense2Pattern, Qt::Dense3Pattern, Qt::Dense4Pattern, Qt::Dense5Pattern, Qt::Dense6Pattern, Qt::Dense7Pattern, Qt::HorPattern, Qt::VerPattern, Qt::CrossPattern, Qt::BDiagPattern, Qt::FDiagPattern, Qt::DiagCrossPattern};
+QColor qtColors[COLOR_COUNT]={Qt::black,Qt::white, Qt::darkGray,
+                              Qt::gray, Qt::lightGray, Qt::red,
+                              Qt::green, Qt::blue, Qt::cyan,
+                              Qt::magenta, Qt::yellow,
+                              Qt::darkRed, Qt::darkGreen,
+                              Qt::darkBlue, Qt::darkCyan,
+                              Qt::darkMagenta, Qt::darkYellow};
+
+Qt::BrushStyle brushStyles[STYLE_COUNT]={Qt::SolidPattern,
+                                         Qt::Dense1Pattern, Qt::Dense2Pattern,
+                                         Qt::Dense3Pattern, Qt::Dense4Pattern,
+                                         Qt::Dense5Pattern, Qt::Dense6Pattern,
+                                         Qt::Dense7Pattern, Qt::HorPattern,
+                                         Qt::VerPattern, Qt::CrossPattern,
+                                         Qt::BDiagPattern, Qt::FDiagPattern,
+                                         Qt::DiagCrossPattern};
+
 QString namesHAlign[HALIGN_COUNT]={"Left", "Right", "Center"};
 QString namesVAlign[VALIGN_COUNT]={"Top", "Bottom", "Center"};
-Qt::AlignmentFlags flagsHAlign[HALIGN_COUNT]={Qt::AlignLeft, Qt::AlignRight, Qt::AlignHCenter};
-Qt::AlignmentFlags flagsVAlign[VALIGN_COUNT]={Qt::AlignTop, Qt::AlignBottom, Qt::AlignVCenter};
 
-CellFormat::CellFormat(QWidget *parent=0)
+Qt::AlignmentFlags flagsHAlign[HALIGN_COUNT]={Qt::AlignLeft,
+                                              Qt::AlignRight,
+                                              Qt::AlignHCenter};
+
+Qt::AlignmentFlags flagsVAlign[VALIGN_COUNT]={Qt::AlignTop,
+                                              Qt::AlignBottom,
+                                              Qt::AlignVCenter};
+
+CellFormat::CellFormat(QWidget *parent)
            :QDialog(parent, 0, TRUE)
 {
@@ -53,5 +74,6 @@ CellFormat::CellFormat(QWidget *parent=0)
   borderEditor=new BorderEditor(widgetBorders);
   borderEditor->setGeometry(10, 10, 215, 145);
-  connect(borderEditor, SIGNAL(clicked(BorderEditor::BorderArea)), this, SLOT(borderClicked(BorderEditor::BorderArea)));
+  connect(borderEditor, SIGNAL(clicked(BorderEditor::BorderArea)),
+          this, SLOT(borderClicked(BorderEditor::BorderArea)));
 
   comboBordersWidth=createCombo(COMBO_WIDTH, widgetBorders, tr("&Width:"), 165);
@@ -59,6 +81,9 @@ CellFormat::CellFormat(QWidget *parent=0)
 
   buttonBordersDefaults=new QPushButton(tr("&Default Borders"), widgetBorders);
-  buttonBordersDefaults->setGeometry(115, 165+2*(COMBO_HEIGHTS+10), 110, COMBO_HEIGHTS);
-  connect(buttonBordersDefaults, SIGNAL(clicked()), this, SLOT(slotBordersDefaults()));
+  buttonBordersDefaults->setGeometry(115, 165+2*(COMBO_HEIGHTS+10),
+                                     110, COMBO_HEIGHTS);
+
+  connect(buttonBordersDefaults, SIGNAL(clicked()),
+          this, SLOT(slotBordersDefaults()));
 
   // Background tab
@@ -293,5 +318,6 @@ int CellFormat::findComboItemIndex(QComboBox *combo, const QString &item)
 }
 
-QComboBox *CellFormat::createCombo(comboType type, QWidget *parent, const QString &caption, int y)
+QComboBox *CellFormat::createCombo(comboType type, QWidget *parent,
+                                   const QString &caption, int y)
 {
   QComboBox *combo=new QComboBox(FALSE, parent);
@@ -308,4 +334,5 @@ QComboBox *CellFormat::createCombo(comboType type, QWidget *parent, const QStrin
     case COMBO_HALIGN: createHAlignCombo(combo); break;
     case COMBO_VALIGN: createVAlignCombo(combo); break;
+  default: break;
   }
 
@@ -496,5 +523,5 @@ int CellFormat::exec(Sheet *s)
 //
 
-BorderEditor::BorderEditor(QWidget *parent=0)
+BorderEditor::BorderEditor(QWidget *parent)
              :QFrame(parent)
 {
diff --git a/noncore/apps/opie-sheet/finddlg.cpp b/noncore/apps/opie-sheet/finddlg.cpp
index d1237ca..e4c6ec8 100644
--- a/noncore/apps/opie-sheet/finddlg.cpp
+++ b/noncore/apps/opie-sheet/finddlg.cpp
@@ -17,5 +17,5 @@
 #include "finddlg.h"
 
-FindDialog::FindDialog(QWidget *parent=0)
+FindDialog::FindDialog(QWidget *parent)
            :QDialog(parent, 0, TRUE)
 {
diff --git a/noncore/apps/opie-sheet/mainwindow.cpp b/noncore/apps/opie-sheet/mainwindow.cpp
index 09ee68b..2f07bae 100644
--- a/noncore/apps/opie-sheet/mainwindow.cpp
+++ b/noncore/apps/opie-sheet/mainwindow.cpp
@@ -167,5 +167,5 @@ void MainWindow::documentOpen(const DocLnk &lnkDoc)
 }
 
-int MainWindow::saveCurrentFile(bool ask=TRUE)
+int MainWindow::saveCurrentFile(bool ask)
 {
   if (ask)
diff --git a/noncore/apps/opie-sheet/numberdlg.cpp b/noncore/apps/opie-sheet/numberdlg.cpp
index e8de639..90fbaa2 100644
--- a/noncore/apps/opie-sheet/numberdlg.cpp
+++ b/noncore/apps/opie-sheet/numberdlg.cpp
@@ -15,5 +15,5 @@
 #include "numberdlg.h"
 
-NumberDialog::NumberDialog(QWidget *parent=0)
+NumberDialog::NumberDialog(QWidget *parent)
              :QDialog(parent, 0, TRUE)
 {
@@ -32,5 +32,6 @@ NumberDialog::~NumberDialog()
 }
 
-int NumberDialog::exec(const QString &caption, const QString &text, int value=1, int min=1, int max=99, int step=1)
+int NumberDialog::exec(const QString &caption, const QString &text,
+                       int value, int min, int max, int step)
 {
   setCaption(caption);
diff --git a/noncore/apps/opie-sheet/sheet.cpp b/noncore/apps/opie-sheet/sheet.cpp
index 1d7ec6f..2279191 100644
--- a/noncore/apps/opie-sheet/sheet.cpp
+++ b/noncore/apps/opie-sheet/sheet.cpp
@@ -108,5 +108,5 @@ void Sheet::swapCells(int row1, int col1, int row2, int col2)
 }
 
-QString Sheet::getParameter(const QString &parameters, int paramNo, bool giveError=FALSE, const QString funcName="")
+QString Sheet::getParameter(const QString &parameters, int paramNo, bool giveError, const QString funcName)
 {
   QString params(parameters);
@@ -146,5 +146,5 @@ bool Sheet::findRange(const QString &variable1, const QString &variable2, int *r
 }
 
-bool Sheet::findRowColumn(const QString &variable, int *row, int *col, bool giveError=FALSE)
+bool Sheet::findRowColumn(const QString &variable, int *row, int *col, bool giveError)
 {
   int position=variable.find(QRegExp("\\d"));
@@ -453,5 +453,5 @@ QString Sheet::getData()
 }
 
-void Sheet::lockClicks(bool lock=TRUE)
+void Sheet::lockClicks(bool lock)
 {
   clicksLocked=lock;
@@ -737,5 +737,5 @@ void Sheet::editCut()
 }
 
-void Sheet::editPaste(bool onlyContents=FALSE)
+void Sheet::editPaste(bool onlyContents)
 {
   int row1=currentRow(), col1=currentColumn();
@@ -762,5 +762,5 @@ void Sheet::editPaste(bool onlyContents=FALSE)
 }
 
-void Sheet::insertRows(int no=1, bool allColumns=TRUE)
+void Sheet::insertRows(int no, bool allColumns)
 {
   setNumRows(numRows()+no);
@@ -784,5 +784,5 @@ void Sheet::insertRows(int no=1, bool allColumns=TRUE)
 }
 
-void Sheet::insertColumns(int no=1, bool allRows=TRUE)
+void Sheet::insertColumns(int no, bool allRows)
 {
   int noCols=numCols();
@@ -810,5 +810,5 @@ void Sheet::insertColumns(int no=1, bool allRows=TRUE)
 }
 
-void Sheet::dataFindReplace(const QString &findStr, const QString &replaceStr, bool matchCase=TRUE, bool allCells=TRUE, bool entireCell=FALSE, bool replace=FALSE, bool replaceAll=FALSE)
+void Sheet::dataFindReplace(const QString &findStr, const QString &replaceStr, bool matchCase, bool allCells, bool entireCell, bool replace, bool replaceAll)
 {
   typeCellData *tempCellData;
diff --git a/noncore/apps/opie-sheet/sortdlg.cpp b/noncore/apps/opie-sheet/sortdlg.cpp
index c60be0d..c2cdec8 100644
--- a/noncore/apps/opie-sheet/sortdlg.cpp
+++ b/noncore/apps/opie-sheet/sortdlg.cpp
@@ -18,5 +18,5 @@
 #include "sortdlg.h"
 
-SortDialog::SortDialog(QWidget *parent=0)
+SortDialog::SortDialog(QWidget *parent)
            :QDialog(parent, 0, TRUE)
 {
@@ -179,5 +179,6 @@ int SortDialog::exec(Sheet *s)
 }
 
-int SortDialog::compareItems(QTableItem *item1, QTableItem *item2, int descending=0, bool caseSensitive=TRUE)
+int SortDialog::compareItems(QTableItem *item1, QTableItem *item2,
+                             int descending, bool caseSensitive)
 {
   int result=0;
diff --git a/noncore/apps/opie-sheet/textdlg.cpp b/noncore/apps/opie-sheet/textdlg.cpp
index 0810eb2..34cec29 100644
--- a/noncore/apps/opie-sheet/textdlg.cpp
+++ b/noncore/apps/opie-sheet/textdlg.cpp
@@ -15,5 +15,5 @@
 #include "textdlg.h"
 
-TextDialog::TextDialog(QWidget *parent=0)
+TextDialog::TextDialog(QWidget *parent)
            :QDialog(parent, 0, TRUE)
 {
@@ -32,5 +32,6 @@ TextDialog::~TextDialog()
 }
 
-int TextDialog::exec(const QString &caption, const QString &text, const QString &value="")
+int TextDialog::exec(const QString &caption, const QString &text,
+                     const QString &value)
 {
   setCaption(caption);
diff --git a/noncore/tools/remote/helptab.cpp b/noncore/tools/remote/helptab.cpp
index 3c53ab6..ac51e13 100644
--- a/noncore/tools/remote/helptab.cpp
+++ b/noncore/tools/remote/helptab.cpp
@@ -17,5 +17,5 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "helptab.h"
 
-HelpTab::HelpTab(QWidget *parent=0, const char *name=0):QWidget(parent, name)
+HelpTab::HelpTab(QWidget *parent, const char *name):QWidget(parent, name)
 {
         QVBoxLayout *layout = new QVBoxLayout(this);
diff --git a/noncore/tools/remote/helptab.h b/noncore/tools/remote/helptab.h
index f3f99b3..83f24ef 100644
--- a/noncore/tools/remote/helptab.h
+++ b/noncore/tools/remote/helptab.h
@@ -15,4 +15,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
+#ifndef HELP_TAB_H
+#define HELP_TAB_H
+
 #include <qwidget.h>
 #include <qtextview.h>
@@ -24,3 +27,5 @@ class HelpTab : public QWidget
 public:
         HelpTab(QWidget *parent=0, const char *name=0);
-};
\ No newline at end of file
+};
+
+#endif
diff --git a/noncore/tools/remote/recorddialog.cpp b/noncore/tools/remote/recorddialog.cpp
index f7cd30c..cfab730 100644
--- a/noncore/tools/remote/recorddialog.cpp
+++ b/noncore/tools/remote/recorddialog.cpp
@@ -17,9 +17,10 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "recorddialog.h"
 
-RecordDialog::RecordDialog(QWidget *parent=0, const char *name=0):QDialog(parent, name)
+RecordDialog::RecordDialog(QWidget *parent, const char *name)
+    :QDialog(parent, name)
 {
         QVBoxLayout *layout = new QVBoxLayout(this);
         QHBoxLayout *hlayout = new QHBoxLayout(this);
-        
+
         layout->insertSpacing(0,5);
         output = new QTextView("Please enter the name of the new remote, and press Return\n", 0, this, "output");
@@ -33,5 +34,5 @@ RecordDialog::RecordDialog(QWidget *parent=0, const char *name=0):QDialog(parent
         hlayout->insertWidget(-1, input, 1);
         hlayout->insertSpacing(-1, 5);
-        
+
         QPushButton *ret = new QPushButton("Return", this, "return");
         hlayout->insertWidget(-1, ret);
@@ -39,5 +40,5 @@ RecordDialog::RecordDialog(QWidget *parent=0, const char *name=0):QDialog(parent
         connect(ret, SIGNAL(clicked()), this, SLOT(retPressed()) );
         where = 0;
-        
+
         record = new OProcess;
 }
diff --git a/noncore/tools/remote/recorddialog.h b/noncore/tools/remote/recorddialog.h
index 38b2bb4..e4dcae6 100644
--- a/noncore/tools/remote/recorddialog.h
+++ b/noncore/tools/remote/recorddialog.h
@@ -15,4 +15,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
+#ifndef RecordDialog_H
+#define RecordDialog_H
+
 #include <qdialog.h>
 #include <qtextview.h>
@@ -41,3 +44,6 @@ private:
         OProcess *record;
         int where;
-};
\ No newline at end of file
+};
+
+#endif
+