aboutsummaryrefslogtreecommitdiffstats
path: root/docbook
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2016-09-23 15:51:44 -0700
committerGerald Combs <gerald@wireshark.org>2016-09-23 22:56:16 +0000
commita1b04ad228b11994e6f3452d0a2ed11ddefb582a (patch)
tree85ee5fc9337acfc6ee3d0ee23607e37bf1fb1de9 /docbook
parent2b9cb53b39979d074ab3d2f4f541ea9d5edf36fd (diff)
More WSDG layout & markup fixups.
Change-Id: I7b404be25d20c28c7dca23d57f9670236a5855c2 Reviewed-on: https://code.wireshark.org/review/17897 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'docbook')
-rw-r--r--docbook/wsdg_src/WSDG_chapter_tools.asciidoc6
-rw-r--r--docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc12
2 files changed, 9 insertions, 9 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_tools.asciidoc b/docbook/wsdg_src/WSDG_chapter_tools.asciidoc
index a574f9f80b..99506a7391 100644
--- a/docbook/wsdg_src/WSDG_chapter_tools.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_tools.asciidoc
@@ -347,7 +347,7 @@ package is to be used. See
However, you might already have a different Microsoft $$C++$$ compiler
installed. It should be possible to use any of the following with the considerations listed:
-.Visual C++ 2013 Community Edition
+.Visual $$C++$$ 2013 Community Edition
IDE + Debugger?:: Yes
@@ -357,7 +357,7 @@ SDK required for 64-bit builds?:: No
CMake Generator: `Visual Studio 12`
-.Visual C++ 2010 Express Edition
+.Visual $$C++$$ 2010 Express Edition
IDE + Debugger?:: Yes
@@ -419,7 +419,7 @@ at the Visual Studio Command line prompt (cmd.exe):
should result in something like:
----
-Microsoft (R) C/C++ Optimizing Compiler Version 18.00.31101 for x86
+Microsoft (R) C/$$C++$$ Optimizing Compiler Version 18.00.31101 for x86
Copyright (C) Microsoft Corporation. All rights reserved.
usage: cl [ option... ] filename... [ /link linkoption...
diff --git a/docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc b/docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc
index 6870b289c7..c303ff4099 100644
--- a/docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc
@@ -156,7 +156,6 @@ it's not strictly required:
button box.
- If the dialog box contains a `QTreeWidget` you might want to add your own
`QTreeWidgetItem` subclass with the following methods:
-[horizontal]
`drawData()`:: Draws column data with any needed formatting.
`colData()`:: Returns the data for each column as a `QVariant`. Used for
copying as CSV, YAML, etc.
@@ -175,11 +174,12 @@ If you're calling a function that returns wmem-allocated memory it might make
more sense to add a wrapper function to 'qt_ui_utils' than to call wmem_free in
your code.
-===== Mixing C and C++
+===== Mixing C and $$C++$$
-Sometimes we have to call C++ functions from one of Wireshark's C callbacks and
-pass C++ objects to or from C. Tap listeners are a common example. The C++ FAQ
-link:$$http://www.parashift.com/c++-faq/mixing-c-and-cpp.html$$:[describes how to do this
+Sometimes we have to call $$C++$$ functions from one of
+Wireshark's C callbacks and pass $$C++$$ objects to or from C. Tap
+listeners are a common example. The $$C++$$ FAQ link:$$http://www.
+parashift.com/c++-faq/mixing-c-and-cpp.html$$:[describes how to do this
safely].
Tapping usually involves declaring static methods for callbacks, passing `this`
@@ -235,7 +235,7 @@ The main window has many QActions which are shared with child widgets. See
'ui/qt/proto_tree.cpp' for an example of this.
http://www.kdab.com/kdab-products/gammaray/[GammaRay] lets you inspect
-the internals of a running Qt application similar to Spy{plus}{plus} on Windows.
+the internals of a running Qt application similar to $$Spy++$$ on Windows.
[[ChUIGTK]]