More copyright changes to Digia Plc in translations and tools

Change-Id: Idb88b4e72548dfa641c6b8ce78a661fa61757ad0
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

3 files changed, 76 insertions, 76 deletions

diff --git a/tools/qdoc3/doc/config/scripts/functions.js b/tools/qdoc3/doc/config/scripts/functions.js
index af204d8..c966e40 100644
--- a/tools/qdoc3/doc/config/scripts/functions.js
+++ b/tools/qdoc3/doc/config/scripts/functions.js
@@ -75,7 +75,7 @@ var qturl = "";
 
 // Process data sent back from the server. The data is structured as a XML.
 /*
-XML structure handled by function processNokiaData()
+XML structure handled by function processDigiaData()
 <page> - container for each page returned
 <pageWords/> - contains keywords
 <pageTitle/> - contains page title/header content 
@@ -85,7 +85,7 @@ XML structure handled by function processNokiaData()
 */
 
 
-function processNokiaData(response){
+function processDigiaData(response){
 /* fetch the responce from the server using page as the root element */
 	var propertyTags = response.getElementsByTagName('page');
 	/* reset counters */	
@@ -238,7 +238,7 @@ function CheckEmptyAndLoadList()
 				$('.searching').remove(); 
 				$('#pageType').removeClass('loading');
 
-                processNokiaData(response);
+                processDigiaData(response);
 
  }     
               });
diff --git a/tools/qdoc3/doc/config/scripts/narrow.js b/tools/qdoc3/doc/config/scripts/narrow.js
index a5e8b97..7b48208 100644
--- a/tools/qdoc3/doc/config/scripts/narrow.js
+++ b/tools/qdoc3/doc/config/scripts/narrow.js
@@ -58,76 +58,76 @@ var narrowInit = function() {
 
 /* 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) {
-		}
-	}
+        /* 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');
-  }
+        /*  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(); 
+        $('#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
+                        /* 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');
+                                processDigiaData(response);
+                        }
+                });
+        }, 500); /* timer set to 500 ms */
+});
diff --git a/tools/qdoc3/doc/qdoc-manual.qdoc b/tools/qdoc3/doc/qdoc-manual.qdoc
index 3b8e30f..f021307 100644
--- a/tools/qdoc3/doc/qdoc-manual.qdoc
+++ b/tools/qdoc3/doc/qdoc-manual.qdoc
@@ -3723,11 +3723,11 @@
         \l{GNU Lesser General Public License (LGPL)} or the
         \l{Qt Commercial Edition}{Qt Commercial License Agreement}, but rather under
         specific licenses from the original authors. Some pieces of code were developed
-        by Nokia and others originated from third parties.
+        by Digia and others originated from third parties.
         This page lists the licenses used, names the authors, and links
         to the places where it is used.
 
-        Nokia gratefully acknowledges these and other contributions
+        Digia gratefully acknowledges these and other contributions
         to Qt. We recommend that programs that use Qt also acknowledge
         these contributions, and quote these license statements in an
         appendix to the documentation.
@@ -4080,10 +4080,10 @@
        <shortdesc>the QWidget class is the base class of all user interface objects.</shortdesc>
        <prolog>
            <author>Qt Development Frameworks</author>
-           <publisher>Nokia</publisher>
+           <publisher>Digia</publisher>
            <copyright>
                <copyryear year="2011"/>
-               <copyrholder>Nokia</copyrholder>
+               <copyrholder>Digia</copyrholder>
            </copyright>
            <permissions view="all"/>
            <metadata>
@@ -7019,9 +7019,9 @@
     \code
     dita.metadata.default.author      = Qt Development Frameworks
     dita.metadata.default.permissions = all
-    dita.metadata.default.publisher   = Nokia
+    dita.metadata.default.publisher   = Digia
     dita.metadata.default.copyryear = 2011
-    dita.metadata.default.copyrholder = Nokia
+    dita.metadata.default.copyrholder = Digia
     dita.metadata.default.audience = programmer
     \endcode