diff options
153 files changed, 563 insertions, 4693 deletions
diff --git a/doc/config/images/arrow_down.png b/doc/config/images/arrow_down.png Binary files differdeleted file mode 100644 index 9d01e97f..00000000 --- a/doc/config/images/arrow_down.png +++ /dev/null diff --git a/doc/config/images/bg_l.png b/doc/config/images/bg_l.png Binary files differdeleted file mode 100755 index 90b1da10..00000000 --- a/doc/config/images/bg_l.png +++ /dev/null diff --git a/doc/config/images/bg_l_blank.png b/doc/config/images/bg_l_blank.png Binary files differdeleted file mode 100755 index 5a9673d8..00000000 --- a/doc/config/images/bg_l_blank.png +++ /dev/null diff --git a/doc/config/images/bg_ll_blank.png b/doc/config/images/bg_ll_blank.png Binary files differdeleted file mode 100644 index 95a1c45e..00000000 --- a/doc/config/images/bg_ll_blank.png +++ /dev/null diff --git a/doc/config/images/bg_r.png b/doc/config/images/bg_r.png Binary files differdeleted file mode 100755 index f0fb121d..00000000 --- a/doc/config/images/bg_r.png +++ /dev/null diff --git a/doc/config/images/bg_ul_blank.png b/doc/config/images/bg_ul_blank.png Binary files differdeleted file mode 100644 index 70512614..00000000 --- a/doc/config/images/bg_ul_blank.png +++ /dev/null diff --git a/doc/config/images/box_bg.png b/doc/config/images/box_bg.png Binary files differdeleted file mode 100755 index 3322f923..00000000 --- a/doc/config/images/box_bg.png +++ /dev/null diff --git a/doc/config/images/breadcrumb.png b/doc/config/images/breadcrumb.png Binary files differdeleted file mode 100755 index 0ded5514..00000000 --- a/doc/config/images/breadcrumb.png +++ /dev/null diff --git a/doc/config/images/bullet_dn.png b/doc/config/images/bullet_dn.png Binary files differdeleted file mode 100644 index f7762472..00000000 --- a/doc/config/images/bullet_dn.png +++ /dev/null diff --git a/doc/config/images/bullet_gt.png b/doc/config/images/bullet_gt.png Binary files differdeleted file mode 100755 index 7561b4ed..00000000 --- a/doc/config/images/bullet_gt.png +++ /dev/null diff --git a/doc/config/images/bullet_sq.png b/doc/config/images/bullet_sq.png Binary files differdeleted file mode 100755 index a84845e3..00000000 --- a/doc/config/images/bullet_sq.png +++ /dev/null diff --git a/doc/config/images/bullet_up.png b/doc/config/images/bullet_up.png Binary files differdeleted file mode 100644 index 7de2f069..00000000 --- a/doc/config/images/bullet_up.png +++ /dev/null diff --git a/doc/config/images/feedbackground.png b/doc/config/images/feedbackground.png Binary files differdeleted file mode 100755 index 3a38d995..00000000 --- a/doc/config/images/feedbackground.png +++ /dev/null diff --git a/doc/config/images/header_bg.png b/doc/config/images/header_bg.png Binary files differdeleted file mode 100644 index a436aa61..00000000 --- a/doc/config/images/header_bg.png +++ /dev/null diff --git a/doc/config/images/horBar.png b/doc/config/images/horBar.png Binary files differdeleted file mode 100755 index 100fe91c..00000000 --- a/doc/config/images/horBar.png +++ /dev/null diff --git a/doc/config/images/page.png b/doc/config/images/page.png Binary files differdeleted file mode 100644 index 1db151bd..00000000 --- a/doc/config/images/page.png +++ /dev/null diff --git a/doc/config/images/page_bg.png b/doc/config/images/page_bg.png Binary files differdeleted file mode 100755 index 9b3bd999..00000000 --- a/doc/config/images/page_bg.png +++ /dev/null diff --git a/doc/config/images/qt-logo.png b/doc/config/images/qt-logo.png Binary files differdeleted file mode 100644 index 14ddf2a0..00000000 --- a/doc/config/images/qt-logo.png +++ /dev/null diff --git a/doc/config/images/spinner.gif b/doc/config/images/spinner.gif Binary files differdeleted file mode 100644 index 1ed786f2..00000000 --- a/doc/config/images/spinner.gif +++ /dev/null diff --git a/doc/config/images/sprites-combined.png b/doc/config/images/sprites-combined.png Binary files differdeleted file mode 100755 index 7f968663..00000000 --- a/doc/config/images/sprites-combined.png +++ /dev/null diff --git a/doc/config/macros.qdocconf b/doc/config/macros.qdocconf deleted file mode 100644 index d8b96c0b..00000000 --- a/doc/config/macros.qdocconf +++ /dev/null @@ -1,37 +0,0 @@ -macro.aacute.HTML = "á" -macro.Aring.HTML = "Å" -macro.aring.HTML = "å" -macro.Auml.HTML = "Ä" -macro.author = "\\b{Author:}" -macro.br.HTML = "<br />" -macro.BR.HTML = "<br />" -macro.copyright.HTML = "©" -macro.eacute.HTML = "é" -macro.gui = "\\b" -macro.hr.HTML = "<hr />" -macro.iacute.HTML = "í" -macro.key = "\\b" -macro.menu = "\\b" -macro.note = "\\b{Note:}" -macro.oslash.HTML = "ø" -macro.ouml.HTML = "ö" -macro.QA = "\\e{Qt Assistant}" -macro.QD = "\\e{Qt Designer}" -macro.QL = "\\e{Qt Linguist}" -macro.QQV = "\\e{Qt QML Viewer}" -macro.param = "\\e" -macro.raisedaster.HTML = "<sup>*</sup>" -macro.rarrow.HTML = "→" -macro.reg.HTML = "<sup>®</sup>" -macro.return = "Returns" -macro.starslash = "\\c{*/}" -macro.begincomment = "\\c{/*}" -macro.endcomment = "\\c{*/}" -macro.uuml.HTML = "ü" -macro.mdash.HTML = "—" - -macro.beginfloatleft.HTML = "<div style=\"float: left; margin-right: 2em\">" -macro.beginfloatright.HTML = "<div style=\"float: right; margin-left: 2em\">" -macro.endfloat.HTML = "</div>" -macro.clearfloat.HTML = "<br style=\"clear: both\" />" -macro.emptyspan.HTML = "<span></span>" diff --git a/doc/config/qt-cpp-ignore.qdocconf b/doc/config/qt-cpp-ignore.qdocconf deleted file mode 100644 index 9b09a60a..00000000 --- a/doc/config/qt-cpp-ignore.qdocconf +++ /dev/null @@ -1,99 +0,0 @@ -Cpp.ignoretokens = QAXFACTORY_EXPORT \ - QDESIGNER_COMPONENTS_LIBRARY \ - QDESIGNER_EXTENSION_LIBRARY \ - QDESIGNER_SDK_LIBRARY \ - QDESIGNER_SHARED_LIBRARY \ - QDESIGNER_UILIB_LIBRARY \ - QM_EXPORT_CANVAS \ - QM_EXPORT_DNS \ - QM_EXPORT_DOM \ - QM_EXPORT_FTP \ - QM_EXPORT_HTTP \ - QM_EXPORT_ICONVIEW \ - QM_EXPORT_NETWORK \ - QM_EXPORT_OPENGL \ - QM_EXPORT_OPENVG \ - QM_EXPORT_SQL \ - QM_EXPORT_TABLE \ - QM_EXPORT_WORKSPACE \ - QM_EXPORT_XML \ - QT_ASCII_CAST_WARN \ - QT_ASCII_CAST_WARN_CONSTRUCTOR \ - QT_BEGIN_HEADER \ - QT_DESIGNER_STATIC \ - QT_END_HEADER \ - QT_FASTCALL \ - QT_WIDGET_PLUGIN_EXPORT \ - Q_COMPAT_EXPORT \ - Q_CORE_EXPORT \ - Q_CORE_EXPORT_INLINE \ - Q_EXPLICIT \ - Q_EXPORT \ - Q_EXPORT_CODECS_CN \ - Q_EXPORT_CODECS_JP \ - Q_EXPORT_CODECS_KR \ - Q_EXPORT_PLUGIN \ - Q_GFX_INLINE \ - Q_AUTOTEST_EXPORT \ - QM_AUTOTEST_EXPORT \ - Q_GUI_EXPORT \ - Q_GUI_EXPORT_INLINE \ - Q_GUI_EXPORT_STYLE_CDE \ - Q_GUI_EXPORT_STYLE_COMPACT \ - Q_GUI_EXPORT_STYLE_MAC \ - Q_GUI_EXPORT_STYLE_MOTIF \ - Q_GUI_EXPORT_STYLE_MOTIFPLUS \ - Q_GUI_EXPORT_STYLE_PLATINUM \ - Q_GUI_EXPORT_STYLE_POCKETPC \ - Q_GUI_EXPORT_STYLE_SGI \ - Q_GUI_EXPORT_STYLE_WINDOWS \ - Q_GUI_EXPORT_STYLE_WINDOWSXP \ - QHELP_EXPORT \ - Q_INLINE_TEMPLATE \ - Q_INTERNAL_WIN_NO_THROW \ - Q_NETWORK_EXPORT \ - Q_OPENGL_EXPORT \ - Q_OPENVG_EXPORT \ - Q_OUTOFLINE_TEMPLATE \ - Q_SQL_EXPORT \ - Q_SVG_EXPORT \ - Q_SCRIPT_EXPORT \ - Q_SCRIPTTOOLS_EXPORT \ - Q_TESTLIB_EXPORT \ - Q_TYPENAME \ - Q_XML_EXPORT \ - Q_XMLSTREAM_EXPORT \ - Q_XMLPATTERNS_EXPORT \ - QDBUS_EXPORT \ - Q_DBUS_EXPORT \ - QT_BEGIN_NAMESPACE \ - QT_BEGIN_INCLUDE_NAMESPACE \ - QT_END_NAMESPACE \ - QT_END_INCLUDE_NAMESPACE \ - PHONON_EXPORT \ - Q_DECLARATIVE_EXPORT \ - Q_GADGET \ - QWEBKIT_EXPORT \ - Q_INVOKABLE -Cpp.ignoredirectives = Q_DECLARE_HANDLE \ - Q_DECLARE_INTERFACE \ - Q_DECLARE_METATYPE \ - Q_DECLARE_OPERATORS_FOR_FLAGS \ - Q_DECLARE_PRIVATE \ - Q_DECLARE_PUBLIC \ - Q_DECLARE_SHARED \ - Q_DECLARE_TR_FUNCTIONS \ - Q_DECLARE_TYPEINFO \ - Q_DISABLE_COPY \ - QT_FORWARD_DECLARE_CLASS \ - Q_DUMMY_COMPARISON_OPERATOR \ - Q_ENUMS \ - Q_FLAGS \ - Q_INTERFACES \ - __attribute__ \ - K_DECLARE_PRIVATE \ - PHONON_OBJECT \ - PHONON_HEIR \ - Q_PRIVATE_PROPERTY \ - Q_DECLARE_PRIVATE_D \ - Q_CLASSINFO diff --git a/doc/config/qt-defines.qdocconf b/doc/config/qt-defines.qdocconf deleted file mode 100644 index 50a355f0..00000000 --- a/doc/config/qt-defines.qdocconf +++ /dev/null @@ -1,17 +0,0 @@ -defines = Q_QDOC \ - QT_.*_SUPPORT \ - QT_.*_LIB \ - QT_COMPAT \ - QT_KEYPAD_NAVIGATION \ - QT_NO_EGL \ - QT3_SUPPORT \ - Q_WS_.* \ - Q_OS_.* \ - Q_BYTE_ORDER \ - QT_DEPRECATED \ - Q_NO_USING_KEYWORD \ - __cplusplus - -versionsym = QT_VERSION_STR - -codeindent = 1 diff --git a/doc/config/qt-html-default-styles.qdocconf b/doc/config/qt-html-default-styles.qdocconf deleted file mode 100644 index b2e39d02..00000000 --- a/doc/config/qt-html-default-styles.qdocconf +++ /dev/null @@ -1,32 +0,0 @@ -# Define the location of the templates to use. Style sheets and scripts are -# specified relative to the template directory and will be copied into -# subdirectories of the output directory. - -HTML.templatedir = . - -HTML.stylesheets = style/offline.css - -HTML.scripts = - -# Files not referenced in any qdoc file (last four needed by qtdemo) -# See also qhp.Qt.extraFiles -extraimages.HTML = qt-logo.png \ - arrow_down.png \ - breadcrumb.png \ - bullet_gt.png \ - bullet_dn.png \ - bullet_sq.png \ - bullet_up.png \ - horBar.png \ - sprites-combined.png - -# Include the style sheets and scripts used. - -HTML.headerstyles = \ - " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n" - -HTML.headerscripts = - -HTML.endheader = \ - "</head>\n" \ - "<body>\n" diff --git a/doc/config/qt-html-online-styles.qdocconf b/doc/config/qt-html-online-styles.qdocconf deleted file mode 100644 index 4ffd6ca6..00000000 --- a/doc/config/qt-html-online-styles.qdocconf +++ /dev/null @@ -1,72 +0,0 @@ -# Define the location of the templates to use. Style sheets and scripts are -# specified relative to the template directory and will be copied into -# subdirectories of the output directory. - -HTML.templatedir = . - -HTML.stylesheets = style/narrow.css \ - style/style.css \ - style/style_ie6.css \ - style/style_ie7.css \ - style/style_ie8.css \ - style/superfish.css - -# Adding jquery and functions - providing online tools and search features -HTML.scripts = scripts/functions.js \ - scripts/narrow.js \ - scripts/superfish.js \ - scripts/jquery.js - - -# Files not referenced in any qdoc file. -# See also qhp.Qt.extraFiles -extraimages.HTML = qt-logo.png \ - bg_l.png \ - bg_l_blank.png \ - bg_ll_blank.png \ - bg_ul_blank.png \ - header_bg.png \ - bg_r.png \ - box_bg.png \ - breadcrumb.png \ - bullet_gt.png \ - bullet_dn.png \ - bullet_sq.png \ - bullet_up.png \ - arrow_down.png \ - feedbackground.png \ - horBar.png \ - page.png \ - page_bg.png \ - sprites-combined.png \ - spinner.gif - -# Include the style sheets and scripts used. - -HTML.headerstyles = \ - " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/style.css\" />\n" \ - " <script src=\"scripts/jquery.js\" type=\"text/javascript\"></script>\n" \ - " <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n" \ - " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/superfish.css\" />\n" \ - " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/narrow.css\" />\n" \ - " <!--[if IE]>\n" \ - "<meta name=\"MSSmartTagsPreventParsing\" content=\"true\">\n" \ - "<meta http-equiv=\"imagetoolbar\" content=\"no\">\n" \ - "<![endif]-->\n" \ - "<!--[if lt IE 7]>\n" \ - "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie6.css\">\n" \ - "<![endif]-->\n" \ - "<!--[if IE 7]>\n" \ - "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie7.css\">\n" \ - "<![endif]-->\n" \ - "<!--[if IE 8]>\n" \ - "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie8.css\">\n" \ - "<![endif]-->\n\n" - -HTML.headerscripts = \ - "<script src=\"scripts/superfish.js\" type=\"text/javascript\"></script>\n" \ - "<script src=\"scripts/narrow.js\" type=\"text/javascript\"></script>\n\n" - -HTML.endheader = \ - "</head>\n" \ - "<body class=\"\" onload=\"CheckEmptyAndLoadList();\">\n" diff --git a/doc/config/qt-html-templates-online.qdocconf b/doc/config/qt-html-templates-online.qdocconf deleted file mode 100644 index ac1ea9c0..00000000 --- a/doc/config/qt-html-templates-online.qdocconf +++ /dev/null @@ -1,142 +0,0 @@ -include(qt-html-online-styles.qdocconf) - -HTML.postheader = \ - " <div class=\"header\" id=\"qtdocheader\">\n" \ - " <div class=\"content\"> \n" \ - " <div id=\"nav-logo\">\n" \ - " <a href=\"index.html\">Home</a></div>\n" \ - " <a href=\"index.html\" class=\"qtref\"><span>Qt5 Reference Documentation</span></a>\n" \ - " <div id=\"narrowsearch\"></div>\n" \ - " <div id=\"nav-topright\">\n" \ - " <ul>\n" \ - " <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \ - " <li class=\"nav-topright-dev\"><a href=\"http://developer.qt.nokia.com/\">DEV</a></li>\n" \ - " <li class=\"nav-topright-labs\"><a href=\"http://labs.qt.nokia.com/blogs/\">LABS</a></li>\n" \ - " <li class=\"nav-topright-doc nav-topright-doc-active\"><a href=\"http://doc.qt.nokia.com/\">\n" \ - " DOC</a></li>\n" \ - " <li class=\"nav-topright-blog\"><a href=\"http://blog.qt.nokia.com/\">BLOG</a></li>\n" \ - " </ul>\n" \ - " </div>\n" \ - " <div id=\"shortCut\">\n" \ - " <ul>\n" \ - " <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">QtMobility 1.2</a></span></li>\n" \ - " <li class=\"shortCut-topleft-active\"><a href=\"http://doc.qt.nokia.com\">ALL VERSIONS" \ - " </a></li>\n" \ - " </ul>\n" \ - " </div>\n" \ - " </div>\n" \ - " </div>\n" \ - " <div class=\"wrapper\">\n" \ - " <div class=\"hd\">\n" \ - " <span></span>\n" \ - " </div>\n" \ - " <div class=\"bd group\">\n" \ - " <div class=\"sidebar\">\n" \ - " <div class=\"box first bottombar\" id=\"lookup\">\n" \ - " <h2 title=\"API Lookup\">\n" \ - " API Lookup</h2>\n" \ - " <div id=\"list001\" class=\"list\">\n" \ - " <ul id=\"ul001\" >\n" \ - " <li class=\"defaultLink\"><a href=\"classes.html\">Class index</a></li>\n" \ - " <li class=\"defaultLink\"><a href=\"functions.html\">Function index</a></li>\n" \ - " <li class=\"defaultLink\"><a href=\"modules.html\">Modules</a></li>\n" \ - " <li class=\"defaultLink\"><a href=\"qml-plugins.html\">QML Plugins</a></li>\n" \ - " </ul> \n" \ - " </div>\n" \ - " </div>\n" \ - " <div class=\"box bottombar\" id=\"topics\">\n" \ - " <h2 title=\"QtMobility Topics\"><span></span>\n" \ - " Qt Topics</h2>\n" \ - " <div id=\"list002\" class=\"list\">\n" \ - " <ul id=\"ul002\" >\n" \ - " <li class=\"defaultLink\"><a href=\"quickstart.html\">Quickstart Guide</a></li> \n" \ - " <li class=\"defaultLink\"><a href=\"index.html#platform-compatibility\">Platform-specific info</a></li> \n" \ - " </ul> \n" \ - " </div>\n" \ - " </div>\n" \ - " <div class=\"box\" id=\"examples\">\n" \ - " <h2 title=\"Examples\"><span></span>\n" \ - " Examples</h2>\n" \ - " <div id=\"list003\" class=\"list\">\n" \ - " <ul id=\"ul003\">\n" \ - " <li class=\"defaultLink\"><a href=\"all-examples.html\">Examples</a></li>\n" \ - " <li class=\"defaultLink\"><a href=\"tutorials.html\">Tutorials</a></li>\n" \ - " </ul> \n" \ - " </div>\n" \ - " </div>\n" \ - " </div>\n" \ - " <div class=\"wrap\">\n" \ - " <div class=\"toolbar\">\n" \ - " <div class=\"breadcrumb toolblock\">\n" \ - " <ul>\n" \ - " <li class=\"first\"><a href=\"index.html\">Home</a></li>\n" \ - " <!-- Breadcrumbs go here -->\n" - -HTML.postpostheader = \ - " </ul>\n" \ - " </div>\n" \ - " <div class=\"toolbuttons toolblock\">\n" \ - " <ul>\n" \ - " <li id=\"smallA\" class=\"t_button\">A</li>\n" \ - " <li id=\"medA\" class=\"t_button active\">A</li>\n" \ - " <li id=\"bigA\" class=\"t_button\">A</li>\n" \ - " <li id=\"print\" class=\"t_button\"><a href=\"javascript:this.print();\">\n" \ - " <span>Print</span></a></li>\n" \ - " </ul>\n" \ - " </div>\n" \ - " </div>\n" \ - " <div class=\"content mainContent\">\n" - -HTML.footer = \ - " <div class=\"feedback t_button\">\n" \ - " [+] Documentation Feedback</div>\n" \ - " </div>\n" \ - " </div>\n" \ - " </div> \n" \ - " <div class=\"ft\">\n" \ - " <span></span>\n" \ - " </div>\n" \ - " </div> \n" \ - " <div class=\"footer\">\n" \ - " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2012 Digia Plc and/or its\n" \ - " subsidiaries. Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ - " in Finland and/or other countries worldwide.</p>\n" \ - " <p>\n" \ - " All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \ - " href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \ - " <br />\n" \ - " <p>\n" \ - " Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \ - " Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \ - " with the terms contained in a written agreement between you and Digia.</p>\n" \ - " <p>\n" \ - " Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \ - " Free Documentation License version 1.3</a>\n" \ - " as published by the Free Software Foundation.</p>\n" \ - " </div>\n" \ - " <div id=\"feedbackBox\">\n" \ - " <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \ - " <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \ - " <p id=\"noteHead\">Thank you for giving your feedback.</p> <p class=\"note\">Make sure it is related to this specific page. For more general bugs and \n" \ - " requests, please use the <a href=\"http://bugreports.qt-project.org/secure/Dashboard.jspa\">Qt Bug Tracker</a>.</p>\n" \ - " <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\"></textarea></p>\n" \ - " <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \ - " </form>\n" \ - " </div>\n" \ - " <div id=\"blurpage\">\n" \ - " </div>\n" \ - "\n" \ - " <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n" \ - " <script type=\"text/javascript\">\n" \ - " var _gaq = _gaq || [];\n" \ - " _gaq.push(['_setAccount', 'UA-4457116-5']);\n" \ - " _gaq.push(['_trackPageview']);\n" \ - " (function() {\n" \ - " var ga = document.createElement('script'); " \ - "ga.type = 'text/javascript'; ga.async = true;\n" \ - " ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + " \ - "'.google-analytics.com/ga.js';\n" \ - " var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n" \ - " })();\n" \ - " </script>\n" diff --git a/doc/config/qt-html-templates.qdocconf b/doc/config/qt-html-templates.qdocconf deleted file mode 100644 index 74afea32..00000000 --- a/doc/config/qt-html-templates.qdocconf +++ /dev/null @@ -1,54 +0,0 @@ -include(qt-html-default-styles.qdocconf) - -HTML.postheader = \ - "<div class=\"header\" id=\"qtdocheader\">\n" \ - " <div class=\"content\"> \n" \ - " <a href=\"index.html\" class=\"qtref\"><span>Qt5 Reference Documentation</span></a>\n" \ - " </div>\n" \ - " <div class=\"breadcrumb toolblock\">\n" \ - " <ul>\n" \ - " <li class=\"first\"><a href=\"index.html\">Home</a></li>\n" \ - " <!-- Breadcrumbs go here -->\n" - -HTML.postpostheader = \ - " </ul>\n" \ - " </div>\n" \ - "</div>\n" \ - "<div class=\"content mainContent\">\n" - -HTML.footer = \ - " <div class=\"ft\">\n" \ - " <span></span>\n" \ - " </div>\n" \ - "</div> \n" \ - "<div class=\"footer\">\n" \ - " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2012 Digia Plc and/or its\n" \ - " subsidiaries. Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ - " in Finland and/or other countries worldwide.</p>\n" \ - " <p>\n" \ - " All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \ - " href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \ - " <br />\n" \ - " <p>\n" \ - " Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \ - " Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \ - " with the terms contained in a written agreement between you and Digia.</p>\n" \ - " <p>\n" \ - " Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \ - " Free Documentation License version 1.3</a>\n" \ - " as published by the Free Software Foundation.</p>\n" \ - "</div>\n" \ - -# Files not referenced in any qdoc file. -# See also extraimages.HTML -qhp.QtMobility.extraFiles = index.html \ - images/arrow_down.png \ - images/breadcrumb.png \ - images/bullet_gt.png \ - images/bullet_dn.png \ - images/bullet_sq.png \ - images/bullet_up.png \ - images/horBar.png \ - images/sprites-combined.png \ - style/offline.css diff --git a/doc/config/qtlocation-dita.qdocconf b/doc/config/qtlocation-dita.qdocconf deleted file mode 100644 index 6bb4dd4d..00000000 --- a/doc/config/qtlocation-dita.qdocconf +++ /dev/null @@ -1,34 +0,0 @@ -# Name of the project. -project = Qt Location - -# Directories in which to search for files to document and images. -# By default set to the root directory of the project for sources -# and headers and qdoc will therefore generate output for each file. -# Images should be placed in <rootdir>/dic/images and examples in -# <rootdir>/examples. -# Paths are relative to the location of this file. -exampledirs += ../src/examples \ - ../.. \ - ../../examples \ - ../src \ - ../../src/3rdparty - -headerdirs += ../src \ - ../../src - -imagedirs += ../src/images \ - -sourcedirs += ../src \ - ../../src - -excludedirs += - -#Do not change the variables after this line unless you know what you are doing. - -outputdir = ../ditaxml -outputformats = DITAXML - -examples.fileextensions = "*.cpp *.h *.js *.svg *.xml *.ui *.qml" -examples.imageextensions = "*.png *.jpeg *.jpg *.gif *.mng" -headers.fileextensions = "*.h *.ch *.h++ *.hh *.hpp *.hxx" -sources.fileextensions = "*.cpp *.qdoc *.mm *.qml" diff --git a/doc/config/qtlocation.qdocconf b/doc/config/qtlocation.qdocconf deleted file mode 100644 index 07645a58..00000000 --- a/doc/config/qtlocation.qdocconf +++ /dev/null @@ -1,94 +0,0 @@ -include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) -include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) - -include(macros.qdocconf) -include(qt-cpp-ignore.qdocconf) -include(qt-defines.qdocconf) - -# Name of the project. -project = Qt Location -description = Qt Location Documentation - -depends += qtcore qtnetwork qtquick qtqml - -# Directories in which to search for files to document and images. -# By default set to the root directory of the project for sources -# and headers and qdoc will therefore generate output for each file. -# Images should be placed in <rootdir>/dic/images and examples in -# <rootdir>/examples. -# Paths are relative to the location of this file. - -exampledirs += ../src/examples \ - ../.. \ - ../../examples \ - ../../examples/declarative \ - ../src \ - ../../src/3rdparty - -headerdirs += ../src \ - ../../src - -imagedirs += ./images \ - ../src/images - -sourcedirs += ../src \ - ../../src \ - ../../examples - -excludedirs += - -# The index file contains links to the Qt 5 documentation. -# Point to the any .index file to cross link to other projects -#indexes = $QT5DOC/doc/html/qt.index - -# The following parameters are for creating a qhp file, the qhelpgenerator -# program can convert the qhp file into a qch file which can be opened in -# Qt Assistant and/or Qt Creator. - -# Defines the name of the project. You cannot use operators (+, =, -) in -# the name. Properties for this project are set using a qhp.<projectname>.property -# format. -qhp.projects = qtlocation - -# Sets the name of the output qhp file. -qhp.qtlocation.file = qtlocation.qhp - -# Namespace for the output file. This namespace is used to distinguish between -# different documentation files in Creator/Assistant. -qhp.qtlocation.namespace = qtlocation.500 - -# Title for the package, will be the main title for the package in -# Assistant/Creator. -qhp.qtlocation.indexTitle = Qt Location Documentation - -# Extra files to add to the output which are not linked to from anywhere -# using a qdoc \l command. -qhp.qtlocation.extraFiles = style/common.css - -# Only update the name of the project for the next variables. -qhp.qtlocation.virtualFolder = qdoc -qhp.qtlocation.subprojects = classes -qhp.qtlocation.subprojects.classes.title = Classes -qhp.qtlocation.subprojects.classes.selectors = class fake:headerfile -qhp.qtlocation.subprojects.classes.sortPages = true - - - -# Do NOT change the variables after this line unless you know what you are doing. - -outputformats = HTML - -examples.fileextensions = "*.cpp *.h *.js *.svg *.xml *.ui *.qml" -examples.imageextensions = "*.png *.jpeg *.jpg *.gif *.mng" -headers.fileextensions = "*.h *.ch *.h++ *.hh *.hpp *.hxx" -sources.fileextensions = "*.cpp *.qdoc *.mm *.qml" - -HTML.nobreadcrumbs = "true" - -HTML.templatedir = . -HTML.stylesheets = style/common.css - -HTML.headerstyles = " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/common.css\" />\n" -HTML.endheader = "</head>\n<body>\n" - -HTML.footer = "<div class=\"footer\">Copyright (c) 2012 Digia Plc and/or its subsidiaries. All rights reserved.</div>\n" diff --git a/doc/config/scripts/functions.js b/doc/config/scripts/functions.js deleted file mode 100644 index d8be935c..00000000 --- a/doc/config/scripts/functions.js +++ /dev/null @@ -1,258 +0,0 @@ -// Removing search results -function hideSearchResults() { -/* hiding search results as the user clicks on the different categories */ - $('#resultdialog').removeClass('active'); - $("#resultlist").removeClass().addClass('all'); - $("#resultlinks").removeClass().addClass('all'); - $("#searchcount").removeClass().addClass('all'); -} -/* closing the searhc result dialog */ -$('#resultclose').click(function(e) { - e.preventDefault(); - hideSearchResults(); -}); - -$(document.body).click(function() { -}); - -/* START non link areas where cursor should change to pointing hand */ -$('.t_button').mouseover(function() { - $('.t_button').css('cursor','pointer'); -}); -/* END non link areas */ -/* Changing font size to smaller */ -$('#smallA').click(function() { - $('.mainContent .heading,.mainContent h1, .mainContent h2, .mainContent h3, .mainContent p, .mainContent li, .mainContent table').css('font-size','smaller'); - $('.t_button').removeClass('active') - $(this).addClass('active') -}); - -/* Reset font size */ -$('#medA').click(function() { - $('.mainContent .heading').css('font','600 16px/1 Arial'); - $('.mainContent h1').css('font','600 18px/1.2 Arial'); - $('.mainContent h2').css('font','600 16px/1.2 Arial'); - $('.mainContent h3').css('font','600 14px/1.2 Arial'); - $('.mainContent p').css('font','13px/20px Verdana'); - $('.mainContent li').css('font','400 13px/1 Verdana'); - $('.mainContent li').css('line-height','14px'); - $('.mainContent .toc li').css('font', 'normal 10px/1.2 Verdana'); - $('.mainContent table').css('font','13px/1.2 Verdana'); - $('.mainContent .heading').css('font','600 16px/1 Arial'); - $('.mainContent .indexboxcont li').css('font','600 13px/1 Verdana'); - $('.t_button').removeClass('active') - $(this).addClass('active') -}); -/* Changing font size to bigger */ -$('#bigA').click(function() { - $('.mainContent .heading,.mainContent h1, .mainContent h2, .mainContent h3, .mainContent p, .mainContent li, .mainContent table').css('font-size','large'); - $('.mainContent .heading,.mainContent h1, .mainContent h2, .mainContent h3, .mainContent p, .mainContent li, .mainContent table').css('line-height','25px'); - $('.t_button').removeClass('active') - $(this).addClass('active') -}); - -/* Show page content after closing feedback box */ -$('.feedclose').click(function() { - $('.bd').show(); - $('.hd').show(); - $('.footer').show(); - $('#feedbackBox').hide(); - $('#blurpage').hide(); -}); - -/* Hide page content and show feedback box */ -$('.feedback').click(function() { - $('.bd').hide(); - $('.hd').hide(); - $('.footer').hide(); - $('#feedbackBox').show(); - $('#blurpage').show(); -}); -/* Default search URL */ -var qturl = ""; - -/* The next function handles the response data (in xml) returned by the search engine */ - -// Process data sent back from the server. The data is structured as a XML. -/* -XML structure handled by function processNokiaData() -<page> - container for each page returned -<pageWords/> - contains keywords -<pageTitle/> - contains page title/header content -<pageUrl/> - contains page URL - URL relative to root -<pageType> - contains page type - APIPage/Article/Example -</page> -*/ - - -function processNokiaData(response){ -/* fetch the responce from the server using page as the root element */ - var propertyTags = response.getElementsByTagName('page'); - /* reset counters */ - var apiCount = 0; - var articleCount = 0; - var exampleCount = 0; - var full_li_element; - -/* remove any old results */ - $('#resultlist li').remove(); - - - /* running through the elements in the xml structure */ - for (var i=0; i<propertyTags.length; i++) { - /* for every element named pageWords*/ - for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++) { - /* start a new list element */ - full_li_element = '<li'; - /* if the pageType element reads APIPage, add class name api */ - if (propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'APIPage') { - full_li_element += ' class="api"'; - apiCount++; - } - /* if the pageType element reads Article, add class name article */ - else if (propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article') { - full_li_element += ' class="article"'; - articleCount++; - } - /* if the pageType element reads Example, add class name example */ - else if (propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Example') { - full_li_element += ' class="example"'; - exampleCount++; - } - /* adding the link element*/ - full_li_element += '><a href="'+qturl; - /* adding the URL attribute*/ - full_li_element += propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue; - /* adding the link title and closing the link and list elements */ - full_li_element += '">' + propertyTags[i].getElementsByTagName('pageWords')[0].firstChild.nodeValue + '</a></li>'; - /* appending the list element to the #resultlist div*/ - $('#resultlist').append(full_li_element); - } - } - - /* if the result is not empty */ - if (propertyTags.length > 0) { - /* add class name active to show the dialog */ - $('#resultdialog').addClass('active'); - /* setting number of hits*/ - $('#resultcount').html(propertyTags.length); - $('#apicount').html(apiCount); - $('#articlecount').html(articleCount); - $('#examplecount').html(exampleCount); - - } - else { - $('#pageType').addClass('red'); - } - - - - // Filtering results in display - $('p#resultlinks a').click(function(e) { - e.preventDefault(); - // Displays API ref pages - if (this.id == "showapiresults") { - $("#resultlist").removeClass().addClass('api'); - $("#resultlinks").removeClass().addClass('api'); - $("#searchcount").removeClass().addClass('api'); - } - // Displays Articles - else if (this.id == "showarticleresults") { - $("#resultlist").removeClass().addClass('article'); - $("#resultlinks").removeClass().addClass('article'); - $("#searchcount").removeClass().addClass('article'); - } - // Displays Examples - if (this.id == "showexampleresults") { - $("#resultlist").removeClass().addClass('example'); - $("#resultlinks").removeClass().addClass('example'); - $("#searchcount").removeClass().addClass('example'); - } - // Displays All - if (this.id == "showallresults") { - $("#resultlist").removeClass().addClass('all'); - $("#resultlinks").removeClass().addClass('all'); - $("#searchcount").removeClass().addClass('all'); - } - }); -} - -//build regular expression object to find empty string or any number of blank -var blankRE=/^\s*$/; - - -function CheckEmptyAndLoadList() -{ - /* Start Extracting information for feedback and adding this to the feedback form */ - var pageUrl = window.location.href; - var pageVal = $('title').html(); - $('#pageType').removeClass('red'); - $('#feedUrl').remove(); - $('#pageVal').remove(); - $('.menuAlert').remove(); - $('#feedform').append('<input id="feedUrl" name="feedUrl" value="'+pageUrl+'" style="display:none;">'); - $('#feedform').append('<input id="pageVal" name="pageVal" value="'+pageVal+'" style="display:none;">'); - /* End Extracting information for feedback and adding this to the feedback form */ - - /* extracts search query */ - var value = document.getElementById('pageType').value; - /* if the search is less than three chars long remove class names and remove elements from old search*/ - if ((blankRE.test(value)) || (value.length < 3)) - { - $('#resultdialog').removeClass('active'); - $('#resultlist li').remove(); - } -} - -// Loads on doc ready - prepares search - $(document).ready(function () { - /* fetch page title*/ - var pageTitle = $('title').html(); - /* getting content from search box */ - var currentString = $('#pageType').val() ; - /* if the search box is not empty run CheckEmptyAndLoadList*/ - if (currentString.length < 1){ - CheckEmptyAndLoadList(); - } - - /* on key-up in the search box execute the following */ - $('#pageType').keyup(function () { - /* extract the search box content */ - var searchString = $('#pageType').val() ; - /* if the string is less than three characters */ - if ((searchString == null) || (searchString.length < 3)) { - /* remove classes and elements*/ - $('#pageType').removeClass('loading'); - $('.searching').remove(); - /* run CheckEmptyAndLoadList */ - CheckEmptyAndLoadList(); - - $('.report').remove(); - return; - } - /* if timer checks out */ - if (this.timer) clearTimeout(this.timer); - this.timer = setTimeout(function () { - /* add loading image by adding loading class */ - $('#pageType').addClass('loading'); - $('.searching').remove(); - - /* run the actual search */ - $.ajax({ - contentType: "application/x-www-form-urlencoded", - url: 'http://' + location.host + '/nokiasearch/GetDataServlet', - data: 'searchString='+searchString, - dataType:'xml', - type: 'post', - success: function (response, textStatus) { - /* on success remove loading img */ - $('.searching').remove(); - $('#pageType').removeClass('loading'); - - processNokiaData(response); - - } - }); - }, 500); /* timer set to 500 ms */ - }); - });
\ No newline at end of file diff --git a/doc/config/scripts/jquery.js b/doc/config/scripts/jquery.js deleted file mode 100644 index b92e35f6..00000000 --- a/doc/config/scripts/jquery.js +++ /dev/null @@ -1,152 +0,0 @@ -/*! - * jQuery JavaScript Library v1.4.1 - * http://jquery.com/ - * - * Copyright 2010, John Resig - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * Includes Sizzle.js - * http://sizzlejs.com/ - * Copyright 2010, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. - * - * Date: Mon Jan 25 19:43:33 2010 -0500 - */ -(function(z,v){function la(){if (!c.isReady){try{r.documentElement.doScroll("left")}catch(a){setTimeout(la,1);return}c.ready()}}function Ma(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,i){var j=a.length;if (typeof b==="object"){for (var n in b)X(a,n,b[n],f,e,d);return a}if (d!==v){f=!i&&f&&c.isFunction(d);for (n=0;n<j;n++)e(a[n],b,f?d.call(a[n],n,e(a[n],b)):d,i);return a}return j? -e(a[0],b):null}function J(){return(new Date).getTime()}function Y(){return false}function Z(){return true}function ma(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function na(a){var b,d=[],f=[],e=arguments,i,j,n,o,m,s,x=c.extend({},c.data(this,"events").live);if (!(a.button&&a.type==="click")){for (o in x){j=x[o];if (j.live===a.type||j.altLive&&c.inArray(a.type,j.altLive)>-1){i=j.data;i.beforeFilter&&i.beforeFilter[a.type]&&!i.beforeFilter[a.type](a)||f.push(j.selector)}else delete x[o]}i=c(a.target).closest(f, -a.currentTarget);m=0;for (s=i.length;m<s;m++)for (o in x){j=x[o];n=i[m].elem;f=null;if (i[m].selector===j.selector){if (j.live==="mouseenter"||j.live==="mouseleave")f=c(a.relatedTarget).closest(j.selector)[0];if (!f||f!==n)d.push({elem:n,fn:j})}}m=0;for (s=d.length;m<s;m++){i=d[m];a.currentTarget=i.elem;a.data=i.fn.data;if (i.fn.apply(i.elem,e)===false){b=false;break}}return b}}function oa(a,b){return"live."+(a?a+".":"")+b.replace(/\./g,"`").replace(/ /g,"&")}function pa(a){return!a||!a.parentNode||a.parentNode.nodeType=== -11}function qa(a,b){var d=0;b.each(function(){if (this.nodeName===(a[d]&&a[d].nodeName)){var f=c.data(a[d++]),e=c.data(this,f);if (f=f&&f.events){delete e.handle;e.events={};for (var i in f)for (var j in f[i])c.event.add(this,i,f[i][j],f[i][j].data)}}})}function ra(a,b,d){var f,e,i;if (a.length===1&&typeof a[0]==="string"&&a[0].length<512&&a[0].indexOf("<option")<0&&(c.support.checkClone||!sa.test(a[0]))){e=true;if (i=c.fragments[a[0]])if (i!==1)f=i}if (!f){b=b&&b[0]?b[0].ownerDocument||b[0]:r;f=b.createDocumentFragment(); -c.clean(a,b,f,d)}if (e)c.fragments[a[0]]=i?f:1;return{fragment:f,cacheable:e}}function K(a,b){var d={};c.each(ta.concat.apply([],ta.slice(0,b)),function(){d[this]=a});return d}function ua(a){return"scrollTo"in a&&a.document?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var c=function(a,b){return new c.fn.init(a,b)},Na=z.jQuery,Oa=z.$,r=z.document,S,Pa=/^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,Qa=/^.[^:#\[\.,]*$/,Ra=/\S/,Sa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Ta=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,O=navigator.userAgent, -va=false,P=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,Q=Array.prototype.slice,wa=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if (!a)return this;if (a.nodeType){this.context=this[0]=a;this.length=1;return this}if (typeof a==="string")if ((d=Pa.exec(a))&&(d[1]||!b))if (d[1]){f=b?b.ownerDocument||b:r;if (a=Ta.exec(a))if (c.isPlainObject(b)){a=[r.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=ra([d[1]], -[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}}else{if (b=r.getElementById(d[2])){if (b.id!==d[2])return S.find(a);this.length=1;this[0]=b}this.context=r;this.selector=a;return this}else if (!b&&/^\w+$/.test(a)){this.selector=a;this.context=r;a=r.getElementsByTagName(a)}else return!b||b.jquery?(b||S).find(a):c(b).find(a);else if (c.isFunction(a))return S.ready(a);if (a.selector!==v){this.selector=a.selector;this.context=a.context}return c.isArray(a)?this.setArray(a):c.makeArray(a, -this)},selector:"",jquery:"1.4.1",length:0,size:function(){return this.length},toArray:function(){return Q.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){a=c(a||null);a.prevObject=this;a.context=this.context;if (b==="find")a.selector=this.selector+(this.selector?" ":"")+d;else if (b)a.selector=this.selector+"."+b+"("+d+")";return a},setArray:function(a){this.length=0;ba.apply(this,a);return this},each:function(a,b){return c.each(this, -a,b)},ready:function(a){c.bindReady();if (c.isReady)a.call(r,c);else P&&P.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(Q.apply(this,arguments),"slice",Q.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice}; -c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,i,j,n;if (typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if (typeof a!=="object"&&!c.isFunction(a))a={};if (d===b){a=this;--b}for (;b<d;b++)if ((e=arguments[b])!=null)for (i in e){j=a[i];n=e[i];if (a!==n)if (f&&n&&(c.isPlainObject(n)||c.isArray(n))){j=j&&(c.isPlainObject(j)||c.isArray(j))?j:c.isArray(n)?[]:{};a[i]=c.extend(f,j,n)}else if (n!==v)a[i]=n}return a};c.extend({noConflict:function(a){z.$= -Oa;if (a)z.jQuery=Na;return c},isReady:false,ready:function(){if (!c.isReady){if (!r.body)return setTimeout(c.ready,13);c.isReady=true;if (P){for (var a,b=0;a=P[b++];)a.call(r,c);P=null}c.fn.triggerHandler&&c(r).triggerHandler("ready")}},bindReady:function(){if (!va){va=true;if (r.readyState==="complete")return c.ready();if (r.addEventListener){r.addEventListener("DOMContentLoaded",L,false);z.addEventListener("load",c.ready,false)}else if (r.attachEvent){r.attachEvent("onreadystatechange",L);z.attachEvent("onload", -c.ready);var a=false;try{a=z.frameElement==null}catch(b){}r.documentElement.doScroll&&a&&la()}}},isFunction:function(a){return $.call(a)==="[object Function]"},isArray:function(a){return $.call(a)==="[object Array]"},isPlainObject:function(a){if (!a||$.call(a)!=="[object Object]"||a.nodeType||a.setInterval)return false;if (a.constructor&&!aa.call(a,"constructor")&&!aa.call(a.constructor.prototype,"isPrototypeOf"))return false;var b;for (b in a);return b===v||aa.call(a,b)},isEmptyObject:function(a){for (var b in a)return false; -return true},error:function(a){throw a;},parseJSON:function(a){if (typeof a!=="string"||!a)return null;if (/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return z.JSON&&z.JSON.parse?z.JSON.parse(a):(new Function("return "+a))();else c.error("Invalid JSON: "+a)},noop:function(){},globalEval:function(a){if (a&&Ra.test(a)){var b=r.getElementsByTagName("head")[0]|| -r.documentElement,d=r.createElement("script");d.type="text/javascript";if (c.support.scriptEval)d.appendChild(r.createTextNode(a));else d.text=a;b.insertBefore(d,b.firstChild);b.removeChild(d)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,b,d){var f,e=0,i=a.length,j=i===v||c.isFunction(a);if (d)if (j)for (f in a){if (b.apply(a[f],d)===false)break}else for (;e<i;){if (b.apply(a[e++],d)===false)break}else if (j)for (f in a){if (b.call(a[f],f,a[f])===false)break}else for (d= -a[0];e<i&&b.call(d,e,d)!==false;d=a[++e]);return a},trim:function(a){return(a||"").replace(Sa,"")},makeArray:function(a,b){b=b||[];if (a!=null)a.length==null||typeof a==="string"||c.isFunction(a)||typeof a!=="function"&&a.setInterval?ba.call(b,a):c.merge(b,a);return b},inArray:function(a,b){if (b.indexOf)return b.indexOf(a);for (var d=0,f=b.length;d<f;d++)if (b[d]===a)return d;return-1},merge:function(a,b){var d=a.length,f=0;if (typeof b.length==="number")for (var e=b.length;f<e;f++)a[d++]=b[f];else for (;b[f]!== -v;)a[d++]=b[f++];a.length=d;return a},grep:function(a,b,d){for (var f=[],e=0,i=a.length;e<i;e++)!d!==!b(a[e],e)&&f.push(a[e]);return f},map:function(a,b,d){for (var f=[],e,i=0,j=a.length;i<j;i++){e=b(a[i],i,d);if (e!=null)f[f.length]=e}return f.concat.apply([],f)},guid:1,proxy:function(a,b,d){if (arguments.length===2)if (typeof b==="string"){d=a;a=d[b];b=v}else if (b&&!c.isFunction(b)){d=b;b=v}if (!b&&a)b=function(){return a.apply(d||this,arguments)};if (a)b.guid=a.guid=a.guid||b.guid||c.guid++;return b}, -uaMatch:function(a){a=a.toLowerCase();a=/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version)?[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||!/compatible/.test(a)&&/(mozilla)(?:.*? rv:([\w.]+))?/.exec(a)||[];return{browser:a[1]||"",version:a[2]||"0"}},browser:{}});O=c.uaMatch(O);if (O.browser){c.browser[O.browser]=true;c.browser.version=O.version}if (c.browser.webkit)c.browser.safari=true;if (wa)c.inArray=function(a,b){return wa.call(b,a)};S=c(r);if (r.addEventListener)L=function(){r.removeEventListener("DOMContentLoaded", -L,false);c.ready()};else if (r.attachEvent)L=function(){if (r.readyState==="complete"){r.detachEvent("onreadystatechange",L);c.ready()}};(function(){c.support={};var a=r.documentElement,b=r.createElement("script"),d=r.createElement("div"),f="script"+J();d.style.display="none";d.innerHTML=" <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";var e=d.getElementsByTagName("*"),i=d.getElementsByTagName("a")[0];if (!(!e||!e.length||!i)){c.support= -{leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(i.getAttribute("style")),hrefNormalized:i.getAttribute("href")==="/a",opacity:/^0.55$/.test(i.style.opacity),cssFloat:!!i.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:r.createElement("select").appendChild(r.createElement("option")).selected,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null}; -b.type="text/javascript";try{b.appendChild(r.createTextNode("window."+f+"=1;"))}catch(j){}a.insertBefore(b,a.firstChild);if (z[f]){c.support.scriptEval=true;delete z[f]}a.removeChild(b);if (d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function n(){c.support.noCloneEvent=false;d.detachEvent("onclick",n)});d.cloneNode(true).fireEvent("onclick")}d=r.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=r.createDocumentFragment();a.appendChild(d.firstChild); -c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var n=r.createElement("div");n.style.width=n.style.paddingLeft="1px";r.body.appendChild(n);c.boxModel=c.support.boxModel=n.offsetWidth===2;r.body.removeChild(n).style.display="none"});a=function(n){var o=r.createElement("div");n="on"+n;var m=n in o;if (!m){o.setAttribute(n,"return;");m=typeof o[n]==="function"}return m};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=i=null}})();c.props= -{"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ua=0,xa={},Va={};c.extend({cache:{},expando:G,noData:{embed:true,object:true,applet:true},data:function(a,b,d){if (!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==z?xa:a;var f=a[G],e=c.cache;if (!b&&!f)return null;f||(f=++Ua);if (typeof b==="object"){a[G]=f;e=e[f]=c.extend(true, -{},b)}else e=e[f]?e[f]:typeof d==="undefined"?Va:(e[f]={});if (d!==v){a[G]=f;e[b]=d}return typeof b==="string"?e[b]:e}},removeData:function(a,b){if (!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==z?xa:a;var d=a[G],f=c.cache,e=f[d];if (b){if (e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{try{delete a[G]}catch(i){a.removeAttribute&&a.removeAttribute(G)}delete f[d]}}}});c.fn.extend({data:function(a,b){if (typeof a==="undefined"&&this.length)return c.data(this[0]);else if (typeof a==="object")return this.each(function(){c.data(this, -a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if (b===v){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if (f===v&&this.length)f=c.data(this[0],a);return f===v&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this,a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if (a){b=(b||"fx")+"queue";var f=c.data(a,b);if (!d)return f||[];if (!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d); -return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if (f==="inprogress")f=d.shift();if (f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if (typeof a!=="string"){b=a;a="fx"}if (b===v)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]|| -a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var ya=/[\n\t]/g,ca=/\s+/,Wa=/\r/g,Xa=/href|src|style/,Ya=/(button|input)/i,Za=/(button|input|object|select|textarea)/i,$a=/^(a|area)$/i,za=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if (c.isFunction(a))return this.each(function(o){var m= -c(this);m.addClass(a.call(this,o,m.attr("class")))});if (a&&typeof a==="string")for (var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if (e.nodeType===1)if (e.className)for (var i=" "+e.className+" ",j=0,n=b.length;j<n;j++){if (i.indexOf(" "+b[j]+" ")<0)e.className+=" "+b[j]}else e.className=a}return this},removeClass:function(a){if (c.isFunction(a))return this.each(function(o){var m=c(this);m.removeClass(a.call(this,o,m.attr("class")))});if (a&&typeof a==="string"||a===v)for (var b=(a||"").split(ca), -d=0,f=this.length;d<f;d++){var e=this[d];if (e.nodeType===1&&e.className)if (a){for (var i=(" "+e.className+" ").replace(ya," "),j=0,n=b.length;j<n;j++)i=i.replace(" "+b[j]+" "," ");e.className=i.substring(1,i.length-1)}else e.className=""}return this},toggleClass:function(a,b){var d=typeof a,f=typeof b==="boolean";if (c.isFunction(a))return this.each(function(e){var i=c(this);i.toggleClass(a.call(this,e,i.attr("class"),b),b)});return this.each(function(){if (d==="string")for (var e,i=0,j=c(this),n=b,o= -a.split(ca);e=o[i++];){n=f?n:!j.hasClass(e);j[n?"addClass":"removeClass"](e)}else if (d==="undefined"||d==="boolean"){this.className&&c.data(this,"__className__",this.className);this.className=this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for (var b=0,d=this.length;b<d;b++)if ((" "+this[b].className+" ").replace(ya," ").indexOf(a)>-1)return true;return false},val:function(a){if (a===v){var b=this[0];if (b){if (c.nodeName(b,"option"))return(b.attributes.value|| -{}).specified?b.value:b.text;if (c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if (d<0)return null;var i=b?d:0;for (d=b?d+1:e.length;i<d;i++){var j=e[i];if (j.selected){a=c(j).val();if (b)return a;f.push(a)}}return f}if (za.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Wa,"")}return v}var n=c.isFunction(a);return this.each(function(o){var m=c(this),s=a;if (this.nodeType===1){if (n)s=a.call(this,o,m.val()); -if (typeof s==="number")s+="";if (c.isArray(s)&&za.test(this.type))this.checked=c.inArray(m.val(),s)>=0;else if (c.nodeName(this,"select")){var x=c.makeArray(s);c("option",this).each(function(){this.selected=c.inArray(c(this).val(),x)>=0});if (!x.length)this.selectedIndex=-1}else this.value=s}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if (!a||a.nodeType===3||a.nodeType===8)return v;if (f&&b in c.attrFn)return c(a)[b](d); -f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==v;b=f&&c.props[b]||b;if (a.nodeType===1){var i=Xa.test(b);if (b in a&&f&&!i){if (e){b==="type"&&Ya.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");a[b]=d}if (c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if (b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:Za.test(a.nodeName)||$a.test(a.nodeName)&&a.href?0:v;return a[b]}if (!c.support.style&&f&&b==="style"){if (e)a.style.cssText= -""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&i?a.getAttribute(b,2):a.getAttribute(b);return a===null?v:a}return c.style(a,b,d)}});var ab=function(a){return a.replace(/[^\w\s\.\|`]/g,function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if (!(a.nodeType===3||a.nodeType===8)){if (a.setInterval&&a!==z&&!a.frameElement)a=z;if (!d.guid)d.guid=c.guid++;if (f!==v){d=c.proxy(d);d.data=f}var e=c.data(a,"events")||c.data(a,"events",{}),i=c.data(a,"handle"),j;if (!i){j= -function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(j.elem,arguments):v};i=c.data(a,"handle",j)}if (i){i.elem=a;b=b.split(/\s+/);for (var n,o=0;n=b[o++];){var m=n.split(".");n=m.shift();if (o>1){d=c.proxy(d);if (f!==v)d.data=f}d.type=m.slice(0).sort().join(".");var s=e[n],x=this.special[n]||{};if (!s){s=e[n]={};if (!x.setup||x.setup.call(a,f,m,d)===false)if (a.addEventListener)a.addEventListener(n,i,false);else a.attachEvent&&a.attachEvent("on"+n,i)}if (x.add)if ((m=x.add.call(a, -d,f,m,s))&&c.isFunction(m)){m.guid=m.guid||d.guid;m.data=m.data||d.data;m.type=m.type||d.type;d=m}s[d.guid]=d;this.global[n]=true}a=null}}},global:{},remove:function(a,b,d){if (!(a.nodeType===3||a.nodeType===8)){var f=c.data(a,"events"),e,i,j;if (f){if (b===v||typeof b==="string"&&b.charAt(0)===".")for (i in f)this.remove(a,i+(b||""));else{if (b.type){d=b.handler;b=b.type}b=b.split(/\s+/);for (var n=0;i=b[n++];){var o=i.split(".");i=o.shift();var m=!o.length,s=c.map(o.slice(0).sort(),ab);s=new RegExp("(^|\\.)"+ -s.join("\\.(?:.*\\.)?")+"(\\.|$)");var x=this.special[i]||{};if (f[i]){if (d){j=f[i][d.guid];delete f[i][d.guid]}else for (var A in f[i])if (m||s.test(f[i][A].type))delete f[i][A];x.remove&&x.remove.call(a,o,j);for (e in f[i])break;if (!e){if (!x.teardown||x.teardown.call(a,o)===false)if (a.removeEventListener)a.removeEventListener(i,c.data(a,"handle"),false);else a.detachEvent&&a.detachEvent("on"+i,c.data(a,"handle"));e=null;delete f[i]}}}}for (e in f)break;if (!e){if (A=c.data(a,"handle"))A.elem=null;c.removeData(a, -"events");c.removeData(a,"handle")}}}},trigger:function(a,b,d,f){var e=a.type||a;if (!f){a=typeof a==="object"?a[G]?a:c.extend(c.Event(e),a):c.Event(e);if (e.indexOf("!")>=0){a.type=e=e.slice(0,-1);a.exclusive=true}if (!d){a.stopPropagation();this.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if (!d||d.nodeType===3||d.nodeType===8)return v;a.result=v;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d, -b);f=d.parentNode||d.ownerDocument;try{if (!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if (d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(i){}if (!a.isPropagationStopped()&&f)c.event.trigger(a,b,f,true);else if (!a.isDefaultPrevented()){d=a.target;var j;if (!(c.nodeName(d,"a")&&e==="click")&&!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()])){try{if (d[e]){if (j=d["on"+e])d["on"+e]=null;this.triggered=true;d[e]()}}catch(n){}if (j)d["on"+e]=j;this.triggered=false}}},handle:function(a){var b, -d;a=arguments[0]=c.event.fix(a||z.event);a.currentTarget=this;d=a.type.split(".");a.type=d.shift();b=!d.length&&!a.exclusive;var f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)");d=(c.data(this,"events")||{})[a.type];for (var e in d){var i=d[e];if (b||f.test(i.type)){a.handler=i;a.data=i.data;i=i.apply(this,arguments);if (i!==v){a.result=i;if (i===false){a.preventDefault();a.stopPropagation()}}if (a.isImmediatePropagationStopped())break}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "), -fix:function(a){if (a[G])return a;var b=a;a=c.Event(b);for (var d=this.props.length,f;d;){f=this.props[--d];a[f]=b[f]}if (!a.target)a.target=a.srcElement||r;if (a.target.nodeType===3)a.target=a.target.parentNode;if (!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if (a.pageX==null&&a.clientX!=null){b=r.documentElement;d=r.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop|| -d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if (!a.which&&(a.charCode||a.charCode===0?a.charCode:a.keyCode))a.which=a.charCode||a.keyCode;if (!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if (!a.which&&a.button!==v)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a,b){c.extend(a,b||{});a.guid+=b.selector+b.live;b.liveProxy=a;c.event.add(this,b.live,na,b)},remove:function(a){if (a.length){var b= -0,d=new RegExp("(^|\\.)"+a[0]+"(\\.|$)");c.each(c.data(this,"events").live||{},function(){d.test(this.type)&&b++});b<1&&c.event.remove(this,a[0],na)}},special:{}},beforeunload:{setup:function(a,b,d){if (this.setInterval)this.onbeforeunload=d;return false},teardown:function(a,b){if (this.onbeforeunload===b)this.onbeforeunload=null}}}};c.Event=function(a){if (!this.preventDefault)return new c.Event(a);if (a&&a.type){this.originalEvent=a;this.type=a.type}else this.type=a;this.timeStamp=J();this[G]=true}; -c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=Z;var a=this.originalEvent;if (a){a.preventDefault&&a.preventDefault();a.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=Z;var a=this.originalEvent;if (a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z;this.stopPropagation()},isDefaultPrevented:Y,isPropagationStopped:Y,isImmediatePropagationStopped:Y};var Aa=function(a){for (var b= -a.relatedTarget;b&&b!==this;)try{b=b.parentNode}catch(d){break}if (b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}},Ba=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?Ba:Aa,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?Ba:Aa)}}});if (!c.support.submitBubbles)c.event.special.submit={setup:function(a,b,d){if (this.nodeName.toLowerCase()!== -"form"){c.event.add(this,"click.specialSubmit."+d.guid,function(f){var e=f.target,i=e.type;if ((i==="submit"||i==="image")&&c(e).closest("form").length)return ma("submit",this,arguments)});c.event.add(this,"keypress.specialSubmit."+d.guid,function(f){var e=f.target,i=e.type;if ((i==="text"||i==="password")&&c(e).closest("form").length&&f.keyCode===13)return ma("submit",this,arguments)})}else return false},remove:function(a,b){c.event.remove(this,"click.specialSubmit"+(b?"."+b.guid:""));c.event.remove(this, -"keypress.specialSubmit"+(b?"."+b.guid:""))}};if (!c.support.changeBubbles){var da=/textarea|input|select/i;function Ca(a){var b=a.type,d=a.value;if (b==="radio"||b==="checkbox")d=a.checked;else if (b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if (a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d}function ea(a,b){var d=a.target,f,e;if (!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Ca(d);if (a.type!=="focusout"|| -d.type!=="radio")c.data(d,"_change_data",e);if (!(f===v||e===f))if (f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}}c.event.special.change={filters:{focusout:ea,click:function(a){var b=a.target,d=b.type;if (d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return ea.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if (a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return ea.call(this,a)},beforeactivate:function(a){a= -a.target;a.nodeName.toLowerCase()==="input"&&a.type==="radio"&&c.data(a,"_change_data",Ca(a))}},setup:function(a,b,d){for (var f in T)c.event.add(this,f+".specialChange."+d.guid,T[f]);return da.test(this.nodeName)},remove:function(a,b){for (var d in T)c.event.remove(this,d+".specialChange"+(b?"."+b.guid:""),T[d]);return da.test(this.nodeName)}};var T=c.event.special.change.filters}r.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this, -f)}c.event.special[b]={setup:function(){this.addEventListener(a,d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if (typeof d==="object"){for (var i in d)this[b](i,f,d[i],e);return this}if (c.isFunction(f)){e=f;f=v}var j=b==="one"?c.proxy(e,function(n){c(this).unbind(n,j);return e.apply(this,arguments)}):e;return d==="unload"&&b!=="one"?this.one(d,f,e):this.each(function(){c.event.add(this,d,j,f)})}});c.fn.extend({unbind:function(a, -b){if (typeof a==="object"&&!a.preventDefault){for (var d in a)this.unbind(d,a[d]);return this}return this.each(function(){c.event.remove(this,a,b)})},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if (this[0]){a=c.Event(a);a.preventDefault();a.stopPropagation();c.event.trigger(a,b,this[0]);return a.result}},toggle:function(a){for (var b=arguments,d=1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(f){var e=(c.data(this,"lastToggle"+ -a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,e+1);f.preventDefault();return b[e].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});c.each(["live","die"],function(a,b){c.fn[b]=function(d,f,e){var i,j=0;if (c.isFunction(f)){e=f;f=v}for (d=(d||"").split(/\s+/);(i=d[j++])!=null;){i=i==="focus"?"focusin":i==="blur"?"focusout":i==="hover"?d.push("mouseleave")&&"mouseenter":i;b==="live"?c(this.context).bind(oa(i,this.selector),{data:f,selector:this.selector, -live:i},e):c(this.context).unbind(oa(i,this.selector),e?{guid:e.guid+this.selector+i}:null)}return this}});c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){c.fn[b]=function(d){return d?this.bind(b,d):this.trigger(b)};if (c.attrFn)c.attrFn[b]=true});z.attachEvent&&!z.addEventListener&&z.attachEvent("onunload",function(){for (var a in c.cache)if (c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}}); -(function(){function a(g){for (var h="",k,l=0;g[l];l++){k=g[l];if (k.nodeType===3||k.nodeType===4)h+=k.nodeValue;else if (k.nodeType!==8)h+=a(k.childNodes)}return h}function b(g,h,k,l,q,p){q=0;for (var u=l.length;q<u;q++){var t=l[q];if (t){t=t[g];for (var y=false;t;){if (t.sizcache===k){y=l[t.sizset];break}if (t.nodeType===1&&!p){t.sizcache=k;t.sizset=q}if (t.nodeName.toLowerCase()===h){y=t;break}t=t[g]}l[q]=y}}}function d(g,h,k,l,q,p){q=0;for (var u=l.length;q<u;q++){var t=l[q];if (t){t=t[g];for (var y=false;t;){if (t.sizcache=== -k){y=l[t.sizset];break}if (t.nodeType===1){if (!p){t.sizcache=k;t.sizset=q}if (typeof h!=="string"){if (t===h){y=true;break}}else if (o.filter(h,[t]).length>0){y=t;break}}t=t[g]}l[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,i=Object.prototype.toString,j=false,n=true;[0,0].sort(function(){n=false;return 0});var o=function(g,h,k,l){k=k||[];var q=h=h||r;if (h.nodeType!==1&&h.nodeType!==9)return[];if (!g|| -typeof g!=="string")return k;for (var p=[],u,t,y,R,H=true,M=w(h),I=g;(f.exec(""),u=f.exec(I))!==null;){I=u[3];p.push(u[1]);if (u[2]){R=u[3];break}}if (p.length>1&&s.exec(g))if (p.length===2&&m.relative[p[0]])t=fa(p[0]+p[1],h);else for (t=m.relative[p[0]]?[h]:o(p.shift(),h);p.length;){g=p.shift();if (m.relative[g])g+=p.shift();t=fa(g,t)}else{if (!l&&p.length>1&&h.nodeType===9&&!M&&m.match.ID.test(p[0])&&!m.match.ID.test(p[p.length-1])){u=o.find(p.shift(),h,M);h=u.expr?o.filter(u.expr,u.set)[0]:u.set[0]}if (h){u= -l?{expr:p.pop(),set:A(l)}:o.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=u.expr?o.filter(u.expr,u.set):u.set;if (p.length>0)y=A(t);else H=false;for (;p.length;){var D=p.pop();u=D;if (m.relative[D])u=p.pop();else D="";if (u==null)u=h;m.relative[D](y,u,M)}}else y=[]}y||(y=t);y||o.error(D||g);if (i.call(y)==="[object Array]")if (H)if (h&&h.nodeType===1)for (g=0;y[g]!=null;g++){if (y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))k.push(t[g])}else for (g=0;y[g]!=null;g++)y[g]&& -y[g].nodeType===1&&k.push(t[g]);else k.push.apply(k,y);else A(y,k);if (R){o(R,q,k,l);o.uniqueSort(k)}return k};o.uniqueSort=function(g){if (C){j=n;g.sort(C);if (j)for (var h=1;h<g.length;h++)g[h]===g[h-1]&&g.splice(h--,1)}return g};o.matches=function(g,h){return o(g,null,null,h)};o.find=function(g,h,k){var l,q;if (!g)return[];for (var p=0,u=m.order.length;p<u;p++){var t=m.order[p];if (q=m.leftMatch[t].exec(g)){var y=q[1];q.splice(1,1);if (y.substr(y.length-1)!=="\\"){q[1]=(q[1]||"").replace(/\\/g,"");l=m.find[t](q, -h,k);if (l!=null){g=g.replace(m.match[t],"");break}}}}l||(l=h.getElementsByTagName("*"));return{set:l,expr:g}};o.filter=function(g,h,k,l){for (var q=g,p=[],u=h,t,y,R=h&&h[0]&&w(h[0]);g&&h.length;){for (var H in m.filter)if ((t=m.leftMatch[H].exec(g))!=null&&t[2]){var M=m.filter[H],I,D;D=t[1];y=false;t.splice(1,1);if (D.substr(D.length-1)!=="\\"){if (u===p)p=[];if (m.preFilter[H])if (t=m.preFilter[H](t,u,k,p,l,R)){if (t===true)continue}else y=I=true;if (t)for (var U=0;(D=u[U])!=null;U++)if (D){I=M(D,t,U,u);var Da= -l^!!I;if (k&&I!=null)if (Da)y=true;else u[U]=false;else if (Da){p.push(D);y=true}}if (I!==v){k||(u=p);g=g.replace(m.match[H],"");if (!y)return[];break}}}if (g===q)if (y==null)o.error(g);else break;q=g}return u};o.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var m=o.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/, -TAG:/^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},relative:{"+":function(g,h){var k=typeof h==="string",l=k&&!/\W/.test(h);k=k&&!l;if (l)h=h.toLowerCase();l=0;for (var q=g.length, -p;l<q;l++)if (p=g[l]){for (;(p=p.previousSibling)&&p.nodeType!==1;);g[l]=k||p&&p.nodeName.toLowerCase()===h?p||false:p===h}k&&o.filter(h,g,true)},">":function(g,h){var k=typeof h==="string";if (k&&!/\W/.test(h)){h=h.toLowerCase();for (var l=0,q=g.length;l<q;l++){var p=g[l];if (p){k=p.parentNode;g[l]=k.nodeName.toLowerCase()===h?k:false}}}else{l=0;for (q=g.length;l<q;l++)if (p=g[l])g[l]=k?p.parentNode:p.parentNode===h;k&&o.filter(h,g,true)}},"":function(g,h,k){var l=e++,q=d;if (typeof h==="string"&&!/\W/.test(h)){var p= -h=h.toLowerCase();q=b}q("parentNode",h,l,g,p,k)},"~":function(g,h,k){var l=e++,q=d;if (typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("previousSibling",h,l,g,p,k)}},find:{ID:function(g,h,k){if (typeof h.getElementById!=="undefined"&&!k)return(g=h.getElementById(g[1]))?[g]:[]},NAME:function(g,h){if (typeof h.getElementsByName!=="undefined"){var k=[];h=h.getElementsByName(g[1]);for (var l=0,q=h.length;l<q;l++)h[l].getAttribute("name")===g[1]&&k.push(h[l]);return k.length===0?null:k}}, -TAG:function(g,h){return h.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,h,k,l,q,p){g=" "+g[1].replace(/\\/g,"")+" ";if (p)return g;p=0;for (var u;(u=h[p])!=null;p++)if (u)if (q^(u.className&&(" "+u.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))k||l.push(u);else if (k)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},CHILD:function(g){if (g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&& -"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,k,l,q,p){h=g[1].replace(/\\/g,"");if (!p&&m.attrMap[h])g[1]=m.attrMap[h];if (g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,k,l,q){if (g[1]==="not")if ((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=o(g[3],null,null,h);else{g=o.filter(g[3],h,k,true^q);k||l.push.apply(l,g);return false}else if (m.match.POS.test(g[0])||m.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true); -return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,k){return!!o(k[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"=== -g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},setFilters:{first:function(g,h){return h===0},last:function(g,h,k,l){return h===l.length-1},even:function(g,h){return h%2=== -0},odd:function(g,h){return h%2===1},lt:function(g,h,k){return h<k[3]-0},gt:function(g,h,k){return h>k[3]-0},nth:function(g,h,k){return k[3]-0===h},eq:function(g,h,k){return k[3]-0===h}},filter:{PSEUDO:function(g,h,k,l){var q=h[1],p=m.filters[q];if (p)return p(g,k,h,l);else if (q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if (q==="not"){h=h[3];k=0;for (l=h.length;k<l;k++)if (h[k]===g)return false;return true}else o.error("Syntax error, unrecognized expression: "+ -q)},CHILD:function(g,h){var k=h[1],l=g;switch(k){case "only":case "first":for (;l=l.previousSibling;)if (l.nodeType===1)return false;if (k==="first")return true;l=g;case "last":for (;l=l.nextSibling;)if (l.nodeType===1)return false;return true;case "nth":k=h[2];var q=h[3];if (k===1&&q===0)return true;h=h[0];var p=g.parentNode;if (p&&(p.sizcache!==h||!g.nodeIndex)){var u=0;for (l=p.firstChild;l;l=l.nextSibling)if (l.nodeType===1)l.nodeIndex=++u;p.sizcache=h}g=g.nodeIndex-q;return k===0?g===0:g%k===0&&g/k>= -0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var k=h[1];g=m.attrHandle[k]?m.attrHandle[k](g):g[k]!=null?g[k]:g.getAttribute(k);k=g+"";var l=h[2];h=h[4];return g==null?l==="!=":l==="="?k===h:l==="*="?k.indexOf(h)>=0:l==="~="?(" "+k+" ").indexOf(h)>=0:!h?k&&g!==false:l==="!="?k!==h:l==="^="? -k.indexOf(h)===0:l==="$="?k.substr(k.length-h.length)===h:l==="|="?k===h||k.substr(0,h.length+1)===h+"-":false},POS:function(g,h,k,l){var q=m.setFilters[h[2]];if (q)return q(g,k,h,l)}}},s=m.match.POS;for (var x in m.match){m.match[x]=new RegExp(m.match[x].source+/(?![^\[]*\])(?![^\(]*\))/.source);m.leftMatch[x]=new RegExp(/(^(?:.|\r|\n)*?)/.source+m.match[x].source.replace(/\\(\d+)/g,function(g,h){return"\\"+(h-0+1)}))}var A=function(g,h){g=Array.prototype.slice.call(g,0);if (h){h.push.apply(h,g);return h}return g}; -try{Array.prototype.slice.call(r.documentElement.childNodes,0)}catch(B){A=function(g,h){h=h||[];if (i.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if (typeof g.length==="number")for (var k=0,l=g.length;k<l;k++)h.push(g[k]);else for (k=0;g[k];k++)h.push(g[k]);return h}}var C;if (r.documentElement.compareDocumentPosition)C=function(g,h){if (!g.compareDocumentPosition||!h.compareDocumentPosition){if (g==h)j=true;return g.compareDocumentPosition?-1:1}g=g.compareDocumentPosition(h)&4?-1:g=== -h?0:1;if (g===0)j=true;return g};else if ("sourceIndex"in r.documentElement)C=function(g,h){if (!g.sourceIndex||!h.sourceIndex){if (g==h)j=true;return g.sourceIndex?-1:1}g=g.sourceIndex-h.sourceIndex;if (g===0)j=true;return g};else if (r.createRange)C=function(g,h){if (!g.ownerDocument||!h.ownerDocument){if (g==h)j=true;return g.ownerDocument?-1:1}var k=g.ownerDocument.createRange(),l=h.ownerDocument.createRange();k.setStart(g,0);k.setEnd(g,0);l.setStart(h,0);l.setEnd(h,0);g=k.compareBoundaryPoints(Range.START_TO_END, -l);if (g===0)j=true;return g};(function(){var g=r.createElement("div"),h="script"+(new Date).getTime();g.innerHTML="<a name='"+h+"'/>";var k=r.documentElement;k.insertBefore(g,k.firstChild);if (r.getElementById(h)){m.find.ID=function(l,q,p){if (typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(l[1]))?q.id===l[1]||typeof q.getAttributeNode!=="undefined"&&q.getAttributeNode("id").nodeValue===l[1]?[q]:v:[]};m.filter.ID=function(l,q){var p=typeof l.getAttributeNode!=="undefined"&&l.getAttributeNode("id"); -return l.nodeType===1&&p&&p.nodeValue===q}}k.removeChild(g);k=g=null})();(function(){var g=r.createElement("div");g.appendChild(r.createComment(""));if (g.getElementsByTagName("*").length>0)m.find.TAG=function(h,k){k=k.getElementsByTagName(h[1]);if (h[1]==="*"){h=[];for (var l=0;k[l];l++)k[l].nodeType===1&&h.push(k[l]);k=h}return k};g.innerHTML="<a href='#'></a>";if (g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")m.attrHandle.href=function(h){return h.getAttribute("href", -2)};g=null})();r.querySelectorAll&&function(){var g=o,h=r.createElement("div");h.innerHTML="<p class='TEST'></p>";if (!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){o=function(l,q,p,u){q=q||r;if (!u&&q.nodeType===9&&!w(q))try{return A(q.querySelectorAll(l),p)}catch(t){}return g(l,q,p,u)};for (var k in g)o[k]=g[k];h=null}}();(function(){var g=r.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if (!(!g.getElementsByClassName||g.getElementsByClassName("e").length=== -0)){g.lastChild.className="e";if (g.getElementsByClassName("e").length!==1){m.order.splice(1,0,"CLASS");m.find.CLASS=function(h,k,l){if (typeof k.getElementsByClassName!=="undefined"&&!l)return k.getElementsByClassName(h[1])};g=null}}})();var E=r.compareDocumentPosition?function(g,h){return g.compareDocumentPosition(h)&16}:function(g,h){return g!==h&&(g.contains?g.contains(h):true)},w=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},fa=function(g,h){var k=[], -l="",q;for (h=h.nodeType?[h]:h;q=m.match.PSEUDO.exec(g);){l+=q[0];g=g.replace(m.match.PSEUDO,"")}g=m.relative[g]?g+"*":g;q=0;for (var p=h.length;q<p;q++)o(g,h[q],k);return o.filter(l,k)};c.find=o;c.expr=o.selectors;c.expr[":"]=c.expr.filters;c.unique=o.uniqueSort;c.getText=a;c.isXMLDoc=w;c.contains=E})();var bb=/Until$/,cb=/^(?:parents|prevUntil|prevAll)/,db=/,/;Q=Array.prototype.slice;var Ea=function(a,b,d){if (c.isFunction(b))return c.grep(a,function(e,i){return!!b.call(e,i,e)===d});else if (b.nodeType)return c.grep(a, -function(e){return e===b===d});else if (typeof b==="string"){var f=c.grep(a,function(e){return e.nodeType===1});if (Qa.test(b))return c.filter(b,f,!d);else b=c.filter(b,f)}return c.grep(a,function(e){return c.inArray(e,b)>=0===d})};c.fn.extend({find:function(a){for (var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f<e;f++){d=b.length;c.find(a,this[f],b);if (f>0)for (var i=d;i<b.length;i++)for (var j=0;j<d;j++)if (b[j]===b[i]){b.splice(i--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for (var d= -0,f=b.length;d<f;d++)if (c.contains(this,b[d]))return true})},not:function(a){return this.pushStack(Ea(this,a,false),"not",a)},filter:function(a){return this.pushStack(Ea(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){if (c.isArray(a)){var d=[],f=this[0],e,i={},j;if (f&&a.length){e=0;for (var n=a.length;e<n;e++){j=a[e];i[j]||(i[j]=c.expr.match.POS.test(j)?c(j,b||this.context):j)}for (;f&&f.ownerDocument&&f!==b;){for (j in i){e=i[j];if (e.jquery?e.index(f)> --1:c(f).is(e)){d.push({selector:j,elem:f});delete i[j]}}f=f.parentNode}}return d}var o=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(m,s){for (;s&&s.ownerDocument&&s!==b;){if (o?o.index(s)>-1:c(s).is(a))return s;s=s.parentNode}return null})},index:function(a){if (!a||typeof a==="string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(), -a);return this.pushStack(pa(a[0])||pa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")}, -nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);bb.test(a)||(f=d);if (f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e): -e;if ((this.length>1||db.test(f))&&cb.test(a))e=e.reverse();return this.pushStack(e,a,Q.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if (d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for (a=a[b];a&&a.nodeType!==9&&(d===v||a.nodeType!==1||!c(a).is(d));){a.nodeType===1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for (var f=0;a;a=a[d])if (a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for (var d=[];a;a=a.nextSibling)a.nodeType===1&&a!== -b&&d.push(a);return d}});var Fa=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ga=/(<([\w:]+)[^>]*?)\/>/g,eb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,Ha=/<([\w:]+)/,fb=/<tbody/i,gb=/<|&\w+;/,sa=/checked\s*(?:[^=]|=\s*.checked.)/i,Ia=function(a,b,d){return eb.test(d)?a:b+"></"+d+">"},F={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"], -col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if (!c.support.htmlSerialize)F._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if (c.isFunction(a))return this.each(function(b){var d=c(this);d.text(a.call(this,b,d.text()))});if (typeof a!=="object"&&a!==v)return this.empty().append((this[0]&&this[0].ownerDocument||r).createTextNode(a));return c.getText(this)}, -wrapAll:function(a){if (c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if (this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for (var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},wrapInner:function(a){if (c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length? -d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if (this[0]&&this[0].parentNode)return this.domManip(arguments, -false,function(b){this.parentNode.insertBefore(b,this)});else if (arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if (this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this.nextSibling)});else if (arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},clone:function(a){var b=this.map(function(){if (!c.support.noCloneEvent&& -!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if (!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Fa,"").replace(V,"")],f)[0]}else return this.cloneNode(true)});if (a===true){qa(this,b);qa(this.find("*"),b.find("*"))}return b},html:function(a){if (a===v)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Fa,""):null;else if (typeof a==="string"&&!/<script/i.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(Ha.exec(a)|| -["",""])[1].toLowerCase()]){a=a.replace(Ga,Ia);try{for (var b=0,d=this.length;b<d;b++)if (this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(f){this.empty().append(a)}}else c.isFunction(a)?this.each(function(e){var i=c(this),j=i.html();i.empty().append(function(){return a.call(this,e,j)})}):this.empty().append(a);return this},replaceWith:function(a){if (this[0]&&this[0].parentNode){if (c.isFunction(a))return this.each(function(b){var d=c(this),f=d.html();d.replaceWith(a.call(this, -b,f))});else a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){function f(s){return c.nodeName(s,"table")?s.getElementsByTagName("tbody")[0]||s.appendChild(s.ownerDocument.createElement("tbody")):s}var e,i,j=a[0],n=[];if (!c.support.checkClone&&arguments.length===3&&typeof j=== -"string"&&sa.test(j))return this.each(function(){c(this).domManip(a,b,d,true)});if (c.isFunction(j))return this.each(function(s){var x=c(this);a[0]=j.call(this,s,b?x.html():v);x.domManip(a,b,d)});if (this[0]){e=a[0]&&a[0].parentNode&&a[0].parentNode.nodeType===11?{fragment:a[0].parentNode}:ra(a,this,n);if (i=e.fragment.firstChild){b=b&&c.nodeName(i,"tr");for (var o=0,m=this.length;o<m;o++)d.call(b?f(this[o],i):this[o],e.cacheable||this.length>1||o>0?e.fragment.cloneNode(true):e.fragment)}n&&c.each(n, -Ma)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);for (var e=0,i=d.length;e<i;e++){var j=(e>0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),j);f=f.concat(j)}return this.pushStack(f,a,d.selector)}});c.each({remove:function(a,b){if (!a||c.filter(a,[this]).length){if (!b&&this.nodeType===1){c.cleanData(this.getElementsByTagName("*"));c.cleanData([this])}this.parentNode&& -this.parentNode.removeChild(this)}},empty:function(){for (this.nodeType===1&&c.cleanData(this.getElementsByTagName("*"));this.firstChild;)this.removeChild(this.firstChild)}},function(a,b){c.fn[a]=function(){return this.each(b,arguments)}});c.extend({clean:function(a,b,d,f){b=b||r;if (typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||r;var e=[];c.each(a,function(i,j){if (typeof j==="number")j+="";if (j){if (typeof j==="string"&&!gb.test(j))j=b.createTextNode(j);else if (typeof j=== -"string"){j=j.replace(Ga,Ia);var n=(Ha.exec(j)||["",""])[1].toLowerCase(),o=F[n]||F._default,m=o[0];i=b.createElement("div");for (i.innerHTML=o[1]+j+o[2];m--;)i=i.lastChild;if (!c.support.tbody){m=fb.test(j);n=n==="table"&&!m?i.firstChild&&i.firstChild.childNodes:o[1]==="<table>"&&!m?i.childNodes:[];for (o=n.length-1;o>=0;--o)c.nodeName(n[o],"tbody")&&!n[o].childNodes.length&&n[o].parentNode.removeChild(n[o])}!c.support.leadingWhitespace&&V.test(j)&&i.insertBefore(b.createTextNode(V.exec(j)[0]),i.firstChild); -j=c.makeArray(i.childNodes)}if (j.nodeType)e.push(j);else e=c.merge(e,j)}});if (d)for (a=0;e[a];a++)if (f&&c.nodeName(e[a],"script")&&(!e[a].type||e[a].type.toLowerCase()==="text/javascript"))f.push(e[a].parentNode?e[a].parentNode.removeChild(e[a]):e[a]);else{e[a].nodeType===1&&e.splice.apply(e,[a+1,0].concat(c.makeArray(e[a].getElementsByTagName("script"))));d.appendChild(e[a])}return e},cleanData:function(a){for (var b=0,d;(d=a[b])!=null;b++){c.event.remove(d);c.removeData(d)}}});var hb=/z-?index|font-?weight|opacity|zoom|line-?height/i, -Ja=/alpha\([^)]*\)/,Ka=/opacity=([^)]*)/,ga=/float/i,ha=/-([a-z])/ig,ib=/([A-Z])/g,jb=/^-?\d+(?:px)?$/i,kb=/^-?\d/,lb={position:"absolute",visibility:"hidden",display:"block"},mb=["Left","Right"],nb=["Top","Bottom"],ob=r.defaultView&&r.defaultView.getComputedStyle,La=c.support.cssFloat?"cssFloat":"styleFloat",ia=function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if (e===v)return c.curCSS(d,f);if (typeof e==="number"&&!hb.test(f))e+="px";c.style(d,f,e)})}; -c.extend({style:function(a,b,d){if (!a||a.nodeType===3||a.nodeType===8)return v;if ((b==="width"||b==="height")&&parseFloat(d)<0)d=v;var f=a.style||a,e=d!==v;if (!c.support.opacity&&b==="opacity"){if (e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter=Ja.test(a)?a.replace(Ja,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Ka.exec(f.filter)[1])/100+"":""}if (ga.test(b))b=La;b=b.replace(ha,ia);if (e)f[b]=d;return f[b]},css:function(a, -b,d,f){if (b==="width"||b==="height"){var e,i=b==="width"?mb:nb;function j(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(i,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if (f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a,"border"+this+"Width",true))||0})}a.offsetWidth!==0?j():c.swap(a,lb,j);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if (!c.support.opacity&&b==="opacity"&& -a.currentStyle){f=Ka.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if (ga.test(b))b=La;if (!d&&e&&e[b])f=e[b];else if (ob){if (ga.test(b))b="float";b=b.replace(ib,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if (!e)return null;if (a=e.getComputedStyle(a,null))f=a.getPropertyValue(b);if (b==="opacity"&&f==="")f="1"}else if (a.currentStyle){d=b.replace(ha,ia);f=a.currentStyle[b]||a.currentStyle[d];if (!jb.test(f)&&kb.test(f)){b=e.left;var i=a.runtimeStyle.left;a.runtimeStyle.left= -a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=i}}return f},swap:function(a,b,d){var f={};for (var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for (e in b)a.style[e]=f[e]}});if (c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var pb= -J(),qb=/<script(.|\s)*?\/script>/gi,rb=/select|textarea/i,sb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ja=/\?/,tb=/(\?|&)_=.*?(&|$)/,ub=/^(\w+:)?\/\/([^\/?#]+)/,vb=/%20/g;c.fn.extend({_load:c.fn.load,load:function(a,b,d){if (typeof a!=="string")return this._load(a);else if (!this.length)return this;var f=a.indexOf(" ");if (f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if (b)if (c.isFunction(b)){d=b;b=null}else if (typeof b==="object"){b= -c.param(b,c.ajaxSettings.traditional);f="POST"}var i=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(j,n){if (n==="success"||n==="notmodified")i.html(e?c("<div />").append(j.responseText.replace(qb,"")).find(e):j.responseText);d&&i.each(d,[j.responseText,n,j])}});return this},serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&& -(this.checked||rb.test(this.nodeName)||sb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if (c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a, -b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if (c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:z.XMLHttpRequest&&(z.location.protocol!=="file:"||!z.ActiveXObject)?function(){return new z.XMLHttpRequest}: -function(){try{return new z.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&&e.success.call(o,n,j,w);e.global&&f("ajaxSuccess",[w,e])}function d(){e.complete&&e.complete.call(o,w,j);e.global&&f("ajaxComplete",[w,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")} -function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),i,j,n,o=a&&a.context||e,m=e.type.toUpperCase();if (e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if (e.dataType==="jsonp"){if (m==="GET")N.test(e.url)||(e.url+=(ja.test(e.url)?"&":"?")+(e.jsonp||"callback")+"=?");else if (!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if (e.dataType==="json"&&(e.data&&N.test(e.data)|| -N.test(e.url))){i=e.jsonpCallback||"jsonp"+pb++;if (e.data)e.data=(e.data+"").replace(N,"="+i+"$1");e.url=e.url.replace(N,"="+i+"$1");e.dataType="script";z[i]=z[i]||function(q){n=q;b();d();z[i]=v;try{delete z[i]}catch(p){}A&&A.removeChild(B)}}if (e.dataType==="script"&&e.cache===null)e.cache=false;if (e.cache===false&&m==="GET"){var s=J(),x=e.url.replace(tb,"$1_="+s+"$2");e.url=x+(x===e.url?(ja.test(e.url)?"&":"?")+"_="+s:"")}if (e.data&&m==="GET")e.url+=(ja.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&& -c.event.trigger("ajaxStart");s=(s=ub.exec(e.url))&&(s[1]&&s[1]!==location.protocol||s[2]!==location.host);if (e.dataType==="script"&&m==="GET"&&s){var A=r.getElementsByTagName("head")[0]||r.documentElement,B=r.createElement("script");B.src=e.url;if (e.scriptCharset)B.charset=e.scriptCharset;if (!i){var C=false;B.onload=B.onreadystatechange=function(){if (!C&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){C=true;b();d();B.onload=B.onreadystatechange=null;A&&B.parentNode&& -A.removeChild(B)}}}A.insertBefore(B,A.firstChild);return v}var E=false,w=e.xhr();if (w){e.username?w.open(m,e.url,e.async,e.username,e.password):w.open(m,e.url,e.async);try{if (e.data||a&&a.contentType)w.setRequestHeader("Content-Type",e.contentType);if (e.ifModified){c.lastModified[e.url]&&w.setRequestHeader("If-Modified-Since",c.lastModified[e.url]);c.etag[e.url]&&w.setRequestHeader("If-None-Match",c.etag[e.url])}s||w.setRequestHeader("X-Requested-With","XMLHttpRequest");w.setRequestHeader("Accept", -e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(fa){}if (e.beforeSend&&e.beforeSend.call(o,w,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");w.abort();return false}e.global&&f("ajaxSend",[w,e]);var g=w.onreadystatechange=function(q){if (!w||w.readyState===0||q==="abort"){E||d();E=true;if (w)w.onreadystatechange=c.noop}else if (!E&&w&&(w.readyState===4||q==="timeout")){E=true;w.onreadystatechange=c.noop;j=q==="timeout"?"timeout":!c.httpSuccess(w)? -"error":e.ifModified&&c.httpNotModified(w,e.url)?"notmodified":"success";var p;if (j==="success")try{n=c.httpData(w,e.dataType,e)}catch(u){j="parsererror";p=u}if (j==="success"||j==="notmodified")i||b();else c.handleError(e,w,j,p);d();q==="timeout"&&w.abort();if (e.async)w=null}};try{var h=w.abort;w.abort=function(){w&&h.call(w);g("abort")}}catch(k){}e.async&&e.timeout>0&&setTimeout(function(){w&&!E&&g("timeout")},e.timeout);try{w.send(m==="POST"||m==="PUT"||m==="DELETE"?e.data:null)}catch(l){c.handleError(e, -w,null,l);d()}e.async||g();return w}},handleError:function(a,b,d,f){if (a.error)a.error.call(a.context||a,b,d,f);if (a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if (d)c.lastModified[b]=d;if (f)c.etag[b]= -f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if (d&&d.dataFilter)a=d.dataFilter(a,b);if (typeof a==="string")if (b==="json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if (b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(j,n){if (c.isArray(n))c.each(n, -function(o,m){b?f(j,m):d(j+"["+(typeof m==="object"||c.isArray(m)?o:"")+"]",m)});else!b&&n!=null&&typeof n==="object"?c.each(n,function(o,m){d(j+"["+o+"]",m)}):f(j,n)}function f(j,n){n=c.isFunction(n)?n():n;e[e.length]=encodeURIComponent(j)+"="+encodeURIComponent(n)}var e=[];if (b===v)b=c.ajaxSettings.traditional;if (c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for (var i in a)d(i,a[i]);return e.join("&").replace(vb,"+")}});var ka={},wb=/toggle|show|hide/,xb=/^([+-]=)?([\d+-.]+)(.*)$/, -W,ta=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if (a||a===0)return this.animate(K("show",3),a,b);else{a=0;for (b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");this[a].style.display=d||"";if (c.css(this[a],"display")==="none"){d=this[a].nodeName;var f;if (ka[d])f=ka[d];else{var e=c("<"+d+" />").appendTo("body");f=e.css("display");if (f==="none")f="block";e.remove(); -ka[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for (b=this.length;a<b;a++)this[a].style.display=c.data(this[a],"olddisplay")||"";return this}},hide:function(a,b){if (a||a===0)return this.animate(K("hide",3),a,b);else{a=0;for (b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");!d&&d!=="none"&&c.data(this[a],"olddisplay",c.css(this[a],"display"))}a=0;for (b=this.length;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b){var d=typeof a==="boolean";if (c.isFunction(a)&& -c.isFunction(b))this._toggle.apply(this,arguments);else a==null||d?this.each(function(){var f=d?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(K("toggle",3),a,b);return this},fadeTo:function(a,b,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d)},animate:function(a,b,d,f){var e=c.speed(b,d,f);if (c.isEmptyObject(a))return this.each(e.complete);return this[e.queue===false?"each":"queue"](function(){var i=c.extend({},e),j,n=this.nodeType===1&&c(this).is(":hidden"), -o=this;for (j in a){var m=j.replace(ha,ia);if (j!==m){a[m]=a[j];delete a[j];j=m}if (a[j]==="hide"&&n||a[j]==="show"&&!n)return i.complete.call(this);if ((j==="height"||j==="width")&&this.style){i.display=c.css(this,"display");i.overflow=this.style.overflow}if (c.isArray(a[j])){(i.specialEasing=i.specialEasing||{})[j]=a[j][1];a[j]=a[j][0]}}if (i.overflow!=null)this.style.overflow="hidden";i.curAnim=c.extend({},a);c.each(a,function(s,x){var A=new c.fx(o,i,s);if (wb.test(x))A[x==="toggle"?n?"show":"hide":x](a); -else{var B=xb.exec(x),C=A.cur(true)||0;if (B){x=parseFloat(B[2]);var E=B[3]||"px";if (E!=="px"){o.style[s]=(x||1)+E;C=(x||1)/A.cur(true)*C;o.style[s]=C+E}if (B[1])x=(B[1]==="-="?-1:1)*x+C;A.custom(C,x,E)}else A.custom(C,x,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);this.each(function(){for (var f=d.length-1;f>=0;f--)if (d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle", -1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration==="number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a, -b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if (!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||c.fx.step._default)(this);if ((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if (this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]== -null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(i){return e.step(i)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;this.pos=this.state=0;var e=this;f.elem=this.elem;if (f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop=== -"width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if (a||b>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for (var f in this.options.curAnim)if (this.options.curAnim[f]!==true)d=false;if (d){if (this.options.display!=null){this.elem.style.overflow= -this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if (c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if (this.options.hide||this.options.show)for (var e in this.options.curAnim)c.style(this.elem,e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos= -c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for (var a=c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||c.fx.stop()},stop:function(){clearInterval(W);W=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if (a.elem.style&&a.elem.style[a.prop]!= -null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if (c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===b.elem}).length};c.fn.offset="getBoundingClientRect"in r.documentElement?function(a){var b=this[0];if (a)return this.each(function(e){c.offset.setOffset(this,a,e)});if (!b||!b.ownerDocument)return null;if (b===b.ownerDocument.body)return c.offset.bodyOffset(b);var d=b.getBoundingClientRect(), -f=b.ownerDocument;b=f.body;f=f.documentElement;return{top:d.top+(self.pageYOffset||c.support.boxModel&&f.scrollTop||b.scrollTop)-(f.clientTop||b.clientTop||0),left:d.left+(self.pageXOffset||c.support.boxModel&&f.scrollLeft||b.scrollLeft)-(f.clientLeft||b.clientLeft||0)}}:function(a){var b=this[0];if (a)return this.each(function(s){c.offset.setOffset(this,a,s)});if (!b||!b.ownerDocument)return null;if (b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d=b.offsetParent,f= -b,e=b.ownerDocument,i,j=e.documentElement,n=e.body;f=(e=e.defaultView)?e.getComputedStyle(b,null):b.currentStyle;for (var o=b.offsetTop,m=b.offsetLeft;(b=b.parentNode)&&b!==n&&b!==j;){if (c.offset.supportsFixedPosition&&f.position==="fixed")break;i=e?e.getComputedStyle(b,null):b.currentStyle;o-=b.scrollTop;m-=b.scrollLeft;if (b===d){o+=b.offsetTop;m+=b.offsetLeft;if (c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(b.nodeName))){o+=parseFloat(i.borderTopWidth)|| -0;m+=parseFloat(i.borderLeftWidth)||0}f=d;d=b.offsetParent}if (c.offset.subtractsBorderForOverflowNotVisible&&i.overflow!=="visible"){o+=parseFloat(i.borderTopWidth)||0;m+=parseFloat(i.borderLeftWidth)||0}f=i}if (f.position==="relative"||f.position==="static"){o+=n.offsetTop;m+=n.offsetLeft}if (c.offset.supportsFixedPosition&&f.position==="fixed"){o+=Math.max(j.scrollTop,n.scrollTop);m+=Math.max(j.scrollLeft,n.scrollLeft)}return{top:o,left:m}};c.offset={initialize:function(){var a=r.body,b=r.createElement("div"), -d,f,e,i=parseFloat(c.curCSS(a,"marginTop",true))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";a.insertBefore(b,a.firstChild); -d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i;a.removeChild(b);c.offset.initialize=c.noop}, -bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if (c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if (/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),i=parseInt(c.curCSS(a,"top",true),10)||0,j=parseInt(c.curCSS(a,"left",true),10)||0;if (c.isFunction(b))b=b.call(a,d,e);d={top:b.top-e.top+i,left:b.left- -e.left+j};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if (!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top-f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for (var a= -this.offsetParent||r.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],i;if (!e)return null;if (f!==v)return this.each(function(){if (i=ua(this))i.scrollTo(!a?f:c(i).scrollLeft(),a?f:c(i).scrollTop());else this[d]=f});else return(i=ua(e))?"pageXOffset"in i?i[a?"pageYOffset":"pageXOffset"]:c.support.boxModel&&i.document.documentElement[d]||i.document.body[d]:e[d]}}); -c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if (!e)return f==null?null:this;if (c.isFunction(f))return this.each(function(i){var j=c(this);j[d](f.call(this,i,j[d]()))});return"scrollTo"in e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]|| -e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===v?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});z.jQuery=z.$=c})(window); diff --git a/doc/config/scripts/narrow.js b/doc/config/scripts/narrow.js deleted file mode 100644 index cc506f78..00000000 --- a/doc/config/scripts/narrow.js +++ /dev/null @@ -1,133 +0,0 @@ -/* This function generates menus and search box in narrow/slim fit mode */ -var narrowInit = function() { - /* 1: Create search form */ - var narrowSearch = $('<div id="narrowsearch"></div>'); - var searchform = $("#qtdocsearch"); - narrowSearch.append(searchform); - $("#qtdocheader .content .qtref").after(narrowSearch); - - /* 2: Create dropdowns */ - var narrowmenu = $('<ul id="narrowmenu" class="sf-menu"></ul>'); - - /* Lookup */ - var lookuptext = $("#lookup h2").attr("title"); - $("#lookup ul").removeAttr("id"); - $("#lookup ul li").removeAttr("class"); - $("#lookup ul li").removeAttr("style"); - var lookupul = $("#lookup ul"); - var lookuplist = $('<li></li>'); - var lookuplink = $('<a href="#"></a>'); - lookuplink.append(lookuptext); - lookuplist.append(lookuplink); - lookuplist.append(lookupul); - narrowmenu.append(lookuplist); - - /* Topics */ - var topicstext = $("#topics h2").attr("title"); - $("#topics ul").removeAttr("id"); - $("#topics ul li").removeAttr("class"); - $("#topics ul li").removeAttr("style"); - var topicsul = $("#topics ul"); - var topicslist = $('<li></li>'); - var topicslink = $('<a href="#"></a>'); - topicslink.append(topicstext); - topicslist.append(topicslink); - topicslist.append(topicsul); - narrowmenu.append(topicslist); - - /* Examples */ - var examplestext = $("#examples h2").attr("title"); - $("#examples ul").removeAttr("id"); - $("#examples ul li").removeAttr("class"); - $("#examples ul li").removeAttr("style"); - var examplesul = $("#examples ul"); - var exampleslist = $('<li></li>'); - var exampleslink = $('<a href="#"></a>'); - exampleslink.append(examplestext); - exampleslist.append(exampleslink); - exampleslist.append(examplesul); - narrowmenu.append(exampleslist); - - $("#shortCut").after(narrowmenu); - $('ul#narrowmenu').superfish({ - delay: 100, - autoArrows: false, - disableHI: true - }); -} - -/* Executes on doc ready */ -$(document).ready(function(){ - /* check if body has the narrow class */ - if ($('body').hasClass('narrow')) { - /* run narrowInit */ - narrowInit(); - } - - /* messure window width and add class if it is smaller than 600 px */ - if($(window).width()<600) { - $('body').addClass('narrow'); - /* if the search box contains */ - if ($("#narrowsearch").length == 0) { - /* run narrowInit */ - narrowInit(); - } - } - else { /* if the window is wider than 600 px, narrow is removed */ - $('body').removeClass('narrow'); - if ($("#narrowsearch").length == 0) { - } - } -}); -/* binding resize event to this funciton */ -$(window).bind('resize', function () { - /* if the window is wider than 600 px, narrow class is added */ - if($(window).width()<600) { - $('body').addClass('narrow'); - if ($("#narrowsearch").length == 0) { - narrowInit(); - } - } - else { - /* else we remove the narrow class */ - $('body').removeClass('narrow'); - } -}); - - $('#narrowsearch').keyup(function () { - /* extract the search box content */ - var searchString = $('#narrowsearch').val(); - /* if the string is less than three characters */ - if ((searchString == null) || (searchString.length < 3)) { - /* remove classes and elements*/ - $('#narrowsearch').removeClass('loading'); - $('.searching').remove(); - /* run CheckEmptyAndLoadList */ - CheckEmptyAndLoadList(); - - $('.report').remove(); - return; - } - /* if timer checks out */ - if (this.timer) clearTimeout(this.timer); - this.timer = setTimeout(function () { - /* add loading image by adding loading class */ - $('#narrowsearch').addClass('loading'); - $('.searching').remove(); - - /* run the actual search */ - $.ajax({ - contentType: "application/x-www-form-urlencoded", - url: 'http://' + location.host + '/nokiasearch/GetDataServlet', - data: 'searchString='+searchString, - dataType:'xml', - type: 'post', - success: function (response, textStatus) { - /* on success remove loading img */ - $('.searching').remove(); - $('#narrowsearch').removeClass('loading'); - processNokiaData(response); - } - }); - }, 500); /* timer set to 500 ms */ - });
\ No newline at end of file diff --git a/doc/config/scripts/superfish.js b/doc/config/scripts/superfish.js deleted file mode 100644 index 4018e00f..00000000 --- a/doc/config/scripts/superfish.js +++ /dev/null @@ -1,121 +0,0 @@ - -/* - * Superfish v1.4.8 - jQuery menu widget - * Copyright (c) 2008 Joel Birch - * - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - * - * CHANGELOG: http://users.tpg.com.au/j_birch/plugins/superfish/changelog.txt - */ - -;(function($){ - $.fn.superfish = function(op){ - - var sf = $.fn.superfish, - c = sf.c, - $arrow = $(['<span class="',c.arrowClass,'"> »</span>'].join('')), - over = function(){ - var $$ = $(this), menu = getMenu($$); - clearTimeout(menu.sfTimer); - $$.showSuperfishUl().siblings().hideSuperfishUl(); - }, - out = function(){ - var $$ = $(this), menu = getMenu($$), o = sf.op; - clearTimeout(menu.sfTimer); - menu.sfTimer=setTimeout(function(){ - o.retainPath=($.inArray($$[0],o.$path)>-1); - $$.hideSuperfishUl(); - if (o.$path.length && $$.parents(['li.',o.hoverClass].join('')).length<1){over.call(o.$path);} - },o.delay); - }, - getMenu = function($menu){ - var menu = $menu.parents(['ul.',c.menuClass,':first'].join(''))[0]; - sf.op = sf.o[menu.serial]; - return menu; - }, - addArrow = function($a){ $a.addClass(c.anchorClass).append($arrow.clone()); }; - - return this.each(function() { - var s = this.serial = sf.o.length; - var o = $.extend({},sf.defaults,op); - o.$path = $('li.'+o.pathClass,this).slice(0,o.pathLevels).each(function(){ - $(this).addClass([o.hoverClass,c.bcClass].join(' ')) - .filter('li:has(ul)').removeClass(o.pathClass); - }); - sf.o[s] = sf.op = o; - - $('li:has(ul)',this)[($.fn.hoverIntent && !o.disableHI) ? 'hoverIntent' : 'hover'](over,out).each(function() { - if (o.autoArrows) addArrow( $('>a:first-child',this) ); - }) - .not('.'+c.bcClass) - .hideSuperfishUl(); - - var $a = $('a',this); - $a.each(function(i){ - var $li = $a.eq(i).parents('li'); - $a.eq(i).focus(function(){over.call($li);}).blur(function(){out.call($li);}); - }); - o.onInit.call(this); - - }).each(function() { - var menuClasses = [c.menuClass]; - if (sf.op.dropShadows && !($.browser.msie && $.browser.version < 7)) menuClasses.push(c.shadowClass); - $(this).addClass(menuClasses.join(' ')); - }); - }; - - var sf = $.fn.superfish; - sf.o = []; - sf.op = {}; - sf.IE7fix = function(){ - var o = sf.op; - if ($.browser.msie && $.browser.version > 6 && o.dropShadows && o.animation.opacity!=undefined) - this.toggleClass(sf.c.shadowClass+'-off'); - }; - sf.c = { - bcClass : 'sf-breadcrumb', - menuClass : 'sf-js-enabled', - anchorClass : 'sf-with-ul', - arrowClass : 'sf-sub-indicator', - shadowClass : 'sf-shadow' - }; - sf.defaults = { - hoverClass : 'sfHover', - pathClass : 'overideThisToUse', - pathLevels : 1, - delay : 800, - animation : {opacity:'show'}, - speed : 'normal', - autoArrows : true, - dropShadows : true, - disableHI : false, // true disables hoverIntent detection - onInit : function(){}, // callback functions - onBeforeShow: function(){}, - onShow : function(){}, - onHide : function(){} - }; - $.fn.extend({ - hideSuperfishUl : function(){ - var o = sf.op, - not = (o.retainPath===true) ? o.$path : ''; - o.retainPath = false; - var $ul = $(['li.',o.hoverClass].join(''),this).add(this).not(not).removeClass(o.hoverClass) - .find('>ul').hide().css('visibility','hidden'); - o.onHide.call($ul); - return this; - }, - showSuperfishUl : function(){ - var o = sf.op, - sh = sf.c.shadowClass+'-off', - $ul = this.addClass(o.hoverClass) - .find('>ul:hidden').css('visibility','visible'); - sf.IE7fix.call($ul); - o.onBeforeShow.call($ul); - $ul.animate(o.animation,o.speed,function(){ sf.IE7fix.call($ul); o.onShow.call($ul); }); - return this; - } - }); - -})(jQuery); diff --git a/doc/config/style/common.css b/doc/config/style/common.css deleted file mode 100644 index 282f596b..00000000 --- a/doc/config/style/common.css +++ /dev/null @@ -1,160 +0,0 @@ -a:link, a:visited { - color: #00732F; - text-decoration: none; - font-weight: bold; -} - -body { - font: normal 400 14px/1.2 Arial; - margin-top: 85px; -} - -h1 { - margin: 0; -} - -h2 { - font: 500 20px/1.2 Arial; -} - -h3.fn, span.fn { - -moz-border-radius: 7px 7px 7px 7px; - -webkit-border-radius: 7px 7px 7px 7px; - border-radius: 7px 7px 7px 7px; - background-color: #F6F6F6; - border-width: 1px; - border-style: solid; - border-color: #E6E6E6; - word-spacing: 3px; - padding: 3px 5px; -} - -table, pre { - -moz-border-radius: 7px 7px 7px 7px; - -webkit-border-radius: 7px 7px 7px 7px; - border-radius: 7px 7px 7px 7px; - background-color: #F6F6F6; - border: 1px solid #E6E6E6; - border-collapse: separate; - font-size: 12px; - line-height: 1.2; - margin-bottom: 25px; - margin-left: 15px; -} - -table td { - padding: 3px 15px 3px 20px; -} - -table tr.even { - background-color: white; - color: #66666E; -} - -table tr.odd { - background-color: #F6F6F6; - color: #66666E; -} - -li { - margin-bottom: 10px; - padding-left: 12px; -} - -.cpp { - display: block; - margin: 10; - overflow: hidden; - overflow-x: hidden; - overflow-y: hidden; - padding: 20px 0 20px 0; -} - -.footer { - margin-top: 50px; -} - -.memItemLeft { - padding-right: 3px; -} - -.memItemRight { - padding: 3px 15px 3px 0; -} - -.qml { - display: block; - margin: 10; - overflow: hidden; - overflow-x: hidden; - overflow-y: hidden; - padding: 20px 0 20px 0; -} - -.qmldefault { - padding-left: 5px; - float: right; - color: red; -} - -.qmlreadonly { - padding-left: 5px; - float: right; - color: #254117; -} - -.rightAlign { - padding: 3px 5px 3px 10px; - text-align: right; -} - -.title { - background-color: white; - color: #44A51C; - font-family: Verdana; - font-size: 35px; - font-weight: normal; - left: 0; - padding-bottom: 5px; - padding-left: 16px; - padding-top: 20px; - position: absolute; - right: 0; - top: 0; -} - -.toc { - float: right; - -moz-border-radius: 7px 7px 7px 7px; - -webkit-border-radius: 7px 7px 7px 7px; - border-radius: 7px 7px 7px 7px; - background-color: #F6F6F6; - border: 1px solid #DDD; - margin: 0 20px 10px 10px; - padding: 20px 15px 20px 20px; - height: auto; - width: 200px; -} -/* offset the child sections */ -.toc .level2 { - margin-left: 15px; -} -.toc .level3 { - margin-left: 30px; -} -.toc .level4 { - margin-left: 40px; -} - -/* modify the TOC layouts */ -div.toc ul { - padding-left: 20px; -} -div.toc li { - padding-left: 4px; -} -/* Remove the border around images*/ -a img -{ - border:none; -} diff --git a/doc/config/style/narrow.css b/doc/config/style/narrow.css deleted file mode 100644 index 40be7eaa..00000000 --- a/doc/config/style/narrow.css +++ /dev/null @@ -1,270 +0,0 @@ - /* start narrow mode */ - - body.narrow - { - background-image: none; - } - - .narrow a { - color: #44a51c; - } - - .narrow .header, .narrow .header .content, .narrow .footer, .narrow .wrapper { - margin: 0 7px; - min-width: 300px; - } - - .narrow .footer { - margin: 0px; - } - - .creator .header, .creator .header .content, .creator .footer, .creator .wrapper { - margin: 0px; - min-width: 300px; - } - .narrow .header - { - width: 100%; - margin: 0; - height: auto; - background: #fff url(../images/header_bg.png) repeat-x 0 100%; - padding: 10px 0 5px 0; - overflow: visible; - } - - .narrow .header .content - { - } - - .narrow .header #nav-logo - { - display: none; - } - - .narrow .header .qtref - { - width: auto; - height: auto; - color: #363534; - position: static; - float: left; - margin-left: 25px; - font: bold 18px/1 Arial; - } - - .narrow .header .qtref a - { - color: #00732F; - } - - .narrow .header .qtref span - { - background-image: none; - text-indent: 0; - } - - .narrow .header #nav-topright - { - display: none; - } - - .narrow .header #shortCut - { - clear: both; - font-weight: normal; - position: static; - float: left; - margin: 15px 0 0 25px; - overflow: hidden; - padding: 0; - height: auto; - } - - .narrow .header #shortCut ul - { - float: none; - margin: 0; - width: auto; - font-size: 11px; - } - - .narrow .header #shortCut ul li - { - background-image: none; - } - - .narrow .header #shortCut ul .shortCut-topleft-active, - .narrow .header #shortCut ul .shortCut-topleft-inactive - { - background-image: none; - height: auto; - padding: 0; - width: auto; - } - .narrow .header #shortCut ul li a - { - color: #00732F; - } - - .narrow .wrapper .hd - { - background: url(../images/bg_ul_blank.png) no-repeat 0 0; - } - - .narrow .wrapper .bd - { - background: url(../images/bg_l_blank.png) repeat-y 0 0; - } - - .narrow .wrapper .ft - { - background: url(../images/bg_ll_blank.png) no-repeat 0 0; - } - - .narrow .sidebar - { - display: none; - } - - .narrow .wrap - { - margin: 0 5px 0 5px; - } - - .creator .wrap - { - margin: 0px; - background:#FFFFFF; - } - .narrow .wrap .toolbar - { - border-bottom: none; - } - - .narrow .wrap .content - { - padding-top: 15px; - } - .creator .wrap .content - { - padding-top: 10px; - } - .creator .wrap .content .guide - { - padding-top: 15px; - } - .narrow .wrap .feedback - { - display: none; - } - - .narrow .wrap .breadcrumb ul li { - font-weight: normal; - } - - .narrow .wrap .breadcrumb ul li a { - color: #44a51c; - } - - .narrow .wrap .breadcrumb ul li.last a { - color: #363534; - } - - #narrowsearch { - display: none; - } - - .narrow #narrowsearch { - display: block; - float: right; - margin-right: 25px; - _position: relative; - } - - .narrow #narrowsearch fieldset { - _position: absolute; - _margin-top: -1px; - } - - .narrow #narrowsearch { - background: url("http://doc.qt.nokia.com/prototype/html/images/sprites-combined.png") no-repeat scroll -6px -348px transparent; - height: 21px; - padding: 2px 0 0 5px; - width: 167px; - } - - .narrow #narrowsearch input { - border: none; - font: 13px/1.2 Verdana; - height: 19px; - outline: none; - padding: 0; - width: 158px; - *border: 1px solid #fff; - *height: 17px; - _height: 18px; - /* to be fixed */ - display: none; - /* to be fixed */ - } - - .narrow .indexbox .indexIcon { - display: none; - } - - .narrow .indexboxcont .section { - width: 64%; - padding-left: 0; - } - - .narrow .indexboxcont .sectionlist { - width: 32.5%; - } - - #narrowmenu { - display: none; - float: right; - margin: 15px 40px 0 0; - font-size: 11px; - } - - .narrow #narrowmenu { - display: block; - } - - #narrowmenu a { - line-height: 1.1; - background: url(../images/arrow_down.png) no-repeat 100% 50%; - white-space: nowrap; - padding: 0 16px 0 5px; - } - - #narrowmenu li { - margin-left: 20px; - } - - #narrowmenu li li { - margin: 0 0 5px 0; - } - - #narrowmenu li li a { - padding: 0; - background-image: none; - } - - #narrowmenu li, - #narrowmenu li ul { - background-color: #fff; - margin-top:-1px; - } - - #narrowmenu li ul { - width: auto; - padding: 5px; - } - - .sf-menu li:hover ul, .sf-menu li.sfHover ul { - top: 1.2em; - } - - /* end narrow mode */ diff --git a/doc/config/style/offline.css b/doc/config/style/offline.css deleted file mode 100644 index c3f90c36..00000000 --- a/doc/config/style/offline.css +++ /dev/null @@ -1,675 +0,0 @@ -@media screen -{ - -/* basic elements */ - html - { - color: #000000; - background: #FFFFFF; - } - table - { - border-collapse: collapse; - border-spacing: 0; - } - fieldset, img - { - border: 0; - max-width:100%; - } - address, caption, cite, code, dfn, em, strong, th, var, optgroup - { - font-style: inherit; - font-weight: inherit; - } - del, ins - { - text-decoration: none; - } - ol li - { - list-style: decimal; - } - ul li - { - list-style: none; - } - caption, th - { - text-align: left; - } - h1, h2, h3, h4, h5, h6 - { - font-size: 100%; - } - q:before, q:after - { - content: ''; - } - abbr, acronym - { - border: 0; - font-variant: normal; - } - sup, sub - { - vertical-align: baseline; - } - tt, .qmlreadonly span, .qmldefault span - { - word-spacing:0.5em; - } - legend - { - color: #000000; - } - strong - { - font-weight: bold; - } - em - { - font-style: italic; - } - - body - { - margin-left: 0.5em; - margin-right: 0.5em; - font-family: sans-serif; - line-height: normal - } - a - { - color: #00732F; - text-decoration: none; - } - hr - { - background-color: #E6E6E6; - border: 1px solid #E6E6E6; - height: 1px; - width: 100%; - text-align: left; - margin: 1.5em 0 1.5em 0; - } - - pre - { - border: 1px solid #DDDDDD; - -moz-border-radius: 0.7em 0.7em 0.7em 0.7em; - -webkit-border-radius: 0.7em 0.7em 0.7em 0.7em; - border-radius: 0.7em 0.7em 0.7em 0.7em; - margin: 0 1.5em 1em 1em; - padding: 1em 1em 1em 1em; - overflow-x: auto; - } - table, pre - { - -moz-border-radius: 0.7em 0.7em 0.7em 0.7em; - -webkit-border-radius: 0.7em 0.7em 0.7em 0.7em; - border-radius: 0.7em 0.7em 0.7em 0.7em; - background-color: #F6F6F6; - border: 1px solid #E6E6E6; - border-collapse: separate; - margin-bottom: 2.5em; - } - pre { - font-size: 90%; - display: block; - overflow:hidden; - } - thead - { - margin-top: 0.5em; - font-weight: bold - } - th - { - padding: 0.5em 1.5em 0.5em 1em; - background-color: #E1E1E1; - border-left: 1px solid #E6E6E6; - } - td - { - padding: 0.25em 1.5em 0.25em 1em; - } - - td.rightAlign - { - padding: 0.25em 0.5em 0.25em 1em; - } - table tr.odd - { - border-left: 1px solid #E6E6E6; - background-color: #F6F6F6; - color: #66666E; - } - table tr.even - { - border-left: 1px solid #E6E6E6; - background-color: #ffffff; - color: #66666E; - } - - div.float-left - { - float: left; margin-right: 2em - } - div.float-right - { - float: right; margin-left: 2em - } - - span.comment - { - color: #008B00; - } - span.string, span.char - { - color: #000084; - } - span.number - { - color: #a46200; - } - span.operator - { - color: #202020; - } - span.keyword - { - color: #840000; - } - span.name - { - color: black - } - span.type - { - font-weight: bold - } - span.type a:visited - { - color: #0F5300; - } - span.preprocessor - { - color: #404040 - } -/* end basic elements */ - -/* font style elements */ - .heading - { - font-weight: bold; - font-size: 125%; - } - .subtitle - { - font-size: 110% - } - .small-subtitle - { - font-size: 100% - } - .red - { - color:red; - } -/* end font style elements */ - -/* global settings*/ - .header, .footer - { - display: block; - clear: both; - overflow: hidden; - } -/* end global settings*/ - -/* header elements */ - .header .qtref - { - color: #00732F; - font-weight: bold; - font-size: 130%; - } - - .header .content - { - margin-bottom: 0.5em - } - - .header .breadcrumb - { - font-size: 90%; - padding: 0.5em 0 0.5em 1em; - margin: 0; - background-color: #fafafa; - height: 1.35em; - border-bottom: 1px solid #d1d1d1; - } - - .header .breadcrumb ul - { - margin: 0; - padding: 0; - } - - .header .content - { - word-wrap: break-word; - } - - .header .breadcrumb ul li - { - float: left; - background: url(../images/breadcrumb.png) no-repeat 0 3px; - padding-left: 1.5em; - margin-left: 1.5em; - } - - .header .breadcrumb ul li.last - { - font-weight: normal; - } - - .header .breadcrumb ul li a - { - color: #00732F; - } - - .header .breadcrumb ul li.first - { - background-image: none; - padding-left: 0; - margin-left: 0; - } - - .header .content ol li { - background: none; - margin-bottom: 1.0em; - margin-left: 1.2em; - padding-left: 0 - } - - .header .content li - { - background: url(../images/bullet_sq.png) no-repeat 0 5px; - margin-bottom: 1em; - padding-left: 1.2em; - } - -/* end header elements */ - -/* content elements */ - .content h1 - { - font-weight: bold; - font-size: 130% - } - - .content h2 - { - font-weight: bold; - font-size: 120%; - width: 100%; - } - .content h3 - { - font-weight: bold; - font-size: 110%; - width: 100%; - } - .content table p - { - margin: 0 - } - .content ul - { - padding-left: 2.5em; - } - .content li - { - padding-top: 0.25em; - padding-bottom: 0.25em; - } - .content ul img { - vertical-align: middle; - } - - .content a:visited - { - color: #4c0033; - text-decoration: none; - } - - .content a:visited:hover - { - color: #4c0033; - text-decoration: underline; - } - - a:hover - { - color: #4c0033; - text-decoration: underline; - } - descr p a - { - text-decoration: underline; - } - - .descr p a:visited - { - text-decoration: underline; - } - - .alphaChar{ - width:95%; - background-color:#F6F6F6; - border:1px solid #E6E6E6; - -moz-border-radius: 7px 7px 7px 7px; - border-radius: 7px 7px 7px 7px; - -webkit-border-radius: 7px 7px 7px 7px; - font-size:12pt; - padding-left:10px; - margin-top:10px; - margin-bottom:10px; - } - .flowList{ - /*vertical-align:top;*/ - /*margin:20px auto;*/ - - column-count:3; - -webkit-column-count:3; - -moz-column-count:3; -/* - column-width:100%; - -webkit-column-width:200px; - -col-column-width:200px; -*/ - column-gap:41px; - -webkit-column-gap:41px; - -moz-column-gap:41px; - - column-rule: 1px dashed #ccc; - -webkit-column-rule: 1px dashed #ccc; - -moz-column-rule: 1px dashed #ccc; - } - - .flowList dl{ - } - .flowList dd{ - /*display:inline-block;*/ - margin-left:10px; - min-width:250px; - line-height: 1.5; - min-width:100%; - min-height:15px; - } - - .flowList dd a{ - } - - .content .flowList p{ - padding:0px; - } - - .content .alignedsummary - { - margin: 15px; - } - - - .qmltype - { - text-align: center; - font-size: 120%; - } - .qmlreadonly - { - padding-left: 5px; - float: right; - color: #254117; - } - - .qmldefault - { - padding-left: 5px; - float: right; - color: red; - } - - .qmldoc - { - } - - .generic .alphaChar{ - margin-top:5px; - } - - .generic .odd .alphaChar{ - background-color: #F6F6F6; - } - - .generic .even .alphaChar{ - background-color: #FFFFFF; - } - - .memItemRight{ - padding: 0.25em 1.5em 0.25em 0; - } - .highlightedCode - { - margin: 1.0em; - } - .annotated td { - padding: 0.25em 0.5em 0.25em 0.5em; - } - - .toc - { - font-size: 80% - } - - .header .content .toc ul - { - padding-left: 0px; - } - - .content .toc h3 { - border-bottom: 0px; - margin-top: 0px; - } - - .content .toc h3 a:hover { - color: #00732F; - text-decoration: none; - } - - .content .toc .level2 - { - margin-left: 1.5em; - } - - .content .toc .level3 - { - margin-left: 3.0em; - } - - .content ul li - { - background: url(../images/bullet_sq.png) no-repeat 0 0.7em; - padding-left: 1em - } - - .content .toc li - { - background: url(../images/bullet_dn.png) no-repeat 0 5px; - padding-left: 1em - } - - .relpage - { - -moz-border-radius: 7px 7px 7px 7px; - -webkit-border-radius: 7px 7px 7px 7px; - border-radius: 7px 7px 7px 7px; - border: 1px solid #DDDDDD; - padding: 25px 25px; - clear: both; - } - .relpage ul - { - float: none; - padding: 1.5em; - } - - h3.fn, span.fn - { - -moz-border-radius:7px 7px 7px 7px; - -webkit-border-radius:7px 7px 7px 7px; - border-radius:7px 7px 7px 7px; - background-color: #F6F6F6; - border-width: 1px; - border-style: solid; - border-color: #E6E6E6; - font-weight: bold; - word-spacing:3px; - padding:3px 5px; - } - - .functionIndex { - font-size:12pt; - word-spacing:10px; - margin-bottom:10px; - background-color: #F6F6F6; - border-width: 1px; - border-style: solid; - border-color: #E6E6E6; - -moz-border-radius: 7px 7px 7px 7px; - -webkit-border-radius: 7px 7px 7px 7px; - border-radius: 7px 7px 7px 7px; - width:100%; - } - - .centerAlign - { - text-align:center; - } - - .rightAlign - { - text-align:right; - } - - .leftAlign - { - text-align:left; - } - - .topAlign{ - vertical-align:top - } - - .functionIndex a{ - display:inline-block; - } - -/* end content elements */ -/* footer elements */ - - .footer - { - color: #393735; - font-size: 0.75em; - text-align: center; - padding-top: 1.5em; - padding-bottom: 1em; - background-color: #E6E7E8; - margin: 0; - } - .footer p - { - margin: 0.25em - } - .small - { - font-size: 0.5em; - } -/* end footer elements */ - - .item { - float: left; - position: relative; - width: 100%; - overflow: hidden; - } - - - .item .primary { - margin-right: 220px; - position: relative; - } - - .item hr { - margin-left: -220px; - } - - .item .secondary { - float: right; - width: 200px; - position: relative; - } - - .item .cols { - clear: both; - display: block; - } - - .item .cols .col { - float: left; - margin-left: 1.5%; - } - - .item .cols .col.first { - margin-left: 0; - } - - .item .cols.two .col { - width: 45%; - } - - .item .box { - margin: 0 0 10px 0; - } - - .item .box h3 { - margin: 0 0 10px 0; - } - - .cols.unclear { - clear:none; - } -} - -/* end of screen media */ - -/* start of print media */ - -@media print -{ - input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft, #feedbackBox, #blurpage, .toc, .breadcrumb, .toolbar, .floatingResult - { - display: none; - background: none; - } - .content - { - background: none; - display: block; - width: 100%; margin: 0; float: none; - } -} -/* end of print media */ diff --git a/doc/config/style/style.css b/doc/config/style/style.css deleted file mode 100644 index 128eb27d..00000000 --- a/doc/config/style/style.css +++ /dev/null @@ -1,1627 +0,0 @@ -@media screen -{ - -/* basic elements */ - html - { - color: #000000; - background: #FFFFFF; - } - body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, input, button, textarea, p, blockquote, th, td - { - margin: 0; - padding: 0; - } - table - { - border-collapse: collapse; - border-spacing: 0; - } - fieldset, img - { - border: 0; - max-width:100%; - } - address, caption, cite, code, dfn, em, strong, th, var, optgroup - { - font-style: inherit; - font-weight: inherit; - } - del, ins - { - text-decoration: none; - } - li - { - list-style: none; - } - ol li - { - list-style: decimal; - } - caption, th - { - text-align: left; - } - h1, h2, h3, h4, h5, h6 - { - font-size: 100%; - } - q:before, q:after - { - content: ''; - } - abbr, acronym - { - border: 0; - font-variant: normal; - } - sup, sub - { - vertical-align: baseline; - } - tt, .qmlreadonly span, .qmldefault span - { - word-spacing:5px; - } - legend - { - color: #000000; - } - input, button, textarea, select, optgroup, option - { - font-family: inherit; - font-size: inherit; - font-style: inherit; - font-weight: inherit; - } - input, button, textarea, select - { - font-size: 100%; - } - strong - { - font-weight: bold; - } - em - { - font-style: italic; - } - - /* adding Qt theme */ - html - { - /* background-color: #e5e5e5;*/ - } - body - { - background: #e6e7e8 url(../images/page_bg.png) repeat-x 0 0; - font: normal 13px/1.2 Verdana; - color: #363534; - } - a - { - color: #00732f; - text-decoration: none; - } - hr - { - background-color: #E6E6E6; - border: 1px solid #E6E6E6; - height: 1px; - width: 100%; - text-align: left; - margin: 15px 0px 15px 0px; - } - - pre - { - border: 1px solid #DDDDDD; - -moz-border-radius: 7px 7px 7px 7px; - -webkit-border-radius: 7px 7px 7px 7px; - border-radius: 7px 7px 7px 7px; - margin: 0 20px 10px 10px; - padding: 20px 15px 20px 20px; - overflow-x: auto; - } - table, pre - { - -moz-border-radius: 7px 7px 7px 7px; - -webkit-border-radius: 7px 7px 7px 7px; - border-radius: 7px 7px 7px 7px; - background-color: #F6F6F6; - border: 1px solid #E6E6E6; - border-collapse: separate; - font-size: 11px; - margin-bottom: 25px; - } - pre.highlightedCode { - display: block; - overflow:hidden; - } - thead - { - margin-top: 5px; - font:600 12px/1.2 Arial; - } - th - { - padding: 5px 15px 5px 15px; - background-color: #E1E1E1; - border-left: 1px solid #E6E6E6; - } - td - { - padding: 3px 15px 3px 15px; - } - tr.odd td:hover, tr.even td:hover {} - - td.rightAlign - { - padding: 3px 5px 3px 10px; - } - table tr.odd - { - border-left: 1px solid #E6E6E6; - background-color: #F6F6F6; - color: #66666E; - } - table tr.even - { - border-left: 1px solid #E6E6E6; - background-color: #ffffff; - color: #66666E; - } - table tr.odd td:hover, table tr.even td:hover - { - /* background-color: #E6E6E6;*/ /* disabled until further notice */ - } - - div.float-left - { - float: left; margin-right: 2em - } - div.float-right - { - float: right; margin-left: 2em - } - - span.comment - { - color: #008B00; - font-style: italic - } - span.string, span.char - { - color: #000084; - } - span.number - { - color: #a46200; - } - span.operator - { - color: #202020; - } - span.keyword - { - color: #840000; - } - span.name - { - color: black - } - span.type - { - font-weight: bold - } - span.type a:visited - { - color: #0F5300; - } - span.preprocessor - { - color: #404040 - } -/* end basic elements */ - -/* font style elements */ - .heading - { - font: normal bold 16px/1.2 Arial; - padding-bottom: 15px; - } - .subtitle - { - font-size: 13px; - } - .small-subtitle - { - font-size: 13px; - } -/* end font style elements */ - -/* global settings*/ - .header, .footer, .wrapper - { - min-width: 600px; - max-width: 1500px; - margin: 0 30px; - } - .header, .footer - { - display: block; - clear: both; - overflow: hidden; - } - .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after - { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; - } - -/* end global settings*/ -/* header elements */ - .header - { - height: 115px; - position: relative; - } - .header .icon - { - position: absolute; - top: 13px; - left: 0; - } - .header .qtref - { - position: absolute; - top: 28px; - left: 88px; - width: 302px; - height: 22px; - } - .header .qtref span - { - display: block; - width: 420px; - height: 30px; - text-indent: -999em; - background: url(../images/sprites-combined.png) no-repeat -80px -235px; - } - .content a:visited - { - color: #4c0033; - text-decoration: none; - } - .content a:visited:hover - { - color: #4c0033; - text-decoration: underline; - } - - #nav-topright - { - height: 70px; - } - - #nav-topright ul - { - list-style-type: none; - float: right; - width: 370px; - margin-top: 11px; - } - - #nav-topright li - { - display: inline-block; - margin-right: 20px; - float: left; - } - - #nav-topright li.nav-topright-last - { - margin-right: 0; - } - - #nav-topright li a - { - background: transparent url(../images/sprites-combined.png) no-repeat; - height: 18px; - display: block; - overflow: hidden; - text-indent: -9999px; - } - - #nav-topright li.nav-topright-home a - { - width: 65px; - background-position: -2px -91px; - } - - #nav-topright li.nav-topright-home a:hover - { - background-position: -2px -117px; - } - - - #nav-topright li.nav-topright-dev a - { - width: 30px; - background-position: -76px -91px; - } - - #nav-topright li.nav-topright-dev a:hover - { - background-position: -76px -117px; - } - - - #nav-topright li.nav-topright-labs a - { - width: 40px; - background-position: -114px -91px; - } - - #nav-topright li.nav-topright-labs a:hover - { - background-position: -114px -117px; - } - - #nav-topright li.nav-topright-doc a - { - width: 32px; - background-position: -162px -91px; - } - - #nav-topright li.nav-topright-doc a:hover, #nav-topright li.nav-topright-doc-active a - { - background-position: -162px -117px; - } - - #nav-topright li.nav-topright-blog a - { - width: 40px; - background-position: -203px -91px; - } - - #nav-topright li.nav-topright-blog a:hover, #nav-topright li.nav-topright-blog-active a - { - background-position: -203px -117px; - } - - #nav-topright li.nav-topright-shop a - { - width: 40px; - background-position: -252px -91px; - } - - #nav-topright li.nav-topright-shop a:hover, #nav-topright li.nav-topright-shop-active a - { - background-position: -252px -117px; - } - - #nav-logo - { - background: transparent url(../images/sprites-combined.png ) no-repeat 0 -225px; - left: -3px; - position: absolute; - width: 75px; - height: 75px; - top: 13px; - } - #nav-logo a - { - width: 75px; - height: 75px; - display: block; - text-indent: -9999px; - overflow: hidden; - } - - - .shortCut-topleft-inactive - { - padding-left: 3px; - padding-right: 3px; - background: transparent url( ../images/sprites-combined.png) no-repeat 0px -58px; - height: 20px; - } - .shortCut-topleft-inactive span - { - font-variant: normal; - } - .shortCut-topleft-inactive span a:hover, .shortCut-topleft-active a:hover - { - text-decoration:none; - } - #shortCut - { - padding-top: 10px; - font-weight: bolder; - color: #b0adab; - } - #shortCut ul - { - list-style-type: none; - float: left; - width: 347px; - margin-left: 100px; - } - #shortCut li - { - display: inline-block; - margin-right: 25px; - float: left; - white-space: nowrap; - } - #shortCut li a - { - color: #b0adab; - } - #shortCut li a:hover - { - color: #44a51c; - } - - - -/* end header elements */ -/* content and sidebar elements */ - .wrapper - { - background: url(../images/bg_r.png) repeat-y 100% 0; - } - .wrapper .hd - { - padding-left: 216px; - height: 15px; - background: url(../images/page.png) no-repeat 0 0; - overflow: hidden; - } - - - - - .wrapper .hd span - { - height: 15px; - display: block; - overflow: hidden; - background: url(../images/page.png) no-repeat 100% -30px; - } - .wrapper .bd - { - background: url(../images/bg_l.png) repeat-y 0 0; - position: relative; - } - - - - - .wrapper .ft - { - padding-left: 216px; - height: 15px; - background: url(../images/page.png) no-repeat 0 -75px; - overflow: hidden; - } - - - - - .wrapper .ft span - { - height: 15px; - display: block; - background: url(../images/page.png) no-repeat 100% -60px; - overflow: hidden; - } - .navTop{ - float:right; - display:block; - padding-right:15px; - - - } - - - -/* end content and sidebar elements */ -/* sidebar elements */ - .sidebar - { - float: left; - margin-left: 5px; - width: 200px; - font-size: 11px; - } - - - - - - - .sidebar .searchlabel - { - padding: 0 0 2px 17px; - font: normal bold 11px/1.2 Verdana; - } - - .sidebar .search - { - padding: 0 15px 0 16px; - } - - .sidebar .search form - { - background: url(../images/sprites-combined.png) no-repeat -6px -348px; - height:21px; - padding:2px 0 0 5px; - width:167px; - } - - .sidebar .search form input#pageType - { - width: 158px; - height: 19px; - padding: 0; - border: 0px; - outline: none; - font: 13px/1.2 Verdana; - } - - .sidebar .box - { - padding: 17px 15px 5px 16px; - } - - .sidebar .box .first - { - background-image: none; - } - - .sidebar .box h2 - { - font: bold 16px/1.2 Arial; - padding: 0; - } - .sidebar .box h2 span - { - overflow: hidden; - display: inline-block; - } - .sidebar .box#lookup h2 - { - background-image: none; - } - .sidebar #lookup.box h2 span - { - } - .sidebar .box#topics h2 - { - background-image: none; - } - .sidebar #topics.box h2 span - { - } - .sidebar .box#examples h2 - { - background-image: none; - } - .sidebar #examples.box h2 span - { - } - - .sidebar .box .list - { - display: block; - max-height:200px; - min-height:120px; - overflow-y:auto; - overflow-x:none; - } - .list li a:hover - { - text-decoration: underline; - } - .sidebar .box ul - { - padding-bottom:5px; - padding-left:10px; - padding-top:5px; - } - .sidebar .box ul li - { - padding-left: 12px; - background: url(../images/bullet_gt.png) no-repeat 0 5px; - margin-bottom: 5px; - } - .sidebar .bottombar - { - background: url(../images/box_bg.png) repeat-x 0 bottom; - } - .sidebar .box ul li.noMatch - { - background: none; - color:#FF2A00; - font-style:italic; - } - .sidebar .box ul li.hit - { - background: none; - color:#AAD2F0; - font-style:italic; - } - .sidebar .search form input.loading - { - background:url("../images/spinner.gif") no-repeat scroll right center transparent; - } - -.floatingResult{ - z-index:1; - position:relative; - padding-top:0px; - background-color:white; - border:solid 1px black; - height:250px; - width:600px; - overflow-x:hidden; - overflow-y:auto; -} - - .floatingResult:hover{ - display:block; - } - .floatingResult:hover{ - } - -/* end sidebar elements */ -/* content elements */ - .wrap - { - margin: 0 5px 0 208px; - overflow: visible; - } - - - - - .wrap .toolbar - { - background-color: #fafafa; - border-bottom: 1px solid #d1d1d1; - height: 20px; - position: relative; - } - .wrap .toolbar .toolblock - { - position: absolute; - } - .wrap .toolbar .breadcrumb - { - font-size: 11px; - line-height: 1.2; - padding: 0 0 10px 21px; - height: 10px; - } - .wrap .toolbar .toolbuttons - { - padding: 0 0 10px 21px; - right: 5px; - vertical-align: middle; - overflow: hidden; - } - .wrap .toolbar .toolbuttons .active - { - color: #00732F; - } - .wrap .toolbar .toolbuttons ul - { - float: right; - } - .wrap .toolbar .toolbuttons li - { - float: left; - text-indent: -10px; - margin-top: -5px; - margin-right: 15px; - font-weight: bold; - color: #B0ADAB; - } - - .toolbuttons #print - { - border-left: 1px solid #c5c4c4; - margin-top: 0; - padding-left: 7px; - text-indent: 0; - } - .toolbuttons #print a - { - width: 16px; - height: 16px; - } - - .toolbuttons #print a span - { - width: 16px; - height: 16px; - text-indent: -999em; - display: block; - overflow: hidden; - background: url(../images/sprites-combined.png) no-repeat -137px -311px; - } - - .toolbuttons #smallA - { - font-size: 10pt; - } - .toolbuttons #medA - { - font-size: 12pt; - } - .toolbuttons #bigA - { - font-size: 14pt; - margin-right: 7px; - } - - #smallA:hover, #medA:hover, #bigA:hover - { - color: #00732F; - } - - - .wrap .content - { - padding: 30px; - word-wrap:break-word; - } - - .wrap .breadcrumb ul - { - } - .wrap .breadcrumb ul li - { - float: left; - background: url(../images/breadcrumb.png) no-repeat 0 3px; - padding-left: 15px; - margin-left: 15px; - font-weight: bold; - } - .wrap .breadcrumb ul li.last - { - font-weight: normal; - } - .wrap .breadcrumb ul li a - { - color: #363534; - } - .wrap .breadcrumb ul li.first - { - background-image: none; - padding-left: 0; - margin-left: 0; - } - - - - - .wrap .content ol li { - background:none; - font:normal 10pt/1.2 Verdana; - - margin-bottom:10px; - margin-left:12px; - /*list-style-type:disc;*/ - } - - .wrap .content ol li - { - background:none; - margin-bottom: 10px; - padding-left:0px; - margin-left:52px; - } - - .wrap .content li - { - background: url(../images/bullet_sq.png) no-repeat 0 5px; - font: normal 400 10pt/1.2 Verdana; - margin-bottom: 10px; - padding-left:12px; - } - - .content li:hover {} - - .wrap .content h1 - { - font: bold 18px/1.2 Arial; - } - .wrap .content h2 - { - border-bottom:1px solid #DDDDDD; - font:600 16px/1.2 Arial; - margin-top:15px; - width:100%; - } - .wrap .content h3 - { - font: bold 14px/1.2 Arial; - font:600 16px/1.2 Arial; - margin-top:15px; - width:100%; - } - .wrap .content p - { - line-height: 20px; - padding: 5px; - } - .wrap .content table p - { - line-height: 20px; - /* padding: 0px;*/ - } - .wrap .content ul - { - padding-left: 25px; - padding-top: 10px; - } - .wrap .content ul img { - vertical-align:middle; - } - a:hover - { - color: #4c0033; - text-decoration: underline; - } - .feedback - { - float: none; - position: absolute; - right: 15px; - bottom: 10px; - font: normal 8px/1 Verdana; - color: #B0ADAB; - } - .feedback:hover - { - float: right; - font: normal 8px/1 Verdana; - color: #00732F; - text-decoration: underline; - } - .alphaChar{ - width:95%; - background-color:#F6F6F6; - border:1px solid #E6E6E6; - -moz-border-radius: 7px 7px 7px 7px; - border-radius: 7px 7px 7px 7px; - -webkit-border-radius: 7px 7px 7px 7px; - font-size:12pt; - padding-left:10px; - margin-top:10px; - margin-bottom:10px; - } - .flowList{ - /*vertical-align:top;*/ - /*margin:20px auto;*/ - - column-count:3; - -webkit-column-count:3; - -moz-column-count:3; -/* - column-width:100%; - -webkit-column-width:200px; - -col-column-width:200px; -*/ - column-gap:41px; - -webkit-column-gap:41px; - -moz-column-gap:41px; - - column-rule: 1px dashed #ccc; - -webkit-column-rule: 1px dashed #ccc; - -moz-column-rule: 1px dashed #ccc; - } - - .flowList dl{ - } - .flowList dd{ - /*display:inline-block;*/ - margin-left:10px; - min-width:250px; - line-height: 1.2; - min-width:100%; - - } - - .flowList dd a{ - } - - .wrap .content .flowList p{ - padding:0px; - } - - .content .alignedsummary - { - margin: 15px; - } - - - .qmltype - { - text-align: center; - font-size: 160%; - } - .qmlreadonly - { - padding-left: 5px; - float: right; - color: #254117; - } - - .qmldefault - { - padding-left: 5px; - float: right; - color: red; - } - - .qmldoc - { - } - - *.qmlitem p - { - } - #feedbackBox - { - display: none; - -moz-border-radius: 7px 7px 7px 7px; - -webkit-border-radius: 7px 7px 7px 7px; - border-radius: 7px 7px 7px 7px; - border: 1px solid #DDDDDD; - position: fixed; - top: 100px; - left: 33%; - height: 230px; - width: 400px; - padding: 5px; - background-color: #e6e7e8; - z-index: 4; - } - #feedcloseX - { - display: inline; - padding: 5px 5px 0 0; - margin-bottom: 3px; - color: #363534; - font-weight: bold; - float: right; - text-decoration: none; - } - - #feedbox - { - display: inline; - width: 370px; - height: 120px; - margin: 0px 25px 10px 15px; - } - #noteHead - { - font-weight:bold; - padding:10px 10px 10px 20px; - } - #feedsubmit - { - display: inline; - float: right; - margin: 4px 32px 0 0; - } - - .note - { - font-size:7pt; - padding-bottom:3px; - padding-left:20px; - } - - #blurpage - { - display: none; - position: fixed; - float: none; - top: 0px; - left: 0px; - right: 0px; - bottom: 0px; - background: transparent url(../images/feedbackground.png) 0 0; - z-index: 3; - } - .toc - { - float: right; - -moz-border-radius: 7px 7px 7px 7px; - -webkit-border-radius: 7px 7px 7px 7px; - border-radius: 7px 7px 7px 7px; - background-color: #F6F6F6; - border: 1px solid #DDDDDD; - margin: 0 20px 10px 10px; - padding: 20px 15px 20px 20px; - height: auto; - width: 200px; - } - - .toc h3, .generic a - { - font: bold 12px/1.2 Arial; - } - - .generic{ - } - .generic td{ - /* padding:5px;*/ - } - .generic .alphaChar{ - margin-top:5px; - } - - .generic .odd .alphaChar{ - background-color: #F6F6F6; - } - - .generic .even .alphaChar{ - background-color: #FFFFFF; - } - - .alignedsummary{} - .propsummary{} - .memItemLeft{} - .memItemRight{ - padding:3px 15px 3px 0; - } - .bottomAlign{} - .highlightedCode - { - margin:10px; - } - .LegaleseLeft{} - .valuelist{} - .annotated td{ - padding: 3px 5px 3px 5px; - } - .obsolete{} - .compat{} - .flags{} - .qmlsummary{} - .qmlitem{} - .qmlproto{} - .qmlname{} - .qmlreadonly{} - .qmldefault{} - .qmldoc{} - .qt-style{} - .redFont{} - code{} - - .wrap .content .toc ul - { - padding-left: 0px; - } - - .wrap .content .toc h3{ - border-bottom:0px; - margin-top:0px; - } - - .wrap .content .toc h3 a:hover{ - color:#00732F; - text-decoration:none; - } - - - .wrap .content .toc .level2 - { - margin-left: 15px; - } - - .wrap .content .toc .level3 - { - margin-left: 30px; - } - - .content .toc li - { - font: normal 10px/1.2 Verdana; - background: url(../images/bullet_dn.png) no-repeat 0 5px; - } - .relpage - { - -moz-border-radius: 7px 7px 7px 7px; - -webkit-border-radius: 7px 7px 7px 7px; - border-radius: 7px 7px 7px 7px; - border: 1px solid #DDDDDD; - padding: 25px 25px; - clear: both; - } - .relpage ul - { - float: none; - padding: 15px; - } - .content .relpage li - { - font: normal 11px/1.2 Verdana; - } - h3.fn, span.fn - { - -moz-border-radius:7px 7px 7px 7px; - -webkit-border-radius:7px 7px 7px 7px; - border-radius:7px 7px 7px 7px; - background-color: #F6F6F6; - border-width: 1px; - border-style: solid; - border-color: #E6E6E6; - font-weight: bold; - word-spacing:3px; - padding:3px 5px; - } - - .functionIndex { - font-size:12pt; - word-spacing:10px; - margin-bottom:10px; - background-color: #F6F6F6; - border-width: 1px; - border-style: solid; - border-color: #E6E6E6; - -moz-border-radius: 7px 7px 7px 7px; - -webkit-border-radius: 7px 7px 7px 7px; - border-radius: 7px 7px 7px 7px; - width:100%; - } - - .centerAlign - { - text-align:center; - } - - .rightAlign - { - text-align:right; - } - - - .leftAlign - { - text-align:left; - } - - .topAlign{ - vertical-align:top - } - - .functionIndex a{ - display:inline-block; - } - -/* end content elements */ -/* footer elements */ - - .footer - { - min-height: 100px; - color: #797775; - font: normal 9px/1 Verdana; - text-align: center; - padding-top: 40px; - background-color: #E6E7E8; - margin: 0; - } -/* end footer elements */ - - - - - /* start index box */ - .indexbox - { - width: 100%; - display:inline-block; - } - - .indexboxcont - { - display: block; - - } - - .indexboxbar - { - background: transparent url(../images/horBar.png ) repeat-x left bottom; - margin-bottom: 25px; - - - } - - .indexboxcont .section - { - display: inline-block; - width: 49%; - *width:42%; - _width:42%; - padding:0 2% 0 1%; - vertical-align:top; - -} - - .indexboxcont .indexIcon - { - width: 11%; - *width:18%; - _width:18%; - overflow:hidden; - -} - -.indexboxcont .section { - float: left; -} - - .indexboxcont .section p - { - padding-top: 20px; - padding-bottom: 20px; - } - .indexboxcont .sectionlist - { - display: inline-block; - vertical-align:top; - width: 32.5%; - padding: 0; - } - .indexboxcont .sectionlist ul - { - margin-bottom: 20px; - } - - .indexboxcont .sectionlist ul li - { - line-height: 12px; - } - - .content .indexboxcont li - { - font: normal bold 13px/1 Verdana; - } - - .indexbox a:hover, .indexbox a:visited:hover - { - color: #4c0033; - text-decoration: underline; - } - - .indexbox a:visited - { - color: #00732f; - text-decoration: none; - } - - .indexbox .indexIcon { - width: 11%; - } - - - .indexbox .indexIcon span - { - display: block; - } - - .indexbox.guide .indexIcon span - { - width: 96px; - height: 137px; - background: url(../images/sprites-combined.png) no-repeat -5px -376px; - padding: 0; - } - - .indexbox.tools .indexIcon span - { - width: 115px; - height: 137px; - background: url(../images/sprites-combined.png) no-repeat -111px -376px; - padding: 0; - } - .indexboxcont:after - { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; - } - - - -/* start of creator spec*/ - .creator - { - margin-left:0px; - margin-right:0px; - padding-left:0px; - padding-right:0px; - } - .creator .wrap .content ol li { - list-style-type:decimal; - - } - .creator .header .icon, - .creator .feedback, - .creator .t_button, - .creator .feedback, - .creator #feedbackBox, - .creator #feedback, - .creator #blurpage, - /*.creator .indexbox .indexIcon span,*/ - .creator .wrapper .hd, -/* .creator .indexbox .indexIcon,*/ - .creator .header #nav-logo, - .creator #offlinemenu, - .creator #offlinesearch, - .creator .header #nav-topright, - .creator .header #shortCut , - .creator .wrapper .hd, - .creator .wrapper .ft, - .creator .sidebar, - .creator .wrap .feedback - { - display:none; - } - - body.creator - { - background: none; - - font: normal 13px/1.2 Verdana; - color: #363534; - background-color: #FAFAFA; - } - - .wrap .content ol li { - - } - - - .creator .header, .footer, .wrapper - { - max-width: 1500px; - margin: 0px; - } - - .creator .wrapper - { - position:relative; - top:5px; - } - .creator .wrapper .bd - { - - background:#FFFFFF; - } - - - .creator .header, .footer - { - display: block; - clear: both; - overflow: hidden; - } - .creator .wrap .content p - - { - line-height: 20px; - padding: 5px; - } - - .creator .header .qtref span - { - background:none; - } - - - - .creator .footer - { - border-top:1px solid #E5E5E5; - height: 50px; - margin:0px; - padding:10px; - } - - .creator .footer p - { - text-align:justify; - max-width:900px; - } - - .creator .wrap - { - - padding:0 5px 0 5px; - margin: 0px; - } - .creator .wrap .toolbar - { - - - border-bottom:1px solid #E5E5E5; - /*width:100%;*/ - margin-left:-5px; - margin-right:-5px; - } - .creator .wrap .breadcrumb ul li a - { - /* color: #363534;*/ - color: #00732F; - } - - .creator .wrap .content - { - padding: 0px; - word-wrap:break-word; - } - - .creator .wrap .content ol li { - background:none; - font: inherit; - padding-left: 0px; - } - - .creator .wrap .content .descr ol li { - margin-left: 45px; - - } - .creator .content .alignedsummary - { - margin: 5px; - width:100%; - } - .creator .generic{ - max-width:75%; - } - .creator .generic td{ - /* padding:0;*/ - } - .creator .indexboxbar - { - border-bottom:1px solid #E5E5E5; - margin-bottom: 25px; - background: none; - } - - - - .creator .header - { - width: 100%; - margin: 0; - height: auto; - background-color: #ffffff; - padding: 10px 0 5px 0; - overflow: visible; - border-bottom: solid #E5E5E5 1px; - z-index:1; - - - - - - - - - /* position:fixed;*/ - } - - - .creator .header .content - { - } - .creator .header .qtref - { - color: #00732F; - position: static; - float: left; - margin-left: 5px; - font: bold 18px/1 Arial; - } - - .creator .header .qtref:visited - { - color: #00732F; - } - .creator .header .qtref:hover - { - color: #00732F; - text-decoration:none; - } - .creator .header .qtref span - { - background-image: none; - text-indent: 0; - text-decoration:none; - } - - - - - - - .creator .wrap .toolbar - { - display:block; - padding-top:0px; - } - - - - .creator .wrap .breadcrumb ul li { - font-weight: normal; - } - - .creator .wrap .breadcrumb ul li a { - /*color: #44a51c;*/ - } - - .creator .wrap .breadcrumb ul li.last a { - /*color: #363534;*/ - } - - .creator #narrowmenu ul - { - border-bottom:solid 1px #E5E5E5; - border-left:solid 1px #E5E5E5; - border-right:solid 1px #E5E5E5; - } - - .creator #narrowmenu li ul { - margin-top:-15px; - } - - - .creator .toc { - margin:10px 20px 10px 10px; - } - - .creator #narrowsearch, .creator #narrowmenu{ - display:none; - } -/* end of creator spec*/ - -} - -/* end of screen media */ - -/* start of print media */ - -@media print -{ - input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft, #feedbackBox, #blurpage, .toc, .breadcrumb, .toolbar, .floatingResult - { - display: none; - background: none; - } - .content - { - background: none; - display: block; - width: 100%; margin: 0; float: none; - - } -} -/* end of print media */ diff --git a/doc/config/style/style_ie6.css b/doc/config/style/style_ie6.css deleted file mode 100644 index 16fb8505..00000000 --- a/doc/config/style/style_ie6.css +++ /dev/null @@ -1,54 +0,0 @@ -.indexbox, .indexboxcont, .group { - zoom: 1; - height: 1%; -} - -.sidebar { - margin-left: 3px; - width: 199px; - overflow: hidden; -} - -.sidebar .search form { - position: relative; -} - -.sidebar .search form fieldset { - position: absolute; - margin-top: -1px; -} - -.sidebar .search form input#searchstring { - border: 1px solid #fff; - height: 18px; -} - -.wrap { - zoom: 1; -} - -.content, -.toolbar { - zoom: 1; - margin-left: -3px; - position: relative; -} - -.indexbox { - clear: both; -} - -.indexboxcont .section { - zoom: 1; - float: left; -} - -.indexboxcont .sectionlist { - zoom: 1; - float: left; -} - -.wrap .toolbar .toolbuttons li { - text-indent: 0; - margin-right: 8px; -}
\ No newline at end of file diff --git a/doc/config/style/style_ie7.css b/doc/config/style/style_ie7.css deleted file mode 100644 index afbff5f8..00000000 --- a/doc/config/style/style_ie7.css +++ /dev/null @@ -1,19 +0,0 @@ -.indexbox, .indexboxcont, .group { - min-height: 1px; -} - -.sidebar .search form input#searchstring { - border: 1px solid #fff; - height: 17px; -} - - -.indexboxcont .section { - zoom: 1; - float: left; -} - -.indexboxcont .sectionlist { - zoom: 1; - float: left; -} diff --git a/doc/config/style/style_ie8.css b/doc/config/style/style_ie8.css deleted file mode 100644 index e69de29b..00000000 --- a/doc/config/style/style_ie8.css +++ /dev/null diff --git a/doc/config/style/superfish.css b/doc/config/style/superfish.css deleted file mode 100644 index 2bdaef4d..00000000 --- a/doc/config/style/superfish.css +++ /dev/null @@ -1,51 +0,0 @@ -.sf-menu, .sf-menu * { - margin: 0; - padding: 0; - list-style: none; -} -.sf-menu { - line-height: 1.0; -} -.sf-menu ul { - position: absolute; - top: -999em; - width: 10em; /* left offset of submenus need to match (see below) */ -} -.sf-menu ul li { - width: 100%; -} -.sf-menu li:hover { - visibility: inherit; /* fixes IE7 'sticky bug' */ -} -.sf-menu li { - float: left; - position: relative; -} -.sf-menu a { - display: block; - position: relative; -} -.sf-menu li:hover ul, -.sf-menu li.sfHover ul { - left: 0; - top: 2.5em; /* match top ul list item height */ - z-index: 99; -} -ul.sf-menu li:hover li ul, -ul.sf-menu li.sfHover li ul { - top: -999em; -} -ul.sf-menu li li:hover ul, -ul.sf-menu li li.sfHover ul { - left: 10em; /* match ul width */ - top: 0; -} -ul.sf-menu li li:hover li ul, -ul.sf-menu li li.sfHover li ul { - top: -999em; -} -ul.sf-menu li li li:hover ul, -ul.sf-menu li li li.sfHover ul { - left: 10em; /* match ul width */ - top: 0; -} diff --git a/doc/doc.pro b/doc/doc.pro deleted file mode 100644 index 1d660174..00000000 --- a/doc/doc.pro +++ /dev/null @@ -1,4 +0,0 @@ -TEMPLATE = subdirs - -# Doc snippets use widgets -qtHaveModule(widgets): SUBDIRS += src/snippets diff --git a/doc/src/imports/qtlocation5.qdoc b/doc/src/imports/qtlocation5.qdoc deleted file mode 100644 index 0dac7aa6..00000000 --- a/doc/src/imports/qtlocation5.qdoc +++ /dev/null @@ -1,85 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \qmlmodule QtLocation 5.0 - \title Qt Location QML Types - \ingroup qmlmodules - \brief Provides QML types for mapping and location information - -\section1 Overview - -The identifying string for this module is \e QtLocation. To use include the following import -statement in the QML file. - -\snippet snippets/declarative/plugin.qml Plugin import - -The following table provides links to more detailed information on sections of the Qt Location QML -API. - -\table - \row - \li \l {Positioning (QML)}{Location Positioning} - \li Retrieving information about the current position. - \row - \li \l {Maps and Navigation (QML)}{Maps and Navigation} - \li Displaying maps and finding routes. - \row - \li \l {QML PLaces API} {Places} - \li Searching for and managing points of interest. -\endtable - -\section1 Basic Types - -\annotatedlist qml-QtLocation5-basictypes - -\section1 Common QML Types - -\annotatedlist qml-QtLocation5-common - -\section1 Positioning QML Types - -\annotatedlist qml-QtLocation5-positioning - -\section1 Maps QML Types - -\annotatedlist qml-QtLocation5-maps - -\section1 Navigation and Routing QML Types - -\annotatedlist qml-QtLocation5-routing - -\section1 Geocoding QML Types - -\annotatedlist qml-QtLocation5-geocoding - -\section1 Places QML Types - -\annotatedlist qml-QtLocation5-places - -\section1 Alphabetical Listing of all QML Types -*/ diff --git a/doc/src/plugins/qml-location.qdoc b/doc/src/plugins/qml-location.qdoc deleted file mode 100644 index af3e70b7..00000000 --- a/doc/src/plugins/qml-location.qdoc +++ /dev/null @@ -1,108 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \group qml-location - \title QML Location Plugin - QML Support for the Qt Location API. -*/ - -/*! - \page qml-location-plugin.html - - \title Location QML Plugin - \previouspage {index-qtlocation-module.html}{Qt Location Module} - - \brief A QML plugin for the Qt Location API. - - - \section1 Overview - - The Qt Location API gives users the capability to write applications that understand a geographical location and movement of the position coordinates. Backend services can be called by the API to detect landmarks and display appropriate information. The QML Location Plugin delivers these capabilities in an easy to use form. - - \section1 Positioning - - \section2 Coordinate - - The \l {QtLocation5::coordinate}{coordinate} is a basic unit of geographical information. The - \l {QtLocation5::coordinate}{coordinate} type has attributes to hold the \c {latitude}, - \c longitude and \a altitude. - - \section2 Position - - The three dimensional position of an object such as a mobile device can be specified by giving - the latitude, longitude and altitude. That is the values held in the - l\ {QtLocation5::coordinate}{coordinate} type. Additionally for computation of future - positions we would like to know if the object is moving, what \l {Position::speed}{speed} it is - doing and what is the \l {Position::timestamp}{timestamp} of the last position data. Position - therefore includes values for the \l {Position::coordinate}{coordinate}, - \l {Position::speed}{speed} and a \l {Position::timestamp}{timestamp}. \l Position also takes - responsibility for validation of sensible values for these properties. These are exposed as - the \l {Position::latitudeValid}{latitudeValid}, \l {Position::longitudeValid}{longitudeValid}, - \l {Position::altitudeValid}{altitudeValid}, \l {Position::speedValid}{speedValid}, - \l {Position::horizontalAccuracyValid}{horizontalAccuracyValid}, and - \l {Position::verticalAccuracyValid}{verticalAccuracyValid} properties. - - - \section2 PositionSource - - We have a Position type, a \l {QtLocation5::coordinate}{coordinate} type but where do we get - the data from? It is a good idea to be able to indicate alternative sources. - Perhaps instead of directly picking up GPS satellites you want to do - some testing using a datafile. We may also need to manage our - interaction with the source. - - The \l PositionSource type provides the developer with control, - within the limits allowed by the platform, of the source of the - geographical data. The positional data can be sourced from a logfile - which is in NMEA format. - - \l {http://en.wikipedia.org/wiki/NMEA}{NMEA} is a common text-based protocol for specifying navigational data. For convenience, the \l {PositionSource::nmeaSource}{nmeaSource} property is provided to enable QML applications to read NMEA data from a log file, the source will emit updates according to the time stamp of each NMEA sentence to produce a "replay" of the recorded data. - - \section2 Positioning Types - - - \annotatedlist qml-location - - \section1 Maps - - The Map type can be used be used to display a map of the world. The - bulk of the functionality is provided by a mapping plugin described - by the plugin type associated with the Map. - - Various map objects can be added to the map. These map objects are - specified in terms of coordinates and meters. - - Interaction with the map objects is done via the MapMouseArea item. - - \section2 Map Types - - \annotatedlist qml-location-maps - -*/ - - diff --git a/examples/declarative/places/places.qml b/examples/declarative/places/places.qml index 1fce1654..4b2165dd 100644 --- a/examples/declarative/places/places.qml +++ b/examples/declarative/places/places.qml @@ -70,7 +70,7 @@ Item { //=====================Menu===================== Menu { - id:mainMenu +: id:mainMenu anchors.bottom: parent.bottom z: backgroundRect.z + 3 diff --git a/qtlocation.pro b/qtlocation.pro index 2016f994..44318227 100644 --- a/qtlocation.pro +++ b/qtlocation.pro @@ -4,9 +4,3 @@ qtCompileTest(geoclue) qtCompileTest(gypsy) load(qt_parts) - -module_qtlocation_doc.subdir = doc/src -module_qtlocation_doc.target = sub-doc -module_qtlocation_doc.depends = sub_src - -SUBDIRS += module_qtlocation_doc diff --git a/src/imports/location/declarativeplaces/qdeclarativecategory.cpp b/src/imports/location/declarativeplaces/qdeclarativecategory.cpp index 66e68175..8d960771 100644 --- a/src/imports/location/declarativeplaces/qdeclarativecategory.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativecategory.cpp @@ -70,11 +70,11 @@ QT_USE_NAMESPACE If the \l Plugin supports it, categories can be created or removed. To create a new category construct a new Category object and set its properties, then invoke the \l save() method. - \snippet snippets/declarative/places.qml QtLocation import + \snippet declarative/places.qml QtLocation import \codeline - \snippet snippets/declarative/places.qml Category + \snippet declarative/places.qml Category \dots 0 - \snippet snippets/declarative/places.qml Category save + \snippet declarative/places.qml Category save To remove a category ensure that the \l plugin and categoryId properties are set and call the \l remove() method. diff --git a/src/imports/location/declarativeplaces/qdeclarativecontactdetail.cpp b/src/imports/location/declarativeplaces/qdeclarativecontactdetail.cpp index 19605368..4a6624a5 100644 --- a/src/imports/location/declarativeplaces/qdeclarativecontactdetail.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativecontactdetail.cpp @@ -66,8 +66,8 @@ \li website \endlist - ContactDetails instances are only ever used in the context of \l {Places}. It is not possible - to create a ContactDetails instance directly or re-assign ContactDetails instances to \l {Places}. + ContactDetails instances are only ever used in the context of \l {Place}{Places}. It is not possible + to create a ContactDetails instance directly or re-assign ContactDetails instances to \l {Place}{Places}. Modification of ContactDetails can only be accomplished via Javascript. \section1 Examples @@ -75,23 +75,23 @@ The following example shows how to access all \l {QtLocation5::ContactDetail}{ContactDetails} and print them to the console: - \snippet snippets/declarative/places.qml QtLocation import + \snippet declarative/places.qml QtLocation import \codeline - \snippet snippets/declarative/places.qml ContactDetails read + \snippet declarative/places.qml ContactDetails read The returned list of contact details is an \l {QObjectList-based model}{object list} and so can be used directly as a data model. For example, the following demonstrates how to display a list of contact phone numbers in a list view: - \snippet snippets/declarative/places.qml QtQuick import - \snippet snippets/declarative/places.qml QtLocation import + \snippet declarative/places.qml QtQuick import + \snippet declarative/places.qml QtLocation import \codeline - \snippet snippets/declarative/places.qml ContactDetails phoneList + \snippet declarative/places.qml ContactDetails phoneList The following example demonstrates how to assign a single phone number to a place in JavaScript: - \snippet snippets/declarative/places.qml ContactDetails write single + \snippet declarative/places.qml ContactDetails write single The following demonstrates how to assign multiple phone numbers to a place in JavaScript: - \snippet snippets/declarative/places.qml ContactDetails write multiple + \snippet declarative/places.qml ContactDetails write multiple */ /*! @@ -137,10 +137,10 @@ QVariant QDeclarativeContactDetails::updateValue(const QString &, const QVariant \section1 Examples The following example demonstrates how to assign a single phone number to a place in JavaScript: - \snippet snippets/declarative/places.qml ContactDetails write single + \snippet declarative/places.qml ContactDetails write single The following demonstrates how to assign multiple phone numbers to a place in JavaScript: - \snippet snippets/declarative/places.qml ContactDetails write multiple + \snippet declarative/places.qml ContactDetails write multiple Note, due to limitations of the QQmlPropertyMap, it is not possible to declaratively specify the contact details in QML, it can only be accomplished diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp index 82965baa..5c60594b 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp @@ -70,7 +70,7 @@ QT_USE_NAMESPACE The Place type represents a physical location with additional metadata describing that location. Contrasted with \l Location, \l Address, and - \l {QtLocation5::coordinate}{coordinate} type which are used to describe where a location is. + \l {coordinate} type which are used to describe where a location is. The basic properties of a Place are its \l name and \l location. Place objects are typically obtained from a search model and will generally only have their @@ -113,11 +113,11 @@ QT_USE_NAMESPACE If the \l Plugin supports it, the Place type can be used to save a place. First create a new Place and set its properties: - \snippet snippets/declarative/places.qml Place savePlace def + \snippet declarative/places.qml Place savePlace def Then invoke the \l save() method: - \snippet snippets/declarative/places.qml Place savePlace + \snippet declarative/places.qml Place savePlace The \l status property will change to Place.Saving and then to Place.Ready if the save was successful or to Place.Error if an error occurs. @@ -127,7 +127,7 @@ QT_USE_NAMESPACE saved place. \section3 Caveats - \include place-caveats.qdocinc + \input place-caveats.qdocinc \section3 Saving Between Plugins When saving places between plugins, there are a few things to be aware of. @@ -145,7 +145,7 @@ QT_USE_NAMESPACE The following snippet provides an example of saving a place to a different plugin using the \l copyFrom method: - \snippet snippets/declarative/places.qml Place save to different plugin + \snippet declarative/places.qml Place save to different plugin \section2 Removing a Place @@ -164,18 +164,18 @@ QT_USE_NAMESPACE properties to show to the user. For example the favorite may have a modified name which should be displayed rather than the original name. - \snippet snippets/declarative/places.qml Place favorite + \snippet declarative/places.qml Place favorite The following demonstrates how to save a new favorite instance. A call is made to create/initialize the favorite instance and then the instance is saved. - \snippet snippets/declarative/places.qml Place saveFavorite + \snippet declarative/places.qml Place saveFavorite The following demonstrates favorite removal: - \snippet snippets/declarative/places.qml Place removeFavorite 1 + \snippet declarative/places.qml Place removeFavorite 1 \dots - \snippet snippets/declarative/places.qml Place removeFavorite 2 + \snippet declarative/places.qml Place removeFavorite 2 The PlaceSearchModel has a favoritesPlugin property. If the property is set, any places found during a search are checked against the favoritesPlugin to see if there is a corresponding @@ -559,7 +559,7 @@ QString QDeclarativePlace::name() const If only the place identifier is known, all other place data can fetched from the \l Plugin. - \snippet snippets/declarative/places.qml Place placeId + \snippet declarative/places.qml Place placeId */ void QDeclarativePlace::setPlaceId(const QString &placeId) { @@ -641,9 +641,9 @@ bool QDeclarativePlace::detailsFetched() const to a handler function, and then have the handler function process the change in status. - \snippet snippets/declarative/places.qml Place checkStatus + \snippet declarative/places.qml Place checkStatus \dots - \snippet snippets/declarative/places.qml Place checkStatus handler + \snippet declarative/places.qml Place checkStatus handler */ void QDeclarativePlace::setStatus(Status status, const QString &errorString) @@ -820,7 +820,7 @@ QString QDeclarativePlace::errorString() const defined for this place, this property will be an empty string. It is equivalent to: - \snippet snippets/declarative/places.qml Place primaryPhone + \snippet declarative/places.qml Place primaryPhone */ QString QDeclarativePlace::primaryPhone() const { @@ -833,7 +833,7 @@ QString QDeclarativePlace::primaryPhone() const This property holds the primary fax number of the place. If no "fax" contact detail is defined for this place this property will be an empty string. It is equivalent to - \snippet snippets/declarative/places.qml Place primaryFax + \snippet declarative/places.qml Place primaryFax */ QString QDeclarativePlace::primaryFax() const { @@ -846,7 +846,7 @@ QString QDeclarativePlace::primaryFax() const This property holds the primary email address of the place. If no "email" contact detail is defined for this place this property will be an empty string. It is equivalent to - \snippet snippets/declarative/places.qml Place primaryEmail + \snippet declarative/places.qml Place primaryEmail */ QString QDeclarativePlace::primaryEmail() const { @@ -859,7 +859,7 @@ QString QDeclarativePlace::primaryEmail() const This property holds the primary website url of the place. If no "website" contact detail is defined for this place this property will be an empty string. It is equivalent to - \snippet snippets/declarative/places.qml Place primaryWebsite + \snippet declarative/places.qml Place primaryWebsite */ QUrl QDeclarativePlace::primaryWebsite() const diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceattribute.cpp b/src/imports/location/declarativeplaces/qdeclarativeplaceattribute.cpp index 7fb35b79..a2c596b6 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceattribute.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceattribute.cpp @@ -96,12 +96,12 @@ The following example shows how to access all \l {PlaceAttribute}{PlaceAttributes} and print them to the console: - \snippet snippets/declarative/places.qml QtLocation import + \snippet declarative/places.qml QtLocation import \codeline - \snippet snippets/declarative/places.qml ExtendedAttributes read + \snippet declarative/places.qml ExtendedAttributes read The following example shows how to assign and modify an attribute: - \snippet snippets/declarative/places.qml + \snippet declarative/places.qml \sa PlaceAttribute, QQmlPropertyMap */ @@ -137,13 +137,13 @@ The following example shows how to display all attributes in a list: - \snippet snippets/declarative/places.qml QtQuick import - \snippet snippets/declarative/places.qml QtLocation import + \snippet declarative/places.qml QtQuick import + \snippet declarative/places.qml QtLocation import \codeline - \snippet snippets/declarative/places.qml ExtendedAttributes + \snippet declarative/places.qml ExtendedAttributes The following example shows how to assign and modify an attribute: - \snippet snippets/declarative/places.qml ExtendedAttributes write + \snippet declarative/places.qml ExtendedAttributes write */ QDeclarativePlaceAttribute::QDeclarativePlaceAttribute(QObject *parent) diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.cpp index 4cfe6115..7913cef0 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.cpp @@ -103,10 +103,10 @@ QT_BEGIN_NAMESPACE The following example shows how to display editorials for a place: - \snippet snippets/declarative/places.qml QtQuick import - \snippet snippets/declarative/places.qml QtLocation import + \snippet declarative/places.qml QtQuick import + \snippet declarative/places.qml QtLocation import \codeline - \snippet snippets/declarative/places.qml EditorialModel + \snippet declarative/places.qml EditorialModel */ diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp b/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp index b66e252d..669faa04 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp @@ -65,7 +65,7 @@ QT_USE_NAMESPACE The Icon type also has a parameters map which is a set of key value pairs. The precise keys to use depend on the - \l {Qt Location Module#Plugin References and Parameters}{plugin} being used. + \l {Qt Location#Plugin References and Parameters}{plugin} being used. The parameters map is used by the \l Plugin to determine which URL to return. In the case where an icon can only possibly have one image URL, the @@ -75,13 +75,13 @@ QT_USE_NAMESPACE The following code shows how to display a 64x64 pixel icon: - \snippet snippets/declarative/places.qml QtQuick import - \snippet snippets/declarative/places.qml QtLocation import + \snippet declarative/places.qml QtQuick import + \snippet declarative/places.qml QtLocation import \codeline - \snippet snippets/declarative/places.qml Icon + \snippet declarative/places.qml Icon Alternatively, a default sized icon can be specified like so: - \snippet snippets/declarative/places.qml Icon default + \snippet declarative/places.qml Icon default */ QDeclarativePlaceIcon::QDeclarativePlaceIcon(QObject *parent) @@ -155,7 +155,7 @@ QUrl QDeclarativePlaceIcon::url(const QSize &size) const are used by the plugin to return the appropriate URL when url() is called and to specify locations to save to when saving icons. - Consult the \l {Qt Location Module#Plugin References and Parameters}{plugin documentation} + Consult the \l {Qt Location#Plugin References and Parameters}{plugin documentation} for what parameters are supported and how they should be used. Note, due to limitations of the QQmlPropertyMap, it is not possible diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp b/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp index ca4bbf54..597bed89 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp @@ -104,10 +104,10 @@ QT_BEGIN_NAMESPACE The following example shows how to display images for a place: - \snippet snippets/declarative/places.qml QtQuick import - \snippet snippets/declarative/places.qml QtLocation import + \snippet declarative/places.qml QtQuick import + \snippet declarative/places.qml QtLocation import \codeline - \snippet snippets/declarative/places.qml ImageModel + \snippet declarative/places.qml ImageModel */ /*! diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceuser.cpp b/src/imports/location/declarativeplaces/qdeclarativeplaceuser.cpp index 3204a23c..f66a53e7 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceuser.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceuser.cpp @@ -63,10 +63,10 @@ QT_USE_NAMESPACE The following example shows how to display information about the user who submitted an editorial: - \snippet snippets/declarative/places.qml QtQuick import - \snippet snippets/declarative/places.qml QtLocation import + \snippet declarative/places.qml QtQuick import + \snippet declarative/places.qml QtLocation import \codeline - \snippet snippets/declarative/places.qml EditorialModel + \snippet declarative/places.qml EditorialModel */ QDeclarativePlaceUser::QDeclarativePlaceUser(QObject *parent) diff --git a/src/imports/location/declarativeplaces/qdeclarativeratings.cpp b/src/imports/location/declarativeplaces/qdeclarativeratings.cpp index 0c371b10..f27b32cf 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeratings.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeratings.cpp @@ -57,10 +57,10 @@ QT_USE_NAMESPACE information is visualized as a number of stars. The \l average property gives an aggregated ratings value out of a possible maximum as given by the \l maximum property. - \snippet snippets/declarative/places.qml QtQuick import - \snippet snippets/declarative/places.qml QtLocation import + \snippet declarative/places.qml QtQuick import + \snippet declarative/places.qml QtLocation import \codeline - \snippet snippets/declarative/places.qml Ratings + \snippet declarative/places.qml Ratings */ QDeclarativeRatings::QDeclarativeRatings(QObject *parent) diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp index d5fe5db8..28ed5b32 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp @@ -127,7 +127,7 @@ QT_USE_NAMESPACE It can often be helpful to use a \l Loader to create a delegate that will choose different \l {Component}s based on the search result type. - \snippet snippets/declarative/places_loader.qml Handle Result Types + \snippet declarative/places_loader.qml Handle Result Types \section1 Detection of Updated and Removed Places @@ -145,10 +145,10 @@ QT_USE_NAMESPACE fetch search results, but rather performs a single fetch when \l update() is run. The \l count is set to the number of search results returned during the fetch. - \snippet snippets/declarative/places.qml QtQuick import - \snippet snippets/declarative/places.qml QtLocation import + \snippet declarative/places.qml QtQuick import + \snippet declarative/places.qml QtLocation import \codeline - \snippet snippets/declarative/places.qml PlaceSearchModel + \snippet declarative/places.qml PlaceSearchModel \sa CategoryModel, {QPlaceManager} @@ -200,7 +200,7 @@ QT_USE_NAMESPACE an application developer will not need to set this property. In cases where the favorites plugin does not support matching by alternative identifiers, - then the \l {Qt Location Module#Plugin References and Parameters}{plugin documentation} should + then the \l {Qt Location#Plugin References and Parameters}{plugin documentation} should be consulted to see precisely what key-value parameters to set. */ @@ -210,8 +210,8 @@ QT_USE_NAMESPACE This property holds the search area. The search result returned by the model will be within the search area. - If this property is set to a \l {QtLocation5::geocircle}{geocircle} its - \l {QtLocation5::geocircle}{radius} property may be left unset, in which case the \l Plugin + If this property is set to a \l {geocircle} its + \l {geocircle}{radius} property may be left unset, in which case the \l Plugin will choose an appropriate radius for the search. Support for specifying a search area can vary according to the \l plugin backend diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp index 29c85c5d..e344d8ea 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp @@ -91,10 +91,10 @@ QT_USE_NAMESPACE from a partial search term. The \l searchArea is set to match what would be used to perform the actual place search with \l PlaceSearchModel. - \snippet snippets/declarative/places.qml QtQuick import - \snippet snippets/declarative/places.qml QtLocation import + \snippet declarative/places.qml QtQuick import + \snippet declarative/places.qml QtLocation import \codeline - \snippet snippets/declarative/places.qml SearchSuggestionModel + \snippet declarative/places.qml SearchSuggestionModel \sa PlaceSearchModel, {QPlaceManager} */ @@ -111,8 +111,8 @@ QT_USE_NAMESPACE This property holds the search area. Search suggestion results returned by the model will be relevant to the given search area. - If this property is set to a \l {QtLocation5::geocircle}{geocircle} its - \l {QtLocation5::geocircle}{radius} property may be left unset, in which case the \l Plugin + If this property is set to a \l {geocircle} its + \l {geocircle}{radius} property may be left unset, in which case the \l Plugin will choose an appropriate radius for the search. */ diff --git a/src/imports/location/declarativeplaces/qdeclarativesupplier.cpp b/src/imports/location/declarativeplaces/qdeclarativesupplier.cpp index 4083e291..19487cdb 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesupplier.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesupplier.cpp @@ -67,10 +67,10 @@ QT_USE_NAMESPACE The following example shows how to create and display a supplier in QML: - \snippet snippets/declarative/places.qml QtQuick import - \snippet snippets/declarative/places.qml QtLocation import + \snippet declarative/places.qml QtQuick import + \snippet declarative/places.qml QtLocation import \codeline - \snippet snippets/declarative/places.qml Supplier + \snippet declarative/places.qml Supplier */ QDeclarativeSupplier::QDeclarativeSupplier(QObject *parent) diff --git a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp index 6472c03d..dd0a7fea 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp @@ -85,10 +85,10 @@ QT_USE_NAMESPACE The following example displays a flat list of all available categories: - \snippet snippets/declarative/places.qml QtQuick import - \snippet snippets/declarative/places.qml QtLocation import + \snippet declarative/places.qml QtQuick import + \snippet declarative/places.qml QtLocation import \codeline - \snippet snippets/declarative/places.qml CategoryView + \snippet declarative/places.qml CategoryView To access the hierarchical category model it is necessary to use a \l VisualDataModel to access the child items. diff --git a/src/imports/location/locationsingleton.cpp b/src/imports/location/locationsingleton.cpp index 4080edc4..e4f9a833 100644 --- a/src/imports/location/locationsingleton.cpp +++ b/src/imports/location/locationsingleton.cpp @@ -69,7 +69,6 @@ LocationSingleton::LocationSingleton(QObject *parent) Constructs an invalid coordinate. - \sa {QtLocation5::coordinate}{coordinate} */ QGeoCoordinate LocationSingleton::coordinate() const { @@ -82,7 +81,7 @@ QGeoCoordinate LocationSingleton::coordinate() const Constructs a coordinate with the specified \a latitude, \a longitude and optional \a altitude. Both \a latitude and \a longitude must be valid, otherwise an invalid coordinate is returned. - \sa {QtLocation5::coordinate}{coordinate} + \sa {coordinate} */ QGeoCoordinate LocationSingleton::coordinate(double latitude, double longitude, double altitude) const { @@ -94,7 +93,7 @@ QGeoCoordinate LocationSingleton::coordinate(double latitude, double longitude, Constructs an invalid geoshape. - \sa {QtLocation5::geoshape}{geoshape} + \sa {geoshape} */ QGeoShape LocationSingleton::shape() const { @@ -106,7 +105,7 @@ QGeoShape LocationSingleton::shape() const Constructs an invalid georectangle. - \sa {QtLocation5::georectangle}{georectangle} + \sa {georectangle} */ QGeoRectangle LocationSingleton::rectangle() const { @@ -119,7 +118,7 @@ QGeoRectangle LocationSingleton::rectangle() const Constructs a georectangle centered at \a center with a width of \a width degrees and a hight of \a height degrees. - \sa {QtLocation5::georectangle}{georectangle} + \sa {georectangle} */ QGeoRectangle LocationSingleton::rectangle(const QGeoCoordinate ¢er, double width, double height) const @@ -133,7 +132,7 @@ QGeoRectangle LocationSingleton::rectangle(const QGeoCoordinate ¢er, Constructs a georectangle with its top left corner positioned at \a topLeft and its bottom right corner positioned at \a {bottomLeft}. - \sa {QtLocation5::georectangle}{georectangle} + \sa {georectangle} */ QGeoRectangle LocationSingleton::rectangle(const QGeoCoordinate &topLeft, const QGeoCoordinate &bottomRight) const @@ -146,7 +145,7 @@ QGeoRectangle LocationSingleton::rectangle(const QGeoCoordinate &topLeft, Constructs an invalid geocircle. - \sa {QtLocation5::geocircle}{geocircle} + \sa {geocircle} */ QGeoCircle LocationSingleton::circle() const { diff --git a/src/imports/location/qdeclarativecirclemapitem.cpp b/src/imports/location/qdeclarativecirclemapitem.cpp index 117fd30b..7ffaa406 100644 --- a/src/imports/location/qdeclarativecirclemapitem.cpp +++ b/src/imports/location/qdeclarativecirclemapitem.cpp @@ -77,7 +77,7 @@ QT_BEGIN_NAMESPACE Internally, a MapCircle is implemented as a many-sided polygon. To calculate the radius points it uses a spherical model of the Earth, - similar to the atDistanceAndAzimuth method of the \l {QtLocation5::coordinate}{coordinate} + similar to the atDistanceAndAzimuth method of the \l {coordinate} type. These two things can occasionally have implications for the accuracy of the circle's shape, depending on position and map projection. @@ -119,7 +119,7 @@ QT_BEGIN_NAMESPACE } \endcode - \image ../../../doc/src/images/api-mapcircle.png + \image api-mapcircle.png */ #ifndef M_PI diff --git a/src/imports/location/qdeclarativegeocircle.cpp b/src/imports/location/qdeclarativegeocircle.cpp index ef7e0354..cfa533a9 100644 --- a/src/imports/location/qdeclarativegeocircle.cpp +++ b/src/imports/location/qdeclarativegeocircle.cpp @@ -56,8 +56,8 @@ QT_BEGIN_NAMESPACE \brief The geocircle type represents a circular geographic area. - The \c geocircle type is a \l {QtLocation5::geoshape}{geoshape} that represents a circular - geographic area. It is defined in terms of a \l {QtLocation5::coordinate}{coordinate} which + The \c geocircle type is a \l {geoshape} that represents a circular + geographic area. It is defined in terms of a \l {coordinate} which specifies the \c center of the circle and a qreal which specifies the \c radius of the circle in meters. @@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE \section2 Example Usage Use properties of type \l variant to store a \c {geocircle}. To create a \c geocircle value, - use the \l {QtLocation5::QtLocation}{QtLocation.circle()} function: + use the \l {QtLocation::circle}{QtLocation.circle()} function: \qml import QtLocation 5.0 diff --git a/src/imports/location/qdeclarativegeocodemodel.cpp b/src/imports/location/qdeclarativegeocodemodel.cpp index 4a1996d1..ca22a270 100644 --- a/src/imports/location/qdeclarativegeocodemodel.cpp +++ b/src/imports/location/qdeclarativegeocodemodel.cpp @@ -338,8 +338,8 @@ void QDeclarativeGeocodeModel::setBounds(const QVariant &boundingArea) within the area. his is particularly useful if query is only partially filled out, as the service will attempt to (reverse) geocode all matches for the specified data. - Accepted types are \l {QtLocation5::georectangle}{georectangle} and - \l {QtLocation5::geocircle}{geocircle}. + Accepted types are \l {georectangle} and + \l {geocircle}. */ QVariant QDeclarativeGeocodeModel::bounds() const { @@ -489,7 +489,7 @@ void QDeclarativeGeocodeModel::setLocations(const QList<QGeoLocation> &locations This property holds how many locations the model currently has. Amongst other uses, you can use this value when accessing locations - via the QtLocation5::GeocodeModel::get -method. + via the GeocodeModel::get -method. */ int QDeclarativeGeocodeModel::count() const @@ -615,7 +615,7 @@ void QDeclarativeGeocodeModel::cancel() \list \li Address - Geocoding (address to coordinate) - \li \l {QtLocation5::coordinate}{coordinate} - Reverse geocoding (coordinate to address) + \li \l {coordinate} - Reverse geocoding (coordinate to address) \li string - Geocoding (address to coordinate) \endlist */ @@ -684,7 +684,7 @@ void QDeclarativeGeocodeModel::setQuery(const QVariant &query) is false. If setting this value to 'true' and using an Address or - \l {QtLocation5::coordinate}{coordinate} as the query, note that any change at all in the + \l {coordinate} as the query, note that any change at all in the object's properties will trigger a new request to be sent. If you are adjusting many properties of the object whilst autoUpdate is enabled, this can generate large numbers of useless (and later discarded) requests. diff --git a/src/imports/location/qdeclarativegeomaneuver.cpp b/src/imports/location/qdeclarativegeomaneuver.cpp index 4891dcdf..09edf377 100644 --- a/src/imports/location/qdeclarativegeomaneuver.cpp +++ b/src/imports/location/qdeclarativegeomaneuver.cpp @@ -66,10 +66,10 @@ QT_BEGIN_NAMESPACE The following QML snippet demonstrates how to print information about a route maneuver: - \snippet snippets/declarative/routing.qml QtQuick import - \snippet snippets/declarative/routing.qml QtLocation import + \snippet declarative/routing.qml QtQuick import + \snippet declarative/routing.qml QtLocation import \codeline - \snippet snippets/declarative/routing.qml RouteManeuver + \snippet declarative/routing.qml RouteManeuver */ QDeclarativeGeoManeuver::QDeclarativeGeoManeuver(QObject *parent) diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp index 4c4791b5..e2e96179 100644 --- a/src/imports/location/qdeclarativegeomap.cpp +++ b/src/imports/location/qdeclarativegeomap.cpp @@ -100,7 +100,7 @@ QT_BEGIN_NAMESPACE The geographic region displayed in the Map item is referred to as its viewport, and this is defined by the properties \l center, and - \l zoomLevel. The \l center property contains a \l {QtLocation5::coordinate}{coordinate} + \l zoomLevel. The \l center property contains a \l {coordinate} specifying the center of the viewport, while \l zoomLevel controls the scale of the map. See each of these properties for further details about their values. @@ -182,7 +182,7 @@ QT_BEGIN_NAMESPACE } \endcode - \image ../../../doc/src/images/api-map.png + \image api-map.png */ QDeclarativeGeoMap::QDeclarativeGeoMap(QQuickItem *parent) @@ -895,10 +895,10 @@ void QDeclarativeGeoMap::wheelEvent(QWheelEvent *event) As an example, consider the case where you have a MapCircle representing your current position: - \snippet snippets/declarative/maps.qml QtQuick import - \snippet snippets/declarative/maps.qml QtLocation import + \snippet declarative/maps.qml QtQuick import + \snippet declarative/maps.qml QtLocation import \codeline - \snippet snippets/declarative/maps.qml Map addMapItem MapCircle at current position + \snippet declarative/maps.qml Map addMapItem MapCircle at current position \note MapItemViews cannot be added with this method. diff --git a/src/imports/location/qdeclarativegeomapgesturearea.cpp b/src/imports/location/qdeclarativegeomapgesturearea.cpp index 6b7a3617..e3f76fbd 100644 --- a/src/imports/location/qdeclarativegeomapgesturearea.cpp +++ b/src/imports/location/qdeclarativegeomapgesturearea.cpp @@ -155,7 +155,7 @@ QT_BEGIN_NAMESPACE flicking and pinch-to-zoom gesture used on touch displays. A MapGestureArea is automatically created with a new Map and available with - the \l{QtLocation5::Map::pinch}{pinch} property. This is the only way + the \l{Map::gesture}{gesture} property. This is the only way to create a MapGestureArea, and once created this way cannot be destroyed without its parent Map. diff --git a/src/imports/location/qdeclarativegeomapitemview.cpp b/src/imports/location/qdeclarativegeomapitemview.cpp index 6002a193..71520dbd 100644 --- a/src/imports/location/qdeclarativegeomapitemview.cpp +++ b/src/imports/location/qdeclarativegeomapitemview.cpp @@ -70,10 +70,10 @@ QT_BEGIN_NAMESPACE This example demonstrates how to use the MapViewItem object to display a \l{Route}{route} on a \l{Map}{map}: - \snippet snippets/declarative/maps.qml QtQuick import - \snippet snippets/declarative/maps.qml QtLocation import + \snippet declarative/maps.qml QtQuick import + \snippet declarative/maps.qml QtLocation import \codeline - \snippet snippets/declarative/maps.qml MapRoute + \snippet declarative/maps.qml MapRoute */ QDeclarativeGeoMapItemView::QDeclarativeGeoMapItemView(QQuickItem *parent) diff --git a/src/imports/location/qdeclarativegeomapquickitem.cpp b/src/imports/location/qdeclarativegeomapquickitem.cpp index c6649731..8a9b0c6e 100644 --- a/src/imports/location/qdeclarativegeomapquickitem.cpp +++ b/src/imports/location/qdeclarativegeomapquickitem.cpp @@ -153,12 +153,12 @@ QT_BEGIN_NAMESPACE to display a Marker on the Map. This strategy is used to show the map markers in the MapViewer example. - \snippet examples/declarative/mapviewer/content/map/Marker.qml mqi-top - \snippet examples/declarative/mapviewer/content/map/Marker.qml mqi-anchor - \snippet examples/declarative/mapviewer/content/map/Marker.qml mqi-closeimage - \snippet examples/declarative/mapviewer/content/map/Marker.qml mqi-close + \snippet mapviewer/content/map/Marker.qml mqi-top + \snippet mapviewer/content/map/Marker.qml mqi-anchor + \snippet mapviewer/content/map/Marker.qml mqi-closeimage + \snippet mapviewer/content/map/Marker.qml mqi-close - \image ../../../doc/src/images/api-mapquickitem.png + \image api-mapquickitem.png */ QDeclarativeGeoMapQuickItem::QDeclarativeGeoMapQuickItem(QQuickItem *parent) @@ -184,7 +184,7 @@ QDeclarativeGeoMapQuickItem::~QDeclarativeGeoMapQuickItem() {} for the value of their anchorPoint properties. The values of anchorPoint for each are written on top of the item. - \image ../../../doc/src/images/api-mapquickitem-anchor.png + \image api-mapquickitem-anchor.png */ void QDeclarativeGeoMapQuickItem::setCoordinate(const QGeoCoordinate &coordinate) { diff --git a/src/imports/location/qdeclarativegeorectangle.cpp b/src/imports/location/qdeclarativegeorectangle.cpp index 7ee338fa..8dc0dd6a 100644 --- a/src/imports/location/qdeclarativegeorectangle.cpp +++ b/src/imports/location/qdeclarativegeorectangle.cpp @@ -56,9 +56,9 @@ QT_BEGIN_NAMESPACE \brief The georectangle type represents a rectangular geographic area. - The \c georectangle type is a \l {QtLocation5::geoshape}{geoshape} that represents a + The \c georectangle type is a \l {geoshape} that represents a rectangular geographic area. It is defined by a pair of - \l {QtLocation5::coordinate}{coordinates} which represent the top-left and bottom-right corners + \l {coordinate}{coordinates} which represent the top-left and bottom-right corners of the \c {georectangle}. The coordinates are accessible from the \c topLeft and \c bottomRight attributes. @@ -83,7 +83,7 @@ QT_BEGIN_NAMESPACE \section2 Example Usage Use properties of type \l variant to store a \c {georectangle}. To create a \c georectangle - value, use the \l {QtLocation5::QtLocation}{QtLocation.rectangle()} function: + value, use the \l {QtLocation::rectangle}{QtLocation.rectangle()} function: \qml import QtLocation 5.0 diff --git a/src/imports/location/qdeclarativegeoroute.cpp b/src/imports/location/qdeclarativegeoroute.cpp index 83681887..ab4b49db 100644 --- a/src/imports/location/qdeclarativegeoroute.cpp +++ b/src/imports/location/qdeclarativegeoroute.cpp @@ -72,10 +72,10 @@ QT_BEGIN_NAMESPACE This example shows how to display a route's maneuvers in a ListView: - \snippet snippets/declarative/routing.qml QtQuick import - \snippet snippets/declarative/routing.qml QtLocation import + \snippet declarative/routing.qml QtQuick import + \snippet declarative/routing.qml QtLocation import \codeline - \snippet snippets/declarative/routing.qml Route Maneuver List + \snippet declarative/routing.qml Route Maneuver List */ @@ -158,7 +158,7 @@ qreal QDeclarativeGeoRoute::distance() const indicates the number of objects and 'path[index starting from zero]' gives the actual object. - \sa QtLocation5::coordinate + \sa QtLocation::coordinate */ QJSValue QDeclarativeGeoRoute::path() const @@ -209,7 +209,7 @@ void QDeclarativeGeoRoute::setPath(const QJSValue &value) } /*! - \qmlproperty QQmlListProperty<RouteSegment> QtLocation5::Route::segments + \qmlproperty list<RouteSegment> QtLocation5::Route::segments Read-only property which holds the list of \l RouteSegment objects of this route. diff --git a/src/imports/location/qdeclarativegeoroutesegment.cpp b/src/imports/location/qdeclarativegeoroutesegment.cpp index 74f214f1..ca99362f 100644 --- a/src/imports/location/qdeclarativegeoroutesegment.cpp +++ b/src/imports/location/qdeclarativegeoroutesegment.cpp @@ -72,10 +72,10 @@ QT_BEGIN_NAMESPACE The following QML snippet demonstrates how to print information about a route segment: - \snippet snippets/declarative/routing.qml QtQuick import - \snippet snippets/declarative/routing.qml QtLocation import + \snippet declarative/routing.qml QtQuick import + \snippet declarative/routing.qml QtLocation import \codeline - \snippet snippets/declarative/routing.qml RouteSegment + \snippet declarative/routing.qml RouteSegment */ QDeclarativeGeoRouteSegment::QDeclarativeGeoRouteSegment(QObject *parent) @@ -144,7 +144,7 @@ QDeclarativeGeoManeuver *QDeclarativeGeoRouteSegment::maneuver() const indicates the number of objects and 'path[index starting from zero]' gives the actual object. - \sa QtLocation5::coordinate + \sa QtLocation::coordinate */ QJSValue QDeclarativeGeoRouteSegment::path() const diff --git a/src/imports/location/qdeclarativegeoserviceprovider.cpp b/src/imports/location/qdeclarativegeoserviceprovider.cpp index 727e63a0..49ad3e4c 100644 --- a/src/imports/location/qdeclarativegeoserviceprovider.cpp +++ b/src/imports/location/qdeclarativegeoserviceprovider.cpp @@ -491,7 +491,7 @@ QGeoServiceProvider *QDeclarativeGeoServiceProvider::sharedGeoServiceProvider() For \l {Plugin}'s that do not support locales, the locales list is always empty. The following code demonstrates how to set a single and multiple locales: - \snippet snippets/declarative/plugin.qml Plugin locale + \snippet declarative/plugin.qml Plugin locale */ QStringList QDeclarativeGeoServiceProvider::locales() const { @@ -757,7 +757,7 @@ bool QDeclarativeGeoServiceProviderRequirements::matches(const QGeoServiceProvid To set such a parameter, declare a PluginParameter inside a \l Plugin object, and give it \l{name} and \l{value} properties. A list of valid parameter names for each plugin is available from the - \l {Qt Location Module#Plugin References and Parameters}{plugin reference pages}. + \l {Qt Location#Plugin References and Parameters}{plugin reference pages}. \section2 Example Usage diff --git a/src/imports/location/qdeclarativegeoshape.cpp b/src/imports/location/qdeclarativegeoshape.cpp index 916be6b2..e08f8edc 100644 --- a/src/imports/location/qdeclarativegeoshape.cpp +++ b/src/imports/location/qdeclarativegeoshape.cpp @@ -56,8 +56,8 @@ QT_BEGIN_NAMESPACE The \c geoshape type represents an abstract geographic area. It includes attributes and methods common to all geographic areas. To create objects that represent a valid geographic - area use \l {QtLocation5::georectangle}{georectangle} or - \l {QtLocation5::geocircle}{geocircle}. + area use \l {georectangle}{georectangle} or + \l {geocircle}{geocircle}. The \c isValid attribute can be used to test if the geoshape represents a valid geographic area. @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE The \c isEmpty attribute can be used to test if the geoshape represents a region with a geomatrical area of 0. - The \l contains() method can be used to test if a \l {QtLocation5::coordinate}{coordinate} is + The \l contains() method can be used to test if a \l {QtLocation::coordinate}{coordinate} is within the geoshape. \section2 Example Usage @@ -83,7 +83,7 @@ QT_BEGIN_NAMESPACE } \endqml - or with the \l {QtLocation5::QtLocation}{QtLocation.shape()} function: + or with the \l {QtLocation::QtLocation}{QtLocation.shape()} function: \qml import QtLocation 5.0 @@ -104,7 +104,7 @@ QT_BEGIN_NAMESPACE bool contains(coordinate coord) \endcode - Returns true if the \l {QtLocation5::coordinate}{coordinate} specified by \a coord is within + Returns true if the \l {QtLocation::coordinate}{coordinate} specified by \a coord is within this geoshape; Otherwise returns false. */ diff --git a/src/imports/location/qdeclarativepolygonmapitem.cpp b/src/imports/location/qdeclarativepolygonmapitem.cpp index 3c051d4e..bd4eeed0 100644 --- a/src/imports/location/qdeclarativepolygonmapitem.cpp +++ b/src/imports/location/qdeclarativepolygonmapitem.cpp @@ -69,10 +69,10 @@ QT_BEGIN_NAMESPACE \brief The MapPolygon type displays a polygon on a Map The MapPolygon type displays a polygon on a Map, specified in terms of an ordered list of - \l {QtLocation5::coordinate}{coordinates}. For best appearance and results, polygons should be + \l {QtLocation::coordinate}{coordinates}. For best appearance and results, polygons should be simple (not self-intersecting). - The \l {QtLocation5::coordinate}{coordinates} on the path cannot be directly changed after + The \l {QtLocation::coordinate}{coordinates} on the path cannot be directly changed after being added to the Polygon. Instead, copy the \l path into a var, modify the copy and reassign the copy back to the \l path. @@ -132,7 +132,7 @@ QT_BEGIN_NAMESPACE } \endcode - \image ../../../doc/src/images/api-mappolygon.png + \image api-mappolygon.png */ struct Vertex diff --git a/src/imports/location/qdeclarativepolylinemapitem.cpp b/src/imports/location/qdeclarativepolylinemapitem.cpp index 6dd6a644..837fa7da 100644 --- a/src/imports/location/qdeclarativepolylinemapitem.cpp +++ b/src/imports/location/qdeclarativepolylinemapitem.cpp @@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE \brief The MapPolyline type displays a polyline on a map. The MapPolyline type displays a polyline on a map, specified in terms of an ordered list of - \l {QtLocation5::coordinate}{coordinates}. The \l {QtLocation5::coordinate}{coordinates} on + \l {coordinate}{coordinates}. The \l {coordinate}{coordinates} on the path cannot be directly changed after being added to the Polyline. Instead, copy the \l path into a var, modify the copy and reassign the copy back to the \l path. @@ -121,7 +121,7 @@ QT_BEGIN_NAMESPACE } \endcode - \image ../../../doc/src/images/api-mappolyline.png + \image api-mappolyline.png */ QDeclarativeMapLineProperties::QDeclarativeMapLineProperties(QObject *parent) : diff --git a/src/imports/location/qdeclarativeposition.cpp b/src/imports/location/qdeclarativeposition.cpp index 3a28585f..bbd53423 100644 --- a/src/imports/location/qdeclarativeposition.cpp +++ b/src/imports/location/qdeclarativeposition.cpp @@ -79,7 +79,7 @@ QT_BEGIN_NAMESPACE See the example given for the \l{PositionSource} type, or the \l{declarative/flickr}{Flickr} example application. - \sa PositionSource, QtLocation5::coordinate + \sa PositionSource, coordinate */ diff --git a/src/imports/location/qdeclarativerectanglemapitem.cpp b/src/imports/location/qdeclarativerectanglemapitem.cpp index 16fa5509..ffb0a2c3 100644 --- a/src/imports/location/qdeclarativerectanglemapitem.cpp +++ b/src/imports/location/qdeclarativerectanglemapitem.cpp @@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE right side have the same longitude. To specify the rectangle, it requires a \l topLeft and \l bottomRight point, - both given by a \l {QtLocation5::coordinate}{coordinate}. + both given by a \l {coordinate}. By default, the rectangle is displayed with transparent fill and a 1-pixel thick black border. This can be changed using the \l color, \l border.color @@ -113,7 +113,7 @@ QT_BEGIN_NAMESPACE } \endcode - \image ../../../doc/src/images/api-maprectangle.png + \image api-maprectangle.png */ struct Vertex diff --git a/src/imports/location/qdeclarativeroutemapitem.cpp b/src/imports/location/qdeclarativeroutemapitem.cpp index 74d886df..264ee835 100644 --- a/src/imports/location/qdeclarativeroutemapitem.cpp +++ b/src/imports/location/qdeclarativeroutemapitem.cpp @@ -60,7 +60,7 @@ other means, on the Map as a Polyline following the path of the Route. MapRoute is really a \l MapPolyline, but with the path specified using the - \l route property instead of directly in \l {QtLocation5::coordinate}{coordinates}. + \l route property instead of directly in \l {coordinate}{coordinates}. By default, the route is displayed as a 1-pixel thick black line. This can be changed using the \l line.width and \l line.color properties. @@ -74,10 +74,10 @@ Here is how to draw a \l{Route}{route} on a \l{Map}{map}: - \snippet snippets/declarative/maps.qml QtQuick import - \snippet snippets/declarative/maps.qml QtLocation import + \snippet declarative/maps.qml QtQuick import + \snippet declarative/maps.qml QtLocation import \codeline - \snippet snippets/declarative/maps.qml MapRoute + \snippet declarative/maps.qml MapRoute */ diff --git a/doc/src/images/api-map.png b/src/location/doc/images/api-map.png Binary files differindex 6e7255d4..6e7255d4 100644 --- a/doc/src/images/api-map.png +++ b/src/location/doc/images/api-map.png diff --git a/doc/src/images/api-mapcircle.png b/src/location/doc/images/api-mapcircle.png Binary files differindex ab31eefc..ab31eefc 100644 --- a/doc/src/images/api-mapcircle.png +++ b/src/location/doc/images/api-mapcircle.png diff --git a/doc/src/images/api-mappolygon.png b/src/location/doc/images/api-mappolygon.png Binary files differindex 46b5fc17..46b5fc17 100644 --- a/doc/src/images/api-mappolygon.png +++ b/src/location/doc/images/api-mappolygon.png diff --git a/doc/src/images/api-mappolyline.png b/src/location/doc/images/api-mappolyline.png Binary files differindex 682812c4..682812c4 100644 --- a/doc/src/images/api-mappolyline.png +++ b/src/location/doc/images/api-mappolyline.png diff --git a/doc/src/images/api-mapquickitem-anchor.png b/src/location/doc/images/api-mapquickitem-anchor.png Binary files differindex 40581db5..40581db5 100644 --- a/doc/src/images/api-mapquickitem-anchor.png +++ b/src/location/doc/images/api-mapquickitem-anchor.png diff --git a/doc/src/images/api-mapquickitem.png b/src/location/doc/images/api-mapquickitem.png Binary files differindex 3abde6b6..3abde6b6 100644 --- a/doc/src/images/api-mapquickitem.png +++ b/src/location/doc/images/api-mapquickitem.png diff --git a/doc/src/images/api-maprectangle.png b/src/location/doc/images/api-maprectangle.png Binary files differindex 957503ee..957503ee 100644 --- a/doc/src/images/api-maprectangle.png +++ b/src/location/doc/images/api-maprectangle.png diff --git a/doc/src/images/example-mapviewer.png b/src/location/doc/images/example-mapviewer.png Binary files differindex 4dcac4fa..4dcac4fa 100644 --- a/doc/src/images/example-mapviewer.png +++ b/src/location/doc/images/example-mapviewer.png diff --git a/doc/src/images/example-weatherinfo.png b/src/location/doc/images/example-weatherinfo.png Binary files differindex 6557b57b..6557b57b 100644 --- a/doc/src/images/example-weatherinfo.png +++ b/src/location/doc/images/example-weatherinfo.png diff --git a/doc/src/images/flickr-demo.jpg b/src/location/doc/images/flickr-demo.jpg Binary files differindex cfd12819..cfd12819 100644 --- a/doc/src/images/flickr-demo.jpg +++ b/src/location/doc/images/flickr-demo.jpg diff --git a/doc/src/images/mapsdemo-finished.png b/src/location/doc/images/mapsdemo-finished.png Binary files differindex cadee4a3..cadee4a3 100644 --- a/doc/src/images/mapsdemo-finished.png +++ b/src/location/doc/images/mapsdemo-finished.png diff --git a/doc/src/images/mapsdemo-routing.png b/src/location/doc/images/mapsdemo-routing.png Binary files differindex 3c2d0cad..3c2d0cad 100644 --- a/doc/src/images/mapsdemo-routing.png +++ b/src/location/doc/images/mapsdemo-routing.png diff --git a/doc/src/images/mapsdemo-searchgui.png b/src/location/doc/images/mapsdemo-searchgui.png Binary files differindex a307e68a..a307e68a 100644 --- a/doc/src/images/mapsdemo-searchgui.png +++ b/src/location/doc/images/mapsdemo-searchgui.png diff --git a/doc/src/images/mapsdemo-verybasic.png b/src/location/doc/images/mapsdemo-verybasic.png Binary files differindex 9d92a74c..9d92a74c 100644 --- a/doc/src/images/mapsdemo-verybasic.png +++ b/src/location/doc/images/mapsdemo-verybasic.png diff --git a/doc/src/images/places-list.png b/src/location/doc/images/places-list.png Binary files differindex 02416e53..02416e53 100644 --- a/doc/src/images/places-list.png +++ b/src/location/doc/images/places-list.png diff --git a/doc/src/images/places-map.jpg b/src/location/doc/images/places-map.jpg Binary files differindex b5f2e35b..b5f2e35b 100644 --- a/doc/src/images/places-map.jpg +++ b/src/location/doc/images/places-map.jpg diff --git a/doc/src/images/qml-flickr-1.jpg b/src/location/doc/images/qml-flickr-1.jpg Binary files differindex 14fc5c92..14fc5c92 100644 --- a/doc/src/images/qml-flickr-1.jpg +++ b/src/location/doc/images/qml-flickr-1.jpg diff --git a/doc/src/images/qml-places.png b/src/location/doc/images/qml-places.png Binary files differindex 970f1dc4..970f1dc4 100644 --- a/doc/src/images/qml-places.png +++ b/src/location/doc/images/qml-places.png diff --git a/src/location/doc/qtlocation.qdocconf b/src/location/doc/qtlocation.qdocconf new file mode 100644 index 00000000..a5b10857 --- /dev/null +++ b/src/location/doc/qtlocation.qdocconf @@ -0,0 +1,56 @@ +include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) + +project = QtLocation +description = Qt Location Reference Documentation +url = http://qt-project.org/doc/qt-$QT_VER/qtlocation +version = $QT_VERSION + + + +qhp.projects = QtLocation + +qhp.QtLocation.file = qtlocation.qhp +qhp.QtLocation.namespace = org.qt-project.qtlocation.$QT_VERSION_TAG +qhp.QtLocation.virtualFolder = qtlocation +qhp.QtLocation.indexTitle = Qt Location +qhp.QtLocation.indexRoot = + +qhp.QtLocation.filterAttributes = qtlocation $QT_VERSION qtrefdoc +qhp.QtLocation.customFilters.Qt.name = QtLocation $QT_VERSION +qhp.QtLocation.customFilters.Qt.filterAttributes = qtLocation $QT_VERSION +qhp.QtLocation.subprojects = overviews classes qml examples +qhp.QtLocation.subprojects.classes.title = C++ Classes +qhp.QtLocation.subprojects.classes.indexTitle = Qt Location C++ Classes +qhp.QtLocation.subprojects.classes.selectors = class fake:headerfile +qhp.QtLocation.subprojects.classes.sortPages = true +qhp.QtLocation.subprojects.qml.title = QML Types +qhp.QtLocation.subprojects.qml.indexTitle = Qt Location QML Types +qhp.QtLocation.subprojects.qml.selectors = fake:headerfile +qhp.QtLocation.subprojects.qml.sortPages = true +qhp.QtLocation.subprojects.overviews.title = Overviews +qhp.QtLocation.subprojects.overviews.indexTitle = Qt Location Overview +qhp.QtLocation.subprojects.overviews.selectors = fake:page,group,module +qhp.QtLocation.subprojects.examples.title = Qt Location Examples +qhp.QtLocation.subprojects.examples.indexTitle = Qt Location Examples +qhp.QtLocation.subprojects.examples.selectors = fake:example + +tagfile = ../../../doc/qtlocation/qtlocation.tags + +depends += qtcore qtdoc qtquick qtqml qtnetwork + +headerdirs += .. \ + ../../imports/location + +sourcedirs += .. \ + ../../imports/location \ + +exampledirs += ../../../examples \ + ../../../examples/declarative \ + snippets/ + + +imagedirs += images + +navigation.landingpage = "Qt Location" +navigation.cppclassespage = "Qt Location C++ Classes" +navigation.qmltypespage = "Qt Location QML Types" diff --git a/doc/src/snippets/cpp/cpp.pro b/src/location/doc/snippets/cpp/cpp.pro index b961b988..b961b988 100644 --- a/doc/src/snippets/cpp/cpp.pro +++ b/src/location/doc/snippets/cpp/cpp.pro diff --git a/doc/src/snippets/cpp/cppqml.cpp b/src/location/doc/snippets/cpp/cppqml.cpp index 93d2b603..93d2b603 100644 --- a/doc/src/snippets/cpp/cppqml.cpp +++ b/src/location/doc/snippets/cpp/cppqml.cpp diff --git a/doc/src/snippets/cpp/main.cpp b/src/location/doc/snippets/cpp/main.cpp index 9a389ed3..9a389ed3 100644 --- a/doc/src/snippets/cpp/main.cpp +++ b/src/location/doc/snippets/cpp/main.cpp diff --git a/doc/src/snippets/declarative/content/Cell.qml b/src/location/doc/snippets/declarative/content/Cell.qml index 70b9befd..70b9befd 100644 --- a/doc/src/snippets/declarative/content/Cell.qml +++ b/src/location/doc/snippets/declarative/content/Cell.qml diff --git a/doc/src/snippets/declarative/declarative-location.qml b/src/location/doc/snippets/declarative/declarative-location.qml index 111fe727..111fe727 100644 --- a/doc/src/snippets/declarative/declarative-location.qml +++ b/src/location/doc/snippets/declarative/declarative-location.qml diff --git a/doc/src/snippets/declarative/declarative-map.qml b/src/location/doc/snippets/declarative/declarative-map.qml index d517580e..d517580e 100644 --- a/doc/src/snippets/declarative/declarative-map.qml +++ b/src/location/doc/snippets/declarative/declarative-map.qml diff --git a/doc/src/snippets/declarative/declarative.pro b/src/location/doc/snippets/declarative/declarative.pro index 40fb082f..40fb082f 100644 --- a/doc/src/snippets/declarative/declarative.pro +++ b/src/location/doc/snippets/declarative/declarative.pro diff --git a/doc/src/snippets/declarative/maps.qml b/src/location/doc/snippets/declarative/maps.qml index fbb60b82..fbb60b82 100644 --- a/doc/src/snippets/declarative/maps.qml +++ b/src/location/doc/snippets/declarative/maps.qml diff --git a/doc/src/snippets/declarative/marker.png b/src/location/doc/snippets/declarative/marker.png Binary files differindex 86ec960e..86ec960e 100644 --- a/doc/src/snippets/declarative/marker.png +++ b/src/location/doc/snippets/declarative/marker.png diff --git a/doc/src/snippets/declarative/nmealog.txt b/src/location/doc/snippets/declarative/nmealog.txt index 8c8286dd..8c8286dd 100755 --- a/doc/src/snippets/declarative/nmealog.txt +++ b/src/location/doc/snippets/declarative/nmealog.txt diff --git a/doc/src/snippets/declarative/places.qml b/src/location/doc/snippets/declarative/places.qml index 66c62cf7..66c62cf7 100644 --- a/doc/src/snippets/declarative/places.qml +++ b/src/location/doc/snippets/declarative/places.qml diff --git a/doc/src/snippets/declarative/places_loader.qml b/src/location/doc/snippets/declarative/places_loader.qml index 9f10faf7..9f10faf7 100644 --- a/doc/src/snippets/declarative/places_loader.qml +++ b/src/location/doc/snippets/declarative/places_loader.qml diff --git a/doc/src/snippets/declarative/plugin.qml b/src/location/doc/snippets/declarative/plugin.qml index 64b2a55a..64b2a55a 100644 --- a/doc/src/snippets/declarative/plugin.qml +++ b/src/location/doc/snippets/declarative/plugin.qml diff --git a/doc/src/snippets/declarative/routing.qml b/src/location/doc/snippets/declarative/routing.qml index 04258bdd..04258bdd 100644 --- a/doc/src/snippets/declarative/routing.qml +++ b/src/location/doc/snippets/declarative/routing.qml diff --git a/doc/src/snippets/declarative/testpolymapobjects.qml b/src/location/doc/snippets/declarative/testpolymapobjects.qml index c86580a2..c86580a2 100644 --- a/doc/src/snippets/declarative/testpolymapobjects.qml +++ b/src/location/doc/snippets/declarative/testpolymapobjects.qml diff --git a/doc/src/snippets/places/main.cpp b/src/location/doc/snippets/places/main.cpp index 171a35bf..171a35bf 100644 --- a/doc/src/snippets/places/main.cpp +++ b/src/location/doc/snippets/places/main.cpp diff --git a/doc/src/snippets/places/places.pro b/src/location/doc/snippets/places/places.pro index 9fa4c7fb..9fa4c7fb 100644 --- a/doc/src/snippets/places/places.pro +++ b/src/location/doc/snippets/places/places.pro diff --git a/doc/src/snippets/places/requesthandler.h b/src/location/doc/snippets/places/requesthandler.h index 92e1a935..92e1a935 100644 --- a/doc/src/snippets/places/requesthandler.h +++ b/src/location/doc/snippets/places/requesthandler.h diff --git a/doc/src/snippets/snippets.pro b/src/location/doc/snippets/snippets.pro index e4946c8b..e4946c8b 100644 --- a/doc/src/snippets/snippets.pro +++ b/src/location/doc/snippets/snippets.pro diff --git a/doc/src/cpp-qml.qdoc b/src/location/doc/src/cpp-qml.qdoc index 4ee4e65e..3e38edb0 100644 --- a/doc/src/cpp-qml.qdoc +++ b/src/location/doc/src/cpp-qml.qdoc @@ -37,9 +37,9 @@ The \l {Category::category} {Category.category} property is used to provide an i Category object must be obtained from C++, then use the \l {QObject::property()}{property()} and \l {QObject::setProperty()}{setProperty()} functions to get and set the \c category property. The following gets the QPlaceCategory representing this object from C++: -\snippet snippets/cpp/cppqml.cpp Category get +\snippet cpp/cppqml.cpp Category get The following sets the properties of this object based on a QPlaceCategory object from C++: -\snippet snippets/cpp/cppqml.cpp Category set +\snippet cpp/cppqml.cpp Category set \section2 ContactDetail - QDeclarativeContactDetail @@ -48,10 +48,10 @@ The \l {ContactDetail::contactDetail} {ContactDetail.contactDetail} property is \l {QObject::property()}{property()} and \l {QObject::setProperty()}{setProperty()} functions to get and set the \c contactDetail property. The following gets the QPlaceContactDetail representing this object from C++: -\snippet snippets/cpp/cppqml.cpp ContactDetail get +\snippet cpp/cppqml.cpp ContactDetail get The following sets the properties of this object based on a QPlaceContactDetail object from C++: -\snippet snippets/cpp/cppqml.cpp ContactDetail set +\snippet cpp/cppqml.cpp ContactDetail set \section2 Place - QPlace @@ -60,9 +60,9 @@ The \l {Place::place} {Place.place} property is used to provide an interface bet \l {QObject::property()}{property()} and \l {QObject::setProperty()}{setProperty()} functions to get and set the \c place property. The following gets the QPlace representing this object from C++: -\snippet snippets/cpp/cppqml.cpp Place get +\snippet cpp/cppqml.cpp Place get The following sets the properties of this object based on a QPlace object from C++: -\snippet snippets/cpp/cppqml.cpp Place set +\snippet cpp/cppqml.cpp Place set @@ -73,9 +73,9 @@ PlaceAttribute object must be obtained from C++, then use the \l {QObject::property()}{property()} and \l {QObject::setProperty()}{setProperty()} functions to get and set the \c attribute property. The following gets the QPlaceAttribute representing this object from C++: -\snippet snippets/cpp/cppqml.cpp PlaceAttribute get +\snippet cpp/cppqml.cpp PlaceAttribute get The following sets the properties of this object based on a QPlaceAttribute object from C++: -\snippet snippets/cpp/cppqml.cpp PlaceAttribute set +\snippet cpp/cppqml.cpp PlaceAttribute set \section2 Icon - QPlaceIcon @@ -83,9 +83,9 @@ The following sets the properties of this object based on a QPlaceAttribute obje The \l {Icon::icon} {Icon.icon} property is used to provide an interface between C++ and QML code. First a pointer to a Icon object must be obtained from C++, then use the \l {QObject::property()}{property()} and \l {QObject::setProperty()}{setProperty()} functions to get and set the \c icon property. The following gets the QPlaceIcon representing this object from C++: -\snippet snippets/cpp/cppqml.cpp Icon get +\snippet cpp/cppqml.cpp Icon get The following sets the properties of this object based on a QPlaceIcon object from C++: -\snippet snippets/cpp/cppqml.cpp Icon set +\snippet cpp/cppqml.cpp Icon set \section2 User - QPlaceUser @@ -94,9 +94,9 @@ The \l {User::user} {User.user} property is used to provide an interface between User object must be obtained from C++, then use the \l {QObject::property()}{property()} and \l {QObject::setProperty()}{setProperty()} functions to get and set the \c user property. The following gets the QPlaceUser representing this object from C++: -\snippet snippets/cpp/cppqml.cpp User get +\snippet cpp/cppqml.cpp User get The following sets the properties of this object based on a QPlaceUser object from C++: -\snippet snippets/cpp/cppqml.cpp User set +\snippet cpp/cppqml.cpp User set \section2 Ratings - QPlaceRatings @@ -105,9 +105,9 @@ The \l {Ratings::ratings} {Ratings.ratings} property is used to provide an inter Ratings object must be obtained from C++, then use the \l {QObject::property()}{property()} and \l {QObject::setProperty()}{setProperty()} functions to get and set the \c ratings property. The following gets the QPlaceRating representing this object from C++: -\snippet snippets/cpp/cppqml.cpp Ratings get +\snippet cpp/cppqml.cpp Ratings get The following sets the properties of this object based on a QPlaceRatings object from C++: -\snippet snippets/cpp/cppqml.cpp Ratings set +\snippet cpp/cppqml.cpp Ratings set \section2 Supplier - QPlaceSupplier @@ -116,9 +116,9 @@ The \l {Supplier::supplier} {Supplier.supplier} property is used to provide an i Supplier object must be obtained from C++, then use the \l {QObject::property()}{property()} and \l {QObject::setProperty()}{setProperty()} functions to get and set the \c supplier property. The following gets the QPlaceSupplier representing this object from C++: -\snippet snippets/cpp/cppqml.cpp Supplier get +\snippet cpp/cppqml.cpp Supplier get The following sets the properties of this object based on a QPlaceSupplier object from C++: -\snippet snippets/cpp/cppqml.cpp Supplier set +\snippet cpp/cppqml.cpp Supplier set \section2 Address - QGeoAddress @@ -127,9 +127,9 @@ The \l {Address::address} {Address.address} property is used to provide an inter Address object must be obtained from C++, then use the \l {QObject::property()}{property()} and \l {QObject::setProperty()}{setProperty()} functions to get and set the \c address property. The following gets the QGeoAddress representing this object from C++: -\snippet snippets/cpp/cppqml.cpp Address get +\snippet cpp/cppqml.cpp Address get The following sets the properties of this object based on a QGeoAddress object from C++: -\snippet snippets/cpp/cppqml.cpp Address set +\snippet cpp/cppqml.cpp Address set \section2 Location - QGeoLocation @@ -138,8 +138,8 @@ The \l {Location::location} {Location.location} property is used to provide an i Location object must be obtained from C++, then use the \l {QObject::property()}{property()} and \l {QObject::setProperty()}{setProperty()} functions to get and set the \c location property. The following gets the QGeoLocation representing this object from C++: -\snippet snippets/cpp/cppqml.cpp Location get +\snippet cpp/cppqml.cpp Location get The following sets the properties of this object based on a QGeoLocation object from C++: -\snippet snippets/cpp/cppqml.cpp Location set +\snippet cpp/cppqml.cpp Location set */ diff --git a/doc/src/examples/declarative-flickr.qdoc b/src/location/doc/src/examples/declarative-flickr.qdoc index 3e83d1c9..99c2792d 100644 --- a/doc/src/examples/declarative-flickr.qdoc +++ b/src/location/doc/src/examples/declarative-flickr.qdoc @@ -52,20 +52,20 @@ GeoTab component (the floating "window" describing current location and status). - \snippet examples/declarative/flickr/flickrmobile/GeoTab.qml possrc + \snippet flickr/flickrmobile/GeoTab.qml possrc When the "Locate and update" button is pressed, we first interrogate the PositionSource to check if it has an available backend for positioning data. If it does not, we fall back to using a pre-recorded NMEA log for demonstration. We then instruct the PositionSource to update. - \snippet examples/declarative/flickr/flickrmobile/GeoTab.qml locatebutton-top - \snippet examples/declarative/flickr/flickrmobile/GeoTab.qml locatebutton-clicked + \snippet flickr/flickrmobile/GeoTab.qml locatebutton-top + \snippet flickr/flickrmobile/GeoTab.qml locatebutton-clicked To share the new position data with the rest of the application, we use properties that we have created on the GeoTab component: - \snippet examples/declarative/flickr/flickrmobile/GeoTab.qml props + \snippet flickr/flickrmobile/GeoTab.qml props The longitude and latitude values retrieved here are eventually set on in properties on the RestModel component. The RestModel is an XmlListModel, @@ -75,7 +75,7 @@ In this case, it retrieves data from the Flickr REST API online, based on our current location - \snippet examples/declarative/flickr/flickrcommon/RestModel.qml restmodel + \snippet flickr/flickrcommon/RestModel.qml restmodel This model data is then shown in a variety of Qt Quick views to produce the example application. diff --git a/doc/src/examples/declarative-mapviewer.qdoc b/src/location/doc/src/examples/declarative-mapviewer.qdoc index b761caac..6fbec0e9 100644 --- a/doc/src/examples/declarative-mapviewer.qdoc +++ b/src/location/doc/src/examples/declarative-mapviewer.qdoc @@ -57,7 +57,7 @@ \list \li \l{QtLocation5::Map}{Map} \li \l{QtLocation5::MapGestureArea}{MapGestureArea} - \li \l{QtLocation5::coordinate}{coordinate} + \li \l{coordinate} \endlist \li Finding an address \list @@ -79,11 +79,11 @@ Drawing a map on-screen is accomplished using the Map type, as shown below. - \snippet examples/declarative/mapviewer/content/map/MapComponent.qml top - \snippet examples/declarative/mapviewer/content/map/MapComponent.qml coord - \snippet examples/declarative/mapviewer/content/map/MapComponent.qml end + \snippet mapviewer/content/map/MapComponent.qml top + \snippet mapviewer/content/map/MapComponent.qml coord + \snippet mapviewer/content/map/MapComponent.qml end - In this example, we give the map an initial center \l {QtLocation5::coordinate}{coordinate} + In this example, we give the map an initial center \l {coordinate} with a set latitude and longitude. We also set the initial zoom level to 50% (halfway between the maximum and minimum). @@ -106,19 +106,19 @@ Receiving results of geocoding is done through a GeocodeModel, which is typically instantiated as a property of the Map component: - \snippet examples/declarative/mapviewer/content/map/MapComponent.qml geocodemodel0 - \snippet examples/declarative/mapviewer/content/map/MapComponent.qml geocodemodel1 + \snippet mapviewer/content/map/MapComponent.qml geocodemodel0 + \snippet mapviewer/content/map/MapComponent.qml geocodemodel1 Then, to display the contents of the GeocodeModel we use a MapItemView: - \snippet examples/declarative/mapviewer/content/map/MapComponent.qml geocodeview + \snippet mapviewer/content/map/MapComponent.qml geocodeview MapItemView uses an object called a "delegate" to act as a template for the items it creates. This can contain any map object desired, but in this case we show a MapCircle: - \snippet examples/declarative/mapviewer/content/map/MapComponent.qml pointdel0 - \snippet examples/declarative/mapviewer/content/map/MapComponent.qml pointdel1 + \snippet mapviewer/content/map/MapComponent.qml pointdel0 + \snippet mapviewer/content/map/MapComponent.qml pointdel1 With these three objects, we have enough to receive Geocode responses and display them on our Map. The final piece is to send the actual Geocode @@ -133,9 +133,9 @@ in with the desired parameters. Then we set "map.geocodeModel.query" to the filled in Address, and call update() on the GeocodeModel. - \snippet examples/declarative/mapviewer/mapviewer.qml geocode0 - \snippet examples/declarative/mapviewer/mapviewer.qml geocode1 - \snippet examples/declarative/mapviewer/mapviewer.qml geocode2 + \snippet mapviewer/mapviewer.qml geocode0 + \snippet mapviewer/mapviewer.qml geocode1 + \snippet mapviewer/mapviewer.qml geocode2 \section2 Directions and Travel Routes @@ -145,35 +145,35 @@ Here again, we instantiate the RouteModel as a property of our Map: - \snippet examples/declarative/mapviewer/content/map/MapComponent.qml routemodel0 - \snippet examples/declarative/mapviewer/content/map/MapComponent.qml routemodel3 + \snippet mapviewer/content/map/MapComponent.qml routemodel0 + \snippet mapviewer/content/map/MapComponent.qml routemodel3 To display the contents of a model to the user, we need a view. Once again we will use a MapItemView, to display the Routes as objects on the Map: - \snippet examples/declarative/mapviewer/content/map/MapComponent.qml routeview + \snippet mapviewer/content/map/MapComponent.qml routeview To act as a template for the objects we wish the view to create, we create a delegate component: - \snippet examples/declarative/mapviewer/content/map/MapComponent.qml routedelegate0 - \snippet examples/declarative/mapviewer/content/map/MapComponent.qml routedelegate1 + \snippet mapviewer/content/map/MapComponent.qml routedelegate0 + \snippet mapviewer/content/map/MapComponent.qml routedelegate1 With the model, view and delegate now complete, the only missing component is some kind of control over the model to begin the Route request process. In the simplest case, we can fill out a Route request using two already - available \l {QtLocation5::coordinate}{coordinates}, which we store inside the RouteDialog + available \l {coordinate}{coordinates}, which we store inside the RouteDialog component: - \snippet examples/declarative/mapviewer/mapviewer.qml routedialog0 - \snippet examples/declarative/mapviewer/mapviewer.qml routedialog1 + \snippet mapviewer/mapviewer.qml routedialog0 + \snippet mapviewer/mapviewer.qml routedialog1 In the next snippet, we show how to set up the request object and instruct the model to update. We also instruct the map to center on the start coordinate for our routing request. - \snippet examples/declarative/mapviewer/mapviewer.qml routerequest0 - \snippet examples/declarative/mapviewer/mapviewer.qml routerequest1 + \snippet mapviewer/mapviewer.qml routerequest0 + \snippet mapviewer/mapviewer.qml routerequest1 This is all that is required to display a Route on the Map. However, it is also useful to be able to retrieve the written directions and explanation @@ -183,11 +183,11 @@ \l {ListView} pair. The data in the \l {Models and Views in Qt Quick#ListModel}{ListModel} is built from the routeModel's output: - \snippet examples/declarative/mapviewer/content/map/MapComponent.qml routeinfomodel + \snippet mapviewer/content/map/MapComponent.qml routeinfomodel Inside the RouteModel, we add an \l{QtLocation5::RouteModel::status}{onStatusChanged} handler, which calls the \c{update()} function we defined on the model: - \snippet examples/declarative/mapviewer/content/map/MapComponent.qml routemodel1 + \snippet mapviewer/content/map/MapComponent.qml routemodel1 */ diff --git a/doc/src/examples/declarative-places.qdoc b/src/location/doc/src/examples/declarative-places.qdoc index 30848740..30848740 100644 --- a/doc/src/examples/declarative-places.qdoc +++ b/src/location/doc/src/examples/declarative-places.qdoc diff --git a/doc/src/examples/logfilepositionsource.qdoc b/src/location/doc/src/examples/logfilepositionsource.qdoc index 0e7ac773..0e7ac773 100644 --- a/doc/src/examples/logfilepositionsource.qdoc +++ b/src/location/doc/src/examples/logfilepositionsource.qdoc diff --git a/doc/src/examples/places-list.qdoc b/src/location/doc/src/examples/places-list.qdoc index bfabc8ac..79f17f25 100644 --- a/doc/src/examples/places-list.qdoc +++ b/src/location/doc/src/examples/places-list.qdoc @@ -36,14 +36,14 @@ To write a QML application that will show places in a list, we start by making the following import declarations. - \snippet examples/declarative/places_list/places_list.qml Imports + \snippet places_list/places_list.qml Imports Instantiate a \l Plugin instance. The \l Plugin is effectively the backend from where places are sourced from. Because the \c nokia plugin has been specified, some mandatory parameters need to be filled in, see the \l {Mandatory Parameters} {Nokia Plugin} documentation for details: - \snippet examples/declarative/places_list/places_list.qml Initialize Plugin + \snippet places_list/places_list.qml Initialize Plugin Next we instantiate a \l PlaceSearchModel which we can use to specify search parameters and perform a places search operation. For illustrative @@ -52,7 +52,7 @@ {PlaceSearchModel::update} {update()} would be invoked in response to a user action such as a button click. - \snippet examples/declarative/places_list/places_list.qml PlaceSearchModel + \snippet places_list/places_list.qml PlaceSearchModel Finally we instantiate a \l ListView to show the search results found by the model. An inline delegate has been used and we have assumed that @@ -61,5 +61,5 @@ the \e place \l {PlaceSearchModel Roles} {role}, other search result types may not have a \e place \l {PlaceSearchModel Roles} {role}. - \snippet examples/declarative/places_list/places_list.qml Places ListView + \snippet places_list/places_list.qml Places ListView */ diff --git a/doc/src/examples/places-map.qdoc b/src/location/doc/src/examples/places-map.qdoc index 04bec6a5..1f34597f 100644 --- a/doc/src/examples/places-map.qdoc +++ b/src/location/doc/src/examples/places-map.qdoc @@ -37,14 +37,14 @@ To write a QML application that will show places on a map, we start by making the following import declarations. - \snippet examples/declarative/places_map/places_map.qml Imports + \snippet places_map/places_map.qml Imports Instantiate a \l Plugin instance. The \l Plugin is effectively the backend from where places are sourced from. Because the \c nokia plugin has been specified, some mandatory parameters need to be filled in, see the \l {Mandatory Parameters} {Nokia Plugin} documentation for details: - \snippet examples/declarative/places_map/places_map.qml Initialize Plugin + \snippet places_map/places_map.qml Initialize Plugin Next we instantiate a \l PlaceSearchModel which we can use to specify search parameters and perform a places search operation. For illustrative @@ -53,7 +53,7 @@ {PlaceSearchModel::update} {update()} would be invoked in response to a user action such as a button click. - \snippet examples/declarative/places_map/places_map.qml PlaceSearchModel + \snippet places_map/places_map.qml PlaceSearchModel The map is displayed by using the \l Map type and inside we declare the \l MapItemView and supply the search model and a delegate. An inline delegate @@ -63,5 +63,5 @@ other search result types may not have a \e place \l {PlaceSearchModel Roles} {role}. - \snippet examples/declarative/places_map/places_map.qml Places MapItemView + \snippet places_map/places_map.qml Places MapItemView */ diff --git a/doc/src/examples/qtlocation-examples.qdoc b/src/location/doc/src/examples/qtlocation-examples.qdoc index 8a7fe532..8a7fe532 100644 --- a/doc/src/examples/qtlocation-examples.qdoc +++ b/src/location/doc/src/examples/qtlocation-examples.qdoc diff --git a/doc/src/examples/weatherinfo.qdoc b/src/location/doc/src/examples/weatherinfo.qdoc index 9ba7ee72..ad5ad5d5 100644 --- a/doc/src/examples/weatherinfo.qdoc +++ b/src/location/doc/src/examples/weatherinfo.qdoc @@ -48,21 +48,21 @@ information taken from the HTTP service. It is a simple data class, but we give it Q_PROPERTies to expose it nicely to QML, later. - \snippet examples/weatherinfo/appmodel.h 0 - \snippet examples/weatherinfo/appmodel.h 1 + \snippet weatherinfo/appmodel.h 0 + \snippet weatherinfo/appmodel.h 1 AppModel models the state of the entire application. At startup, the application first begins by waiting for network connectivity. We do this using the QNetworkConfigurationManager and QNetworkSession family of C++ APIs. - \snippet examples/weatherinfo/appmodel.cpp 0 - \snippet examples/weatherinfo/appmodel.cpp 1 + \snippet weatherinfo/appmodel.cpp 0 + \snippet weatherinfo/appmodel.cpp 1 Once the network session is open, we proceed to get the platform's default position source using QGeoPositionInfo::createDefaultSource() - \snippet examples/weatherinfo/appmodel.cpp 2 + \snippet weatherinfo/appmodel.cpp 2 If no default source is available, we take a static location and fetch weather for that. If, however, we do have a position source, we connect @@ -73,15 +73,15 @@ of the returned coordinate to retrieve the current "city" name for use in the weather lookup. - \snippet examples/weatherinfo/appmodel.cpp 3 + \snippet weatherinfo/appmodel.cpp 3 To inform the UI about this process, the cityChanged() signal is emitted when a new city is used, and the weatherChanged() signal whenever a weather update occurs. - \snippet examples/weatherinfo/appmodel.h 2 - \snippet examples/weatherinfo/appmodel.h 3 - \snippet examples/weatherinfo/appmodel.h 4 + \snippet weatherinfo/appmodel.h 2 + \snippet weatherinfo/appmodel.h 3 + \snippet weatherinfo/appmodel.h 4 We use a QQmlListProperty for the weather forecast information, which contains the next 4 days of forecast weather. This makes it @@ -91,19 +91,19 @@ function. We call this once for each type we wish to register, before loading the actual QML file. - \snippet examples/weatherinfo/main.cpp 0 - \snippet examples/weatherinfo/main.cpp 1 + \snippet weatherinfo/main.cpp 0 + \snippet weatherinfo/main.cpp 1 Finally, in the actual QML, we instantiate the AppModel. - \snippet examples/weatherinfo/weatherinfo.qml 0 - \snippet examples/weatherinfo/weatherinfo.qml 1 - \snippet examples/weatherinfo/weatherinfo.qml 2 + \snippet weatherinfo/weatherinfo.qml 0 + \snippet weatherinfo/weatherinfo.qml 1 + \snippet weatherinfo/weatherinfo.qml 2 Once instantiated like this, we can use its properties elsewhere in the QML document: - \snippet examples/weatherinfo/weatherinfo.qml 3 - \snippet examples/weatherinfo/weatherinfo.qml 4 + \snippet weatherinfo/weatherinfo.qml 3 + \snippet weatherinfo/weatherinfo.qml 4 */ diff --git a/doc/src/maps.qdoc b/src/location/doc/src/maps.qdoc index 31526cb5..99cc9bca 100644 --- a/doc/src/maps.qdoc +++ b/src/location/doc/src/maps.qdoc @@ -29,7 +29,6 @@ /*! \page location-maps-qml.html \title Maps and Navigation (QML) -\previouspage {Qt Location Module}{Qt Location} \brief Provides QtQuick user interfaces for displaying, navigating and interacting with maps, as well as geocoding and navigation. @@ -41,6 +40,8 @@ contains utilities for geocoding (finding a geographic coordinate from a street address) and navigation (including driving and walking directions). It builds upon the API concepts and types in the \l{Positioning (QML)}{QML Positioning API}. +A more hands-on introduction of the Maps and Navigation types can be found in the +\l {QML Maps}{Maps and Navigation tutorial}. \section1 Maps @@ -84,13 +85,13 @@ standard QtQuick item. \row \li \l{QtLocation5::MapRectangle}{MapRectangle} \li A rectangle whose top left and bottom right points are specified as - \l {QtLocation5::coordinate}{coordinate} types, optionally with a border. + \l {coordinate} types, optionally with a border. \row \li \l{QtLocation5::MapPolygon}{MapPolygon} - \li A polygon made of an arbitrary list of \l {QtLocation5::coordinate}{coordinates}. + \li A polygon made of an arbitrary list of \l {coordinate}{coordinates}. \row \li \l{QtLocation5::MapPolyline}{MapPolyline} - \li A polyline made of an arbitrary list of \l {QtLocation5::coordinate}{coordinates}. + \li A polyline made of an arbitrary list of \l {coordinate}{coordinates}. \row \li \l{QtLocation5::MapQuickItem}{MapQuickItem} \li Turns any arbitrary QtQuick Item into a map overlay object. MapQuickItem is an enabler for specifying custom map overlay objects. @@ -148,7 +149,7 @@ A geocoding query in QML is performed using the query, its \c{query} property may be set to either an \l{QtLocation5::Address}{Address} object or a string containing the textual form of the address to search for. To perform the reverse, the same property -can be set to a \l {QtLocation5::coordinate}{coordinate} instead. Results are made available in the +can be set to a \l {coordinate} instead. Results are made available in the contents of the model. \b{Key Types} @@ -205,7 +206,6 @@ between the segments. /*! \page location-maps-cpp.html \title Maps and Navigation (C++) -\previouspage {Qt Location Module}{Qt Location} \brief Provides C++ classes for Geocoding and Navigation. diff --git a/doc/src/place-caveats.qdocinc b/src/location/doc/src/place-caveats.qdocinc index ce766338..ce766338 100644 --- a/doc/src/place-caveats.qdocinc +++ b/src/location/doc/src/place-caveats.qdocinc diff --git a/doc/src/place-crossref.qdocinc b/src/location/doc/src/place-crossref.qdocinc index 4d9639f1..4d9639f1 100644 --- a/doc/src/place-crossref.qdocinc +++ b/src/location/doc/src/place-crossref.qdocinc diff --git a/doc/src/place-definition.qdocinc b/src/location/doc/src/place-definition.qdocinc index d9bcc6b7..d9bcc6b7 100644 --- a/doc/src/place-definition.qdocinc +++ b/src/location/doc/src/place-definition.qdocinc diff --git a/doc/src/places.qdoc b/src/location/doc/src/places.qdoc index 5d688747..62a6d0d5 100644 --- a/doc/src/places.qdoc +++ b/src/location/doc/src/places.qdoc @@ -28,7 +28,6 @@ /*! \page location-places-qml.html \title QML Places API - \previouspage {Qt Location 5.x} \section1 Overview @@ -51,7 +50,7 @@ {PluginParameter} {parameters} and nuances of each \l Plugin, see the \l {Plugin references and parameters}{Plugin References}. - \snippet examples/declarative/places_list/places_list.qml Initialize Plugin + \snippet places_list/places_list.qml Initialize Plugin \note The Nokia plugin must be supplied with some mandatory parameters as outlined in the \l {Mandatory Parameters} {Nokia Plugin} documentation. @@ -99,7 +98,7 @@ transitions into the \c Loading state and when successfully completed moves into the \c Ready state. - \snippet examples/declarative/places_list/places_list.qml PlaceSearchModel + \snippet places_list/places_list.qml PlaceSearchModel \section2 Display Search Results using a ListView A \l ListView can be used to show the search results found by the model. @@ -124,7 +123,7 @@ \table \row \li - \snippet examples/declarative/places_list/places_list.qml Places ListView + \snippet places_list/places_list.qml Places ListView \li \inlineimage places-list.png \endtable @@ -154,7 +153,7 @@ \table \row \li - \snippet examples/declarative/places_map/places_map.qml Places MapItemView + \snippet places_map/places_map.qml Places MapItemView \li \inlineimage places-map.jpg \endtable @@ -173,7 +172,7 @@ have been fetched or not. If not, the Place::getDetails() method can be invoked to fetch the remaining details. - \snippet snippets/declarative/places.qml Place fetchDetails + \snippet declarative/places.qml Place fetchDetails \section2 Saving and Removing Places Some backends may support saving and removing places. This can be done by @@ -184,9 +183,9 @@ successful completion will move to the \c Ready state. The following snippet shows how to save and remove a place using javascript. - \snippet snippets/declarative/places.qml Place createAndSavePlace + \snippet declarative/places.qml Place createAndSavePlace \codeline - \snippet snippets/declarative/places.qml Place removePlace + \snippet declarative/places.qml Place removePlace \section2 Learn More The above snippets only exhibit a small subset of Places functionality. @@ -206,7 +205,6 @@ /*! \page location-places-cpp.html \title Places (C++) - \previouspage {Qt Location Module}{Qt Location} \section1 Overview @@ -225,21 +223,21 @@ All places functionality is facilitated by a QPlaceManager instance. One must specify a QGeoServiceProvider in order to create the QPlaceManager - \snippet snippets/places/requesthandler.h Initialize Manager + \snippet places/requesthandler.h Initialize Manager \section2 Discovery/Search In order to perform a search operation we simply create a QPlaceSearchRequest and set the desired search parameters, such as a search term and search center. - \snippet snippets/places/requesthandler.h Search for places cpp + \snippet places/requesthandler.h Search for places cpp The request is an asynchronous operation so we need a slot to handle the completion of the request. In the handler we check that there are no errors and that our search result type is a place. If so we can then retrieve some of the core details of the place. At the end of the slot, we delete the reply since they are for single use only. - \snippet snippets/places/requesthandler.h Search for places handler cpp + \snippet places/requesthandler.h Search for places handler cpp \b {Note:} Depending upon the plugin backend that was chosen, the search results may contain places which have further details that can be fetched on a place by place basis. To fetch these other details @@ -251,24 +249,24 @@ \section3 Paging If the plugin supports paging, limit and offset parameters may be provided to the search request. - \snippet snippets/places/requesthandler.h Search paging + \snippet places/requesthandler.h Search paging \section2 Fetching Place Details A place that has been returned from a search request may have more details that can be fetched. The following demonstrates how to check if there are further details and if so how to request them. - \snippet snippets/places/requesthandler.h Details check + \snippet places/requesthandler.h Details check \dots \dots - \snippet snippets/places/requesthandler.h Details handler cpp + \snippet places/requesthandler.h Details handler cpp \section2 Fetching Rich Content Rich content such as images and reviews is retrieved through the manager and then if required assigned to a place. - \snippet snippets/places/requesthandler.h Image request + \snippet places/requesthandler.h Image request We can handle the content request as shown below. - \snippet snippets/places/requesthandler.h Image handler + \snippet places/requesthandler.h Image handler It is important to note that the results in the QPlaceContentReply, is a QPlaceContent::Collection which is essentially a QMap<int, QPlaceContent>. The key \c {int} in this case is the @@ -286,21 +284,21 @@ is used just like a place search, the only difference being that the search term is set to a partially completed string. - \snippet snippets/places/requesthandler.h Suggestion request + \snippet places/requesthandler.h Suggestion request And when the request is done, we can use the reply to show the suggestions. - \snippet snippets/places/requesthandler.h Suggestion handler + \snippet places/requesthandler.h Suggestion handler \target Saving a place cpp \section2 Saving a Place The saving of a new place is performed as follows, we create a QPlace instance and populate it with information such as a name, address and coordinate. Once done we can invoke QPlaceManager::savePlace() to begin a save operation. - \snippet snippets/places/requesthandler.h Save place pt1 + \snippet places/requesthandler.h Save place pt1 \dots - \snippet snippets/places/requesthandler.h Save place pt2 + \snippet places/requesthandler.h Save place pt2 Once a place is saved the reply contains the new identifier for that place. - \snippet snippets/places/requesthandler.h Save place handler + \snippet places/requesthandler.h Save place handler Note that to save an already \e existing place, the QPlace::placeId() must be filled in with the correct identifier. Otherwise a new place will be created if empty or the @@ -311,7 +309,7 @@ from a web service will typically not emit these signals while managers accessing places locally stored generally will. \section3 Caveats - \include place-caveats.qdocinc + \input place-caveats.qdocinc \section3 Saving Between Managers When saving places between managers, there are a few things to be aware of. @@ -325,15 +323,15 @@ copy is now suitable for saving into the manager. If the manager supports matching by alternative identifiers, an alternative identifier attribute is assigned to the copy (see \l {Matching places between managers}) - \snippet snippets/places/requesthandler.h Save to different manager + \snippet places/requesthandler.h Save to different manager \target Removing a place cpp \section2 Removing a Place The removal of a place is performed as follows: - \snippet snippets/places/requesthandler.h Remove place + \snippet places/requesthandler.h Remove place \dots \dots - \snippet snippets/places/requesthandler.h Remove place handler + \snippet places/requesthandler.h Remove place handler When a place is removed, the QPlaceManager may emit the QPlaceManager::placeRemoved() signal. Whether a manager does so is provider specific. Managers accessing places from a web service will typically not emit @@ -345,10 +343,10 @@ 'restaurant'. A place could be described by many categories, it could be a park and a music venue and a ferry or bus stop. To use categories they must first be initialized. - \snippet snippets/places/requesthandler.h Initialize categories + \snippet places/requesthandler.h Initialize categories \dots \dots - \snippet snippets/places/requesthandler.h Initialize categories reply + \snippet places/requesthandler.h Initialize categories reply After the categories have been initialized we can then use these category functions. \list @@ -362,18 +360,18 @@ we use the QPlaceManager::childCategories() function but do not provide a category identifier. - \snippet snippets/places/requesthandler.h Top level categories + \snippet places/requesthandler.h Top level categories If we did provide an identifier then we could retrieve a category's children. - \snippet snippets/places/requesthandler.h Child categories + \snippet places/requesthandler.h Child categories \section2 Saving a Category The following shows how to save a category - \snippet snippets/places/requesthandler.h Save category + \snippet places/requesthandler.h Save category \dots \dots - \snippet snippets/places/requesthandler.h Save category handler + \snippet places/requesthandler.h Save category handler When a category is saved, the QPlaceManager may emit QPlaceManager::categoryAdded() or QPlaceManager::categoryUpdated() signals. However whether a manager does so or not is provider specific, managers accessing places @@ -382,10 +380,10 @@ \section2 Removing a Category Category removal is very similar to removing a place - \snippet snippets/places/requesthandler.h Remove category + \snippet places/requesthandler.h Remove category \dots \dots - \snippet snippets/places/requesthandler.h Remove category handler + \snippet places/requesthandler.h Remove category handler When a category is removed, the QPlaceManager may emit the QPlaceManager::categoryRemoved() signal. Whether a manager does so is provider specific. Managers accessing places from a web service will typically not emit @@ -404,7 +402,7 @@ as part of the saving process an alternative identifier attribute, x_id_nokia, is set for the place saved into the destination manager (when QPlaceManager::compatiblePlace() is called) - \include place-crossref.qdocinc + \input place-crossref.qdocinc In order to perform the matching, we create a QPlaceMatchRequest and assign it the search results from the origin manager. The QPlaceMatchRequest will be used on the destination manager to return corresponding places. We also specify @@ -412,10 +410,10 @@ the key is QPlaceMatchRequest::AlternativeId to indicate we are matching by alternative id, the value in this case would be x_id_nokia which specifies which alternative identifier attribute we are using to do the matching. - \snippet snippets/places/requesthandler.h Match places + \snippet places/requesthandler.h Match places \dots \dots - \snippet snippets/places/requesthandler.h Match places handler + \snippet places/requesthandler.h Match places handler \section1 Classes in Places diff --git a/doc/src/plugins/nokia.qdoc b/src/location/doc/src/plugins/nokia.qdoc index 7c2db0b3..f3a8f58d 100644 --- a/doc/src/plugins/nokia.qdoc +++ b/src/location/doc/src/plugins/nokia.qdoc @@ -28,7 +28,6 @@ /*! \page location-plugin-nokia.html \title Qt Location Nokia Plugin -\previouspage {Qt Location Module} \ingroup QtLocation-plugins \brief Uses the relevant Nokia services provided by Nokia. diff --git a/doc/src/plugins/nokia_terms.qdoc b/src/location/doc/src/plugins/nokia_terms.qdoc index c10bbbf0..c10bbbf0 100644 --- a/doc/src/plugins/nokia_terms.qdoc +++ b/src/location/doc/src/plugins/nokia_terms.qdoc diff --git a/doc/src/plugins/osm.qdoc b/src/location/doc/src/plugins/osm.qdoc index eeab30f5..752454d4 100644 --- a/doc/src/plugins/osm.qdoc +++ b/src/location/doc/src/plugins/osm.qdoc @@ -28,7 +28,6 @@ /*! \page location-plugin-osm.html \title Qt Location Open Street Map Plugin -\previouspage {Qt Location Module} \ingroup QtLocation-plugins \brief Uses Open Street Map and related services. diff --git a/doc/src/plugins/places-backend.qdoc b/src/location/doc/src/plugins/places-backend.qdoc index 409736d6..dd7d68f9 100644 --- a/doc/src/plugins/places-backend.qdoc +++ b/src/location/doc/src/plugins/places-backend.qdoc @@ -28,7 +28,6 @@ /*! \page location-places-backend.html \title Places Backend -\previouspage {Qt Location Module} \brief The Places backend is responsible for managing a places datastore whether it is located remotely or locally @@ -50,16 +49,16 @@ through the event loop. \section1 Implementing/Inheriting Reply Objects A reply object would be inherited as follows: -\snippet snippets/places/requesthandler.h Implement reply pt1 +\snippet places/requesthandler.h Implement reply pt1 \dots -\snippet snippets/places/requesthandler.h Implement reply pt2 +\snippet places/requesthandler.h Implement reply pt2 The implementation of a QPlaceManagerEngine must ensure that any signals emitted by the reply objects are delayed until the request functions have returned and the application code has a chance to connect those signals to slots. The typical approach is to use \l {QMetaObject::invokeMethod()} with a \l {Qt::QueuedConnection} to emit the signals. -\snippet snippets/places/requesthandler.h Trigger done +\snippet places/requesthandler.h Trigger done Note that the \c finished signals should always be emitted when a reply is complete, even if an error has been encountered, that is, if there is an error, both the \c error and \c finished signals diff --git a/doc/src/position.qdoc b/src/location/doc/src/position.qdoc index e289b491..75f54c31 100644 --- a/doc/src/position.qdoc +++ b/src/location/doc/src/position.qdoc @@ -29,7 +29,6 @@ \page location-positioning-cpp.html \title Positioning (C++) -\previouspage {index-qtlocation-module.html}{Qt Location} \brief The Location Positioning API enables location positioning by means of GPS or an NMEA data source. diff --git a/doc/src/qml-maps.qdoc b/src/location/doc/src/qml-maps.qdoc index 24c1c134..45cf82f4 100644 --- a/doc/src/qml-maps.qdoc +++ b/src/location/doc/src/qml-maps.qdoc @@ -35,7 +35,6 @@ /*! \page qml-location5-maps.html \title QML Maps -\previouspage {index-qtlocation-module.html}{Qt Location Module} \brief Maps deals with maps, their contents and navigation. @@ -48,7 +47,7 @@ Map item you can center the map, zoom, pinch and make the item flickable. The places to be added to the map are \l {Maps and Navigation (QML)#Putting Objects on a Map (Map Overlay Objects)}{MapItems}. The item's -position is defined by a \l {QtLocation5::coordinate}{coordinate} which includes latitude, +position is defined by a \l {coordinate}{coordinate} which includes latitude, longitude and altitude. The item is then displayed automatically after it is added to the Map. Interaction with the added items, and the \l Map itself, is handled by \l MapMouseArea when items are added as children of the @@ -56,10 +55,10 @@ are added as children of the \section2 Position -The basic piece of position information is the \l {QtLocation5::coordinate}{coordinate}. A +The basic piece of position information is the \l {coordinate}. A coordinate encapsulates data for the latitude, longitude and altitude of the location. Altitude is in meters. It also has a method to determine distance to another -\l {QtLocation5::coordinate}{coordinate}. The \l {QtLocation5::coordinate}{coordinate} type may +\l {coordinate}. The \l {coordinate} type may also be held within a \l {QtLocation5::Location}{Location} element, this will also have information on a bounding box size to determine sufficient proximity to the location and a location address. @@ -79,18 +78,18 @@ In the snippet we see that the \c geocodeModel property contains the plugin and two signal handlers. One for changes in status (\c onStatusChanged ) and the other to update the centering of the Map object (\c onLocationsChanged ). -\snippet examples/declarative/mapviewer/content/map/MapComponent.qml geocodemodel0 -\snippet examples/declarative/mapviewer/content/map/MapComponent.qml geocodemodel0 body -\snippet examples/declarative/mapviewer/content/map/MapComponent.qml geocodemodel1 +\snippet mapviewer/content/map/MapComponent.qml geocodemodel0 +\snippet mapviewer/content/map/MapComponent.qml geocodemodel0 body +\snippet mapviewer/content/map/MapComponent.qml geocodemodel1 \codeline -\snippet examples/declarative/mapviewer/content/map/MapComponent.qml geocodeview +\snippet mapviewer/content/map/MapComponent.qml geocodeview These geocoding features are called from a higher level piece of code. In this snippet we see an \c onGoButtonClicked signal handler that extracts the address from the user interface and then creates a query for the \l GeocodeModel to process and determine the geographical coordinates. -\snippet examples/declarative/mapviewer/mapviewer.qml geocode1 +\snippet mapviewer/mapviewer.qml geocode1 \section2 Navigation @@ -145,12 +144,12 @@ by some user input, and used in \c routeModel as the query. The \c routeInfoMode is a \l {Models and Views in Qt Quick#ListModel}{ListModel} that can be updated using an \c update() function that we will look at later. -\snippet examples/declarative/mapviewer/content/map/MapComponent.qml routemodel0 +\snippet mapviewer/content/map/MapComponent.qml routemodel0 \codeline -\snippet examples/declarative/mapviewer/content/map/MapComponent.qml routemodel1 +\snippet mapviewer/content/map/MapComponent.qml routemodel1 \codeline -\snippet examples/declarative/mapviewer/content/map/MapComponent.qml routemodel2 -\snippet examples/declarative/mapviewer/content/map/MapComponent.qml routemodel3 +\snippet mapviewer/content/map/MapComponent.qml routemodel2 +\snippet mapviewer/content/map/MapComponent.qml routemodel3 The user enters, via a dialog, some information such as the starting point of the route, some waypoints and the destination. All of these locations are @@ -158,12 +157,12 @@ waypoints so the locations from start to finish will be entered as a sequence of waypoints. Then other query properties can be set that may be specific to this trip. -\snippet examples/declarative/mapviewer/mapviewer.qml routerequest0 +\snippet mapviewer/mapviewer.qml routerequest0 \codeline -\snippet examples/declarative/mapviewer/mapviewer.qml routerequest0 feature weight +\snippet mapviewer/mapviewer.qml routerequest0 feature weight \codeline -\snippet examples/declarative/mapviewer/mapviewer.qml routerequest1 -\snippet examples/declarative/mapviewer/mapviewer.qml routedialog1 +\snippet mapviewer/mapviewer.qml routerequest1 +\snippet mapviewer/mapviewer.qml routedialog1 The \c routeInfoModel \l {Models and Views in Qt Quick#ListModel}{ListModel} is used to grab the results of the query and construct a suitable list for display. The @@ -171,9 +170,9 @@ results of the query and construct a suitable list for display. The function that loops through the segments extracting the segment length, instruction text and distance to the next instruction. The extracted data is formatted for display as it is retrieved. -\snippet examples/declarative/mapviewer/content/map/MapComponent.qml routeinfomodel +\snippet mapviewer/content/map/MapComponent.qml routeinfomodel \codeline -\snippet examples/declarative/mapviewer/content/map/MapComponent.qml routeview +\snippet mapviewer/content/map/MapComponent.qml routeview For more information on the example see the \l {Map Viewer (QML)}{Map Viewer (QML)} example. @@ -186,8 +185,8 @@ pinching to zoom. Enabling and configuring pinch and flickable is easy within the \l Map type. -\snippet examples/declarative/mapviewer/content/map/MapComponent.qml top -\snippet examples/declarative/mapviewer/content/map/MapComponent.qml end +\snippet mapviewer/content/map/MapComponent.qml top +\snippet mapviewer/content/map/MapComponent.qml end Zoom can also be controlled by other objects like sliders, as shown in the example, by implementing the \c onValueChanged handler to update the Map diff --git a/doc/src/qml-position.qdoc b/src/location/doc/src/qml-position.qdoc index aee049f7..9553f6d2 100644 --- a/doc/src/qml-position.qdoc +++ b/src/location/doc/src/qml-position.qdoc @@ -29,7 +29,6 @@ \page location-positioning-qml.html \title Positioning (QML) -\previouspage {index-qtlocation-module.html}{Qt Location} \brief The Location Positioning API enables location positioning by means of GPS or an NMEA data source. @@ -47,6 +46,9 @@ surface \unicode {0x2014} as provided by a latitude-longitude coordinate \li The bearing of the device in degrees, relative to true north \endlist +For more information see +\l {http://en.wikipedia.org/wiki/Geographic_coordinate}{Geographic Coordinate}. + This data can be extracted through a variety of methods. One of the most well known methods of positioning is GPS (Global Positioning System), a publicly available system that uses radiowave signals received from @@ -59,6 +61,43 @@ location data source within the API is that it provides a latitude-longitude coordinate with a date/time value, with the option of providing the other attributes listed above. +\section2 Coordinate + +The \l {coordinate} is a basic unit of geographical information. The +\l {coordinate} type has attributes to hold the \c {latitude}, +\c longitude and \c altitude. + +\section2 Position + +The three dimensional position of an object such as a mobile device can be specified by giving +the latitude, longitude and altitude. That is the values held in the +l\ {coordinate} type. Additionally for computation of future +positions we would like to know if the object is moving, what \l {Position::speed}{speed} it is +doing and what is the \l {Position::timestamp}{timestamp} of the last position data. Position +therefore includes values for the \l {Position::coordinate}{coordinate}, +\l {Position::speed}{speed} and a \l {Position::timestamp}{timestamp}. \l Position also takes +responsibility for validation of sensible values for these properties. These are exposed as +the \l {Position::latitudeValid}{latitudeValid}, \l {Position::longitudeValid}{longitudeValid}, +\l {Position::altitudeValid}{altitudeValid}, \l {Position::speedValid}{speedValid}, +\l {Position::horizontalAccuracyValid}{horizontalAccuracyValid}, and +\l {Position::verticalAccuracyValid}{verticalAccuracyValid} properties. + + +\section2 PositionSource + +We have a Position type, a \l {coordinate} type but where does the data come from? +Also it is a good idea to be able to indicate alternative sources. +Perhaps instead of directly picking up GPS satellites it might be desirable to do +some testing using a datafile. + +The \l PositionSource type provides the developer with control, +within the limits allowed by the platform, of the source of the +geographical data. Apart from tradtional sources such as GPS and cell data the positional data can be +sourced from a logfile which is in NMEA format. + +\l {http://en.wikipedia.org/wiki/NMEA}{NMEA} is a common text-based protocol for specifying navigational data. For convenience, the \l {PositionSource::nmeaSource}{nmeaSource} property is provided to enable QML applications to read NMEA data from a log file, the source will emit updates according to the time stamp of each NMEA sentence to produce a "replay" of the recorded data. + + \section2 Example: Centering the Map on the Current Position Here is an example of a client that uses a \l{PositionSource}{position source} diff --git a/doc/src/qtlocation-cpp.qdoc b/src/location/doc/src/qtlocation-cpp.qdoc index a72816fe..c13360b5 100644 --- a/doc/src/qtlocation-cpp.qdoc +++ b/src/location/doc/src/qtlocation-cpp.qdoc @@ -29,7 +29,6 @@ \page qtlocation-cpp.html \title Qt Location C++ API \brief Information about the Qt Location C++ API -\previouspage {Qt Location Module} The Location API provides a library for location positioning, mapping and navigation. diff --git a/doc/src/qtlocation-geoservices.qdoc b/src/location/doc/src/qtlocation-geoservices.qdoc index 7adb9b18..7adb9b18 100644 --- a/doc/src/qtlocation-geoservices.qdoc +++ b/src/location/doc/src/qtlocation-geoservices.qdoc diff --git a/src/location/doc/src/qtlocation-qml.qdoc b/src/location/doc/src/qtlocation-qml.qdoc new file mode 100644 index 00000000..351552de --- /dev/null +++ b/src/location/doc/src/qtlocation-qml.qdoc @@ -0,0 +1,143 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \qmlmodule QtLocation 5.0 + \title Qt Location QML Types + \ingroup qmlmodules + \brief Provides QML types for mapping and location information + +\section1 Overview + +The identifying string for this module is \e QtLocation. To use include the following import +statement in the QML file. + +\snippet declarative/plugin.qml Plugin import + +\section2 Location QML Concepts + +Position information can come from a variety of sources including satellites, +wifi, text files and so on. The position is described by the latitude, +the longitude, and the altitude in meters. For more information see +\l {http://en.wikipedia.org/wiki/Geographic_coordinate}{Geographic Coordinate}. + +The QML position is stored in a \l {coordinate} which contains the +latitude, longitude and altitude of the device. The \l {QtLocation5::Location}{Location} contains +this \l {coordinate} and adds an address, it also has a bounding box which +defines the recommended viewing region when displaying the location. + +Now that the device has a position, with regular updates the API can determine +the speed and heading of the device. It can also define a box or a circle that can +produce a notification when the device either leaves or enters that region. + +Adding a \l {QtLocation5::Map}{Map} with positions of interest and +\l {QtLocation5::Place}{Places}, then the device can be made aware of nearby features and related +information, displayed graphically. Features on the \l Map may be places of business, entertainment +and so on. They may include paths, roads, or forms of transport leading so that +navigation optimization and assistance are possible. + +To perform navigation we need \l {Route}s from start to destination. These routes +are made up of segments. Each \l {QtLocation5::RouteSegment}{RouteSegment} +can be considered a navigation sub-task: drive 100 meters, turn left. The beginning and +end of each segment is a \e waypoint, that is, one part of our journey. + +A typical use case for the API is a user looking for a particular type of +place, say a restaurant. The user could enter a search string into the map +application and respond to a list or display of results for restaurants +"near" the device. The application could then be used to navigate to the +restaurant using an optimized route that is aware of features in the +environment that can help or hinder the journey. The navigation then +proceeds with the user's progress monitored by means of the current +\l Location. In the context of this API the map application would be aware +of the location and size of various places and the location of the user. +Plugins would supply the data used by the application to determine routes and +navigation instructions. The \l Place types would hold information about the +destination and surrounding objects including displayable representations. +The \l Map type would enable this information to be displayed, panned, +zoomed and so on. The \l Route would be determined by a plugin with each +\l RouteSegment holding the navigation instructions guided by the updated +current \l Location. + +\l {Plugin}s are a means of specifying which Location based service to use. For example, +a plugin may allow connection to a provider's service that handles geocoding and routing +that the API and application can use. There may be various GeoServices plugins for various tasks +with some plugins providing more than one service. One QML \l Plugin should be created +for each required GeoService plugin. Plugins are required for maps, routing and geocoding, +however the default plugin handles all three of these services. A plugin may +require online access or may support on-board maps and data. The default "nokia" +plugin only supports online use. The connection would be managed by QNetworkInfo and +QNetworkConfigurationManager. + +\note: Plugins may not provide various features such as paging or relevance hints. +Since plugins may be supplied by other providers, support for these aspects is +dependent on the provider's implementation. + +The following table provides links to more detailed information on sections of the Qt Location QML +API. + +\table + \row + \li \l {Positioning (QML)}{Location Positioning} + \li Retrieving information about the current position. + \row + \li \l {Maps and Navigation (QML)}{Maps and Navigation} + \li Displaying maps and finding routes. + \row + \li \l {QML PLaces API} {Places} + \li Searching for and managing points of interest. +\endtable + +\section1 Basic Types + +\annotatedlist qml-QtLocation5-basictypes + +\section1 Common QML Types + +\annotatedlist qml-QtLocation5-common + +\section1 Positioning QML Types + +\annotatedlist qml-QtLocation5-positioning + +\section1 Maps QML Types + +\annotatedlist qml-QtLocation5-maps + +\section1 Navigation and Routing QML Types + +\annotatedlist qml-QtLocation5-routing + +\section1 Geocoding QML Types + +\annotatedlist qml-QtLocation5-geocoding + +\section1 Places QML Types + +\annotatedlist qml-QtLocation5-places + +\section1 Alphabetical Listing of all QML Types +*/ diff --git a/doc/src/qtlocation.qdoc b/src/location/doc/src/qtlocation.qdoc index f30e308d..31ed3055 100644 --- a/doc/src/qtlocation.qdoc +++ b/src/location/doc/src/qtlocation.qdoc @@ -30,7 +30,7 @@ /*! \module QtLocation - \title Qt Location Module + \title Qt Location C++ Classes \ingroup modules \brief Location module provides positioning, mapping, navigation, and place search @@ -61,7 +61,7 @@ /*! -\page index-qtlocation-module.html +\page qtlocation-index.html \title Qt Location \brief The Qt Location API provides positioning, mapping, navigation, and place search via QML and C++ interfaces. @@ -101,66 +101,6 @@ The .pro file should have the \e location keyword added QT += location \endcode -\section2 Location QML Concepts - -Position information can come from a variety of sources including satellites, -wifi, text files and so on. The position is described by the usual latitude, -longitude, and the altitude in meters. For more information see -\l {http://en.wikipedia.org/wiki/Geographic_coordinate}{Geographic Coordinate}. - -The QML position is stored in a \l {QtLocation5::coordinate}{coordinate} which contains the -latitude, longitude and altitude of the device. The \l {QtLocation5::Location}{Location} contains -this \l {QtLocation5::coordinate}{coordinate} and adds an address, it also has a bounding box which -defines the recommended viewing region when displaying the location. - -Now that the device has a position, with regular updates the API can determine -the speed and heading of the device. It can also define a box or a circle that can -produce a notification when the device either leaves or enters that region. - -Adding a \l {QtLocation5::Map}{Map} with positions of interest and -\l {QtLocation5::Place}{Places}, then the device can be made aware of nearby features and related -information, displayed graphically. Features on the \l Map may be places of business, entertainment -and so on. They may include paths, roads, or forms of transport leading so that -navigation optimization and assistance are possible. - -To perform navigation we need \l {Route}s from start to destination. These routes -are made up of segments. Each \l {QtLocation5::RouteSegment}{RouteSegment} -can be considered a navigation sub-task: drive 100 meters, turn left. The beginning and -end of each segment is a \e waypoint, that is, one part of our journey. - -A typical use case for the API is a user looking for a particular type of -place, say a restaurant. The user could enter a search string into the map -application and respond to a list or display of results for restaurants -"near" the device. The application could then be used to navigate to the -restaurant using an optimized route that is aware of features in the -environment that can help or hinder the journey. The navigation then -proceeds with the user's progress monitored by means of the current -\l Location. In the context of this API the map application would be aware -of the location and size of various places and the location of the user. -Plugins would supply the data used by the application to determine routes and -navigation instructions. The \l Place types would hold information about the -destination and surrounding objects including displayable representations. -The \l Map type would enable this information to be displayed, panned, -zoomed and so on. The \l Route would be determined by a plugin with each -\l RouteSegment holding the navigation instructions guided by the updated -current \l Location. - -\l {Plugin}s are a means of specifying which Location based service to use. For example, -a plugin may allow connection to a provider's service that handles geocoding and routing -that the API and application can use. There may be various GeoServices plugins for various tasks -with some plugins providing more than one service. One QML \l Plugin should be created -for each required GeoService plugin. Plugins are required for maps, routing and geocoding, -however the default plugin handles all three of these services. A plugin may -require online access or may support on-board maps and data. The default "nokia" -plugin only supports online use. The connection would be managed by QNetworkInfo and -QNetworkConfigurationManager. - -\note: Plugins may not provide various features such as paging or relevance hints. -Since plugins may be supplied by other providers, support for these aspects is -dependent on the provider's implementation. - - - \section2 API Sub-Modules The API is split into three core sub-modules, which each have QML and C++ APIs. @@ -174,7 +114,7 @@ such as speed and direction. This provides the fundamental location information \row \li Positioning introduction: \li \l{Positioning (QML)}{for QML} - \li \l{Qt Location C++ API}{for C++} + \li \l{Positioning (C++)}{for C++} \endtable \section3 Places @@ -213,14 +153,20 @@ example applications to demonstrate their usage. \table \row - \li \l {Qt Location 5.x}{QML API Reference} + \li \l {Qt Location QML Types}{QML API Reference} \li Full list of QML components in the Qt Location API \row - \li \l {Qt Location C++ API}{C++ API Reference} - \li Full list of C++ classes and methods in the Qt Location API + \li \l {Qt Location C++ API}{C++ API Reference by domain} + \li Full list of C++ classes and methods of the Qt Location APIs sorted by domain + \row + \li \l {Qt Location C++ Classes}{C++ API Reference} + \li Full list of C++ classes and methods of the Qt Location APIs \row \li \l {Qt Location Examples}{Example Apps} \li Examples demonstrating use of the Qt Location APIs + \row + \li \l {QML Maps}{Maps and Navigation Tutorial} + \li Tutorial introducing the QML Maps Types \endtable \section1 Plugin References and Parameters @@ -248,7 +194,7 @@ Qt Location available for a new platform. In Qt 4 Qt Mobility provided some location functionality for Positioning and Maps with Landmarks support. The new Qt Location API has had an extensive reworking -of \l {Map}s and \l Places (formerly Landmarks). Also both C++ and QML APIs have +of \l {Map}s and \l {Place}s (formerly Landmarks). Also both C++ and QML APIs have been reworked to be simpler to use. New features of Qt Location includes @@ -256,15 +202,15 @@ New features of Qt Location includes \li Maps are now part of the Qt Quick scenegraph, and rendered using hardware-accelerated OpenGL \li Arbitrary Qt Quick items on the map are supported using \l MapQuickItem \li Now possible to create map overlays with a model - \li Built-in support for pinch-to-zoom gestures (\l MapPinchArea), flicking (\l MapFlickable), and panning + \li Built-in support for pinch-to-zoom gestures, flicking , and panning (see \l MapGestureArea) \li Vast performance improvements over Qt Mobility 1.2, especially for large map polylines and objects in general \li Full QML API now available for routing and geocoding -- compatible with standard QML model-view design \li Service provider feature detection without having to open all the available plugins - \li Unified "Plugin" QML type used by routing/geocoding/maps etc with easy-to-set PluginParameters + \li Unified \l Plugin QML type used by routing/geocoding/maps etc with easy-to-set \l PluginParameter \li Two plugins are supplied with Qt (a Nokia and an OSM plugin for GeoServices). \li Landmarks API is replaced by the Places API - \li \l Places supports viewing of richer content such as reviews, images, and editorials - \li \l Places supports locale handling, sponsored search results, and supplier attribution + \li \l Place supports viewing of richer content such as reviews, images, and editorials + \li \l Place supports locale handling, sponsored search results, and supplier attribution \endlist */ diff --git a/doc/src/src.pro b/src/location/doc/src/src.pro index fe90f135..fe90f135 100644 --- a/doc/src/src.pro +++ b/src/location/doc/src/src.pro diff --git a/src/location/location.pro b/src/location/location.pro index 5b38ccfa..f36fd8ff 100644 --- a/src/location/location.pro +++ b/src/location/location.pro @@ -1,14 +1,9 @@ TARGET = QtLocation QT = core-private -HEADERS += qgeopositioninfosource_p.h -qtHaveModule(3d): include(maps/maps.pri) -include(places/places.pri) - -QMAKE_DOCS = $$PWD/../../doc/config/qtlocation.qdocconf - -load(qt_module) +QMAKE_DOCS = $$PWD/doc/qtlocation.qdocconf +OTHER_FILES += doc/src/*.qdoc # show .qdoc files in Qt Creator PUBLIC_HEADERS += \ qgeoaddress.h \ @@ -36,10 +31,8 @@ PRIVATE_HEADERS += \ qlocationutils_p.h \ qnmeapositioninfosource_p.h \ qgeoareamonitor_polling_p.h \ - qgeocoordinate_p.h - - -HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS + qgeocoordinate_p.h \ + qgeopositioninfosource_p.h SOURCES += \ qgeoaddress.cpp \ @@ -58,3 +51,10 @@ SOURCES += \ qgeoareamonitor_polling.cpp \ qgeopositioninfosourcefactory.cpp \ qlocation.cpp + +qtHaveModule(3d): include(maps/maps.pri) +include(places/places.pri) + +HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS + +load(qt_module) diff --git a/src/location/places/qplace.cpp b/src/location/places/qplace.cpp index 4a9e1d11..63aa6f34 100644 --- a/src/location/places/qplace.cpp +++ b/src/location/places/qplace.cpp @@ -59,14 +59,14 @@ QT_BEGIN_NAMESPACE \brief The QPlace class represents a set of data about a place. - \include place-definition.qdocinc + \input place-definition.qdocinc \section2 Contact Information The contact information of a place is based around a common set of \l {Contact Types}{contact types}. To retrieve all the phone numbers of a place, one would do: - \snippet snippets/places/requesthandler.h Phone numbers + \snippet places/requesthandler.h Phone numbers The contact types are string values by design to allow for providers to introduce new contact types. @@ -85,7 +85,7 @@ QT_BEGIN_NAMESPACE Similar to contacts attributes are based around a common set of \l {Attribute Types}{attribute types}. To retrieve an extended attribute one would do: - \snippet snippets/places/requesthandler.h Opening hours + \snippet places/requesthandler.h Opening hours The attribute types are string values by design to allow providers to introduce new attribute types. @@ -114,7 +114,7 @@ QT_BEGIN_NAMESPACE the category to be created). \section2 Saving Caveats - \include place-caveats.qdocinc + \input place-caveats.qdocinc */ /*! diff --git a/src/location/places/qplacecontent.cpp b/src/location/places/qplacecontent.cpp index be26d543..4b9b93f7 100644 --- a/src/location/places/qplacecontent.cpp +++ b/src/location/places/qplacecontent.cpp @@ -91,7 +91,7 @@ bool QPlaceContentPrivate::compare(const QPlaceContentPrivate *other) const Conversion between QPlaceContent and it's subclasses can be easily performed without casting. Due to the way it has been implemented, object slicing is not an issue, the following code is valid: - \snippet snippets/places/requesthandler.h Content conversion + \snippet places/requesthandler.h Content conversion The rich content of a place is typically made available as paginated items. The ability to convert between QPlaceContent and it's subclasses means that code which handles diff --git a/src/location/places/qplacecontentrequest.cpp b/src/location/places/qplacecontentrequest.cpp index 5ac66cbe..1353ada4 100644 --- a/src/location/places/qplacecontentrequest.cpp +++ b/src/location/places/qplacecontentrequest.cpp @@ -88,10 +88,10 @@ void QPlaceContentRequestPrivate::clear() retrieve rich content like images and reviews in a paginated fashion. The following code would request a set of 5 images from the 10th index: - \snippet snippets/places/requesthandler.h Content request + \snippet places/requesthandler.h Content request \dots \dots - \snippet snippets/places/requesthandler.h Content handler + \snippet places/requesthandler.h Content handler \sa QPlaceContentReply */ diff --git a/src/location/places/qplacedetailsreply.cpp b/src/location/places/qplacedetailsreply.cpp index 061f3797..d2908ec9 100644 --- a/src/location/places/qplacedetailsreply.cpp +++ b/src/location/places/qplacedetailsreply.cpp @@ -65,7 +65,7 @@ QT_USE_NAMESPACE \brief The QPlaceDetailsReply class manages a place details fetch operation started by an instance of QPlaceManager. - See \l {Fetching Place Details} for an example on how to use a details reply. + See \l {QML Places API#Fetching Place Details}{Fetching Place Details} for an example on how to use a details reply. \sa QPlaceManager */ diff --git a/src/location/places/qplaceicon.cpp b/src/location/places/qplaceicon.cpp index a7939733..1ae9c14f 100644 --- a/src/location/places/qplaceicon.cpp +++ b/src/location/places/qplaceicon.cpp @@ -88,17 +88,16 @@ bool QPlaceIconPrivate::operator == (const QPlaceIconPrivate &other) const \brief The QPlaceIcon class represents an icon. - \section2 Usage The typical usage of an icon is to use the url() function to specify a preferred icon size. - \snippet snippets/places/requesthandler.h icon + \snippet places/requesthandler.h icon The icons are typically backend dependent, if a manager backend does not support a given size, the URL of the icon that most closely matches those parameters is returned. The icon class also has a key-value set of parameters. The precise key one - needs to use depends on the \l {Qt Location Module#Plugin References and Parameters}{plugin} + needs to use depends on the \l {Qt Location#Plugin References and Parameters}{plugin} being used. These parameters influence which icon URL is returned by the manager and may also be used to specify icon URL locations when saving icons. @@ -196,7 +195,7 @@ QUrl QPlaceIcon::url(const QSize &size) const URL when url() is called and to specify locations to save to when saving icons. - Consult the \l {Qt Location Module#Plugin References and Parameters}{plugin documentation} + Consult the \l {Qt Location#Plugin References and Parameters}{plugin documentation} for what parameters are supported and how they should be used. */ QVariantMap QPlaceIcon::parameters() const diff --git a/src/location/places/qplacemanager.cpp b/src/location/places/qplacemanager.cpp index 61b1cb15..d0e91312 100644 --- a/src/location/places/qplacemanager.cpp +++ b/src/location/places/qplacemanager.cpp @@ -106,10 +106,10 @@ QT_BEGIN_NAMESPACE contains the results of the request, along with any errors that occurred, if any. An asynchronous request is generally handled as follows: - \snippet snippets/places/requesthandler.h Simple search + \snippet places/requesthandler.h Simple search \dots \dots - \snippet snippets/places/requesthandler.h Simple search handler + \snippet places/requesthandler.h Simple search handler See \l {Common Operations} for a list of examples demonstrating how the QPlaceManger is used. @@ -200,7 +200,7 @@ int QPlaceManager::managerVersion() const /*! Retrieves a details of place corresponding to the given \a placeId. - See \l {Fetching Place Details} for an example of usage. + See \l {QML Places API#Fetching Place Details}{Fetching Place Details} for an example of usage. */ QPlaceDetailsReply *QPlaceManager::getPlaceDetails(const QString &placeId) const { diff --git a/src/location/places/qplaceratings.cpp b/src/location/places/qplaceratings.cpp index 0cfdca2e..c8467f07 100644 --- a/src/location/places/qplaceratings.cpp +++ b/src/location/places/qplaceratings.cpp @@ -82,7 +82,7 @@ bool QPlaceRatingsPrivate::isEmpty() const The average() function returns an aggregated ratings value out of a possible maximum as given by the maximum() function. - \snippet snippets/places/requesthandler.h Ratings + \snippet places/requesthandler.h Ratings */ /*! diff --git a/src/location/places/qplaceresult.cpp b/src/location/places/qplaceresult.cpp index 002d94c7..8a3a99fe 100644 --- a/src/location/places/qplaceresult.cpp +++ b/src/location/places/qplaceresult.cpp @@ -86,7 +86,7 @@ bool QPlaceResultPrivate::compare(const QPlaceSearchResultPrivate *other) const The intended usage is that a QPlaceSearchResult can be converted into a QPlaceResult like so: - \snippet snippets/places/requesthandler.h Convert search result + \snippet places/requesthandler.h Convert search result The implmentation is handled in such a way that object slicing is not an issue. diff --git a/src/location/places/qplacesearchrequest.cpp b/src/location/places/qplacesearchrequest.cpp index 76393c27..4af49102 100644 --- a/src/location/places/qplacesearchrequest.cpp +++ b/src/location/places/qplacesearchrequest.cpp @@ -145,7 +145,7 @@ void QPlaceSearchRequestPrivate::clear() \brief The QPlaceSearchRequest class represents the set of parameters for a search request. A typical search request may look like the following: - \snippet snippets/places/requesthandler.h Search request + \snippet places/requesthandler.h Search request Note that specifying a search center can be done by setting a circular search area that has a center but no radius. The default radius is set to -1, which indicates an undefined radius. The provider will @@ -160,7 +160,7 @@ void QPlaceSearchRequestPrivate::clear() Also be aware that providers may vary by which parameters they support for example some providers may not support paging while others do, some providers may honor relevance hints while others may completely ignore them, - see the \l {Qt Location Module#Plugin References and Parameters}{plugin documentation} for more + see the \l {Qt Location#Plugin References and Parameters}{plugin documentation} for more details. */ diff --git a/src/location/places/qplacesearchresult.cpp b/src/location/places/qplacesearchresult.cpp index 424cba3d..124299f5 100644 --- a/src/location/places/qplacesearchresult.cpp +++ b/src/location/places/qplacesearchresult.cpp @@ -84,7 +84,7 @@ bool QPlaceSearchResultPrivate::compare(const QPlaceSearchResultPrivate *other) The intended usage is that depending on the \l {QPlaceSearchResult::type()} {type}, the search result can be converted to a more detailed subclass like so: - \snippet snippets/places/requesthandler.h Convert search result + \snippet places/requesthandler.h Convert search result The implmentation is handled in such a way that object slicing is not an issue. It is not expected that client applications or backend plugins instantiate |
