Cleanup

Fix up license headers and private warnings, as well as other general
cleanups.

13 files changed, 137 insertions, 12 deletions

diff --git a/src/declarative/debugger/qmldebugclient.cpp b/src/declarative/debugger/qmldebugclient.cpp
index 3dacf01..e442333 100644
--- a/src/declarative/debugger/qmldebugclient.cpp
+++ b/src/declarative/debugger/qmldebugclient.cpp
@@ -185,6 +185,6 @@ void QmlDebugClientPlugin::messageReceived(const QByteArray &)
 {
 }
 
-#include "qmldebugclient.moc"
-
 QT_END_NAMESPACE
+
+#include "qmldebugclient.moc"
diff --git a/src/declarative/debugger/qmldebugger.cpp b/src/declarative/debugger/qmldebugger.cpp
index 9ab3247..aad11de 100644
--- a/src/declarative/debugger/qmldebugger.cpp
+++ b/src/declarative/debugger/qmldebugger.cpp
@@ -62,6 +62,8 @@
 #include <private/qmlpropertyview_p.h>
 #include <private/qmlwatches_p.h>
 
+QT_BEGIN_NAMESPACE
+
 QmlDebugger::QmlDebugger(QWidget *parent)
 : QWidget(parent), m_tree(0), m_warnings(0), m_watchTable(0), m_watches(0), 
   m_properties(0), m_text(0), m_highlightedItem(0)
@@ -353,3 +355,4 @@ void QmlDebugger::setDebugObject(QObject *obj)
     item->setExpanded(true);
 }
 
+QT_END_NAMESPACE
diff --git a/src/declarative/debugger/qmldebugger.h b/src/declarative/debugger/qmldebugger.h
index 10b2f9a..03efeb6 100644
--- a/src/declarative/debugger/qmldebugger.h
+++ b/src/declarative/debugger/qmldebugger.h
@@ -101,4 +101,3 @@ QT_END_NAMESPACE
 QT_END_HEADER
 
 #endif // QMLDEBUGGER_H
-
diff --git a/src/declarative/debugger/qmldebuggerstatus.h b/src/declarative/debugger/qmldebuggerstatus.h
index 62336de..a8480f4 100644
--- a/src/declarative/debugger/qmldebuggerstatus.h
+++ b/src/declarative/debugger/qmldebuggerstatus.h
@@ -64,4 +64,3 @@ QT_END_NAMESPACE
 QT_END_HEADER
 
 #endif // QLMDEBUGGERSTATUS_P_H
-
diff --git a/src/declarative/debugger/qmldebugserver.cpp b/src/declarative/debugger/qmldebugserver.cpp
index 23e59e0..e055ad5 100644
--- a/src/declarative/debugger/qmldebugserver.cpp
+++ b/src/declarative/debugger/qmldebugserver.cpp
@@ -294,6 +294,6 @@ void QmlDebugServerPlugin::messageReceived(const QByteArray &)
 {
 }
 
-#include "qmldebugserver.moc"
-
 QT_END_NAMESPACE
+
+#include "qmldebugserver.moc"
diff --git a/src/declarative/debugger/qmlobjecttree.cpp b/src/declarative/debugger/qmlobjecttree.cpp
index 27dc000..8a2358a 100644
--- a/src/declarative/debugger/qmlobjecttree.cpp
+++ b/src/declarative/debugger/qmlobjecttree.cpp
@@ -48,6 +48,8 @@
 #include <QtGui/qinputdialog.h>
 #include <QtGui/qboxlayout.h>
 
+QT_BEGIN_NAMESPACE
+
 QmlObjectTree::QmlObjectTree(QWidget *parent)
 : QTreeWidget(parent)
 {
@@ -73,3 +75,4 @@ void QmlObjectTree::mousePressEvent(QMouseEvent *me)
     } 
 }
 
+QT_END_NAMESPACE
diff --git a/src/declarative/debugger/qmlobjecttree_p.h b/src/declarative/debugger/qmlobjecttree_p.h
index 4e6d484..54d6d8e 100644
--- a/src/declarative/debugger/qmlobjecttree_p.h
+++ b/src/declarative/debugger/qmlobjecttree_p.h
@@ -42,10 +42,23 @@
 #ifndef QMLOBJECTTREE_P_H
 #define QMLOBJECTTREE_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtGui/qtreewidget.h>
 #include <QtCore/qurl.h>
 #include <QtCore/qpointer.h>
 
+QT_BEGIN_NAMESPACE
+
 class QmlBindableValue;
 class QmlDebuggerItem : public QTreeWidgetItem
 {
@@ -82,5 +95,7 @@ protected:
     virtual void mousePressEvent(QMouseEvent *);
 };
 
