[fondue-commits] [SCM] Fondue Font Editor branch, master, updated. 85629e3525a0e05a6d0483583269332ac45554ed

Eugeniy Meshcheryakov eugen at debian.org
Thu Feb 28 21:00:18 UTC 2008 

The following commit has been merged in the master branch:
commit b34bd5026b6bfd58a8e6c00838c214805f12c9f7
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Thu Feb 28 21:35:10 2008 +0100

    relicense under GPLv3 (*.cxx & *.h)

diff --git a/gui/colorcombobox.cxx b/gui/colorcombobox.cxx
index f66283d..e1142d5 100644
--- a/gui/colorcombobox.cxx
+++ b/gui/colorcombobox.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "colorcombobox.h"
 #include <QStringList>
diff --git a/gui/colorcombobox.h b/gui/colorcombobox.h
index c1f3d66..240292d 100644
--- a/gui/colorcombobox.h
+++ b/gui/colorcombobox.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef COLORCOMBOBOX_H
 #define COLORCOMBOBOX_H
diff --git a/gui/controlpoint.cxx b/gui/controlpoint.cxx
index aa87ccb..0f20fba 100644
--- a/gui/controlpoint.cxx
+++ b/gui/controlpoint.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "controlpoint.h"
 #include <QPainter>
diff --git a/gui/controlpoint.h b/gui/controlpoint.h
index e2beafe..5200fda 100644
--- a/gui/controlpoint.h
+++ b/gui/controlpoint.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef CONTROLPOINT_H
 #define CONTROLPOINT_H
diff --git a/gui/cvteditor.cxx b/gui/cvteditor.cxx
index d994348..3b81778 100644
--- a/gui/cvteditor.cxx
+++ b/gui/cvteditor.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "cvteditor.h"
 #include <QHBoxLayout>
diff --git a/gui/cvteditor.h b/gui/cvteditor.h
index 5e447d2..3676deb 100644
--- a/gui/cvteditor.h
+++ b/gui/cvteditor.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef CVTEDITOR_H
 #define CVTEDITOR_H
diff --git a/gui/documentinfoeditor.cxx b/gui/documentinfoeditor.cxx
index 745e347..f34e972 100644
--- a/gui/documentinfoeditor.cxx
+++ b/gui/documentinfoeditor.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "documentinfoeditor.h"
 #include <QGridLayout>
diff --git a/gui/documentinfoeditor.h b/gui/documentinfoeditor.h
index a73f4c2..d27a13d 100644
--- a/gui/documentinfoeditor.h
+++ b/gui/documentinfoeditor.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef DOCUMENTINFOEDITOR_H
 #define DOCUMENTINFOEDITOR_H
diff --git a/gui/glyphcell.cxx b/gui/glyphcell.cxx
index 555545f..3bfeb48 100644
--- a/gui/glyphcell.cxx
+++ b/gui/glyphcell.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "glyphcell.h"
 #include <QPainter>
diff --git a/gui/glyphcell.h b/gui/glyphcell.h
index f5f12cb..ed212e6 100644
--- a/gui/glyphcell.h
+++ b/gui/glyphcell.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef TTGLYPHCELL_H
 #define TTGLYPHCELL_H
diff --git a/gui/glypheditwidget.cxx b/gui/glypheditwidget.cxx
index 651365e..682d179 100644
--- a/gui/glypheditwidget.cxx
+++ b/gui/glypheditwidget.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "glypheditwidget.h"
 #include "glyphcell.h"
diff --git a/gui/glypheditwidget.h b/gui/glypheditwidget.h
index 63a3ff0..cf32585 100644
--- a/gui/glypheditwidget.h
+++ b/gui/glypheditwidget.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GLYPHEDITWIDGET_H
 #define GLYPHEDITWIDGET_H
diff --git a/gui/glyphgraphics.cxx b/gui/glyphgraphics.cxx
index 07c321e..41c5202 100644
--- a/gui/glyphgraphics.cxx
+++ b/gui/glyphgraphics.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "glyphgraphics.h"
 #include "glyphcell.h"
diff --git a/gui/glyphgraphics.h b/gui/glyphgraphics.h
index 42d5df9..f4dd6ab 100644
--- a/gui/glyphgraphics.h
+++ b/gui/glyphgraphics.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GLYPHGRAPHICS_H
 #define GLYPHGRAPHICS_H
