[Uml-devel] branches/work/kde4/kdesdk

[Thiago Macieira]

SVN commit 437156 by thiago:

merge 436100:437128

 _M            branches/work/kde4/kdesdk (directory)  
 M  +1 -1      kioslave/svn/ksvnd/ksvnd.desktop  
 M  +1 -0      kioslave/svn/svn+file.protocol  
 M  +1 -0      kioslave/svn/svn+http.protocol  
 M  +1 -0      kioslave/svn/svn+https.protocol  
 M  +1 -0      kioslave/svn/svn+ssh.protocol  
 M  +1 -0      kioslave/svn/svn.protocol  
 M  +1 -1      scripts/kde-emacs/kde-emacs-utils.el  
 D             scripts/qt4 (directory)  
 M  +6 -0      scripts/svnbackport  
 M  +1 -0      umbrello/THANKS  
 M  +1 -1      umbrello/umbrello/codegenerators/Makefile.am  
 M  +6 -0      umbrello/umbrello/codegenerators/codegenfactory.cpp  
 A             umbrello/umbrello/codegenerators/rubywriter.cpp   trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/rubywriter.cpp#437128
 A             umbrello/umbrello/codegenerators/rubywriter.h   trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/rubywriter.h#437128
 M  +1 -0      umbrello/umbrello/headings/Makefile.am  
 A             umbrello/umbrello/headings/heading.rb   trunk/KDE/kdesdk/umbrello/umbrello/headings/heading.rb#437128


** branches/work/kde4/kdesdk #property changes
Name: svnmerge-integrated
   - /trunk/KDE/kdesdk/:1-436100
   + /trunk/KDE/kdesdk/:1-437128
--- branches/work/kde4/kdesdk/kioslave/svn/ksvnd/ksvnd.desktop #437155:437156
@@ -17,7 +17,7 @@
 Name[pl]=Moduł Subversion dla KDED
 Name[pt]=Módulo KDED Subversion
 Name[pt_BR]=Módulo de Sub-versão KDED
-Name[ru]=Моудль Subversion KDED
+Name[ru]=Служба Subversion
 Name[sl]=Modul  Subversion za KDED
 Name[sr]=KDED модул за Subversion
 Name[sr at Latn]=KDED modul za Subversion
--- branches/work/kde4/kdesdk/kioslave/svn/svn+file.protocol #437155:437156
@@ -25,6 +25,7 @@
 Description[pl]=Wtyczka protokołu Subversion
 Description[pt]='Ioslave' para Subversion
 Description[pt_BR]=ioslave de Subversão
+Description[ru]=Доступ к хранилищу Subversion
 Description[sl]=ioslave Subversion
 Description[sr]=IOSlave за Subversion
 Description[sr at Latn]=IOSlave za Subversion
--- branches/work/kde4/kdesdk/kioslave/svn/svn+http.protocol #437155:437156
@@ -25,6 +25,7 @@
 Description[pl]=Wtyczka protokołu Subversion
 Description[pt]='Ioslave' para Subversion
 Description[pt_BR]=ioslave de Subversão
+Description[ru]=Доступ к хранилищу Subversion
 Description[sl]=ioslave Subversion
 Description[sr]=IOSlave за Subversion
 Description[sr at Latn]=IOSlave za Subversion
--- branches/work/kde4/kdesdk/kioslave/svn/svn+https.protocol #437155:437156
@@ -25,6 +25,7 @@
 Description[pl]=Wtyczka protokołu Subversion
 Description[pt]='Ioslave' para Subversion
 Description[pt_BR]=ioslave de Subversão
+Description[ru]=Доступ к хранилищу Subversion
 Description[sl]=ioslave Subversion
 Description[sr]=IOSlave за Subversion
 Description[sr at Latn]=IOSlave za Subversion
--- branches/work/kde4/kdesdk/kioslave/svn/svn+ssh.protocol #437155:437156
@@ -25,6 +25,7 @@
 Description[pl]=Wtyczka protokołu Subversion
 Description[pt]='Ioslave' para Subversion
 Description[pt_BR]=ioslave de Subversão
+Description[ru]=Доступ к хранилищу Subversion
 Description[sl]=ioslave Subversion
 Description[sr]=IOSlave за Subversion
 Description[sr at Latn]=IOSlave za Subversion
