31 files changed, 951 insertions, 617 deletions

diff --git a/noncore/settings/aqpkg/categoryfilterimpl.cpp b/noncore/settings/aqpkg/categoryfilterimpl.cpp
index e8ce7e7..61e1f93 100644
--- a/noncore/settings/aqpkg/categoryfilterimpl.cpp
+++ b/noncore/settings/aqpkg/categoryfilterimpl.cpp
@@ -1,28 +1,41 @@
-/***************************************************************************
-                          categoryfilterimpl.cpp  -  description
-                             -------------------
-    begin                : Sun Nov 17 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
+
 #include <iostream>
 using namespace std;
 
 #include <qgroupbox.h>
 #include <qlayout.h> 
 #include <qlistbox.h>
 #include <qstring.h>
 
 #include "categoryfilterimpl.h"
 
 CategoryFilterImpl :: CategoryFilterImpl(const QString &categories, const QString &selectedCategories, QWidget *parent, const char *name )
     : QDialog( parent, name, true )
diff --git a/noncore/settings/aqpkg/categoryfilterimpl.h b/noncore/settings/aqpkg/categoryfilterimpl.h
index a85fce4..78d39db 100644
--- a/noncore/settings/aqpkg/categoryfilterimpl.h
+++ b/noncore/settings/aqpkg/categoryfilterimpl.h
@@ -1,28 +1,40 @@
-/***************************************************************************
-                          categoryfilterimpl.h  -  description
-                             -------------------
-    begin                : Sun Nov 17 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 #ifndef CATEGORYFILTERIMPL_H
 #define CATEGORYFILTERIMPL_H
 
 #include <qdialog.h>
 
 class QListBox;
 
 /**
   *@author Andy Qua
   */
 
diff --git a/noncore/settings/aqpkg/datamgr.cpp b/noncore/settings/aqpkg/datamgr.cpp
index 79f36e1..cd0c78f 100644
--- a/noncore/settings/aqpkg/datamgr.cpp
+++ b/noncore/settings/aqpkg/datamgr.cpp
@@ -1,40 +1,50 @@
-/***************************************************************************
-                          datamgr.cpp  -  description
-                             -------------------
-    begin                : Thu Aug 29 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-#include <fstream>
-#include <iostream>
-using namespace std;
+/*
+                             This file is part of the OPIE Project
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 #ifdef QWS
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 #else
 #include <qapplication.h>
 #endif
 
-#include <stdio.h>
+#include <qfile.h>
+#include <qtextstream.h>
 
 #include "datamgr.h"
 #include "global.h"
 
 
 QString DataManager::availableCategories = "";
 DataManager::DataManager()
     : QObject( 0x0, 0x0 )
 {
     activeServer = "";
     availableCategories = "#";
     
@@ -79,25 +89,24 @@ void DataManager :: loadServers()
     Config cfg( "aqpkg" );
     cfg.setGroup( "destinations" );
 #endif
 
     // Read file from /etc/ipkg.conf
     QString ipkg_conf = IPKG_CONF;
     FILE *fp;
     fp = fopen( ipkg_conf, "r" );
     char line[130];
     QString lineStr;
     if ( fp == NULL )
     {
-        cout << "Couldn't open " << ipkg_conf << "! err = " << fp << endl;
         return;
     }
     else
     {
         while ( fgets( line, sizeof line, fp) != NULL )
         {
             lineStr = line;
             if ( lineStr.startsWith( "src" ) || lineStr.startsWith( "#src" ) || lineStr.startsWith( "# src" ) )
             {
                 char alias[20];
                 char url[100];
 
@@ -189,103 +198,115 @@ void DataManager :: reloadServerData( )
             // The other servers files hold the contents of the server package list
             if ( serverName == LOCAL_SERVER )
                 server->readStatusFile( destList );
             else if ( serverName == LOCAL_IPKGS )
             server->readLocalIpks( getServer( LOCAL_SERVER ) );
             else
             server->readPackageFile( getServer( LOCAL_SERVER ) );     
         }
 }
 
 void DataManager :: writeOutIpkgConf()
 {
+    QFile f( IPKG_CONF );
+    if ( !f.open( IO_WriteOnly ) )
+    {
+        return;
+    }
+    
+    QTextStream t( &f );
+/*
     QString ipkg_conf = IPKG_CONF;
     ofstream out( ipkg_conf );
+*/
+    t << "# Written by AQPkg\n";
+    t << "# Must have one or more source entries of the form:\n";
+    t << "#\n";
+    t << "#   src <src-name> <source-url>\n";
+    t << "#\n";
+    t << "# and one or more destination entries of the form:\n";
+    t << "#\n";
+    t << "#   dest <dest-name> <target-path>\n";
+    t << "#\n";
+    t << "# where <src-name> and <dest-names> are identifiers that\n";
+    t << "# should match [a-zA-Z0-9._-]+, <source-url> should be a\n";
+    t << "# URL that points to a directory containing a Familiar\n";
+    t << "# Packages file, and <target-path> should be a directory\n";
+    t << "# that exists on the target system.\n\n";
 
-    out << "# Written by AQPkg" << endl;
-    out << "# Must have one or more source entries of the form:" << endl;
-    out << "#" << endl;
-    out << "#   src <src-name> <source-url>" << endl;
-    out << "#" << endl;
-    out << "# and one or more destination entries of the form:" << endl;
-    out << "#" << endl;
-    out << "#   dest <dest-name> <target-path>" << endl;
-    out << "#" << endl;
-    out << "# where <src-name> and <dest-names> are identifiers that" << endl;
-    out << "# should match [a-zA-Z0-9._-]+, <source-url> should be a" << endl;
-    out << "# URL that points to a directory containing a Familiar" << endl;
-    out << "# Packages file, and <target-path> should be a directory" << endl;
-    out << "# that exists on the target system." << endl << endl;
-    
     // Write out servers
     Server *server;
     QListIterator<Server> it( serverList );
     while ( it.current() )
     {
         server = it.current();
         QString alias = server->getServerName();
         // Don't write out local as its a dummy
         if ( alias != LOCAL_SERVER && alias != LOCAL_IPKGS )
         {
             QString url = server->getServerUrl();;
 
             if ( !server->isServerActive() )
-                out << "#";
-            out << "src " << alias << " " << url << endl;
+                t << "#";
+            t << "src " << alias << " " << url << endl;
         }
 
         ++it;
     }
 
-    out << endl;
+    t << endl;
 
     // Write out destinations
     QListIterator<Destination> it2( destList );
     while ( it2.current() )
     {
-        out << "dest " << it2.current()->getDestinationName() << " " << it2.current()->getDestinationPath() << endl;
+        t << "dest " << it2.current()->getDestinationName() << " " << it2.current()->getDestinationPath() << endl;
         ++it2;
     }
 
-    out << endl;
-    out << "# Proxy Support" << endl;
+    t << endl;
+    t << "# Proxy Support\n";
 
     if ( !httpProxyEnabled && httpProxy == "" )
-        out << "#option http_proxy http://proxy.tld:3128" << endl;
+        t << "#option http_proxy http://proxy.tld:3128\n";
     else
     {
         if ( !httpProxyEnabled )
-            out << "#";
-        out << "option http_proxy " << httpProxy << endl;
+            t << "#";
+        t << "option http_proxy " << httpProxy << endl;
     }
 
     if ( !ftpProxyEnabled && ftpProxy == "" )
-        out << "#option ftp_proxy http://proxy.tld:3128" << endl;
+        t << "#option ftp_proxy http://proxy.tld:3128\n";
     else
     {
         if ( !ftpProxyEnabled )
-            out << "#";
-        out << "option ftp_proxy " << ftpProxy << endl;
+            t << "#";
+        t << "option ftp_proxy " << ftpProxy << endl;
     }
     if ( proxyUsername == "" || (!httpProxyEnabled && !ftpProxyEnabled) )
-        out << "#option proxy_username <username>" << endl;
+        t << "#option proxy_username <username>\n";
     else
-        out << "option proxy_username " << proxyUsername << endl;
+        t << "option proxy_username " << proxyUsername << endl;
     if ( proxyPassword == "" || (!httpProxyEnabled && !ftpProxyEnabled) )
-        out << "#option proxy_password <password>" << endl << endl;
+        t << "#option proxy_password <password>\n\n";
     else
-        out << "option proxy_password " << proxyPassword << endl<< endl;
-
-    out << "# Offline mode (for use in constructing flash images offline)" << endl;
-    out << "#option offline_root target" << endl;
+        t << "option proxy_password " << proxyPassword << endl<< endl;
 
+    t << "# Offline mode (for use in constructing flash images offline)\n";
+    t << "#option offline_root target\n";
     
-    out.close();
+    f.close();
 }
 
 
 void DataManager :: setAvailableCategories( QString section )
 {
-    section = section.lower();
-    if ( availableCategories.find( "#" + section + "#" ) == -1 )
-        availableCategories += section + "#";
+    QString sectstr = "#";
+    sectstr.append( section.lower() );
+    sectstr.append( "#" );
+    if ( availableCategories.find( sectstr ) == -1 )
+    {
+        availableCategories.append( section );
+        availableCategories.append( "#" );
+    }
 }
diff --git a/noncore/settings/aqpkg/datamgr.h b/noncore/settings/aqpkg/datamgr.h
index 7fa42c1..32a1e57 100644
--- a/noncore/settings/aqpkg/datamgr.h
+++ b/noncore/settings/aqpkg/datamgr.h
@@ -1,28 +1,40 @@
-/***************************************************************************
-                          datamgr.h  -  description
-                             -------------------
-    begin                : Thu Aug 29 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 #ifndef DATAMGR_H
 #define DATAMGR_H
 
 #include <map>
 using namespace std;
 
 #include <qlist.h>
 #include <qobject.h>
 #include <qstring.h>
 
 #include "server.h"
diff --git a/noncore/settings/aqpkg/destination.cpp b/noncore/settings/aqpkg/destination.cpp
index 45bdb48..6423894 100644
--- a/noncore/settings/aqpkg/destination.cpp
+++ b/noncore/settings/aqpkg/destination.cpp
@@ -1,28 +1,40 @@
-/***************************************************************************
-                          destination.cpp  -  description
-                             -------------------
-    begin                : Mon Aug 26 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
+/*
+                             This file is part of the OPIE Project
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
 
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
+*/
 
 #include "destination.h"
 #include "global.h"
 
 Destination::Destination( const char *name, const char *path )
 {
         destName = name;
         destPath = path;
     linkToRootDir = true;
 }
 
 Destination::~Destination()
diff --git a/noncore/settings/aqpkg/destination.h b/noncore/settings/aqpkg/destination.h
index 646fae9..4a7f706 100644
--- a/noncore/settings/aqpkg/destination.h
+++ b/noncore/settings/aqpkg/destination.h
@@ -1,28 +1,41 @@
-/***************************************************************************
-                          destination.h  -  description
-                             -------------------
-    begin                : Mon Aug 26 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
+
 #ifndef DESTINATION_H
 #define DESTINATION_H
 
 #include <qstring.h>
 
 class Destination
 {
 public:
     Destination() {}
     Destination( const char *name, const char *path );
     ~Destination();
 
diff --git a/noncore/settings/aqpkg/global.h b/noncore/settings/aqpkg/global.h
index 920b090..4fdd51d 100644
--- a/noncore/settings/aqpkg/global.h
+++ b/noncore/settings/aqpkg/global.h
@@ -1,28 +1,40 @@
-/***************************************************************************
-                          global.h  -  description
-                             -------------------
-    begin                : Mon Aug 26 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 #ifndef __GLOBAL_H
 #define __GLOBAL_H
 
 #define VERSION_TEXT "AQPkg Version 1.11"
 
 // Uncomment the below line to run on a Linux box rather than a Zaurus
 // box this allows you to change where root is, and where to load config files from
 // #define X86
 
 // Sets up location of ipkg.conf and root directory
 #ifdef QWS
diff --git a/noncore/settings/aqpkg/inputdlg.cpp b/noncore/settings/aqpkg/inputdlg.cpp
index 724a891..06e934c 100644
--- a/noncore/settings/aqpkg/inputdlg.cpp
+++ b/noncore/settings/aqpkg/inputdlg.cpp
@@ -1,28 +1,41 @@
-/***************************************************************************
-                          inputdlg.h  -  description
-                             -------------------
-    begin                : Mon Aug 26 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
+
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qspinbox.h>
 #include <qcombobox.h>
 #include <qwidgetstack.h>
 #include <qvalidator.h>
 #include <qapplication.h>
 
 #include "inputdlg.h"
 #include "global.h"
diff --git a/noncore/settings/aqpkg/inputdlg.h b/noncore/settings/aqpkg/inputdlg.h
index 1e0c5bc..260201e 100644
--- a/noncore/settings/aqpkg/inputdlg.h
+++ b/noncore/settings/aqpkg/inputdlg.h
@@ -1,28 +1,40 @@
-/***************************************************************************
-                          inputdlg.h  -  description
-                             -------------------
-    begin                : Mon Aug 26 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 #ifndef INPUTDIALOG_H
 #define INPUTDIALOG_H
 
 #include <qdialog.h>
 #include <qstring.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 
 class InputDialog : public QDialog
 {
     Q_OBJECT
diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp
index 896e370..17f7b08 100644
--- a/noncore/settings/aqpkg/installdlgimpl.cpp
+++ b/noncore/settings/aqpkg/installdlgimpl.cpp
@@ -1,28 +1,40 @@
-/***************************************************************************
-                          installdlgimpl.cpp  -  description
-                             -------------------
-    begin                : Mon Aug 26 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 #include <stdio.h>
 
 #include <opie/ofiledialog.h>
  
 #ifdef QWS
 #include <qpe/config.h>
 #include <qpe/fileselector.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/storage.h>
 #endif
@@ -454,13 +466,13 @@ void InstallDlgImpl :: ipkgFinished()
         else
         {
                 btnOptions->setEnabled( true );
                 btnInstall->setText( tr( "Close" ) );
                 btnInstall->setIconSet( Resource::loadPixmap( "enter" ) );
 
                 btnOptions->setText( tr( "Save output" ) );
                 btnOptions->setIconSet( Resource::loadPixmap( "save" ) );
 
                 if ( destination && destination->currentText() != 0 && destination->currentText() != "" )
                         displayAvailableSpace( destination->currentText() );
         }
-}
\ No newline at end of file
+}
diff --git a/noncore/settings/aqpkg/installdlgimpl.h b/noncore/settings/aqpkg/installdlgimpl.h
index 9a7dbff..894465a 100644
--- a/noncore/settings/aqpkg/installdlgimpl.h
+++ b/noncore/settings/aqpkg/installdlgimpl.h
@@ -1,28 +1,41 @@
-/***************************************************************************
-                          installdlgimpl.h  -  description
-                             -------------------
-    begin                : Mon Aug 26 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
+/*
+                             This file is part of the OPIE Project
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
 #ifndef INSTALLDLGIMPL_H
 #define INSTALLDLGIMPL_H
 
 using namespace std;
 
 #include <qlist.h>
 #include <qstring.h>
 #include <qwidget.h>
 
 class QComboBox;
 class QLabel;
 class QMultiLineEdit;
diff --git a/noncore/settings/aqpkg/instoptionsimpl.cpp b/noncore/settings/aqpkg/instoptionsimpl.cpp
index 72d794f..9d52013 100644
--- a/noncore/settings/aqpkg/instoptionsimpl.cpp
+++ b/noncore/settings/aqpkg/instoptionsimpl.cpp
@@ -1,28 +1,40 @@
-/***************************************************************************
-                          instoptionsimpl.cpp  -  description
-                             -------------------
-    begin                : Mon Aug 26 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 #ifdef QWS
 #include <qpe/config.h>
 #endif
 
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 
 #include "global.h"
diff --git a/noncore/settings/aqpkg/instoptionsimpl.h b/noncore/settings/aqpkg/instoptionsimpl.h
index 1312afd..e68a3dc 100644
--- a/noncore/settings/aqpkg/instoptionsimpl.h
+++ b/noncore/settings/aqpkg/instoptionsimpl.h
@@ -1,28 +1,41 @@
-/***************************************************************************
-                          installoptionsimpl.h  -  description
-                             -------------------
-    begin                : Mon Aug 26 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
+/*
+                             This file is part of the OPIE Project
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
 #ifndef INSTALLOPTIONSIMPL_H
 #define INSTALLOPTIONSIMPL_H
 
 #include <qdialog.h>
 
 class QCheckBox;
 class QComboBox;
 
 class InstallOptionsDlgImpl : public QDialog
 {
     Q_OBJECT
 public:
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index 34999ad..08ae386 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -1,28 +1,40 @@
-/***************************************************************************
-                          ipkg.cpp  -  description
-                             -------------------
-    begin                : Sat Aug 31 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 #include <fstream>
 #include <iostream>
 #include <vector>
 using namespace std;
 
 #include <stdio.h>
 #include <unistd.h>
 
 #ifdef QWS
 #include <qpe/qpeapplication.h>
 #else
diff --git a/noncore/settings/aqpkg/ipkg.h b/noncore/settings/aqpkg/ipkg.h
index a0d38e3..8f254f9 100644
--- a/noncore/settings/aqpkg/ipkg.h
+++ b/noncore/settings/aqpkg/ipkg.h
@@ -1,28 +1,40 @@
-/***************************************************************************
-                          ipkg.h  -  description
-                             -------------------
-    begin                : Sat Aug 31 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
+/*
+                             This file is part of the OPIE Project
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
 
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
+*/
 
 #ifndef IPKG_H
 #define IPKG_H
 
 
 /**
   *@author Andy Qua
   */
 
 #include <qobject.h>
 #include <qstring.h>
 #include <qstringlist.h>
