summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Haupt <andre@bitwigglers.org>2009-05-14 02:44:19 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-05-18 14:24:12 (GMT)
commit03069de9c398fe7a787388e61badb09ae1b1e6b7 (patch)
treebfe14ae241e283691cdc6e467c6237b84ede7915
parentd76c5fb7feda66621b435263353f49e9b4b34308 (diff)
downloadQt-03069de9c398fe7a787388e61badb09ae1b1e6b7.zip
Qt-03069de9c398fe7a787388e61badb09ae1b1e6b7.tar.gz
Qt-03069de9c398fe7a787388e61badb09ae1b1e6b7.tar.bz2
Replace all occurences of "heirarchy" with "hierarchy"
Signed-off-by: Andre Haupt <andre@bitwigglers.org> Reviewed-By: Thiago Macieira
-rw-r--r--doc/src/stylesheet.qdoc4
-rw-r--r--src/corelib/io/qresource.cpp2
-rw-r--r--src/gui/widgets/qmenu_p.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/stylesheet.qdoc b/doc/src/stylesheet.qdoc
index 46ec041..4060f33 100644
--- a/doc/src/stylesheet.qdoc
+++ b/doc/src/stylesheet.qdoc
@@ -398,7 +398,7 @@
(usually) refers to a single object, not to all instances of a
class.
- Similarly, selectors with pseudo-states are more specific that
+ Similarly, selectors with pseudo-states are more specific than
ones that do not specify pseudo-states. Thus, the following style
sheet specifies that a \l{QPushButton} should have white text
when the mouse is hovering over it, otherwise red text:
@@ -653,7 +653,7 @@
\target sub controls
\section1 Sub-controls
- A widget is considered as a heirarchy (tree) of subcontrols drawn on top
+ A widget is considered as a hierarchy (tree) of subcontrols drawn on top
of each other. For example, the QComboBox draws the drop-down sub-control
followed by the down-arrow sub-control. A QComboBox is thus rendered as
follows:
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index a1f921e..1f77caa 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -406,7 +406,7 @@ QString QResource::absoluteFilePath() const
}
/*!
- Returns true if the resource really exists in the resource heirarchy,
+ Returns true if the resource really exists in the resource hierarchy,
false otherwise.
*/
diff --git a/src/gui/widgets/qmenu_p.h b/src/gui/widgets/qmenu_p.h
index e3c4890..74367c4 100644
--- a/src/gui/widgets/qmenu_p.h
+++ b/src/gui/widgets/qmenu_p.h
@@ -208,7 +208,7 @@ public:
QString searchBuffer;
QBasicTimer searchBufferTimer;
- //passing of mouse events up the parent heirarchy
+ //passing of mouse events up the parent hierarchy
QPointer<QMenu> activeMenu;
bool mouseEventTaken(QMouseEvent *);