more ports and compling fixes from the 3.5 branch

svn path=/trunk/KDE/kdeedu/kalzium/src/spectrum.h; revision=455935

diff --git a/kalzium/src/spectrum.cpp b/kalzium/src/spectrum.cpp
index 4482c40b108374cf1683ecfd953a803d7a941320..a5ec168abb76fd9770126d8d7fa7b33a4480d4eb 100644 (file)
--- a/kalzium/src/spectrum.cpp
+++ b/kalzium/src/spectrum.cpp
@@ -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.             *
+ *   51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include "spectrum.h"
 

diff --git a/kalzium/src/spectrum.h b/kalzium/src/spectrum.h
index ca31023ef0b285f0f17ec852e644ab563ecd2cf5..fccf49d9b9aec6d8ea501d535a1c689de63f1111 100644 (file)
--- a/kalzium/src/spectrum.h
+++ b/kalzium/src/spectrum.h
@@ -18,11 +18,11 @@
  *   You should have received a copy of the GNU General Public License     *
  *   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 Steet, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 
-#include <qstring.h>
 #include <qlist.h>
+#include <qstring.h>
 
 class QPixmap;
 class Element;