+QT_END_NAMESPACE
+
 #endif // QMLOBJECTTREE_P_H
 
diff --git a/src/declarative/debugger/qmlpropertyview.cpp b/src/declarative/debugger/qmlpropertyview.cpp
index abe1902..76a192d 100644
--- a/src/declarative/debugger/qmlpropertyview.cpp
+++ b/src/declarative/debugger/qmlpropertyview.cpp
@@ -47,6 +47,8 @@
 #include <QtDeclarative/qmlbindablevalue.h>
 #include <private/qmlboundsignal_p.h>
 
+QT_BEGIN_NAMESPACE
+
 QmlPropertyView::QmlPropertyView(QmlWatches *watches, QWidget *parent)
 : QWidget(parent), m_tree(0), m_watches(watches)
 {
@@ -221,4 +223,6 @@ void QmlPropertyView::refresh()
     setObject(m_object);
 }
 
+QT_END_NAMESPACE
+
 #include "qmlpropertyview.moc"
diff --git a/src/declarative/debugger/qmlpropertyview_p.h b/src/declarative/debugger/qmlpropertyview_p.h
index 469a08d..4694482 100644
--- a/src/declarative/debugger/qmlpropertyview_p.h
+++ b/src/declarative/debugger/qmlpropertyview_p.h
@@ -42,6 +42,17 @@
 #ifndef QMLPROPERTYVIEW_P_H
 #define QMLPROPERTYVIEW_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtGui/qwidget.h>
 #include <QtCore/qpointer.h>
 #include <private/qmlwatches_p.h>
diff --git a/src/declarative/debugger/qmlwatches.cpp b/src/declarative/debugger/qmlwatches.cpp
index bac4cbd..8fc9e89 100644
--- a/src/declarative/debugger/qmlwatches.cpp
+++ b/src/declarative/debugger/qmlwatches.cpp
@@ -46,6 +46,8 @@
 #include <QtDeclarative/qmlmetatype.h>
 #include <QtDeclarative/qmlexpression.h>
 
+QT_BEGIN_NAMESPACE
+
 QString QmlWatches::objectToString(QObject *obj)
 {
     if(!obj)
@@ -301,4 +303,6 @@ QVariant QmlWatches::data(const QModelIndex &idx, int role) const
     }
 }
 
+QT_END_NAMESPACE
+
 #include "qmlwatches.moc"
diff --git a/src/declarative/debugger/qmlwatches_p.h b/src/declarative/debugger/qmlwatches_p.h
index 6c383a1..dfec979 100644
--- a/src/declarative/debugger/qmlwatches_p.h
+++ b/src/declarative/debugger/qmlwatches_p.h
@@ -42,6 +42,17 @@
 #ifndef QMLWATCHES_P_H
 #define QMLWATCHES_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/qbytearray.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qpointer.h>
diff --git a/src/declarative/debugger/qpacketprotocol.cpp b/src/declarative/debugger/qpacketprotocol.cpp
index 6911b89..7be23b7 100644
--- a/src/declarative/debugger/qpacketprotocol.cpp
+++ b/src/declarative/debugger/qpacketprotocol.cpp
@@ -1,16 +1,49 @@
 /****************************************************************************
 **
-** This file is part of the $PACKAGE_NAME$.
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
 **
-** Copyright (C) $THISYEAR$ $COMPANY_NAME$.
+** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
-** $QT_EXTENDED_DUAL_LICENSE$
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
 #include "qpacketprotocol.h"
 #include <QBuffer>
 
+QT_BEGIN_NAMESPACE
+
 #define MAX_PACKET_SIZE 0x7FFFFFFF
 
 /*!
@@ -458,5 +491,7 @@ QPacketAutoSend::~QPacketAutoSend()
         p->send(*this);
 }
 
+QT_END_NAMESPACE
+
 #include "qpacketprotocol.moc"
 
diff --git a/src/declarative/debugger/qpacketprotocol.h b/src/declarative/debugger/qpacketprotocol.h
index 6dd8bda..f3fb44b 100644
--- a/src/declarative/debugger/qpacketprotocol.h
+++ b/src/declarative/debugger/qpacketprotocol.h
@@ -1,10 +1,41 @@
 /****************************************************************************
 **
-** This file is part of the $PACKAGE_NAME$.
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
 **
-** Copyright (C) $THISYEAR$ $COMPANY_NAME$.
+** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
-** $QT_EXTENDED_DUAL_LICENSE$
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
@@ -14,6 +45,12 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qdatastream.h>
 
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
 class QIODevice;
 class QBuffer;
 class QPacket;
@@ -78,4 +115,8 @@ private:
     QPacketProtocol * p;
 };
 
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
 #endif