diff --git a/gui/glyphiconengine.cxx b/gui/glyphiconengine.cxx
index 5e040ef..36ef4be 100644
--- a/gui/glyphiconengine.cxx
+++ b/gui/glyphiconengine.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "glyphiconengine.h"
 #include <QPainter>
diff --git a/gui/glyphiconengine.h b/gui/glyphiconengine.h
index b2a8826..bd303bb 100644
--- a/gui/glyphiconengine.h
+++ b/gui/glyphiconengine.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GLYPHICONENGINE_H
 #define GLYPHICONENGINE_H
diff --git a/gui/glyphitem.cxx b/gui/glyphitem.cxx
index 000127a..00547a9 100644
--- a/gui/glyphitem.cxx
+++ b/gui/glyphitem.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "glyphitem.h"
 #include "glyphgraphics.h"
diff --git a/gui/glyphitem.h b/gui/glyphitem.h
index a470497..23e6347 100644
--- a/gui/glyphitem.h
+++ b/gui/glyphitem.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GLYPHITEM_H
 #define GLYPHITEM_H
diff --git a/gui/glyphpropertieseditor.cxx b/gui/glyphpropertieseditor.cxx
index ba79982..2fc467a 100644
--- a/gui/glyphpropertieseditor.cxx
+++ b/gui/glyphpropertieseditor.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "glyphpropertieseditor.h"
 #include <QLabel>
diff --git a/gui/glyphpropertieseditor.h b/gui/glyphpropertieseditor.h
index a2eef37..4566e50 100644
--- a/gui/glyphpropertieseditor.h
+++ b/gui/glyphpropertieseditor.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GLYPHPROPERTIESEDITOR_H
 #define GLYPHPROPERTIESEDITOR_H
diff --git a/gui/glyphsgridwidget.cxx b/gui/glyphsgridwidget.cxx
index a7fa9e6..2d46499 100644
--- a/gui/glyphsgridwidget.cxx
+++ b/gui/glyphsgridwidget.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "glyphsgridwidget.h"
 #include <QPainter>
diff --git a/gui/glyphsgridwidget.h b/gui/glyphsgridwidget.h
index 68b8d83..f9bc8ca 100644
--- a/gui/glyphsgridwidget.h
+++ b/gui/glyphsgridwidget.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GLYPHGRIDWIDGET_H
 #define GLYPHGRIDWIDGET_H
diff --git a/gui/glyphsmodel.cxx b/gui/glyphsmodel.cxx
index d52e039..dccb1b1 100644
--- a/gui/glyphsmodel.cxx
+++ b/gui/glyphsmodel.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "glyphsmodel.h"
 #include "glyphiconengine.h"
diff --git a/gui/glyphsmodel.h b/gui/glyphsmodel.h
index be361e1..5ca51af 100644
--- a/gui/glyphsmodel.h
+++ b/gui/glyphsmodel.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GLYPHSMODEL_H
 #define GLYPHSMODEL_H
diff --git a/gui/glyphsmodeldelegate.cxx b/gui/glyphsmodeldelegate.cxx
index 2b5b519..d80b6d1 100644
--- a/gui/glyphsmodeldelegate.cxx
+++ b/gui/glyphsmodeldelegate.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "glyphsmodeldelegate.h"
 #include <QModelIndex>
diff --git a/gui/glyphsmodeldelegate.h b/gui/glyphsmodeldelegate.h
index 208820d..e9651d8 100644
--- a/gui/glyphsmodeldelegate.h
+++ b/gui/glyphsmodeldelegate.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GLYPHSMODELDELEGATE_H
 #define GLYPHSMODELDELEGATE_H
diff --git a/gui/mainwindow.cxx b/gui/mainwindow.cxx
index 40ad2a0..a91803e 100644
--- a/gui/mainwindow.cxx
+++ b/gui/mainwindow.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "mainwindow.h"
 #include <QAction>
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 0591c2a..75c62ba 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
diff --git a/gui/maxpeditor.cxx b/gui/maxpeditor.cxx
index d1859ec..77a7818 100644
--- a/gui/maxpeditor.cxx
+++ b/gui/maxpeditor.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "maxpeditor.h"
 #include <QGridLayout>
diff --git a/gui/maxpeditor.h b/gui/maxpeditor.h
index 60ba187..b6c67e7 100644
--- a/gui/maxpeditor.h
+++ b/gui/maxpeditor.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef MAXPEDITOR_H
 #define MAXPEDITOR_H