diff --git a/noncore/settings/aqpkg/letterpushbutton.cpp b/noncore/settings/aqpkg/letterpushbutton.cpp
index ca96c6c..c8b43e9 100644
--- a/noncore/settings/aqpkg/letterpushbutton.cpp
+++ b/noncore/settings/aqpkg/letterpushbutton.cpp
@@ -1,28 +1,40 @@
-/***************************************************************************
-                          letterpushbutton.cpp  -  description
-                             -------------------
-    begin                : Wed Oct 16 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
+/*
+                             This file is part of the OPIE Project
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
 
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
+*/
 
 #include "letterpushbutton.h"
 
 LetterPushButton :: LetterPushButton( const QString &text, QWidget *parent, const char *name )
    : QPushButton( text, parent, name )
 {
    connect( this, SIGNAL(released()), this, SLOT(released_emmitor()) );
 }
 
 LetterPushButton :: ~LetterPushButton()
 {
 }
diff --git a/noncore/settings/aqpkg/letterpushbutton.h b/noncore/settings/aqpkg/letterpushbutton.h
index e45b89d..452d68e 100644
--- a/noncore/settings/aqpkg/letterpushbutton.h
+++ b/noncore/settings/aqpkg/letterpushbutton.h
@@ -1,28 +1,40 @@
-/***************************************************************************
-                          letterpushbutton.h  -  description
-                             -------------------
-    begin                : Wed Oct 16 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 #ifndef LETTERPUSHBUTTON_H
 #define LETTERPUSHBUTTON_H
 
 #include <qpushbutton.h>
 
 /**
   *@author Andy Qua
   */
 
 class LetterPushButton : public QPushButton
 {
diff --git a/noncore/settings/aqpkg/main.cpp b/noncore/settings/aqpkg/main.cpp
index 15ef9d6..066d79f 100644
--- a/noncore/settings/aqpkg/main.cpp
+++ b/noncore/settings/aqpkg/main.cpp
@@ -1,62 +1,71 @@
-/***************************************************************************
-                          main.cpp  -  description
-                             -------------------
-    begin                : Mon Aug 26 13:32:30 BST 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 #ifdef QWS
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
 #else
 #include <qapplication.h>
 #endif
 
 #include <qobjectdefs.h>
 
 #include "mainwin.h"
 #include "server.h"
 
 #include "global.h"
 
 
 int main(int argc, char *argv[])
 {
-//  cout << "Root dir = " << ROOT << endl;
 #ifdef QWS
   QPEApplication a( argc, argv );
 #else
   QApplication a( argc, argv );
 #endif
 
 #ifdef QWS
   // Disable suspend mode
-//  cout << "Disabling suspend mode" << endl;
   QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::DisableSuspend;
 #endif
 
   MainWindow *win = new MainWindow();
   a.setMainWidget(win);
   win->showMaximized();
 
   a.exec();
 
 #ifdef QWS
   // Reenable suspend mode
-//  cout << "Enabling suspend mode" << endl;
   QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
 #endif
  #ifdef _DEBUG
   DumpUnfreed();
  #endif
 }
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index f0e8e48..0102292 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -1,28 +1,40 @@
-/***************************************************************************
-                          mainwin.cpp  -  description
-                             -------------------
-    begin                : Mon Aug 26 13:32:30 BST 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 #include <linux/limits.h>
 #include <unistd.h>
 
 #include <qpe/qcopenvelope_qws.h>
 #include <qmenubar.h>
 #include <qpe/qpeapplication.h>
 #include <qtoolbar.h>
 #include <qpe/config.h>
 #include <qpe/resource.h>
 
 #include <qaction.h>
@@ -293,25 +305,24 @@ void MainWindow :: init()
     showUpgradedPkgs = false;
     categoryFilterEnabled = false;
 
     updateData();
 
     stack->raiseWidget( networkPkgWindow );
 }
 
 void MainWindow :: setDocument( const QString &doc )
 {
     // Remove path from package
     QString package = Utils::getPackageNameFromIpkFilename( doc );
-//    std::cout << "Selecting package " << package << std::endl;
 
     // First select local server
     for ( int i = 0 ; i < serversList->count() ; ++i )
     {
         if ( serversList->text( i ) == LOCAL_IPKGS )
         {
             serversList->setCurrentItem( i );
             break;
         }
     }
     serverSelected( 0 );
 
@@ -545,28 +556,26 @@ void MainWindow :: updateData()
 
     QListIterator<Server> it( mgr->getServerList() );
     Server *server;
 
     for ( ; it.current(); ++it, ++i )
     {
         server = it.current();
         serverName = server->getServerName();
         m_status->setText( tr( "Building server list:\n\t%1" ).arg( serverName ) );
         m_progress->setProgress( i );
         qApp->processEvents();
 
-//        cout << "Adding " << it->getServerName() << " to combobox" << endl;
         if ( !server->isServerActive() )
         {
-//            cout << serverName << " is not active" << endl;
             i--;
             continue;
         }
 
         serversList->insertItem( serverName );
         if ( serverName == currentlySelectedServer )
                 activeItem = i;
         }
 
         // set selected server to be active server
         if ( activeItem != -1 )
                 serversList->setCurrentItem( activeItem );
@@ -704,41 +713,35 @@ void MainWindow :: serverSelected( int, bool raiseProgress )
 
     // Display this widget once everything is done
     if ( doProgress && raiseProgress )
     {
         stack->raiseWidget( networkPkgWindow );
     }
 }
 
 void MainWindow :: searchForPackage( const QString &text )
 {
     if ( !text.isEmpty() )
     {
-//        cout << "searching for " << text << endl;
         // look through package list for text startng at current position
-//        vector<InstallData> workingPackages;
         QCheckListItem *start = (QCheckListItem *)packagesList->currentItem();
-//        if ( start != 0 )
-//            start = (QCheckListItem *)start->nextSibling();
 
         if ( start == 0 )
             start = (QCheckListItem *)packagesList->firstChild();
 
         for ( QCheckListItem *item = start; item != 0 ;
               item = (QCheckListItem *)item->nextSibling() )
         {
-//            cout << "checking " << item->text().lower() << endl;
             if ( item->text().lower().find( text ) != -1 )
             {
-//                cout << "matched " << item->text() << endl;
                 packagesList->ensureItemVisible( item );
                 packagesList->setCurrentItem( item );
                 break;
             }
         }
     }
 }
 
 void MainWindow :: updateServer()
 {
     QString serverName = serversList->currentText();
 
@@ -1004,26 +1007,24 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
     else
     {
         InstallData *newitem = new InstallData();
         newitem->option = "D";
         if ( !p->isPackageStoredLocally() )
             newitem->packageName = p->getInstalledPackageName();
         else
             newitem->packageName = name;
 
         if ( p->getInstalledTo() )
         {
             newitem->destination = p->getInstalledTo();
-//            cout << "dest - " << p->getInstalledTo()->getDestinationName() << endl;
-//            cout << "dest - " << p->getInstalledTo()->getDestinationPath() << endl;
         }
         else
         {
             newitem->destination = p->getLocalPackage()->getInstalledTo();
         }
 
         // Now see if version is newer or not
         int val = compareVersions( p->getInstalledVersion(), p->getVersion() );
 
         // If the version requested is older and user selected a local ipk file, then reinstall the file
         if ( p->isPackageStoredLocally() && val == -1 )
             val = 0;
diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h
index f95c332..9f48321 100644
--- a/noncore/settings/aqpkg/mainwin.h
+++ b/noncore/settings/aqpkg/mainwin.h
@@ -1,28 +1,40 @@
-/***************************************************************************
-                          mainwin.h  -  description
-                             -------------------
-    begin                : Mon Aug 26 13:32:30 BST 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
+/*
+                             This file is part of the OPIE Project
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
 
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
+*/
 
 #ifndef MAINWIN_H
 #define MAINWIN_H
 
 #include <qmainwindow.h>
 #include <qpixmap.h>
 
 class DataManager;
 class InstallData;
 class InstallDlgImpl;
 
 class QAction;
diff --git a/noncore/settings/aqpkg/mem.cpp b/noncore/settings/aqpkg/mem.cpp
index 405aada..5f32a26 100644
--- a/noncore/settings/aqpkg/mem.cpp
+++ b/noncore/settings/aqpkg/mem.cpp
@@ -1,106 +1,110 @@
-/***************************************************************************

-                          mem.h  -  description

-                             -------------------

-    begin                : Mon Aug 26 2002

-    copyright            : (C) 2002 by Andy Qua

-    email                : andy.qua@blueyonder.co.uk

- ***************************************************************************/

-

-/***************************************************************************

- *                                                                         *

- *   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.                                   *

- *                                                                         *

- ***************************************************************************/

-#include <stdio.h>

-#include <fstream>

-#include <iostream>

-#include <list>

-using namespace std;

-

-#define __MEMFILE_C

-#include "global.h"

-

-#ifdef _DEBUG

-

-void __cdecl *operator new( unsigned int size, const char *file, int line )

-{

-      void *ptr = (void *)malloc(size);

-      AddTrack((long)ptr, size, file, line);

-      return(ptr);

-}

-

-void operator delete(void *p)

-{

-      RemoveTrack((long)p);

-      free(p);

-}

-

-#endif

-

-

-typedef struct {

-              longaddress;

-              longsize;

-              charfile[64];

-              longline;

-} ALLOC_INFO;

-

-typedef list<ALLOC_INFO*> AllocList;

-

-AllocList allocList;

-

-

-

-void AddTrack(long addr,  long asize,  const char *fname, long lnum)

-{

-      ALLOC_INFO *info;

-

-

-      info = (ALLOC_INFO *)malloc(sizeof( ALLOC_INFO ));

-      info->address = addr;

-      strncpy(info->file, fname, 63);

-      info->line = lnum;

-      info->size = asize;

-      allocList.insert(allocList.begin(), info);

-};

-

-void RemoveTrack(long addr)

-{

-      AllocList::iterator i;

-

-      bool found = false;

-      for(i = allocList.begin(); i != allocList.end(); i++)

-      {

-              if((*i)->address == addr)

-              {

-                      allocList.remove((*i));

-                      found = true;

-                      break;

-              }

-      }

-}

-

-void DumpUnfreed()

-{

-      AllocList::iterator i;

-      long totalSize = 0;

-      char buf[1024];

-

-

-//      if(!allocList)

-        //      return;

-

-      for(i = allocList.begin(); i != allocList.end(); i++) {

-              sprintf(buf, "%-15s:  LINE %ld,  ADDRESS %ld %ld unfreed",

-                      (*i)->file, (*i)->line, (*i)->address, (*i)->size);

-              cout <<buf << endl;

-              totalSize += (*i)->size;

-      }

-      sprintf(buf, "-----------------------------------------------------------\n");

-              cout <<buf << endl;

-      sprintf(buf, "Total Unfreed: %ld bytes\n", totalSize);

-              cout <<buf << endl;

-};

+/*
+                             This file is part of the OPIE Project
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
+
+#include <stdio.h>
+#include <list>
+using namespace std;
+
+#define __MEMFILE_C
+#include "global.h"
+
+#ifdef _DEBUG
+
+void __cdecl *operator new( unsigned int size, const char *file, int line )
+{
+      void *ptr = (void *)malloc(size);
+      AddTrack((long)ptr, size, file, line);
+      return(ptr);
+}
+
+void operator delete(void *p)
+{
+      RemoveTrack((long)p);
+      free(p);
+}
+
+#endif
+
+
+typedef struct {
+              longaddress;
+              longsize;
+              charfile[64];
+              longline;
+} ALLOC_INFO;
+
+typedef list<ALLOC_INFO*> AllocList;
+
+AllocList allocList;
+
+
+
+void AddTrack(long addr,  long asize,  const char *fname, long lnum)
+{
+      ALLOC_INFO *info;
+
+
+      info = (ALLOC_INFO *)malloc(sizeof( ALLOC_INFO ));
+      info->address = addr;
+      strncpy(info->file, fname, 63);
+      info->line = lnum;
+      info->size = asize;
+      allocList.insert(allocList.begin(), info);
+};
+
+void RemoveTrack(long addr)
+{
+      AllocList::iterator i;
+
+      bool found = false;
+      for(i = allocList.begin(); i != allocList.end(); i++)
+      {
+              if((*i)->address == addr)
+              {
+                      allocList.remove((*i));
+                      found = true;
+                      break;
+              }
+      }
+}
+
+void DumpUnfreed()
+{
+      AllocList::iterator i;
+      long totalSize = 0;
+      char buf[1024];
+
+      for(i = allocList.begin(); i != allocList.end(); i++) {
+              sprintf(buf, "%-15s:  LINE %ld,  ADDRESS %ld %ld unfreed",
+                      (*i)->file, (*i)->line, (*i)->address, (*i)->size);
+              totalSize += (*i)->size;
+      }
+      sprintf(buf, "-----------------------------------------------------------\n");
+      sprintf(buf, "Total Unfreed: %ld bytes\n", totalSize);
+};
diff --git a/noncore/settings/aqpkg/package.cpp b/noncore/settings/aqpkg/package.cpp
index 3395870..4c27c65 100644
--- a/noncore/settings/aqpkg/package.cpp
+++ b/noncore/settings/aqpkg/package.cpp
@@ -1,28 +1,40 @@
-/***************************************************************************
-                          package.cpp  -  description
-                             -------------------
-    begin                : Mon Aug 26 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 #include "package.h"
 #include "global.h"
 
 Package::Package( QString &name )
 {
     packageName = name;
 
     version = "N/A";
     description = "N/A";
     packageSize = "N/A";
     section = "N/A";
diff --git a/noncore/settings/aqpkg/package.h b/noncore/settings/aqpkg/package.h
index 110ae91..c72f8b3 100644
--- a/noncore/settings/aqpkg/package.h
+++ b/noncore/settings/aqpkg/package.h
@@ -1,28 +1,40 @@
-/***************************************************************************
-                          package.h  -  description
-                             -------------------
-    begin                : Mon Aug 26 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
+/*
+                             This file is part of the OPIE Project
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
 
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
+*/
 
 #ifndef PACKAGE_H
 #define PACKAGE_H
 
 #include <stdlib.h>
 
 /**
   *@author Andy Qua
   */
 
 #include <qstring.h>
 #include "destination.h"
diff --git a/noncore/settings/aqpkg/packagewin.cpp b/noncore/settings/aqpkg/packagewin.cpp
index 7971ccc..9553cd1 100644
--- a/noncore/settings/aqpkg/packagewin.cpp
+++ b/noncore/settings/aqpkg/packagewin.cpp
@@ -1,16 +1,17 @@
 /*
                              This file is part of the OPIE Project
-               =.
-             .=l.            Copyright (c)  2002 OPIE team <opie@handhelds.org?>
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file 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 file 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
@@ -95,25 +96,23 @@ PackageWindow::PackageWindow( Package *package, const QString &server )
                         }
                 }
         }
         else
         {
                 setCaption( tr( "Package Information" ) );
                 str = tr( "Package information is unavailable" );
         }
 
         QVBoxLayout *layout = new QVBoxLayout( this, 4, 4 );
 
         QTextView *l = new QTextView( str, QString::null, this );
-        //l->setTextFormat( Qt::RichText );
-        //l->setAlignment( Qt::AlignLeft | Qt::AlignVCenter | Qt::WordBreak );
         layout->addWidget( l );
 
         QPushButton *btn = new QPushButton( Resource::loadPixmap( "enter" ), tr( "Close" ), this );
         layout->addWidget( btn );
         connect( btn, SIGNAL( clicked() ), this, SLOT( close() ) );
 
 }
 
 PackageWindow::~PackageWindow()
 {
 }
diff --git a/noncore/settings/aqpkg/packagewin.h b/noncore/settings/aqpkg/packagewin.h
index b4fdcad..83f3849 100644
--- a/noncore/settings/aqpkg/packagewin.h
+++ b/noncore/settings/aqpkg/packagewin.h
@@ -1,16 +1,17 @@
 /*
                              This file is part of the OPIE Project
-               =.
-             .=l.            Copyright (c)  2002 OPIE team <opie@handhelds.org?>
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file 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 file 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
diff --git a/noncore/settings/aqpkg/server.cpp b/noncore/settings/aqpkg/server.cpp
index e2b8096..4693db1 100644
--- a/noncore/settings/aqpkg/server.cpp
+++ b/noncore/settings/aqpkg/server.cpp
@@ -1,56 +1,65 @@
-/***************************************************************************
-                          server.cpp  -  description
-                             -------------------
-    begin                : Mon Aug 26 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
-    description          : This class holds details about a server
-                         : e.g. all the packages that contained on the server
-                         :      the installation status
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 #include "server.h"
 #include "datamgr.h"
 
 #include <qfile.h>
 #include <qtextstream.h>
 
 #ifdef QWS
 #include <qpe/global.h>
 #include <qpe/applnk.h>
 #include <qlist.h>
 #endif
 
 #include "utils.h"
 
 #include "global.h"
 
 Server :: Server( const char *name, const char *url )
 {
     serverName = name;
     serverUrl = url;
     packageFile = IPKG_DIR;
     active = true;
-    packageFile += "lists/" + serverName;
+    packageFile.append( "lists/" );
+    packageFile.append( serverName );
 }
 
 Server :: ~Server()
 {
         cleanUp();
 }
 
 void Server :: cleanUp()
 {
     packageList.clear();
 }
 
@@ -75,25 +84,24 @@ void Server :: readStatusFile(  QList<Destination> &destList )
             rootRead = true;
             installingToRoot = true;
         }   
         
         packageFile = path;
         packageFile.append( "usr/lib/ipkg/status" );
         readPackageFile( 0, false, installingToRoot, &( *dest ) );
     }
 
     // Ensure that the root status file is read
     if ( !rootRead )
     {
-        //cout << "Reading status file " << "/usr/lib/ipkg/status" << endl;
         packageFile = "/usr/lib/ipkg/status";
         readPackageFile( 0, false, true );
     }
 }
 
 void Server :: readLocalIpks( Server *local )
 {
     cleanUp();
 
 #ifdef QWS
     // First, get any local IPKGs in the documents area
     // Only applicable to Qtopie/Opie
diff --git a/noncore/settings/aqpkg/server.h b/noncore/settings/aqpkg/server.h
index 02746e0..f524ed6 100644
--- a/noncore/settings/aqpkg/server.h
+++ b/noncore/settings/aqpkg/server.h
@@ -1,28 +1,41 @@
-/***************************************************************************
-                          server.h  -  description
-                             -------------------
-    begin                : Mon Aug 26 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
+/*
+                             This file is part of the OPIE Project
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
 #ifndef SERVER_H
 #define SERVER_H
 
 #include <qlist.h>
 #include <qstring.h>
 
 using namespace std;
 
 #include "package.h"
 #include "destination.h"
 
 class Server
diff --git a/noncore/settings/aqpkg/settingsimpl.cpp b/noncore/settings/aqpkg/settingsimpl.cpp
index e2afada..4887ceb 100644
--- a/noncore/settings/aqpkg/settingsimpl.cpp
+++ b/noncore/settings/aqpkg/settingsimpl.cpp
@@ -1,28 +1,40 @@
-/***************************************************************************
-                          settingsimpl.cpp  -  description
-                             -------------------
-    begin                : Thu Aug 29 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 #include <fstream>
 #include <algorithm>
 using namespace std;
 
 #include <qcheckbox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
diff --git a/noncore/settings/aqpkg/settingsimpl.h b/noncore/settings/aqpkg/settingsimpl.h
index 9ffc259..1530ce1 100644
--- a/noncore/settings/aqpkg/settingsimpl.h
+++ b/noncore/settings/aqpkg/settingsimpl.h
@@ -1,28 +1,40 @@
-/***************************************************************************
-                          settingsimpl.h  -  description
-                             -------------------
-    begin                : Thu Aug 29 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
+/*
+                             This file is part of the OPIE Project
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
 
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
+*/
 
 #include "datamgr.h"
 
 #include <qdialog.h>
 
 class QCheckBox;
 class QLineEdit;
 class QListBox;
 
 class SettingsImpl : public QDialog
 {
     Q_OBJECT
diff --git a/noncore/settings/aqpkg/utils.cpp b/noncore/settings/aqpkg/utils.cpp
index 446ce39..00607dd 100644
--- a/noncore/settings/aqpkg/utils.cpp
+++ b/noncore/settings/aqpkg/utils.cpp
@@ -1,45 +1,55 @@
-/***************************************************************************
-                          utils.cpp  -  description
-                             -------------------
-    begin                : Sat Sep 7 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 #include <stdio.h>
 #include <sys/vfs.h>
-//#include <mntent.h>
  
 #include "utils.h"
 #include "global.h"
 
 Utils :: Utils()
 {
 }
 
 Utils :: ~Utils()
 {
 }
 
-
 QString Utils :: getPathfromIpkFilename( const QString &file )
 {
     int p = file.findRev( "/" );
     QString path = "";
     if ( p != -1 )
             path = file.left( p );
 
     return path;
     
 }
 
 QString Utils :: getFilenameFromIpkFilename( const QString &file )
@@ -72,25 +82,24 @@ QString Utils :: getPackageVersionFromIpkFilename( const QString &file )
             name = name.mid( p + 1 );
     p = name.find( "_" ) + 1;
     int p2 = name.find( "_", p );
     QString version = name.mid( p, p2 - p );
     return version;
 }
 
 
 bool Utils :: getStorageSpace( const char *path, long *blockSize, long *totalBlocks, long *availBlocks )
 {
     bool ret = false;
 
-//    qDebug( "Reading from path %s", path );
     struct statfs fs;
     if ( !statfs( path, &fs ) )
     {
         *blockSize = fs.f_bsize;
         *totalBlocks = fs.f_blocks;
         *availBlocks = fs.f_bavail;
         ret = true;
     }
 
     return ret;
 }
 
diff --git a/noncore/settings/aqpkg/utils.h b/noncore/settings/aqpkg/utils.h
index c572f7b..6e5116e 100644
--- a/noncore/settings/aqpkg/utils.h
+++ b/noncore/settings/aqpkg/utils.h
@@ -1,28 +1,40 @@
-/***************************************************************************
-                          utils.h  -  description
-                             -------------------
-    begin                : Sat Sep 7 2002
-    copyright            : (C) 2002 by Andy Qua
-    email                : andy.qua@blueyonder.co.uk
- ***************************************************************************/
+/*
+                             This file is part of the OPIE Project
+                             
+               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
+             .=l.                                Dan Williams <drw@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file 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 file 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 file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
 
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
+*/
 
 #ifndef UTILS_H
 #define UTILS_H
 
 #include <qstring.h>
 
 /**
   *@author Andy Qua
   */
 
 class Utils {
 public: