diff options
Diffstat (limited to 'umbrello')
41 files changed, 63 insertions, 63 deletions
diff --git a/umbrello/INSTALL b/umbrello/INSTALL index 22f48d78..dbd22b3e 100644 --- a/umbrello/INSTALL +++ b/umbrello/INSTALL @@ -2,7 +2,7 @@ You need to be the parent directory to configure the compile, depending on where you got the source you may need to do the extra KDE step of Makefile.cvs. -cd kdesdk +cd tdesdk make -f Makefile.cvs ./configure --prefix=`kde-config --prefix` cd umbrello diff --git a/umbrello/Makefile.am b/umbrello/Makefile.am index f99bedf2..374ebc20 100644 --- a/umbrello/Makefile.am +++ b/umbrello/Makefile.am @@ -1,8 +1,8 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## SUBDIRS = umbrello -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ # not a GNU package. You can remove this line, if # have all needed files, that a GNU package needs AUTOMAKE_OPTIONS = foreign diff --git a/umbrello/make-umbrello-release.sh b/umbrello/make-umbrello-release.sh index 84429ad0..812291f0 100755 --- a/umbrello/make-umbrello-release.sh +++ b/umbrello/make-umbrello-release.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Make a release from the current branches/KDE/3.5/kdesdk/umbrello +# Make a release from the current branches/KDE/3.5/tdesdk/umbrello # # Run this script as follows: # . make-umbrello-release.sh [BRANCH_VERSION] @@ -8,7 +8,7 @@ # @todo Create release from trunk if BRANCH_VERSION not given. # Note: trunk uses the cmake based build process. # -# The script creates a directory, /tmp/kdesdk, which is used +# The script creates a directory, /tmp/tdesdk, which is used # as the work area for building the release. # The release tarfile will be placed in the current working dir. # The release version is taken from the VERSION file. @@ -22,12 +22,12 @@ version=`grep "^[1-9]" VERSION` udir=umbrello-$version svnroot=svn://anonsvn.kde.org:/home/kde/branches/KDE/$branchver cd /tmp -svn co -N $svnroot/kdesdk -cd kdesdk -svn co $svnroot/kdesdk/umbrello $udir +svn co -N $svnroot/tdesdk +cd tdesdk +svn co $svnroot/tdesdk/umbrello $udir svn co $svnroot/kde-common/admin $udir/admin -svn co -N $svnroot/kdesdk/doc $udir/doc -svn co $svnroot/kdesdk/doc/umbrello $udir/doc/umbrello +svn co -N $svnroot/tdesdk/doc $udir/doc +svn co $svnroot/tdesdk/doc/umbrello $udir/doc/umbrello cp -p Makefile.cvs $udir/ cd $udir mv configure.in.in configure.in.in.orig @@ -39,19 +39,19 @@ cat configure.in.in.orig >> configure.in.in rm configure.in.in.orig perl -p -e 's@umbrello/VERSION@VERSION@g' -i `find umbrello -name Makefile.am` cd /tmp -log=/tmp/kdesdk/svn2dist.log -$origdir/../scripts/svn2dist kdesdk $udir -n umbrello --admin-dir kdesdk/$udir/admin \ +log=/tmp/tdesdk/svn2dist.log +$origdir/../scripts/svn2dist tdesdk $udir -n umbrello --admin-dir tdesdk/$udir/admin \ --svn-root svn://anonsvn.kde.org/home/kde/branches/stable --log=$log -o -mv umbrello/po kdesdk/$udir/ +mv umbrello/po tdesdk/$udir/ rm -rf umbrello -cd kdesdk/$udir +cd tdesdk/$udir make -f Makefile.cvs cd .. tarfile=${udir}.tar.bz2 tar cfvj $tarfile --exclude=.svn --exclude=autom4te.cache $udir mv $tarfile $origdir/ cd $origdir -# rm -rf /tmp/kdesdk +# rm -rf /tmp/tdesdk echo upload $tarfile to upload.sf.net echo wput $tarfile ftp://upload.sf.net/incoming/ diff --git a/umbrello/umbrello/codegenerationpolicy.cpp b/umbrello/umbrello/codegenerationpolicy.cpp index 4acfb2b5..9cac6c3a 100644 --- a/umbrello/umbrello/codegenerationpolicy.cpp +++ b/umbrello/umbrello/codegenerationpolicy.cpp @@ -28,7 +28,7 @@ // kde includes #include <kconfig.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kdebug.h> #include <kstandarddirs.h> diff --git a/umbrello/umbrello/codeimport/kdevcppparser/README b/umbrello/umbrello/codeimport/kdevcppparser/README index 3ed39eba..8d81c89f 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/README +++ b/umbrello/umbrello/codeimport/kdevcppparser/README @@ -1,16 +1,16 @@ This directory contains the C++ parser from Kdevelop-3.0. -Following files are copies from the directory kdevelop/lib/cppparser: +Following files are copies from the directory tdevelop/lib/cppparser: ast.{h,cpp} driver.{h,cpp} errors.{h,cpp} keywords.lut.h lexer.{h,cpp} lookup.{h,cpp} parser.{h,cpp} tree_parser.{h,cpp} -Following files are copies from the directory kdevelop/languages/cpp: +Following files are copies from the directory tdevelop/languages/cpp: ast_utils.{h,cpp} -Following files are copies from the directory kdevelop/lib/util: +Following files are copies from the directory tdevelop/lib/util: urlutil.{h,cpp} -The source files cpptree2uml.{h,cpp} are based on kdevelop/languages/cpp/ +The source files cpptree2uml.{h,cpp} are based on tdevelop/languages/cpp/ store_walker.{h,cpp}. The class CppTree2Uml inherits from class TreeParser and overrides certain methods from that class. diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp index e273aeb7..ebb10af4 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp @@ -1,5 +1,5 @@ /* This file is part of KDevelop - Copyright (C) 2002,2003 Roberto Raggi <[email protected]> + Copyright (C) 2002,2003 Roberto Raggi <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.h b/umbrello/umbrello/codeimport/kdevcppparser/ast.h index 0d6a4759..49520e33 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/ast.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.h @@ -1,5 +1,5 @@ /* This file is part of KDevelop - Copyright (C) 2002,2003 Roberto Raggi <[email protected]> + Copyright (C) 2002,2003 Roberto Raggi <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp index 9d070334..ee6937ac 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2002 by Roberto Raggi * - * [email protected] * + * [email protected] * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h index 1f6209db..f84f7249 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2002 by Roberto Raggi * - * [email protected] * + * [email protected] * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp b/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp index 8bb7167a..4bc15f65 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Based on kdevelop-3.0 languages/cpp/store_walker.cpp by Roberto Raggi * + * Based on tdevelop-3.0 languages/cpp/store_walker.cpp by Roberto Raggi * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp b/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp index c1db8656..d3c8a1df 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp @@ -1,5 +1,5 @@ /* This file is part of KDevelop - Copyright (C) 2002,2003 Roberto Raggi <[email protected]> + Copyright (C) 2002,2003 Roberto Raggi <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/umbrello/umbrello/codeimport/kdevcppparser/driver.h b/umbrello/umbrello/codeimport/kdevcppparser/driver.h index 9c365129..a349b7c8 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/driver.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/driver.h @@ -1,5 +1,5 @@ /* This file is part of KDevelop - Copyright (C) 2002,2003 Roberto Raggi <[email protected]> + Copyright (C) 2002,2003 Roberto Raggi <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp b/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp index 9a18ddd6..e3cb19e5 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp @@ -1,5 +1,5 @@ /* This file is part of KDevelop - Copyright (C) 2002,2003 Roberto Raggi <[email protected]> + Copyright (C) 2002,2003 Roberto Raggi <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/umbrello/umbrello/codeimport/kdevcppparser/errors.h b/umbrello/umbrello/codeimport/kdevcppparser/errors.h index 6751475e..e0959250 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/errors.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/errors.h @@ -1,5 +1,5 @@ /* This file is part of KDevelop - Copyright (C) 2002,2003 Roberto Raggi <[email protected]> + Copyright (C) 2002,2003 Roberto Raggi <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h b/umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h index 1969fdb7..e733a254 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h @@ -1,4 +1,4 @@ -/* Automatically generated from keywords.table using /home/roberto/src/kdelibs/kjs/create_hash_table. DO NOT EDIT ! */ +/* Automatically generated from keywords.table using /home/roberto/src/tdelibs/kjs/create_hash_table. DO NOT EDIT ! */ static const struct HashEntry keywordEntries[] = { diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp index f51c9986..f91813f1 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp @@ -1,5 +1,5 @@ /* This file is part of KDevelop - Copyright (C) 2002,2003 Roberto Raggi <[email protected]> + Copyright (C) 2002,2003 Roberto Raggi <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.h b/umbrello/umbrello/codeimport/kdevcppparser/lexer.h index 3b26fb0c..0e15f053 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.h @@ -1,5 +1,5 @@ /* This file is part of KDevelop - Copyright (C) 2002,2003 Roberto Raggi <[email protected]> + Copyright (C) 2002,2003 Roberto Raggi <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp index 87b5b546..a05a7ddf 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp @@ -19,7 +19,7 @@ * */ -// adapted to kdevelop by Roberto Raggi <[email protected]> +// adapted to tdevelop by Roberto Raggi <[email protected]> #include "lookup.h" diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lookup.h b/umbrello/umbrello/codeimport/kdevcppparser/lookup.h index b2bad4de..615d8a00 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/lookup.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/lookup.h @@ -19,7 +19,7 @@ * */ -// adapted to kdevelop by Roberto Raggi <[email protected]> +// adapted to tdevelop by Roberto Raggi <[email protected]> #ifndef _KJSLOOKUP_H_ #define _KJSLOOKUP_H_ diff --git a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp index 066ff36b..51837b1e 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp @@ -1,5 +1,5 @@ /* This file is part of KDevelop - Copyright (C) 2002,2003 Roberto Raggi <[email protected]> + Copyright (C) 2002,2003 Roberto Raggi <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/umbrello/umbrello/codeimport/kdevcppparser/parser.h b/umbrello/umbrello/codeimport/kdevcppparser/parser.h index 9be954c2..930a563f 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/parser.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/parser.h @@ -1,5 +1,5 @@ /* This file is part of KDevelop - Copyright (C) 2002,2003 Roberto Raggi <[email protected]> + Copyright (C) 2002,2003 Roberto Raggi <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.cpp b/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.cpp index 454c4b99..d419336e 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.cpp @@ -1,5 +1,5 @@ /* This file is part of KDevelop - Copyright (C) 2002,2003 Roberto Raggi <[email protected]> + Copyright (C) 2002,2003 Roberto Raggi <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.h b/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.h index 5377358b..66fc05ef 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/tree_parser.h @@ -1,5 +1,5 @@ /* This file is part of KDevelop - Copyright (C) 2002,2003 Roberto Raggi <[email protected]> + Copyright (C) 2002,2003 Roberto Raggi <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp index 92886e07..8b8cc8eb 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp @@ -30,7 +30,7 @@ #include <limits.h> #include <stdlib.h> -#include <kdeversion.h> +#include <tdeversion.h> #if (TDE_VERSION_MINOR==0) && (TDE_VERSION_MAJOR==3) #include <kdevkurl.h> #endif diff --git a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.h b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.h index 2d05b162..8f761791 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.h @@ -77,10 +77,10 @@ namespace URLUtil * If baseDirUrl == url.path() then it will return ".". * <code> * KURL baseUrl, dirUrl; - * baseUrl.setPath( "/home/mario/src/kdevelop/" ); - * dirUrl.setPath( "/home/mario/src/kdevelop/parts/cvs/" ); + * baseUrl.setPath( "/home/mario/src/tdevelop/" ); + * dirUrl.setPath( "/home/mario/src/tdevelop/parts/cvs/" ); * TQString relPathName = extractDirPathRelative( baseUrl, url ); // == "parts/cvs/" - * TQString absPathName = extractDirPathAbsolute( url ); // == "/home/mario/src/kdevelop/parts/cvs/" + * TQString absPathName = extractDirPathAbsolute( url ); // == "/home/mario/src/tdevelop/parts/cvs/" * </code> * Note that if you pass a file name in @p url (instead of a directory) or the @p baseUrl is not contained * in @p url then the function will return "" (void string). diff --git a/umbrello/umbrello/docgenerators/xmi2docbook.sh b/umbrello/umbrello/docgenerators/xmi2docbook.sh index 865ebb6f..3385c12d 100644 --- a/umbrello/umbrello/docgenerators/xmi2docbook.sh +++ b/umbrello/umbrello/docgenerators/xmi2docbook.sh @@ -1,9 +1,9 @@ #! /bin/bash echo Converting from XMI to docbook... -java -cp /usr/share/java/xalan-j2-2.6.0.jar org.apache.xalan.xslt.Process -xml -in $1.xmi -xsl /home/gael/Logiciels/trinity.5-svn/kdesdk/umbrello.withdocgen/umbrello/docgenerators/xmi2docbook.xsl -out $1.docbook +java -cp /usr/share/java/xalan-j2-2.6.0.jar org.apache.xalan.xslt.Process -xml -in $1.xmi -xsl /home/gael/Logiciels/trinity.5-svn/tdesdk/umbrello.withdocgen/umbrello/docgenerators/xmi2docbook.xsl -out $1.docbook echo Converting from docbook to XHTML... -java -cp /usr/share/java/xalan-j2-2.6.0.jar org.apache.xalan.xslt.Process -in $1.docbook -xsl /home/gael/Logiciels/trinity.5-svn/kdesdk/umbrello.withdocgen/umbrello/docgenerators/docbook2xhtml.xsl -out $1.html -html +java -cp /usr/share/java/xalan-j2-2.6.0.jar org.apache.xalan.xslt.Process -in $1.docbook -xsl /home/gael/Logiciels/trinity.5-svn/tdesdk/umbrello.withdocgen/umbrello/docgenerators/docbook2xhtml.xsl -out $1.html -html echo done. diff --git a/umbrello/umbrello/pics/COPYING b/umbrello/umbrello/pics/COPYING index 5e09cc93..e05154c1 100644 --- a/umbrello/umbrello/pics/COPYING +++ b/umbrello/umbrello/pics/COPYING @@ -1,3 +1,3 @@ Images under this directory as well as the Umbrello and Umbrello mimetype icons may be copied under the terms of the LGPL plus add-on as -found in kdelibs/pics/LICENSE.crystalsvg +found in tdelibs/pics/LICENSE.crystalsvg diff --git a/umbrello/umbrello/pics/sources/align_bottom.svg b/umbrello/umbrello/pics/sources/align_bottom.svg index 0f292766..1799e8aa 100644 --- a/umbrello/umbrello/pics/sources/align_bottom.svg +++ b/umbrello/umbrello/pics/sources/align_bottom.svg @@ -16,7 +16,7 @@ inkscape:version="0.42" width="22pt" height="22pt" - sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/kdesdk/umbrello/umbrello/pics/sources" + sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/tdesdk/umbrello/umbrello/pics/sources" sodipodi:docname="align_bottom.svg"> <metadata id="metadata1589"> diff --git a/umbrello/umbrello/pics/sources/align_hori_distribute.svg b/umbrello/umbrello/pics/sources/align_hori_distribute.svg index f6174a83..6bcc9f69 100644 --- a/umbrello/umbrello/pics/sources/align_hori_distribute.svg +++ b/umbrello/umbrello/pics/sources/align_hori_distribute.svg @@ -16,9 +16,9 @@ inkscape:version="0.42" width="22pt" height="22pt" - sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/kdesdk/umbrello/umbrello/pics/sources" + sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/tdesdk/umbrello/umbrello/pics/sources" sodipodi:docname="align_hori_distribute.svg" - inkscape:export-filename="/home/dani/Proyectos/umbrello-svn/kdesdk/umbrello/umbrello/pics/align_hori_distribute.png" + inkscape:export-filename="/home/dani/Proyectos/umbrello-svn/tdesdk/umbrello/umbrello/pics/align_hori_distribute.png" inkscape:export-xdpi="72.000000" inkscape:export-ydpi="72.000000"> <metadata diff --git a/umbrello/umbrello/pics/sources/align_hori_middle.svg b/umbrello/umbrello/pics/sources/align_hori_middle.svg index 4c7b1234..b23ae482 100644 --- a/umbrello/umbrello/pics/sources/align_hori_middle.svg +++ b/umbrello/umbrello/pics/sources/align_hori_middle.svg @@ -16,7 +16,7 @@ inkscape:version="0.42" width="27.500000px" height="27.500000px" - sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/kdesdk/umbrello/umbrello/pics/sources" + sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/tdesdk/umbrello/umbrello/pics/sources" sodipodi:docname="align_vert_distribute.svg"> <metadata id="metadata47"> diff --git a/umbrello/umbrello/pics/sources/align_left.svg b/umbrello/umbrello/pics/sources/align_left.svg index 362e4e34..22c46df3 100644 --- a/umbrello/umbrello/pics/sources/align_left.svg +++ b/umbrello/umbrello/pics/sources/align_left.svg @@ -16,7 +16,7 @@ inkscape:version="0.42" width="22pt" height="22pt" - sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/kdesdk/umbrello/umbrello/pics/sources" + sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/tdesdk/umbrello/umbrello/pics/sources" sodipodi:docname="align_left.svg"> <metadata id="metadata5028"> diff --git a/umbrello/umbrello/pics/sources/align_right.svg b/umbrello/umbrello/pics/sources/align_right.svg index 8fa3af6e..3ed3a88a 100644 --- a/umbrello/umbrello/pics/sources/align_right.svg +++ b/umbrello/umbrello/pics/sources/align_right.svg @@ -16,7 +16,7 @@ inkscape:version="0.42" width="22pt" height="22pt" - sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/kdesdk/umbrello/umbrello/pics/sources" + sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/tdesdk/umbrello/umbrello/pics/sources" sodipodi:docname="align_right.svg"> <metadata id="metadata4876"> diff --git a/umbrello/umbrello/pics/sources/align_top.svg b/umbrello/umbrello/pics/sources/align_top.svg index e7cec488..977ee1b9 100644 --- a/umbrello/umbrello/pics/sources/align_top.svg +++ b/umbrello/umbrello/pics/sources/align_top.svg @@ -16,7 +16,7 @@ inkscape:version="0.42" width="22pt" height="22pt" - sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/kdesdk/umbrello/umbrello/pics/sources" + sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/tdesdk/umbrello/umbrello/pics/sources" sodipodi:docname="align_top.svg"> <metadata id="metadata4677"> diff --git a/umbrello/umbrello/pics/sources/align_vert_distribute.svg b/umbrello/umbrello/pics/sources/align_vert_distribute.svg index 135eda26..d4b78d65 100644 --- a/umbrello/umbrello/pics/sources/align_vert_distribute.svg +++ b/umbrello/umbrello/pics/sources/align_vert_distribute.svg @@ -16,9 +16,9 @@ inkscape:version="0.42" width="22pt" height="22pt" - sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/kdesdk/umbrello/umbrello/pics/sources" + sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/tdesdk/umbrello/umbrello/pics/sources" sodipodi:docname="align_vert_distribute.svg" - inkscape:export-filename="/home/dani/Proyectos/umbrello-svn/kdesdk/umbrello/umbrello/pics/align_hori_distribute.png" + inkscape:export-filename="/home/dani/Proyectos/umbrello-svn/tdesdk/umbrello/umbrello/pics/align_hori_distribute.png" inkscape:export-xdpi="72.000000" inkscape:export-ydpi="72.000000"> <metadata diff --git a/umbrello/umbrello/pics/sources/align_vert_middle.svg b/umbrello/umbrello/pics/sources/align_vert_middle.svg index b7b62def..9e63ccf3 100644 --- a/umbrello/umbrello/pics/sources/align_vert_middle.svg +++ b/umbrello/umbrello/pics/sources/align_vert_middle.svg @@ -16,7 +16,7 @@ inkscape:version="0.42" width="22pt" height="22pt" - sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/kdesdk/umbrello/umbrello/pics/sources" + sodipodi:docbase="/home/dani/Proyectos/umbrello-svn/tdesdk/umbrello/umbrello/pics/sources" sodipodi:docname="align_vert_middle.svg"> <metadata id="metadata1467"> diff --git a/umbrello/umbrello/pics/sources/diag_entityrelationship.svg b/umbrello/umbrello/pics/sources/diag_entityrelationship.svg index 586f8e2e..485ef522 100644 --- a/umbrello/umbrello/pics/sources/diag_entityrelationship.svg +++ b/umbrello/umbrello/pics/sources/diag_entityrelationship.svg @@ -8,7 +8,7 @@ inkscape:version="0.40" width="16pt" height="16pt" - sodipodi:docbase="/home/jr/devel/kdesdk/umbrello/umbrello/pics/sources" + sodipodi:docbase="/home/jr/devel/tdesdk/umbrello/umbrello/pics/sources" sodipodi:docname="diag_entityrelationship.svg" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" diff --git a/umbrello/umbrello/pics/sources/entity.svg b/umbrello/umbrello/pics/sources/entity.svg index a40611eb..ea5edd34 100644 --- a/umbrello/umbrello/pics/sources/entity.svg +++ b/umbrello/umbrello/pics/sources/entity.svg @@ -8,7 +8,7 @@ inkscape:version="0.40" width="22pt" height="22pt" - sodipodi:docbase="/home/jr/devel/kdesdk/umbrello/umbrello/pics/sources" + sodipodi:docbase="/home/jr/devel/tdesdk/umbrello/umbrello/pics/sources" sodipodi:docname="entity.svg" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" @@ -18,7 +18,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" - inkscape:export-filename="/home/jr/devel/kdesdk/umbrello/umbrello/pics/entity.png" + inkscape:export-filename="/home/jr/devel/tdesdk/umbrello/umbrello/pics/entity.png" inkscape:export-xdpi="72.000000" inkscape:export-ydpi="72.000000"> <metadata diff --git a/umbrello/umbrello/pics/sources/relationship.svg b/umbrello/umbrello/pics/sources/relationship.svg index 89981396..4e69a98e 100644 --- a/umbrello/umbrello/pics/sources/relationship.svg +++ b/umbrello/umbrello/pics/sources/relationship.svg @@ -8,7 +8,7 @@ inkscape:version="0.40" width="22pt" height="22pt" - sodipodi:docbase="/home/jr/devel/kdesdk/umbrello/umbrello/pics/sources" + sodipodi:docbase="/home/jr/devel/tdesdk/umbrello/umbrello/pics/sources" sodipodi:docname="relationship.svg" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" @@ -17,7 +17,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" - inkscape:export-filename="/home/jr/devel/kdesdk/umbrello/umbrello/pics/sources/relationship.png" + inkscape:export-filename="/home/jr/devel/tdesdk/umbrello/umbrello/pics/sources/relationship.png" inkscape:export-xdpi="72.000000" inkscape:export-ydpi="72.000000"> <metadata diff --git a/umbrello/umbrello/uml.h b/umbrello/umbrello/uml.h index b2f9181d..3e5b27e7 100644 --- a/umbrello/umbrello/uml.h +++ b/umbrello/umbrello/uml.h @@ -22,7 +22,7 @@ #include <tqdict.h> #include <kdockwidget.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kurl.h> // forward declaration of the UML classes diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp index 6abc0f8e..39c8ce61 100644 --- a/umbrello/umbrello/umldoc.cpp +++ b/umbrello/umbrello/umldoc.cpp @@ -23,7 +23,7 @@ // kde includes #include <kapplication.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kdebug.h> #include <kio/job.h> #include <kio/netaccess.h> diff --git a/umbrello/umbrello/uniqueid.cpp b/umbrello/umbrello/uniqueid.cpp index 9c271cdb..d1f08341 100644 --- a/umbrello/umbrello/uniqueid.cpp +++ b/umbrello/umbrello/uniqueid.cpp @@ -26,7 +26,7 @@ Uml::IDType gen() { static char buf[20]; int length = 12; int i = 0; - // Source: KDE4 kdelibs/tdecore/krandom.cpp KRandom::randomString() + // Source: KDE4 tdelibs/tdecore/krandom.cpp KRandom::randomString() while (length--) { int r = kapp->random() % 62; r += 48; |
