- rename sheet-qt -> opie-sheet

- format source code for a better readability

18 files changed, 618 insertions, 204 deletions

diff --git a/noncore/apps/opie-sheet/Excel.cpp b/noncore/apps/opie-sheet/Excel.cpp
index fc49d56..57aef20 100644
--- a/noncore/apps/opie-sheet/Excel.cpp
+++ b/noncore/apps/opie-sheet/Excel.cpp
@@ -1,4 +1,33 @@
+/*
+               =.            This file is part of the Opie Project
+             .=l.            Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
+#include "Excel.h"
 
+/* STD */
 #include <stdio.h>
 #include <stdlib.h>
@@ -7,5 +36,4 @@
 #include <sys/types.h>
 #include <strings.h>
-#include "Excel.h"
 
 static xfrecord formatter[] = {
@@ -64,5 +92,6 @@ int ExcelBook::Integer4Byte(int b1,int b2,int b3,int b4)
 };
 
-int ExcelBook::Integer2ByteFile(FILE *f) {
+int ExcelBook::Integer2ByteFile(FILE *f)
+{
 	int i1, i2;
 	i1 = fgetc(f);
@@ -103,5 +132,6 @@ double ExcelBook::Double4Byte(int b1, int b2, int b3, int b4)
 		};
 		return value;
-	}else
+    }
+    else
 	{
 
@@ -133,8 +163,11 @@ void ExcelBook::DetectEndian(void)
 	unsigned char* a = (unsigned char*) &i;
 	end = (*a != 0x11);
-	if (end == 1) {
+    if (end == 1)
+    {
 		endian = BIG_ENDIAN;
 		printf("BIGENDIAN!\r\n");
-	} else {
+    }
+    else
+    {
 		endian = LITTLE_ENDIAN;
 		printf("LITTLEENDIAN!\r\n");
@@ -149,10 +182,13 @@ double ExcelBook::Double8Byte(int b1, int b2, int b3, int b4, int b5, int b6, in
 	ieee = (unsigned char *)&d;
 	for (i = 0; i < 8; i++) ieee[i] = 0;
-	if (endian == BIG_ENDIAN) {
+    if (endian == BIG_ENDIAN)
+    {
 		ieee[0] = ((int)b8) & 0xff;ieee[1] = ((int)b7) & 0xff;
 		ieee[2] = ((int)b6) & 0xff;ieee[3] = ((int)b5) & 0xff;
 		ieee[4] = ((int)b4) & 0xff;ieee[5] = ((int)b3) & 0xff;
 		ieee[6] = ((int)b2) & 0xff;ieee[7] = ((int)b1) & 0xff;
-	} else {
+    }
+    else
+    {
 		ieee[0] = ((int)b1) & 0xff;ieee[1] = ((int)b2) & 0xff;
 		ieee[2] = ((int)b3) & 0xff;ieee[3] = ((int)b4) & 0xff;
@@ -394,5 +430,6 @@ int ExcelBook::SheetHandleRecord(ExcelSheet* sheet, ExcelBREC* record)
 				sheet->rows = Integer2Byte(data[2], data[3]);
 				sheet->cols = Integer2Byte(data[6], data[7]);
-			} else
+        }
+        else
 			{
 				sheet->rows = Integer4Byte(data[4], data[5], data[6], data[7]);
@@ -603,5 +640,6 @@ void ExcelBook::HandleBoundSheet(ExcelBREC* rec)
 		//ascii
 		name=GetASCII(data,pos,length);
-	}else
+    }
+    else
 	{
 		name=GetUnicode(data,pos,length);
@@ -809,9 +847,11 @@ QString* ExcelBook::CellDataString(ExcelSheet* sh, int row, int col)
 				{
 					strftime(str,1024,dateformat.ascii(),tmptr);
-				} else
+            }
+            else
 				{
 					strftime(str,1024,format.ascii(),tmptr);
 				};
-			} else
+        }
+        else
 			if (XFRecords[c->xfindex]->type == NUMBERFORMAT)
 			{
@@ -822,5 +862,6 @@ QString* ExcelBook::CellDataString(ExcelSheet* sh, int row, int col)
 				precision = CellGetPrecision(c->valued);
 				sprintf(str,"%.*f",precision,c->valued);
-			}else
+            }
+            else
 			{
 				precision = CellGetPrecision(c->valued);
@@ -1003,9 +1044,11 @@ void ExcelBook::HandleFormula(ExcelSheet* sheet, ExcelBREC* record)
 	{
 		// string
-	} else
+    }
+    else
 	if (data[6] == 1  && data[12] == -1 && data[13] == -1)
 	{
 		// boolean
-	} else
+        }
+        else
 	if ( data[6] == 2 && data[12] == -1 && data[13] == -1)
 	{
@@ -1124,5 +1167,6 @@ QString ExcelBook::GetFormula(int row, int col, ExcelSheet* sheet, char* data, i
 					s1=QString("""")+s1+QString("""");
 					operands.prepend(new QString(s1));
-				}else
+            }
+            else
 				{
 					w1=data[idx];idx++;
@@ -1143,5 +1187,6 @@ QString ExcelBook::GetFormula(int row, int col, ExcelSheet* sheet, char* data, i
 					w3=Integer2Byte(data[idx],data[idx+1]) & 0x00FF;idx=idx+2;//col1
 					w4=Integer2Byte(data[idx],data[idx+1]) & 0x00FF;idx=idx+2;//col2
-				}else
+            }
+            else
 				{
 					w1=Integer2Byte(data[idx],data[idx+1]) & 0x3FFF;idx=idx+2;//row1
@@ -1162,5 +1207,6 @@ QString ExcelBook::GetFormula(int row, int col, ExcelSheet* sheet, char* data, i
 					w1=Integer2Byte(data[idx],data[idx+1]);idx=idx+2;//row
 					w2=Integer2Byte(data[idx],data[idx+1]) & 0x00FF;idx=idx+2;//col
-				}else
+            }
+            else
 				{
 					w1=Integer2Byte(data[idx],data[idx+1]) & 0x3FFF;idx=idx+2;//row
@@ -1333,5 +1379,6 @@ QString ExcelBook::GetFormula(int row, int col, ExcelSheet* sheet, char* data, i
 					w2=(int)data[idx];idx++;
 					w1=Integer2Byte(data[idx],data[idx+1]);idx=idx+2;
-				}else
+            }
+            else
 				{
 					w1=Integer2Byte(data[idx],data[idx+1]);idx=idx+2;
diff --git a/noncore/apps/opie-sheet/Excel.h b/noncore/apps/opie-sheet/Excel.h
index 0a581cf..51ccf5c 100644
--- a/noncore/apps/opie-sheet/Excel.h
+++ b/noncore/apps/opie-sheet/Excel.h
@@ -1,3 +1,36 @@
+/*
+               =.            This file is part of the Opie Project
+             .=l.            Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
+
+/* QT */
+#include <qstring.h>
+#include <qarray.h>
+#include <qlist.h>
 
+/* STD */
 #include <stdio.h>
 #include <stdlib.h>
@@ -6,7 +39,4 @@
 #include <sys/types.h>
 #include <strings.h>
-#include <qstring.h>
-#include <qarray.h>
-#include <qlist.h>
 
 #define DATEFORMAT 0x1
@@ -115,5 +145,6 @@ public:
 };
 
-struct mulrk {
+struct mulrk
+{
         int row;
         int first;
@@ -125,7 +156,4 @@ struct mulrk {
 };
 
-
-
-
 class ExcelBook
 {
@@ -197,9 +225,4 @@ void HandleFormula(ExcelSheet* sheet, ExcelBREC* record);
 QString GetFormula(int row, int col, ExcelSheet* sheet, char* data, int sz);
 QString FindCellName(int row, int col);
-
-
-
-
-
 };
 
diff --git a/noncore/apps/opie-sheet/cellformat.cpp b/noncore/apps/opie-sheet/cellformat.cpp
index 342ebe9..602d20d 100644
--- a/noncore/apps/opie-sheet/cellformat.cpp
+++ b/noncore/apps/opie-sheet/cellformat.cpp
@@ -1,10 +1,29 @@
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
+/*
+               =.            This file is part of the Opie Project
+             .=l.            Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 /*
@@ -15,4 +34,5 @@
 #include "cellformat.h"
 
+/* QT */
 #include <qlistbox.h>
 #include <qlabel.h>
@@ -150,6 +170,5 @@ CellFormat::CellFormat(QWidget *parent)
 
 CellFormat::~CellFormat()
-{
-}
+{}
 
 int CellFormat::findColorIndex(const QColor &color)
@@ -530,6 +549,5 @@ BorderEditor::BorderEditor(QWidget *parent)
 
 BorderEditor::~BorderEditor()
-{
-}
+{}
 
 void BorderEditor::drawContents(QPainter *p)
diff --git a/noncore/apps/opie-sheet/cellformat.h b/noncore/apps/opie-sheet/cellformat.h
index b569b7f..e07af9c 100644
--- a/noncore/apps/opie-sheet/cellformat.h
+++ b/noncore/apps/opie-sheet/cellformat.h
@@ -1,10 +1,29 @@
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
+/*
+               =.            This file is part of the Opie Project
+             .=l.            Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 /*
@@ -16,5 +35,10 @@
 #define CELLFORMAT_H
 
+#include "sheet.h"
+
+/* OPIE */
 #include <qpe/fontdatabase.h>
+
+/* QT */
 #include <qdialog.h>
 #include <qtabwidget.h>
@@ -24,6 +48,4 @@
 #include <qpushbutton.h>
 
-#include "sheet.h"
-
 class BorderEditor: public QFrame
 {
diff --git a/noncore/apps/opie-sheet/finddlg.cpp b/noncore/apps/opie-sheet/finddlg.cpp
index e4c6ec8..c724159 100644
--- a/noncore/apps/opie-sheet/finddlg.cpp
+++ b/noncore/apps/opie-sheet/finddlg.cpp
@@ -1,10 +1,29 @@
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
+/*
+               =.            This file is part of the Opie Project
+             .=l.            Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 /*
@@ -13,7 +32,9 @@
  */
 
+#include "finddlg.h"
+
+/* QT */
 #include <qlabel.h>
 #include <qradiobutton.h>
-#include "finddlg.h"
 
 FindDialog::FindDialog(QWidget *parent)
@@ -65,6 +86,5 @@ FindDialog::FindDialog(QWidget *parent)
 
 FindDialog::~FindDialog()
-{
-}
+{}
 
 void FindDialog::typeChanged(int id)
diff --git a/noncore/apps/opie-sheet/finddlg.h b/noncore/apps/opie-sheet/finddlg.h
index 1af2da5..b456f21 100644
--- a/noncore/apps/opie-sheet/finddlg.h
+++ b/noncore/apps/opie-sheet/finddlg.h
@@ -1,10 +1,29 @@
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
+/*
+               =.            This file is part of the Opie Project
+             .=l.            Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 /*
@@ -16,4 +35,7 @@
 #define FINDDLG_H
 
+#include "sheet.h"
+
+/* QT */
 #include <qdialog.h>
 #include <qtabwidget.h>
@@ -23,5 +45,4 @@
 #include <qpushbutton.h>
 #include <qvbuttongroup.h>
-#include "sheet.h"
 
 class FindDialog: public QDialog
diff --git a/noncore/apps/opie-sheet/main.cpp b/noncore/apps/opie-sheet/main.cpp
index 861473e..bf35908 100644
--- a/noncore/apps/opie-sheet/main.cpp
+++ b/noncore/apps/opie-sheet/main.cpp
@@ -1,10 +1,29 @@
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
+/*
+               =.            This file is part of the Opie Project
+             .=l.            Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 /*
diff --git a/noncore/apps/opie-sheet/mainwindow.cpp b/noncore/apps/opie-sheet/mainwindow.cpp
index 061748e..bb85a24 100644
--- a/noncore/apps/opie-sheet/mainwindow.cpp
+++ b/noncore/apps/opie-sheet/mainwindow.cpp
@@ -1,10 +1,29 @@
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
+/*
+               =.            This file is part of the Opie Project
+             .=l.            Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 /*
@@ -15,10 +34,13 @@
 #include "mainwindow.h"
 
+/* OPIE */
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 
+/* QT */
 #include <qmessagebox.h>
 #include <qradiobutton.h>
 
+/* STD */
 #include "cellformat.h"
 #include "numberdlg.h"
@@ -39,5 +61,5 @@ MainWindow::MainWindow(QWidget *parent, const char* n, WFlags fl)
   // construct objects
   currentDoc=0;
-  fileSelector=new FileSelector("application/sheet-qt", this, QString::null);
+    fileSelector=new FileSelector("application/opie-sheet", this, QString::null);
   ExcelSelector=new FileSelector("application/excel",this,QString::null,FALSE);
   connect(fileSelector, SIGNAL(closeMe()), this, SLOT(selectorHide()));
@@ -47,5 +69,4 @@ MainWindow::MainWindow(QWidget *parent, const char* n, WFlags fl)
   connect(ExcelSelector,SIGNAL(closeMe()), this, SLOT(ExcelSelectorHide()));
 
-
   listSheets.setAutoDelete(TRUE);
 
@@ -91,5 +112,5 @@ void MainWindow::documentSave(DocLnk *lnkDoc)
   }
 
-  lnkDoc->setType("application/sheet-qt");
+    lnkDoc->setType("application/opie-sheet");
   if (!fm.saveFile(*lnkDoc, streamBuffer))
   {
diff --git a/noncore/apps/opie-sheet/mainwindow.h b/noncore/apps/opie-sheet/mainwindow.h
index eacbe36..642b7ae 100644
--- a/noncore/apps/opie-sheet/mainwindow.h
+++ b/noncore/apps/opie-sheet/mainwindow.h
@@ -1,10 +1,29 @@
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
+/*
+               =.            This file is part of the Opie Project
+             .=l.            Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 /*
@@ -16,6 +35,12 @@
 #define MAINWINDOW_H
 
+#include "Excel.h"
+#include "sheet.h"
+
+/* OPIE */
 #include <qpe/applnk.h>
 #include <qpe/fileselector.h>
+
+/* QT */
 #include <qmenubar.h>
 #include <qtoolbar.h>
@@ -26,6 +51,4 @@
 #include <qcombobox.h>
 #include <qtoolbutton.h>
-#include "Excel.h"
-#include "sheet.h"
 
 typedef struct typeSheet
diff --git a/noncore/apps/opie-sheet/numberdlg.cpp b/noncore/apps/opie-sheet/numberdlg.cpp
index 90fbaa2..43574e9 100644
--- a/noncore/apps/opie-sheet/numberdlg.cpp
+++ b/noncore/apps/opie-sheet/numberdlg.cpp
@@ -1,10 +1,29 @@
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
+/*
+               =.            This file is part of the Opie Project
+             .=l.            Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 /*
@@ -29,6 +48,5 @@ NumberDialog::NumberDialog(QWidget *parent)
 
 NumberDialog::~NumberDialog()
-{
-}
+{}
 
 int NumberDialog::exec(const QString &caption, const QString &text,
diff --git a/noncore/apps/opie-sheet/numberdlg.h b/noncore/apps/opie-sheet/numberdlg.h
index 81e3326..497c076 100644
--- a/noncore/apps/opie-sheet/numberdlg.h
+++ b/noncore/apps/opie-sheet/numberdlg.h
@@ -1,10 +1,29 @@
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
+/*
+               =.            This file is part of the Opie Project
+             .=l.            Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 /*
@@ -16,4 +35,5 @@
 #define NUMBERDLG_H
 
+/* QT */
 #include <qdialog.h>
 #include <qlabel.h>
diff --git a/noncore/apps/opie-sheet/opie-sheet.pro b/noncore/apps/opie-sheet/opie-sheet.pro
index ced4daf..d0beb93 100644
--- a/noncore/apps/opie-sheet/opie-sheet.pro
+++ b/noncore/apps/opie-sheet/opie-sheet.pro
@@ -1,5 +1,20 @@
 CONFIG        = qt warn_on  quick-app
-HEADERS        = mainwindow.h sheet.h cellformat.h finddlg.h numberdlg.h sortdlg.h textdlg.h Excel.h
-SOURCES        = main.cpp mainwindow.cpp sheet.cpp cellformat.cpp finddlg.cpp numberdlg.cpp sortdlg.cpp textdlg.cpp Excel.cpp
+HEADERS       = mainwindow.h \
+                sheet.h \
+                cellformat.h \
+                finddlg.h \
+                numberdlg.h \
+                sortdlg.h \
+                textdlg.h \
+                Excel.h
+SOURCES       = main.cpp \
+                mainwindow.cpp \
+                sheet.cpp \
+                cellformat.cpp \
+                finddlg.cpp \
+                numberdlg.cpp \
+                sortdlg.cpp \
+                textdlg.cpp \
+                Excel.cpp
 INCLUDEPATH    += $(OPIEDIR)/include
 DEPENDPATH    += $(OPIEDIR)/include
diff --git a/noncore/apps/opie-sheet/sheet.cpp b/noncore/apps/opie-sheet/sheet.cpp
index 88847da..477c982 100644
--- a/noncore/apps/opie-sheet/sheet.cpp
+++ b/noncore/apps/opie-sheet/sheet.cpp
@@ -1,10 +1,29 @@
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
+/*
+               =.            This file is part of the Opie Project
+             .=l.            Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 /*
@@ -15,5 +34,8 @@
 #include "sheet.h"
 
+/* QT */
 #include <qmessagebox.h>
+
+/* STD */
 #include <math.h>
 #include <stdlib.h>
@@ -49,6 +71,5 @@ Sheet::Sheet(int numRows, int numCols, QWidget *parent)
 
 Sheet::~Sheet()
-{
-}
+{}
 
 typeCellData *Sheet::findCellData(int row, int col)
@@ -68,5 +89,6 @@ void Sheet::slotCellSelected(int row, int col)
   {
     emit currentDataChanged(cellData->data);
-  }else
+    }
+    else
     emit currentDataChanged("");
 }
@@ -229,5 +251,6 @@ double Sheet::BesselI0(double x)
 		y*=y;
 		ans=1.0+y*(3.5156229+y*(3.0899424+y*(1.2067492 +y*(0.2659732+y*(0.360768e-1+y*0.45813e-2)))));
-	}else
+    }
+    else
 	{
 		y=3.75/ax;
@@ -246,5 +269,6 @@ double Sheet::BesselI1(double x)
 		y*=y;
 		ans=ax*(0.5+y*(0.87890594+y*(0.51498869+y*(0.15084934 +y*(0.2658733e-1+y*(0.301532e-2+y*0.32411e-3))))));
-	} else
+    }
+    else
 	{
 		y=3.75/ax;
@@ -293,5 +317,6 @@ double Sheet::BesselK0(double x)
 		y=x*x/4.0;
 		ans=(-log(x/2.0)*BesselI0(x))+(-0.57721566+y*(0.42278420 +y*(0.23069756+y*(0.3488590e-1+y*(0.262698e-2 +y*(0.10750e-3+y*0.74e-5))))));
-	} else
+    }
+    else
 	{
 		y=2.0/x;
@@ -308,5 +333,6 @@ double Sheet::BesselK1(double x)
 		y=x*x/4.0;
 		ans=(log(x/2.0)*BesselI1(x))+(1.0/x)*(1.0+y*(0.15443144 +y*(-0.67278579+y*(-0.18156897+y*(-0.1919402e-1 +y*(-0.110404e-2+y*(-0.4686e-4)))))));
-	} else
+    }
+    else
 	{
 		y=2.0/x;
@@ -343,5 +369,6 @@ double Sheet::BesselJ0(double x)
 		ans2=57568490411.0+y*(1029532985.0+y*(9494680.718 +y*(59272.64853+y*(267.8532712+y*1.0))));
 		ans=ans1/ans2;
-	} else
+    }
+    else
 	{
 		z=8.0/ax;
@@ -365,5 +392,6 @@ double Sheet::BesselY0(double x)
 		ans2=40076544269.0+y*(745249964.8+y*(7189466.438 +y*(47447.26470+y*(226.1030244+y*1.0))));
 		ans=(ans1/ans2)+0.636619772*BesselJ0(x)*log(x);
-	} else
+    }
+    else
 	{
 		z=8.0/x;
@@ -387,5 +415,6 @@ double Sheet::BesselJ1(double x)
 		ans2=144725228442.0+y*(2300535178.0+y*(18583304.74 +y*(99447.43394+y*(376.9991397+y*1.0))));
 		ans=ans1/ans2;
-	} else
+    }
+    else
 	{
 		z=8.0/ax; y=z*z; xx=ax-2.356194491;
@@ -408,5 +437,6 @@ double Sheet::BesselY1(double x)
 		ans2=0.2499580570e14+y*(0.4244419664e12 +y*(0.3733650367e10+y*(0.2245904002e8 +y*(0.1020426050e6+y*(0.3549632885e3+y)))));
 		ans=(ans1/ans2)+0.636619772*(BesselJ1(x)*log(x)-1.0/x);
-	} else
+    }
+    else
 	{
 		z=8.0/x;
@@ -459,5 +489,6 @@ double Sheet::BesselJ(int n, double x)
 			}
 			ans=bj;
-		} else
+    }
+    else
 		{
 			tox=2.0/ax;
@@ -519,5 +550,6 @@ double Sheet::GammaP(double a, double x)
 		GammaSeries(&gamser,a,x,&gln);
 		return gamser;
-	}else
+    }
+    else
 	{
 		GammaContinuedFraction(&gammcf,a,x,&gln);
@@ -545,5 +577,6 @@ void Sheet::GammaSeries(double *gamser, double a, double x, double *gln)
 		*gamser=0.0;
 		return;
-	} else
+    }
+    else
 	{
 		ap=a;
@@ -559,5 +592,6 @@ void Sheet::GammaSeries(double *gamser, double a, double x, double *gln)
 				return;
 			}
-		} return;
+        }
+        return;
 		return;
 	}
@@ -663,5 +697,6 @@ double Sheet::functionSum(const QString &param1, const QString &param2)
 	}
   return result;
-  }else
+    }
+    else
   {
 	double d1=0,d2=0;
@@ -790,5 +825,6 @@ double Sheet::functionSumSQ(const QString &param1, const QString &param2)
 	}
   	return result;
-  }else
+    }
+    else
   {
 	double d1=0,d2=0;
@@ -820,5 +856,6 @@ double Sheet::functionMin(const QString &param1, const QString &param2)
 		}
 	return min;
