diff options
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qclipboard.cpp | 14 | ||||
| -rw-r--r-- | src/gui/kernel/qcursor.h | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qkeysequence.cpp | 20 |
3 files changed, 18 insertions, 18 deletions
diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp index 79da6471b8..f0b1f16ba2 100644 --- a/src/gui/kernel/qclipboard.cpp +++ b/src/gui/kernel/qclipboard.cpp @@ -226,7 +226,7 @@ QClipboard::~QClipboard() the global clipboard. \value Selection indicates that data should be stored and retrieved from - the global mouse selection. Support for \c Selection is provided only on + the global mouse selection. Support for \c Selection is provided only on systems with a global mouse selection (e.g. X11). \value FindBuffer indicates that data should be stored and retrieved from @@ -344,7 +344,7 @@ void QClipboard::setText(const QString &text, Mode mode) clipboard is used. If \a mode is QClipboard::Clipboard, the image is retrieved from the global clipboard. If \a mode is QClipboard::Selection, the image is retrieved from the global - mouse selection. + mouse selection. \sa setImage(), pixmap(), mimeData(), QImage::isNull() */ @@ -459,7 +459,7 @@ void QClipboard::setPixmap(const QPixmap &pixmap, Mode mode) \sa mimeData() */ -/*! +/*! \fn void QClipboard::clear(Mode mode) Clear the clipboard contents. @@ -467,7 +467,7 @@ void QClipboard::setPixmap(const QPixmap &pixmap, Mode mode) clipboard is used. If \a mode is QClipboard::Clipboard, this function clears the global clipboard contents. If \a mode is QClipboard::Selection, this function clears the global mouse - selection contents. If \a mode is QClipboard::FindBuffer, this + selection contents. If \a mode is QClipboard::FindBuffer, this function clears the search string buffer. \sa QClipboard::Mode, supportsSelection() @@ -521,21 +521,21 @@ bool QClipboard::ownsFindBuffer() const return ownsMode(FindBuffer); } -/*! +/*! \internal \fn bool QClipboard::supportsMode(Mode mode) const; Returns true if the clipboard supports the clipboard mode speacified by \a mode; otherwise returns false. */ -/*! +/*! \internal \fn bool QClipboard::ownsMode(Mode mode) const; Returns true if the clipboard supports the clipboard data speacified by \a mode; otherwise returns false. */ -/*! +/*! \internal Emits the appropriate changed signal for \a mode. */ diff --git a/src/gui/kernel/qcursor.h b/src/gui/kernel/qcursor.h index 016a0ef798..0bf4cc7bf9 100644 --- a/src/gui/kernel/qcursor.h +++ b/src/gui/kernel/qcursor.h @@ -107,7 +107,7 @@ public: static void setPos(QScreen *screen, int x, int y); inline static void setPos(const QPoint &p) { setPos(p.x(), p.y()); } inline static void setPos(QScreen *screen, const QPoint &p) { setPos(screen, p.x(), p.y()); } - + private: QCursorData *d; }; diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index cc0ecdf388..66eb1d58ed 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -878,7 +878,7 @@ const uint QKeySequencePrivate::numberOfKeyBindings = sizeof(QKeySequencePrivate \value SelectPreviousPage Extend selection to previous page. \value SelectPreviousWord Extend selection to previous word. \value SelectStartOfBlock Extend selection to the start of a text block. This shortcut is only used on OS X. - \value SelectStartOfDocument Extend selection to start of document. + \value SelectStartOfDocument Extend selection to start of document. \value SelectStartOfLine Extend selection to start of line. \value Underline Underline text. \value Undo Undo. @@ -892,10 +892,10 @@ const uint QKeySequencePrivate::numberOfKeyBindings = sizeof(QKeySequencePrivate /*! \since 4.2 - Constructs a QKeySequence object for the given \a key. - The result will depend on the currently running platform. + Constructs a QKeySequence object for the given \a key. + The result will depend on the currently running platform. - The resulting object will be based on the first element in the + The resulting object will be based on the first element in the list of key bindings for the \a key. */ QKeySequence::QKeySequence(StandardKey key) @@ -903,7 +903,7 @@ QKeySequence::QKeySequence(StandardKey key) const QList <QKeySequence> bindings = keyBindings(key); //pick only the first/primary shortcut from current bindings if (bindings.size() > 0) { - d = bindings.first().d; + d = bindings.first().d; d->ref.ref(); } else @@ -991,8 +991,8 @@ static inline int maybeSwapShortcut(int shortcut) \since 4.2 Returns a list of key bindings for the given \a key. - The result of calling this function will vary based on the target platform. - The first element of the list indicates the primary shortcut for the given platform. + The result of calling this function will vary based on the target platform. + The first element of the list indicates the primary shortcut for the given platform. If the result contains more than one result, these can be considered alternative shortcuts on the same platform for the given \a key. */ @@ -1509,9 +1509,9 @@ QKeySequence::SequenceMatch QKeySequence::matches(const QKeySequence &seq) const \obsolete - Use toString() instead. - - Returns the key sequence as a QString. This is equivalent to + Use toString() instead. + + Returns the key sequence as a QString. This is equivalent to calling toString(QKeySequence::NativeText). Note that the result is not platform independent. */ |