diff --git a/gui/ttieditor.cxx b/gui/ttieditor.cxx
index 4b56880..1964666 100644
--- a/gui/ttieditor.cxx
+++ b/gui/ttieditor.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "ttieditor.h"
 #include <QTextEdit>
diff --git a/gui/ttieditor.h b/gui/ttieditor.h
index e465d58..ea98a1e 100644
--- a/gui/ttieditor.h
+++ b/gui/ttieditor.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef TTIEDITOR_H
 #define TTIEDITOR_H
diff --git a/gui/ttihighlighter.cxx b/gui/ttihighlighter.cxx
index e32edff..0146beb 100644
--- a/gui/ttihighlighter.cxx
+++ b/gui/ttihighlighter.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "ttihighlighter.h"
 #include <QRegExp>
diff --git a/gui/ttihighlighter.h b/gui/ttihighlighter.h
index d13180b..6889f44 100644
--- a/gui/ttihighlighter.h
+++ b/gui/ttihighlighter.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef TTIHIGHLIGHTER_H
 #define TTIHIGHLIGHTER_H
diff --git a/gui/unicodeproxymodel.cxx b/gui/unicodeproxymodel.cxx
index 0ddc312..8f45f1f 100644
--- a/gui/unicodeproxymodel.cxx
+++ b/gui/unicodeproxymodel.cxx
@@ -338,4 +338,16 @@ void UnicodeProxyModel::sourceRowsRemoved(const QModelIndex &parent, int start,
 			toSourceMap[i.key()] = i.value() - diff;
 		}
 	}
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 }
diff --git a/gui/unicodeproxymodel.h b/gui/unicodeproxymodel.h
index 47a7970..9ac3cfd 100644
--- a/gui/unicodeproxymodel.h
+++ b/gui/unicodeproxymodel.h
@@ -41,4 +41,16 @@ private:
 	void createMapping();
 };
 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
diff --git a/gui/unicodevalueeditor.cxx b/gui/unicodevalueeditor.cxx
index 6b53ed6..f97aa44 100644
--- a/gui/unicodevalueeditor.cxx
+++ b/gui/unicodevalueeditor.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "unicodevalueeditor.h"
 #include <QRegExpValidator>
diff --git a/gui/unicodevalueeditor.h b/gui/unicodevalueeditor.h
index 91cd111..aab16f7 100644
--- a/gui/unicodevalueeditor.h
+++ b/gui/unicodevalueeditor.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef UNICODEVALUEEDITOR_H
 #define UNICODEVALUEEDITOR_H
diff --git a/nongui/cvtentry.h b/nongui/cvtentry.h
index 2d702bd..9e46d6d 100644
--- a/nongui/cvtentry.h
+++ b/nongui/cvtentry.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef CVTENTRY_H
 #define CVTENTRY_H
diff --git a/nongui/cvtmodel.cxx b/nongui/cvtmodel.cxx
index 9365333..f80fde0 100644
--- a/nongui/cvtmodel.cxx
+++ b/nongui/cvtmodel.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "cvtmodel.h"
 #include "fontdocument.h"
diff --git a/nongui/cvtmodel.h b/nongui/cvtmodel.h
index c5a5fc9..1f3d012 100644
--- a/nongui/cvtmodel.h
+++ b/nongui/cvtmodel.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef CVTMODEL_H
 #define CVTMODEL_H
diff --git a/nongui/documentinfomodel.cxx b/nongui/documentinfomodel.cxx
index aad14ca..28a09c1 100644
--- a/nongui/documentinfomodel.cxx
+++ b/nongui/documentinfomodel.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "documentinfomodel.h"
 #include "fontdocument.h"
diff --git a/nongui/documentinfomodel.h b/nongui/documentinfomodel.h
index 0e36884..1056224 100644
--- a/nongui/documentinfomodel.h
+++ b/nongui/documentinfomodel.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef DOCUMENTINFOMODEL_H
 #define DOCUMENTINFOMODEL_H
diff --git a/nongui/fontdocument.cxx b/nongui/fontdocument.cxx
index 44af6de..ec62e49 100644
--- a/nongui/fontdocument.cxx
+++ b/nongui/fontdocument.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "fontdocument.h"
 
diff --git a/nongui/fontdocument.h b/nongui/fontdocument.h
index 122d9aa..a88b536 100644
--- a/nongui/fontdocument.h
+++ b/nongui/fontdocument.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef FONTDOCUMENT_H
 #define FONTDOCUMENT_H