--- branches/work/kde4/kdesdk/kioslave/svn/svn.protocol #437155:437156
@@ -25,6 +25,7 @@
 Description[pl]=Wtyczka protokołu Subversion
 Description[pt]='Ioslave' para Subversion
 Description[pt_BR]=ioslave de Subversão
+Description[ru]=Доступ к хранилищу Subversion
 Description[sl]=ioslave Subversion
 Description[sr]=IOSlave за Subversion
 Description[sr at Latn]=IOSlave za Subversion
--- branches/work/kde4/kdesdk/scripts/kde-emacs/kde-emacs-utils.el #437155:437156
@@ -821,7 +821,7 @@
       (progn
 	(re-search-forward "^class" nil t)
 	(beginning-of-line))
-    ))
+    )))
 
 (defun qt-open-header ()
   "Open the Qt header file for the class under point"
--- branches/work/kde4/kdesdk/scripts/svnbackport #437155:437156
@@ -7,6 +7,7 @@
 # Initial author: Dirk Mueller
 # Support for multiple command-line arguments: David Faure
 # Ported to SVN: Till Gerken
+# Help message: Thomas Zander
 #
 # It is a straight port and not very sophisticated. It might break. I hope
 # that someone else with more knowledge about Subversion will pick it up.
@@ -16,6 +17,11 @@
 
 #REPOSITORY=https://svn.kde.org/home/kde
 
+if test -z "$1" -o "$1" = "-h" -o "$1" = "--help"; then
+    echo "Usage: svnbackport recentlyCommittedFile";
+    exit;
+fi
+
 BRANCH=3.4
 
 SRC_REMOTE=`svn info | grep URL: | cut -c6-`
--- branches/work/kde4/kdesdk/umbrello/THANKS #437155:437156
@@ -23,6 +23,7 @@
 Ben Burton <bab @debian.org>
 Albert Cervera <albertca @jazzfree.com>
 Albert Astals Cid <tsdgeos @terra.es>
+Richard Dale <duke @tipitina.demon.co.uk>
 Vincent Decorges <vincent.decorges @eivd.ch>
 Jean-Remy Falleri <jr.falleri @gmail.com>
 Andi Fischer <andi.fischer @hispeed.ch>
--- branches/work/kde4/kdesdk/umbrello/umbrello/codegenerators/Makefile.am #437155:437156
@@ -22,7 +22,7 @@
 				cppcodegenerationformbase.ui cppcodegenerationform.cpp \
 				simplecodegenerator.cpp \
 				adawriter.cpp aswriter.cpp cppwriter.cpp javawriter.cpp jswriter.cpp \
-				idlwriter.cpp perlwriter.cpp \
+				idlwriter.cpp perlwriter.cpp rubywriter.cpp \
 				phpwriter.cpp php5writer.cpp pythonwriter.cpp sqlwriter.cpp xmlschemawriter.cpp \
 				xmlelementcodeblock.cpp xmlcodecomment.cpp \
 				codegen_utils.cpp
--- branches/work/kde4/kdesdk/umbrello/umbrello/codegenerators/codegenfactory.cpp #437155:437156
@@ -35,6 +35,7 @@
 #include "php5writer.h"
 #include "perlwriter.h"
 #include "pythonwriter.h"
+#include "rubywriter.h"
 #include "sqlwriter.h"
 #include "aswriter.h"
 #include "jswriter.h"
@@ -64,6 +65,7 @@
     l.append("PHP");
     l.append("PHP5");
     l.append("Python");
+    l.append("Ruby");
     l.append("SQL");
     l.append("XMLSchema");
     return l;
@@ -95,6 +97,8 @@
         return "PerlWriter";
     if (l == "Python")
         return "PythonWriter";
+    if (l == "Ruby")
+        return "RubyWriter";
     if (l == "SQL")
         return "SQLWriter";
     if (l == "XMLSchema")
@@ -138,6 +142,8 @@
             obj = new PerlWriter( doc, name);
         } else if (cname == "PythonWriter") {
             obj = new PythonWriter( doc, name);
+        } else if (cname == "RubyWriter") {
+            obj = new RubyWriter( doc, name);
         } else if (cname == "SQLWriter") {
             obj = new SQLWriter( doc, name);
         } else if (cname == "XMLSchemaWriter") {
--- branches/work/kde4/kdesdk/umbrello/umbrello/headings/Makefile.am #437155:437156
@@ -11,5 +11,6 @@
 heading.php \
 heading.pm \
 heading.py \
+heading.rb \
 heading.sql \
 heading.xsd