diff options
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qclipboard.cpp | 6 | ||||
| -rw-r--r-- | src/gui/kernel/qdrag.cpp | 4 | ||||
| -rw-r--r-- | src/gui/kernel/qevent.cpp | 14 | ||||
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 4 | ||||
| -rw-r--r-- | src/gui/kernel/qkeysequence.cpp | 44 | ||||
| -rw-r--r-- | src/gui/kernel/qpalette.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qshortcutmap.cpp | 2 |
7 files changed, 38 insertions, 38 deletions
diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp index ef5e4f9c18..90fd63ee62 100644 --- a/src/gui/kernel/qclipboard.cpp +++ b/src/gui/kernel/qclipboard.cpp @@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE as QApplication::clipboard(). Example: - \snippet doc/src/snippets/code/src_gui_kernel_qclipboard.cpp 0 + \snippet code/src_gui_kernel_qclipboard.cpp 0 QClipboard features some convenience functions to access common data types: setText() allows the exchange of Unicode text and @@ -80,7 +80,7 @@ QT_BEGIN_NAMESPACE A typical example of the use of these functions follows: - \snippet doc/src/snippets/droparea.cpp 0 + \snippet droparea.cpp 0 \section1 Notes for X11 Users @@ -366,7 +366,7 @@ QImage QClipboard::image(Mode mode) const This is shorthand for: - \snippet doc/src/snippets/code/src_gui_kernel_qclipboard.cpp 1 + \snippet code/src_gui_kernel_qclipboard.cpp 1 \sa image(), setPixmap() setMimeData() */ diff --git a/src/gui/kernel/qdrag.cpp b/src/gui/kernel/qdrag.cpp index 40015c8706..e20401c67b 100644 --- a/src/gui/kernel/qdrag.cpp +++ b/src/gui/kernel/qdrag.cpp @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE QMimeData object. This is specified with the setMimeData() function in the following way: - \snippet doc/src/snippets/dragging/mainwindow.cpp 1 + \snippet dragging/mainwindow.cpp 1 Note that setMimeData() assigns ownership of the QMimeData object to the QDrag object. The QDrag must be constructed on the heap with a parent QObject @@ -80,7 +80,7 @@ QT_BEGIN_NAMESPACE that the cursor's hot spot points to the center of its bottom edge: - \snippet doc/src/snippets/separations/finalwidget.cpp 2 + \snippet separations/finalwidget.cpp 2 \note On X11, the pixmap may not be able to keep up with the mouse movements if the hot spot causes the pixmap to be displayed diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index 266eb143e5..eeedd32fd9 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -582,7 +582,7 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos, Example: - \snippet doc/src/snippets/code/src_gui_kernel_qevent.cpp 0 + \snippet code/src_gui_kernel_qevent.cpp 0 */ /*! @@ -604,7 +604,7 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos, Example: - \snippet doc/src/snippets/code/src_gui_kernel_qevent.cpp 0 + \snippet code/src_gui_kernel_qevent.cpp 0 */ /*! @@ -2557,9 +2557,9 @@ QHelpEvent::~QHelpEvent() \table 100% \row \li - \snippet doc/src/snippets/qstatustipevent/main.cpp 1 + \snippet qstatustipevent/main.cpp 1 \dots - \snippet doc/src/snippets/qstatustipevent/main.cpp 3 + \snippet qstatustipevent/main.cpp 3 \li \image qstatustipevent-widget.png Widget with status tip. \endtable @@ -2570,10 +2570,10 @@ QHelpEvent::~QHelpEvent() \table 100% \row \li - \snippet doc/src/snippets/qstatustipevent/main.cpp 0 - \snippet doc/src/snippets/qstatustipevent/main.cpp 2 + \snippet qstatustipevent/main.cpp 0 + \snippet qstatustipevent/main.cpp 2 \dots - \snippet doc/src/snippets/qstatustipevent/main.cpp 3 + \snippet qstatustipevent/main.cpp 3 \li \image qstatustipevent-action.png Action with status tip. \endtable diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 2efc29bddf..bdffb985f7 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -2098,7 +2098,7 @@ static inline void applyCursor(const QList<QWindow *> &l, const QCursor &c) restoreOverrideCursor(), otherwise the stack will never be emptied. Example: - \snippet doc/src/snippets/code/src_gui_kernel_qapplication_x11.cpp 0 + \snippet code/src_gui_kernel_qapplication_x11.cpp 0 \sa overrideCursor(), restoreOverrideCursor(), changeOverrideCursor(), QWidget::setCursor() @@ -2154,7 +2154,7 @@ QStyleHints *QGuiApplication::styleHints() This function must be called before creating the QGuiApplication object, like this: - \snippet doc/src/snippets/code/src_gui_kernel_qapplication.cpp 6 + \snippet code/src_gui_kernel_qapplication.cpp 6 \sa desktopSettingsAware() */ diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index 14e434f475..f94c6d541e 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -177,16 +177,16 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni more modifiers, such as Qt::SHIFT, Qt::CTRL, Qt::ALT and Qt::META. \endlist - For example, \gui{Ctrl P} might be a sequence used as a shortcut for + For example, \uicontrol{Ctrl P} might be a sequence used as a shortcut for printing a document, and can be specified in any of the following ways: - \snippet doc/src/snippets/code/src_gui_kernel_qkeysequence.cpp 0 + \snippet code/src_gui_kernel_qkeysequence.cpp 0 Note that, for letters, the case used in the specification string does not matter. In the above examples, the user does not need to - hold down the \key{Shift} key to activate a shortcut specified - with "Ctrl+P". However, for other keys, the use of \key{Shift} as + hold down the \uicontrol{Shift} key to activate a shortcut specified + with "Ctrl+P". However, for other keys, the use of \uicontrol{Shift} as an unspecified extra modifier key can lead to confusion for users of an application whose keyboards have different layouts to those used by the developers. See the \l{Keyboard Layout Issues} section @@ -207,9 +207,9 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni as Qt::Key_A. \b{Note:} On Mac OS X, references to "Ctrl", Qt::CTRL, Qt::Control - and Qt::ControlModifier correspond to the \key Command keys on the + and Qt::ControlModifier correspond to the \uicontrol Command keys on the Macintosh keyboard, and references to "Meta", Qt::META, Qt::Meta and - Qt::MetaModifier correspond to the \key Control keys. Developers on + Qt::MetaModifier correspond to the \uicontrol Control keys. Developers on Mac OS X can use the same shortcut descriptions across all platforms, and their applications will automatically work as expected on Mac OS X. @@ -220,9 +220,9 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni setting up actions in a typical application. The table below shows some common key sequences that are often used for these standard shortcuts by applications on four widely-used platforms. Note - that on Mac OS X, the \key Ctrl value corresponds to the \key - Command keys on the Macintosh keyboard, and the \key Meta value - corresponds to the \key Control keys. + that on Mac OS X, the \uicontrol Ctrl value corresponds to the \uicontrol + Command keys on the Macintosh keyboard, and the \uicontrol Meta value + corresponds to the \uicontrol Control keys. \table \header \li StandardKey \li Windows \li Mac OS X \li KDE \li GNOME @@ -303,23 +303,23 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni Many key sequence specifications are chosen by developers based on the layout of certain types of keyboard, rather than choosing keys that - represent the first letter of an action's name, such as \key{Ctrl S} - ("Ctrl+S") or \key{Ctrl C} ("Ctrl+C"). + represent the first letter of an action's name, such as \uicontrol{Ctrl S} + ("Ctrl+S") or \uicontrol{Ctrl C} ("Ctrl+C"). Additionally, because certain symbols can only be entered with the help of modifier keys on certain keyboard layouts, key sequences intended for use with one keyboard layout may map to a different key, map to no keys at all, or require an additional modifier key to be used on different keyboard layouts. - For example, the shortcuts, \key{Ctrl plus} and \key{Ctrl minus}, are often + For example, the shortcuts, \uicontrol{Ctrl plus} and \uicontrol{Ctrl minus}, are often used as shortcuts for zoom operations in graphics applications, and these may be specified as "Ctrl++" and "Ctrl+-" respectively. However, the way these shortcuts are specified and interpreted depends on the keyboard layout. - Users of Norwegian keyboards will note that the \key{+} and \key{-} keys + Users of Norwegian keyboards will note that the \uicontrol{+} and \uicontrol{-} keys are not adjacent on the keyboard, but will still be able to activate both - shortcuts without needing to press the \key{Shift} key. However, users - with British keyboards will need to hold down the \key{Shift} key - to enter the \key{+} symbol, making the shortcut effectively the same as + shortcuts without needing to press the \uicontrol{Shift} key. However, users + with British keyboards will need to hold down the \uicontrol{Shift} key + to enter the \uicontrol{+} symbol, making the shortcut effectively the same as "Ctrl+Shift+=". Although some developers might resort to fully specifying all the modifiers @@ -328,9 +328,9 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni For example, a developer using a British keyboard may decide to specify "Ctrl+Shift+=" as the key sequence in order to create a shortcut that - coincidentally behaves in the same way as \key{Ctrl plus}. However, the - \key{=} key needs to be accessed using the \key{Shift} key on Norwegian - keyboard, making the required shortcut effectively \key{Ctrl Shift Shift =} + coincidentally behaves in the same way as \uicontrol{Ctrl plus}. However, the + \uicontrol{=} key needs to be accessed using the \uicontrol{Shift} key on Norwegian + keyboard, making the required shortcut effectively \uicontrol{Ctrl Shift Shift =} (an impossible key combination). As a result, both human-readable strings and hard-coded key codes @@ -352,10 +352,10 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni key codes, can be created by using the multiple argument constructor, or by passing a human-readable string of comma-separated key sequences. - For example, the key sequence, \key{Ctrl X} followed by \key{Ctrl C}, can + For example, the key sequence, \uicontrol{Ctrl X} followed by \uicontrol{Ctrl C}, can be specified using either of the following ways: - \snippet doc/src/snippets/code/src_gui_kernel_qkeysequence.cpp 1 + \snippet code/src_gui_kernel_qkeysequence.cpp 1 \warning A QApplication instance must have been constructed before a QKeySequence is created; otherwise, your application may crash. @@ -937,7 +937,7 @@ QKeySequence::QKeySequence() \endlink(), so that shortcut keys can be replaced in translations: - \snippet doc/src/snippets/code/src_gui_kernel_qkeysequence.cpp 2 + \snippet code/src_gui_kernel_qkeysequence.cpp 2 Note the "File|Open" translator comment. It is by no means necessary, but it provides some context for the human translator. diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp index ab62ec0992..cb18b0d22f 100644 --- a/src/gui/kernel/qpalette.cpp +++ b/src/gui/kernel/qpalette.cpp @@ -499,7 +499,7 @@ static void qt_palette_from_color(QPalette &pal, const QColor &button) and the QTextDocument::setDefaultStyleSheet() function to alter the appearance of links. For example: - \snippet doc/src/snippets/textdocument-css/main.cpp 0 + \snippet textdocument-css/main.cpp 0 \value NoRole No role; this special role is often used to indicate that a role has not been assigned. diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp index a750082219..267f528ca0 100644 --- a/src/gui/kernel/qshortcutmap.cpp +++ b/src/gui/kernel/qshortcutmap.cpp @@ -528,7 +528,7 @@ QKeySequence::SequenceMatch QShortcutMap::find(QKeyEvent *e) /*! \internal Clears \a seq to an empty QKeySequence. Same as doing (the slower) - \snippet doc/src/snippets/code/src_gui_kernel_qshortcutmap.cpp 0 + \snippet code/src_gui_kernel_qshortcutmap.cpp 0 */ void QShortcutMap::clearSequence(QVector<QKeySequence> &ksl) { |