diff --git a/nongui/fontdocumentreader.cxx b/nongui/fontdocumentreader.cxx
index 1306c6e..78321df 100644
--- a/nongui/fontdocumentreader.cxx
+++ b/nongui/fontdocumentreader.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "fontdocumentreader.h"
 #include <QPointF>
diff --git a/nongui/fontdocumentreader.h b/nongui/fontdocumentreader.h
index 4a7dbe7..7c66bd4 100644
--- a/nongui/fontdocumentreader.h
+++ b/nongui/fontdocumentreader.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef FONTDOCUMENTREADER_H
 #define FONTDOCUMENTREADER_H
diff --git a/nongui/fontdocumentwriter.cxx b/nongui/fontdocumentwriter.cxx
index ae67c8c..e00d087 100644
--- a/nongui/fontdocumentwriter.cxx
+++ b/nongui/fontdocumentwriter.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "fontdocumentwriter.h"
 #include "fontdocument.h"
diff --git a/nongui/fontdocumentwriter.h b/nongui/fontdocumentwriter.h
index 8e0ac81..e5e702c 100644
--- a/nongui/fontdocumentwriter.h
+++ b/nongui/fontdocumentwriter.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef FONTDOCUMENTWRITER_H
 #define FONTDOCUMENTWRITER_H
diff --git a/nongui/glyph.cxx b/nongui/glyph.cxx
index d7f772f..32c4e43 100644
--- a/nongui/glyph.cxx
+++ b/nongui/glyph.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "glyph.h"
 #include "glyphcontour.h"
diff --git a/nongui/glyph.h b/nongui/glyph.h
index ba306a4..d1087a9 100644
--- a/nongui/glyph.h
+++ b/nongui/glyph.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GLYPH_H
 #define GLYPH_H
diff --git a/nongui/glyphcontentbase.h b/nongui/glyphcontentbase.h
index 0c9913c..eda6614 100644
--- a/nongui/glyphcontentbase.h
+++ b/nongui/glyphcontentbase.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GLYPHCONTENTBASE_H
 #define GLYPHCONTENTBASE_H
diff --git a/nongui/glyphcontour.cxx b/nongui/glyphcontour.cxx
index 5b563a0..1bc8ccd 100644
--- a/nongui/glyphcontour.cxx
+++ b/nongui/glyphcontour.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "glyphcontour.h"
 
diff --git a/nongui/glyphcontour.h b/nongui/glyphcontour.h
index c2ca5c6..ba6aad3 100644
--- a/nongui/glyphcontour.h
+++ b/nongui/glyphcontour.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GLYPHCONTOUR_H
 #define GLYPHCONTOUR_H
diff --git a/nongui/glyphpoint.h b/nongui/glyphpoint.h
index 92dbbf6..ef76325 100644
--- a/nongui/glyphpoint.h
+++ b/nongui/glyphpoint.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GLYPHPOINT_H
 #define GLYPHPOINT_H
diff --git a/nongui/glyphreference.cxx b/nongui/glyphreference.cxx
index 2c5f6a1..bd40fc5 100644
--- a/nongui/glyphreference.cxx
+++ b/nongui/glyphreference.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "glyphreference.h"
 
diff --git a/nongui/glyphreference.h b/nongui/glyphreference.h
index 44d045d..1189ac4 100644
--- a/nongui/glyphreference.h
+++ b/nongui/glyphreference.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GLYPHREFERENCE_H
 #define GLYPHREFERENCE_H
diff --git a/nongui/ttfdecode.cxx b/nongui/ttfdecode.cxx
index 24af011..413a513 100644
--- a/nongui/ttfdecode.cxx
+++ b/nongui/ttfdecode.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <QByteArray>
 #include <QDataStream>
diff --git a/nongui/ttfdecode.h b/nongui/ttfdecode.h
index 6480f83..2fba25f 100644
--- a/nongui/ttfdecode.h
+++ b/nongui/ttfdecode.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef TTFDECODE_H
 #define TTFDECODE_H
diff --git a/nongui/ttfencode.cxx b/nongui/ttfencode.cxx
index 13eb096..d3dbaf0 100644
--- a/nongui/ttfencode.cxx
+++ b/nongui/ttfencode.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "ttfencode.h"
 #include <QIODevice>
diff --git a/nongui/ttfencode.h b/nongui/ttfencode.h
index 5314fdf..77ea80c 100644
--- a/nongui/ttfencode.h
+++ b/nongui/ttfencode.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef TTFENCODE_H
 #define TTFENCODE_H