-  }else
+    }
+    else
   {
 	double d1=0,d2=0;
@@ -848,5 +885,6 @@ double Sheet::functionMax(const QString &param1, const QString &param2)
 	};
 	return max;
-  }else
+    }
+    else
   {
 	double d1=0,d2=0;
@@ -878,5 +916,6 @@ double Sheet::functionCount(const QString &param1, const QString &param2)
 	};
 	return divider;
-  }else
+    }
+    else
   {
 	double d1=0,d2=0;int ii=0;
@@ -993,10 +1032,12 @@ QString Sheet::calculateFunction(const QString &func, const QString &parameters,
 	{
 		if(text(row,col).length()==0) val1=1; else val1=0;
-	}else
+        }
+        else
 	{
 		if(findRowColumn(calculateVariable(getParameter(parameters, 0)), &row,&col, FALSE))
 		{
 			if(text(row,col).length()==0) val1=1; else val1=0;
-		}else
+            }
+            else
 		{
 			val1=0;
@@ -1013,5 +1054,6 @@ QString Sheet::calculateFunction(const QString &func, const QString &parameters,
 		val1=text(row,col).toDouble(&ok);
 		if(ok) val1=1; else val1=0;
-	}else
+        }
+        else
 	{
 		if(findRowColumn(calculateVariable(getParameter(parameters, 0, TRUE, function)), &row,&col, FALSE))
@@ -1019,5 +1061,6 @@ QString Sheet::calculateFunction(const QString &func, const QString &parameters,
 			val1=text(row,col).toDouble(&ok);
 			if(ok) val1=1; else val1=0;
-		}else
+            }
+            else
 		{
 			val1=0;
@@ -1390,5 +1433,6 @@ QString Sheet::calculateFunction(const QString &func, const QString &parameters,
 		s1=calculateVariable(getParameter(parameters, 1, TRUE, function));
 		return QString(s1);
-	}else
+        }
+        else
 	{
 		s1=calculateVariable(getParameter(parameters, 2, TRUE, function));
@@ -1553,5 +1597,6 @@ QString Sheet::calculateFunction(const QString &func, const QString &parameters,
 	{
 		return QString::number(GammaQ(floor(val1)+1, val2));
-	}else
+        }
+        else
 	{
 		return QString::number(exp(-val2)*pow(val2,val1)/exp(GammaLn(val1+1.0)));
@@ -1567,5 +1612,6 @@ QString Sheet::calculateFunction(const QString &func, const QString &parameters,
 	{
 		return QString::number(GammaP(val2/2.0,val1*val1/2.0));
-	} else
+        }
+        else
 	{
 		return QString::number(
@@ -1583,5 +1629,6 @@ QString Sheet::calculateFunction(const QString &func, const QString &parameters,
 	{
 		return QString::number(GammaP(val2/2.0,val1/2.0));
-	} else
+        }
+        else
 	{
 		return QString::number(
@@ -2386,5 +2433,6 @@ void Expression::GetNext()
 		}//while
 	}//else if
-};//end function
+}
+;//end function
 
 
diff --git a/noncore/apps/opie-sheet/sheet.h b/noncore/apps/opie-sheet/sheet.h
index f705cd0..92c8061 100644
--- a/noncore/apps/opie-sheet/sheet.h
+++ b/noncore/apps/opie-sheet/sheet.h
@@ -1,10 +1,29 @@
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
+/*
+               =.            This file is part of the Opie Project
+             .=l.            Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 /*
@@ -16,4 +35,5 @@
 #define SHEET_H
 
+/* QT */
 #include <qtable.h>
 #include <qstack.h>
diff --git a/noncore/apps/opie-sheet/sortdlg.cpp b/noncore/apps/opie-sheet/sortdlg.cpp
index c2cdec8..47d666f 100644
--- a/noncore/apps/opie-sheet/sortdlg.cpp
+++ b/noncore/apps/opie-sheet/sortdlg.cpp
@@ -1,10 +1,29 @@
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
+/*
+               =.            This file is part of the Opie Project
+             .=l.            Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 /*
@@ -13,8 +32,10 @@
  */
 
+#include "sortdlg.h"
+
+/* QT */
 #include <qlabel.h>
 #include <qradiobutton.h>
 #include <qmessagebox.h>
-#include "sortdlg.h"
 
 SortDialog::SortDialog(QWidget *parent)
@@ -56,6 +77,5 @@ SortDialog::SortDialog(QWidget *parent)
 
 SortDialog::~SortDialog()
-{
-}
+{}
 
 QComboBox *SortDialog::createFieldCombo(const QString &caption, int y)
diff --git a/noncore/apps/opie-sheet/sortdlg.h b/noncore/apps/opie-sheet/sortdlg.h
index b3699a9..5a1025e 100644
--- a/noncore/apps/opie-sheet/sortdlg.h
+++ b/noncore/apps/opie-sheet/sortdlg.h
@@ -1,10 +1,29 @@
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
+/*
+               =.            This file is part of the Opie Project
+             .=l.            Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 /*
@@ -16,4 +35,7 @@
 #define SORTDLG_H
 
+#include "sheet.h"
+
+/* QT */
 #include <qdialog.h>
 #include <qtabwidget.h>
@@ -23,5 +45,4 @@
 #include <qpushbutton.h>
 #include <qvbuttongroup.h>
-#include "sheet.h"
 
 class SortDialog: public QDialog
diff --git a/noncore/apps/opie-sheet/textdlg.cpp b/noncore/apps/opie-sheet/textdlg.cpp
index 34cec29..020b9ae 100644
--- a/noncore/apps/opie-sheet/textdlg.cpp
+++ b/noncore/apps/opie-sheet/textdlg.cpp
@@ -1,10 +1,29 @@
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
+/*
+               =.            This file is part of the Opie Project
+             .=l.            Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 /*
@@ -29,6 +48,5 @@ TextDialog::TextDialog(QWidget *parent)
 
 TextDialog::~TextDialog()
-{
-}
+{}
 
 int TextDialog::exec(const QString &caption, const QString &text,
diff --git a/noncore/apps/opie-sheet/textdlg.h b/noncore/apps/opie-sheet/textdlg.h
index 78ef580..d54da16 100644
--- a/noncore/apps/opie-sheet/textdlg.h
+++ b/noncore/apps/opie-sheet/textdlg.h
@@ -1,10 +1,29 @@
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
+/*
+               =.            This file is part of the Opie Project
+             .=l.            Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 /*
@@ -16,4 +35,5 @@
 #define TEXTDLG_H
 
+/* QT */
 #include <qdialog.h>
 #include <qlabel.h>