From 2568f8ab2482873cdb11312bf4a29ee1e57a0205 Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@digia.com>
Date: Wed, 5 Dec 2012 10:14:13 +0100
Subject: QtBase: Doc: Replacing link with snippet in QTranslator.

Because the linguist examples are moved to qttools module, a link
to the hellotr example broke.

Change-Id: I2aeefc143578618396f5be38ed1d52afdd1f7436
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
---
 src/corelib/doc/snippets/hellotrmain.cpp | 57 ++++++++++++++++++++++++++++++++
 src/corelib/kernel/qtranslator.cpp       |  6 ++--
 2 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 src/corelib/doc/snippets/hellotrmain.cpp

diff --git a/src/corelib/doc/snippets/hellotrmain.cpp b/src/corelib/doc/snippets/hellotrmain.cpp
new file mode 100644
index 0000000000..fdb034c241
--- /dev/null
+++ b/src/corelib/doc/snippets/hellotrmain.cpp
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QTranslator translator;
+    translator.load("hellotr_la");
+    app.installTranslator(&translator);
+
+    QPushButton hello(QPushButton::tr("Hello world!"));
+    hello.resize(100, 30);
+
+    hello.show();
+    return app.exec();
+}
+//! [0]
+
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index f934202cf6..58e4f202d5 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -343,10 +343,10 @@ public:
 
     The most common use of QTranslator is to: load a translation
     file, install it using QCoreApplication::installTranslator(), and use
-    it via QObject::tr(). Here's the \c main() function from the
-    \l{linguist/hellotr}{Hello tr()} example:
+    it via QObject::tr(). Here's an example \c main() function using the
+    QTranslator:
 
-    \snippet linguist/hellotr/main.cpp 2
+    \snippet hellotrmain.cpp 0
 
     Note that the translator must be created \e before the
     application's widgets.
-- 
cgit v1.2.3