Eliminate some mentions of Trolltech.

Reviewed-by: Trust Me

17 files changed, 19 insertions, 20 deletions

diff --git a/util/lexgen/README b/util/lexgen/README
index b8e927787f..9feb18d1e3 100644
--- a/util/lexgen/README
+++ b/util/lexgen/README
@@ -13,4 +13,4 @@ Use at your own risk ;-)
 
 
 --
-Simon Hausmann <simon@trolltech.com>
+Simon Hausmann <simon.hausmann@nokia.com>
diff --git a/util/qlalr/compress.cpp b/util/qlalr/compress.cpp
index 261a8ddbc6..efa4fea43f 100644
--- a/util/qlalr/compress.cpp
+++ b/util/qlalr/compress.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/compress.h b/util/qlalr/compress.h
index 39d4945d4c..2ca914cc90 100644
--- a/util/qlalr/compress.h
+++ b/util/qlalr/compress.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/cppgenerator.cpp b/util/qlalr/cppgenerator.cpp
index d6041e1667..6bb0e4c32f 100644
--- a/util/qlalr/cppgenerator.cpp
+++ b/util/qlalr/cppgenerator.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/cppgenerator.h b/util/qlalr/cppgenerator.h
index e519abcedc..ce81a73d7e 100644
--- a/util/qlalr/cppgenerator.h
+++ b/util/qlalr/cppgenerator.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/dotgraph.cpp b/util/qlalr/dotgraph.cpp
index c5b7f58435..5f847a9fb7 100644
--- a/util/qlalr/dotgraph.cpp
+++ b/util/qlalr/dotgraph.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/dotgraph.h b/util/qlalr/dotgraph.h
index cf5219142f..ea4c542c59 100644
--- a/util/qlalr/dotgraph.h
+++ b/util/qlalr/dotgraph.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/grammar.cpp b/util/qlalr/grammar.cpp
index e91eb240a3..26f8378c89 100644
--- a/util/qlalr/grammar.cpp
+++ b/util/qlalr/grammar.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/grammar_p.h b/util/qlalr/grammar_p.h
index 2876e9af5a..e1d8eff3c5 100644
--- a/util/qlalr/grammar_p.h
+++ b/util/qlalr/grammar_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/lalr.cpp b/util/qlalr/lalr.cpp
index 489fc68601..797750cd94 100644
--- a/util/qlalr/lalr.cpp
+++ b/util/qlalr/lalr.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/lalr.g b/util/qlalr/lalr.g
index f7f5bba63a..c98c2afb5b 100644
--- a/util/qlalr/lalr.g
+++ b/util/qlalr/lalr.g
@@ -3,7 +3,7 @@
 -- Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 -- Contact: Nokia Corporation (qt-info@nokia.com)
 --
--- This file is part of the QLALR project on Trolltech Labs.
+-- This file is part of the QLALR project on Qt Labs.
 --
 -- $QT_BEGIN_LICENSE:LGPL$
 -- No Commercial Usage
@@ -83,7 +83,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the <your project> project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -197,7 +197,7 @@ protected:
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the <your project> project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/lalr.h b/util/qlalr/lalr.h
index a4955e9f18..75cdbe0f20 100644
--- a/util/qlalr/lalr.h
+++ b/util/qlalr/lalr.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/main.cpp b/util/qlalr/main.cpp
index e78aeb37ac..d3a9c7f01c 100644
--- a/util/qlalr/main.cpp
+++ b/util/qlalr/main.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/parsetable.cpp b/util/qlalr/parsetable.cpp
index f6a4058537..bb78d2de29 100644
--- a/util/qlalr/parsetable.cpp
+++ b/util/qlalr/parsetable.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/parsetable.h b/util/qlalr/parsetable.h
index b144ff909f..8aebdaf32f 100644
--- a/util/qlalr/parsetable.h
+++ b/util/qlalr/parsetable.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/recognizer.cpp b/util/qlalr/recognizer.cpp
index 386dc31175..de0475f52c 100644
--- a/util/qlalr/recognizer.cpp
+++ b/util/qlalr/recognizer.cpp
@@ -1,10 +1,9 @@
-
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the <your project> project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/recognizer.h b/util/qlalr/recognizer.h
index 9ac8ee0977..94f7035941 100644
--- a/util/qlalr/recognizer.h
+++ b/util/qlalr/recognizer.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage