Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt

7 files changed, 8 insertions, 8 deletions

diff --git a/src/qt3support/network/q3http.cpp b/src/qt3support/network/q3http.cpp
index f1590a6..591b381 100644
--- a/src/qt3support/network/q3http.cpp
+++ b/src/qt3support/network/q3http.cpp
@@ -626,7 +626,7 @@ void Q3HttpHeader::setContentLength( int len )
 }
 
 /*!
-    Returns true if the header has an entry for the the special HTTP
+    Returns true if the header has an entry for the special HTTP
     header field \c content-type; otherwise returns false.
 
     \sa contentType() setContentType()
diff --git a/src/qt3support/network/q3urloperator.cpp b/src/qt3support/network/q3urloperator.cpp
index 3f334a8..b415e12 100644
--- a/src/qt3support/network/q3urloperator.cpp
+++ b/src/qt3support/network/q3urloperator.cpp
@@ -543,7 +543,7 @@ const Q3NetworkOperation *Q3UrlOperator::rename( const QString &oldname, const Q
     in mind that the get() and put() operations emit this signal
     through the Q3UrlOperator. The number of transferred bytes and the
     total bytes that you receive as arguments in this signal do not
-    relate to the the whole copy operation; they relate first to the
+    relate to the whole copy operation; they relate first to the
     get() and then to the put() operation. Always check what type of
     operation the signal comes from; this is given in the signal's
     last argument.
diff --git a/src/qt3support/widgets/q3action.cpp b/src/qt3support/widgets/q3action.cpp
index 4e1a1bf..311212a 100644
--- a/src/qt3support/widgets/q3action.cpp
+++ b/src/qt3support/widgets/q3action.cpp
@@ -497,7 +497,7 @@ Q3Action::Q3Action(const QIcon& icon, const QString& menuText, QKeySequence acce
 }
 
 /*!
-    This constructor results in an icon-less action with the the menu
+    This constructor results in an icon-less action with the menu
     text \a menuText and keyboard accelerator \a accel. It is a child
     of \a parent and called \a name.
 
diff --git a/src/qt3support/widgets/q3groupbox.cpp b/src/qt3support/widgets/q3groupbox.cpp
index 1fa7e7c..e0b609a 100644
--- a/src/qt3support/widgets/q3groupbox.cpp
+++ b/src/qt3support/widgets/q3groupbox.cpp
@@ -382,7 +382,7 @@ int Q3GroupBox::insideSpacing() const
 }
 
 /*!
-    Sets the the width of the inside margin to \a m pixels.
+    Sets the width of the inside margin to \a m pixels.
 
     \sa insideMargin()
 */
@@ -954,7 +954,7 @@ int Q3GroupBox::frameWidth() const
     \fn int Q3GroupBox::margin() const 
     \since 4.2
 
-    Returns the width of the the margin around the contents of the widget.
+    Returns the width of the margin around the contents of the widget.
     
     This function uses QWidget::getContentsMargins() to get the margin.
 
diff --git a/src/qt3support/widgets/q3popupmenu.cpp b/src/qt3support/widgets/q3popupmenu.cpp
index 7f890b5..0b3a524 100644
--- a/src/qt3support/widgets/q3popupmenu.cpp
+++ b/src/qt3support/widgets/q3popupmenu.cpp
@@ -134,7 +134,7 @@ QT_BEGIN_NAMESPACE
     \fn int Q3PopupMenu::margin() const 
     \since 4.2
 
-    Returns the with of the the margin around the contents of the widget.
+    Returns the width of the margin around the contents of the widget.
     
     This function uses QWidget::getContentsMargins() to get the margin.
     \sa setMargin(), QWidget::getContentsMargins()
diff --git a/src/qt3support/widgets/q3progressbar.cpp b/src/qt3support/widgets/q3progressbar.cpp
index caae460..81f0dbf 100644
--- a/src/qt3support/widgets/q3progressbar.cpp
+++ b/src/qt3support/widgets/q3progressbar.cpp
@@ -455,7 +455,7 @@ void Q3ProgressBar::paintEvent(QPaintEvent *)
     \fn int Q3ProgressBar::margin() const
     \since 4.2
 
-    Returns the with of the the margin around the contents of the widget.
+    Returns the width of the margin around the contents of the widget.
     
     This function uses QWidget::getContentsMargins() to get the margin.
     \sa setMargin(), QWidget::getContentsMargins()
diff --git a/src/qt3support/widgets/q3scrollview.cpp b/src/qt3support/widgets/q3scrollview.cpp
index 91a9203..5a91027 100644
--- a/src/qt3support/widgets/q3scrollview.cpp
+++ b/src/qt3support/widgets/q3scrollview.cpp
@@ -2038,7 +2038,7 @@ void Q3ScrollView::center(int x, int y)
     \list
     \i Margin 0.0 allows (x, y) to be on the edge of the visible area.
     \i Margin 0.5 ensures that (x, y) is in middle 50% of the visible area.
-    \i Margin 1.0 ensures that (x, y) is in the center of the the visible area.
+    \i Margin 1.0 ensures that (x, y) is in the center of the visible area.
     \endlist
 */
 void Q3ScrollView::center(int x, int y, float xmargin, float ymargin)