diff --git a/nongui/ttfwriter.cxx b/nongui/ttfwriter.cxx
index f96ac8e..26963fb 100644
--- a/nongui/ttfwriter.cxx
+++ b/nongui/ttfwriter.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "ttfwriter.h"
 #include <QDebug>
diff --git a/nongui/ttfwriter.h b/nongui/ttfwriter.h
index 81eb78e..fea791d 100644
--- a/nongui/ttfwriter.h
+++ b/nongui/ttfwriter.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef TTFWRITER_H
 #define TTFWRITER_H
diff --git a/nongui/unicodenameslist.cxx b/nongui/unicodenameslist.cxx
index 37c00bd..aee37ef 100644
--- a/nongui/unicodenameslist.cxx
+++ b/nongui/unicodenameslist.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "unicodenameslist.h"
 
diff --git a/nongui/unicodenameslist.h b/nongui/unicodenameslist.h
index f152e4d..67b2018 100644
--- a/nongui/unicodenameslist.h
+++ b/nongui/unicodenameslist.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef UNICODENAMESLIST_H
 #define UNICODENAMESLIST_H
diff --git a/qscript/constructors.cxx b/qscript/constructors.cxx
index 758165b..1da026b 100644
--- a/qscript/constructors.cxx
+++ b/qscript/constructors.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "constructors.h"
 #include "fontdocument.h"
diff --git a/qscript/constructors.h b/qscript/constructors.h
index c17d992..dae9df3 100644
--- a/qscript/constructors.h
+++ b/qscript/constructors.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef CONSTRUCTORS_H
 #define CONSTRUCTORS_H
diff --git a/qscript/fontio.cxx b/qscript/fontio.cxx
index 0f5666f..d473072 100644
--- a/qscript/fontio.cxx
+++ b/qscript/fontio.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "fontio.h"
 #include "fontdocument.h"
diff --git a/qscript/fontio.h b/qscript/fontio.h
index 62e2922..100e2b0 100644
--- a/qscript/fontio.h
+++ b/qscript/fontio.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef FONTIO_H
 #define FONTIO_H
diff --git a/qscript/scriptconsole.cxx b/qscript/scriptconsole.cxx
index c7bf0ac..ddb4ed5 100644
--- a/qscript/scriptconsole.cxx
+++ b/qscript/scriptconsole.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "scriptconsole.h"
 #include <QSplitter>
diff --git a/qscript/scriptconsole.h b/qscript/scriptconsole.h
index 5f58613..97de1cf 100644
--- a/qscript/scriptconsole.h
+++ b/qscript/scriptconsole.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef SCRIPTCONSOLE_H
 #define SCRIPTCONSOLE_H
diff --git a/ruby/ascii85.cxx b/ruby/ascii85.cxx
index 44059f7..e9b926c 100644
--- a/ruby/ascii85.cxx
+++ b/ruby/ascii85.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "ascii85.h"
 
diff --git a/ruby/ascii85.h b/ruby/ascii85.h
index abd58fb..9bd40ab 100644
--- a/ruby/ascii85.h
+++ b/ruby/ascii85.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef ASCII85_H
 #define ASCII85_H
diff --git a/ruby/ruby_bindings.cxx b/ruby/ruby_bindings.cxx
index 5d0dc3a..6610618 100644
--- a/ruby/ruby_bindings.cxx
+++ b/ruby/ruby_bindings.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <ruby.h>
 #include "ttfdecode.h"
diff --git a/ruby/ruby_bindings.h b/ruby/ruby_bindings.h
index 3be9ec2..f0251bf 100644
--- a/ruby/ruby_bindings.h
+++ b/ruby/ruby_bindings.h
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef RUBY_BINDINGS_H
 #define RUBY_BINDINGS_H
diff --git a/src/main.cxx b/src/main.cxx
index dde2311..15e876f 100644
--- a/src/main.cxx
+++ b/src/main.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <QApplication>
 #include <QTranslator>
diff --git a/src/ufondue.cxx b/src/ufondue.cxx
index c2c9a04..7693871 100644
--- a/src/ufondue.cxx
+++ b/src/ufondue.cxx
@@ -1,8 +1,8 @@
 /* Copyright (C) 2007 Євгеній Мещеряков <eugen at debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <QCoreApplication>
 #include <ruby.h>

-- 
Fondue Font Editor

More information about the fondue-commits mailing list