[pkg-kde-commits] rev 2782 - trunk/packages/kdeutils/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Sat Jan 7 23:42:05 UTC 2006
Author: chrsmrtn
Date: 2006-01-07 23:42:02 +0000 (Sat, 07 Jan 2006)
New Revision: 2782
Added:
trunk/packages/kdeutils/debian/patches/01_kdeutils_branch_r495372.diff
Log:
kdeutils branch pull.
Added: trunk/packages/kdeutils/debian/patches/01_kdeutils_branch_r495372.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/01_kdeutils_branch_r495372.diff 2006-01-07 23:36:53 UTC (rev 2781)
+++ trunk/packages/kdeutils/debian/patches/01_kdeutils_branch_r495372.diff 2006-01-07 23:42:02 UTC (rev 2782)
@@ -0,0 +1,7818 @@
+#DPATCHLEVEL=0
+--- kfloppy/zip.cpp (revision 489522)
++++ kfloppy/zip.cpp (revision 495372)
+@@ -17,7 +17,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kfloppy/zip.h (revision 489522)
++++ kfloppy/zip.h (revision 495372)
+@@ -17,7 +17,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kfloppy/floppy.cpp (revision 489522)
++++ kfloppy/floppy.cpp (revision 495372)
+@@ -17,7 +17,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kfloppy/floppy.h (revision 489522)
++++ kfloppy/floppy.h (revision 495372)
+@@ -17,7 +17,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kfloppy/main.cpp (revision 489522)
++++ kfloppy/main.cpp (revision 495372)
+@@ -18,7 +18,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kfloppy/format.cpp (revision 489522)
++++ kfloppy/format.cpp (revision 495372)
+@@ -16,7 +16,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kfloppy/debug.h (revision 489522)
++++ kfloppy/debug.h (revision 495372)
+@@ -16,8 +16,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program in a file called COPYING; if not, write to
+- the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
++ MA 02110-1301, USA.
+
+ */
+
+--- kfloppy/format.h (revision 489522)
++++ kfloppy/format.h (revision 495372)
+@@ -17,7 +17,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kgpg/kgpg.cpp (revision 489522)
++++ kgpg/kgpg.cpp (revision 495372)
+@@ -575,7 +575,7 @@
+ } else {
+ QString path = KGpgSettings::gpgConfigPath();
+ if (path.isEmpty()) {
+- if (KMessageBox::questionYesNo(0,i18n("<qt>You did not set a path to your GnuPG config file.<br>This may bring some surprising results in KGpg's execution.<br>Would you like to start KGpg's Wizard to fix this problem ?</qt>"),QString::null,i18n("Start Wizard"),i18n("Do Not Start"))==KMessageBox::Yes)
++ if (KMessageBox::questionYesNo(0,i18n("<qt>You have not set a path to your GnuPG config file.<br>This may cause some surprising results in KGpg's execution.<br>Would you like to start KGpg's Wizard to fix this problem?</qt>"),QString::null,i18n("Start Wizard"),i18n("Do Not Start"))==KMessageBox::Yes)
+ startWizard();
+ } else {
+ QStringList groups=KgpgInterface::getGpgGroupNames(path);
+--- kjots/KJotsMain.cpp (revision 489522)
++++ kjots/KJotsMain.cpp (revision 495372)
+@@ -17,7 +17,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ //
+ #include <qheader.h>
+ #include <qwidgetstack.h>
+--- kjots/kjotsedit.cpp (revision 489522)
++++ kjots/kjotsedit.cpp (revision 495372)
+@@ -17,7 +17,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ //
+
+ #include <qpainter.h>
+--- kjots/kjotsbookmarks.cpp (revision 489522)
++++ kjots/kjotsbookmarks.cpp (revision 495372)
+@@ -17,7 +17,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ //
+
+ #include "KJotsMain.h"
+--- kjots/KJotsMain.h (revision 489522)
++++ kjots/KJotsMain.h (revision 495372)
+@@ -17,7 +17,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ //
+
+ #ifndef KJotsMain_included
+--- kjots/kjotsedit.h (revision 489522)
++++ kjots/kjotsedit.h (revision 495372)
+@@ -17,7 +17,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ //
+
+ #ifndef __KJOTSEDIT_H
+--- kjots/kjotsbookmarks.h (revision 489522)
++++ kjots/kjotsbookmarks.h (revision 495372)
+@@ -17,7 +17,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ //
+
+ #ifndef KJOTSBOOKMARKS
+--- kjots/kjotsentry.cpp (revision 489522)
++++ kjots/kjotsentry.cpp (revision 495372)
+@@ -17,7 +17,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ //
+
+ #include <qdir.h>
+--- kjots/kjotsentry.h (revision 489522)
++++ kjots/kjotsentry.h (revision 495372)
+@@ -17,7 +17,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ //
+
+ #ifndef __KJOTSENTRY_H
+--- kjots/main.cpp (revision 489522)
++++ kjots/main.cpp (revision 495372)
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ //
+
+ #ifdef HAVE_CONFIG_H
+--- kjots/icons/README (revision 489522)
++++ kjots/icons/README (revision 495372)
+@@ -18,7 +18,7 @@
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY
+ # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ # License for more details. For a copy of the GNU General Public
+-# License, write to the Free Software Foundation, Inc., 675 Mass
+-# Ave, Cambridge, MA 02139, USA.
++# License, write to the Free Software Foundation, Inc.,
++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+--- ktimer/ktimer.h (revision 489522)
++++ ktimer/ktimer.h (revision 495372)
+@@ -13,7 +13,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef KTIMER_H_INCLUDED
+--- ktimer/main.cpp (revision 489522)
++++ ktimer/main.cpp (revision 495372)
+@@ -13,7 +13,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include <kapplication.h>
+--- ktimer/ktimer.cpp (revision 489522)
++++ ktimer/ktimer.cpp (revision 495372)
+@@ -13,7 +13,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include <qtimer.h>
+--- klaptopdaemon/pcmcia.h (revision 489522)
++++ klaptopdaemon/pcmcia.h (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+--- klaptopdaemon/power.h (revision 489522)
++++ klaptopdaemon/power.h (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+--- klaptopdaemon/buttons.h (revision 489522)
++++ klaptopdaemon/buttons.h (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+--- klaptopdaemon/daemon_state.cpp (revision 489522)
++++ klaptopdaemon/daemon_state.cpp (revision 495372)
+@@ -23,7 +23,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include <stdlib.h>
+--- klaptopdaemon/makecrc.cpp (revision 489522)
++++ klaptopdaemon/makecrc.cpp (revision 495372)
+@@ -17,7 +17,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+--- klaptopdaemon/profile.h (revision 489522)
++++ klaptopdaemon/profile.h (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+--- klaptopdaemon/warning.cpp (revision 489522)
++++ klaptopdaemon/warning.cpp (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "warning.h"
+--- klaptopdaemon/kpcmcia.cpp (revision 489522)
++++ klaptopdaemon/kpcmcia.cpp (revision 495372)
+@@ -14,8 +14,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ */
+
+ /*
+--- klaptopdaemon/daemondock.h (revision 489522)
++++ klaptopdaemon/daemondock.h (revision 495372)
+@@ -20,7 +20,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+--- klaptopdaemon/krichtextlabel.h (revision 489522)
++++ klaptopdaemon/krichtextlabel.h (revision 495372)
+@@ -12,8 +12,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef KRICHTEXTLABEL_H
+--- klaptopdaemon/battery.cpp (revision 489522)
++++ klaptopdaemon/battery.cpp (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ // my headers:
+--- klaptopdaemon/acpi_helper.cpp (revision 489522)
++++ klaptopdaemon/acpi_helper.cpp (revision 495372)
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ //
+--- klaptopdaemon/portable.h (revision 489522)
++++ klaptopdaemon/portable.h (revision 495372)
+@@ -21,7 +21,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ struct power_result {
+--- klaptopdaemon/smapi.h (revision 489522)
++++ klaptopdaemon/smapi.h (revision 495372)
+@@ -21,8 +21,8 @@
+ * GNU General Public License for more details.
+ *
+ * To receive a copy of the GNU General Public License, please write
+- * to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+- * Boston, MA 02111-1307 USA
++ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301 USA
+ *
+ ********************************************************************/
+
+--- klaptopdaemon/acpi.h (revision 489522)
++++ klaptopdaemon/acpi.h (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+--- klaptopdaemon/apm.h (revision 489522)
++++ klaptopdaemon/apm.h (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+--- klaptopdaemon/kpcmciainfo.cpp (revision 489522)
++++ klaptopdaemon/kpcmciainfo.cpp (revision 495372)
+@@ -15,8 +15,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ */
+
+
+--- klaptopdaemon/main.cpp (revision 489522)
++++ klaptopdaemon/main.cpp (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+--- klaptopdaemon/laptop_daemon.h (revision 489522)
++++ klaptopdaemon/laptop_daemon.h (revision 495372)
+@@ -20,7 +20,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "daemon_state.h"
+--- klaptopdaemon/sony.cpp (revision 489522)
++++ klaptopdaemon/sony.cpp (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ // my headers:
+--- klaptopdaemon/smapibios.h (revision 489522)
++++ klaptopdaemon/smapibios.h (revision 495372)
+@@ -21,8 +21,8 @@
+ * GNU General Public License for more details.
+ *
+ * To receive a copy of the GNU General Public License, please write
+- * to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+- * Boston, MA 02111-1307 USA
++ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301 USA
+ *
+ ********************************************************************/
+
+--- klaptopdaemon/pcmcia.cpp (revision 489522)
++++ klaptopdaemon/pcmcia.cpp (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include <sys/types.h>
+--- klaptopdaemon/power.cpp (revision 489522)
++++ klaptopdaemon/power.cpp (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "power.h"
+--- klaptopdaemon/buttons.cpp (revision 489522)
++++ klaptopdaemon/buttons.cpp (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "buttons.h"
+--- klaptopdaemon/profile.cpp (revision 489522)
++++ klaptopdaemon/profile.cpp (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ // my headers:
+--- klaptopdaemon/daemondock.cpp (revision 489522)
++++ klaptopdaemon/daemondock.cpp (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include <stdio.h>
+--- klaptopdaemon/krichtextlabel.cpp (revision 489522)
++++ klaptopdaemon/krichtextlabel.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include "krichtextlabel.h"
+--- klaptopdaemon/wake_laptop.cpp (revision 489522)
++++ klaptopdaemon/wake_laptop.cpp (revision 495372)
+@@ -17,7 +17,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include <kprocess.h>
+--- klaptopdaemon/daemon_state.h (revision 489522)
++++ klaptopdaemon/daemon_state.h (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+--- klaptopdaemon/portable.cpp (revision 489522)
++++ klaptopdaemon/portable.cpp (revision 495372)
+@@ -20,7 +20,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ //
+--- klaptopdaemon/smapidev.c (revision 489522)
++++ klaptopdaemon/smapidev.c (revision 495372)
+@@ -22,8 +22,8 @@
+ * GNU General Public License for more details.
+ *
+ * To receive a copy of the GNU General Public License, please write
+- * to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+- * Boston, MA 02111-1307 USA
++ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301 USA
+ *
+ ********************************************************************/
+
+--- klaptopdaemon/checkcrc.h (revision 489522)
++++ klaptopdaemon/checkcrc.h (revision 495372)
+@@ -17,7 +17,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef _CHECKCRC_H_
+--- klaptopdaemon/warning.h (revision 489522)
++++ klaptopdaemon/warning.h (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+--- klaptopdaemon/kpcmcia.h (revision 489522)
++++ klaptopdaemon/kpcmcia.h (revision 495372)
+@@ -14,8 +14,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ */
+
+
+--- klaptopdaemon/acpi.cpp (revision 489522)
++++ klaptopdaemon/acpi.cpp (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ // my headers:
+--- klaptopdaemon/apm.cpp (revision 489522)
++++ klaptopdaemon/apm.cpp (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ // my headers:
+--- klaptopdaemon/smapidev.h (revision 489522)
++++ klaptopdaemon/smapidev.h (revision 495372)
+@@ -21,8 +21,8 @@
+ * GNU General Public License for more details.
+ *
+ * To receive a copy of the GNU General Public License, please write
+- * to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+- * Boston, MA 02111-1307 USA
++ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301 USA
+ *
+ ********************************************************************/
+
+--- klaptopdaemon/battery.h (revision 489522)
++++ klaptopdaemon/battery.h (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+--- klaptopdaemon/thinkpad_common.h (revision 489522)
++++ klaptopdaemon/thinkpad_common.h (revision 495372)
+@@ -22,8 +22,8 @@
+ * GNU General Public License for more details.
+ *
+ * To receive a copy of the GNU General Public License, please write
+- * to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+- * Boston, MA 02111-1307 USA
++ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301 USA
+ *
+ ********************************************************************/
+
+--- klaptopdaemon/laptop_daemon.cpp (revision 489522)
++++ klaptopdaemon/laptop_daemon.cpp (revision 495372)
+@@ -23,7 +23,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include <stdlib.h>
+@@ -855,7 +855,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- klaptopdaemon/kpcmciainfo.h (revision 489522)
++++ klaptopdaemon/kpcmciainfo.h (revision 495372)
+@@ -15,8 +15,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ */
+
+
+--- klaptopdaemon/main.h (revision 489522)
++++ klaptopdaemon/main.h (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+--- klaptopdaemon/version.h (revision 489522)
++++ klaptopdaemon/version.h (revision 495372)
+@@ -13,7 +13,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #define LAPTOP_VERSION "1.4"
+--- klaptopdaemon/laptop_check.cpp (revision 489522)
++++ klaptopdaemon/laptop_check.cpp (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+--- klaptopdaemon/sony.h (revision 489522)
++++ klaptopdaemon/sony.h (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+--- kedit/kedit.cpp (revision 489522)
++++ kedit/kedit.cpp (revision 495372)
+@@ -17,7 +17,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kedit/kedit.h (revision 489522)
++++ kedit/kedit.h (revision 495372)
+@@ -17,7 +17,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kedit/ktextfiledlg.cpp (revision 489522)
++++ kedit/ktextfiledlg.cpp (revision 495372)
+@@ -14,8 +14,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include <qlabel.h>
+--- kedit/ktextfiledlg.h (revision 489522)
++++ kedit/ktextfiledlg.h (revision 495372)
+@@ -14,8 +14,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef __KTEXTFILEDLG_H__
+--- ksim/ksimview.cpp (revision 489522)
++++ ksim/ksimview.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "ksimview.h"
+--- ksim/systeminfo.cpp (revision 489522)
++++ ksim/systeminfo.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifdef HAVE_CONFIG_H
+--- ksim/themeprefs.h (revision 489522)
++++ ksim/themeprefs.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef THEMEIMPL_H
+--- ksim/ksim.h (revision 489522)
++++ ksim/ksim.h (revision 495372)
+@@ -14,8 +14,8 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #ifndef KSIMEXTENSION_H
+--- ksim/generalprefs.cpp (revision 489522)
++++ ksim/generalprefs.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "generalprefs.h"
+--- ksim/ksimframe.cpp (revision 489522)
++++ ksim/ksimframe.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "ksimframe.h"
+--- ksim/library/ksimconfig.h (revision 489522)
++++ ksim/library/ksimconfig.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef KSIMCONFIG_H
+--- ksim/library/themeloader.h (revision 489522)
++++ ksim/library/themeloader.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef THEMELOADER_H
+--- ksim/library/chart.cpp (revision 489522)
++++ ksim/library/chart.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "chart.h"
+--- ksim/library/pluginmodule.cpp (revision 489522)
++++ ksim/library/pluginmodule.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "pluginmodule.h"
+--- ksim/library/led.cpp (revision 489522)
++++ ksim/library/led.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "led.h"
+--- ksim/library/progress.cpp (revision 489522)
++++ ksim/library/progress.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "progress.h"
+--- ksim/library/chart.h (revision 489522)
++++ ksim/library/chart.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef KSIM__CHART_H
+--- ksim/library/led.h (revision 489522)
++++ ksim/library/led.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef KSIM__LED_H
+--- ksim/library/pluginmodule.h (revision 489522)
++++ ksim/library/pluginmodule.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef PLUGINMODULE_H
+--- ksim/library/progress.h (revision 489522)
++++ ksim/library/progress.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef KSIM__PROGRESS_H
+--- ksim/library/pluginglobal.cpp (revision 489522)
++++ ksim/library/pluginglobal.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "pluginglobal.h"
+--- ksim/library/label.cpp (revision 489522)
++++ ksim/library/label.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "label.h"
+--- ksim/library/pluginglobal.h (revision 489522)
++++ ksim/library/pluginglobal.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef PLUGINGLOBAL_H
+--- ksim/library/label.h (revision 489522)
++++ ksim/library/label.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef KSIM__LABEL_H
+--- ksim/library/pluginloader.cpp (revision 489522)
++++ ksim/library/pluginloader.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "pluginloader.h"
+--- ksim/library/common.cpp (revision 489522)
++++ ksim/library/common.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "common.h"
+--- ksim/library/ksimconfig.cpp (revision 489522)
++++ ksim/library/ksimconfig.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include <kstandarddirs.h>
+--- ksim/library/themeloader.cpp (revision 489522)
++++ ksim/library/themeloader.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "themeloader.h"
+--- ksim/library/pluginloader.h (revision 489522)
++++ ksim/library/pluginloader.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef PLUGINLOADER_H
+--- ksim/library/themetypes.h (revision 489522)
++++ ksim/library/themetypes.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef THEMETYPES_H
+--- ksim/library/common.h (revision 489522)
++++ ksim/library/common.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef KSIM__COMMON_H
+--- ksim/ksimsysinfo.h (revision 489522)
++++ ksim/ksimsysinfo.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef SYSINFO_H
+--- ksim/ksimpref.h (revision 489522)
++++ ksim/ksimpref.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef KSIMPREF_H
+--- ksim/COPYING (revision 489522)
++++ ksim/COPYING (revision 495372)
+@@ -2,7 +2,7 @@
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+@@ -305,7 +305,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+ Also add information on how to contact you by electronic and paper mail.
+--- ksim/monitors/mail/ksimmail.cpp (revision 489522)
++++ ksim/monitors/mail/ksimmail.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ // $Id$
+--- ksim/monitors/mail/ksimmail.h (revision 489522)
++++ ksim/monitors/mail/ksimmail.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ // $Id$
+--- ksim/monitors/filesystem/ksimfsystem.cpp (revision 489522)
++++ ksim/monitors/filesystem/ksimfsystem.cpp (revision 495372)
+@@ -16,7 +16,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include <config.h>
+--- ksim/monitors/filesystem/fsystemconfig.cpp (revision 489522)
++++ ksim/monitors/filesystem/fsystemconfig.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "fsystemconfig.h"
+--- ksim/monitors/filesystem/filesystemstats.cpp (revision 489522)
++++ ksim/monitors/filesystem/filesystemstats.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "filesystemstats.h"
+--- ksim/monitors/filesystem/ksimfsystem.h (revision 489522)
++++ ksim/monitors/filesystem/ksimfsystem.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef FSYSTEM_H
+--- ksim/monitors/filesystem/fsystemconfig.h (revision 489522)
++++ ksim/monitors/filesystem/fsystemconfig.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef FSYSTEMCONFIG_H
+--- ksim/monitors/filesystem/fsystemiface.h (revision 489522)
++++ ksim/monitors/filesystem/fsystemiface.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef FSYSTEMIFACE_H
+--- ksim/monitors/filesystem/filesystemstats.h (revision 489522)
++++ ksim/monitors/filesystem/filesystemstats.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef FILESYSTEMSTATS_H
+--- ksim/monitors/filesystem/filesystemwidget.cpp (revision 489522)
++++ ksim/monitors/filesystem/filesystemwidget.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "filesystemwidget.h"
+--- ksim/monitors/filesystem/filesystemwidget.h (revision 489522)
++++ ksim/monitors/filesystem/filesystemwidget.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef FSYSTEM_WIDGET_H
+--- ksim/monitors/lm_sensors/ksimsensors.cpp (revision 489522)
++++ ksim/monitors/lm_sensors/ksimsensors.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "ksimsensors.h"
+--- ksim/monitors/lm_sensors/sensorsconfig.cpp (revision 489522)
++++ ksim/monitors/lm_sensors/sensorsconfig.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "sensorsconfig.h"
+--- ksim/monitors/lm_sensors/sensorbase.cpp (revision 489522)
++++ ksim/monitors/lm_sensors/sensorbase.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "sensorbase.h"
+--- ksim/monitors/lm_sensors/ksimsensors.h (revision 489522)
++++ ksim/monitors/lm_sensors/ksimsensors.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef SENSORS_H
+--- ksim/monitors/lm_sensors/sensorsconfig.h (revision 489522)
++++ ksim/monitors/lm_sensors/sensorsconfig.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef SENSORSIMPL_H
+--- ksim/monitors/lm_sensors/NVCtrl.c (revision 489522)
++++ ksim/monitors/lm_sensors/NVCtrl.c (revision 495372)
+@@ -14,8 +14,8 @@
+ * along with this program; if not, write to the:
+ *
+ * Free Software Foundation, Inc.
+- * 59 Temple Place - Suite 330
+- * Boston, MA 02111-1307, USA
++ * 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA
+ *
+ */
+
+--- ksim/monitors/lm_sensors/nv_control.h (revision 489522)
++++ ksim/monitors/lm_sensors/nv_control.h (revision 495372)
+@@ -14,8 +14,8 @@
+ * along with this program; if not, write to the:
+ *
+ * Free Software Foundation, Inc.
+- * 59 Temple Place - Suite 330
+- * Boston, MA 02111-1307, USA
++ * 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA
+ *
+ */
+
+--- ksim/monitors/lm_sensors/sensorbase.h (revision 489522)
++++ ksim/monitors/lm_sensors/sensorbase.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef SENSORBASE_H
+--- ksim/monitors/lm_sensors/NVCtrl.h (revision 489522)
++++ ksim/monitors/lm_sensors/NVCtrl.h (revision 495372)
+@@ -14,8 +14,8 @@
+ * along with this program; if not, write to the:
+ *
+ * Free Software Foundation, Inc.
+- * 59 Temple Place - Suite 330
+- * Boston, MA 02111-1307, USA
++ * 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA
+ *
+ */
+
+--- ksim/monitors/lm_sensors/ksimsensorsiface.h (revision 489522)
++++ ksim/monitors/lm_sensors/ksimsensorsiface.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef KSIMSENSORSIFACE_H
+--- ksim/monitors/net/netdevices.h (revision 489522)
++++ ksim/monitors/net/netdevices.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef NETDEVICES_H
+--- ksim/monitors/net/ksimnet.h (revision 489522)
++++ ksim/monitors/net/ksimnet.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef KSIMNET_H
+--- ksim/monitors/net/netconfig.h (revision 489522)
++++ ksim/monitors/net/netconfig.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef NETCONFIG_H
+--- ksim/monitors/net/netdialog.cpp (revision 489522)
++++ ksim/monitors/net/netdialog.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "netdialog.h"
+--- ksim/monitors/net/ksimnet.cpp (revision 489522)
++++ ksim/monitors/net/ksimnet.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include <time.h>
+--- ksim/monitors/net/netdialog.h (revision 489522)
++++ ksim/monitors/net/netdialog.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef NETDIALOG_H
+--- ksim/monitors/net/netconfig.cpp (revision 489522)
++++ ksim/monitors/net/netconfig.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include <qpushbutton.h>
+--- ksim/monitors/cpu/ksimcpu.h (revision 489522)
++++ ksim/monitors/cpu/ksimcpu.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef KSIMCPU_H
+--- ksim/monitors/cpu/ksimcpu.cpp (revision 489522)
++++ ksim/monitors/cpu/ksimcpu.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "ksimcpu.h"
+--- ksim/monitors/disk/ksimdisk.cpp (revision 489522)
++++ ksim/monitors/disk/ksimdisk.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "ksimdisk.h"
+--- ksim/monitors/disk/ksimdisk.h (revision 489522)
++++ ksim/monitors/disk/ksimdisk.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef KSIMDISK_H
+--- ksim/monitors/i8k/ksimi8k.cpp (revision 489522)
++++ ksim/monitors/i8k/ksimi8k.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "ksimi8k.h"
+--- ksim/monitors/i8k/ksimi8k.h (revision 489522)
++++ ksim/monitors/i8k/ksimi8k.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef KSIMI8K_H
+--- ksim/monitors/snmp/plugin.cpp (revision 489522)
++++ ksim/monitors/snmp/plugin.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include "plugin.h"
+--- ksim/monitors/snmp/snmp_p.h (revision 489522)
++++ ksim/monitors/snmp/snmp_p.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef SNMP_P_H
+--- ksim/monitors/snmp/hostconfig.cpp (revision 489522)
++++ ksim/monitors/snmp/hostconfig.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include "hostconfig.h"
+--- ksim/monitors/snmp/snmplib.cpp (revision 489522)
++++ ksim/monitors/snmp/snmplib.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include "config.h"
+--- ksim/monitors/snmp/monitordialog.cpp (revision 489522)
++++ ksim/monitors/snmp/monitordialog.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include "monitordialog.h"
+--- ksim/monitors/snmp/configpage.h (revision 489522)
++++ ksim/monitors/snmp/configpage.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef CONFIGPAGE_H
+--- ksim/monitors/snmp/view.cpp (revision 489522)
++++ ksim/monitors/snmp/view.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include "view.h"
+--- ksim/monitors/snmp/value.cpp (revision 489522)
++++ ksim/monitors/snmp/value.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include "config.h"
+--- ksim/monitors/snmp/monitorconfig.cpp (revision 489522)
++++ ksim/monitors/snmp/monitorconfig.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include "monitorconfig.h"
+--- ksim/monitors/snmp/chartmonitor.h (revision 489522)
++++ ksim/monitors/snmp/chartmonitor.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+ #ifndef CHARTMONITOR_H
+ #define CHARTMONITOR_H
+--- ksim/monitors/snmp/snmp.h (revision 489522)
++++ ksim/monitors/snmp/snmp.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef KSIM_SNMP_H
+--- ksim/monitors/snmp/session.cpp (revision 489522)
++++ ksim/monitors/snmp/session.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include "config.h"
+--- ksim/monitors/snmp/browsedialog.h (revision 489522)
++++ ksim/monitors/snmp/browsedialog.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef BROWSEDIALOG_H
+--- ksim/monitors/snmp/monitor.cpp (revision 489522)
++++ ksim/monitors/snmp/monitor.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include "monitor.h"
+--- ksim/monitors/snmp/labelmonitor.cpp (revision 489522)
++++ ksim/monitors/snmp/labelmonitor.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include "labelmonitor.h"
+--- ksim/monitors/snmp/identifier.h (revision 489522)
++++ ksim/monitors/snmp/identifier.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef IDENTIFIER_H
+--- ksim/monitors/snmp/walker.h (revision 489522)
++++ ksim/monitors/snmp/walker.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef WALKER_H
+--- ksim/monitors/snmp/proberesultdialog.h (revision 489522)
++++ ksim/monitors/snmp/proberesultdialog.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef PROBERESULTDIALOG_H
+--- ksim/monitors/snmp/probedialog.h (revision 489522)
++++ ksim/monitors/snmp/probedialog.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef PROBEDIALOG_H
+--- ksim/monitors/snmp/pdu.h (revision 489522)
++++ ksim/monitors/snmp/pdu.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef PDU_H
+--- ksim/monitors/snmp/value_p.h (revision 489522)
++++ ksim/monitors/snmp/value_p.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef VALUE_P_H
+--- ksim/monitors/snmp/configpage.cpp (revision 489522)
++++ ksim/monitors/snmp/configpage.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include "configpage.h"
+--- ksim/monitors/snmp/hostdialog.h (revision 489522)
++++ ksim/monitors/snmp/hostdialog.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef HOSTDIALOG_H
+--- ksim/monitors/snmp/plugin.h (revision 489522)
++++ ksim/monitors/snmp/plugin.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef KSIM_PLUGIN_H
+--- ksim/monitors/snmp/hostconfig.h (revision 489522)
++++ ksim/monitors/snmp/hostconfig.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef HOSTCONFIG_H
+--- ksim/monitors/snmp/chartmonitor.cpp (revision 489522)
++++ ksim/monitors/snmp/chartmonitor.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+ #include "chartmonitor.h"
+
+--- ksim/monitors/snmp/snmplib.h (revision 489522)
++++ ksim/monitors/snmp/snmplib.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef SNMPLIB_H
+--- ksim/monitors/snmp/monitordialog.h (revision 489522)
++++ ksim/monitors/snmp/monitordialog.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef MONITORDIALOG_H
+--- ksim/monitors/snmp/snmp.cpp (revision 489522)
++++ ksim/monitors/snmp/snmp.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include "config.h"
+--- ksim/monitors/snmp/view.h (revision 489522)
++++ ksim/monitors/snmp/view.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef VIEW_H
+--- ksim/monitors/snmp/browsedialog.cpp (revision 489522)
++++ ksim/monitors/snmp/browsedialog.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include "browsedialog.h"
+--- ksim/monitors/snmp/value.h (revision 489522)
++++ ksim/monitors/snmp/value.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef VALUE_H
+--- ksim/monitors/snmp/monitorconfig.h (revision 489522)
++++ ksim/monitors/snmp/monitorconfig.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef MONITORCONFIG_H
+--- ksim/monitors/snmp/identifier.cpp (revision 489522)
++++ ksim/monitors/snmp/identifier.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include "identifier.h"
+--- ksim/monitors/snmp/walker.cpp (revision 489522)
++++ ksim/monitors/snmp/walker.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include "walker.h"
+--- ksim/monitors/snmp/proberesultdialog.cpp (revision 489522)
++++ ksim/monitors/snmp/proberesultdialog.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include "proberesultdialog.h"
+--- ksim/monitors/snmp/probedialog.cpp (revision 489522)
++++ ksim/monitors/snmp/probedialog.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include "probedialog.h"
+--- ksim/monitors/snmp/pdu.cpp (revision 489522)
++++ ksim/monitors/snmp/pdu.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include "config.h"
+--- ksim/monitors/snmp/session.h (revision 489522)
++++ ksim/monitors/snmp/session.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef SESSION_H
+--- ksim/monitors/snmp/monitor.h (revision 489522)
++++ ksim/monitors/snmp/monitor.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef MONITOR_H
+--- ksim/monitors/snmp/labelmonitor.h (revision 489522)
++++ ksim/monitors/snmp/labelmonitor.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef LABELMONITOR_H
+--- ksim/monitors/snmp/hostdialog.cpp (revision 489522)
++++ ksim/monitors/snmp/hostdialog.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include "hostdialog.h"
+--- ksim/monitorprefs.h (revision 489522)
++++ ksim/monitorprefs.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef MONITORPREFS_H
+--- ksim/themeprefs.cpp (revision 489522)
++++ ksim/themeprefs.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "themeprefs.h"
+--- ksim/ksimview.h (revision 489522)
++++ ksim/ksimview.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef KSIMVIEW_H
+--- ksim/ksim.cpp (revision 489522)
++++ ksim/ksim.cpp (revision 495372)
+@@ -14,8 +14,8 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
+ */
+
+ #include "ksim.h"
+--- ksim/systeminfo.h (revision 489522)
++++ ksim/systeminfo.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef SYSTEMINFO_H
+--- ksim/baselist.h (revision 489522)
++++ ksim/baselist.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef BASELIST_H
+--- ksim/ksimsysinfo.cpp (revision 489522)
++++ ksim/ksimsysinfo.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include <qtooltip.h>
+--- ksim/ksimpref.cpp (revision 489522)
++++ ksim/ksimpref.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "ksimpref.h"
+--- ksim/generalprefs.h (revision 489522)
++++ ksim/generalprefs.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef GENERAL_H
+--- ksim/ksimframe.h (revision 489522)
++++ ksim/ksimframe.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef KSIMFRAME_H
+--- ksim/monitorprefs.cpp (revision 489522)
++++ ksim/monitorprefs.cpp (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include "monitorprefs.h"
+--- kwallet/kwalletmanager.h (revision 489522)
++++ kwallet/kwalletmanager.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef KWALLETMANAGER_H
+--- kwallet/kwalleteditor.cpp (revision 489522)
++++ kwallet/kwalleteditor.cpp (revision 495372)
+@@ -14,8 +14,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+
+--- kwallet/main.cpp (revision 489522)
++++ kwallet/main.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include <kaboutdata.h>
+--- kwallet/kwalletpopup.cpp (revision 489522)
++++ kwallet/kwalletpopup.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+
+--- kwallet/allyourbase.h (revision 489522)
++++ kwallet/allyourbase.h (revision 495372)
+@@ -14,8 +14,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef ALLYOURBASE_H
+--- kwallet/kwalletmanager-kwalletd.desktop (revision 489522)
++++ kwallet/kwalletmanager-kwalletd.desktop (revision 495372)
+@@ -25,6 +25,7 @@
+ Name[lt]=Spatažodinių tvarkymo įrankis
+ Name[mk]=Ðлатка за менаџирање на паричници
+ Name[nb]=Wallet administrasjonsverktøy
++Name[nds]=Knippenpleger
+ Name[nl]=Portefeuillebeheer
+ Name[nn]=Wallet-administrasjonsverktøy
+ Name[pa]=ਵਾਲਿਟ ਪਰਬੰਧਨ ਸੰਦ
+--- kwallet/kwmapeditor.h (revision 489522)
++++ kwallet/kwmapeditor.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef KWMAPEDITOR_H
+--- kwallet/kwalletmanager.cpp (revision 489522)
++++ kwallet/kwalletmanager.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+
+--- kwallet/kwalleteditor.h (revision 489522)
++++ kwallet/kwalleteditor.h (revision 495372)
+@@ -14,8 +14,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef KWALLETEDITOR_H
+--- kwallet/allyourbase.cpp (revision 489522)
++++ kwallet/allyourbase.cpp (revision 495372)
+@@ -14,8 +14,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include "allyourbase.h"
+--- kwallet/kwalletmanager.desktop (revision 489522)
++++ kwallet/kwalletmanager.desktop (revision 495372)
+@@ -25,6 +25,7 @@
+ Name[lt]=Spatažodinių tvarkymo įrankis
+ Name[mk]=Ðлатка за менаџирање на паричници
+ Name[nb]=Wallet administrasjonsverktøy
++Name[nds]=Knippenpleger
+ Name[nl]=Portefeuillebeheer
+ Name[nn]=Wallet-administrasjonsverktøy
+ Name[pa]=ਵਾਲਿਟ ਪਰਬੰਧਨ ਸੰਦ
+--- kwallet/kwmapeditor.cpp (revision 489522)
++++ kwallet/kwmapeditor.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include "kwmapeditor.h"
+--- kwallet/konfigurator/konfigurator.h (revision 489522)
++++ kwallet/konfigurator/konfigurator.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef _KWALLETKONFIGURATOR_H
+--- kwallet/konfigurator/kwallet_config.desktop (revision 489522)
++++ kwallet/konfigurator/kwallet_config.desktop (revision 495372)
+@@ -26,6 +26,7 @@
+ Name[ja]=KDE ウォレット
+ Name[lt]=KDE slaptažodinės
+ Name[mk]=KDE Паричник
++Name[nds]=KDE-Knipp
+ Name[pa]=KDE ਵਾਲਿਟ
+ Name[pl]=Portfel KDE
+ Name[pt]=Carteira KDE
+--- kwallet/konfigurator/kwalletconfig.desktop (revision 489522)
++++ kwallet/konfigurator/kwalletconfig.desktop (revision 495372)
+@@ -30,6 +30,7 @@
+ Name[ja]=KDE ウォレット
+ Name[lt]=KDE slaptažodinės
+ Name[mk]=KDE Паричник
++Name[nds]=KDE-Knipp
+ Name[pa]=KDE ਵਾਲਿਟ
+ Name[pl]=Portfel KDE
+ Name[pt]=Carteira KDE
+@@ -67,6 +68,7 @@
+ Comment[lt]=KDE slaptažodinių konfigūravimas
+ Comment[mk]=Конфигурација на паричник во KDE
+ Comment[nb]=Konfigurasjon av KDE Wallet
++Comment[nds]=Inrichten vun KDE-Knippen
+ Comment[nl]=KDE portefeuille-instellingen
+ Comment[nn]=Oppsett av KDE Wallet
+ Comment[pa]=KDE ਵਾਲਿਟ ਸੰਰਚਨਾ
+@@ -107,6 +109,7 @@
+ Keywords[lt]=Wallet, slaptažodinė,Form Fill,Passwords,Form Data,formų pildymas,slaptažodžiai,formų duomenys
+ Keywords[mk]=Wallet,Form Fill,Passwords,Form Data, Паричник, формулар, лозинки
+ Keywords[nb]=Wallet,Skjemautfylling,Passord,Skjema
++Keywords[nds]=Knipp,Formulor,Passwöör,Formulordaten
+ Keywords[nl]=Wallet,gegevens,portefeuille,wachtwoorden,veilig bewaren van wachtwoorden,invulgegevens,formulieren
+ Keywords[nn]=wallet,skjemautfylling,passord,skjema
+ Keywords[pa]=Wallet,Form Fill,ਗà©à¨ªà¨¤-ਕੋਡ,ਫਾਰਮ ਡਾਟਾ
+--- kwallet/konfigurator/kwalletmanager_show.desktop (revision 489522)
++++ kwallet/konfigurator/kwalletmanager_show.desktop (revision 495372)
+@@ -25,6 +25,7 @@
+ Name[lt]=Spatažodinių tvarkymo įrankis
+ Name[mk]=Ðлатка за менаџирање на паричници
+ Name[nb]=Wallet administrasjonsverktøy
++Name[nds]=Knippenpleger
+ Name[nl]=Portefeuillebeheer
+ Name[nn]=Wallet-administrasjonsverktøy
+ Name[pa]=ਵਾਲਿਟ ਪਰਬੰਧਨ ਸੰਦ
+--- kwallet/konfigurator/konfigurator.cpp (revision 489522)
++++ kwallet/konfigurator/konfigurator.cpp (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include "konfigurator.h"
+--- kwallet/kwalletpopup.h (revision 489522)
++++ kwallet/kwalletpopup.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef KWALLETPOPUP_H
+--- kdf/kdfconfig.h (revision 489522)
++++ kdf/kdfconfig.h (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+--- kdf/kconftest.cpp (revision 489522)
++++ kdf/kconftest.cpp (revision 495372)
+@@ -17,8 +17,8 @@
+ **
+ ** You should have received a copy of the GNU General Public License
+ ** along with this program in a file called COPYING; if not, write to
+-** the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+-** MA 02111-1307, USA.
++** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
++** MA 02110-1301, USA.
+ */
+
+ /*
+--- kdf/kdf.cpp (revision 489522)
++++ kdf/kdf.cpp (revision 495372)
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- kdf/listview.cpp (revision 489522)
++++ kdf/listview.cpp (revision 495372)
+@@ -13,7 +13,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- kdf/kdfwidget.cpp (revision 489522)
++++ kdf/kdfwidget.cpp (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ //
+--- kdf/kdf.h (revision 489522)
++++ kdf/kdf.h (revision 495372)
+@@ -15,7 +15,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kdf/listview.h (revision 489522)
++++ kdf/listview.h (revision 495372)
+@@ -13,7 +13,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- kdf/disks.cpp (revision 489522)
++++ kdf/disks.cpp (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include <qfileinfo.h>
+--- kdf/kdfwidget.h (revision 489522)
++++ kdf/kdfwidget.h (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+--- kdf/kwikdisk.cpp (revision 489522)
++++ kdf/kwikdisk.cpp (revision 495372)
+@@ -15,7 +15,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kdf/disks.h (revision 489522)
++++ kdf/disks.h (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+--- kdf/stdoption.cpp (revision 489522)
++++ kdf/stdoption.cpp (revision 495372)
+@@ -17,8 +17,8 @@
+ **
+ ** You should have received a copy of the GNU General Public License
+ ** along with this program in a file called COPYING; if not, write to
+-** the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+-** MA 02111-1307, USA.
++** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
++** MA 02110-1301, USA.
+ */
+
+ /*
+--- kdf/kcmdf.cpp (revision 489522)
++++ kdf/kcmdf.cpp (revision 495372)
+@@ -15,7 +15,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kdf/mntconfig.cpp (revision 489522)
++++ kdf/mntconfig.cpp (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+--- kdf/kwikdisk.h (revision 489522)
++++ kdf/kwikdisk.h (revision 495372)
+@@ -15,7 +15,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kdf/disklist.cpp (revision 489522)
++++ kdf/disklist.cpp (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+ #include <config.h>
+--- kdf/optiondialog.cpp (revision 489522)
++++ kdf/optiondialog.cpp (revision 495372)
+@@ -13,7 +13,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- kdf/stdoption.h (revision 489522)
++++ kdf/stdoption.h (revision 495372)
+@@ -17,8 +17,8 @@
+ **
+ ** You should have received a copy of the GNU General Public License
+ ** along with this program in a file called COPYING; if not, write to
+-** the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+-** MA 02111-1307, USA.
++** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
++** MA 02110-1301, USA.
+ */
+
+ /*
+--- kdf/kcmdf.h (revision 489522)
++++ kdf/kcmdf.h (revision 495372)
+@@ -15,7 +15,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kdf/mntconfig.h (revision 489522)
++++ kdf/mntconfig.h (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+--- kdf/kdfconfig.cpp (revision 489522)
++++ kdf/kdfconfig.cpp (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+--- kdf/disklist.h (revision 489522)
++++ kdf/disklist.h (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+
+--- kdf/optiondialog.h (revision 489522)
++++ kdf/optiondialog.h (revision 495372)
+@@ -13,7 +13,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/dialog.cc (revision 489522)
++++ khexedit/dialog.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/exportdialog.cc (revision 489522)
++++ khexedit/exportdialog.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/dialog.h (revision 489522)
++++ khexedit/dialog.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/parts/kbytesedit/kbyteseditwidget.desktop (revision 489522)
++++ khexedit/parts/kbytesedit/kbyteseditwidget.desktop (revision 495372)
+@@ -8,7 +8,7 @@
+ Name[ca]=Estri BytesEdit
+ Name[cy]=Celfigyn GolyguBeit
+ Name[de]=BytesEdit-Bedienelement
+-Name[el]=ΓÏαφικό πεÏιβάλλον επεξεÏγασίας byte
++Name[el]=ΓÏαφικό συστατικό BytesEdit
+ Name[es]=Ventana de edición de bytes
+ Name[et]=Baitide redigeerimise komponent
+ Name[eu]=Byteak Editatzeko Widget-a
+--- khexedit/chartabledialog.h (revision 489522)
++++ khexedit/chartabledialog.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/draglabel.cc (revision 489522)
++++ khexedit/draglabel.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/hexdrag.cc (revision 489522)
++++ khexedit/hexdrag.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/main.cc (revision 489522)
++++ khexedit/main.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/stringdialog.cc (revision 489522)
++++ khexedit/stringdialog.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/converterdialog.cc (revision 489522)
++++ khexedit/converterdialog.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/conversion.h (revision 489522)
++++ khexedit/conversion.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/hexprinter.cc (revision 489522)
++++ khexedit/hexprinter.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/converterdialog.h (revision 489522)
++++ khexedit/converterdialog.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/toplevel.cc (revision 489522)
++++ khexedit/toplevel.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/searchbar.cc (revision 489522)
++++ khexedit/searchbar.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/optiondialog.h (revision 489522)
++++ khexedit/optiondialog.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/hexvalidator.h (revision 489522)
++++ khexedit/hexvalidator.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/statusbarprogress.cc (revision 489522)
++++ khexedit/statusbarprogress.cc (revision 495372)
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/hexeditstate.h (revision 489522)
++++ khexedit/hexeditstate.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/hexeditorwidget.cc (revision 489522)
++++ khexedit/hexeditorwidget.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/hexeditorwidget.h (revision 489522)
++++ khexedit/hexeditorwidget.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/listview.cc (revision 489522)
++++ khexedit/listview.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/hexclipboard.h (revision 489522)
++++ khexedit/hexclipboard.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/printdialogpage.cc (revision 489522)
++++ khexedit/printdialogpage.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/hexbuffer.cc (revision 489522)
++++ khexedit/hexbuffer.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/bitswapwidget.h (revision 489522)
++++ khexedit/bitswapwidget.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/hexdrag.h (revision 489522)
++++ khexedit/hexdrag.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/hextoolwidget.cc (revision 489522)
++++ khexedit/hextoolwidget.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/version.h (revision 489522)
++++ khexedit/version.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/stringdialog.h (revision 489522)
++++ khexedit/stringdialog.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/optiondialog.cc (revision 489522)
++++ khexedit/optiondialog.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/toplevel.h (revision 489522)
++++ khexedit/toplevel.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/searchbar.h (revision 489522)
++++ khexedit/searchbar.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+ #ifndef _SEARCHBAR_H_
+--- khexedit/hexerror.cc (revision 489522)
++++ khexedit/hexerror.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/exportdialog.h (revision 489522)
++++ khexedit/exportdialog.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/hexclipboard.cc (revision 489522)
++++ khexedit/hexclipboard.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/chartabledialog.cc (revision 489522)
++++ khexedit/chartabledialog.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/progress.h (revision 489522)
++++ khexedit/progress.h (revision 495372)
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/listview.h (revision 489522)
++++ khexedit/listview.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/draglabel.h (revision 489522)
++++ khexedit/draglabel.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/hexbuffer.h (revision 489522)
++++ khexedit/hexbuffer.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/hexviewwidget.cc (revision 489522)
++++ khexedit/hexviewwidget.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/hexmanagerwidget.cc (revision 489522)
++++ khexedit/hexmanagerwidget.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/hexviewwidget.h (revision 489522)
++++ khexedit/hexviewwidget.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/conversion.cc (revision 489522)
++++ khexedit/conversion.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/hexmanagerwidget.h (revision 489522)
++++ khexedit/hexmanagerwidget.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/hextoolwidget.h (revision 489522)
++++ khexedit/hextoolwidget.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/statusbarprogress.h (revision 489522)
++++ khexedit/statusbarprogress.h (revision 495372)
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/hexerror.h (revision 489522)
++++ khexedit/hexerror.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/printdialogpage.h (revision 489522)
++++ khexedit/printdialogpage.h (revision 495372)
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/fileinfodialog.cc (revision 489522)
++++ khexedit/fileinfodialog.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/bitswapwidget.cc (revision 489522)
++++ khexedit/bitswapwidget.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/fileinfodialog.h (revision 489522)
++++ khexedit/fileinfodialog.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/hexvalidator.cc (revision 489522)
++++ khexedit/hexvalidator.cc (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- khexedit/hexprinter.h (revision 489522)
++++ khexedit/hexprinter.h (revision 495372)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- COPYING (revision 489522)
++++ COPYING (revision 495372)
+@@ -8,7 +8,7 @@
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+@@ -311,7 +311,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+ Also add information on how to contact you by electronic and paper mail.
+--- kmilo/kmilod/defaultskin.h (revision 489522)
++++ kmilo/kmilod/defaultskin.h (revision 495372)
+@@ -16,8 +16,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef _DEFAULTSKIN_H_
+--- kmilo/kmilod/displayskin.h (revision 489522)
++++ kmilo/kmilod/displayskin.h (revision 495372)
+@@ -16,8 +16,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef _DISPLAYSKIN_H_
+--- kmilo/kmilod/kmilod.cpp (revision 489522)
++++ kmilo/kmilod/kmilod.cpp (revision 495372)
+@@ -16,8 +16,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+
+ */
+
+--- kmilo/kmilod/kmilointerface.h (revision 489522)
++++ kmilo/kmilod/kmilointerface.h (revision 495372)
+@@ -16,8 +16,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+
+ */
+ #ifndef _KMILOI_H_
+--- kmilo/kmilod/kmilod.h (revision 489522)
++++ kmilo/kmilod/kmilod.h (revision 495372)
+@@ -16,8 +16,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+
+ */
+ #ifndef _KMILOD_H_
+--- kmilo/kmilod/monitor.cpp (revision 489522)
++++ kmilo/kmilod/monitor.cpp (revision 495372)
+@@ -15,8 +15,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+
+ */
+
+--- kmilo/kmilod/Makefile.am (revision 489522)
++++ kmilo/kmilod/Makefile.am (revision 495372)
+@@ -13,8 +13,8 @@
+
+ # You should have received a copy of the GNU Library General Public License
+ # along with this library; see the file COPYING.LIB. If not, write to
+-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ INCLUDES=$(all_includes)
+
+--- kmilo/kmilod/defaultskin.cpp (revision 489522)
++++ kmilo/kmilod/defaultskin.cpp (revision 495372)
+@@ -16,8 +16,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+
+ */
+
+--- kmilo/kmilod/displayskin.cpp (revision 489522)
++++ kmilo/kmilod/displayskin.cpp (revision 495372)
+@@ -15,8 +15,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+
+ */
+
+--- kmilo/kmilod/kmilointerface.cpp (revision 489522)
++++ kmilo/kmilod/kmilointerface.cpp (revision 495372)
+@@ -16,8 +16,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+
+ */
+
+--- kmilo/kmilod/monitor.h (revision 489522)
++++ kmilo/kmilod/monitor.h (revision 495372)
+@@ -16,8 +16,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #ifndef _MONITOR_H_
+--- kmilo/thinkpad/thinkpad.cpp (revision 489522)
++++ kmilo/thinkpad/thinkpad.cpp (revision 495372)
+@@ -24,8 +24,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+
+ */
+
+--- kmilo/thinkpad/thinkpad.h (revision 489522)
++++ kmilo/thinkpad/thinkpad.h (revision 495372)
+@@ -21,8 +21,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+
+ */
+ #ifndef _THINKPAD_H_
+--- kmilo/thinkpad/Makefile.am (revision 489522)
++++ kmilo/thinkpad/Makefile.am (revision 495372)
+@@ -13,8 +13,8 @@
+
+ # You should have received a copy of the GNU Library General Public License
+ # along with this library; see the file COPYING.LIB. If not, write to
+-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ SUBDIRS = . kcmthinkpad
+
+--- kmilo/thinkpad/kcmthinkpad/main.cpp (revision 489522)
++++ kmilo/thinkpad/kcmthinkpad/main.cpp (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- kmilo/thinkpad/kcmthinkpad/main.h (revision 489522)
++++ kmilo/thinkpad/kcmthinkpad/main.h (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui.h (revision 489522)
++++ kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui.h (revision 495372)
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+ /****************************************************************************
+--- kmilo/demo/demo.cpp (revision 489522)
++++ kmilo/demo/demo.cpp (revision 495372)
+@@ -15,8 +15,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+
+ */
+
+--- kmilo/demo/Makefile.am (revision 489522)
++++ kmilo/demo/Makefile.am (revision 495372)
+@@ -13,8 +13,8 @@
+
+ # You should have received a copy of the GNU Library General Public License
+ # along with this library; see the file COPYING.LIB. If not, write to
+-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ INCLUDES=-I$(srcdir)/../kmilod $(all_includes)
+
+--- kmilo/demo/demo.h (revision 489522)
++++ kmilo/demo/demo.h (revision 495372)
+@@ -15,8 +15,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+
+ */
+ #ifndef _DEMO_H_
+--- kmilo/kmilo_kvaio/kcmkvaio/main.cpp (revision 489522)
++++ kmilo/kmilo_kvaio/kcmkvaio/main.cpp (revision 495372)
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- kmilo/kmilo_kvaio/kcmkvaio/main.h (revision 489522)
++++ kmilo/kmilo_kvaio/kcmkvaio/main.h (revision 495372)
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- kmilo/kmilo_kvaio/sonypi.h (revision 489522)
++++ kmilo/kmilo_kvaio/sonypi.h (revision 495372)
+@@ -29,7 +29,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- kmilo/kmilo_kvaio/Makefile.am (revision 489522)
++++ kmilo/kmilo_kvaio/Makefile.am (revision 495372)
+@@ -13,8 +13,8 @@
+
+ # You should have received a copy of the GNU Library General Public License
+ # along with this library; see the file COPYING.LIB. If not, write to
+-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ SUBDIRS = . kcmkvaio
+
+--- kmilo/powerbook/Makefile.am (revision 489522)
++++ kmilo/powerbook/Makefile.am (revision 495372)
+@@ -13,8 +13,8 @@
+
+ # You should have received a copy of the GNU Library General Public License
+ # along with this library; see the file COPYING.LIB. If not, write to
+-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ INCLUDES=-I$(srcdir)/../kmilod $(all_includes)
+
+--- kmilo/powerbook/pb_monitor.cpp (revision 489522)
++++ kmilo/powerbook/pb_monitor.cpp (revision 495372)
+@@ -15,8 +15,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+
+ */
+
+--- kmilo/powerbook/pb_monitor.h (revision 489522)
++++ kmilo/powerbook/pb_monitor.h (revision 495372)
+@@ -15,8 +15,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+
+ */
+ #ifndef _PBMONITOR_H_
+--- kmilo/powerbook2/Makefile.am (revision 489522)
++++ kmilo/powerbook2/Makefile.am (revision 495372)
+@@ -13,8 +13,8 @@
+
+ # You should have received a copy of the GNU Library General Public License
+ # along with this library; see the file COPYING.LIB. If not, write to
+-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ INCLUDES=-I$(srcdir)/../kmilod $(all_includes)
+
+--- kmilo/powerbook2/pb_monitor.cpp (revision 489522)
++++ kmilo/powerbook2/pb_monitor.cpp (revision 495372)
+@@ -18,8 +18,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+
+ */
+
+--- kmilo/powerbook2/pb_monitor.h (revision 489522)
++++ kmilo/powerbook2/pb_monitor.h (revision 495372)
+@@ -18,8 +18,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+
+ */
+ #ifndef _PBMONITOR_H_
+--- kmilo/asus/asus.h (revision 489522)
++++ kmilo/asus/asus.h (revision 495372)
+@@ -16,8 +16,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+
+ */
+ #ifndef ASUS_H
+--- kmilo/asus/Makefile.am (revision 489522)
++++ kmilo/asus/Makefile.am (revision 495372)
+@@ -14,8 +14,8 @@
+
+ # You should have received a copy of the GNU Library General Public License
+ # along with this library; see the file COPYING.LIB. If not, write to
+-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ #SUBDIRS = . kcmthinkpad
+
+--- kmilo/asus/asus.cpp (revision 489522)
++++ kmilo/asus/asus.cpp (revision 495372)
+@@ -16,8 +16,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+
+ */
+
+--- kmilo/delli8k/delli8k.h (revision 489522)
++++ kmilo/delli8k/delli8k.h (revision 495372)
+@@ -23,7 +23,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ #ifndef DELLI8K_H
+--- kmilo/delli8k/Makefile.am (revision 489522)
++++ kmilo/delli8k/Makefile.am (revision 495372)
+@@ -14,8 +14,8 @@
+
+ # You should have received a copy of the GNU Library General Public License
+ # along with this library; see the file COPYING.LIB. If not, write to
+-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ INCLUDES=-I$(srcdir)/../kmilod $(all_includes)
+
+--- kmilo/delli8k/README (revision 489522)
++++ kmilo/delli8k/README (revision 495372)
+@@ -35,7 +35,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+ COMPATIBILITY:
+--- kmilo/delli8k/delli8k.cpp (revision 489522)
++++ kmilo/delli8k/delli8k.cpp (revision 495372)
+@@ -23,7 +23,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ #include <kgenericfactory.h>
+--- kmilo/generic/generic_monitor.cpp (revision 489522)
++++ kmilo/generic/generic_monitor.cpp (revision 495372)
+@@ -18,8 +18,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+
+ */
+
+--- kmilo/generic/Makefile.am (revision 489522)
++++ kmilo/generic/Makefile.am (revision 495372)
+@@ -13,8 +13,8 @@
+
+ # You should have received a copy of the GNU Library General Public License
+ # along with this library; see the file COPYING.LIB. If not, write to
+-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ INCLUDES=-I$(srcdir)/../kmilod $(all_includes)
+
+--- kmilo/generic/generic_monitor.h (revision 489522)
++++ kmilo/generic/generic_monitor.h (revision 495372)
+@@ -18,8 +18,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+
+ */
+ #ifndef _GENERICMONITOR_H_
+--- kregexpeditor/dotregexp.cpp (revision 489522)
++++ kregexpeditor/dotregexp.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #include "dotregexp.h"
+
+--- kregexpeditor/multicontainerwidget.cpp (revision 489522)
++++ kregexpeditor/multicontainerwidget.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #include "multicontainerwidget.h"
+ #include "dragaccepter.h"
+--- kregexpeditor/altnwidget.cpp (revision 489522)
++++ kregexpeditor/altnwidget.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifdef QT_ONLY
+ #include "compat.h"
+--- kregexpeditor/concregexp.h (revision 489522)
++++ kregexpeditor/concregexp.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __CONCREGEXP_H
+ #define __CONCREGEXP_H
+--- kregexpeditor/myfontmetrics.cpp (revision 489522)
++++ kregexpeditor/myfontmetrics.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #include "myfontmetrics.h"
+
+--- kregexpeditor/lookaheadregexp.h (revision 489522)
++++ kregexpeditor/lookaheadregexp.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __LOOKAHEADREGEXP_H
+ #define __LOOKAHEADREGEXP_H
+--- kregexpeditor/limitedcharlineedit.h (revision 489522)
++++ kregexpeditor/limitedcharlineedit.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __limitedcharlineedit
+ #define __limitedcharlineedit
+--- kregexpeditor/auxbuttons.cpp (revision 489522)
++++ kregexpeditor/auxbuttons.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #ifdef QT_ONLY
+--- kregexpeditor/textrangeregexp.cpp (revision 489522)
++++ kregexpeditor/textrangeregexp.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifdef QT_ONLY
+ #include "compat.h"
+--- kregexpeditor/charselector.cpp (revision 489522)
++++ kregexpeditor/charselector.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #ifdef QT_ONLY
+--- kregexpeditor/regexphighlighter.h (revision 489522)
++++ kregexpeditor/regexphighlighter.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #ifndef REGEXPHIGHLIGHTER_H
+--- kregexpeditor/positionregexp.cpp (revision 489522)
++++ kregexpeditor/positionregexp.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #include "positionregexp.h"
+ #include "errormap.h"
+--- kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp (revision 489522)
++++ kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #include "kwidgetstreamer.h"
+ #include "kmultiformlistbox.h"
+--- kregexpeditor/KWidgetStreamer/kwidgetstreamer.h (revision 489522)
++++ kregexpeditor/KWidgetStreamer/kwidgetstreamer.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __kwidgetstreamer
+ #define __kwidgetstreamer
+--- kregexpeditor/verifier.h (revision 489522)
++++ kregexpeditor/verifier.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef VERIFIER_H
+ #define VERIFIER_H
+--- kregexpeditor/drag.h (revision 489522)
++++ kregexpeditor/drag.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef drag_h
+ #define drag_h
+--- kregexpeditor/regexpconverter.cpp (revision 489522)
++++ kregexpeditor/regexpconverter.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #include "regexpconverter.h"
+--- kregexpeditor/util.h (revision 489522)
++++ kregexpeditor/util.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #ifndef UTIL_H
+--- kregexpeditor/verifybuttons.cpp (revision 489522)
++++ kregexpeditor/verifybuttons.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifdef QT_ONLY
+ #include "compat.h"
+--- kregexpeditor/dragaccepter.cpp (revision 489522)
++++ kregexpeditor/dragaccepter.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #include "dragaccepter.h"
+ #include "concwidget.h"
+--- kregexpeditor/repeatwidget.cpp (revision 489522)
++++ kregexpeditor/repeatwidget.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifdef QT_ONLY
+ #include "compat.h"
+--- kregexpeditor/kregexpeditorgui.h (revision 489522)
++++ kregexpeditor/kregexpeditorgui.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef kregexpeditorgui_h
+ #define kregexpeditorgui_h
+--- kregexpeditor/selectablelineedit.h (revision 489522)
++++ kregexpeditor/selectablelineedit.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __selectablelineedit
+ #define __selectablelineedit
+--- kregexpeditor/errormap.cpp (revision 489522)
++++ kregexpeditor/errormap.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #ifdef QT_ONLY
+--- kregexpeditor/characterswidget.h (revision 489522)
++++ kregexpeditor/characterswidget.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef characterswidget
+ #define characterswidget
+--- kregexpeditor/regexp.cpp (revision 489522)
++++ kregexpeditor/regexp.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #include "regexp.h"
+ #include "widgetfactory.h"
+--- kregexpeditor/singlecontainerwidget.h (revision 489522)
++++ kregexpeditor/singlecontainerwidget.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __singlecontainer
+ #define __singlecontainer
+--- kregexpeditor/textwidget.h (revision 489522)
++++ kregexpeditor/textwidget.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __textwidget
+ #define __textwidget
+--- kregexpeditor/infopage.h (revision 489522)
++++ kregexpeditor/infopage.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef infopage_h
+ #define infopage_h
+--- kregexpeditor/compoundwidget.h (revision 489522)
++++ kregexpeditor/compoundwidget.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef compoundwidget
+ #define compoundwidget
+--- kregexpeditor/concregexp.cpp (revision 489522)
++++ kregexpeditor/concregexp.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #include "concregexp.h"
+ #include "widgetfactory.h"
+--- kregexpeditor/gen_qregexpparser.hh (revision 489522)
++++ kregexpeditor/gen_qregexpparser.hh (revision 495372)
+@@ -15,8 +15,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA. */
++ Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA. */
+
+ /* As a special exception, when this file is copied by Bison into a
+ Bison output file, you may use that output file without restriction.
+--- kregexpeditor/regexpwidget.cpp (revision 489522)
++++ kregexpeditor/regexpwidget.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #ifdef QT_ONLY
+--- kregexpeditor/userdefinedregexps.h (revision 489522)
++++ kregexpeditor/userdefinedregexps.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __USERDEFINEDREGEXPS_H
+ #define __USERDEFINEDREGEXPS_H
+--- kregexpeditor/qregexpparser.l (revision 489522)
++++ kregexpeditor/qregexpparser.l (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ %option noyywrap
+
+--- kregexpeditor/limitedcharlineedit.cpp (revision 489522)
++++ kregexpeditor/limitedcharlineedit.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #include "limitedcharlineedit.h"
+ #include <qvalidator.h>
+--- kregexpeditor/kregexpeditorfactory.cpp (revision 489522)
++++ kregexpeditor/kregexpeditorfactory.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #ifndef QT_ONLY
+--- kregexpeditor/gen_qregexplexer.cpp (revision 489522)
++++ kregexpeditor/gen_qregexplexer.cpp (revision 495372)
+@@ -447,8 +447,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #line 21 "qregexpparser.l"
+ #include <qstring.h>
+--- kregexpeditor/zerowidgets.cpp (revision 489522)
++++ kregexpeditor/zerowidgets.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #ifdef QT_ONLY
+--- kregexpeditor/altnwidget.h (revision 489522)
++++ kregexpeditor/altnwidget.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef altnwidget
+ #define altnwidget
+--- kregexpeditor/regexphighlighter.cpp (revision 489522)
++++ kregexpeditor/regexphighlighter.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #include "regexphighlighter.h"
+--- kregexpeditor/verifier.cpp (revision 489522)
++++ kregexpeditor/verifier.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifdef QT_ONLY
+ #include "compat.h"
+--- kregexpeditor/kregexpeditorprivate.h (revision 489522)
++++ kregexpeditor/kregexpeditorprivate.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef kregexpeditorprivate_h
+ #define kregexpeditorprivate_h
+--- kregexpeditor/drag.cpp (revision 489522)
++++ kregexpeditor/drag.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #include "drag.h"
+ #include "regexp.h"
+--- kregexpeditor/util.cpp (revision 489522)
++++ kregexpeditor/util.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #include "util.h"
+--- kregexpeditor/editorwindow.cpp (revision 489522)
++++ kregexpeditor/editorwindow.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #ifdef QT_ONLY
+--- kregexpeditor/qregexpparser.y (revision 489522)
++++ kregexpeditor/qregexpparser.y (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ %{
+ #ifdef QT_ONLY
+--- kregexpeditor/widgetfactory.h (revision 489522)
++++ kregexpeditor/widgetfactory.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef widgetfactory
+ #define widgetfactory
+--- kregexpeditor/kregexpeditorgui.cpp (revision 489522)
++++ kregexpeditor/kregexpeditorgui.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #ifdef QT_ONLY
+--- kregexpeditor/auxbuttons.h (revision 489522)
++++ kregexpeditor/auxbuttons.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef AUXBUTTONS_H
+ #define AUXBUTTONS_H
+--- kregexpeditor/selectablelineedit.cpp (revision 489522)
++++ kregexpeditor/selectablelineedit.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #ifndef QT_ONLY
+--- kregexpeditor/textrangeregexp.h (revision 489522)
++++ kregexpeditor/textrangeregexp.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __TEXTRANGEREGEXP_H
+ #define __TEXTRANGEREGEXP_H
+--- kregexpeditor/dcbutton.cpp (revision 489522)
++++ kregexpeditor/dcbutton.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifdef QT_ONLY
+ #include "compat.h"
+--- kregexpeditor/qt-only/compat.cpp (revision 489522)
++++ kregexpeditor/qt-only/compat.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #include "compat.h"
+--- kregexpeditor/qt-only/compat.h (revision 489522)
++++ kregexpeditor/qt-only/compat.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #ifndef COMPAT_H
+--- kregexpeditor/charselector.h (revision 489522)
++++ kregexpeditor/charselector.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef CHARSELECTOR_H
+ #define CHARSELECTOR_H
+--- kregexpeditor/characterswidget.cpp (revision 489522)
++++ kregexpeditor/characterswidget.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #ifdef QT_ONLY
+--- kregexpeditor/concwidget.cpp (revision 489522)
++++ kregexpeditor/concwidget.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #include "concregexp.h"
+ #include "concwidget.h"
+--- kregexpeditor/regexpconverter.h (revision 489522)
++++ kregexpeditor/regexpconverter.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #ifndef REGEXPCONVERTER_H
+--- kregexpeditor/dragaccepter.h (revision 489522)
++++ kregexpeditor/dragaccepter.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __dragaccepter
+ #define __dragaccepter
+--- kregexpeditor/repeatwidget.h (revision 489522)
++++ kregexpeditor/repeatwidget.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __repeatwidget
+ #define __repeatwidget
+--- kregexpeditor/userdefinedregexps.cpp (revision 489522)
++++ kregexpeditor/userdefinedregexps.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifdef QT_ONLY
+ #include "compat.h"
+--- kregexpeditor/regexp.h (revision 489522)
++++ kregexpeditor/regexp.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef REGEXP_H
+ #define REGEXP_H
+--- kregexpeditor/regexpwidget.h (revision 489522)
++++ kregexpeditor/regexpwidget.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __regexpwidget
+ #define __regexpwidget
+--- kregexpeditor/compoundregexp.h (revision 489522)
++++ kregexpeditor/compoundregexp.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef COMPOUNDREGEXP_H
+ #define COMPOUNDREGEXP_H
+--- kregexpeditor/textregexp.h (revision 489522)
++++ kregexpeditor/textregexp.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __textregexp_h
+ #define __textregexp_h
+--- kregexpeditor/triple.h (revision 489522)
++++ kregexpeditor/triple.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __triple_h
+ #define __triple_h
+--- kregexpeditor/scrollededitorwindow.cpp (revision 489522)
++++ kregexpeditor/scrollededitorwindow.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef QT_ONLY
+ #include "scrollededitorwindow.moc"
+--- kregexpeditor/kregexpeditorprivate.cpp (revision 489522)
++++ kregexpeditor/kregexpeditorprivate.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #ifdef QT_ONLY
+--- kregexpeditor/widgetfactory.cpp (revision 489522)
++++ kregexpeditor/widgetfactory.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifdef QT_ONLY
+ #include "compat.h"
+--- kregexpeditor/zerowidgets.h (revision 489522)
++++ kregexpeditor/zerowidgets.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef zerowidget
+ #define zerowidget
+--- kregexpeditor/altnregexp.h (revision 489522)
++++ kregexpeditor/altnregexp.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef ALTNREGEXP_H
+ #define ALTNREGEXP_H
+--- kregexpeditor/qtregexphighlighter.cpp (revision 489522)
++++ kregexpeditor/qtregexphighlighter.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #include "qtregexphighlighter.h"
+ #include <qregexp.h>
+--- kregexpeditor/regexpbuttons.h (revision 489522)
++++ kregexpeditor/regexpbuttons.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __REGEXPBUTTONS_H
+ #define __REGEXPBUTTONS_H
+--- kregexpeditor/editorwindow.h (revision 489522)
++++ kregexpeditor/editorwindow.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef editorwindow_h
+ #define editorwindow_h
+--- kregexpeditor/main.cpp (revision 489522)
++++ kregexpeditor/main.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #ifdef QT_ONLY
+--- kregexpeditor/dcbutton.h (revision 489522)
++++ kregexpeditor/dcbutton.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef dcbutton
+ #define dcbutton
+--- kregexpeditor/concwidget.h (revision 489522)
++++ kregexpeditor/concwidget.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __concwidget
+ #define __concwidget
+--- kregexpeditor/qtregexpconverter.h (revision 489522)
++++ kregexpeditor/qtregexpconverter.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #ifndef QTREGEXPCONVERTER_H
+--- kregexpeditor/test-without-dl/main.cpp (revision 489522)
++++ kregexpeditor/test-without-dl/main.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #include <kapplication.h>
+ #include <kcmdlineargs.h>
+--- kregexpeditor/compoundregexp.cpp (revision 489522)
++++ kregexpeditor/compoundregexp.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #ifdef QT_ONLY
+--- kregexpeditor/textregexp.cpp (revision 489522)
++++ kregexpeditor/textregexp.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifdef QT_ONLY
+ #include "compat.h"
+--- kregexpeditor/lookaheadwidget.h (revision 489522)
++++ kregexpeditor/lookaheadwidget.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __lookaheadwidget
+ #define __lookaheadwidget
+--- kregexpeditor/emacsregexpconverter.h (revision 489522)
++++ kregexpeditor/emacsregexpconverter.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #ifndef EMACSREGEXPCONVERTER_H
+--- kregexpeditor/pair.h (revision 489522)
++++ kregexpeditor/pair.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __pair_h
+ #define __pair_h
+--- kregexpeditor/repeatregexp.h (revision 489522)
++++ kregexpeditor/repeatregexp.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __REPEATREGEXP_H
+ #define __REPEATREGEXP_H
+--- kregexpeditor/lookaheadregexp.cpp (revision 489522)
++++ kregexpeditor/lookaheadregexp.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #include "lookaheadregexp.h"
+ #include "errormap.h"
+--- kregexpeditor/dotregexp.h (revision 489522)
++++ kregexpeditor/dotregexp.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef DOTREGEXP_H
+ #define DOTREGEXP_H
+--- kregexpeditor/multicontainerwidget.h (revision 489522)
++++ kregexpeditor/multicontainerwidget.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __multicontainerwidget
+ #define __multicontainerwidget
+--- kregexpeditor/myfontmetrics.h (revision 489522)
++++ kregexpeditor/myfontmetrics.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __MYFONTMETRICS_H
+ #define __MYFONTMETRICS_H
+--- kregexpeditor/altnregexp.cpp (revision 489522)
++++ kregexpeditor/altnregexp.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #include "altnregexp.h"
+ #include "widgetfactory.h"
+--- kregexpeditor/regexpbuttons.cpp (revision 489522)
++++ kregexpeditor/regexpbuttons.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifdef QT_ONLY
+ #include "compat.h"
+--- kregexpeditor/scrollededitorwindow.h (revision 489522)
++++ kregexpeditor/scrollededitorwindow.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __scrolledEditorWindow
+ #define __scrolledEditorWindow
+--- kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp (revision 489522)
++++ kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef QT_ONLY
+ #include "kmultiformlistbox.moc"
+--- kregexpeditor/KMultiFormListBox/indexWindow.cpp (revision 489522)
++++ kregexpeditor/KMultiFormListBox/indexWindow.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #ifdef QT_ONLY
+--- kregexpeditor/KMultiFormListBox/windowlistboxitem.h (revision 489522)
++++ kregexpeditor/KMultiFormListBox/windowlistboxitem.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __windowlistboxitem
+ #define __windowlistboxitem
+--- kregexpeditor/KMultiFormListBox/kmultiformlistbox.h (revision 489522)
++++ kregexpeditor/KMultiFormListBox/kmultiformlistbox.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __kmultiformlistbox
+ #define __kmultiformlistbox
+--- kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp (revision 489522)
++++ kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #ifdef QT_ONLY
+--- kregexpeditor/KMultiFormListBox/indexWindow.h (revision 489522)
++++ kregexpeditor/KMultiFormListBox/indexWindow.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __indexWindow
+ #define __indexWindow
+--- kregexpeditor/KMultiFormListBox/ccp.cpp (revision 489522)
++++ kregexpeditor/KMultiFormListBox/ccp.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ //---------------------
+ // ccp = Cut-Copy-Paste
+--- kregexpeditor/KMultiFormListBox/kmultiformlistbox-shower.h (revision 489522)
++++ kregexpeditor/KMultiFormListBox/kmultiformlistbox-shower.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __kmultiformlistboxshower
+ #define __kmultiformlistboxshower
+--- kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.h (revision 489522)
++++ kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ // ------------------------------- Description ----------------------------
+ // This is the KMultiFormListBox Widget. You do not need to inheret from this class,
+--- kregexpeditor/KMultiFormListBox/ccp.h (revision 489522)
++++ kregexpeditor/KMultiFormListBox/ccp.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __ccp
+ #define __ccp
+--- kregexpeditor/KMultiFormListBox/widgetwindow.cpp (revision 489522)
++++ kregexpeditor/KMultiFormListBox/widgetwindow.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #include "widgetwindow.h"
+ #include "windowlistboxitem.h"
+--- kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp (revision 489522)
++++ kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifdef QT_ONLY
+ #include "compat.h"
+--- kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.cpp (revision 489522)
++++ kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #ifndef QT_ONLY
+--- kregexpeditor/KMultiFormListBox/widgetwindow.h (revision 489522)
++++ kregexpeditor/KMultiFormListBox/widgetwindow.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __configwindow
+ #define __configwindow
+--- kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.h (revision 489522)
++++ kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __kmultiformlistboxwindowed
+ #define __kmultiformlistboxwindowed
+--- kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h (revision 489522)
++++ kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __kmultiformlistboxentry
+ #define __kmultiformlistboxentry
+--- kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.cpp (revision 489522)
++++ kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #include "kmultiformlistboxfactory.h"
+ #include <qframe.h>
+--- kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.h (revision 489522)
++++ kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ // -------------------------------- includes ------------------------------
+ #ifndef __kmultiformlistboxfactory
+--- kregexpeditor/KMultiFormListBox/windowlistboxitem.cpp (revision 489522)
++++ kregexpeditor/KMultiFormListBox/windowlistboxitem.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #include "windowlistboxitem.h"
+ #include "widgetwindow.h"
+--- kregexpeditor/qtregexphighlighter.h (revision 489522)
++++ kregexpeditor/qtregexphighlighter.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef QTREGEXPHIGHLIGHTER_H
+ #define QTREGEXPHIGHLIGHTER_H
+--- kregexpeditor/gen_qregexpparser.cc (revision 489522)
++++ kregexpeditor/gen_qregexpparser.cc (revision 495372)
+@@ -15,8 +15,8 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA. */
++ Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA. */
+
+ /* As a special exception, when this file is copied by Bison into a
+ Bison output file, you may use that output file without restriction.
+--- kregexpeditor/positionregexp.h (revision 489522)
++++ kregexpeditor/positionregexp.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef __POSITIONREGEXP_H
+ #define __POSITIONREGEXP_H
+--- kregexpeditor/qtregexpconverter.cpp (revision 489522)
++++ kregexpeditor/qtregexpconverter.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #include "qtregexpconverter.h"
+--- kregexpeditor/infopage.cpp (revision 489522)
++++ kregexpeditor/infopage.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifdef QT_ONLY
+ #include "compat.h"
+--- kregexpeditor/compoundwidget.cpp (revision 489522)
++++ kregexpeditor/compoundwidget.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifdef QT_ONLY
+ #include "compat.h"
+--- kregexpeditor/singlecontainerwidget.cpp (revision 489522)
++++ kregexpeditor/singlecontainerwidget.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef QT_ONLY
+ #include "singlecontainerwidget.moc"
+--- kregexpeditor/textwidget.cpp (revision 489522)
++++ kregexpeditor/textwidget.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef QT_ONLY
+ #include "textwidget.moc"
+--- kregexpeditor/verifybuttons.h (revision 489522)
++++ kregexpeditor/verifybuttons.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef VERIFYBUTTONS_H
+ #define VERIFYBUTTONS_H
+--- kregexpeditor/lookaheadwidget.cpp (revision 489522)
++++ kregexpeditor/lookaheadwidget.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #ifdef QT_ONLY
+--- kregexpeditor/emacsregexpconverter.cpp (revision 489522)
++++ kregexpeditor/emacsregexpconverter.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+
+ #include "emacsregexpconverter.h"
+--- kregexpeditor/repeatregexp.cpp (revision 489522)
++++ kregexpeditor/repeatregexp.cpp (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifdef QT_ONLY
+ #include "compat.h"
+--- kregexpeditor/errormap.h (revision 489522)
++++ kregexpeditor/errormap.h (revision 495372)
+@@ -12,8 +12,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
+ **/
+ #ifndef ERRORMAP_H
+ #define ERRORMAP_H
+--- kdelirc/COPYING (revision 489522)
++++ kdelirc/COPYING (revision 495372)
+@@ -2,7 +2,7 @@
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+@@ -305,7 +305,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+ Also add information on how to contact you by electronic and paper mail.
+--- kcalc/kcalcdisplay.cpp (revision 489522)
++++ kcalc/kcalcdisplay.cpp (revision 495372)
+@@ -19,7 +19,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+@@ -275,15 +275,10 @@
+ }
+ else // _num_base == NB_DECIMAL
+ {
+- // We need to use QCString here since it uses the systems native ::sprintf()
+- // implementation which is more flexible than QString's.
+- _display_amount = new_amount;
++ _display_amount = new_amount;
+
+-
+- display_str = _display_amount.toQString(QString().setNum(KCalcSettings::precision()));
++ display_str = _display_amount.toQString(KCalcSettings::precision(), _fixed_precision);
+ #if 0
+- if (_fixed_precision != -1 && _display_amount <= 1.0e+16)
+- display_str = QCString().sprintf(PRINT_FLOAT, _fixed_precision, _display_amount);
+ else if (_display_amount > 1.0e+16)
+ display_str = QCString().sprintf(PRINT_LONG_BIG, _precision + 1, _display_amount);
+ else
+@@ -317,7 +312,7 @@
+ {
+ if (_num_base != NB_DECIMAL)
+ return QLabel::text();
+- QString display_str = _display_amount.toQString(QString().setNum(KCalcSettings::precision()));
++ QString display_str = _display_amount.toQString(KCalcSettings::precision());
+
+ return display_str;
+ // return QCString().sprintf(PRINT_LONG_BIG, 40, _display_amount);
+--- kcalc/stats.h (revision 489522)
++++ kcalc/stats.h (revision 495372)
+@@ -19,7 +19,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kcalc/confvalues.h (revision 489522)
++++ kcalc/confvalues.h (revision 495372)
+@@ -18,7 +18,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kcalc/kcalc_const_menu.h (revision 489522)
++++ kcalc/kcalc_const_menu.h (revision 495372)
+@@ -16,7 +16,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kcalc/kcalc_button.h (revision 489522)
++++ kcalc/kcalc_button.h (revision 495372)
+@@ -17,7 +17,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kcalc/kcalc.cpp (revision 489522)
++++ kcalc/kcalc.cpp (revision 495372)
+@@ -16,7 +16,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+@@ -1827,6 +1827,7 @@
+ QVBoxLayout *fontLayout = new QVBoxLayout(fontWidget);
+ KFontChooser *mFontChooser =
+ new KFontChooser(fontWidget, "kcfg_Font", false, QStringList(), false, 6);
++
+ fontLayout->addWidget(mFontChooser);
+ dialog->addPage(fontWidget, i18n("Font"), "fonts", i18n("Select Display Font"));
+
+--- kcalc/kcalc_const_button.cpp (revision 489522)
++++ kcalc/kcalc_const_button.cpp (revision 495372)
+@@ -15,7 +15,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kcalc/dlabel.cpp (revision 489522)
++++ kcalc/dlabel.cpp (revision 495372)
+@@ -19,7 +19,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kcalc/kcalc_core.h (revision 489522)
++++ kcalc/kcalc_core.h (revision 495372)
+@@ -18,7 +18,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kcalc/stats.cpp (revision 489522)
++++ kcalc/stats.cpp (revision 495372)
+@@ -19,7 +19,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+@@ -82,15 +82,7 @@
+ KNumber result = 0;
+ unsigned int bound;
+ size_t index;
+- qHeapSort(mData);
+
+-#ifdef DEBUG_STATS
+- QValueVector<KNumber>::iterator p;
+- for(p = mData.begin(); p != mData.end(); ++p) {
+- printf("Sorted %Lg\n", *p)
+- }
+-#endif
+-
+ bound = count();
+
+ if (bound == 0){
+@@ -101,12 +93,16 @@
+ if (bound == 1)
+ return mData.at(0);
+
++ // need to copy mData-list, because sorting afterwards
++ QValueVector<KNumber> tmp_mData(mData);
++ qHeapSort(tmp_mData);
++
+ if( bound & 1) { // odd
+ index = (bound - 1 ) / 2 + 1;
+- result = mData.at(index - 1);
++ result = tmp_mData.at(index - 1);
+ } else { // even
+ index = bound / 2;
+- result = ((mData.at(index - 1)) + (mData.at(index))) / KNumber(2);
++ result = ((tmp_mData.at(index - 1)) + (tmp_mData.at(index))) / KNumber(2);
+ }
+
+ return result;
+--- kcalc/ChangeLog (revision 489522)
++++ kcalc/ChangeLog (revision 495372)
+@@ -1,3 +1,9 @@
++2005-12-29 Klaus Niederkrüger <kniederk at math.uni-koeln.de>
++ * Fixed BUG 116835, BUG 118300, BUG 118909
++
++2005-10-?? Klaus Niederkrüger <kniederk at math.uni-koeln.de>
++ * Added arbitrary precision
++
+ 2005-04-30 Klaus Niederkrüger <kniederk at math.uni-koeln.de>
+ * Fix BUG 100316
+
+--- kcalc/kcalc_const_menu.cpp (revision 489522)
++++ kcalc/kcalc_const_menu.cpp (revision 495372)
+@@ -15,7 +15,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kcalc/kcalc_button.cpp (revision 489522)
++++ kcalc/kcalc_button.cpp (revision 495372)
+@@ -16,7 +16,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kcalc/kcalcdisplay.h (revision 489522)
++++ kcalc/kcalcdisplay.h (revision 495372)
+@@ -18,7 +18,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kcalc/README (revision 489522)
++++ kcalc/README (revision 495372)
+@@ -3,78 +3,6 @@
+ KCalc is currently covered under the GPL version 2. A copy of this
+ license can be found in a file named COPYING, in the toplevel directory.
+
+-How to enable long double precision for KCalc:
+-==============================================
+-
+-If your machine supports the C data type 'long double' and if you
+-have a working libc you can enable 'long double' precison for KCalc.
+-
+-( RedHat 5.0 users are out of luck -- I suggest
+- you get yourself something more KDE friendly )
+-
+-Here is what to do:
+-
+-1) Check ../config.h and see whether HAVE_LONG_DOUBLE is defined, ie
+-you should be able to locate a line saying:
+-
+-#define HAVE_LONG_DOUBLE 1
+-
+-If you can't find such a line your system doesn't support long
+-double IEEE precision. => Contact your vendor if you have further
+-questions.
+-
+-2) Edit the file kcalctype.h and remove the line
+-#undef HAVE_LONG_DOUBLE
+-
+-3) recompile KCalc.
+-
+-Bernd
+-
+---------------------------------------------------------
+-
+-
+-IMPORTANT: On a number of systems including Linux systems using a certain
+-version of gcc (gcc-2.7.3 RedHat 5.0 for example) you will not get a working
+-version of kcalc unless you undefine the preprosessor symbol FABSL in
+-../config.h
+-
+-that is change the line
+-#define FABSL
+-to
+-/*#define FABLS*/
+-
+-What this does effectively is tell kcalc to use the C data type
+-'double' as its fundamental data type instead of 'long double'.
+-So this procedure will give you greatly reduced precision. Since
+-this is a compiler bug there is nothing I can do about it.
+-Complain to the gnu people or to your distribution and ask
+-them to get a working version of gcc out.
+-
+-In general if you have trouble getting kcalc to work, the first thing
+-you should try is to undefine FABSL in ../config.h.
+-(eg. rs6000-ibm-aix3.2.5 etc )
+-
+-thanks,
+-Bernd
+-
+-
+-kcalc 0.4
+-=========
+-
+-Added statistical functions. Use F3 and F4 to switch between them.
+-If you have trouble with the mathematical functions used, have a
+-look at kcalctype.h and make the necessary changes.
+-
+-kcalc 0.3
+-=========
+-
+-kcalc is now mostly complete with regard to basic functionality. A few
+-rough edges remain. Nevertheless, I believe kcalc will prove a useful
+-little calculator.
+-
+ Have fun with kcalc!
+
+-Bernd
+-wuebben at kde.org
+
+-
+--- kcalc/kcalc.h (revision 489522)
++++ kcalc/kcalc.h (revision 495372)
+@@ -17,7 +17,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kcalc/knumber/tests/knumbertest.cpp (revision 489522)
++++ kcalc/knumber/tests/knumbertest.cpp (revision 495372)
+@@ -32,13 +32,13 @@
+ {
+ std::cout << "Testing result of: " << string.ascii() <<
+ " should give " << desired_string.ascii() << " and gives " <<
+- result.toQString().ascii() << "....\n";
++ result.toQString(8).ascii() << "....\n";
+ std::cout << "The type of the result should be " <<
+ numtypeToString(desired).ascii() << " and gives " <<
+ numtypeToString(result.type()).ascii() << ".... ";
+
+ if (result.type() == desired &&
+- result.toQString() == desired_string) {
++ result.toQString(8) == desired_string) {
+ std::cout << "OK\n";
+ return;
+ }
+@@ -284,8 +284,8 @@
+ checkResult("KNumber(-16).sqrt()", KNumber(-16).sqrt(), "nan", KNumber::SpecialType);
+ checkResult("KNumber(\"16/9\").sqrt()", KNumber("16/9").sqrt(), "4/3", KNumber::FractionType);
+ checkResult("KNumber(\"-16/9\").sqrt()", KNumber("-16/9").sqrt(), "nan", KNumber::SpecialType);
+- checkResult("KNumber(2).sqrt()", KNumber(2).sqrt(), "1.41421", KNumber::FloatType);
+- checkResult("KNumber(\"2/3\").sqrt()", KNumber("2/3").sqrt(), "0.816497", KNumber::FloatType);
++ checkResult("KNumber(2).sqrt()", KNumber(2).sqrt(), "1.4142136", KNumber::FloatType);
++ checkResult("KNumber(\"2/3\").sqrt()", KNumber("2/3").sqrt(), "0.81649658", KNumber::FloatType);
+ checkResult("KNumber(\"0.25\").sqrt()", KNumber("0.25").sqrt(), "0.5", KNumber::FloatType);
+ checkResult("KNumber(\"-0.25\").sqrt()", KNumber("-0.25").sqrt(), "nan", KNumber::SpecialType);
+
+--- kcalc/knumber/tests/Makefile.am (revision 489522)
++++ kcalc/knumber/tests/Makefile.am (revision 495372)
+@@ -14,8 +14,8 @@
+
+ # You should have received a copy of the GNU Library General Public License
+ # along with this library; see the file COPYING.LIB. If not, write to
+-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ INCLUDES = -I$(top_srcdir)/kcalc/knumber $(all_includes)
+
+--- kcalc/knumber/knumber.cpp (revision 489522)
++++ kcalc/knumber/knumber.cpp (revision 495372)
+@@ -14,8 +14,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include <math.h>
+@@ -207,56 +207,188 @@
+ return *this;
+ }
+
+-QString const KNumber::toQString(QString const & prec) const
++// increase the digit at 'position' by one
++static void _inc_by_one(QString &str, int position)
+ {
++ for (int i = position; i >= 0; i--)
++ {
++ char last_char = str[i].latin1();
++ switch(last_char)
++ {
++ case '0':
++ str[i] = '1';
++ break;
++ case '1':
++ str[i] = '2';
++ break;
++ case '2':
++ str[i] = '3';
++ break;
++ case '3':
++ str[i] = '4';
++ break;
++ case '4':
++ str[i] = '5';
++ break;
++ case '5':
++ str[i] = '6';
++ break;
++ case '6':
++ str[i] = '7';
++ break;
++ case '7':
++ str[i] = '8';
++ break;
++ case '8':
++ str[i] = '9';
++ break;
++ case '9':
++ str[i] = '0';
++ if (i == 0) str.prepend('1');
++ continue;
++ case '.':
++ continue;
++ }
++ break;
++ }
++}
++
++// Cut off if more digits in fractional part than 'precision'
++static void _round(QString &str, int precision)
++{
++ int decimalSymbolPos = str.find('.');
++
++ if (decimalSymbolPos == -1)
++ if (precision == 0) return;
++ else if (precision > 0) // add dot if missing (and needed)
++ {
++ str.append('.');
++ decimalSymbolPos = str.length() - 1;
++ }
++
++ // fill up with more than enough zeroes (in case fractional part too short)
++ str.append(QString().fill('0', precision));
++
++ // Now decide whether to round up or down
++ char last_char = str[decimalSymbolPos + precision + 1].latin1();
++ switch (last_char)
++ {
++ case '0':
++ case '1':
++ case '2':
++ case '3':
++ case '4':
++ // nothing to do, rounding down
++ break;
++ case '5':
++ case '6':
++ case '7':
++ case '8':
++ case '9':
++ // rounding up
++ _inc_by_one(str, decimalSymbolPos + precision);
++ break;
++ default:
++ break;
++ }
++
++ decimalSymbolPos = str.find('.');
++ str.truncate(decimalSymbolPos + precision + 1);
++
++ // if precision == 0 delete also '.'
++ if (precision == 0) str = str.section('.', 0, 0);
++}
++
++static QString roundNumber(const QString &numStr, int precision)
++{
++ QString tmpString = numStr;
++ if (precision < 0 ||
++ ! QRegExp("^[+-]?\\d+(\\.\\d+)*(e[+-]?\\d+)?$").exactMatch(tmpString))
++ return numStr;
++
++
++ // Skip the sign (for now)
++ bool neg = (tmpString[0] == '-');
++ if (neg || tmpString[0] == '+') tmpString.remove(0, 1);
++
++
++ // Split off exponential part (including 'e'-symbol)
++ QString mantString = tmpString.section('e', 0, 0,
++ QString::SectionCaseInsensitiveSeps);
++ QString expString = tmpString.section('e', 1, 1,
++ QString::SectionCaseInsensitiveSeps |
++ QString::SectionIncludeLeadingSep);
++ if (expString.length() == 1) expString = QString();
++
++
++ _round(mantString, precision);
++
++ if(neg) mantString.prepend('-');
++
++ return mantString + expString;
++}
++
++
++QString const KNumber::toQString(int width, int prec) const
++{
+ QString tmp_str;
++
++ if (*this == Zero) // important to avoid infinite loops below
++ return "0";
+ switch (type()) {
+ case IntegerType:
+- tmp_str = QString(_num->ascii(prec));
+- if (QRegExp("^\\d+$").exactMatch(prec)) {
+- int int_num = prec.toInt();
+- if (int_num < tmp_str.length()) {
+- bool tmp_bool = _fraction_input; // stupid work-around
+- _fraction_input = false;
+- tmp_str = (KNumber("1.0")*(*this)).toQString(prec);
+- _fraction_input = tmp_bool;
+- }
+- }
++ if (width > 0) { //result needs to be cut-off
++ bool tmp_bool = _fraction_input; // stupid work-around
++ _fraction_input = false;
++ tmp_str = (KNumber("1.0")*(*this)).toQString(width, -1);
++ _fraction_input = tmp_bool;
++ } else
++ tmp_str = QString(_num->ascii());
+ break;
+ case FractionType:
+ if (_float_output) {
+ bool tmp_bool = _fraction_input; // stupid work-around
+ _fraction_input = false;
+- tmp_str = QString((KNumber("1.0")*(*this))._num->ascii());
++ tmp_str = (KNumber("1.0")*(*this)).toQString(width, -1);
+ _fraction_input = tmp_bool;
+- }
+- else if(_splitoffinteger_output) {
+- // split off integer part
+- KNumber int_part = this->integerPart();
+- if (int_part == Zero)
++ } else { // _float_output == false
++ if(_splitoffinteger_output) {
++ // split off integer part
++ KNumber int_part = this->integerPart();
++ if (int_part == Zero)
++ tmp_str = QString(_num->ascii());
++ else if (int_part < Zero)
++ tmp_str = int_part.toQString() + " " + (int_part - *this)._num->ascii();
++ else
++ tmp_str = int_part.toQString() + " " + (*this - int_part)._num->ascii();
++ } else
+ tmp_str = QString(_num->ascii());
+- else if (int_part < Zero)
+- tmp_str = int_part.toQString() + " " + (int_part - *this)._num->ascii();
+- else
+- tmp_str = int_part.toQString() + " " + (*this - int_part)._num->ascii();
+- } else
+- tmp_str = QString(_num->ascii());
+
+- if (QRegExp("^\\d+$").exactMatch(prec)) {
+- int int_num = prec.toInt();
+- if (int_num < tmp_str.length()) {
++ if (width > 0 && tmp_str.length() > width) {
++ //result needs to be cut-off
+ bool tmp_bool = _fraction_input; // stupid work-around
+ _fraction_input = false;
+- tmp_str = (KNumber("1.0")*(*this)).toQString(prec);
++ tmp_str = (KNumber("1.0")*(*this)).toQString(width, -1);
+ _fraction_input = tmp_bool;
+ }
+ }
++
+ break;
++ case FloatType:
++ if (width > 0)
++ tmp_str = QString(_num->ascii(width));
++ else
++ // rough estimate for maximal decimal precision (10^3 = 2^10)
++ tmp_str = QString(_num->ascii(3*mpf_get_default_prec()/10));
++ break;
+ default:
+- tmp_str = QString(_num->ascii(prec));
++ return QString(_num->ascii());
+ }
+-
+- return tmp_str;
++
++ if (prec >= 0)
++ return roundNumber(tmp_str, prec);
++ else
++ return tmp_str;
+ }
+
+ void KNumber::setDefaultFloatOutput(bool flag)
+--- kcalc/knumber/knumber_priv.cpp (revision 489522)
++++ kcalc/knumber/knumber_priv.cpp (revision 495372)
+@@ -13,13 +13,16 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+
+ #include <math.h>
+ #include <config.h>
+
++#ifdef HAVE_STDLIB_H
++#include <stdlib.h>
++#endif
+ #include <qregexp.h>
+ #include <qstring.h>
+
+@@ -158,9 +161,9 @@
+ return *this;
+ }
+
+-QString const _knumerror::ascii(QString const &num) const
++QString const _knumerror::ascii(int prec) const
+ {
+- static_cast<void>(num);
++ static_cast<void>(prec);
+
+ switch(_error) {
+ case UndefinedNumber:
+@@ -174,19 +177,21 @@
+ }
+ }
+
+-QString const _knuminteger::ascii(QString const &num) const
++QString const _knuminteger::ascii(int prec) const
+ {
++ static_cast<void>(prec);
+ char *tmp_ptr;
+
+- gmp_asprintf(&tmp_ptr, "%Zd", _mpz);
+- QString ret_str = tmp_ptr;
++ gmp_asprintf(&tmp_ptr, "%Zd", _mpz);
++ QString ret_str = tmp_ptr;
+ #warning ok to free with delete?
+- delete tmp_ptr;
+- return ret_str;
++ delete tmp_ptr;
++ return ret_str;
+ }
+
+-QString const _knumfraction::ascii(QString const &num) const
++QString const _knumfraction::ascii(int prec) const
+ {
++ static_cast<void>(prec);
+ char const *tmp_ptr = mpq_get_str(0, 10, _mpq);
+ QString ret_str = tmp_ptr;
+ #warning ok to free with delete?
+@@ -195,13 +200,15 @@
+ return ret_str;
+ }
+
+-QString const _knumfloat::ascii(QString const &num) const
++QString const _knumfloat::ascii(int prec) const
+ {
+ QString ret_str;
+ char *tmp_ptr;
++ if (prec > 0)
++ gmp_asprintf(&tmp_ptr, ("%." + QString().setNum(prec) + "Fg").ascii(), _mpf);
++ else
++ gmp_asprintf(&tmp_ptr, "%Fg", _mpf);
+
+- gmp_asprintf(&tmp_ptr, "%Fg", _mpf);
+-
+ ret_str = tmp_ptr;
+
+ #warning ok to free with delete?
+@@ -320,7 +327,7 @@
+
+
+
+-#warning _cbrt for now this is a stupid work around for now
++#warning _cbrt for now this is a stupid work around
+ static void _cbrt(mpf_t &num)
+ {
+ double tmp_num = cbrt(mpf_get_d(num));
+--- kcalc/knumber/knumber.h (revision 489522)
++++ kcalc/knumber/knumber.h (revision 495372)
+@@ -14,8 +14,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+ #ifndef _KNUMBER_H
+ #define _KNUMBER_H
+@@ -45,7 +45,7 @@
+ * of this class will be described below:
+ *
+ * @li @p NumType::SpecialType - This type represents an error that
+- * has occured, e.g. trying to divide 1 by 0 gives an object that
++ * has occurred, e.g. trying to divide 1 by 0 gives an object that
+ * represents infinity.
+ *
+ * @li @p NumType::IntegerType - The number is an integer. It can be
+@@ -75,7 +75,7 @@
+ * KNumber tries to provide transparent access to the following type
+ * of numbers:
+ *
+- * @li @p NumType::SpecialType - Some type of error has occured,
++ * @li @p NumType::SpecialType - Some type of error has occurred,
+ * further inspection with @p KNumber::ErrorType
+ *
+ * @li @p NumType::IntegerType - the number is an integer
+@@ -134,7 +134,7 @@
+ * NumType::FractionType, which can be either displayed as fractions
+ * or in decimal notation.
+ *
+- * The default behaviour is not to display fractions in floating
++ * The default behavior is not to display fractions in floating
+ * point notation.
+ */
+ static void setDefaultFloatOutput(bool flag);
+@@ -157,8 +157,8 @@
+
+ /**
+ * What a terrible method name!! When displaying a fraction, the
+- * default mode gives "@p nomin/denom". With this method one can
+- * choose to display a fraction as "@p integer nomin/denom".
++ * default mode gives @p "nomin/denom". With this method one can
++ * choose to display a fraction as @p "integer nomin/denom".
+ *
+ * Examples: Default representation mode is 47/17, but if @p flag is
+ * @p true, then the result is 2 13/17.
+@@ -168,17 +168,19 @@
+ /**
+ * Return a QString representing the KNumber.
+ *
+- * @param prec The string is similar to the optional conversion
+- * specifications for formatted output for printf and friends,
+- * e.g. "10.3" to display numbers with 10 digits in front of the
+- * decimal point, and 3 after the decimal point. More precise
+- * explanations will be given later.
+- *
++ * @param width This number specifies the maximal length of the
++ * output, before the method switches to exponential notation and
++ * does rounding. For negative numbers, this option is ignored.
++ *
++ * @param prec This parameter controls the number of digits
++ * following the decimal point. For negative numbers, this option
++ * is ignored.
++ *
+ */
+- QString const toQString(QString const & prec = QString::null) const;
++ QString const toQString(int width = -1, int prec = -1) const;
+
+ /**
+- * Compute the absoulte value, i.e. @p x.abs() returns the value
++ * Compute the absolute value, i.e. @p x.abs() returns the value
+ *
+ * \f[ \left\{\begin{array}{cl} x, & x \ge 0 \\ -x, & x <
+ * 0\end{array}\right.\f]
+--- kcalc/knumber/knumber_priv.h (revision 489522)
++++ kcalc/knumber/knumber_priv.h (revision 495372)
+@@ -13,8 +13,8 @@
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA.
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
+ */
+ #ifndef _KNUMBER_PRIV_H
+ #define _KNUMBER_PRIV_H
+@@ -46,7 +46,7 @@
+
+ virtual NumType type(void) const = 0;
+
+- virtual QString const ascii(QString const &num = QString::null) const = 0;
++ virtual QString const ascii(int prec = -1) const = 0;
+
+ virtual _knumber * abs(void) const = 0;
+ virtual _knumber * intPart(void) const = 0;
+@@ -90,7 +90,7 @@
+
+ virtual NumType type(void) const {return SpecialType;}
+
+- virtual QString const ascii(QString const &num = QString::null) const;
++ virtual QString const ascii(int prec = -1) const;
+
+ virtual _knumber * abs(void) const;
+ virtual _knumber * intPart(void) const;
+@@ -156,7 +156,7 @@
+
+ virtual NumType type(void) const {return IntegerType;}
+
+- virtual QString const ascii(QString const &num = QString::null) const;
++ virtual QString const ascii(int prec = -1) const;
+
+ virtual _knumber * abs(void) const;
+ virtual _knumber * intPart(void) const;
+@@ -216,7 +216,7 @@
+
+ virtual NumType type(void) const {return FractionType;}
+
+- virtual QString const ascii(QString const &num= QString::null) const;
++ virtual QString const ascii(int prec = -1) const;
+
+ bool isInteger(void) const;
+
+@@ -269,7 +269,7 @@
+
+ virtual NumType type(void) const {return FloatType;}
+
+- virtual QString const ascii(QString const &num = QString::null) const;
++ virtual QString const ascii(int prec = -1) const;
+
+ virtual _knumber * abs(void) const;
+ virtual _knumber * intPart(void) const;
+--- kcalc/kcalc_const_button.h (revision 489522)
++++ kcalc/kcalc_const_button.h (revision 495372)
+@@ -17,7 +17,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kcalc/TODO (revision 489522)
++++ kcalc/TODO (revision 495372)
+@@ -6,3 +6,10 @@
+ * better to handle keys with "accel" or with "keyPressEvent"?
+
+ * think about either doing RichText by hand on labels, or only draw visible buttons, to enhance startup time.
++
++Following examples from the handbook do not work anymore as explained
++in the documentation. Need to update the documentation!!
++* 22.345 Mod 8 = will give the result 6.345
++* 10.345 Lsh 3 = also gives 80
++* 16 Inv Lsh 2 = gives 4 (16 divided by 2 twice).
++* 16.999 Inv Lsh 2 = also gives 4
+\ No newline at end of file
+--- kcalc/kcalctype.h (revision 489522)
++++ kcalc/kcalctype.h (revision 495372)
+@@ -19,7 +19,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- kcalc/kcalc_core.cpp (revision 489522)
++++ kcalc/kcalc_core.cpp (revision 495372)
+@@ -24,7 +24,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+@@ -770,7 +770,7 @@
+
+ void CalcEngine::TangensHyp(KNumber input)
+ {
+- CALCAMNT tmp_num = input.toQString().toDouble();
++ CALCAMNT tmp_num = static_cast<double>(input);
+ _last_number = KNumber(double(TANH(tmp_num)));
+ }
+
+--- kcalc/dlabel.h (revision 489522)
++++ kcalc/dlabel.h (revision 495372)
+@@ -20,7 +20,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/extractiondialog.cpp (revision 489522)
++++ ark/extractiondialog.cpp (revision 495372)
+@@ -23,7 +23,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- ark/ark_part.cpp (revision 489522)
++++ ark/ark_part.cpp (revision 495372)
+@@ -17,7 +17,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+@@ -124,7 +124,7 @@
+ extractAction = new KAction(i18n("E&xtract..."), "ark_extract", 0, awidget,
+ SLOT(action_extract()), actionCollection(), "extract");
+
+- deleteAction = new KAction(i18n("De&lete"), "ark_delete", 0, awidget,
++ deleteAction = new KAction(i18n("De&lete"), "ark_delete", KShortcut(Qt::Key_Delete), awidget,
+ SLOT(action_delete()), actionCollection(), "delete");
+
+ viewAction = new KAction(i18n("to view something","&View"), "ark_view", 0, awidget,
+--- ark/arkutils.h (revision 489522)
++++ ark/arkutils.h (revision 495372)
+@@ -25,7 +25,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/arkfactory.cpp (revision 489522)
++++ ark/arkfactory.cpp (revision 495372)
+@@ -15,7 +15,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/archiveformatinfo.cpp (revision 489522)
++++ ark/archiveformatinfo.cpp (revision 495372)
+@@ -16,7 +16,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/ar.h (revision 489522)
++++ ark/ar.h (revision 495372)
+@@ -23,7 +23,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/zip.h (revision 489522)
++++ ark/zip.h (revision 495372)
+@@ -21,7 +21,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/zoo.h (revision 489522)
++++ ark/zoo.h (revision 495372)
+@@ -19,7 +19,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+ #ifndef ZOO_H
+--- ark/archiveformatdlg.cpp (revision 489522)
++++ ark/archiveformatdlg.cpp (revision 495372)
+@@ -15,7 +15,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/arkapp.h (revision 489522)
++++ ark/arkapp.h (revision 495372)
+@@ -20,7 +20,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/searchbar.cpp (revision 489522)
++++ ark/searchbar.cpp (revision 495372)
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- ark/ark_part.desktop (revision 489522)
++++ ark/ark_part.desktop (revision 495372)
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb
++MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-tbz2;application/x-zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb
+ Comment=Archive Handling Tool
+ Comment[af]=Argief Handtering Program
+ Comment[ar]=أداة للتعامل مغ الملقات المضغوطة
+--- ark/lha.cpp (revision 489522)
++++ ark/lha.cpp (revision 495372)
+@@ -21,7 +21,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/arkviewer.h (revision 489522)
++++ ark/arkviewer.h (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- ark/extractiondialog.h (revision 489522)
++++ ark/extractiondialog.h (revision 495372)
+@@ -22,7 +22,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- ark/zoo.cpp (revision 489522)
++++ ark/zoo.cpp (revision 495372)
+@@ -19,7 +19,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/archiveformatinfo.h (revision 489522)
++++ ark/archiveformatinfo.h (revision 495372)
+@@ -16,7 +16,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/mainwindow.cpp (revision 489522)
++++ ark/mainwindow.cpp (revision 495372)
+@@ -17,7 +17,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/arch.h (revision 489522)
++++ ark/arch.h (revision 495372)
+@@ -21,7 +21,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/ace.cpp (revision 489522)
++++ ark/ace.cpp (revision 495372)
+@@ -18,7 +18,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/searchbar.h (revision 489522)
++++ ark/searchbar.h (revision 495372)
+@@ -17,7 +17,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- ark/arkviewer.cpp (revision 489522)
++++ ark/arkviewer.cpp (revision 495372)
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+--- ark/compressedfile.cpp (revision 489522)
++++ ark/compressedfile.cpp (revision 495372)
+@@ -19,7 +19,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/ark.desktop (revision 489522)
++++ ark/ark.desktop (revision 495372)
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb
++MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-tbz2;application/x-zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb
+ GenericName=Archiving Tool
+ GenericName[af]=Argiveer Program
+ GenericName[ar]=أداة أرشÙØ©
+--- ark/filelistview.cpp (revision 489522)
++++ ark/filelistview.cpp (revision 495372)
+@@ -22,7 +22,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+@@ -260,7 +260,7 @@
+ * the next item is the next sibling of its parent, and so on.
+ */
+ FileLVI *nitem = static_cast<FileLVI*>( item->nextSibling() );
+- while ( !nitem and item->parent() )
++ while ( !nitem && item->parent() )
+ {
+ item = static_cast<FileLVI*>( item->parent() );
+ nitem = static_cast<FileLVI*>( item->parent()->nextSibling() );
+--- ark/sevenzip.h (revision 489522)
++++ ark/sevenzip.h (revision 495372)
+@@ -18,7 +18,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+ #ifndef SEVENZIP_H
+--- ark/lha.h (revision 489522)
++++ ark/lha.h (revision 495372)
+@@ -21,7 +21,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+ #ifndef LHA_H
+--- ark/arch.cpp (revision 489522)
++++ ark/arch.cpp (revision 495372)
+@@ -22,7 +22,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/mainwindow.h (revision 489522)
++++ ark/mainwindow.h (revision 495372)
+@@ -17,7 +17,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/rar.cpp (revision 489522)
++++ ark/rar.cpp (revision 495372)
+@@ -19,7 +19,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/main.cpp (revision 489522)
++++ ark/main.cpp (revision 495372)
+@@ -22,7 +22,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/arkwidget.h (revision 489522)
++++ ark/arkwidget.h (revision 495372)
+@@ -23,7 +23,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/tar.cpp (revision 489522)
++++ ark/tar.cpp (revision 495372)
+@@ -23,7 +23,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/ace.h (revision 489522)
++++ ark/ace.h (revision 495372)
+@@ -18,7 +18,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/arkutils.cpp (revision 489522)
++++ ark/arkutils.cpp (revision 495372)
+@@ -25,7 +25,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/ar.cpp (revision 489522)
++++ ark/ar.cpp (revision 495372)
+@@ -20,7 +20,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/zip.cpp (revision 489522)
++++ ark/zip.cpp (revision 495372)
+@@ -21,7 +21,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/sevenzip.cpp (revision 489522)
++++ ark/sevenzip.cpp (revision 495372)
+@@ -20,7 +20,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/ark_part.h (revision 489522)
++++ ark/ark_part.h (revision 495372)
+@@ -16,7 +16,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/compressedfile.h (revision 489522)
++++ ark/compressedfile.h (revision 495372)
+@@ -19,7 +19,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+ #ifndef COMPRESSED_FILE_H
+--- ark/arkfactory.h (revision 489522)
++++ ark/arkfactory.h (revision 495372)
+@@ -15,7 +15,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/filelistview.h (revision 489522)
++++ ark/filelistview.h (revision 495372)
+@@ -22,7 +22,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+ #ifndef FILELISTVIEW_H
+--- ark/arkapp.cpp (revision 489522)
++++ ark/arkapp.cpp (revision 495372)
+@@ -21,7 +21,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- ark/arkwidget.cpp (revision 489522)
++++ ark/arkwidget.cpp (revision 495372)
+@@ -25,7 +25,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+@@ -1242,11 +1242,13 @@
+ QStringList list = m_fileListView->selectedFilenames();
+
+ // ask for confirmation
+- if ( !KMessageBox::warningContinueCancel( this,
++ if ( KMessageBox::warningContinueCancelList( this,
+ i18n( "Do you really want to delete the selected items?" ),
++ list,
+ QString::null,
+- KStdGuiItem::del() )
+- == KMessageBox::Continue)
++ KStdGuiItem::del(),
++ "confirmDelete" )
++ != KMessageBox::Continue)
+ {
+ return;
+ }
+--- ark/archiveformatdlg.h (revision 489522)
++++ ark/archiveformatdlg.h (revision 495372)
+@@ -16,7 +16,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+ #ifndef ARCHIVEFORMATDLG_H
+--- ark/rar.h (revision 489522)
++++ ark/rar.h (revision 495372)
+@@ -18,7 +18,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+ #ifndef RAR_H
+--- ark/tar.h (revision 489522)
++++ ark/tar.h (revision 495372)
+@@ -24,7 +24,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+
+--- superkaramba/src/karamba.cpp (revision 489522)
++++ superkaramba/src/karamba.cpp (revision 495372)
+@@ -17,7 +17,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #include "karamba_python.h"
+--- superkaramba/src/input.cpp (revision 489522)
++++ superkaramba/src/input.cpp (revision 495372)
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #include "input.h"
+--- superkaramba/src/sknewstuff.cpp (revision 489522)
++++ superkaramba/src/sknewstuff.cpp (revision 495372)
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #include <kapplication.h>
+@@ -30,9 +30,13 @@
+ #include <qdir.h>
+ #include <qfileinfo.h>
+
++#ifdef HAVE_CONFIG_H
++ #include <config.h>
++#endif
++
+ #include "karambaapp.h"
+ #include "themesdlg.h"
+-#ifdef KDE_3_3
++#ifdef HAVE_KNEWSTUFF
+ #include "sknewstuff.h"
+
+ SKNewStuff::SKNewStuff( ThemesDlg *dlg ) :
+@@ -44,6 +48,7 @@
+ void SKNewStuff::addThemes(const KArchiveDirectory *archiveDir,
+ const QString& destDir)
+ {
++ kdDebug() << "SKNewStuff::addThemes(): destDir = " << destDir << endl;
+ QStringList entries = archiveDir->entries();
+
+ QStringList::Iterator end( entries.end() );
+@@ -57,8 +62,10 @@
+ else
+ {
+ QFileInfo fi(*it);
+- if(fi.extension() == "theme")
++ if(fi.extension( FALSE ) == "theme")
+ {
++ kdDebug() << "SKNewStuff::addThemes(): theme " << *it
++ << "added to theme dialog" << endl;
+ mDlg->addThemeToList(destDir + *it);
+ }
+ }
+@@ -152,4 +159,4 @@
+ }
+ return KGlobal::dirs()->saveLocation( "tmp" ) + source.fileName();
+ }
+-#endif //KDE_3_3
++#endif //HAVE_KNEWSTUFF
+--- superkaramba/src/richtextlabel_python.h (revision 489522)
++++ superkaramba/src/richtextlabel_python.h (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifndef RICHTEXTLABEL_PYTHON_H
+--- superkaramba/src/themefile.cpp (revision 489522)
++++ superkaramba/src/themefile.cpp (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+ #include "themefile.h"
+ #include "lineparser.h"
+@@ -327,8 +327,6 @@
+
+ bool ThemeFile::canUninstall() const
+ {
+- if(!isZipTheme())
+- return false;
+ QFileInfo fi(file());
+ if(fi.permission(QFileInfo::WriteUser) ||
+ fi.permission(QFileInfo::WriteGroup) ||
+--- superkaramba/src/kwidgetlistbox.cpp (revision 489522)
++++ superkaramba/src/kwidgetlistbox.cpp (revision 495372)
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+ #include "kwidgetlistbox.h"
+ #include <kdebug.h>
+--- superkaramba/src/task_python.cpp (revision 489522)
++++ superkaramba/src/task_python.cpp (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifdef _XOPEN_SOURCE
+--- superkaramba/src/menu_python.cpp (revision 489522)
++++ superkaramba/src/menu_python.cpp (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifdef _XOPEN_SOURCE
+--- superkaramba/src/config_python.cpp (revision 489522)
++++ superkaramba/src/config_python.cpp (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifdef _XOPEN_SOURCE
+--- superkaramba/src/graph_python.h (revision 489522)
++++ superkaramba/src/graph_python.h (revision 495372)
+@@ -17,7 +17,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifndef GRAPH_PYTHON_H
+--- superkaramba/src/themewidget.h (revision 489522)
++++ superkaramba/src/themewidget.h (revision 495372)
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+ #ifndef THEMEWIDGET_H
+ #define THEMEWIDGET_H
+--- superkaramba/src/imagelabel_python.cpp (revision 489522)
++++ superkaramba/src/imagelabel_python.cpp (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifdef _XOPEN_SOURCE
+--- superkaramba/src/textlabel_python.cpp (revision 489522)
++++ superkaramba/src/textlabel_python.cpp (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifdef _XOPEN_SOURCE
+--- superkaramba/src/taskbartest.cpp (revision 489522)
++++ superkaramba/src/taskbartest.cpp (revision 495372)
+@@ -17,7 +17,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #include <kapplication.h>
+--- superkaramba/src/themelocale.h (revision 489522)
++++ superkaramba/src/themelocale.h (revision 495372)
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+ #ifndef THEMELOCALE_H
+ #define THEMELOCALE_H
+--- superkaramba/src/richtextlabel_python.cpp (revision 489522)
++++ superkaramba/src/richtextlabel_python.cpp (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifdef _XOPEN_SOURCE
+--- superkaramba/src/input_python.cpp (revision 489522)
++++ superkaramba/src/input_python.cpp (revision 495372)
+@@ -20,7 +20,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifdef _XOPEN_SOURCE
+--- superkaramba/src/karamba.h (revision 489522)
++++ superkaramba/src/karamba.h (revision 495372)
+@@ -17,7 +17,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifndef _KARAMBA_H_
+--- superkaramba/src/karamba_python.h (revision 489522)
++++ superkaramba/src/karamba_python.h (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifndef KARAMBA_PYTHON_H
+--- superkaramba/src/themefile.h (revision 489522)
++++ superkaramba/src/themefile.h (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+ #ifndef THEMEFILE_H
+ #define THEMEFILE_H
+--- superkaramba/src/bar_python.h (revision 489522)
++++ superkaramba/src/bar_python.h (revision 495372)
+@@ -17,7 +17,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifndef BAR_PYTHON_H
+--- superkaramba/src/showdesktop.cpp (revision 489522)
++++ superkaramba/src/showdesktop.cpp (revision 495372)
+@@ -16,7 +16,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+ #include <kwinmodule.h>
+ #include <netwm.h>
+--- superkaramba/src/config_python.h (revision 489522)
++++ superkaramba/src/config_python.h (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifndef CONFIG_PYTHON_H
+--- superkaramba/src/themesdlg.cpp (revision 489522)
++++ superkaramba/src/themesdlg.cpp (revision 495372)
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+ #include "karambaapp.h"
+ #include "dcopinterface_stub.h"
+@@ -25,7 +25,11 @@
+ #include "kwidgetlistbox.h"
+ #include "karamba.h"
+
+-#ifdef KDE_3_3
++#ifdef HAVE_CONFIG_H
++ #include <config.h>
++#endif
++
++#ifdef HAVE_KNEWSTUFF
+ #include "sknewstuff.h"
+ #endif
+
+@@ -49,7 +53,7 @@
+ : ThemesLayout(parent, name)
+ {
+ populateListbox();
+-#ifdef KDE_3_3
++#ifdef HAVE_KNEWSTUFF
+ mNewStuff = 0;
+ #endif
+ }
+@@ -58,7 +62,7 @@
+ {
+ //kdDebug() << k_funcinfo << endl;
+ saveUserAddedThemes();
+-#ifdef KDE_3_3
++#ifdef HAVE_KNEWSTUFF
+ if(mNewStuff)
+ {
+ delete mNewStuff;
+@@ -126,7 +130,7 @@
+ item->setDescriptionText(i18n("Download new themes."));
+
+ item->buttonGo->setText(i18n("New Stuff..."));
+-#ifdef KDE_3_3
++#ifdef HAVE_KNEWSTUFF
+ item->buttonGo->setEnabled(true);
+ connect(item->buttonGo, SIGNAL(clicked()),
+ this, SLOT(getNewStuff()));
+@@ -210,7 +214,7 @@
+
+ void ThemesDlg::getNewStuff()
+ {
+-#ifdef KDE_3_3
++#ifdef HAVE_KNEWSTUFF
+ KConfig* config = KGlobal::config();
+ config->setGroup("KNewStuff");
+ config->writeEntry("ProvidersUrl",
+@@ -260,7 +264,7 @@
+ {
+ addThemeToList(file);
+
+-#ifdef KDE_3_3
++#ifdef HAVE_KNEWSTUFF
+ KConfig* config = KGlobal::config();
+ QStringList keys = config->entryMap("KNewStuffStatus").keys();
+
+@@ -354,25 +358,35 @@
+ KURL trash("trash:/");
+ KURL theme(tf->file());
+
+- karambaApp->dcopIface()->closeTheme(tf->name());
+- if(!KProtocolInfo::isKnownProtocol(trash))
+- trash = KGlobalSettings::trashPath();
+- KIO::move(theme, trash);
+- tableThemes->removeItem(w);
+-#ifdef KDE_3_3
+- // Remove theme from KNewStuffStatus
+- KConfig* config = KGlobal::config();
+-
+- config->setGroup("KNewStuffNames");
+- QString name = config->readEntry(theme.path());
+- kdDebug() << theme.path() << name << endl;
+- if(!name.isEmpty())
++ if(!tf->isZipTheme())
+ {
+- kapp->config()->deleteEntry(theme.path());
+- config->setGroup("KNewStuffStatus");
+- kapp->config()->deleteEntry(name);
++ kdDebug() << "removing " << tf->name() << " from the theme dialog" << endl;
++ karambaApp->dcopIface()->closeTheme(tf->name());
++ tableThemes->removeItem(w);
+ }
++ else
++ {
++ karambaApp->dcopIface()->closeTheme(tf->name());
++ if(!KProtocolInfo::isKnownProtocol(trash))
++ trash = KGlobalSettings::trashPath();
++ kdDebug() << "moving " << theme.fileName() << " to the trash" << endl;
++ KIO::move(theme, trash);
++ tableThemes->removeItem(w);
++#ifdef HAVE_KNEWSTUFF
++ // Remove theme from KNewStuffStatus
++ KConfig* config = KGlobal::config();
++
++ config->setGroup("KNewStuffNames");
++ QString name = config->readEntry(theme.path());
++ kdDebug() << theme.path() << name << endl;
++ if(!name.isEmpty())
++ {
++ kapp->config()->deleteEntry(theme.path());
++ config->setGroup("KNewStuffStatus");
++ kapp->config()->deleteEntry(name);
++ }
+ #endif
++ }
+ selectionChanged(tableThemes->selected());
+ }
+
+--- superkaramba/src/karambasessionmanaged.h (revision 489522)
++++ superkaramba/src/karambasessionmanaged.h (revision 495372)
+@@ -17,6 +17,6 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+--- superkaramba/src/systray_python.h (revision 489522)
++++ superkaramba/src/systray_python.h (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifndef SYSTRAY_PYTHON_H
+--- superkaramba/src/misc_python.cpp (revision 489522)
++++ superkaramba/src/misc_python.cpp (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifdef _XOPEN_SOURCE
+--- superkaramba/src/karamba_python.cpp (revision 489522)
++++ superkaramba/src/karamba_python.cpp (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifdef _XOPEN_SOURCE
+--- superkaramba/src/lineparser.cpp (revision 489522)
++++ superkaramba/src/lineparser.cpp (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+ #include "lineparser.h"
+ #include <qregexp.h>
+--- superkaramba/src/bar_python.cpp (revision 489522)
++++ superkaramba/src/bar_python.cpp (revision 495372)
+@@ -17,7 +17,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifdef _XOPEN_SOURCE
+--- superkaramba/src/input_python.h (revision 489522)
++++ superkaramba/src/input_python.h (revision 495372)
+@@ -20,7 +20,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifndef INPUT_PYTHON_H
+--- superkaramba/src/karambasessionmanaged.cpp (revision 489522)
++++ superkaramba/src/karambasessionmanaged.cpp (revision 495372)
+@@ -17,7 +17,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #include <kapplication.h>
+--- superkaramba/src/showdesktop.h (revision 489522)
++++ superkaramba/src/showdesktop.h (revision 495372)
+@@ -16,7 +16,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifndef __showdesktop_h__
+--- superkaramba/src/systray_python.cpp (revision 489522)
++++ superkaramba/src/systray_python.cpp (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifdef _XOPEN_SOURCE
+--- superkaramba/src/themesdlg.h (revision 489522)
++++ superkaramba/src/themesdlg.h (revision 495372)
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifndef THEMESDLG_H
+@@ -24,10 +24,14 @@
+ #include <themes_layout.h>
+ #include "karambaapp.h"
+
++#ifdef HAVE_CONFIG_H
++ #include <config.h>
++#endif
++
+ /**
+ @author See README for the list of authors
+ */
+-#ifdef KDE_3_3
++#ifdef HAVE_KNEWSTUFF
+ class SKNewStuff;
+ #endif
+
+@@ -60,7 +64,7 @@
+ int themeIndex(QString file);
+ QStringList themes();
+
+-#ifdef KDE_3_3
++#ifdef HAVE_KNEWSTUFF
+ private:
+ SKNewStuff *mNewStuff;
+ QStringList m_newStuffStatus;
+--- superkaramba/src/karambalistboxitem.cpp (revision 489522)
++++ superkaramba/src/karambalistboxitem.cpp (revision 495372)
+@@ -16,7 +16,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+ #include "karambalistboxitem.h"
+
+--- superkaramba/src/imagelabel.cpp (revision 489522)
++++ superkaramba/src/imagelabel.cpp (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #include <qpixmap.h>
+--- superkaramba/src/sensorparams.h (revision 489522)
++++ superkaramba/src/sensorparams.h (revision 495372)
+@@ -16,7 +16,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+ #ifndef SENSORPARAMS_H
+ #define SENSORPARAMS_H
+--- superkaramba/src/clickarea.h (revision 489522)
++++ superkaramba/src/clickarea.h (revision 495372)
+@@ -17,7 +17,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+ #ifndef CLICKAREA_H
+ #define CLICKAREA_H
+--- superkaramba/src/textfilesensor.h (revision 489522)
++++ superkaramba/src/textfilesensor.h (revision 495372)
+@@ -17,7 +17,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+ #ifndef TEXTFILESENSOR_H
+ #define TEXTFILESENSOR_H
+--- superkaramba/src/main.cpp (revision 489522)
++++ superkaramba/src/main.cpp (revision 495372)
+@@ -17,7 +17,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #include <karambaapp.h>
+--- superkaramba/src/widget_python.cpp (revision 489522)
++++ superkaramba/src/widget_python.cpp (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifdef _XOPEN_SOURCE
+--- superkaramba/src/sklineedit.h (revision 489522)
++++ superkaramba/src/sklineedit.h (revision 495372)
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifndef SKLINEEDIT_H
+--- superkaramba/src/misc_python.h (revision 489522)
++++ superkaramba/src/misc_python.h (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifndef MISC_PYTHON_H
+--- superkaramba/src/graph_python.cpp (revision 489522)
++++ superkaramba/src/graph_python.cpp (revision 495372)
+@@ -17,7 +17,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifdef _XOPEN_SOURCE
+--- superkaramba/src/input.h (revision 489522)
++++ superkaramba/src/input.h (revision 495372)
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifndef INPUT_H
+--- superkaramba/src/sknewstuff.h (revision 489522)
++++ superkaramba/src/sknewstuff.h (revision 495372)
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifndef SKNEWSTUFF_H
+@@ -23,7 +23,12 @@
+
+ #include <kurl.h>
+ #include "karambaapp.h"
+-#ifdef KDE_3_3
++
++#ifdef HAVE_CONFIG_H
++ #include <config.h>
++#endif
++
++#ifdef HAVE_KNEWSTUFF
+ #include "knewstuff/knewstuff.h"
+ #include "knewstuff/entry.h"
+
+@@ -48,5 +53,5 @@
+ KURL m_sourceLink;
+ };
+
++#endif //HAVE_KNEWSTUFF
+ #endif //SKNEWSTUFF_H
+-#endif //KDE_3_3
+--- superkaramba/src/themewidget.cpp (revision 489522)
++++ superkaramba/src/themewidget.cpp (revision 495372)
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+ #include "themewidget.h"
+ #include "themelocale.h"
+--- superkaramba/src/kwidgetlistbox.h (revision 489522)
++++ superkaramba/src/kwidgetlistbox.h (revision 495372)
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+ #ifndef KWIDGETLISTBOX_H
+ #define KWIDGETLISTBOX_H
+--- superkaramba/src/task_python.h (revision 489522)
++++ superkaramba/src/task_python.h (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifndef TASK_PYTHON_H
+--- superkaramba/src/lineparser.h (revision 489522)
++++ superkaramba/src/lineparser.h (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+ #ifndef LINEPARSER_H
+ #define LINEPARSER_H
+--- superkaramba/src/menu_python.h (revision 489522)
++++ superkaramba/src/menu_python.h (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifndef MENU_PYTHON_H
+--- superkaramba/src/themelocale.cpp (revision 489522)
++++ superkaramba/src/themelocale.cpp (revision 495372)
+@@ -23,7 +23,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+ #include <config.h>
+
+--- superkaramba/src/karambalistboxitem.h (revision 489522)
++++ superkaramba/src/karambalistboxitem.h (revision 495372)
+@@ -16,7 +16,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+ #include "karamba.h"
+ #include <qlistbox.h>
+--- superkaramba/src/imagelabel.h (revision 489522)
++++ superkaramba/src/imagelabel.h (revision 495372)
+@@ -18,7 +18,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifndef IMAGELABEL_H
+--- superkaramba/src/imagelabel_python.h (revision 489522)
++++ superkaramba/src/imagelabel_python.h (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifndef IMAGELABEL_PYTHON_H
+--- superkaramba/src/widget_python.h (revision 489522)
++++ superkaramba/src/widget_python.h (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifndef WIDGET_PYTHON_H
+--- superkaramba/src/textlabel_python.h (revision 489522)
++++ superkaramba/src/textlabel_python.h (revision 495372)
+@@ -19,7 +19,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #ifndef TEXTLABEL_PYTHON_H
+--- superkaramba/src/sklineedit.cpp (revision 489522)
++++ superkaramba/src/sklineedit.cpp (revision 495372)
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #include "sklineedit.h"
+--- superkaramba/src/taskbartest.h (revision 489522)
++++ superkaramba/src/taskbartest.h (revision 495372)
+@@ -17,7 +17,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with SuperKaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #include "taskmanager.h"
+--- superkaramba/configure.in.in (revision 489522)
++++ superkaramba/configure.in.in (revision 495372)
+@@ -63,8 +63,12 @@
+ AC_SUBST(XMMS_LDFLAGS)
+ AC_SUBST(XMMS_INCLUDES)
+
+-KDE_CHECK_LIB(knewstuff, main, [MY_LIBKNEWSTUFF="-lknewstuff"])
+-AC_SUBST(MY_LIBKNEWSTUFF)
++kde_have_knewstuff=yes
++KDE_CHECK_LIB(knewstuff, main, [MY_LIBKNEWSTUFF="-lknewstuff"], kde_have_knewstuff=no)
++if test "$kde_have_knewstuff" = "yes"; then
++ AC_DEFINE(HAVE_KNEWSTUFF, 1, [Define if you have knewstuff])
++ AC_SUBST(MY_LIBKNEWSTUFF)
++fi
+
+ AC_CHECK_LIB(kvm, main, [LIBKVM="-lkvm"])
+ AC_SUBST(LIBKVM)
+--- superkaramba/COPYING (revision 489522)
++++ superkaramba/COPYING (revision 495372)
+@@ -2,7 +2,7 @@
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+- 675 Mass Ave, Cambridge, MA 02139, USA
++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+--- superkaramba/examples/globalMouse/extension/xcursor.c (revision 489522)
++++ superkaramba/examples/globalMouse/extension/xcursor.c (revision 495372)
+@@ -23,7 +23,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Superkaramba; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ****************************************************************************/
+
+ #include <Python.h>
More information about the pkg-kde-commits
mailing list